<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3ce2be19bddf27cc8b1cc59558f43f4cb16218fc">https://github.com/macports/macports-ports/commit/3ce2be19bddf27cc8b1cc59558f43f4cb16218fc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3ce2be19bddf27cc8b1cc59558f43f4cb16218fc
</span>Author: Sebastien Bardeau <bardeau@iram.fr>
AuthorDate: Wed May 2 16:37:59 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> Gildas: update to 201805a
</span>---
science/gildas/Portfile | 6 +++---
.../gildas/files/patch-admin-Makefile.python.diff | 2 +-
science/gildas/files/patch-admin-gildas-env.sh.diff | 21 +++++++++------------
science/gildas/files/patch-lapack.diff | 2 +-
4 files changed, 14 insertions(+), 17 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 4889f42..72a3e6a 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;'>@@ -5,7 +5,7 @@ PortGroup compilers 1.0
</span> PortGroup active_variants 1.1
name gildas
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 201803c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 201805a
</span> set my_version [string tolower [clock format [clock scan 2000-[string range ${version} 4 5]-10] -format %b]][string range ${version} 2 3][string range ${version} 6 end]
categories science
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,8 +30,8 @@ master_sites http://www.iram.fr/~gildas/dist/ \
</span> http://www.iram.fr/~gildas/dist/archive/gildas/
distname ${name}-src-${my_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ca1ec4aef259cda4e896110ece75d7ddb14d7db6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e95edfcda46d8976d6dd2839578b95d0ec335fc69cf5e6b250ebb533b606f72c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fd20e215480cc4339f4200085dfdfbdbf85ca1bf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3c747d90fbd30e2e1b9d94babfd3da3b896025d814967390aee62b5bac8120f6
</span>
patch.pre_args -p1
patchfiles patch-admin-Makefile.def.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/patch-admin-Makefile.python.diff b/science/gildas/files/patch-admin-Makefile.python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b11ca80..3244488 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/patch-admin-Makefile.python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/patch-admin-Makefile.python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@
</span> @@ -49,7 +49,7 @@
ifneq ($(MOD_IDENTITY),)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MOD_NAME): $(MOD_SOURCES) $(MOD_INCLUDES) $(MOD_EXTRAS) $(builddir)/setup.py $(SO_NAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MOD_NAME): $(MOD_SOURCES) $(MOD_INCLUDES) $(MOD_EXTRAS) $(builddir)/setup.py $(SO_NAME) | $(pythondir)
</span> - $(GAG_PYTHON_DISTFLAGS) python $(builddir)/setup.py build --build-base $(builddir) --build-lib $(builddir)
+ $(GAG_PYTHON_DISTFLAGS) @PYTHON@ $(builddir)/setup.py build --build-base $(builddir) --build-lib $(builddir)
$(MV) $(builddir)/*$(PYTHON_SO_EXT) $(pythondir)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/patch-admin-gildas-env.sh.diff b/science/gildas/files/patch-admin-gildas-env.sh.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f58d840..24fb656 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/patch-admin-gildas-env.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/patch-admin-gildas-env.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-mar18a/admin/gildas-env.sh.orig 2018-02-19 15:10:04.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-mar18a/admin/gildas-env.sh 2018-03-01 11:01:55.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -449,34 +449,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-may18/admin/gildas-env.sh.orig 2018-05-02 15:05:16.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-may18/admin/gildas-env.sh 2018-05-02 15:12:08.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -353,24 +353,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_LIB=no
</span> NUMPY_PRESENT=no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- NUMERIC_PRESENT=no
</span> SQLITE3_PRESENT=no
- if \which python > /dev/null 2>&1; then
+ if \which @PYTHON@ > /dev/null 2>&1; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@
</span> # unpredictible. Can not check in advance if the linker will
# find it or not. See also our script python-config-ldflags.py
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Now search for Numpy or Numeric
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Now search for Numpy
</span> - if python -c "import numpy" > /dev/null 2>&1; then
+ if @PYTHON@ -c "import numpy" > /dev/null 2>&1; then
NUMPY_PRESENT=yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,11 +32,8 @@
</span> if [ -e "$NUMPY_INC_DIR/numpy/arrayobject.h" ]; then
NUMPY_INC_PRESENT=yes
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- NUMPY_INC_PRESENT=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -378,7 +378,7 @@
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif python -c "import Numeric"> /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elif @PYTHON@ -c "import Numeric"> /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NUMERIC_PRESENT=yes
</span> fi
# Search for sqlite3
- if python -c "import sqlite3" > /dev/null 2>&1; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +41,7 @@
</span> SQLITE3_PRESENT=yes
fi
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -556,11 +556,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -458,11 +458,11 @@
</span> SDM_MISSING=
#
for DIR in $GAGENV_SEARCH_PATH; do
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +55,7 @@
</span> BLAS_PRESENT=yes
BLAS_LIB_DIR=$DIR
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -568,13 +568,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -470,13 +470,13 @@
</span> SLATEC_PRESENT=yes
SLATEC_LIB_DIR=$DIR
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +76,7 @@
</span> if file_present "libasdmStandalone." "${DIR}"; then
SDM_PRESENT=yes
if [ "$SDM_PRESENT" = "yes" ]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -608,6 +608,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -510,6 +510,8 @@
</span> XML_PRESENT="yes"
#
unset GAG_LIB_DEP_PATH GAG_INC_DEP_PATH
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/patch-lapack.diff b/science/gildas/files/patch-lapack.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f1c25f1..31ce203 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/patch-lapack.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/patch-lapack.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ diff --git a/admin/Makefile.def b/admin/Makefile.def
</span>
-LEGACY_LIBS = -lslatec -llapack -lblas
+LEGACY_LIBS = -lslatec -framework Accelerate
<span style='display:block; white-space:pre;background:#ffe0e0;'>- _GAG_LIBS = -lggui -lgcore -lgio -lgwcs -lgmath -lgsys -lginc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _GAG_LIBS = -lggui -lgcore -lgio -lgfits -lgwcs -lgmath -lgsys -lginc
</span> ifndef GAG_WIN32
GAG_LIBS = $(_GAG_LIBS)
else
</pre><pre style='margin:0'>
</pre>