June 2011 - macports-changes - lists.macosforge.org

[79857] branches/release_2_0/base
by afb＠macports.org 28 Jun '11

28 Jun '11

Revision: 79857 http://trac.macports.org/changeset/79857 Author: afb(a)macports.org Date: 2011-06-28 03:11:18 -0700 (Tue, 28 Jun 2011) Log Message: ----------- merge r79772 from trunk: fix tails with trailing slash, on other platforms Revision Links: -------------- http://trac.macports.org/changeset/79772 Modified Paths: -------------- branches/release_2_0/base/src/pextlib1.0/fs-traverse.c Property Changed: ---------------- branches/release_2_0/base/ Property changes on: branches/release_2_0/base ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771,79774,79782,79787 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79772,79774,79782,79787 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Modified: branches/release_2_0/base/src/pextlib1.0/fs-traverse.c =================================================================== --- branches/release_2_0/base/src/pextlib1.0/fs-traverse.c 2011-06-28 10:08:28 UTC (rev 79856) +++ branches/release_2_0/base/src/pextlib1.0/fs-traverse.c 2011-06-28 10:11:18 UTC (rev 79857) @@ -146,6 +146,8 @@ xpath = "."; } else if (*(xpath + tlen) == '/') { xpath += tlen + 1; + } else if (*(target + tlen - 1) == '/') { + xpath += tlen; } }

1 0

[79856] branches/release_2_0/base
by afb＠macports.org 28 Jun '11

28 Jun '11

Revision: 79856 http://trac.macports.org/changeset/79856 Author: afb(a)macports.org Date: 2011-06-28 03:08:28 -0700 (Tue, 28 Jun 2011) Log Message: ----------- merge r79771,79774,79782 from trunk: make sure that test can find library (on freebsd) Revision Links: -------------- http://trac.macports.org/changeset/79771 Modified Paths: -------------- branches/release_2_0/base/src/pextlib1.0/Makefile branches/release_2_0/base/src/registry2.0/Makefile Property Changed: ---------------- branches/release_2_0/base/ Property changes on: branches/release_2_0/base ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771,79774,79782,79787 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Modified: branches/release_2_0/base/src/pextlib1.0/Makefile =================================================================== --- branches/release_2_0/base/src/pextlib1.0/Makefile 2011-06-28 07:15:15 UTC (rev 79855) +++ branches/release_2_0/base/src/pextlib1.0/Makefile 2011-06-28 10:08:28 UTC (rev 79856) @@ -16,9 +16,9 @@ .PHONY: test test:: ${SHLIB_NAME} - ${TCLSH} tests/checksums.tcl ${SHLIB_NAME} - ${TCLSH} tests/curl.tcl ${SHLIB_NAME} - ${TCLSH} tests/filemap.tcl ${SHLIB_NAME} - ${TCLSH} tests/fs-traverse.tcl ${SHLIB_NAME} - ${TCLSH} tests/symlink.tcl ${SHLIB_NAME} - ${TCLSH} tests/unsetenv.tcl ${SHLIB_NAME} + ${TCLSH} tests/checksums.tcl ./${SHLIB_NAME} + ${TCLSH} tests/curl.tcl ./${SHLIB_NAME} + ${TCLSH} tests/filemap.tcl ./${SHLIB_NAME} + ${TCLSH} tests/fs-traverse.tcl ./${SHLIB_NAME} + ${TCLSH} tests/symlink.tcl ./${SHLIB_NAME} + ${TCLSH} tests/unsetenv.tcl ./${SHLIB_NAME} Modified: branches/release_2_0/base/src/registry2.0/Makefile =================================================================== --- branches/release_2_0/base/src/registry2.0/Makefile 2011-06-28 07:15:15 UTC (rev 79855) +++ branches/release_2_0/base/src/registry2.0/Makefile 2011-06-28 10:08:28 UTC (rev 79856) @@ -20,8 +20,8 @@ .PHONY: test test:: ${SHLIB_NAME} - ${TCLSH} tests/entry.tcl ${SHLIB_NAME} - ${TCLSH} tests/depends.tcl ${SHLIB_NAME} + ${TCLSH} tests/entry.tcl ./${SHLIB_NAME} + ${TCLSH} tests/depends.tcl ./${SHLIB_NAME} distclean:: clean rm -f registry_autoconf.tcl

1 0

[79855] trunk/dports/science/gplcver/Portfile
by and.damore＠macports.org 28 Jun '11

28 Jun '11

Revision: 79855 http://trac.macports.org/changeset/79855 Author: and.damore(a)macports.org Date: 2011-06-28 00:15:15 -0700 (Tue, 28 Jun 2011) Log Message: ----------- revision bump for gplcver due to different files installed Modified Paths: -------------- trunk/dports/science/gplcver/Portfile Modified: trunk/dports/science/gplcver/Portfile =================================================================== --- trunk/dports/science/gplcver/Portfile 2011-06-28 05:57:11 UTC (rev 79854) +++ trunk/dports/science/gplcver/Portfile 2011-06-28 07:15:15 UTC (rev 79855) @@ -5,6 +5,7 @@ name gplcver version 2.12a +revision 1 categories science maintainers nomaintainer description GPL Cver is an open-source, interpreted Verilog simulator by Pragmatic C Software

1 0

[79854] trunk/dports/databases/postgis/Portfile
by stromnov＠macports.org 28 Jun '11

28 Jun '11

Revision: 79854 http://trac.macports.org/changeset/79854 Author: stromnov(a)macports.org Date: 2011-06-27 22:57:11 -0700 (Mon, 27 Jun 2011) Log Message: ----------- postgis: update to version 1.5.3 Modified Paths: -------------- trunk/dports/databases/postgis/Portfile Modified: trunk/dports/databases/postgis/Portfile =================================================================== --- trunk/dports/databases/postgis/Portfile 2011-06-28 05:39:20 UTC (rev 79853) +++ trunk/dports/databases/postgis/Portfile 2011-06-28 05:57:11 UTC (rev 79854) @@ -5,8 +5,8 @@ PortGroup archcheck 1.0 name postgis -version 1.5.2 -revision 1 +version 1.5.3 +revision 0 categories databases platforms darwin maintainers stromnov openmaintainer @@ -25,9 +25,9 @@ homepage http://postgis.refractions.net/ master_sites ${homepage}download/ -checksums md5 772ec1d0f04d6800cd7e2420a97a7483 \ - sha1 b1368c08f2a0d22bf7adc57ab419f1e30cacbf56 \ - rmd160 5ba251f6b4138d5a1a85ef26a2d08b6d4f280e0e +checksums md5 05a61df5e1b78bf51c9ce98bea5526fc \ + sha1 e8c572e0258ba760a67b7f717bdc8321b9f6cd58 \ + rmd160 e30275890b175cbe1d70d5899cbe45ec34ddbafb depends_build \ port:docbook-xsl \

1 0

[79853] trunk/dports/net/wireshark-devel/Portfile
by ryandesign＠macports.org 28 Jun '11

28 Jun '11

Revision: 79853 http://trac.macports.org/changeset/79853 Author: ryandesign(a)macports.org Date: 2011-06-27 22:39:20 -0700 (Mon, 27 Jun 2011) Log Message: ----------- wireshark-devel: maintainer update to 1.6.0; see #29858 Modified Paths: -------------- trunk/dports/net/wireshark-devel/Portfile Modified: trunk/dports/net/wireshark-devel/Portfile =================================================================== --- trunk/dports/net/wireshark-devel/Portfile 2011-06-28 05:21:20 UTC (rev 79852) +++ trunk/dports/net/wireshark-devel/Portfile 2011-06-28 05:39:20 UTC (rev 79853) @@ -4,8 +4,8 @@ PortSystem 1.0 name wireshark-devel -epoch 1 -version 1.6.0rc2 +epoch 2 +version 1.6.0 categories net maintainers gmail.com:hsivank description Graphical network analyzer and capture tool @@ -24,8 +24,8 @@ use_bzip2 yes -checksums sha1 014a87dd8c840612acb0de33a8400586157dbb0f \ - rmd160 e67dddd9946585e510ea04ccddea74fe0c59d5a8 +checksums sha1 c54ab0d77f6bbe6a2b7329de69ed10614d57aa35 \ + rmd160 d30ba785f8e8ac6d74b4f3f55f9e797a8bc0dec3 conflicts wireshark @@ -49,8 +49,7 @@ --infodir=\\\${prefix}/share/info \ --without-portaudio \ --disable-warnings-as-errors \ - --without-gnutls \ - --enable-new-packet-list + --without-gnutls configure.ldflags-append "-Wl,-search_paths_first"

1 0

[79852] contrib/mpab/mpsync.sh
by jmr＠macports.org 28 Jun '11

28 Jun '11

Revision: 79852 http://trac.macports.org/changeset/79852 Author: jmr(a)macports.org Date: 2011-06-27 22:21:20 -0700 (Mon, 27 Jun 2011) Log Message: ----------- mpab: update mpsync.sh to allow chrootless operation Modified Paths: -------------- contrib/mpab/mpsync.sh Modified: contrib/mpab/mpsync.sh =================================================================== --- contrib/mpab/mpsync.sh 2011-06-28 05:06:22 UTC (rev 79851) +++ contrib/mpab/mpsync.sh 2011-06-28 05:21:20 UTC (rev 79852) @@ -10,25 +10,40 @@ if [[ -n "$MPAB_DATA" ]]; then dataDir=$MPAB_DATA fi +if [[ -z "$PREFIX" ]]; then + PREFIX=/opt/local +fi if [[ -z "$SRC_PREFIX" ]]; then SRC_PREFIX=/opt/mports fi chrootPath="${dataDir}/${CHROOTSUBDIR}" +OSMajor=`uname -r | sed 's/\..*//'` +# xcodebuild breaks in chroots on 10.6 +if [[ $1 = "-n" || $OSMajor -ge 10 ]]; then + chrootPath="" + if [[ $1 = "-n" ]]; then + shift + fi +fi # $1 - script to execute function chroot_exec () { - cp -p ${baseDir}/chroot-scripts/$1 ${chrootPath}/var/tmp/ - # Set DYLD_NO_FIX_PREBINDING as otherwise, on 10.5, dyld will spew - # errors to syslog/console log like: - # com.apple.launchd[1] (com.apple.dyld): Throttling respawn: Will start in 10 seconds - env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin HOME=/var/root DYLD_NO_FIX_PREBINDING=1 /usr/sbin/chroot ${chrootPath} /bin/sh /var/tmp/$1 + cp -p ${baseDir}/chroot-scripts/$1 ${chrootPath}/var/tmp + if [[ -n "$chrootPath" ]]; then + # Set DYLD_NO_FIX_PREBINDING as otherwise, on 10.5, dyld will spew + # errors to syslog/console log like: + # com.apple.launchd[1] (com.apple.dyld): Throttling respawn: Will start in 10 seconds + env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin HOME=/var/root DYLD_NO_FIX_PREBINDING=1 PREFIX=${PREFIX} SRC_PREFIX=${SRC_PREFIX} /usr/sbin/chroot ${chrootPath} /bin/sh /var/tmp/$1 + else + env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin HOME=/var/root PREFIX=${PREFIX} SRC_PREFIX=${SRC_PREFIX} /bin/sh /var/tmp/$1 + fi rm ${chrootPath}/var/tmp/$1 } if [[ -d ${dataDir}/${exportDir} ]] ; then svn update --non-interactive \ - -r HEAD ${dataDir}/${exportDir} \ + -r HEAD ${dataDir}/${exportDir}/* \ > /dev/null || exit 1 else echo "Checking out macports from svn..." @@ -37,7 +52,7 @@ ${dataDir}/${exportDir} > /dev/null || exit 1 fi -if [[ ! -d ${chrootPath} ]] ; then +if [[ -n "$chrootPath" && ! -d "$chrootPath" ]] ; then sudo ${baseDir}/mpab mount || exit 1 umount=yes fi @@ -46,7 +61,7 @@ ${dataDir}/${exportDir}/dports \ ${chrootPath}${SRC_PREFIX} || exit 1 -echo "Re-creating portindex in chroot" +echo "Re-creating portindex" chroot_exec recreateportindex if [[ "${umount}" = yes ]] ; then

1 0

[79851] trunk/dports/science
by ryandesign＠macports.org 28 Jun '11

28 Jun '11

Revision: 79851 http://trac.macports.org/changeset/79851 Author: ryandesign(a)macports.org Date: 2011-06-27 22:06:22 -0700 (Mon, 27 Jun 2011) Log Message: ----------- playerstage ports: don't overwrite autoconf build dependencies; see #29768 Modified Paths: -------------- trunk/dports/science/playerstage-player/Portfile trunk/dports/science/playerstage-stage/Portfile Modified: trunk/dports/science/playerstage-player/Portfile =================================================================== --- trunk/dports/science/playerstage-player/Portfile 2011-06-28 03:58:49 UTC (rev 79850) +++ trunk/dports/science/playerstage-player/Portfile 2011-06-28 05:06:22 UTC (rev 79851) @@ -25,7 +25,7 @@ sha1 34931ca57148db01202afd08fdc647cc5fdc884c \ rmd160 f77444bfeee5a0494165ed6a65dd69b3a01bb260 -depends_build port:libtool port:pkgconfig +depends_build-append port:libtool port:pkgconfig depends_lib port:gtk2 \ port:libpng \ Modified: trunk/dports/science/playerstage-stage/Portfile =================================================================== --- trunk/dports/science/playerstage-stage/Portfile 2011-06-28 03:58:49 UTC (rev 79850) +++ trunk/dports/science/playerstage-stage/Portfile 2011-06-28 05:06:22 UTC (rev 79851) @@ -27,7 +27,7 @@ sha1 783e16c179c76a65b64ad352c500f8ef6f3f1f2c \ rmd160 c0143cbcb5365110f7990fee27c3537cdad3a433 -depends_build port:pkgconfig \ +depends_build-append port:pkgconfig \ port:fltk depends_lib port:playerstage-player \

1 0

[79850] trunk/dports/graphics/freeimage/Portfile
by ryandesign＠macports.org 28 Jun '11

28 Jun '11

Revision: 79850 http://trac.macports.org/changeset/79850 Author: ryandesign(a)macports.org Date: 2011-06-27 20:58:49 -0700 (Mon, 27 Jun 2011) Log Message: ----------- freeimage: actually use the right archs; see #29950 Modified Paths: -------------- trunk/dports/graphics/freeimage/Portfile Modified: trunk/dports/graphics/freeimage/Portfile =================================================================== --- trunk/dports/graphics/freeimage/Portfile 2011-06-28 03:38:48 UTC (rev 79849) +++ trunk/dports/graphics/freeimage/Portfile 2011-06-28 03:58:49 UTC (rev 79850) @@ -5,6 +5,7 @@ name freeimage version 3.15.0 +revision 1 license FreeImage-1.0 GPL-2 categories graphics platforms macosx @@ -27,6 +28,8 @@ sha1 ec2faa01d1b312aab68d77afe62861759c790100 \ rmd160 5d309d0d8335129d00d6b5455613c89a419ebcac +set VERLIBNAME libfreeimage.[lindex [split ${version} .] 0].dylib + post-patch { # Libraries extension is ".dylib" on Darwin, not ".so" reinplace {s/\.so/.dylib/} ${worksrcpath}/Makefile.gnu @@ -47,27 +50,20 @@ reinplace "s|ldconfig||g" ${worksrcpath}/Makefile.gnu } -if { [variant_isset universal] } { - post-patch { - reinplace "s|CFLAGS ?= |CFLAGS ?= ${configure.universal_cflags} |g" ${worksrcpath}/Makefile.gnu - reinplace "s|CXXFLAGS ?= |CXXFLAGS ?= ${configure.universal_cxxflags} |g" ${worksrcpath}/Makefile.gnu - } +use_configure no + +variant universal {} +if {[variant_isset universal]} { + set archflags ${configure.universal_cflags} } else { - post-patch { - reinplace "s|CFLAGS ?= |CFLAGS ?= -arch ${build_arch} |g" ${worksrcpath}/Makefile.gnu - reinplace "s|CXXFLAGS ?= |CXXFLAGS ?= -arch ${build_arch} |g" ${worksrcpath}/Makefile.gnu - } + set archflags ${configure.cc_archflags} } -use_configure no - -set VERLIBNAME libfreeimage.[lindex [split ${version} .] 0].dylib - build.args -f Makefile.gnu \ PREFIX=${prefix} \ VERLIBNAME=${VERLIBNAME} \ - CC="${configure.cc}" \ - CXX="${configure.cxx}" \ + CC="${configure.cc} ${configure.cflags} ${archflags}" \ + CXX="${configure.cxx} ${configure.cxxflags} ${archflags}" \ LDFLAGS="${configure.ldflags}" destroot.args -f Makefile.gnu \ @@ -91,7 +87,7 @@ pre-test { # Use correct compiler and flags when compiling test - reinplace s:g++:${configure.cxx}: ${test.dir}/Makefile + reinplace "s:g++:${configure.cxx} ${configure.cxxflags} ${archflags}:" ${test.dir}/Makefile # Build the test system "make -C ${test.dir}"

1 0

[79849] trunk/dports/python/py27-rpy2/Portfile
by jowens＠macports.org 28 Jun '11

28 Jun '11

Revision: 79849 http://trac.macports.org/changeset/79849 Author: jowens(a)macports.org Date: 2011-06-27 20:38:48 -0700 (Mon, 27 Jun 2011) Log Message: ----------- version bump, 2.2.1 Modified Paths: -------------- trunk/dports/python/py27-rpy2/Portfile Modified: trunk/dports/python/py27-rpy2/Portfile =================================================================== --- trunk/dports/python/py27-rpy2/Portfile 2011-06-28 00:23:31 UTC (rev 79848) +++ trunk/dports/python/py27-rpy2/Portfile 2011-06-28 03:38:48 UTC (rev 79849) @@ -5,7 +5,7 @@ PortGroup python27 1.0 name py27-rpy2 -version 2.1.9 +version 2.2.1 categories-append science platforms darwin maintainers nomaintainer @@ -19,8 +19,8 @@ master_sites sourceforge:rpy \ http://pypi.python.org/packages/source/r/rpy2/ distname rpy2-${version} -checksums sha1 d068d985c573e93f9af5d0953be53c470f313cbc \ - rmd160 fb8160c7364084716d0c909820c7d0ae99188ff0 +checksums sha1 ff22f43c25fa299343bc6c6c8cbb3cb43212dfa0 \ + rmd160 f83207190e40cb9c1f56f3727ef8b26319a55598 # To continue using your custom R installation instead of MacPorts' R, # you have to remove this dependency line and make sure that your R

1 0

propchange - r79841 svn:log
by ryandesign＠macports.org 28 Jun '11

28 Jun '11

Author: ryandesign(a)macports.org (original author: jeremyhu(a)macports.org) Revision: 79841 Property Name: svn:log @@ -1 +1 @@ -zlib: Build fix for clang +zlib: Build fix for clang; see #28656

1 0