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

[81611] trunk/dports/perl
by dports＠macports.org 03 Aug '11

03 Aug '11

Revision: 81611 http://trac.macports.org/changeset/81611 Author: dports(a)macports.org Date: 2011-08-02 17:31:08 -0700 (Tue, 02 Aug 2011) Log Message: ----------- p5-data-compare: new port via cpan2port, v1.22 Added Paths: ----------- trunk/dports/perl/p5-data-compare/ trunk/dports/perl/p5-data-compare/Portfile Added: trunk/dports/perl/p5-data-compare/Portfile =================================================================== --- trunk/dports/perl/p5-data-compare/Portfile (rev 0) +++ trunk/dports/perl/p5-data-compare/Portfile 2011-08-03 00:31:08 UTC (rev 81611) @@ -0,0 +1,20 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id$ + +PortSystem 1.0 +PortGroup perl5 1.0 + +perl5.setup Data-Compare 1.22 +platforms darwin +maintainers nomaintainer +supported_archs noarch +license {Artistic GPL} + +description Compare perl data structures + +long_description ${description} + +checksums sha256 ce8f2c7cd8e7aad8bfa381824f43c0d2ae0ed8a21450817bbeb1d971b5c2e8af \ + rmd160 141aa84b7b5712188be2deb66bd53703ebb3e85b + +depends_lib-append port:p5-file-find-rule Property changes on: trunk/dports/perl/p5-data-compare/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native

1 0

[81610] trunk/dports/perl
by dports＠macports.org 03 Aug '11

03 Aug '11

Revision: 81610 http://trac.macports.org/changeset/81610 Author: dports(a)macports.org Date: 2011-08-02 17:28:10 -0700 (Tue, 02 Aug 2011) Log Message: ----------- p5-config-autoconf: new port via cpan2port, v0.16 Added Paths: ----------- trunk/dports/perl/p5-config-autoconf/ trunk/dports/perl/p5-config-autoconf/Portfile Added: trunk/dports/perl/p5-config-autoconf/Portfile =================================================================== --- trunk/dports/perl/p5-config-autoconf/Portfile (rev 0) +++ trunk/dports/perl/p5-config-autoconf/Portfile 2011-08-03 00:28:10 UTC (rev 81610) @@ -0,0 +1,18 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id$ + +PortSystem 1.0 +PortGroup perl5 1.0 + +perl5.setup Config-AutoConf 0.16 +platforms darwin +maintainers nomaintainer +supported_archs noarch +license {Artistic GPL} + +description A module to implement some AutoConf macros in pure perl. + +long_description ${description} + +checksums sha256 b3ce181a1f17bf82d0701e89a557510cece3da4ecdf616271fa2079b4eaa5f0b \ + rmd160 354211bfff673a1761df5dc137a972fdf67c970a Property changes on: trunk/dports/perl/p5-config-autoconf/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native

1 0

[81609] contrib/cpan2port/cpan2port
by dports＠macports.org 03 Aug '11

03 Aug '11

Revision: 81609 http://trac.macports.org/changeset/81609 Author: dports(a)macports.org Date: 2011-08-02 17:21:12 -0700 (Tue, 02 Aug 2011) Log Message: ----------- cpan2port: add build_requires dependencies as depends_build, and set perl5.use_module_build the module has a Build.PL instead of Makefile.PL Modified Paths: -------------- contrib/cpan2port/cpan2port Modified: contrib/cpan2port/cpan2port =================================================================== --- contrib/cpan2port/cpan2port 2011-08-03 00:10:19 UTC (rev 81608) +++ contrib/cpan2port/cpan2port 2011-08-03 00:21:12 UTC (rev 81609) @@ -118,6 +118,8 @@ DEBUG::warn("$$info{name} will show deps"); my $dist = find_dist( $info->{dist_dir}, $info->{module}->get ) or die "can't find dist"; + $$info{has_makefile_pl} = (-e "$dist/Makefile.PL"); + $$info{has_build_pl} = (-e "$dist/Build.PL"); $$info{depends} = ( -e "$dist/META.yml" ? 'Module::Depends' @@ -218,11 +220,13 @@ my $checksums = ''; my $depends = ''; my $build_depends = ''; + my $use_module_build = ''; + if ( exists $$info{depends} ) { if ( my $check = $$info{checksums} ) { my @hashes; foreach my $key (keys %{ $check }) { push @hashes, "$key ".$$check{$key}; } - $checksums = 'checksums '.join(" \\\n".(' 'x12),@hashes); + $checksums = 'checksums '.join(" \\\n".(' 'x20),@hashes); } if ( my $dep_ref = Huggy::depends_on($info) ) { @@ -233,10 +237,28 @@ if (@depends) { $depends = 'depends_lib-append '.join(" \\\n".(' 'x20),@depends); } + } + if ( my $dep_ref = Huggy::depends_on($info, during=>"build_requires") ) { + my @depends = map { + MSG::warn "$$info{name} build_requires $_"; + 'port:'.Huggy::from_port $_ + } keys %{ $dep_ref }; + if (@depends) { + $build_depends = 'depends_build-append '.join(" \\\n".(' 'x21),@depends); + } } } + # If no Makefile.PL is present, maybe we need use_module_build? + if (!($$info{has_makefile_pl})) { + if ($$info{has_build_pl}) { + $use_module_build = "perl5.use_module_build"; + } else { + MSG::warn "Didn't find either Makefile.PL or Build.PL"; + } + } + # Generate text for the portfile. # Note that two versions of perl5.setup are generated. The second is for # use when the distfile isn't in the customary location (unfortunately @@ -273,6 +295,7 @@ $depends $build_depends +$use_module_build STOP return $portfile;

1 0

[81608] users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl
by dports＠macports.org 03 Aug '11

03 Aug '11

Revision: 81608 http://trac.macports.org/changeset/81608 Author: dports(a)macports.org Date: 2011-08-02 17:10:19 -0700 (Tue, 02 Aug 2011) Log Message: ----------- texlive: fix livechecks for new distfile name Modified Paths: -------------- users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl Modified: users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl =================================================================== --- users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl 2011-08-02 23:37:09 UTC (rev 81607) +++ users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl 2011-08-03 00:10:19 UTC (rev 81608) @@ -152,7 +152,7 @@ global name master_sites distname extract.suffix livecheck.type regex livecheck.url ${master_sites} - livecheck.regex ${name}-(\\d+)\\.tar + livecheck.regex ${name}-(\\d+)-run\\.tar depends_lib-append port:texlive-common port:texlive-bin

1 0

[81607] trunk/dports/devel/valgrind/Portfile
by raimue＠macports.org 02 Aug '11

02 Aug '11

Revision: 81607 http://trac.macports.org/changeset/81607 Author: raimue(a)macports.org Date: 2011-08-02 16:37:09 -0700 (Tue, 02 Aug 2011) Log Message: ----------- devel/valgrind: Avoid conflict of faq.html and FAQ.html, fixes #30541 Modified Paths: -------------- trunk/dports/devel/valgrind/Portfile Modified: trunk/dports/devel/valgrind/Portfile =================================================================== --- trunk/dports/devel/valgrind/Portfile 2011-08-02 23:33:33 UTC (rev 81606) +++ trunk/dports/devel/valgrind/Portfile 2011-08-02 23:37:09 UTC (rev 81607) @@ -5,7 +5,7 @@ name valgrind conflicts valgrind-devel version 3.6.1 -revision 2 +revision 3 categories devel platforms darwin supported_archs i386 x86_64 @@ -25,6 +25,9 @@ rmd160 6f78ae50e2fb354547d90bf289abb1f56252043a use_bzip2 yes +# Avoid conflict of faq.html and FAQ.html, #30541 +extract.post_args-append --exclude=${distname}/docs/html/FAQ.html + pre-configure { if {"darwin" == ${os.platform} && (${os.major} < 9 || ${os.major} > 10)} { ui_error "${name} ${version} is only compatible with Mac OS X 10.5 or 10.6."

1 0

[81606] trunk/dports/devel
by raimue＠macports.org 02 Aug '11

02 Aug '11

Revision: 81606 http://trac.macports.org/changeset/81606 Author: raimue(a)macports.org Date: 2011-08-02 16:33:33 -0700 (Tue, 02 Aug 2011) Log Message: ----------- devel/valgrind, devel/valgrind-devel: Reorder options, add license Modified Paths: -------------- trunk/dports/devel/valgrind/Portfile trunk/dports/devel/valgrind-devel/Portfile Modified: trunk/dports/devel/valgrind/Portfile =================================================================== --- trunk/dports/devel/valgrind/Portfile 2011-08-02 23:19:30 UTC (rev 81605) +++ trunk/dports/devel/valgrind/Portfile 2011-08-02 23:33:33 UTC (rev 81606) @@ -8,6 +8,8 @@ revision 2 categories devel platforms darwin +supported_archs i386 x86_64 +license GPL-2 maintainers raimue description A powerful open-source memory debugger @@ -43,8 +45,6 @@ configure.args --mandir=${prefix}/share/man \ --without-mpicc -supported_archs i386 x86_64 - if {$build_arch == "i386"} { configure.args-append --enable-only32bit } elseif {$build_arch == "x86_64"} { Modified: trunk/dports/devel/valgrind-devel/Portfile =================================================================== --- trunk/dports/devel/valgrind-devel/Portfile 2011-08-02 23:19:30 UTC (rev 81605) +++ trunk/dports/devel/valgrind-devel/Portfile 2011-08-02 23:33:33 UTC (rev 81606) @@ -9,6 +9,8 @@ version 3.7.0-r${svn.revision} categories devel platforms darwin +supported_archs i386 x86_64 +license GPL-2 maintainers raimue description A powerful open-source memory debugger. @@ -35,8 +37,6 @@ configure.args --mandir=${prefix}/share/man \ --without-mpicc -supported_archs i386 x86_64 - if {$build_arch == "i386"} { configure.args-append --enable-only32bit } elseif {$build_arch == "x86_64"} {

1 0

[81605] trunk/dports/fuse/ntfs-3g
by dports＠macports.org 02 Aug '11

02 Aug '11

Revision: 81605 http://trac.macports.org/changeset/81605 Author: dports(a)macports.org Date: 2011-08-02 16:19:30 -0700 (Tue, 02 Aug 2011) Log Message: ----------- ntfs-3g: use default PKG_CONFIG_PATH instead of adding /usr/local and other directories to it; fixes build with fuse4x installed via MacPorts + a standalone MacFUSE in /usr/local (see #30537) Modified Paths: -------------- trunk/dports/fuse/ntfs-3g/Portfile Added Paths: ----------- trunk/dports/fuse/ntfs-3g/files/ trunk/dports/fuse/ntfs-3g/files/patch-configure.diff Modified: trunk/dports/fuse/ntfs-3g/Portfile =================================================================== --- trunk/dports/fuse/ntfs-3g/Portfile 2011-08-02 22:34:15 UTC (rev 81604) +++ trunk/dports/fuse/ntfs-3g/Portfile 2011-08-02 23:19:30 UTC (rev 81605) @@ -33,6 +33,10 @@ depends_build port:pkgconfig depends_lib path:lib/pkgconfig/fuse.pc:macfuse +# Use default PKG_CONFIG_PATH to avoid picking up a FUSE installation +# in /usr/local (see #30537) +patchfiles patch-configure.diff + configure.args --exec-prefix=${prefix} --with-fuse=external platform darwin { Added: trunk/dports/fuse/ntfs-3g/files/patch-configure.diff =================================================================== --- trunk/dports/fuse/ntfs-3g/files/patch-configure.diff (rev 0) +++ trunk/dports/fuse/ntfs-3g/files/patch-configure.diff 2011-08-02 23:19:30 UTC (rev 81605) @@ -0,0 +1,12 @@ +--- configure.orig 2011-08-02 19:13:55.000000000 -0400 ++++ configure 2011-08-02 19:14:14.000000000 -0400 +@@ -20530,9 +20530,6 @@ + test "x${PKG_CONFIG}" = "xno" && { { echo "$as_me:$LINENO: error: pkg-config wasn't found! Please install from your vendor, or see http://pkg-config.freedesktop.org/wiki/" >&5 + echo "$as_me: error: pkg-config wasn't found! Please install from your vendor, or see http://pkg-config.freedesktop.org/wiki/" >&2;} + { (exit 1); exit 1; }; } +- # Libraries often install their metadata .pc files in directories +- # not searched by pkg-config. Let's workaround this. +- export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/lib/pkgconfig:/usr/lib/pkgconfig:/opt/gnome/lib/pkgconfig:/usr/share/pkgconfig:/usr/local/lib/pkgconfig:$prefix/lib/pkgconfig:/opt/gnome/share/pkgconfig:/usr/local/share/pkgconfig + + pkg_failed=no + { echo "$as_me:$LINENO: checking for FUSE_MODULE" >&5

1 0

[81604] trunk/dports/fuse/sshfs
by dports＠macports.org 02 Aug '11

02 Aug '11

Revision: 81604 http://trac.macports.org/changeset/81604 Author: dports(a)macports.org Date: 2011-08-02 15:34:15 -0700 (Tue, 02 Aug 2011) Log Message: ----------- sshfs: don't add /usr/local/lib to PKG_CONFIG_PATH; fixes build with fuse4x installed via MacPorts + a standalone MacFUSE in /usr/local (#30537) Modified Paths: -------------- trunk/dports/fuse/sshfs/Portfile Added Paths: ----------- trunk/dports/fuse/sshfs/files/patch-configure.ac.diff Modified: trunk/dports/fuse/sshfs/Portfile =================================================================== --- trunk/dports/fuse/sshfs/Portfile 2011-08-02 22:28:46 UTC (rev 81603) +++ trunk/dports/fuse/sshfs/Portfile 2011-08-02 22:34:15 UTC (rev 81604) @@ -39,7 +39,8 @@ platform darwin { patch_sites http://macfuse.googlecode.com/svn/tags/macfuse-2.0/filesystems/sshfs patchfiles sshfs-fuse-${version}-macosx.patch \ - patch-fuse4x-compat.diff + patch-fuse4x-compat.diff \ + patch-configure.ac.diff checksums-append sshfs-fuse-${version}-macosx.patch md5 08330f4c10e25052b3a5c26d180e4752 \ sha1 24e6721c25fb883c945550ac62e20f4c35f4393e Added: trunk/dports/fuse/sshfs/files/patch-configure.ac.diff =================================================================== --- trunk/dports/fuse/sshfs/files/patch-configure.ac.diff (rev 0) +++ trunk/dports/fuse/sshfs/files/patch-configure.ac.diff 2011-08-02 22:34:15 UTC (rev 81604) @@ -0,0 +1,10 @@ +--- a/configure.ac.orig 2011-08-02 18:26:14.000000000 -0400 ++++ a/configure.ac 2011-08-02 18:26:20.000000000 -0400 +@@ -36,7 +36,6 @@ + + AM_CONDITIONAL(SSH_NODELAY_SO, test "$enable_sshnodelay" = "yes") + +-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH + PKG_CHECK_MODULES(SSHFS, [fuse >= 2.2 glib-2.0 gthread-2.0]) + have_fuse_opt_parse=no + oldlibs="$LIBS"

1 0

[81603] trunk/dports/devel/ccache/Portfile
by raimue＠macports.org 02 Aug '11

02 Aug '11

Revision: 81603 http://trac.macports.org/changeset/81603 Author: raimue(a)macports.org Date: 2011-08-02 15:28:46 -0700 (Tue, 02 Aug 2011) Log Message: ----------- devel/ccache: Update to version 3.1.5 Modified Paths: -------------- trunk/dports/devel/ccache/Portfile Modified: trunk/dports/devel/ccache/Portfile =================================================================== --- trunk/dports/devel/ccache/Portfile 2011-08-02 22:19:46 UTC (rev 81602) +++ trunk/dports/devel/ccache/Portfile 2011-08-02 22:28:46 UTC (rev 81603) @@ -4,7 +4,7 @@ PortSystem 1.0 name ccache -version 3.1.4 +version 3.1.5 categories devel platforms darwin freebsd @@ -21,9 +21,8 @@ homepage http://ccache.samba.org/ master_sites http://samba.org/ftp/ccache/ -checksums md5 d43a8fbe83767978098ba7f8ee25d3d1 \ - sha1 caf5b3368419c36b3090b00ad2e03cd3f52f0df7 \ - rmd160 b2988fb7316419de9326513cc7c64100132bb6bc +checksums sha1 fd20d68ebb0725e9bd70a9330b42491d040b94cb \ + rmd160 cda826e53c75c1cd2068d3cdd19dfa67511fee99 configure.args --mandir=${prefix}/share/man

1 0

[81602] trunk/base/src/port/port.tcl
by raimue＠macports.org 02 Aug '11

02 Aug '11

Revision: 81602 http://trac.macports.org/changeset/81602 Author: raimue(a)macports.org Date: 2011-08-02 15:19:46 -0700 (Tue, 02 Aug 2011) Log Message: ----------- port/port.tcl: Output errors on stderr Add consistency to messages about ambiguity Modified Paths: -------------- trunk/base/src/port/port.tcl Modified: trunk/base/src/port/port.tcl =================================================================== --- trunk/base/src/port/port.tcl 2011-08-02 21:23:07 UTC (rev 81601) +++ trunk/base/src/port/port.tcl 2011-08-02 22:19:46 UTC (rev 81602) @@ -4156,7 +4156,7 @@ foreach e $kopts { lappend errlst "--[lindex $e 0]" } - return -code error "${action} --${key} is ambiguous: \n [join $errlst "\n "]" + return -code error "\"port ${action} --${key}\" is ambiguous: \n port ${action} [join $errlst "\n port ${action} "]" } set key [lindex [lindex $kopts 0] 0] set kargc [lindex [lindex $kopts 0] 1] @@ -4313,9 +4313,9 @@ set action_proc [get_action_proc $action] } else { if {[llength $actions] > 1} { - puts "Ambiguous action \"$action\": could be any of {$actions}." + ui_error "\"port ${action}\" is ambiguous: \n port [join $actions "\n port "]" } else { - puts "Unrecognized action \"$action\"" + ui_error "Unrecognized action \"port $action\"" } set action_status 1 break

1 0