December 2007 - macports-changes - lists.macosforge.org

[32365] trunk/base
by jmpp＠macports.org 27 Dec '07

27 Dec '07

Revision: 32365 http://trac.macosforge.org/projects/macports/changeset/32365 Author: jmpp(a)macports.org Date: 2007-12-27 12:31:52 -0800 (Thu, 27 Dec 2007) Log Message: ----------- Add the base/config/macports_version file holding the 1.7.0 version number (for trunk), with limited usage for the time being: * Read it in for the autoconf @MACPORTS_VERSION@ variable; * Stop the Snoopy talk in configure.ac to convert the floating point format to a regular versions, reading base/config/macports_version directly instead; * Switch files with @VER@ substitution over to @MACPORTS_VERSION@. The $macports::autoconf::macports_version will still read from @MP_VERSION@, the floating point format, until a good logic for selfupdate magically emerges (cf. r32364). Modified Paths: -------------- trunk/base/configure.ac trunk/base/portmgr/fedora/macports.spec.in trunk/base/portmgr/freebsd/Makefile.in Added Paths: ----------- trunk/base/config/macports_version Added: trunk/base/config/macports_version =================================================================== --- trunk/base/config/macports_version (rev 0) +++ trunk/base/config/macports_version 2007-12-27 20:31:52 UTC (rev 32365) @@ -0,0 +1 @@ +1.7.0 Modified: trunk/base/configure.ac =================================================================== --- trunk/base/configure.ac 2007-12-27 20:07:33 UTC (rev 32364) +++ trunk/base/configure.ac 2007-12-27 20:31:52 UTC (rev 32365) @@ -1,17 +1,18 @@ dnl Process this file with autoconf to produce a configure script. dnl $Id$ AC_PREREQ(2.52) -AC_INIT([MacPorts], [esyscmd(cat config/mp_version | tr -d '\n')], [macports-dev(a)lists.macosforge.org] [macports]) +AC_INIT([MacPorts], [esyscmd(cat config/macports_version | tr -d '\n')], [macports-dev(a)lists.macosforge.org] [macports]) AC_CONFIG_SRCDIR([src/pextlib1.0/Pextlib.c]) AC_CONFIG_HEADERS([src/config.h]) AC_CANONICAL_SYSTEM -# Read in the MacPorts version from the base/config/mp_vesion file and translate it (e.g. 1.600) to regular version (1.6.0) +# Read in the MacPorts version from the base/config/macports_vesion file AC_MSG_CHECKING(MacPorts version) +MACPORTS_VERSION=$(cat config/macports_version | tr -d '\n') +AC_MSG_RESULT([$MACPORTS_VERSION]) +AC_SUBST(MACPORTS_VERSION) +# Read the old, floating point format version, which we still use internally, and export it for the $macports::autoconf::macports_version variable MP_VERSION=$(cat config/mp_version | tr -d '\n') -VER=`echo $MP_VERSION | sed -e 's/$[[0-9]]$\.$[[0-9]]$0\{0,1\}$[[0-9]][[1-9]]\{0,1\}$0\{0,1\}/\1.\2.\3/'` -AC_MSG_RESULT([$VER]) -AC_SUBST(VER) AC_SUBST(MP_VERSION) # Check user PATH for MP paths, and remove as necessary. Modified: trunk/base/portmgr/fedora/macports.spec.in =================================================================== --- trunk/base/portmgr/fedora/macports.spec.in 2007-12-27 20:07:33 UTC (rev 32364) +++ trunk/base/portmgr/fedora/macports.spec.in 2007-12-27 20:31:52 UTC (rev 32365) @@ -1,6 +1,6 @@ Summary: MacPorts allows installing software on Mac OS X (and other platforms) Name: macports -Version: @VER@ +Version: @MACPORTS_VERSION@ Release: 0%{?dist} License: BSD Group: System Environment/Base Modified: trunk/base/portmgr/freebsd/Makefile.in =================================================================== --- trunk/base/portmgr/freebsd/Makefile.in 2007-12-27 20:07:33 UTC (rev 32364) +++ trunk/base/portmgr/freebsd/Makefile.in 2007-12-27 20:31:52 UTC (rev 32365) @@ -6,7 +6,7 @@ # PORTNAME= macports -PORTVERSION= @VER@ +PORTVERSION= @MACPORTS_VERSION@ CATEGORIES= sysutils MASTER_SITES= http://svn.macosforge.org/repository/macports/distfiles/MacPorts/ DISTNAME= MacPorts-${PORTVERSION}

1 0

[32364] trunk/base/src/macports1.0/macports.tcl
by jmpp＠macports.org 27 Dec '07

27 Dec '07

Revision: 32364 http://trac.macosforge.org/projects/macports/changeset/32364 Author: jmpp(a)macports.org Date: 2007-12-27 12:07:33 -0800 (Thu, 27 Dec 2007) Log Message: ----------- Don't use plain arithmetical comparison to determine if the downloaded sources are newer than the installed MacPorts, but rather our own rpm-vercomp to compare $macports_version_new against $macports::autoconf::macports_version. As of this moment, the result is the same (and will be the same when we release 1.xyz, with x > 6 and/or y,z > 0) as the arithmetical comparison, but in the future this change will allow us to introduce real version numbers into MacPorts. My current idea is to create a base/config/macports_version file holding something like 1.6.1, but the selfupdate logic of reading the latter over base/config/mp_version has to be thoroughly thought out: 600 (from base/config/mp_version's 1.600) is greater than 6, so if we flat out select base/config/macports_version to read the new version we will break selfupdating for everyone, as rpm-vercomp will not see 1.6.1 as greater than 1.600. Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2007-12-27 19:03:53 UTC (rev 32363) +++ trunk/base/src/macports1.0/macports.tcl 2007-12-27 20:07:33 UTC (rev 32364) @@ -1656,14 +1656,14 @@ return -code error "Error: rsync failed in selfupdate" } - # get downloaded MacPorts version and write the old version back + # get downloaded MacPorts version set fd [open [file join $mp_source_path config mp_version] r] gets $fd macports_version_new close $fd ui_msg "\nDownloaded MacPorts base version $macports_version_new" # check if we we need to rebuild base - if {$macports_version_new > $macports::autoconf::macports_version || $use_the_force_luke == "yes"} { + if {[rpm-vercomp $macports_version_new $macports::autoconf::macports_version] > 0 || $use_the_force_luke == "yes"} { ui_msg "Configuring, Building and Installing new MacPorts base" # check if $prefix/bin/port is writable, if so we go ! # get installation user / group

1 0

[32363] trunk/base/config/dp_version
by jmpp＠macports.org 27 Dec '07

27 Dec '07

Revision: 32363 http://trac.macosforge.org/projects/macports/changeset/32363 Author: jmpp(a)macports.org Date: 2007-12-27 11:03:53 -0800 (Thu, 27 Dec 2007) Log Message: ----------- Delete the base/config/dp_version file as a sort of stealth test: only pre dp2mp-move sources use it and will not be able to selfupdate without it (but don't worry, the problem is easily solved by forcing the selfupdate through port(1)'s -f flag). The number of complaints we get about a missing dp_version file will give us a hint about how many out there are still using pre dp2mp-move MacPorts releases (if small, we might be able to remove all the related upgrade code). Removed Paths: ------------- trunk/base/config/dp_version Deleted: trunk/base/config/dp_version =================================================================== --- trunk/base/config/dp_version 2007-12-27 17:17:27 UTC (rev 32362) +++ trunk/base/config/dp_version 2007-12-27 19:03:53 UTC (rev 32363) @@ -1 +0,0 @@ -1.700

1 0

[32362] trunk/dports/x11/rxvt-unicode/Portfile
by takanori＠macports.org 27 Dec '07

27 Dec '07

Revision: 32362 http://trac.macosforge.org/projects/macports/changeset/32362 Author: takanori(a)macports.org Date: 2007-12-27 09:17:27 -0800 (Thu, 27 Dec 2007) Log Message: ----------- rxvt-unicode: Version bump to 8.9. Modified Paths: -------------- trunk/dports/x11/rxvt-unicode/Portfile Modified: trunk/dports/x11/rxvt-unicode/Portfile =================================================================== --- trunk/dports/x11/rxvt-unicode/Portfile 2007-12-27 16:56:31 UTC (rev 32361) +++ trunk/dports/x11/rxvt-unicode/Portfile 2007-12-27 17:17:27 UTC (rev 32362) @@ -3,7 +3,7 @@ PortSystem 1.0 name rxvt-unicode -version 8.7 +version 8.9 categories x11 maintainers nomaintainer description Unicode-aware rxvt clone. @@ -20,9 +20,9 @@ master_sites http://dist.schmorp.de/rxvt-unicode/ \ http://dist.schmorp.de/rxvt-unicode/Attic/ use_bzip2 yes -checksums md5 4d615334e5e4959cded8ba298868a113 \ - sha1 768a6a73a28191189f7bf90da998cb11fbd9c5ad \ - rmd160 b86813275d5f4f7e0e3b756a7d613695519d0336 +checksums md5 033dc1ee5f48a645c0042fa214ae2b5c \ + sha1 0b9b482122a181a4f7cf141b8727442c4909c21e \ + rmd160 c4aa77432b0c621c87e0d65079e3b66051e17d1a depends_lib lib:libX11.6:XFree86 \ port:expat \

1 0

[32361] trunk/dports/math/mathomatic/Portfile
by mww＠macports.org 27 Dec '07

27 Dec '07

Revision: 32361 http://trac.macosforge.org/projects/macports/changeset/32361 Author: mww(a)macports.org Date: 2007-12-27 08:56:31 -0800 (Thu, 27 Dec 2007) Log Message: ----------- version 12.8.3 Modified Paths: -------------- trunk/dports/math/mathomatic/Portfile Modified: trunk/dports/math/mathomatic/Portfile =================================================================== --- trunk/dports/math/mathomatic/Portfile 2007-12-27 15:05:08 UTC (rev 32360) +++ trunk/dports/math/mathomatic/Portfile 2007-12-27 16:56:31 UTC (rev 32361) @@ -3,7 +3,7 @@ PortSystem 1.0 name mathomatic -version 12.8.2 +version 12.8.3 categories math platforms darwin maintainers mww @@ -15,7 +15,7 @@ homepage http://mathomatic.orgserve.de/math/ master_sites http://www.panix.com/~gesslein/ -checksums sha1 0f6e8720e3de1924cdfc488269931523633baacf +checksums sha1 7e9ef5586999b4b852440aea31f40df18e95f0e5 use_bzip2 yes patchfiles patch-makefile

1 0

propchange - r32353 svn:log
by ryandesign＠macports.org 27 Dec '07

27 Dec '07

Author: ryandesign(a)macports.org Revision: 32353 Property Name: svn:log New Property Value: $(find . -type f \! -path "*.svn/*" | xargs grep -nH mp_version) assures me nothing else but macports::selfupdate and macports::version reads the ${prefix}/etc/macports/mp_version installed file, and I've already taken care of those to to read $macports::autoconf::macports_version for our version number instead, so let's not install the base/config/mp_version file anymore. Note that base/config/mp_version cannot disappear from svn, though, as that's what's read by macports::selfupdate to determine if the selfupdate'd sources are newer than what's installed. BRAINSTORM: After this commit, the ${prefix}/etc/macports/mp_version installed file is going to stall and thus might confuse people, so should we delete it upon installing a new release?

1 0

[32360] trunk/dports/python
by ram＠macports.org 27 Dec '07

27 Dec '07

Revision: 32360 http://trac.macosforge.org/projects/macports/changeset/32360 Author: ram(a)macports.org Date: 2007-12-27 07:05:08 -0800 (Thu, 27 Dec 2007) Log Message: ----------- py-numpy/py25-numpy: remove trailing whitespace Modified Paths: -------------- trunk/dports/python/py-numpy/Portfile trunk/dports/python/py25-numpy/Portfile Modified: trunk/dports/python/py-numpy/Portfile =================================================================== --- trunk/dports/python/py-numpy/Portfile 2007-12-27 14:54:14 UTC (rev 32359) +++ trunk/dports/python/py-numpy/Portfile 2007-12-27 15:05:08 UTC (rev 32360) @@ -22,21 +22,21 @@ depends_lib-append port:fftw-3 -variant g95 conflicts gcc42 gcc43 description "Use g95 as fortran compiler" { - depends_lib-append port:g95 +variant g95 conflicts gcc42 gcc43 description "Use g95 as fortran compiler" { + depends_lib-append port:g95 build.cmd-append "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95" -} - -variant gcc42 conflicts g95 gcc43 description "Use gfortran as fortran compiler" { - depends_lib-append port:gcc42 +} + +variant gcc42 conflicts g95 gcc43 description "Use gfortran as fortran compiler" { + depends_lib-append port:gcc42 build.cmd-append "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2" -} - -variant gcc43 conflicts g95 gcc42 description "Use gfortran as fortran compiler" { - depends_lib-append port:gcc43 +} + +variant gcc43 conflicts g95 gcc42 description "Use gfortran as fortran compiler" { + depends_lib-append port:gcc43 build.cmd-append "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3" -} - -if { ![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] } { - default_variants +g95 } + +if { ![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] } { + default_variants +g95 +} Modified: trunk/dports/python/py25-numpy/Portfile =================================================================== --- trunk/dports/python/py25-numpy/Portfile 2007-12-27 14:54:14 UTC (rev 32359) +++ trunk/dports/python/py25-numpy/Portfile 2007-12-27 15:05:08 UTC (rev 32360) @@ -23,21 +23,21 @@ depends_lib-append port:fftw-3 \ port:py25-hashlib -variant g95 conflicts gcc42 gcc43 description "Use g95 as fortran compiler" { - depends_lib-append port:g95 +variant g95 conflicts gcc42 gcc43 description "Use g95 as fortran compiler" { + depends_lib-append port:g95 build.cmd-append "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95" -} +} -variant gcc42 conflicts g95 gcc43 description "Use gfortran as fortran compiler" { - depends_lib-append port:gcc42 +variant gcc42 conflicts g95 gcc43 description "Use gfortran as fortran compiler" { + depends_lib-append port:gcc42 build.cmd-append "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2" -} - -variant gcc43 conflicts g95 gcc42 description "Use gfortran as fortran compiler" { - depends_lib-append port:gcc43 +} + +variant gcc43 conflicts g95 gcc42 description "Use gfortran as fortran compiler" { + depends_lib-append port:gcc43 build.cmd-append "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3" -} - -if { ![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] } { - default_variants +g95 } + +if { ![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] } { + default_variants +g95 +}

1 0

[32359] trunk/dports/textproc/xmlto/Portfile
by boeyms＠macports.org 27 Dec '07

27 Dec '07

Revision: 32359 http://trac.macosforge.org/projects/macports/changeset/32359 Author: boeyms(a)macports.org Date: 2007-12-27 06:54:14 -0800 (Thu, 27 Dec 2007) Log Message: ----------- xmlto: fix installation problems that some people have been having. Modified Paths: -------------- trunk/dports/textproc/xmlto/Portfile Modified: trunk/dports/textproc/xmlto/Portfile =================================================================== --- trunk/dports/textproc/xmlto/Portfile 2007-12-27 13:55:11 UTC (rev 32358) +++ trunk/dports/textproc/xmlto/Portfile 2007-12-27 14:54:14 UTC (rev 32359) @@ -36,9 +36,9 @@ configure.args --with-getopt=${prefix}/bin/getopt \ --mandir=${prefix}/share/man -build.args XML_CATALOG_FILES=${prefix}/etc/xml/catalog +build.env-append XML_CATALOG_FILES=${prefix}/etc/xml/catalog -destroot.args ${build.args} +destroot.env-append ${build.env} post-destroot { set docdir ${prefix}/share/doc/${name}-${version}

1 0

[32358] trunk/dports/mail/imapfilter/Portfile
by mww＠macports.org 27 Dec '07

27 Dec '07

Revision: 32358 http://trac.macosforge.org/projects/macports/changeset/32358 Author: mww(a)macports.org Date: 2007-12-27 05:55:11 -0800 (Thu, 27 Dec 2007) Log Message: ----------- version 2.0.9 Modified Paths: -------------- trunk/dports/mail/imapfilter/Portfile Modified: trunk/dports/mail/imapfilter/Portfile =================================================================== --- trunk/dports/mail/imapfilter/Portfile 2007-12-27 12:30:00 UTC (rev 32357) +++ trunk/dports/mail/imapfilter/Portfile 2007-12-27 13:55:11 UTC (rev 32358) @@ -3,7 +3,7 @@ PortSystem 1.0 name imapfilter -version 2.0.8 +version 2.0.9 categories mail platforms darwin maintainers mww @@ -15,7 +15,7 @@ homepage http://imapfilter.hellug.gr/ master_sites ${homepage}/source/ -checksums sha1 2a78220a4182972b0989171df1c7bfbc8bc22bf0 +checksums sha1 8d05f852d95ace6e52618da07f1720ff325cb2d0 use_bzip2 yes patchfiles patch-configure @@ -31,3 +31,9 @@ livecheck.url ${homepage} livecheck.regex imapfilter-(\[0-9\\.\]+\[0-9\]) +variant universal { + configure.cflags-append "${configure.universal_cflags}" + configure.cppflags-append "${configure.universal_cppflags}" + configure.ldflags-append "${configure.universal_ldflags}" +} +

1 0

[32357] trunk/dports/lang/ragel/Portfile
by mww＠macports.org 27 Dec '07

27 Dec '07

Revision: 32357 http://trac.macosforge.org/projects/macports/changeset/32357 Author: mww(a)macports.org Date: 2007-12-27 04:30:00 -0800 (Thu, 27 Dec 2007) Log Message: ----------- version 5.25 Modified Paths: -------------- trunk/dports/lang/ragel/Portfile Modified: trunk/dports/lang/ragel/Portfile =================================================================== --- trunk/dports/lang/ragel/Portfile 2007-12-27 11:31:39 UTC (rev 32356) +++ trunk/dports/lang/ragel/Portfile 2007-12-27 12:30:00 UTC (rev 32357) @@ -3,7 +3,7 @@ PortSystem 1.0 name ragel -version 5.24 +version 5.25 categories lang platforms darwin maintainers mww @@ -17,7 +17,7 @@ homepage http://www.cs.queensu.ca/~thurston/ragel/ master_sites ${homepage} -checksums sha1 3bc16ef7e0426375b8438f4c5b518b4aa9792c49 +checksums sha1 5431e15665e5987f607b432bcfe7570b3b82752d depends_build port:bison @@ -38,7 +38,3 @@ ${destroot}${prefix}/share/doc/${name} } -platform darwin 8 { - configure.compiler gcc-4.0 -} -

1 0