<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/4ac1b00a24652290706e06c3267e09c3ffa79f91">https://github.com/macports/macports-ports/commit/4ac1b00a24652290706e06c3267e09c3ffa79f91</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 4ac1b00a246 Gildas: fixed support for El Capitan and older.
</span>4ac1b00a246 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4ac1b00a24652290706e06c3267e09c3ffa79f91
</span>Author: Sebastien Bardeau <bardeau@iram.fr>
AuthorDate: Fri Jun 19 16:46:10 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> Gildas: fixed support for El Capitan and older.
</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/60051
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60639
</span>---
science/gildas/Portfile | 6 +++++-
.../gildas/files/patch-admin-define-system.sh.diff | 19 ++++++++++++++-----
2 files changed, 19 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/Portfile b/science/gildas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a628a39fb3..f1399539a31 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,8 +46,11 @@ depends_lib port:gtk2 \
</span> port:python38 \
port:py38-numpy
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# coreutils needed to use GNU gsort instead of native BSD sort as older version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# of sort do not support sort -V:
</span> depends_build port:cfitsio \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:coreutils
</span>
set my_build_opts ""
variant openmp description {Add OpenMP support} {set my_build_opts "-o openmp"}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +71,7 @@ configure {
</span> set cxxstdlib [string map {lib -l} ${configure.cxx_stdlib}]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath}/admin "s|@PREFIX@|${prefix}|g" define-system.sh
</span> reinplace -W ${worksrcpath}/admin "s|@CC@|${configure.cc}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
reinplace -W ${worksrcpath}/admin "s|@CCFLAGS@|${configure.cflags}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
reinplace -W ${worksrcpath}/admin "s|@FC@|${configure.fc}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/patch-admin-define-system.sh.diff b/science/gildas/files/patch-admin-define-system.sh.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 497c9baebc8..c8f83b376ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/patch-admin-define-system.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/patch-admin-define-system.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-feb20a/admin/define-system.sh.orig 2020-02-01 02:15:14.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-feb20a/admin/define-system.sh 2020-02-03 11:52:22.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-jun20b/admin/define-system.sh.orig 2020-06-02 16:38:16.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-jun20b/admin/define-system.sh 2020-06-16 16:56:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Return 0 if first argument is "lower or equal" the second argument
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # NB: the line return in echo below is more portable than echo -e "\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ "$1" = "`echo "$1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$2" | sort -V | head -n1`" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$2" | @PREFIX@/bin/gsort -V | head -n1`" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ verlt() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Return 0 if first argument is "lower than" second argument
</span> @@ -236,18 +236,18 @@
else
GAG_MACHINE=pc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,8 +34,8 @@
</span> fi
fi ;;
CYGWIN*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -460,10 +460,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -446,10 +446,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GAG_COMPILER_FLIBS="-lgfortran"
</span> fi
#
- CPP_VERSION=`cpp --version | head -1 | \sed "s%.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*%\1%"`
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +48,7 @@
</span> fi
#
export GAG_COMPILER_FFLAGS GAG_COMPILER_FLIBS GAG_COMPILER_CPPFLAGS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -486,7 +488,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -472,7 +474,7 @@
</span> # source admin/gildas-env.sh -c ifort (use default ifort e.g. ifort 11) and
# source admin/gildas-env.sh -c ifort14 (i.e. use namely non default ifort 14)
# does not build their binaries in the same integration branch.
</pre><pre style='margin:0'>
</pre>