<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[123099] trunk/dports/science/arb</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/123099">123099</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-08-05 01:30:38 -0700 (Tue, 05 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>arb: update to 6.0.1 (maintainer; #44523)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencearbPortfile">trunk/dports/science/arb/Portfile</a></li>
<li><a href="#trunkdportssciencearbfilespatchARBconfigmakefilediff">trunk/dports/science/arb/files/patch-ARB-config.makefile.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencearbfilespatchARBarb_compiler_versionpldiff">trunk/dports/science/arb/files/patch-ARB-arb_compiler_version.pl.diff</a></li>
<li><a href="#trunkdportssciencearbfilespatchARBglobalsosxcppdiff">trunk/dports/science/arb/files/patch-ARB-globalsosx.cpp.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencearbPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/arb/Portfile (123098 => 123099)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name arb
</span><span class="cx"> epoch 2
</span><del>-version 6.0
</del><ins>+version 6.0.1
</ins><span class="cx"> categories science
</span><span class="cx"> maintainers mac.com:matt.cottrell
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -25,13 +25,13 @@
</span><span class="cx">
</span><span class="cx"> license Restrictive/Distributable
</span><span class="cx">
</span><del>-master_sites http://download.arb-home.de/build/$name-${version}/
</del><ins>+master_sites http://download.arb-home.de/release/${name}-${version}/
</ins><span class="cx"> distname arb-${version}-source
</span><span class="cx"> extract.suffix .tgz
</span><del>-worksrcdir arbsrc_12378
</del><ins>+worksrcdir arbsrc_12565
</ins><span class="cx">
</span><del>-checksums rmd160 8e6dfbb2676908d367f2a5a5a884b34c3f526494 \
- sha256 0999c32fb5241d0834ba40edea070c43644e89c78c1986ec928c91f35d018b40
</del><ins>+checksums rmd160 37c4dd0d973b737758d3da84bdfdec0bd3d44bc1 \
+ sha256 1b91d883981e47f3d96c4da80d9e1bf6e842e52dfe7e38b40bf3d091545aedcb
</ins><span class="cx">
</span><span class="cx"> depends_build port:imake \
</span><span class="cx"> port:makedepend \
</span><span class="lines">@@ -50,12 +50,21 @@
</span><span class="cx"> path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span class="cx"> port:coreutils
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> patchfiles patch-ARB-config.makefile.diff \
</span><span class="cx"> patch-ARB-intro.fig.diff \
</span><del>- patch-ARB-arb.diff
</del><ins>+ 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
+ }
</ins><span class="cx">
</span><ins>+ patchfiles-append patch-ARB-globalsosx.cpp.diff
+}
+
</ins><span class="cx"> configure {
</span><span class="cx"> if {${build_arch} eq "ppc" || ${build_arch} eq "i386"} {
</span><span class="cx"> set is64bit 0
</span><span class="lines">@@ -73,7 +82,19 @@
</span><span class="cx"> PATH=${worksrcpath}/bin:$env(PATH)
</span><span class="cx">
</span><span class="cx"> compiler.blacklist *llvm-gcc-4.2
</span><del>-
</del><ins>+
+# 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"
+ }
+ }
+}
+
</ins><span class="cx"> build.args-append CXX=${configure.cxx} \
</span><span class="cx"> CC=${configure.cc}
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportssciencearbfilespatchARBarb_compiler_versionpldiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/arb/files/patch-ARB-arb_compiler_version.pl.diff (0 => 123099)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+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'";
++ }
++ }
+ }
+
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkdportssciencearbfilespatchARBconfigmakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/arb/files/patch-ARB-config.makefile.diff (123098 => 123099)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- config.makefile.template.orig 2014-06-03 22:01:02.000000000 -0400
-+++ config.makefile.template 2014-06-03 22:01:35.000000000 -0400
</del><ins>+--- config.makefile.template.orig 2014-08-01 06:42:26.000000000 -0400
++++ config.makefile.template 2014-08-01 06:43:39.000000000 -0400
</ins><span class="cx"> @@ -35,8 +35,8 @@
</span><span class="cx"> # ------------
</span><span class="cx"> # Section: Linux
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx">
</span><span class="cx"> -# MACH := DARWIN#
</span><span class="cx"> -# DARWIN := 1
</span><del>-+MACH := DARWIN#
-+DARWIN := 1
</del><ins>++ MACH := DARWIN#
++ DARWIN := 1
</ins><span class="cx">
</span><span class="cx"> # ------------
</span></span></pre></div>
<a id="trunkdportssciencearbfilespatchARBglobalsosxcppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/arb/files/patch-ARB-globalsosx.cpp.diff (0 => 123099)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- 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>
</ins></span></pre>
</div>
</div>
</body>
</html>