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

[110455] trunk/dports/devel/glibmm/Portfile
by jeremyhu＠macports.org 31 Aug '13

31 Aug '13

Revision: 110455 https://trac.macports.org/changeset/110455 Author: jeremyhu(a)macports.org Date: 2013-08-31 00:31:25 -0700 (Sat, 31 Aug 2013) Log Message: ----------- glibmm: autoreconf to pick up a newer glibtool that understands -stdlib Modified Paths: -------------- trunk/dports/devel/glibmm/Portfile Modified: trunk/dports/devel/glibmm/Portfile =================================================================== --- trunk/dports/devel/glibmm/Portfile 2013-08-31 07:09:12 UTC (rev 110454) +++ trunk/dports/devel/glibmm/Portfile 2013-08-31 07:31:25 UTC (rev 110455) @@ -21,12 +21,16 @@ checksums rmd160 df88264bc1f1968fc1bdc6ace2c509af88941edd \ sha256 f15b65bf5740257be03c69f2f5ae71436ac3011ebeb02274b2b99b796c6837cf -depends_build port:pkgconfig +depends_build port:pkgconfig \ + port:mm-common depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \ port:p5.12-xml-parser \ port:libsigcxx2 +use_autoreconf yes +autoreconf.args -fvi + post-destroot { set mmdoctooldir ${prefix}/share/glibmm-2.4/doctool xinstall -d ${destroot}${mmdoctooldir}

1 0

[110454] trunk/dports/science/gstlal-inspiral/Portfile
by jeremyhu＠macports.org 31 Aug '13

31 Aug '13

Revision: 110454 https://trac.macports.org/changeset/110454 Author: jeremyhu(a)macports.org Date: 2013-08-31 00:09:12 -0700 (Sat, 31 Aug 2013) Log Message: ----------- gstlal-inspiral: Add a reminder to version the clang blacklisting when a release version is known Modified Paths: -------------- trunk/dports/science/gstlal-inspiral/Portfile Modified: trunk/dports/science/gstlal-inspiral/Portfile =================================================================== --- trunk/dports/science/gstlal-inspiral/Portfile 2013-08-31 07:05:19 UTC (rev 110453) +++ trunk/dports/science/gstlal-inspiral/Portfile 2013-08-31 07:09:12 UTC (rev 110454) @@ -55,7 +55,9 @@ # fails with "error: cannot compile this complex compound assignment yet" # submitted as radr://11224126 # http://llvm.org/bugs/show_bug.cgi?id=12790 fixed in r183821 -compiler.blacklist clang macports-clang-3.3 +# TODO: Change clang blacklisting into versioned once this is fixed in a released version (not yet in Xcode 4.6) +compiler.blacklist-append clang +compiler.blacklist-append macports-clang-2.9 macports-clang-3.0 macports-clang-3.1 macports-clang-3.2 macports-clang-3.3 compiler.fallback-append macports-clang-3.4 # hack around #39223

1 0

[110453] trunk/dports/security/tor-devel/Portfile
by jeremyhu＠macports.org 31 Aug '13

31 Aug '13

Revision: 110453 https://trac.macports.org/changeset/110453 Author: jeremyhu(a)macports.org Date: 2013-08-31 00:05:19 -0700 (Sat, 31 Aug 2013) Log Message: ----------- tor-devel: Remove blacklisting. It was just wrong. Modified Paths: -------------- trunk/dports/security/tor-devel/Portfile Modified: trunk/dports/security/tor-devel/Portfile =================================================================== --- trunk/dports/security/tor-devel/Portfile 2013-08-31 06:57:15 UTC (rev 110452) +++ trunk/dports/security/tor-devel/Portfile 2013-08-31 07:05:19 UTC (rev 110453) @@ -32,11 +32,6 @@ port:openssl \ port:zlib -# http://llvm.org/bugs/show_bug.cgi?id=15201 -if {[variant_isset universal]} { - compiler.blacklist-append clang macports-clang-2.9 macports-clang-3.0 macports-clang-3.1 macports-clang-3.2 macports-clang-3.3 -} - configure.args --disable-asciidoc \ --disable-silent-rules \ --with-libevent-dir=${prefix} \

1 0

[110452] trunk/dports/devel/cmake/Portfile
by jeremyhu＠macports.org 31 Aug '13

31 Aug '13

Revision: 110452 https://trac.macports.org/changeset/110452 Author: jeremyhu(a)macports.org Date: 2013-08-30 23:57:15 -0700 (Fri, 30 Aug 2013) Log Message: ----------- cmake: Don't use libc++ on Lion, even if we were told to. Modified Paths: -------------- trunk/dports/devel/cmake/Portfile Modified: trunk/dports/devel/cmake/Portfile =================================================================== --- trunk/dports/devel/cmake/Portfile 2013-08-31 06:52:46 UTC (rev 110451) +++ trunk/dports/devel/cmake/Portfile 2013-08-31 06:57:15 UTC (rev 110452) @@ -48,6 +48,16 @@ set universal_archs_supported ${supported_archs} } +platform darwin 11 { + if {[string match *-stdlib=libc++* ${configure.cxxflags}]} { + # TODO: Figure out why this is failing. + # Since nothing links against cmake and cmake is just using the + # STL, we're safe to use libstdc++ even if the user requested libc++ + configure.cxxflags-delete "-stdlib=libc++" + configure.cxxflags-append "-stdlib=libstdc++" + } +} + patchfiles patch-CMakeFindFrameworks.cmake.diff \ patch-Modules-FindQt4.cmake.diff \ patch-Utilities-cmcurl-strequal.h.diff

1 0

[110451] trunk/dports/devel/zeroc-ice33/Portfile
by blair＠macports.org 31 Aug '13

31 Aug '13

Revision: 110451 https://trac.macports.org/changeset/110451 Author: blair(a)macports.org Date: 2013-08-30 23:52:46 -0700 (Fri, 30 Aug 2013) Log Message: ----------- zeroc-ice33: sort application of patch files alphabetically. Modified Paths: -------------- trunk/dports/devel/zeroc-ice33/Portfile Modified: trunk/dports/devel/zeroc-ice33/Portfile =================================================================== --- trunk/dports/devel/zeroc-ice33/Portfile 2013-08-31 06:51:27 UTC (rev 110450) +++ trunk/dports/devel/zeroc-ice33/Portfile 2013-08-31 06:52:46 UTC (rev 110451) @@ -68,7 +68,7 @@ ui_debug ${cmd} system ${cmd} - set cmd "cd ${workpath}/Ice-${version} && patch -p1 < ${filespath}/patch-ice.cpp.src.slice2html.Gen.diff" + set cmd "cd ${workpath}/Ice-${version} && patch -p1 < ${filespath}/patch-ice.cpp.src.Slice.Preprocessor.cpp.diff" ui_debug ${cmd} system ${cmd} @@ -76,7 +76,7 @@ ui_debug ${cmd} system ${cmd} - set cmd "cd ${workpath}/Ice-${version} && patch -p1 < ${filespath}/patch-ice.cpp.src.Slice.Preprocessor.cpp.diff" + set cmd "cd ${workpath}/Ice-${version} && patch -p1 < ${filespath}/patch-ice.cpp.src.slice2html.Gen.diff" ui_debug ${cmd} system ${cmd}

1 0

[110450] trunk/dports/sysutils/memcacheq/Portfile
by jeremyhu＠macports.org 31 Aug '13

31 Aug '13

Revision: 110450 https://trac.macports.org/changeset/110450 Author: jeremyhu(a)macports.org Date: 2013-08-30 23:51:27 -0700 (Fri, 30 Aug 2013) Log Message: ----------- memcacheq: Build with clang Modified Paths: -------------- trunk/dports/sysutils/memcacheq/Portfile Modified: trunk/dports/sysutils/memcacheq/Portfile =================================================================== --- trunk/dports/sysutils/memcacheq/Portfile 2013-08-31 06:28:55 UTC (rev 110449) +++ trunk/dports/sysutils/memcacheq/Portfile 2013-08-31 06:51:27 UTC (rev 110450) @@ -20,14 +20,13 @@ checksums sha1 fc373e02335301cbfe4c00420bdf8592ca2bf95a \ rmd160 7a8b7e4658915d011d148bcd6427a0aa13aaa908 -compiler.blacklist clang - depends_lib port:libevent \ port:db47 configure.args --with-libevent=${prefix} -configure.cflags-append -I${prefix}/include/db47 +configure.cflags-append -std=gnu89 +configure.cppflags-append -I${prefix}/include/db47 configure.ldflags-append -L${prefix}/lib/db47 livecheck.type regex

1 0

[110449] trunk/dports/sysutils/memcached/Portfile
by jeremyhu＠macports.org 31 Aug '13

31 Aug '13

Revision: 110449 https://trac.macports.org/changeset/110449 Author: jeremyhu(a)macports.org Date: 2013-08-30 23:28:55 -0700 (Fri, 30 Aug 2013) Log Message: ----------- memcached: Build with clang Modified Paths: -------------- trunk/dports/sysutils/memcached/Portfile Modified: trunk/dports/sysutils/memcached/Portfile =================================================================== --- trunk/dports/sysutils/memcached/Portfile 2013-08-31 06:19:52 UTC (rev 110448) +++ trunk/dports/sysutils/memcached/Portfile 2013-08-31 06:28:55 UTC (rev 110449) @@ -22,9 +22,6 @@ checksums rmd160 b46ebf6b43520511d15c8e9f0ba4ab19f3aebc6e \ sha256 f2e2ad8ee8d256f2c3748d7f741dcddfd0ab6bdece6fa1c18484e83f311156ef -# http://code.google.com/p/memcached/issues/detail?id=285 -compiler.blacklist clang - configure.args --with-libevent=${prefix} \ ac_cv_search_umem_cache_create=no \ ac_cv_header_umem_h=no @@ -43,6 +40,13 @@ } } +post-patch { + # http://code.google.com/p/memcached/issues/detail?id=285 + if {[string match "*clang*" ${configure.compiler}]} { + reinplace "s|-Werror||g" ${worksrcpath}/configure ${worksrcpath}/doc/Makefile + } +} + variant sasl description {enable SASL authentication} { configure.args-append --enable-sasl }

1 0

[110448] trunk/dports/devel/zeroc-ice33/Portfile
by blair＠macports.org 31 Aug '13

31 Aug '13

Revision: 110448 https://trac.macports.org/changeset/110448 Author: blair(a)macports.org Date: 2013-08-30 23:19:52 -0700 (Fri, 30 Aug 2013) Log Message: ----------- zeroc-ice33: sort patch files alphabetically. Modified Paths: -------------- trunk/dports/devel/zeroc-ice33/Portfile Modified: trunk/dports/devel/zeroc-ice33/Portfile =================================================================== --- trunk/dports/devel/zeroc-ice33/Portfile 2013-08-31 05:36:12 UTC (rev 110447) +++ trunk/dports/devel/zeroc-ice33/Portfile 2013-08-31 06:19:52 UTC (rev 110448) @@ -42,9 +42,9 @@ patchfiles patch-ice.cpp.config.Make.rules.diff \ patch-ice.cpp.config.Make.rules.Darwin.diff \ patch-ice.cpp.src.IceSSL.Instance.cpp.diff \ + patch-ice.cpp.src.Slice.Preprocessor.cpp.diff \ + patch-ice.cpp.src.slice2cpp.Gen.cpp.diff \ patch-ice.cpp.src.slice2html.Gen.diff \ - patch-ice.cpp.src.slice2cpp.Gen.cpp.diff \ - patch-ice.cpp.src.Slice.Preprocessor.cpp.diff \ patch-clang-support.diff platforms darwin

1 0

[110447] trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice. DynamicLibrary.cpp.diff
by blair＠macports.org 31 Aug '13

31 Aug '13

Revision: 110447 https://trac.macports.org/changeset/110447 Author: blair(a)macports.org Date: 2013-08-30 22:36:12 -0700 (Fri, 30 Aug 2013) Log Message: ----------- zeroc-ice34: add currently unused patch. This may be used in the future, I'm committing it now so it can be 'svn copy' to zeroc-ice33. Added Paths: ----------- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff Copied: trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff (from rev 110442, trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff) =================================================================== --- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff (rev 0) +++ trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff 2013-08-31 05:36:12 UTC (rev 110447) @@ -0,0 +1,34 @@ +diff -ru Ice-3.4.2.orig/cpp/src/Ice/DynamicLibrary.cpp Ice-3.4.2/cpp/src/Ice/DynamicLibrary.cpp +--- Ice-3.4.2.orig/cpp/src/Ice/DynamicLibrary.cpp 2011-06-15 12:43:58.000000000 -0700 ++++ Ice-3.4.2/cpp/src/Ice/DynamicLibrary.cpp 2013-08-30 22:10:32.000000000 -0700 +@@ -112,12 +112,18 @@ + + lib += ".dll"; + #elif defined(__APPLE__) ++ // Look for libZeroc... to handle the MacPorts ++ // s/libIce/libZerocIce/ rename. ++ string libZeroc = lib; + lib = "lib" + libName; ++ libZeroc += "libZeroc" + libName; + if(!version.empty()) + { + lib += "." + version; ++ libZeroc += "." + version; + } + lib += ".dylib"; ++ libZeroc += ".dylib"; + #elif defined(__hpux) + lib = "lib" + libName; + if(!version.empty()) +@@ -145,7 +151,10 @@ + + if(!load(lib)) + { +- return 0; ++ if (!load(libZeroc)) ++ { ++ return 0; ++ } + } + + return getSymbol(funcName);

1 0

propchange - r110436 svn:log
by blair＠macports.org 31 Aug '13

31 Aug '13

Author: blair(a)macports.org (original author: blair(a)macports.org) Revision: 110436 Property Name: svn:log @@ -1,4 +1,4 @@ -zeroc-ice33: follow zeroc-ice35: libIce* to libZerocIce*. +zeroc-ice33: follow zeroc-ice35: rename libIce* to libZerocIce*. This makes the two ports consistent in the names they use for the shared libraries.

1 0