[123099] trunk/dports/science/arb
ryandesign at macports.org
ryandesign at macports.org
Tue Aug 5 01:30:38 PDT 2014
Revision: 123099
https://trac.macports.org/changeset/123099
Author: ryandesign at macports.org
Date: 2014-08-05 01:30:38 -0700 (Tue, 05 Aug 2014)
Log Message:
-----------
arb: update to 6.0.1 (maintainer; #44523)
Modified Paths:
--------------
trunk/dports/science/arb/Portfile
trunk/dports/science/arb/files/patch-ARB-config.makefile.diff
Added Paths:
-----------
trunk/dports/science/arb/files/patch-ARB-arb_compiler_version.pl.diff
trunk/dports/science/arb/files/patch-ARB-globalsosx.cpp.diff
Modified: trunk/dports/science/arb/Portfile
===================================================================
--- trunk/dports/science/arb/Portfile 2014-08-05 08:14:45 UTC (rev 123098)
+++ trunk/dports/science/arb/Portfile 2014-08-05 08:30:38 UTC (rev 123099)
@@ -5,7 +5,7 @@
name arb
epoch 2
-version 6.0
+version 6.0.1
categories science
maintainers mac.com:matt.cottrell
platforms darwin
@@ -25,13 +25,13 @@
license Restrictive/Distributable
-master_sites http://download.arb-home.de/build/$name-${version}/
+master_sites http://download.arb-home.de/release/${name}-${version}/
distname arb-${version}-source
extract.suffix .tgz
-worksrcdir arbsrc_12378
+worksrcdir arbsrc_12565
-checksums rmd160 8e6dfbb2676908d367f2a5a5a884b34c3f526494 \
- sha256 0999c32fb5241d0834ba40edea070c43644e89c78c1986ec928c91f35d018b40
+checksums rmd160 37c4dd0d973b737758d3da84bdfdec0bd3d44bc1 \
+ sha256 1b91d883981e47f3d96c4da80d9e1bf6e842e52dfe7e38b40bf3d091545aedcb
depends_build port:imake \
port:makedepend \
@@ -50,12 +50,21 @@
path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:coreutils
-
-
patchfiles patch-ARB-config.makefile.diff \
patch-ARB-intro.fig.diff \
- patch-ARB-arb.diff
+ patch-ARB-arb.diff \
+ patch-ARB-arb_compiler_version.pl.diff
+
+# https://trac.macports.org/ticket/44368
+platform darwin 11 {
+ pre-patch {
+ # DOS to UNIX line endings so we can patch.
+ reinplace "s|\r||g" ${worksrcpath}/GDE/MUSCLE/src/globalsosx.cpp
+ }
+ patchfiles-append patch-ARB-globalsosx.cpp.diff
+}
+
configure {
if {${build_arch} eq "ppc" || ${build_arch} eq "i386"} {
set is64bit 0
@@ -73,7 +82,19 @@
PATH=${worksrcpath}/bin:$env(PATH)
compiler.blacklist *llvm-gcc-4.2
-
+
+# https://trac.macports.org/ticket/33756
+platform darwin {
+ if {${os.major} <= 10} {
+ depends_lib
+ depends_run
+ pre-fetch {
+ ui_error "${name} @${version} requires OS X 10.7 Lion or greater."
+ error "unsupported platform"
+ }
+ }
+}
+
build.args-append CXX=${configure.cxx} \
CC=${configure.cc}
Added: trunk/dports/science/arb/files/patch-ARB-arb_compiler_version.pl.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-arb_compiler_version.pl.diff (rev 0)
+++ trunk/dports/science/arb/files/patch-ARB-arb_compiler_version.pl.diff 2014-08-05 08:30:38 UTC (rev 123099)
@@ -0,0 +1,25 @@
+Index: /trunk/SOURCE_TOOLS/arb_compiler_version.pl
+===================================================================
+--- SOURCE_TOOLS/arb_compiler_version.pl (revision 12310)
++++ SOURCE_TOOLS/arb_compiler_version.pl (revision 12604)
+@@ -38,4 +38,20 @@
+ if ($detectedCompiler eq 'unknown') {
+ if ($detailedVersion =~ /apple.*llvm.*clang/oi) { $detectedCompiler = 'clang'; }
++ else {
++ # check for clang according to #582
++ my $cmd = "$compiler -dM -E -x c /dev/null";
++ if (open(CMD,$cmd.'|')) {
++ LINE: foreach (<CMD>) {
++ if (/__clang__/) {
++ $detectedCompiler = 'clang';
++ last LINE;
++ }
++ }
++ close(CMD);
++ }
++ else {
++ print STDERR "failed to execute '$cmd'";
++ }
++ }
+ }
+
\ No newline at end of file
Modified: trunk/dports/science/arb/files/patch-ARB-config.makefile.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-config.makefile.diff 2014-08-05 08:14:45 UTC (rev 123098)
+++ trunk/dports/science/arb/files/patch-ARB-config.makefile.diff 2014-08-05 08:30:38 UTC (rev 123099)
@@ -1,5 +1,5 @@
---- config.makefile.template.orig 2014-06-03 22:01:02.000000000 -0400
-+++ config.makefile.template 2014-06-03 22:01:35.000000000 -0400
+--- config.makefile.template.orig 2014-08-01 06:42:26.000000000 -0400
++++ config.makefile.template 2014-08-01 06:43:39.000000000 -0400
@@ -35,8 +35,8 @@
# ------------
# Section: Linux
@@ -17,7 +17,7 @@
-# MACH := DARWIN#
-# DARWIN := 1
-+MACH := DARWIN#
-+DARWIN := 1
++ MACH := DARWIN#
++ DARWIN := 1
# ------------
Added: trunk/dports/science/arb/files/patch-ARB-globalsosx.cpp.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-globalsosx.cpp.diff (rev 0)
+++ trunk/dports/science/arb/files/patch-ARB-globalsosx.cpp.diff 2014-08-05 08:30:38 UTC (rev 123099)
@@ -0,0 +1,10 @@
+--- GDE/MUSCLE/src/globalsosx.cpp.orig 2014-06-04 08:15:02.000000000 -0400
++++ GDE/MUSCLE/src/globalsosx.cpp 2014-07-27 14:21:26.000000000 -0400
+@@ -13,6 +13,7 @@
+ #include <netinet/icmp6.h>
+ #include <sys/vmmeter.h>
+ #include <sys/proc.h>
++#include <mach/vm_statistics.h>
+ #include <mach/task_info.h>
+ #include <mach/task.h>
+ #include <mach/mach_init.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140805/30108bcc/attachment.html>
More information about the macports-changes
mailing list