January 2016 - macports-changes - lists.macosforge.org

[144227] trunk/dports/lang/julia/Portfile
by sean＠macports.org 05 Jan '16

05 Jan '16

Revision: 144227 https://trac.macports.org/changeset/144227 Author: sean(a)macports.org Date: 2016-01-04 16:49:23 -0800 (Mon, 04 Jan 2016) Log Message: ----------- julia: use macports openblas port This is change in the interface to julia to use the 32-bit interface for BLAS/LAPACK. For users that want a 64-bit interface, I have provided a variant. Modified Paths: -------------- trunk/dports/lang/julia/Portfile Modified: trunk/dports/lang/julia/Portfile =================================================================== --- trunk/dports/lang/julia/Portfile 2016-01-05 00:49:21 UTC (rev 144226) +++ trunk/dports/lang/julia/Portfile 2016-01-05 00:49:23 UTC (rev 144227) @@ -6,6 +6,7 @@ PortGroup compilers 1.0 github.setup JuliaLang julia 0.4.2 v +revision 1 categories-append lang math science maintainers sean openmaintainer platforms darwin @@ -42,7 +43,8 @@ port:fftw-3-single \ port:ncurses \ port:arpack \ - port:libgit2 + port:libgit2 \ + port:OpenBLAS use_configure no # use_parallel_build no @@ -60,17 +62,11 @@ ln -s ${prefix}/lib/libcholmod.dylib ${worksrcpath}/usr/lib/ ln -s ${prefix}/lib/libsuitesparseconfig.dylib ${worksrcpath}/usr/lib/ ln -s ${prefix}/lib/libarpack.dylib ${worksrcpath}/usr/lib/ + ln -s ${prefix}/lib/libopenblas.dylib ${worksrcpath}/usr/lib/ } build {} -# julia can't use Apple's Accelerate framework so the choices are to build -# lapack (32-bit interface) or build OpenBLAS (64-bit interface). -# Alternatively, we could try to use MacPorts' own OpenBLAS port but that would -# need to be updated to build the 64-bit interface which is inocmpatible with -# the 32-bit interface. Since that could break other ports dependent on -# OpenBLAS, we'll just stick with having julia download and build its own -# internal OpenBLAS. pre-destroot { destroot.args-append \ CC=${configure.cc} \ @@ -87,7 +83,14 @@ USE_SYSTEM_FFTW=1 \ USE_SYSTEM_ARPACK=1 \ USE_SYSTEM_SUITESPARSE=1 \ - USE_SYSTEM_LIBGIT2=1 + USE_SYSTEM_LIBGIT2=1 \ + USE_SYSTEM_BLAS=1 \ + USE_SYSTEM_LAPACK=1 \ + USE_BLAS64=0 \ + LIBBLAS=-lopenblas \ + LIBBLASNAME=libopenblas \ + LIBLAPACK=-lopenblas \ + LIBLAPACKNAME=libopenblas } post-destroot { @@ -106,4 +109,20 @@ } } +variant blas64 description {Build internal OpenBLAS with 64-bit interface} { + depends_lib-delete \ + port:OpenBLAS + + pre-destroot { + destroot.args-delete \ + USE_SYSTEM_BLAS=1 \ + USE_SYSTEM_LAPACK=1 \ + USE_BLAS64=0 \ + LIBBLAS=-lopenblas \ + LIBBLASNAME=libopenblas \ + LIBLAPACK=-lopenblas \ + LIBLAPACKNAME=libopenblas + } +} + livecheck.regex archive/[join ${github.tag_prefix} ""](\[^"-\]+)${extract.suffix}

1 0

[144226] trunk/dports/lang/julia/Portfile
by sean＠macports.org 05 Jan '16

05 Jan '16

Revision: 144226 https://trac.macports.org/changeset/144226 Author: sean(a)macports.org Date: 2016-01-04 16:49:21 -0800 (Mon, 04 Jan 2016) Log Message: ----------- julia: use macports libgit2; fixes #49777 Modified Paths: -------------- trunk/dports/lang/julia/Portfile Modified: trunk/dports/lang/julia/Portfile =================================================================== --- trunk/dports/lang/julia/Portfile 2016-01-05 00:49:18 UTC (rev 144225) +++ trunk/dports/lang/julia/Portfile 2016-01-05 00:49:21 UTC (rev 144226) @@ -41,7 +41,8 @@ port:fftw-3 \ port:fftw-3-single \ port:ncurses \ - port:arpack + port:arpack \ + port:libgit2 use_configure no # use_parallel_build no @@ -85,7 +86,8 @@ USE_SYSTEM_PCRE=1 \ USE_SYSTEM_FFTW=1 \ USE_SYSTEM_ARPACK=1 \ - USE_SYSTEM_SUITESPARSE=1 + USE_SYSTEM_SUITESPARSE=1 \ + USE_SYSTEM_LIBGIT2=1 } post-destroot {

1 0

[144225] trunk/dports/lang/julia/Portfile
by sean＠macports.org 05 Jan '16

05 Jan '16

Revision: 144225 https://trac.macports.org/changeset/144225 Author: sean(a)macports.org Date: 2016-01-04 16:49:18 -0800 (Mon, 04 Jan 2016) Log Message: ----------- julia: add missing dependency on arpack; fixes #48927 Modified Paths: -------------- trunk/dports/lang/julia/Portfile Modified: trunk/dports/lang/julia/Portfile =================================================================== --- trunk/dports/lang/julia/Portfile 2016-01-05 00:49:18 UTC (rev 144224) +++ trunk/dports/lang/julia/Portfile 2016-01-05 00:49:18 UTC (rev 144225) @@ -40,7 +40,8 @@ port:SuiteSparse \ port:fftw-3 \ port:fftw-3-single \ - port:ncurses + port:ncurses \ + port:arpack use_configure no # use_parallel_build no @@ -57,6 +58,7 @@ ln -s ${prefix}/lib/libumfpack.dylib ${worksrcpath}/usr/lib/ ln -s ${prefix}/lib/libcholmod.dylib ${worksrcpath}/usr/lib/ ln -s ${prefix}/lib/libsuitesparseconfig.dylib ${worksrcpath}/usr/lib/ + ln -s ${prefix}/lib/libarpack.dylib ${worksrcpath}/usr/lib/ } build {}

1 0

[144224] trunk/dports/python/py-matplotlib
by sean＠macports.org 05 Jan '16

05 Jan '16

Revision: 144224 https://trac.macports.org/changeset/144224 Author: sean(a)macports.org Date: 2016-01-04 16:49:18 -0800 (Mon, 04 Jan 2016) Log Message: ----------- py-matplotlib: add patch for ppc; fixes #49607 Modified Paths: -------------- trunk/dports/python/py-matplotlib/Portfile Added Paths: ----------- trunk/dports/python/py-matplotlib/files/patch-src-macosx.m.diff Modified: trunk/dports/python/py-matplotlib/Portfile =================================================================== --- trunk/dports/python/py-matplotlib/Portfile 2016-01-05 00:49:16 UTC (rev 144223) +++ trunk/dports/python/py-matplotlib/Portfile 2016-01-05 00:49:18 UTC (rev 144224) @@ -6,6 +6,7 @@ PortGroup github 1.0 github.setup matplotlib matplotlib 1.5.0 v +revision 1 name py-matplotlib categories-append graphics math @@ -50,7 +51,8 @@ port:py${python.version}-cycler patchfiles-append patch-setup.cfg.diff \ - patch-setupext.py.diff + patch-setupext.py.diff \ + patch-src-macosx.m.diff build.env PKG_CONFIG_PATH="${python.prefix}/lib/pkgconfig" Added: trunk/dports/python/py-matplotlib/files/patch-src-macosx.m.diff =================================================================== --- trunk/dports/python/py-matplotlib/files/patch-src-macosx.m.diff (rev 0) +++ trunk/dports/python/py-matplotlib/files/patch-src-macosx.m.diff 2016-01-05 00:49:18 UTC (rev 144224) @@ -0,0 +1,11 @@ +--- src/_macosx.m.orig 2015-11-29 10:44:55.000000000 -0700 ++++ src/_macosx.m 2015-11-29 11:02:16.000000000 -0700 +@@ -1,5 +1,8 @@ + #include <Cocoa/Cocoa.h> + #include <ApplicationServices/ApplicationServices.h> ++#ifndef kCTForegroundColorFromContextAttributeName ++extern const CFStringRef kCTForegroundColorFromContextAttributeName AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER; ++#endif + #include <sys/socket.h> + #include <Python.h> + #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION

1 0

[144223] trunk/dports/science/ccpnmr/Portfile
by sean＠macports.org 05 Jan '16

05 Jan '16

Revision: 144223 https://trac.macports.org/changeset/144223 Author: sean(a)macports.org Date: 2016-01-04 16:49:16 -0800 (Mon, 04 Jan 2016) Log Message: ----------- ccpnmr: use compilers portgroup; fixes #49010 Modified Paths: -------------- trunk/dports/science/ccpnmr/Portfile Modified: trunk/dports/science/ccpnmr/Portfile =================================================================== --- trunk/dports/science/ccpnmr/Portfile 2016-01-05 00:41:40 UTC (rev 144222) +++ trunk/dports/science/ccpnmr/Portfile 2016-01-05 00:49:16 UTC (rev 144223) @@ -2,6 +2,7 @@ # $Id$ PortSystem 1.0 +PortGroup compilers 1.0 name ccpnmr version 2.4.2 @@ -27,6 +28,9 @@ patchfiles ccpnmr.patch use_configure no +compilers.choose cc cxx +compilers.setup -clang -dragonegg -g95 -gfortran -llvm + set python.branch 2.7 set python.prefix ${frameworks_dir}/Python.framework/Versions/${python.branch} set python.bin ${python.prefix}/bin/python${python.branch} @@ -34,9 +38,11 @@ set python.libdir ${python.prefix}/lib/python${python.branch} set python.include ${python.prefix}/include/python${python.branch} -set lib "" - post-patch { + set lib "" + if {[gcc_variant_isset]} { + set lib "${prefix}/lib/[gcc_variant_name]" + } reinplace "s|@PYTHON_BIN@|${python.bin}|g" ${worksrcpath}/bin/analysis \ ${worksrcpath}/bin/formatConverter \ ${worksrcpath}/bin/pipe2azara \ @@ -78,27 +84,6 @@ system "${python.bin} -O ${python.libdir}/compileall.py -d ${python.pkgd}/${name}/${name}${branch} ${destroot}${python.pkgd}/${name}/${name}${branch}" } -variant gcc45 conflicts gcc46 gcc47 gcc48 gcc49 description {Build with GCC 4.5} { - configure.compiler macports-gcc-4.5 - set lib ${prefix}/lib/gcc45 +if {![gcc_variant_isset]} { + default_variants-append +${compilers.gcc_default} } -variant gcc46 conflicts gcc45 gcc47 gcc48 gcc49 description {Build with GCC 4.6} { - configure.compiler macports-gcc-4.6 - set lib ${prefix}/lib/gcc46 -} -variant gcc47 conflicts gcc45 gcc46 gcc48 gcc49 description {Build with GCC 4.7} { - configure.compiler macports-gcc-4.7 - set lib ${prefix}/lib/gcc47 -} -variant gcc48 conflicts gcc45 gcc46 gcc47 gcc49 description {Build with GCC 4.8} { - configure.compiler macports-gcc-4.8 - set lib ${prefix}/lib/gcc48 -} -variant gcc49 conflicts gcc45 gcc46 gcc47 gcc48 description {Build with GCC 4.9} { - configure.compiler macports-gcc-4.9 - set lib ${prefix}/lib/gcc49 -} - -if {![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset gcc48] && ![variant_isset gcc49]} { - default_variants +gcc48 -}

1 0

[144222] trunk/dports/science/metar/Portfile
by mojca＠macports.org 05 Jan '16

05 Jan '16

Revision: 144222 https://trac.macports.org/changeset/144222 Author: mojca(a)macports.org Date: 2016-01-04 16:41:40 -0800 (Mon, 04 Jan 2016) Log Message: ----------- metar: checksums, minor changes in perl5 handling (#48365) Modified Paths: -------------- trunk/dports/science/metar/Portfile Modified: trunk/dports/science/metar/Portfile =================================================================== --- trunk/dports/science/metar/Portfile 2016-01-05 00:12:54 UTC (rev 144221) +++ trunk/dports/science/metar/Portfile 2016-01-05 00:41:40 UTC (rev 144222) @@ -20,11 +20,11 @@ homepage http://github.com/elboza/metar master_sites http://www.autistici.org/0xFE/software/releases/metar/ -checksums md5 c694636e3f402423b8de39eab3e6beec \ - sha1 4e8401f89a3db0434505633d9244e324b953daea \ - rmd160 28644bc6b2507352236b2e2cf8e0975724678b77 +checksums rmd160 28644bc6b2507352236b2e2cf8e0975724678b77 \ + sha256 194b17dc559f91c45847b5fdecceb0d8f71b97ce77b989a728a7416406edfdfa -depends_lib-append port:p${perl5.default_branch}-libwww-perl +perl5.branches 5.22 +depends_lib-append port:p${perl5.major}-libwww-perl worksrcdir ${name} use_configure no @@ -33,8 +33,8 @@ destroot.destdir DEST_DIR=${destroot}${prefix}/bin -pre-destroot { - reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl${perl5.default_branch}|g" ${worksrcpath}/${name}.pl +post-patch { + reinplace "s|#!/usr/bin/perl|#!${perl5.bin}|g" ${worksrcpath}/${name}.pl } post-destroot {

1 0

[144221] trunk/dports/textproc/cloc
by mojca＠macports.org 05 Jan '16

05 Jan '16

Revision: 144221 https://trac.macports.org/changeset/144221 Author: mojca(a)macports.org Date: 2016-01-04 16:12:54 -0800 (Mon, 04 Jan 2016) Log Message: ----------- cloc: switch to perl5.22 (#48365), patches for compatibility with 5.22 Modified Paths: -------------- trunk/dports/textproc/cloc/Portfile Added Paths: ----------- trunk/dports/textproc/cloc/files/ trunk/dports/textproc/cloc/files/patch-cloc.diff Modified: trunk/dports/textproc/cloc/Portfile =================================================================== --- trunk/dports/textproc/cloc/Portfile 2016-01-05 00:02:53 UTC (rev 144220) +++ trunk/dports/textproc/cloc/Portfile 2016-01-05 00:12:54 UTC (rev 144221) @@ -2,10 +2,12 @@ # $Id$ PortSystem 1.0 +PortGroup perl5 1.0 name cloc version 1.64 -set perl_version 5.16 +perl5.branches 5.22 +revision 1 categories textproc devel license GPL-2 Artistic-1 platforms darwin @@ -23,27 +25,21 @@ checksums rmd160 025b0347177dcfa245c35789362c5ce0dc8f6634 \ sha256 309701142f54ee5b244307dec2d07848b71af9b9fee01437d3f7440193f975f0 -depends_run-append port:perl${perl_version} \ - port:p${perl_version}-algorithm-diff \ - port:p${perl_version}-regexp-common \ - port:p${perl_version}-digest-md5 +depends_run-append port:perl${perl5.major} \ + port:p${perl5.major}-algorithm-diff \ + port:p${perl5.major}-regexp-common \ + port:p${perl5.major}-digest-md5 -use_configure no - -patch { +patchfiles patch-cloc.diff +post-patch { reinplace -W ${worksrcpath} \ - "s|^#!/usr/bin/env perl|#!${prefix}/bin/perl${perl_version}|" \ + "s|^#!/usr/bin/env perl|#!${perl5.bin}|" \ cloc sqlite_formatter } -build {} +use_configure no +build {} destroot.args-append prefix=${prefix} -post-destroot { - reinplace -W ${destroot}${prefix}/bin \ - "s|#!/usr/bin/env perl|#! ${prefix}/bin/perl${perl_version}|" \ - cloc -} - livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)\.pl Added: trunk/dports/textproc/cloc/files/patch-cloc.diff =================================================================== --- trunk/dports/textproc/cloc/files/patch-cloc.diff (rev 0) +++ trunk/dports/textproc/cloc/files/patch-cloc.diff 2016-01-05 00:12:54 UTC (rev 144221) @@ -0,0 +1,70 @@ +--- cloc.orig ++++ cloc +@@ -1281,8 +1281,8 @@ + $not_Filters_by_Language_Lang_LR = 1; + } + } else { +- if (!defined(@{$Filters_by_Language{$Lang_L} }) or +- !defined(@{$Filters_by_Language{$Lang_R} })) { ++ if (!(@{$Filters_by_Language{$Lang_L} }) or ++ !(@{$Filters_by_Language{$Lang_R} })) { + $not_Filters_by_Language_Lang_LR = 1; + } + } +@@ -1618,7 +1618,7 @@ + $Ignored{$file} = "--exclude-lang=$Language{$file}"; + next; + } +- my $Filters_by_Language_Language_file = !defined @{$Filters_by_Language{$Language{$file}} }; ++ my $Filters_by_Language_Language_file = !@{$Filters_by_Language{$Language{$file}} }; + if ($Filters_by_Language_Language_file) { + if ($Language{$file} eq "(unknown)") { + $Ignored{$file} = "language unknown (#1)"; +@@ -1759,7 +1759,7 @@ + if ($PERL_516) { + next unless @{$rhaa_Filters_by_Language->{$1}}; + } else { +- next unless defined @{$rhaa_Filters_by_Language->{$1}}; ++ next unless @{$rhaa_Filters_by_Language->{$1}}; + } + # above test necessary to avoid trying to sum reports + # of reports (which have no language breakdown). +@@ -3259,7 +3259,7 @@ + } # 1}}} + sub print_language_filters { # {{{1 + my ($language,) = @_; +- if (!defined @{$Filters_by_Language{$language}}) { ++ if (!@{$Filters_by_Language{$language}}) { + warn "Unknown language: $language\n"; + warn "Use --show-lang to list all defined languages.\n"; + return; +@@ -4623,7 +4623,7 @@ + + open (FILE, $file); + while (<FILE>) { +- if (m/^\\begin{code}/) { close FILE; return 2; } ++ if (m/^\\begin\{code}/) { close FILE; return 2; } + if (m/^>\s/) { close FILE; return 1; } + } + +@@ -4652,9 +4652,9 @@ + if (!s/^>//) { s/.*//; } + } elsif ($literate == 2) { + if ($inlitblock) { +- if (m/^\\end{code}/) { s/.*//; $inlitblock = 0; } ++ if (m/^\\end\{code}/) { s/.*//; $inlitblock = 0; } + } elsif (!$inlitblock) { +- if (m/^\\begin{code}/) { s/.*//; $inlitblock = 1; } ++ if (m/^\\begin\{code}/) { s/.*//; $inlitblock = 1; } + else { s/.*//; } + } + } +@@ -6582,7 +6582,7 @@ + my $language = $rh_Language_by_Extension->{$ext}; + next if defined $extension_collisions{$language}; + next if $seen_it{$language}; +- if (!defined @{$rhaa_Filters_by_Language->{$language}}) { ++ if (!@{$rhaa_Filters_by_Language->{$language}}) { + $OK = 0; + warn "Missing language filter for $language\n"; + }

1 0

[144220] trunk/dports/devel/myrepos/Portfile
by mojca＠macports.org 05 Jan '16

05 Jan '16

Revision: 144220 https://trac.macports.org/changeset/144220 Author: mojca(a)macports.org Date: 2016-01-04 16:02:53 -0800 (Mon, 04 Jan 2016) Log Message: ----------- myrepos: switch to perl5.22 (#48365) Modified Paths: -------------- trunk/dports/devel/myrepos/Portfile Modified: trunk/dports/devel/myrepos/Portfile =================================================================== --- trunk/dports/devel/myrepos/Portfile 2016-01-04 23:53:50 UTC (rev 144219) +++ trunk/dports/devel/myrepos/Portfile 2016-01-05 00:02:53 UTC (rev 144220) @@ -3,9 +3,10 @@ PortSystem 1.0 PortGroup github 1.0 +PortGroup perl5 1.0 github.setup joeyh myrepos 1.20150503 -revision 1 +revision 2 categories devel platforms darwin @@ -29,15 +30,15 @@ use_configure no build.target build -set perl_version 5.16 -depends_lib port:perl${perl_version} +perl5.branches 5.22 +depends_lib port:perl${perl5.major} -depends_run port:p${perl_version}-html-parser \ - port:p${perl_version}-libwww-perl \ - port:p${perl_version}-getopt-long +depends_run port:p${perl5.major}-html-parser \ + port:p${perl5.major}-libwww-perl \ + port:p${perl5.major}-getopt-long post-patch { - reinplace -locale C "s|^#!.*perl|#!${prefix}/bin/perl${perl_version}|" ${worksrcpath}/mr ${worksrcpath}/webcheckout + reinplace -locale C "s|^#!.*perl|#!${perl5.bin}|" ${worksrcpath}/mr ${worksrcpath}/webcheckout } destroot {

1 0

[144219] trunk/dports/devel/globus-core
by mojca＠macports.org 04 Jan '16

04 Jan '16

Revision: 144219 https://trac.macports.org/changeset/144219 Author: mojca(a)macports.org Date: 2016-01-04 15:53:50 -0800 (Mon, 04 Jan 2016) Log Message: ----------- globus-core: fixes for perl (r144216, #48365), still broken (#50215) Revision Links: -------------- https://trac.macports.org/changeset/144216 Modified Paths: -------------- trunk/dports/devel/globus-core/Portfile trunk/dports/devel/globus-core/files/patch-globus-core-automake-obsolete-macro.diff trunk/dports/devel/globus-core/files/patch-globus-core-perldir.diff Modified: trunk/dports/devel/globus-core/Portfile =================================================================== --- trunk/dports/devel/globus-core/Portfile 2016-01-04 23:48:57 UTC (rev 144218) +++ trunk/dports/devel/globus-core/Portfile 2016-01-04 23:53:50 UTC (rev 144219) @@ -45,8 +45,18 @@ patchfiles patch-globus-core-automake-obsolete-macro.diff \ patch-globus-core-perldir.diff -patch.pre_args -p1 +post-patch { + reinplace "s|@@PERLLIB@@|${perl5.lib}|" ${worksrcpath}/configure.in + reinplace "s|libtoolize|glibtoolize|g" ${worksrcpath}/bootstrap +} +# this should probably be an "autoconf" step +pre-configure { + file delete -force ${worksrcpath}/autom4te.cache + system "cd ${worksrcpath} && \ + GLOBUS_LOCATION=${prefix} GPT_LOCATION=${prefix} ./bootstrap" +} + depends_build port:grid-packaging-tools \ port:libtool \ port:autoconf \ @@ -76,13 +86,6 @@ build.env-append GPT_LOCATION=${prefix} \ GLOBUS_LOCATION=${prefix} -pre-configure { - file delete -force ${worksrcpath}/autom4te.cache - reinplace "s/libtoolize/glibtoolize/g" ${worksrcpath}/bootstrap - system "cd ${worksrcpath} && \ - GLOBUS_LOCATION=${prefix} GPT_LOCATION=${prefix} ./bootstrap" -} - post-destroot { # These scripts are intended to be sourced, not executed system "chmod 644 ${destroot}${prefix}/share/globus/globus-build-env-*.sh" Modified: trunk/dports/devel/globus-core/files/patch-globus-core-automake-obsolete-macro.diff =================================================================== --- trunk/dports/devel/globus-core/files/patch-globus-core-automake-obsolete-macro.diff 2016-01-04 23:48:57 UTC (rev 144218) +++ trunk/dports/devel/globus-core/files/patch-globus-core-automake-obsolete-macro.diff 2016-01-04 23:53:50 UTC (rev 144219) @@ -1,5 +1,5 @@ ---- globus_core-8.9.orig/configure.in 2011-12-05 21:27:20.000000000 +0100 -+++ globus_core-8.9/configure.in 2013-01-18 11:50:18.742812017 +0100 +--- configure.in.orig ++++ configure.in @@ -21,7 +21,7 @@ GPT_INIT AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION,0) Modified: trunk/dports/devel/globus-core/files/patch-globus-core-perldir.diff =================================================================== --- trunk/dports/devel/globus-core/files/patch-globus-core-perldir.diff 2016-01-04 23:48:57 UTC (rev 144218) +++ trunk/dports/devel/globus-core/files/patch-globus-core-perldir.diff 2016-01-04 23:53:50 UTC (rev 144219) @@ -1,15 +1,11 @@ ---- globus_core-8.9-orig/configure.in 2011-12-05 21:27:20.000000000 +0100 -+++ globus_core-8.9/configure.in 2013-06-21 16:28:42.471409885 +0200 -@@ -89,7 +89,11 @@ +--- configure.in.orig ++++ configure.in +@@ -89,7 +89,7 @@ perlmoduledir=$withval ], [ - perlmoduledir='${prefix}/lib/perl' -+ if test -x ${prefix}/bin/perl ; then -+ perlmoduledir=`${prefix}/bin/perl -V:installvendorlib | cut -d\' -f 2` -+ else -+ perlmoduledir='${prefix}/lib/perl' -+ fi ++ perlmoduledir=@@PERLLIB@@ ]) AC_SUBST(perlmoduledir)

1 0

[144218] trunk/dports/lang/py-htmldocs/Portfile
by eborisch＠macports.org 04 Jan '16

04 Jan '16

Revision: 144218 https://trac.macports.org/changeset/144218 Author: eborisch(a)macports.org Date: 2016-01-04 15:48:57 -0800 (Mon, 04 Jan 2016) Log Message: ----------- py-htmldocs: Move back to using ftp/python/doc (more stable) when available; Always store in dist_subdirs; Bump base rev to get everyone on the same page here. Also updated 34 version to latest docs. Modified Paths: -------------- trunk/dports/lang/py-htmldocs/Portfile Modified: trunk/dports/lang/py-htmldocs/Portfile =================================================================== --- trunk/dports/lang/py-htmldocs/Portfile 2016-01-04 23:27:11 UTC (rev 144217) +++ trunk/dports/lang/py-htmldocs/Portfile 2016-01-04 23:48:57 UTC (rev 144218) @@ -7,7 +7,8 @@ python.versions 26 27 31 32 33 34 35 python.default_version 27 version 1.0 -revision 1 +set base_rev 2 +revision ${base_rev} license {PSF} if {$subport != $name} { @@ -16,7 +17,7 @@ if {${python.version} == 31} { version 3.1.5 } if {${python.version} == 32} { version 3.2.6 } if {${python.version} == 33} { version 3.3.6 } - if {${python.version} == 34} { version 3.4.3 } + if {${python.version} == 34} { version 3.4.4 } if {${python.version} == 35} { version 3.5.1 } } @@ -40,61 +41,57 @@ long_description Access Python ${version} HTML docs via \ file://${prefix}/share/doc/python${python.version}-doc/index.html - master_sites http://docs.python.org/${python.branch}/archives + master_sites http://www.python.org/ftp/python/doc/${version} distname python-${version}-docs-html + dist_subdir ${name}/${revision} set extractname ${distname} depends_lib-delete port:python${python.version} notes ${long_description} if {${python.version} == 26} { - revision 1 checksums \ rmd160 a7bd375ac3a62249529da805693c3b15510ff976 \ sha256 f3faa71f4b0cc8fa2bb6c5624233ae79983a2d5c11195fb2089668c60ceb7f1f } if {${python.version} == 27} { - revision 2 - dist_subdir ${name}/${revision} + set revision [expr ${base_rev}+1] checksums \ - rmd160 5962cd9d48d5678a832cfef7a693ffcadb66d55e \ - sha256 a6b61188de5e26295533a619f0e89dd180c6b4385d27e3239581de8aa1d4ceaf + rmd160 4dafd3e4e2493f23dd752bb2ce059bac0226d35f \ + sha256 806917ebf99d5b572831583070e44db341405634d5cfdd795ef1e608c05221e8 } if {${python.version} == 31} { - revision 1 checksums \ rmd160 29717979d6a8b4e970a4747e101259da3e3890c1 \ sha256 ff327cfaa1219d8d82fcb4f3bae3ec4ce28567982a49784004130521d282faa0 } if {${python.version} == 32} { - revision 1 checksums \ rmd160 039539fc90454d35525c8b9478156f7135b86622 \ sha256 b746ef40a29abe7949e5f183e236a0734c58b841c0600043160a518390704c13 } if {${python.version} == 33} { - revision 1 checksums \ rmd160 84290bfaea54b943025f7088268f256d4a50cf71 \ sha256 54da33f8a91be819e7ac22fdc88c5125bdd4c67494f52dd79d6b603572c41fb0 } if {${python.version} == 34} { - revision 1 + master_sites http://docs.python.org/${python.branch}/archives checksums \ - rmd160 3cfdc8682fee199be83163026aa2a387f36e14af \ - sha256 62690cf2d6781cf761aa4ae3c81b8a794700f6b61e4cef0cadbcf4f96a5b7da1 + rmd160 61a2f71b85b5e50c38de8e5616ffd87a4a382bf6 \ + sha256 8554b59a5aea9801ae735cafd13585f6e07c25cb71dba2402bd4eacfc05ee2e0 } if {${python.version} == 35} { - revision 2 - dist_subdir ${name}/${revision} + master_sites http://docs.python.org/${python.branch}/archives + set revision [expr ${base_rev}+1] checksums \ - rmd160 708cb554c1b80bcf795f89936ca9bdac11abffb5 \ - sha256 ad75e90b950c6abfae550680576ad8ffa48d8ef579fcb98687037590c7576d98 + rmd160 3e99602293474b478c97ee7ba004065ab65d9196 \ + sha256 1e395e25837fd8898cdd56511c6b56a2ceaace3145e2913e3544a4dfa0f63916 } build {}

1 0