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

[80101] trunk/dports/multimedia/mplayer-devel/Portfile
by jeremyhu＠macports.org 04 Jul '11

04 Jul '11

Revision: 80101 http://trac.macports.org/changeset/80101 Author: jeremyhu(a)macports.org Date: 2011-07-04 02:32:34 -0700 (Mon, 04 Jul 2011) Log Message: ----------- mplayer-devel: Use default description for x11 variant Modified Paths: -------------- trunk/dports/multimedia/mplayer-devel/Portfile Modified: trunk/dports/multimedia/mplayer-devel/Portfile =================================================================== --- trunk/dports/multimedia/mplayer-devel/Portfile 2011-07-04 09:29:25 UTC (rev 80100) +++ trunk/dports/multimedia/mplayer-devel/Portfile 2011-07-04 09:32:34 UTC (rev 80101) @@ -231,7 +231,7 @@ configure.args-delete --disable-caca } -variant x11 description {Enable x11 support} { +variant x11 { depends_lib-append \ port:xorg-libXinerama \ port:xorg-libXv \

1 0

[80100] trunk/dports/multimedia/mplayer-devel/Portfile
by jeremyhu＠macports.org 04 Jul '11

04 Jul '11

Revision: 80100 http://trac.macports.org/changeset/80100 Author: jeremyhu(a)macports.org Date: 2011-07-04 02:29:25 -0700 (Mon, 04 Jul 2011) Log Message: ----------- mplayer-devel: Remove reminder note about clang since the bug is now addressed Modified Paths: -------------- trunk/dports/multimedia/mplayer-devel/Portfile Modified: trunk/dports/multimedia/mplayer-devel/Portfile =================================================================== --- trunk/dports/multimedia/mplayer-devel/Portfile 2011-07-04 09:26:44 UTC (rev 80099) +++ trunk/dports/multimedia/mplayer-devel/Portfile 2011-07-04 09:29:25 UTC (rev 80100) @@ -271,11 +271,6 @@ } platform darwin 11 { - # BUILD FIX TODO: - # clang fails to build due to some bad inline asm - # https://ffmpeg.org/trac/ffmpeg/ticket/303 - # configure.compiler clang - # llvm-gcc-4.2 fails to build vf_fspp.c properly with -O2 and above patchfiles-append llvm-gcc-workaround.patch

1 0

[80099] trunk/dports/devel/libsdl/Portfile
by jeremyhu＠macports.org 04 Jul '11

04 Jul '11

Revision: 80099 http://trac.macports.org/changeset/80099 Author: jeremyhu(a)macports.org Date: 2011-07-04 02:26:44 -0700 (Mon, 04 Jul 2011) Log Message: ----------- libsdl: Fallback on gcc-4.2 based on selected compiler rather than platform Modified Paths: -------------- trunk/dports/devel/libsdl/Portfile Modified: trunk/dports/devel/libsdl/Portfile =================================================================== --- trunk/dports/devel/libsdl/Portfile 2011-07-04 09:25:03 UTC (rev 80098) +++ trunk/dports/devel/libsdl/Portfile 2011-07-04 09:26:44 UTC (rev 80099) @@ -41,7 +41,7 @@ --disable-nasm \ --without-x -variant x11 conflicts no_x11 description {Enable support for X11} { +variant x11 conflicts no_x11 { configure.args-delete --without-x configure.args-append --x-include=${prefix}/include \ --x-lib=${prefix}/lib @@ -57,7 +57,7 @@ } } } -variant no_x11 conflicts x11 description {Legacy compatibility variant} {} +variant no_x11 conflicts x11 {} if {[variant_isset no_x11]} { default_variants -x11 } else { @@ -88,11 +88,12 @@ } } -platform darwin 11 { - # BUILD FIX TODO: - # llvm-gcc-4.2 and clang fail to build as of 2011.06.15 - # This looks like an error in the package. - configure.compiler gcc-4.2 +# BUILD FIX TODO: +# llvm-gcc-4.2 and clang fail to build as of 2011.06.15 +# This looks like an error in the package. +if {${configure.compiler} == "llvm-gcc-4.2" || + ${configure.compiler} == "clang"} { + configure.compiler gcc-4.2 } livecheck.type regex

1 0

[80098] trunk/dports/devel/liboil/Portfile
by jeremyhu＠macports.org 04 Jul '11

04 Jul '11

Revision: 80098 http://trac.macports.org/changeset/80098 Author: jeremyhu(a)macports.org Date: 2011-07-04 02:25:03 -0700 (Mon, 04 Jul 2011) Log Message: ----------- liboil: Fallback on gcc-4.2 based on selected compiler rather than platform Modified Paths: -------------- trunk/dports/devel/liboil/Portfile Modified: trunk/dports/devel/liboil/Portfile =================================================================== --- trunk/dports/devel/liboil/Portfile 2011-07-04 09:22:38 UTC (rev 80097) +++ trunk/dports/devel/liboil/Portfile 2011-07-04 09:25:03 UTC (rev 80098) @@ -57,10 +57,12 @@ post-patch { reinplace "s|__HOST_CPU__|${build_arch}|" ${worksrcpath}/configure } +} - # BUILD FIX TODO: - # llvm-gcc-4.2 and clang fail to build as of 2011.06.16 - # This is an error in the package. +# BUILD FIX TODO: +# llvm-gcc-4.2 and clang fail to build as of 2011.06.16 +# This is an error in the package. +if {${configure.compiler} == "llvm-gcc-4.2" || + ${configure.compiler} == "clang"} { configure.compiler gcc-4.2 } -

1 0

[80097] trunk/dports/graphics/libcaca/Portfile
by jeremyhu＠macports.org 04 Jul '11

04 Jul '11

Revision: 80097 http://trac.macports.org/changeset/80097 Author: jeremyhu(a)macports.org Date: 2011-07-04 02:22:38 -0700 (Mon, 04 Jul 2011) Log Message: ----------- libcaca: Fallback on gcc-4.2 based on selected compiler rather than platform Modified Paths: -------------- trunk/dports/graphics/libcaca/Portfile Modified: trunk/dports/graphics/libcaca/Portfile =================================================================== --- trunk/dports/graphics/libcaca/Portfile 2011-07-04 09:18:20 UTC (rev 80096) +++ trunk/dports/graphics/libcaca/Portfile 2011-07-04 09:22:38 UTC (rev 80097) @@ -30,7 +30,7 @@ --disable-x11 --enable-ncurses --enable-imlib2 \ --disable-ruby -variant x11 description {Add X11 driver support} { +variant x11 { depends_lib-append port:xorg-libX11 configure.args-delete --disable-x11 configure.args-append --enable-x11 \ @@ -38,11 +38,12 @@ --x-libraries=${prefix}/lib } -platform darwin 11 { - # BUILD FIX TODO: - # llvm-gcc-4.2 and clang fail to build as of 2011.06.16 - # This looks like an error in the package. - configure.compiler gcc-4.2 +# BUILD FIX TODO: +# llvm-gcc-4.2 and clang fail to build as of 2011.06.16 +# This looks like an error in the package. +if {${configure.compiler} == "llvm-gcc-4.2" || + ${configure.compiler} == "clang"} { + configure.compiler gcc-4.2 } livecheck.type regex

1 0

[80096] trunk/dports/x11
by jeremyhu＠macports.org 04 Jul '11

04 Jul '11

Revision: 80096 http://trac.macports.org/changeset/80096 Author: jeremyhu(a)macports.org Date: 2011-07-04 02:18:20 -0700 (Mon, 04 Jul 2011) Log Message: ----------- wine*: Fallback on gcc-4.2 based on chosen compiler rather than platform Modified Paths: -------------- trunk/dports/x11/wine/Portfile trunk/dports/x11/wine-crossover/Portfile trunk/dports/x11/wine-crossover-games/Portfile trunk/dports/x11/wine-devel/Portfile Modified: trunk/dports/x11/wine/Portfile =================================================================== --- trunk/dports/x11/wine/Portfile 2011-07-04 09:15:52 UTC (rev 80095) +++ trunk/dports/x11/wine/Portfile 2011-07-04 09:18:20 UTC (rev 80096) @@ -145,6 +145,13 @@ # This is not 64-bit friendly yet supported_archs i386 +# llvm-gcc does not respect force_align_arg_pointer +# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly) +if {${configure.compiler} == "llvm-gcc-4.2" || + ${configure.compiler} == "clang"} { + configure.compiler gcc-4.2 +} + platform darwin 9 { # Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support." # Only affects Xcode 3.0.x and 3.1.x, not 3.2.x. @@ -166,16 +173,6 @@ # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE - # llvm-gcc does not respect force_align_arg_pointer - # clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly) - configure.compiler gcc-4.2 - - # I have a suspicion that this may be necessary, but leaving out for now: - #post-patch { - # # Lion disallows heap execution. - # reinplace "s:LDEXECFLAGS = :LDEXECFLAGS = -Wl,-allow_heap_execute :" ${worksrcpath}/loader/Makefile.in - #} - # Needed or wine will SIGBUS configure.ldflags-append -Wl,-no_pie } Modified: trunk/dports/x11/wine-crossover/Portfile =================================================================== --- trunk/dports/x11/wine-crossover/Portfile 2011-07-04 09:15:52 UTC (rev 80095) +++ trunk/dports/x11/wine-crossover/Portfile 2011-07-04 09:18:20 UTC (rev 80096) @@ -147,6 +147,13 @@ # This is not 64-bit friendly yet supported_archs i386 +# llvm-gcc does not respect force_align_arg_pointer +# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly) +if {${configure.compiler} == "llvm-gcc-4.2" || + ${configure.compiler} == "clang"} { + configure.compiler gcc-4.2 +} + platform darwin 9 { # Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support." # Only affects Xcode 3.0.x and 3.1.x, not 3.2.x. @@ -163,16 +170,6 @@ # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE - # llvm-gcc does not respect force_align_arg_pointer - # clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly) - configure.compiler gcc-4.2 - - # I have a suspicion that this may be necessary, but leaving out for now: - #post-patch { - # # Lion disallows heap execution. - # reinplace "s:LDEXECFLAGS = :LDEXECFLAGS = -Wl,-allow_heap_execute :" ${worksrcpath}/loader/Makefile.in - #} - # Needed or wine will SIGBUS configure.ldflags-append -Wl,-no_pie } Modified: trunk/dports/x11/wine-crossover-games/Portfile =================================================================== --- trunk/dports/x11/wine-crossover-games/Portfile 2011-07-04 09:15:52 UTC (rev 80095) +++ trunk/dports/x11/wine-crossover-games/Portfile 2011-07-04 09:18:20 UTC (rev 80096) @@ -150,6 +150,13 @@ # This is not 64-bit friendly yet supported_archs i386 +# llvm-gcc does not respect force_align_arg_pointer +# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly) +if {${configure.compiler} == "llvm-gcc-4.2" || + ${configure.compiler} == "clang"} { + configure.compiler gcc-4.2 +} + platform darwin 9 { # Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support." # Only affects Xcode 3.0.x and 3.1.x, not 3.2.x. @@ -166,16 +173,6 @@ # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE - # llvm-gcc does not respect force_align_arg_pointer - # clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly) - configure.compiler gcc-4.2 - - # I have a suspicion that this may be necessary, but leaving out for now: - #post-patch { - # # Lion disallows heap execution. - # reinplace "s:LDEXECFLAGS = :LDEXECFLAGS = -Wl,-allow_heap_execute :" ${worksrcpath}/loader/Makefile.in - #} - # Needed or wine will SIGBUS configure.ldflags-append -Wl,-no_pie } Modified: trunk/dports/x11/wine-devel/Portfile =================================================================== --- trunk/dports/x11/wine-devel/Portfile 2011-07-04 09:15:52 UTC (rev 80095) +++ trunk/dports/x11/wine-devel/Portfile 2011-07-04 09:18:20 UTC (rev 80096) @@ -143,6 +143,13 @@ # This is not 64-bit friendly yet supported_archs i386 +# llvm-gcc does not respect force_align_arg_pointer +# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly) +if {${configure.compiler} == "llvm-gcc-4.2" || + ${configure.compiler} == "clang"} { + configure.compiler gcc-4.2 +} + platform darwin 9 { # Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support." # Only affects Xcode 3.0.x and 3.1.x, not 3.2.x. @@ -159,16 +166,6 @@ # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE - # llvm-gcc does not respect force_align_arg_pointer - # clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly) - configure.compiler gcc-4.2 - - # I have a suspicion that this may be necessary, but leaving out for now: - #post-patch { - # # Lion disallows heap execution. - # reinplace "s:LDEXECFLAGS = :LDEXECFLAGS = -Wl,-allow_heap_execute :" ${worksrcpath}/loader/Makefile.in - #} - # Needed or wine will SIGBUS configure.ldflags-append -Wl,-no_pie }

1 0

[80095] trunk/dports/devel/mercurial/Portfile
by deric＠macports.org 04 Jul '11

04 Jul '11

Revision: 80095 http://trac.macports.org/changeset/80095 Author: deric(a)macports.org Date: 2011-07-04 02:15:52 -0700 (Mon, 04 Jul 2011) Log Message: ----------- Update to 1.9, closes #30006. Modified Paths: -------------- trunk/dports/devel/mercurial/Portfile Modified: trunk/dports/devel/mercurial/Portfile =================================================================== --- trunk/dports/devel/mercurial/Portfile 2011-07-04 06:16:26 UTC (rev 80094) +++ trunk/dports/devel/mercurial/Portfile 2011-07-04 09:15:52 UTC (rev 80095) @@ -5,7 +5,7 @@ PortGroup python26 1.0 name mercurial -version 1.8.4 +version 1.9 categories devel python license GPLv2+ maintainers deric @@ -27,9 +27,9 @@ homepage http://www.selenic.com/mercurial/ platforms darwin master_sites http://mercurial.selenic.com/release/ -checksums md5 b3dcc3de473e003dd1cc0500dcd9de47 \ - sha1 25c4f9b1ad1c5c8ef94ca5b120c9af6bdfd23bdc \ - rmd160 c9c21ac48e6c37360f4de5833ddf0ee5e2594620 +checksums md5 d4842129fa2732eb6ed1180467bc32e2 \ + rmd160 f533234095f2028ef742dce96a23751ee023a7f1 \ + sha256 711e4b1cd2924a7a88499d6c431a9122390183bf554d4e153edbb3b2f30123e0 depends_run port:curl-ca-bundle post-patch {

1 0

[80094] trunk/dports/textproc/libiconv/files/patch-c99.diff
by ryandesign＠macports.org 04 Jul '11

04 Jul '11

Revision: 80094 http://trac.macports.org/changeset/80094 Author: ryandesign(a)macports.org Date: 2011-07-03 23:16:26 -0700 (Sun, 03 Jul 2011) Log Message: ----------- libiconv: fix patchfile added in r80075 so it actually applies without error; see #30016 Revision Links: -------------- http://trac.macports.org/changeset/80075 Modified Paths: -------------- trunk/dports/textproc/libiconv/files/patch-c99.diff Modified: trunk/dports/textproc/libiconv/files/patch-c99.diff =================================================================== --- trunk/dports/textproc/libiconv/files/patch-c99.diff 2011-07-04 05:36:43 UTC (rev 80093) +++ trunk/dports/textproc/libiconv/files/patch-c99.diff 2011-07-04 06:16:26 UTC (rev 80094) @@ -1,5 +1,5 @@ ---- lib/iconv.c.orig 2011-07-03 10:09:20.000000000 -0700 -+++ lib/iconv.c 2011-07-03 10:11:24.000000000 -0700 +--- a/lib/iconv.c.orig 2011-07-03 10:09:20.000000000 -0700 ++++ b/lib/iconv.c 2011-07-03 10:11:24.000000000 -0700 @@ -172,7 +172,9 @@ static const struct alias sysdep_aliases #include "aliases2.h" #undef S

1 0

[80093] trunk/dports/textproc/asciidoc/Portfile
by jeremyhu＠macports.org 04 Jul '11

04 Jul '11

Revision: 80093 http://trac.macports.org/changeset/80093 Author: jeremyhu(a)macports.org Date: 2011-07-03 22:36:43 -0700 (Sun, 03 Jul 2011) Log Message: ----------- asciidoc: Version bump to 8.6.5 and addi python variants Modified Paths: -------------- trunk/dports/textproc/asciidoc/Portfile Modified: trunk/dports/textproc/asciidoc/Portfile =================================================================== --- trunk/dports/textproc/asciidoc/Portfile 2011-07-04 04:29:59 UTC (rev 80092) +++ trunk/dports/textproc/asciidoc/Portfile 2011-07-04 05:36:43 UTC (rev 80093) @@ -3,7 +3,7 @@ PortSystem 1.0 name asciidoc -version 8.6.3 +version 8.6.5 categories textproc maintainers boeyms openmaintainer description Formatter/translator for text files to numerous formats @@ -22,26 +22,53 @@ homepage http://www.methods.co.nz/asciidoc/ master_sites sourceforge -checksums md5 1ef39786ee1b4c8a788584e73db2c55a \ - sha1 96ac2a3593cd0787627288359d629f8b7e69f03f \ - rmd160 4ec1a9e1363ffa68b357455e5db9bda9472f5a1f +checksums md5 9247724283501ec1cfb27d5eae9e5eaf \ + sha1 520cbf7f8b8695a3c033c183cee5802f36d0127e \ + rmd160 9828f2a8cc6f0971b4ed829f47fc1b9ecbf1c62c -depends_run port:python26 \ - port:docbook-xml-4.5 \ - port:fop +depends_run port:docbook-xml-4.5 \ + port:fop -destroot.target install docs vimdir=${prefix}/share/vim/vimfiles/ +variant python25 conflicts python26 python27 description {Use python 2.5} { + configure.python ${prefix}/bin/python2.5 -pre-destroot { - file mkdir ${destroot}${prefix}/share/vim/vimfiles/ + post-destroot { + reinplace "s:#!/usr/bin/env python:#!${prefix}/bin/python25:" \ + ${destroot}${prefix}/bin/asciidoc \ + ${destroot}${prefix}/bin/a2x + } } -post-destroot { - reinplace "s:#!/usr/bin/env python:#!${prefix}/bin/python2.6:" \ +variant python26 conflicts python25 python27 description {Use python 2.6} { + configure.python ${prefix}/bin/python2.6 + + post-destroot { + reinplace "s:#!/usr/bin/env python:#!${prefix}/bin/python26:" \ ${destroot}${prefix}/bin/asciidoc \ ${destroot}${prefix}/bin/a2x + } } +variant python27 conflicts python25 python26 description {Use python 2.7} { + configure.python ${prefix}/bin/python2.7 + + post-destroot { + reinplace "s:#!/usr/bin/env python:#!${prefix}/bin/python27:" \ + ${destroot}${prefix}/bin/asciidoc \ + ${destroot}${prefix}/bin/a2x + } +} + +if {![variant_isset python25] && ![variant_isset python26]} { + default_variants +python27 +} + +destroot.target install docs vimdir=${prefix}/share/vim/vimfiles/ + +pre-destroot { + file mkdir ${destroot}${prefix}/share/vim/vimfiles/ +} + platform darwin { # Avoid hidden dependency on gsed configure.env-append SED=/usr/bin/sed

1 0

[80092] trunk/dports/net/bro/Portfile
by jmr＠macports.org 04 Jul '11

04 Jul '11

Revision: 80092 http://trac.macports.org/changeset/80092 Author: jmr(a)macports.org Date: 2011-07-03 21:29:59 -0700 (Sun, 03 Jul 2011) Log Message: ----------- bro: update to 1.5.3 (#25625, also fixes #25631) Modified Paths: -------------- trunk/dports/net/bro/Portfile Modified: trunk/dports/net/bro/Portfile =================================================================== --- trunk/dports/net/bro/Portfile 2011-07-04 03:53:58 UTC (rev 80091) +++ trunk/dports/net/bro/Portfile 2011-07-04 04:29:59 UTC (rev 80092) @@ -3,8 +3,7 @@ PortSystem 1.0 name bro -version 1.2 -revision 2 +version 1.5.3 categories net security platforms darwin maintainers pmq @@ -19,22 +18,28 @@ master_sites ${homepage}downloads/ \ ftp://ftp.bro-ids.org/ distname bro-${version} -checksums sha1 fbafd2568be1e1c1cad9a92e5051e728b0a0b046 \ - rmd160 a7cbf4992b69d4ca49d842f99d61d3f6d6de5679 +checksums sha1 81ae6ab0b34edecae3d0fe76ca8b9030677c5441 \ + rmd160 6dce9a38a16539cf31a661b4f666cc9ba345780e livecheck.type regex livecheck.url ${homepage}/download.html livecheck.regex "${master_sites}/bro-(\[0-9a-z.\]+)-stable${extract.suffix}" # use the system-provided flex -depends_lib port:libpcap port:bison port:openssl path:bin/perl:perl5 +depends_lib port:libpcap port:bison port:openssl port:perl5 port:readline -configure.pre_args --prefix=${prefix}/share/bro -configure.args --infodir=${prefix}/share/info --mandir=${prefix}/share/man \ - --bindir=${prefix}/bin --libdir=${prefix}/lib --enable-brov6 +configure.args --enable-brov6 +post-destroot { + move ${destroot}${prefix}/etc/broccoli.conf ${destroot}${prefix}/etc/broccoli.conf.dist +} post-activate { - ui_msg "You'll need to set your BROHOME to ${prefix}/share/bro and your \ - BROPATH to ${prefix}/share/bro/site:${prefix}/share/bro/policy \ - to use the provided policies)." + if {![file exists ${prefix}/etc/broccoli.conf]} { + copy ${prefix}/etc/broccoli.conf.dist ${prefix}/etc/broccoli.conf + } } + +notes \ +"You'll need to set your BROHOME to ${prefix}/share/bro and your\ +BROPATH to ${prefix}/share/bro/site:${prefix}/share/bro/policy\ +to use the provided policies."

1 0