<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3a784a321d09f20265ea20b03c1e0df647155782">https://github.com/macports/macports-ports/commit/3a784a321d09f20265ea20b03c1e0df647155782</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3a784a321d0 arb: Update to 6.0.6
</span>3a784a321d0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3a784a321d09f20265ea20b03c1e0df647155782
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Oct 10 06:24:10 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> arb: Update to 6.0.6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54341
</span>---
science/arb/Portfile | 26 +++++++++---------------
science/arb/files/patch-ARB-arb.diff | 8 ++++----
science/arb/files/patch-ARB-config.makefile.diff | 8 ++++----
science/arb/files/patch-ARB-globalsosx.cpp.diff | 10 ---------
4 files changed, 18 insertions(+), 34 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/arb/Portfile b/science/arb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b411aa8b7a5..0548b2b1d80 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/arb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/arb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,12 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name arb
epoch 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.0.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.0.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3bc93a511a6eabb108e9811a3c66ea25182da19f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8b1fc3fd11bbb05aca4731ac8803c004a4f2b6b87c11b543660d07ea349a6c21 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13286019
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories science
maintainers nomaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,10 +33,7 @@ license Restrictive/Distributable
</span> master_sites http://download.arb-home.de/release/${name}-${version}/
distname arb-${version}-source
extract.suffix .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir arbsrc_14797
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a7e6ba2dff3eceba97d17e076c3efb333930dd72 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 875301f138974694144b11091b0303a22efcfe7c6291c438881da64179820ce0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir arbsrc_15220
</span>
# bin/mix
conflicts elixir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,6 +52,9 @@ depends_lib port:openmotif \
</span> port:xorg-libXaw \
port:gtime \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span> port:coreutils
patchfiles patch-ARB-config.makefile.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,16 +68,6 @@ platform darwin {
</span> configure.env-append INSTALL=${prefix}/bin/ginstall
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/44368
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 11 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # DOS to UNIX line endings so we can patch.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\r||g" ${worksrcpath}/GDE/MUSCLE/src/globalsosx.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-ARB-globalsosx.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
configure {
if {${build_arch} eq "ppc" || ${build_arch} eq "i386"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/arb/files/patch-ARB-arb.diff b/science/arb/files/patch-ARB-arb.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d237330a888..b0b64b87290 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/arb/files/patch-ARB-arb.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/arb/files/patch-ARB-arb.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- SH/arb.orig 2013-03-02 09:47:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ SH/arb 2013-03-02 14:09:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,7 +62,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- SH/arb.orig 2016-08-22 05:27:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ SH/arb 2020-10-10 06:01:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,7 +89,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span>
# use ARBHOME defined by location of script (comment out for old behavior)
-ARBHOME=$ARBHOME_OF_SCRIPT
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/arb/files/patch-ARB-config.makefile.diff b/science/arb/files/patch-ARB-config.makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c62f63fe52d..feb8266b230 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/arb/files/patch-ARB-config.makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/arb/files/patch-ARB-config.makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.makefile.template.orig 2014-08-01 06:42:26.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.makefile.template 2014-08-01 06:43:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.makefile.template.orig 2016-08-22 05:27:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.makefile.template 2020-10-10 06:01:14.000000000 -0500
</span> @@ -35,8 +35,8 @@
# ------------
# Section: Linux
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,8 +9,8 @@
</span> +#MACH := LINUX# Linux g++ and gcc
+#LINUX := 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # DEBIAN := 1 # uncomment for DEBIAN systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # REDHAT := 1 # uncomment for REDHAT systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # DEBIAN := 1# uncomment for DEBIAN systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # REDHAT := 1# uncomment for REDHAT systems
</span> @@ -44,7 +44,7 @@
# ------------
# Section: Mac OSX
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/arb/files/patch-ARB-globalsosx.cpp.diff b/science/arb/files/patch-ARB-globalsosx.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index aeb36ed4b45..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/arb/files/patch-ARB-globalsosx.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- GDE/MUSCLE/src/globalsosx.cpp.orig 2014-06-04 08:15:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ GDE/MUSCLE/src/globalsosx.cpp 2014-07-27 14:21:26.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,6 +13,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <netinet/icmp6.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/vmmeter.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/proc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <mach/vm_statistics.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <mach/task_info.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <mach/task.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <mach/mach_init.h>
</span></pre><pre style='margin:0'>
</pre>