September 2015 - macports-changes - lists.macosforge.org

[140583] trunk/dports/python/py-click-plugins/Portfile
by stromnov＠macports.org 24 Sep '15

24 Sep '15

Revision: 140583 https://trac.macports.org/changeset/140583 Author: stromnov(a)macports.org Date: 2015-09-24 07:04:05 -0700 (Thu, 24 Sep 2015) Log Message: ----------- py-click-plugins: update to version 1.0.2 Modified Paths: -------------- trunk/dports/python/py-click-plugins/Portfile Modified: trunk/dports/python/py-click-plugins/Portfile =================================================================== --- trunk/dports/python/py-click-plugins/Portfile 2015-09-24 14:01:54 UTC (rev 140582) +++ trunk/dports/python/py-click-plugins/Portfile 2015-09-24 14:04:05 UTC (rev 140583) @@ -5,7 +5,7 @@ PortGroup python 1.0 name py-click-plugins -version 1.0.1 +version 1.0.2 revision 0 platforms darwin license BSD @@ -23,8 +23,8 @@ distname ${python.rootname}-${version} -checksums rmd160 24fac7083a7d3a18e2fc93abbb7ca17caf9e5e80 \ - sha256 94e6e289e9f10dfe85a35f54891bd071b1640d5b08777995457f38c282e59f67 +checksums rmd160 073433f5eeddbc81b024296901e011c80f875ce5 \ + sha256 3e33f24dafbc8f52dd2a557f5fb1452acc7ab67ff354220a832a393bdedb46a8 if {${name} ne ${subport}} { depends_lib-append port:py${python.version}-setuptools \

1 0

[140582] trunk/dports/python/py-setuptools_scm/Portfile
by stromnov＠macports.org 24 Sep '15

24 Sep '15

Revision: 140582 https://trac.macports.org/changeset/140582 Author: stromnov(a)macports.org Date: 2015-09-24 07:01:54 -0700 (Thu, 24 Sep 2015) Log Message: ----------- py-setuptools_scm: update to version 1.8.0 Modified Paths: -------------- trunk/dports/python/py-setuptools_scm/Portfile Modified: trunk/dports/python/py-setuptools_scm/Portfile =================================================================== --- trunk/dports/python/py-setuptools_scm/Portfile 2015-09-24 13:59:24 UTC (rev 140581) +++ trunk/dports/python/py-setuptools_scm/Portfile 2015-09-24 14:01:54 UTC (rev 140582) @@ -5,7 +5,7 @@ PortGroup python 1.0 name py-setuptools_scm -version 1.7.0 +version 1.8.0 revision 0 categories-append devel platforms darwin @@ -22,10 +22,12 @@ homepage https://github.com/pypa/setuptools_scm/ master_sites pypi:[string index ${python.rootname} 0]/${python.rootname} +use_bzip2 yes + distname ${python.rootname}-${version} -checksums rmd160 047b05e54b323056ff31a1473f7c05e48fd85d55 \ - sha256 f2f69c782b4f549003edf5b75b356b37f40a4e880b615996c5d9c117913d6f9c +checksums rmd160 ea6714ecc28b8b5fe707722bc4bc43d5b6b8430e \ + sha256 ddbf365e60e5f8e3f86fe117edeee4a7e1dd8ce7a9337951c9c163e7c506e602 if {${name} ne ${subport}} { depends_lib-append port:py${python.version}-setuptools

1 0

[140581] trunk/dports/python/py-unicodecsv/Portfile
by stromnov＠macports.org 24 Sep '15

24 Sep '15

Revision: 140581 https://trac.macports.org/changeset/140581 Author: stromnov(a)macports.org Date: 2015-09-24 06:59:24 -0700 (Thu, 24 Sep 2015) Log Message: ----------- py-unicodecsv: update to version 0.14.1 Modified Paths: -------------- trunk/dports/python/py-unicodecsv/Portfile Modified: trunk/dports/python/py-unicodecsv/Portfile =================================================================== --- trunk/dports/python/py-unicodecsv/Portfile 2015-09-24 12:40:51 UTC (rev 140580) +++ trunk/dports/python/py-unicodecsv/Portfile 2015-09-24 13:59:24 UTC (rev 140581) @@ -5,7 +5,7 @@ PortGroup python 1.0 name py-unicodecsv -version 0.13.0 +version 0.14.1 revision 0 categories-append devel platforms darwin @@ -23,8 +23,8 @@ distname unicodecsv-${version} -checksums rmd160 99f273e2bf7d2f83882988358f8406e41e321a27 \ - sha256 a913fa13a26b4b25058950f8d6231abee855e8a03a0f265274b3ed30a91034a3 +checksums rmd160 e32a55b18f1ea62a47db3490191bd4bb6566453f \ + sha256 018c08037d48649a0412063ff4eda26eaa81eff1546dbffa51fa5293276ff7fc if {${name} ne ${subport}} { livecheck.type none

1 0

[140580] trunk/dports/science/gnuradio/Portfile
by michaelld＠macports.org 24 Sep '15

24 Sep '15

Revision: 140580 https://trac.macports.org/changeset/140580 Author: michaelld(a)macports.org Date: 2015-09-24 05:40:51 -0700 (Thu, 24 Sep 2015) Log Message: ----------- gnuradio: update devel to 2e7800ff and next to 8f524566, both 20150923. Modified Paths: -------------- trunk/dports/science/gnuradio/Portfile Modified: trunk/dports/science/gnuradio/Portfile =================================================================== --- trunk/dports/science/gnuradio/Portfile 2015-09-24 10:32:28 UTC (rev 140579) +++ trunk/dports/science/gnuradio/Portfile 2015-09-24 12:40:51 UTC (rev 140580) @@ -92,11 +92,11 @@ name gnuradio-devel conflicts gnuradio-legacy gnuradio gnuradio-next - github.setup gnuradio gnuradio a03893d51553eb74ac348ee88d4dd879b0a253c8 - version 20150920 + github.setup gnuradio gnuradio 2e7800ff6f8dbf16775b8682c5297417e460fa67 + version 20150923 checksums \ - rmd160 239849d3fef861c85720d37ba82b85e2acbf07e4 \ - sha256 ed8619b92d1336258b986157e0b1782b6d45ab99b16569caf12f94ffa28fa73f + rmd160 baeea12a2b4dc801e60e36eae5968c34681669e0 \ + sha256 6086a7e1ce0ae20f22023bd680c69e307dc323ecdd9ec5fe0e11740f90707670 } @@ -108,11 +108,11 @@ name gnuradio-next conflicts gnuradio-legacy gnuradio gnuradio-devel - github.setup gnuradio gnuradio 2d0d3f87bbc5d370cb14e5978202b5cb66d1b045 - version 20150920 + github.setup gnuradio gnuradio 8f524566321eb1a25d9d324436f8e0d57dd02d65 + version 20150923 checksums \ - rmd160 c02195b7be2352d38851989eea5558a2e4625535 \ - sha256 08741ef4cf34e52ed6d1fa4aecf61a78b980d8f11891f1b2877c88be130bb0c5 + rmd160 64a0b49a12edf7555a0a0e470e9988021bef0357 \ + sha256 2c400271a6c2f6dd5d8235fc2e03e8189412b1f7c8cf59d7cac2e98c05c99028 # overload the github livecheck URL with the correct branch

1 0

[140579] trunk/dports/devel/cctools
by jeremyhu＠macports.org 24 Sep '15

24 Sep '15

Revision: 140579 https://trac.macports.org/changeset/140579 Author: jeremyhu(a)macports.org Date: 2015-09-24 03:32:28 -0700 (Thu, 24 Sep 2015) Log Message: ----------- cctools: Bump to version 870 Modified Paths: -------------- trunk/dports/devel/cctools/Portfile Removed Paths: ------------- trunk/dports/devel/cctools/files/cctools-862-no-lto.patch Modified: trunk/dports/devel/cctools/Portfile =================================================================== --- trunk/dports/devel/cctools/Portfile 2015-09-24 10:27:48 UTC (rev 140578) +++ trunk/dports/devel/cctools/Portfile 2015-09-24 10:32:28 UTC (rev 140579) @@ -3,10 +3,9 @@ PortSystem 1.0 name cctools -# OS X 10.10.0 -version 862 -set ld64_version 236.3 -revision 1 +# Xcode 6.3 +version 870 +set ld64_version 242 categories devel platforms darwin maintainers jeremyhu openmaintainer @@ -23,16 +22,16 @@ distfiles ld64-${ld64_version}.tar.gz ${name}-${version}.tar.gz -checksums ld64-236.3.tar.gz \ - rmd160 6a3f44aa9ae57a60d2cff5b3d47be7972ad83029 \ - sha256 8ef36729b643201081ab45ebd8586ede8f9968bc17614b679a940faa82875ca6 \ - cctools-862.tar.gz \ - rmd160 21ca74a5f9d04c37c2310f107e21a0f3713360dd \ - sha256 1bf29f620b91c901ad3116b47738ab5076c1aed75d13869cd3bc7f067b4aaadb +checksums ld64-242.tar.gz \ + rmd160 3fc096f0843e2ac949ea5b417eeb6595e8913b8f \ + sha256 bec1a5e20b599d108be0017736833c1f6212ea26c67f20d8437abc5d23433c36 \ + cctools-870.tar.gz \ + rmd160 21cfe0e5f14f4a16f198a9f52ed5e133b01ae3a2 \ + sha256 b83f4b4696414b814cc1781ec4b68ff9c7bb97920a68f308351a74e75f41d961 depends_build port:libunwind-headers -patchfiles cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch PR-12400897.patch cctools-862-prunetrie.patch cctools-862-unifdef__DARWIN_UNIX03-arm.patch cctools-862-no-lto.patch +patchfiles cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch PR-12400897.patch cctools-862-prunetrie.patch cctools-862-unifdef__DARWIN_UNIX03-arm.patch variant universal {} Deleted: trunk/dports/devel/cctools/files/cctools-862-no-lto.patch =================================================================== --- trunk/dports/devel/cctools/files/cctools-862-no-lto.patch 2015-09-24 10:27:48 UTC (rev 140578) +++ trunk/dports/devel/cctools/files/cctools-862-no-lto.patch 2015-09-24 10:32:28 UTC (rev 140579) @@ -1,16 +0,0 @@ ---- misc/libtool.c.orig 2014-11-01 22:48:10.000000000 -0700 -+++ misc/libtool.c 2015-02-11 13:47:57.000000000 -0800 -@@ -1374,8 +1374,11 @@ void) - } - } - } -- else if(ofiles[i].arch_type == OFILE_Mach_O || -- ofiles[i].arch_type == OFILE_LLVM_BITCODE){ -+ else if(ofiles[i].arch_type == OFILE_Mach_O -+#ifdef LTO_SUPPORT -+ || ofiles[i].arch_type == OFILE_LLVM_BITCODE -+#endif -+ ){ - if(cmd_flags.ranlib == TRUE){ - error("for architecture: %s file: %s is not an " - "archive (no processing done on this file)",

1 0

[140578] trunk/dports/devel/libmacho
by jeremyhu＠macports.org 24 Sep '15

24 Sep '15

Revision: 140578 https://trac.macports.org/changeset/140578 Author: jeremyhu(a)macports.org Date: 2015-09-24 03:27:48 -0700 (Thu, 24 Sep 2015) Log Message: ----------- libmacho: Bump to version 870 Modified Paths: -------------- trunk/dports/devel/libmacho/Portfile Removed Paths: ------------- trunk/dports/devel/libmacho/files/ Modified: trunk/dports/devel/libmacho/Portfile =================================================================== --- trunk/dports/devel/libmacho/Portfile 2015-09-24 02:38:52 UTC (rev 140577) +++ trunk/dports/devel/libmacho/Portfile 2015-09-24 10:27:48 UTC (rev 140578) @@ -3,9 +3,8 @@ PortSystem 1.0 name libmacho -version 862 -revision 3 -subport ${name}-headers { revision 2 } +version 870 +subport ${name}-headers { } categories devel platforms darwin maintainers jeremyhu openmaintainer @@ -21,14 +20,11 @@ dist_subdir cctools distname cctools-${version} -checksums rmd160 21ca74a5f9d04c37c2310f107e21a0f3713360dd \ - sha256 1bf29f620b91c901ad3116b47738ab5076c1aed75d13869cd3bc7f067b4aaadb +checksums rmd160 21cfe0e5f14f4a16f198a9f52ed5e133b01ae3a2 \ + sha256 b83f4b4696414b814cc1781ec4b68ff9c7bb97920a68f308351a74e75f41d961 use_configure no -patchfiles \ - ld64-getsectiondata.patch - if {${subport} == "${name}-headers"} { supported_archs noarch universal_variant no

1 0

propchange - r140577 svn:log
by eborisch＠macports.org 24 Sep '15

24 Sep '15

Author: eborisch(a)macports.org (original author: eborisch(a)macports.org) Revision: 140577 Property Name: svn:log @@ -1 +1 @@ -llvm/clang-3.[78]: Update 3.7 to release; update 3.8 to latest SVN. Add +openmp variant (makes "clang-mp-3.[78] -fopenmp ..." work) to 3.7 and 3.8. See #48759. +llvm/clang-3.[78]: Update 3.7 to release. Add +openmp variant (makes "clang-mp-3.[78] -fopenmp ..." work) to 3.7 and 3.8. See #48759.

1 0

[140577] trunk/dports/lang
by eborisch＠macports.org 24 Sep '15

24 Sep '15

Revision: 140577 https://trac.macports.org/changeset/140577 Author: eborisch(a)macports.org Date: 2015-09-23 19:38:52 -0700 (Wed, 23 Sep 2015) Log Message: ----------- llvm/clang-3.[78]: Update 3.7 to release; update 3.8 to latest SVN. Add +openmp variant (makes "clang-mp-3.[78] -fopenmp ..." work) to 3.7 and 3.8. See #48759. Modified Paths: -------------- trunk/dports/lang/llvm-3.7/Portfile trunk/dports/lang/llvm-3.8/Portfile Added Paths: ----------- trunk/dports/lang/llvm-3.7/files/openmp-locations.patch trunk/dports/lang/llvm-3.8/files/openmp-locations.patch Modified: trunk/dports/lang/llvm-3.7/Portfile =================================================================== --- trunk/dports/lang/llvm-3.7/Portfile 2015-09-24 01:18:36 UTC (rev 140576) +++ trunk/dports/lang/llvm-3.7/Portfile 2015-09-24 02:38:52 UTC (rev 140577) @@ -3,6 +3,7 @@ PortSystem 1.0 PortGroup select 1.0 PortGroup compiler_blacklist_versions 1.0 +PortGroup active_variants 1.1 set llvm_version 3.7 set llvm_version_no_dot 37 @@ -62,26 +63,25 @@ default_variants +analyzer } -fetch.type svn -svn.revision 246024 +#fetch.type svn +#svn.revision 246024 -set compiler_rt_rev ${svn.revision} -set libcxx_rev ${svn.revision} -set clang-modernize_rev ${svn.revision} -version ${llvm_version}-r${svn.revision} +#set compiler_rt_rev ${svn.revision} +#set libcxx_rev ${svn.revision} +#set clang-modernize_rev ${svn.revision} +#version ${llvm_version}-r${svn.revision} #worksrcdir trunk #svn.url https://llvm.org/svn/llvm-project/llvm/trunk -worksrcdir release_${llvm_version_no_dot} -svn.url https://llvm.org/svn/llvm-project/llvm/branches/release_${llvm_version_no_d… -default_variants-append +assertions +#worksrcdir release_${llvm_version_no_dot} +#svn.url https://llvm.org/svn/llvm-project/llvm/branches/release_${llvm_version_no_d… +#default_variants-append +assertions -#version ${llvm_version}.0 -#epoch 1 -#master_sites http://llvm.org/releases/${version} -#use_xz yes -#extract.suffix .tar.xz -#distfiles llvm-${version}.src${extract.suffix} -#worksrcdir llvm-${version}.src +version ${llvm_version}.0 +epoch 1 +master_sites http://llvm.org/releases/${version} +use_xz yes +distfiles llvm-${version}.src${extract.suffix} +worksrcdir llvm-${version}.src if {${distfiles} ne ""} { if {${subport} eq "llvm-${llvm_version}"} { @@ -93,6 +93,26 @@ } } +checksums \ + llvm-3.7.0.src.tar.xz \ + rmd160 1e47ce5e07df267a921c60e526673b2908ffb99b \ + sha256 ab45895f9dcdad1e140a3a79fd709f64b05ad7364e308c0e582c5b02e9cc3153 \ + cfe-3.7.0.src.tar.xz \ + rmd160 b59a82dcc44d16f1152f5204584bbc47861d223e \ + sha256 4ed740c5a91df1c90a4118c5154851d6a475f39a91346bdf268c1c29c13aa1cc \ + compiler-rt-3.7.0.src.tar.xz \ + rmd160 94cc920bce769e8b6234376ce8c517cdccd96e0c \ + sha256 227fa998520bc94974a428dc8e7654d9bdf277e5bc70d4064ebc05691bd62b0b \ + libcxx-3.7.0.src.tar.xz \ + rmd160 d78a0948483ff593ab2c39dc5ca745b4d08e8620 \ + sha256 c18f3c8333cd7e678c1424a57fe5e25efe740ca7caf62ac67152b4723f3ad08e \ + clang-tools-extra-3.7.0.src.tar.xz \ + rmd160 fda3871341bfbcfc28d8a368dd56ff8cf60b4987 \ + sha256 8ae8a0a3a96b7a700412d67df0af172cb2fc1326beec575fcc0f71d2e72709cd \ + polly-3.7.0.src.tar.xz \ + rmd160 6c26e90141608c2c4e883faf36c74c35d3ee3d3e \ + sha256 3e5f3f4dc141c7d25b36b910d48c7da74ecc92f10cea5b568c909623d6067edf + patch.pre_args -p1 patchfiles \ 0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \ @@ -326,6 +346,14 @@ destroot.args-append OVERRIDE_libdir=${sub_prefix}/lib } } elseif {${subport} eq "clang-${llvm_version}"} { + if {[variant_isset assertions]} { + # Need to match llvm +-assertions + require_active_variants port:llvm-${llvm_version} assertions + } else { + # Need to match llvm +-assertions + require_active_variants port:llvm-${llvm_version} {} assertions + } + variant analyzer description {Install clang static analyzer} { depends_run-append port:perl5 @@ -360,7 +388,18 @@ } } + variant openmp description {Use MacPorts' provided libomp with -fopenmp} { + configure.args-append \ + --with-clang-default-openmp-runtime=libomp + depends_lib-append port:libomp + patchfiles-append openmp-locations.patch + post-patch { + reinplace "s|@@PREFIX@@|${prefix}|" \ + ${worksrcpath}/tools/clang/lib/Driver/Tools.cpp + } + } + post-patch { reinplace "s|@CLANG_FORMAT_PATH@|${prefix}/bin/clang-format-${suffix}|g" \ ${worksrcpath}/tools/clang/tools/clang-format/clang-format-bbedit.applescript \ Added: trunk/dports/lang/llvm-3.7/files/openmp-locations.patch =================================================================== --- trunk/dports/lang/llvm-3.7/files/openmp-locations.patch (rev 0) +++ trunk/dports/lang/llvm-3.7/files/openmp-locations.patch 2015-09-24 02:38:52 UTC (rev 140577) @@ -0,0 +1,53 @@ +--- orig/tools/clang/lib/Driver/Tools.cpp 2015-09-03 11:39:15.000000000 -0500 ++++ fixed/tools/clang/lib/Driver/Tools.cpp 2015-09-03 11:44:09.000000000 -0500 +@@ -4064,6 +4064,8 @@ + case OMPRT_OMP: + case OMPRT_IOMP5: + // Clang can generate useful OpenMP code for these two runtime libraries. ++ // Automatically find MacPorts' omp.h ++ CmdArgs.push_back("-I@@PREFIX@@/include/libomp"); + CmdArgs.push_back("-fopenmp"); + + // If no option regarding the use of TLS in OpenMP codegeneration is +@@ -6531,12 +6533,18 @@ + options::OPT_fno_openmp, false)) { + switch (getOpenMPRuntime(getToolChain(), Args)) { + case OMPRT_OMP: ++ // Automatically find MacPorts' libomp ++ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp"); + CmdArgs.push_back("-lomp"); + break; + case OMPRT_GOMP: ++ // Automatically find MacPorts' libgomp (libomp) ++ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp"); + CmdArgs.push_back("-lgomp"); + break; + case OMPRT_IOMP5: ++ // Automatically find MacPorts' libiomp5 (libomp) ++ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp"); + CmdArgs.push_back("-liomp5"); + break; + case OMPRT_Unknown: +@@ -8248,9 +8256,13 @@ + // Also link the particular OpenMP runtimes. + switch (getOpenMPRuntime(ToolChain, Args)) { + case OMPRT_OMP: ++ // Automatically find MacPorts' libomp ++ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp"); + CmdArgs.push_back("-lomp"); + break; + case OMPRT_GOMP: ++ // Automatically find MacPorts' libgomp (libomp) ++ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp"); + CmdArgs.push_back("-lgomp"); + + // FIXME: Exclude this for platforms with libgomp that don't require +@@ -8258,6 +8270,8 @@ + CmdArgs.push_back("-lrt"); + break; + case OMPRT_IOMP5: ++ // Automatically find MacPorts' libiomp5 (libomp) ++ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp"); + CmdArgs.push_back("-liomp5"); + break; + case OMPRT_Unknown: Modified: trunk/dports/lang/llvm-3.8/Portfile =================================================================== --- trunk/dports/lang/llvm-3.8/Portfile 2015-09-24 01:18:36 UTC (rev 140576) +++ trunk/dports/lang/llvm-3.8/Portfile 2015-09-24 02:38:52 UTC (rev 140577) @@ -3,6 +3,7 @@ PortSystem 1.0 PortGroup select 1.0 PortGroup compiler_blacklist_versions 1.0 +PortGroup active_variants 1.1 set llvm_version 3.8 set llvm_version_no_dot 38 @@ -326,6 +327,14 @@ destroot.args-append OVERRIDE_libdir=${sub_prefix}/lib } } elseif {${subport} eq "clang-${llvm_version}"} { + if {[variant_isset assertions]} { + # Need to match llvm +-assertions + require_active_variants port:llvm-${llvm_version} assertions + } else { + # Need to match llvm +-assertions + require_active_variants port:llvm-${llvm_version} {} assertions + } + variant analyzer description {Install clang static analyzer} { depends_run-append port:perl5 @@ -360,7 +369,18 @@ } } + variant openmp description {Use MacPorts' provided libomp with -fopenmp} { + configure.args-append \ + --with-clang-default-openmp-runtime=libomp + depends_lib-append port:libomp + patchfiles-append openmp-locations.patch + post-patch { + reinplace "s|@@PREFIX@@|${prefix}|" \ + ${worksrcpath}/tools/clang/lib/Driver/Tools.cpp + } + } + post-patch { reinplace "s|@CLANG_FORMAT_PATH@|${prefix}/bin/clang-format-${suffix}|g" \ ${worksrcpath}/tools/clang/tools/clang-format/clang-format-bbedit.applescript \ Added: trunk/dports/lang/llvm-3.8/files/openmp-locations.patch =================================================================== --- trunk/dports/lang/llvm-3.8/files/openmp-locations.patch (rev 0) +++ trunk/dports/lang/llvm-3.8/files/openmp-locations.patch 2015-09-24 02:38:52 UTC (rev 140577) @@ -0,0 +1,53 @@ +--- orig/tools/clang/lib/Driver/Tools.cpp 2015-09-03 11:39:15.000000000 -0500 ++++ fixed/tools/clang/lib/Driver/Tools.cpp 2015-09-03 11:44:09.000000000 -0500 +@@ -4064,6 +4064,8 @@ + case OMPRT_OMP: + case OMPRT_IOMP5: + // Clang can generate useful OpenMP code for these two runtime libraries. ++ // Automatically find MacPorts' omp.h ++ CmdArgs.push_back("-I@@PREFIX@@/include/libomp"); + CmdArgs.push_back("-fopenmp"); + + // If no option regarding the use of TLS in OpenMP codegeneration is +@@ -6531,12 +6533,18 @@ + options::OPT_fno_openmp, false)) { + switch (getOpenMPRuntime(getToolChain(), Args)) { + case OMPRT_OMP: ++ // Automatically find MacPorts' libomp ++ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp"); + CmdArgs.push_back("-lomp"); + break; + case OMPRT_GOMP: ++ // Automatically find MacPorts' libgomp (libomp) ++ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp"); + CmdArgs.push_back("-lgomp"); + break; + case OMPRT_IOMP5: ++ // Automatically find MacPorts' libiomp5 (libomp) ++ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp"); + CmdArgs.push_back("-liomp5"); + break; + case OMPRT_Unknown: +@@ -8248,9 +8256,13 @@ + // Also link the particular OpenMP runtimes. + switch (getOpenMPRuntime(ToolChain, Args)) { + case OMPRT_OMP: ++ // Automatically find MacPorts' libomp ++ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp"); + CmdArgs.push_back("-lomp"); + break; + case OMPRT_GOMP: ++ // Automatically find MacPorts' libgomp (libomp) ++ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp"); + CmdArgs.push_back("-lgomp"); + + // FIXME: Exclude this for platforms with libgomp that don't require +@@ -8258,6 +8270,8 @@ + CmdArgs.push_back("-lrt"); + break; + case OMPRT_IOMP5: ++ // Automatically find MacPorts' libiomp5 (libomp) ++ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp"); + CmdArgs.push_back("-liomp5"); + break; + case OMPRT_Unknown:

1 0

[140576] users/mojca/ports/python/py-geomagpy/Portfile
by mojca＠macports.org 24 Sep '15

24 Sep '15

Revision: 140576 https://trac.macports.org/changeset/140576 Author: mojca(a)macports.org Date: 2015-09-23 18:18:36 -0700 (Wed, 23 Sep 2015) Log Message: ----------- mojca/py-geomagpy: remove the code for generating the GUI (now in a standalone port geomagpy) Modified Paths: -------------- users/mojca/ports/python/py-geomagpy/Portfile Modified: users/mojca/ports/python/py-geomagpy/Portfile =================================================================== --- users/mojca/ports/python/py-geomagpy/Portfile 2015-09-24 01:16:51 UTC (rev 140575) +++ users/mojca/ports/python/py-geomagpy/Portfile 2015-09-24 01:18:36 UTC (rev 140576) @@ -2,7 +2,6 @@ # $Id$ PortSystem 1.0 -PortGroup app 1.0 PortGroup python 1.0 name py-geomagpy @@ -31,12 +30,13 @@ # TODO: mysql depends_build-append \ port:py${python.version}-setuptools + # mysql and scipy are optional depends_run-append \ port:py${python.version}-numpy \ port:py${python.version}-scipy \ + port:py${python.version}-mysql \ port:py${python.version}-netcdf4 \ - port:py${python.version}-pexpect \ - port:py${python.version}-wxpython-3.0 + port:py${python.version}-pexpect patchfiles patch-gui-xmagpy.py.diff \ patch-setup.py.diff @@ -52,13 +52,6 @@ ln -s ${f} ${destroot}${prefix}/bin/xmagpy-${python.branch} } - # this could be a +gui option, enabled by default - app.name MagPy-${python.version} - # this doesn't work because post-destroot did not finish yet and xmagpy doesn't exist - # app.executable xmagpy-${python.version} - app.executable ${python.pkgd}/magpy/gui/xmagpy.py - app.icon ${worksrcpath}/magpy/gui/magpy.png - livecheck.type none } else { livecheck.type pypi

1 0

[140575] users/mojca/ports/science
by mojca＠macports.org 24 Sep '15

24 Sep '15

Revision: 140575 https://trac.macports.org/changeset/140575 Author: mojca(a)macports.org Date: 2015-09-23 18:16:51 -0700 (Wed, 23 Sep 2015) Log Message: ----------- mojca/geomagpy: preliminary port for GUI for MagPy Added Paths: ----------- users/mojca/ports/science/geomagpy/ users/mojca/ports/science/geomagpy/Portfile Added: users/mojca/ports/science/geomagpy/Portfile =================================================================== --- users/mojca/ports/science/geomagpy/Portfile (rev 0) +++ users/mojca/ports/science/geomagpy/Portfile 2015-09-24 01:16:51 UTC (rev 140575) @@ -0,0 +1,54 @@ +# -*- 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 app 1.0 + +name geomagpy +version 0.1.334 +categories science python +platforms darwin +license GPL-3 +maintainers mojca openmaintainer +supported_archs noarch + +description GUI for MagPy (geomagnetic analysis tools) +long_description ${description} + +homepage http://pypi.python.org/pypi/GeomagPy/ +distfiles + +use_configure no +build {} +destroot {} + +app.name MagPy + +variant python27 conflicts python34 description {Use Python 2.7 for the GUI} { + set python.version 27 + set python.branch 2.7 + + depends_build-append \ + port:py${python.version}-geomagpy + depends_run port:py${python.version}-geomagpy \ + port:py${python.version}-wxpython-3.0 + + app.executable xmagpy-${python.branch} + app.icon ${frameworks_dir}/Python.framework/Versions/${python.branch}/magpy/gui/magpy.png +} +variant python34 conflicts python27 description {Use Python 3.4 for the GUI (does not work yet)} { + set python.version 34 + set python.branch 3.4 + + depends_build-append \ + port:py${python.version}-geomagpy + depends_run port:py${python.version}-geomagpy + # phoenix + + app.executable xmagpy-${python.branch} + app.icon ${frameworks_dir}/Python.framework/Versions/${python.branch}/magpy/gui/magpy.png +} + +if {![variant_isset python27] && ![variant_isset python34]} { + default_variants-append +python27 +} Property changes on: users/mojca/ports/science/geomagpy/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native

1 0