February 2014 - macports-changes - lists.macosforge.org

[117284] trunk/dports/lang/llvm-3.5/Portfile
by jeremyhu＠macports.org 21 Feb '14

21 Feb '14

Revision: 117284 https://trac.macports.org/changeset/117284 Author: jeremyhu(a)macports.org Date: 2014-02-21 01:03:02 -0800 (Fri, 21 Feb 2014) Log Message: ----------- llvm-3.5: Depend on libcxx Modified Paths: -------------- trunk/dports/lang/llvm-3.5/Portfile Modified: trunk/dports/lang/llvm-3.5/Portfile =================================================================== --- trunk/dports/lang/llvm-3.5/Portfile 2014-02-21 09:01:13 UTC (rev 117283) +++ trunk/dports/lang/llvm-3.5/Portfile 2014-02-21 09:03:02 UTC (rev 117284) @@ -134,6 +134,8 @@ ui_error "$name requires a C++11 runtime, which your configuration does not allow" error "unsupported configuration" } + + depends_lib-append port:libcxx } variant universal {

1 0

[117283] trunk/dports/lang
by jeremyhu＠macports.org 21 Feb '14

21 Feb '14

Revision: 117283 https://trac.macports.org/changeset/117283 Author: jeremyhu(a)macports.org Date: 2014-02-21 01:01:13 -0800 (Fri, 21 Feb 2014) Log Message: ----------- libcxx{,abi}: Don't use destroot.violate_mtree (#42385) Modified Paths: -------------- trunk/dports/lang/libcxx/Portfile trunk/dports/lang/libcxxabi/Portfile Modified: trunk/dports/lang/libcxx/Portfile =================================================================== --- trunk/dports/lang/libcxx/Portfile 2014-02-21 08:49:50 UTC (rev 117282) +++ trunk/dports/lang/libcxx/Portfile 2014-02-21 09:01:13 UTC (rev 117283) @@ -15,6 +15,7 @@ fetch.type svn svn.revision 183506 version ${svn.revision} +revision 1 #worksrcdir release_32 #svn.url http://llvm.org/svn/llvm-project/libcxx/branches/release_32 worksrcdir final @@ -25,6 +26,8 @@ variant universal {} use_configure no +set root_path ${prefix}/var/host/${name}-${version}-${revision} + if {${os.major} >= 11} { fetch {} build {} @@ -60,12 +63,15 @@ # Snow Leopard, this port provide this library in /usr for binary # compatibility with Lion and later. - destroot.violate_mtree yes destroot { - xinstall -m 755 -d ${destroot}/usr/lib - xinstall -m 755 ${worksrcpath}/lib/libc++.1.dylib ${destroot}/usr/lib - ln -s libc++.1.dylib ${destroot}/usr/lib/libc++.dylib + xinstall -m 755 -d ${destroot}${root_path}/usr/lib + xinstall -m 755 ${worksrcpath}/lib/libc++.1.dylib ${destroot}${root_path}/usr/lib + ln -s libc++.1.dylib ${destroot}${root_path}/usr/lib/libc++.dylib } + + post-activate { + system "ditto ${root_path} /" + } } livecheck.type none Modified: trunk/dports/lang/libcxxabi/Portfile =================================================================== --- trunk/dports/lang/libcxxabi/Portfile 2014-02-21 08:49:50 UTC (rev 117282) +++ trunk/dports/lang/libcxxabi/Portfile 2014-02-21 09:01:13 UTC (rev 117283) @@ -16,9 +16,12 @@ fetch.type svn svn.revision 183506 version ${svn.revision} +revision 1 worksrcdir trunk svn.url http://llvm.org/svn/llvm-project/libcxxabi/trunk +set root_path ${prefix}/var/host/${name}-${version}-${revision} + variant universal {} use_configure no @@ -56,15 +59,18 @@ # Snow Leopard, this port provide this library in /usr for binary # compatibility with Lion and later. - destroot.violate_mtree yes destroot { - xinstall -m 755 -d ${destroot}/usr/lib - xinstall -m 755 ${worksrcpath}/lib/libc++abi.dylib ${destroot}/usr/lib + xinstall -m 755 -d ${destroot}${root_path}/usr/lib + xinstall -m 755 ${worksrcpath}/lib/libc++abi.dylib ${destroot}${root_path}/usr/lib - xinstall -m 755 -d ${destroot}/usr/include - xinstall -m 644 ${worksrcpath}/include/cxa_demangle.h ${destroot}/usr/include - xinstall -m 644 ${worksrcpath}/include/cxxabi.h ${destroot}/usr/include + xinstall -m 755 -d ${destroot}${root_path}/usr/include + xinstall -m 644 ${worksrcpath}/include/cxa_demangle.h ${destroot}${root_path}/usr/include + xinstall -m 644 ${worksrcpath}/include/cxxabi.h ${destroot}${root_path}/usr/include } + + post-activate { + system "ditto ${root_path} /" + } } livecheck.type none

1 0

[117282] trunk/dports/lang/llvm-3.5/Portfile
by jeremyhu＠macports.org 21 Feb '14

21 Feb '14

Revision: 117282 https://trac.macports.org/changeset/117282 Author: jeremyhu(a)macports.org Date: 2014-02-21 00:49:50 -0800 (Fri, 21 Feb 2014) Log Message: ----------- llvm-3.5: Force libc++ Modified Paths: -------------- trunk/dports/lang/llvm-3.5/Portfile Modified: trunk/dports/lang/llvm-3.5/Portfile =================================================================== --- trunk/dports/lang/llvm-3.5/Portfile 2014-02-21 08:05:07 UTC (rev 117281) +++ trunk/dports/lang/llvm-3.5/Portfile 2014-02-21 08:49:50 UTC (rev 117282) @@ -2,6 +2,7 @@ PortSystem 1.0 PortGroup select 1.0 +PortGroup compiler_blacklist_versions 1.0 set llvm_version 3.5 set llvm_version_no_dot 35 @@ -113,10 +114,28 @@ select.file ${filespath}/mp-${subport} } -# g++-4.0 fails to build some of the newer C++ for ppc -# Intel looks ok, but I prefer using gcc-4.2 for consistency -compiler.blacklist gcc-4.0 +# llvm-3.5 and later requires a C++11 runtime +compiler.blacklist *gcc* {clang < 300} +# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released +platform darwin { + # Note that we are forcing this choice. This means that anything linking + # against llvm-3.5 needs to also be using libc++. This is possibly + # problematic, but luckily there is just a limited set of such dependents. + + if {[info exists configure.cxx_stdlib]} { + configure.cxx_stdlib libc++ + } elseif {${os.major} < 13} { + ui_error "$name requires a C++11 runtime, which your configuration does not allow" + error "unsupported configuration" + } + + if {! [file exists /usr/lib/libc++.dylib]} { + ui_error "$name requires a C++11 runtime, which your configuration does not allow" + error "unsupported configuration" + } +} + variant universal { build.env-append \ UNIVERSAL=1 \

1 0

[117281] trunk/dports/lang
by jeremyhu＠macports.org 21 Feb '14

21 Feb '14

Revision: 117281 https://trac.macports.org/changeset/117281 Author: jeremyhu(a)macports.org Date: 2014-02-21 00:05:07 -0800 (Fri, 21 Feb 2014) Log Message: ----------- gcc4[6789]: Allow cloog-devel to satisfy dependency Modified Paths: -------------- trunk/dports/lang/gcc46/Portfile trunk/dports/lang/gcc47/Portfile trunk/dports/lang/gcc48/Portfile trunk/dports/lang/gcc49/Portfile Modified: trunk/dports/lang/gcc46/Portfile =================================================================== --- trunk/dports/lang/gcc46/Portfile 2014-02-21 08:02:40 UTC (rev 117280) +++ trunk/dports/lang/gcc46/Portfile 2014-02-21 08:05:07 UTC (rev 117281) @@ -48,7 +48,7 @@ rmd160 d3f4da657f086b6423f74e93f001132f4855368a \ sha256 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 -depends_lib port:gmp port:mpfr port:libiconv port:libmpc port:ppl port:cloog path:lib/libgcc/libgcc_s.1.dylib:libgcc +depends_lib port:gmp port:mpfr port:libiconv port:libmpc port:ppl path:lib/pkgconfig/cloog-isl.pc:cloog path:lib/libgcc/libgcc_s.1.dylib:libgcc depends_run port:gcc_select port:ld64 port:cctools depends_skip_archcheck-append gcc_select ld64 cctools Modified: trunk/dports/lang/gcc47/Portfile =================================================================== --- trunk/dports/lang/gcc47/Portfile 2014-02-21 08:02:40 UTC (rev 117280) +++ trunk/dports/lang/gcc47/Portfile 2014-02-21 08:05:07 UTC (rev 117281) @@ -48,7 +48,7 @@ rmd160 d3f4da657f086b6423f74e93f001132f4855368a \ sha256 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 -depends_lib port:gmp port:mpfr port:libiconv port:libmpc port:ppl port:cloog path:lib/libgcc/libgcc_s.1.dylib:libgcc +depends_lib port:gmp port:mpfr port:libiconv port:libmpc port:ppl path:lib/pkgconfig/cloog-isl.pc:cloog path:lib/libgcc/libgcc_s.1.dylib:libgcc depends_run port:gcc_select port:ld64 port:cctools depends_skip_archcheck-append gcc_select ld64 cctools Modified: trunk/dports/lang/gcc48/Portfile =================================================================== --- trunk/dports/lang/gcc48/Portfile 2014-02-21 08:02:40 UTC (rev 117280) +++ trunk/dports/lang/gcc48/Portfile 2014-02-21 08:05:07 UTC (rev 117281) @@ -34,7 +34,7 @@ use_bzip2 yes -depends_lib port:gmp port:mpfr port:libiconv port:libmpc port:cloog path:lib/libgcc/libgcc_s.1.dylib:libgcc +depends_lib port:gmp port:mpfr port:libiconv port:libmpc path:lib/pkgconfig/cloog-isl.pc:cloog path:lib/libgcc/libgcc_s.1.dylib:libgcc depends_run port:gcc_select port:ld64 port:cctools depends_skip_archcheck-append gcc_select ld64 cctools Modified: trunk/dports/lang/gcc49/Portfile =================================================================== --- trunk/dports/lang/gcc49/Portfile 2014-02-21 08:02:40 UTC (rev 117280) +++ trunk/dports/lang/gcc49/Portfile 2014-02-21 08:05:07 UTC (rev 117281) @@ -35,7 +35,7 @@ use_bzip2 yes -depends_lib port:gmp port:mpfr port:libiconv port:libmpc port:cloog port:libgcc-devel +depends_lib port:gmp port:mpfr port:libiconv port:libmpc path:lib/pkgconfig/cloog-isl.pc:cloog port:libgcc-devel depends_run port:gcc_select port:ld64 port:cctools depends_skip_archcheck-append gcc_select ld64 cctools

1 0

[117280] trunk/dports/lang/llvm-3.5/Portfile
by jeremyhu＠macports.org 21 Feb '14

21 Feb '14

Revision: 117280 https://trac.macports.org/changeset/117280 Author: jeremyhu(a)macports.org Date: 2014-02-21 00:02:40 -0800 (Fri, 21 Feb 2014) Log Message: ----------- clang-3.5: Actually apply the patch... Modified Paths: -------------- trunk/dports/lang/llvm-3.5/Portfile Modified: trunk/dports/lang/llvm-3.5/Portfile =================================================================== --- trunk/dports/lang/llvm-3.5/Portfile 2014-02-21 07:57:07 UTC (rev 117279) +++ trunk/dports/lang/llvm-3.5/Portfile 2014-02-21 08:02:40 UTC (rev 117280) @@ -86,7 +86,7 @@ if {${subport} == "clang-${llvm_version}"} { patchfiles-append tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \ - 0001-Comment-out-SL-cctools-workaround.patch + CheckArchesLD.patch 0001-Comment-out-SL-cctools-workaround.patch build.target clang-only destroot.target install-clang

1 0

[117279] trunk/dports/lang/llvm-3.5
by jeremyhu＠macports.org 21 Feb '14

21 Feb '14

Revision: 117279 https://trac.macports.org/changeset/117279 Author: jeremyhu(a)macports.org Date: 2014-02-20 23:57:07 -0800 (Thu, 20 Feb 2014) Log Message: ----------- {clang,llvm}-3.5: Bump to r201834 Revision Links: -------------- https://trac.macports.org/changeset/201834 Modified Paths: -------------- trunk/dports/lang/llvm-3.5/Portfile Added Paths: ----------- trunk/dports/lang/llvm-3.5/files/CheckArchesLD.patch Modified: trunk/dports/lang/llvm-3.5/Portfile =================================================================== --- trunk/dports/lang/llvm-3.5/Portfile 2014-02-21 05:46:45 UTC (rev 117278) +++ trunk/dports/lang/llvm-3.5/Portfile 2014-02-21 07:57:07 UTC (rev 117279) @@ -50,7 +50,7 @@ } fetch.type svn -svn.revision 198565 +svn.revision 201834 set compiler_rt_rev ${svn.revision} set libcxx_rev ${svn.revision} @@ -215,6 +215,8 @@ reinplace {/cc_kext_ios5/ s/^/#/} ${worksrcpath}/projects/compiler-rt/make/platform/clang_darwin.mk reinplace {s/cc_kext_ios5.a//} ${worksrcpath}/tools/clang/runtime/compiler-rt/Makefile + + reinplace {s/VERBOSE := 0/VERBOSE := 1/} ${worksrcpath}/projects/compiler-rt/make/config.mk } } } Added: trunk/dports/lang/llvm-3.5/files/CheckArchesLD.patch =================================================================== --- trunk/dports/lang/llvm-3.5/files/CheckArchesLD.patch (rev 0) +++ trunk/dports/lang/llvm-3.5/files/CheckArchesLD.patch 2014-02-21 07:57:07 UTC (rev 117279) @@ -0,0 +1,12 @@ +--- projects/compiler-rt/make/platform/clang_darwin.mk 2014-02-20 23:25:54.000000000 -0800 ++++ projects/compiler-rt/make/platform/clang_darwin.mk 2014-02-20 23:32:01.000000000 -0800 +@@ -46,7 +46,7 @@ XCRunSdkPath = \ + ### + + CC := $(call XCRun,clang) +-LD := $(call XCRun,ld) ++LD := $(shell $(CC) -print-prog-name=ld) + AR := $(call XCRun,ar) + RANLIB := $(call XCRun,ranlib) + STRIP := $(call XCRun,strip) +

1 0

[117278] trunk/dports/gnome/gfbgraph/Portfile
by ryandesign＠macports.org 21 Feb '14

21 Feb '14

Revision: 117278 https://trac.macports.org/changeset/117278 Author: ryandesign(a)macports.org Date: 2014-02-20 21:46:45 -0800 (Thu, 20 Feb 2014) Log Message: ----------- gfbgraph: allow glib2-devel to satisfy glib2 dependency Modified Paths: -------------- trunk/dports/gnome/gfbgraph/Portfile Modified: trunk/dports/gnome/gfbgraph/Portfile =================================================================== --- trunk/dports/gnome/gfbgraph/Portfile 2014-02-21 05:37:25 UTC (rev 117277) +++ trunk/dports/gnome/gfbgraph/Portfile 2014-02-21 05:46:45 UTC (rev 117278) @@ -23,7 +23,7 @@ depends_build port:pkgconfig -depends_lib port:glib2 \ +depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \ port:rest \ port:json-glib \ port:libsoup \

1 0

[117277] trunk/dports/games/flobopuyo
by jmr＠macports.org 21 Feb '14

21 Feb '14

Revision: 117277 https://trac.macports.org/changeset/117277 Author: jmr(a)macports.org Date: 2014-02-20 21:37:25 -0800 (Thu, 20 Feb 2014) Log Message: ----------- flobopuyo: build fix for 64-bit Modified Paths: -------------- trunk/dports/games/flobopuyo/Portfile Added Paths: ----------- trunk/dports/games/flobopuyo/files/IosVector.cpp.patch trunk/dports/games/flobopuyo/files/PuyoGame.cpp.patch Modified: trunk/dports/games/flobopuyo/Portfile =================================================================== --- trunk/dports/games/flobopuyo/Portfile 2014-02-21 05:35:48 UTC (rev 117276) +++ trunk/dports/games/flobopuyo/Portfile 2014-02-21 05:37:25 UTC (rev 117277) @@ -23,7 +23,9 @@ use_configure no # Makefile "knows" that all Darwin programs live in app bundles -patchfiles patch-Makefile +patchfiles patch-Makefile \ + IosVector.cpp.patch \ + PuyoGame.cpp.patch build.args PREFIX=${prefix} destroot.args PREFIX=${prefix} INSTALL_BINDIR='${destroot}${prefix}/bin' Added: trunk/dports/games/flobopuyo/files/IosVector.cpp.patch =================================================================== --- trunk/dports/games/flobopuyo/files/IosVector.cpp.patch (rev 0) +++ trunk/dports/games/flobopuyo/files/IosVector.cpp.patch 2014-02-21 05:37:25 UTC (rev 117277) @@ -0,0 +1,10 @@ +--- IosVector.cpp.orig 2004-10-09 08:41:12.000000000 +1000 ++++ IosVector.cpp 2014-02-21 16:31:24.000000000 +1100 +@@ -102,6 +102,6 @@ + void IosVector::dumpVector() const { + fprintf(stderr, "Size: %d\n", getSize()); + for (int i = 0, j = getSize() ; i < j ; i++) +- fprintf(stderr, "elt[%d]=%d ", i, (int)getElementAt(i)); ++ fprintf(stderr, "elt[%d]=%p ", i, getElementAt(i)); + fprintf(stderr, "\n"); + } Added: trunk/dports/games/flobopuyo/files/PuyoGame.cpp.patch =================================================================== --- trunk/dports/games/flobopuyo/files/PuyoGame.cpp.patch (rev 0) +++ trunk/dports/games/flobopuyo/files/PuyoGame.cpp.patch 2014-02-21 05:37:25 UTC (rev 117277) @@ -0,0 +1,11 @@ +--- PuyoGame.cpp.orig 2004-10-09 08:41:13.000000000 +1000 ++++ PuyoGame.cpp 2014-02-21 16:15:57.000000000 +1100 +@@ -45,7 +45,7 @@ PuyoState PuyoRandomSystem::getPuyoForSe + return (PuyoState)newItem; + } + else +- return (PuyoState)(int)(sequenceItems.getElementAt(sequence)); ++ return (PuyoState)(long)(sequenceItems.getElementAt(sequence)); + } + + PuyoPuyo::PuyoPuyo(PuyoState state)

1 0

[117276] trunk/dports/x11/wine-devel/Portfile
by ryandesign＠macports.org 21 Feb '14

21 Feb '14

Revision: 117276 https://trac.macports.org/changeset/117276 Author: ryandesign(a)macports.org Date: 2014-02-20 21:35:48 -0800 (Thu, 20 Feb 2014) Log Message: ----------- wine-devel: update to 1.7.13 Modified Paths: -------------- trunk/dports/x11/wine-devel/Portfile Modified: trunk/dports/x11/wine-devel/Portfile =================================================================== --- trunk/dports/x11/wine-devel/Portfile 2014-02-21 05:25:52 UTC (rev 117275) +++ trunk/dports/x11/wine-devel/Portfile 2014-02-21 05:35:48 UTC (rev 117276) @@ -13,7 +13,7 @@ name wine-devel conflicts wine wine-crossover set my_name wine -version 1.7.12 +version 1.7.13 license LGPL-2.1+ categories x11 maintainers ryandesign jwa openmaintainer @@ -39,8 +39,8 @@ sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko checksums ${wine_distfile} \ - rmd160 d07b5fcfc27f1d5d1c1331d6d867cbe6629dc7b4 \ - sha256 2dcdff7bf8bac2bc10da85e3e632e8add830f22cf416173e53abca4ec580b392 \ + rmd160 6bb28bfadf9e410e0bb0b93ea205576164d34581 \ + sha256 a72fdee6e1898007b38f3b30584f86d996567ad8d2f1cc0fe3a877be0493b9df \ ${wine_gecko_distfile} \ rmd160 109014e52d056962350681fd9d8178969cff939d \ sha256 6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c

1 0

[117275] trunk/dports/net/youtube-dl/Portfile
by ryandesign＠macports.org 21 Feb '14

21 Feb '14

Revision: 117275 https://trac.macports.org/changeset/117275 Author: ryandesign(a)macports.org Date: 2014-02-20 21:25:52 -0800 (Thu, 20 Feb 2014) Log Message: ----------- youtube-dl: update to 2014.02.20 Modified Paths: -------------- trunk/dports/net/youtube-dl/Portfile Modified: trunk/dports/net/youtube-dl/Portfile =================================================================== --- trunk/dports/net/youtube-dl/Portfile 2014-02-21 05:24:38 UTC (rev 117274) +++ trunk/dports/net/youtube-dl/Portfile 2014-02-21 05:25:52 UTC (rev 117275) @@ -4,7 +4,7 @@ PortSystem 1.0 name youtube-dl -version 2014.02.17 +version 2014.02.20 categories net platforms darwin maintainers ryandesign openmaintainer @@ -18,8 +18,8 @@ homepage http://rg3.github.com/youtube-dl/ master_sites http://youtube-dl.org/downloads/${version} -checksums rmd160 0955023fc5a48deca9fa14cb420ace5f69106f6b \ - sha256 78be990760e74dd3c0329d3dfb1e5165761ead41a2a9b23f8a6367ccd01c617b +checksums rmd160 35b303d3069602a121f7f129c9e5261acac00382 \ + sha256 8c25f305c4a5bb14f7577961852fda2458eacaa5251c22b97de5709068a8387e depends_build bin:zip:zip

1 0