Revision: 148322 https://trac.macports.org/changeset/148322 Author: khindenburg@macports.org Date: 2016-05-03 19:16:11 -0700 (Tue, 03 May 2016) Log Message: ----------- arb: update to 6.0.4 maintainer #51291 #49963 #51156 Modified Paths: -------------- trunk/dports/science/arb/Portfile Removed Paths: ------------- trunk/dports/science/arb/files/patch-ARB-arb_compiler_version.pl.diff trunk/dports/science/arb/files/patch-Makefile.diff Modified: trunk/dports/science/arb/Portfile =================================================================== --- trunk/dports/science/arb/Portfile 2016-05-04 01:41:40 UTC (rev 148321) +++ trunk/dports/science/arb/Portfile 2016-05-04 02:16:11 UTC (rev 148322) @@ -6,8 +6,7 @@ name arb epoch 2 -version 6.0.1 -revision 3 +version 6.0.4 categories science maintainers mac.com:matt.cottrell platforms darwin @@ -30,10 +29,10 @@ master_sites http://download.arb-home.de/release/${name}-${version}/ distname arb-${version}-source extract.suffix .tgz -worksrcdir arbsrc_12565 +worksrcdir arbsrc_14797 -checksums rmd160 37c4dd0d973b737758d3da84bdfdec0bd3d44bc1 \ - sha256 1b91d883981e47f3d96c4da80d9e1bf6e842e52dfe7e38b40bf3d091545aedcb +checksums rmd160 a7e6ba2dff3eceba97d17e076c3efb333930dd72 \ + sha256 875301f138974694144b11091b0303a22efcfe7c6291c438881da64179820ce0 depends_build port:makedepend \ port:pkgconfig @@ -53,10 +52,8 @@ patchfiles patch-ARB-config.makefile.diff \ patch-ARB-intro.fig.diff \ - patch-ARB-arb.diff \ - patch-ARB-arb_compiler_version.pl.diff \ - patch-Makefile.diff - + patch-ARB-arb.diff + platform darwin { if {${os.major} < 11} { depends_build-append port:coreutils @@ -103,7 +100,7 @@ file rename ${worksrcpath}/lib/arb_tcp.dat ${worksrcpath}/lib/arb_tcp.dat.default file rename ${worksrcpath}/lib/macros ${worksrcpath}/lib/macros.default - eval xinstall -m 0755 [glob ${worksrcpath}/bin/*] ${destroot}${prefix}/bin + xinstall -m 0755 {*}[glob ${worksrcpath}/bin/*] ${destroot}${prefix}/bin file mkdir ${destroot}${prefix}/share/arb/bin file copy ${worksrcpath}/PERL_SCRIPTS ${destroot}${prefix}/share/arb/PERL_SCRIPTS @@ -117,6 +114,7 @@ ln -s ${prefix}/bin/arb_pt_server ${destroot}${prefix}/share/arb/bin/arb_pt_server ln -s ${prefix}/bin/arb_name_server ${destroot}${prefix}/share/arb/bin/arb_name_server + ln -s ${prefix}/bin/muscle ${destroot}${prefix}/share/arb/bin/muscle xinstall -m 777 -d ${destroot}${prefix}/share/arb/lib/pts } @@ -216,4 +214,4 @@ livecheck.type regex livecheck.url http://download.arb-home.de/build/ -livecheck.regex ${name}-(\[0-9.\]+)-rc1-source/${extract.suffix} +livecheck.regex ${name}-(\[0-9.\]+) Deleted: trunk/dports/science/arb/files/patch-ARB-arb_compiler_version.pl.diff =================================================================== --- trunk/dports/science/arb/files/patch-ARB-arb_compiler_version.pl.diff 2016-05-04 01:41:40 UTC (rev 148321) +++ trunk/dports/science/arb/files/patch-ARB-arb_compiler_version.pl.diff 2016-05-04 02:16:11 UTC (rev 148322) @@ -1,52 +0,0 @@ ---- SOURCE_TOOLS/arb_compiler_version.pl.orig 2014-07-22 09:59:34.000000000 -0500 -+++ SOURCE_TOOLS/arb_compiler_version.pl 2014-08-05 04:34:02.000000000 -0500 -@@ -26,17 +26,22 @@ - if (not defined $dumpedVersion) { $dumpedVersion = $undetectable; } - if (not defined $detailedVersion) { $detailedVersion = $undetectable; } - -- if ($detailedVersion =~ /\s/) { -- my $firstWord = $`; -- if ($firstWord eq 'gcc' or $firstWord eq 'clang') { -- $detectedCompiler = $firstWord; -+ my $cmd = "$compiler -dM -E -x c /dev/null"; -+ if (open(CMD,$cmd.'|')) { -+ LINE: foreach (<CMD>) { -+ if (/__GNUC__/) { -+ $detectedCompiler = 'gcc'; -+ # clang also defines __GNUC__ so don't "last" here -+ } -+ elsif (/__clang__/) { -+ $detectedCompiler = 'clang'; -+ last LINE; -+ } - } -- elsif ($firstWord eq 'g++') { $detectedCompiler = 'gcc'; } -- elsif ($firstWord eq 'clang++') { $detectedCompiler = 'clang'; } -+ close(CMD); - } -- -- if ($detectedCompiler eq 'unknown') { -- if ($detailedVersion =~ /apple.*llvm.*clang/oi) { $detectedCompiler = 'clang'; } -+ else { -+ print STDERR "failed to execute '$cmd'"; - } - - if ($detectedCompiler eq 'unknown') { -@@ -45,13 +50,11 @@ - print STDERR "detailedVersion='$detailedVersion'\n"; - } - -- if ($dumpedVersion =~ /\..*\./) { -- $detectedVersion = $dumpedVersion; -+ if ($detailedVersion =~ /\s([0-9]+(?:\.[0-9]+)+)\s/) { -+ $detectedVersion = $1; - } -- else { # if version info does not contain patchlevel -> use detailedVersion -- if ($detailedVersion =~ /\s([0-9]+\.[0-9]+\.[0-9]+)\s/) { -- $detectedVersion = $1; -- } -+ elsif ($dumpedVersion =~ /^([0-9]+(?:\.[0-9]+)+)$/) { -+ $detectedVersion = $dumpedVersion; - } - } - Deleted: trunk/dports/science/arb/files/patch-Makefile.diff =================================================================== --- trunk/dports/science/arb/files/patch-Makefile.diff 2016-05-04 01:41:40 UTC (rev 148321) +++ trunk/dports/science/arb/files/patch-Makefile.diff 2016-05-04 02:16:11 UTC (rev 148322) @@ -1,43 +0,0 @@ ---- Makefile.orig 2014-07-22 09:59:38.000000000 -0500 -+++ Makefile 2014-08-05 05:51:40.000000000 -0500 -@@ -98,10 +98,6 @@ - 4.8.0 4.8.1 4.8.2 4.8.3 \ - 4.9.0 \ - --# supported clang versions: --ALLOWED_clang_VERSIONS=\ -- 4.2.1 \ -- - # ---------------------- - - COMPILER_INFO:=$(shell SOURCE_TOOLS/arb_compiler_version.pl $(A_CXX)) -@@ -118,7 +114,7 @@ - endif - - ifeq ($(USE_CLANG),1) --ALLOWED_COMPILER_VERSIONS=$(ALLOWED_clang_VERSIONS) -+ALLOWED_COMPILER_VERSIONS=$(COMPILER_VERSION) - else - ALLOWED_COMPILER_VERSIONS=$(ALLOWED_gcc_VERSIONS) - endif -@@ -137,6 +133,7 @@ - USE_GCC_47_OR_HIGHER:= - USE_GCC_48_OR_HIGHER:= - -+ifeq ($(USE_CLANG),0) - ifeq ($(USE_GCC_MAJOR),4) - ifeq ($(USE_GCC_MINOR),5) - ifneq ('$(findstring $(USE_GCC_PATCHLEVEL),23456789)','') -@@ -154,9 +151,12 @@ - endif - endif - else -+ ifneq ('$(findstring $(USE_GCC_MAJOR),56789)','') - USE_GCC_452_OR_HIGHER:=yes - USE_GCC_47_OR_HIGHER:=yes - USE_GCC_48_OR_HIGHER:=yes -+ endif -+endif - endif - - #---------------------- define special directories for non standard builds