<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/3c8a814dfe811cfd9be9de326f8e6e1d6f27a667">https://github.com/macports/macports-ports/commit/3c8a814dfe811cfd9be9de326f8e6e1d6f27a667</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 3c8a814 Gildas: update to 201910b
</span>3c8a814 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3c8a814dfe811cfd9be9de326f8e6e1d6f27a667
</span>Author: Sebastien Bardeau <bardeau@iram.fr>
AuthorDate: Wed Oct 2 17:12:36 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> Gildas: update to 201910b
</span>---
science/gildas/Portfile | 14 ++---
.../gildas/files/patch-admin-gildas-env.sh.diff | 48 ++++++++-------
science/gildas/files/patch-lapack.diff | 68 ----------------------
3 files changed, 29 insertions(+), 101 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 5710734..5c8a23c 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 201909a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 201910b
</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,16 +30,15 @@ master_sites http://www.iram.fr/~gildas/dist/ \
</span> distname ${name}-src-${my_version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5377bfe10fa66945588b2fec249adbb817ced0ad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 81a9cece7455604d25d8dc7143aa01cc3e78635f0e039114384b85dbff779250 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 138640212
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e3af7407cb69de975bfdf144661b59a1a9c1406d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 342691a9ef1bf45941d86f21d14305cbfc962104fef652ec1f5ac7b797346f92 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 40930832
</span>
patch.pre_args -p1
patchfiles patch-admin-Makefile.def.diff \
patch-admin-Makefile.python.diff \
patch-admin-gildas-env.sh.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-admin-define-system.sh.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-lapack.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-admin-define-system.sh.diff
</span>
depends_lib port:gtk2 \
port:libpng \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,8 +46,7 @@ depends_lib port:gtk2 \
</span> port:py27-numpy
depends_build port:cfitsio \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:slatec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
set my_build_opts ""
variant openmp description {Add OpenMP support} {set my_build_opts "-o openmp"}
<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 91530e3..5ff7480 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,23 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-jul18a/admin/gildas-env.sh.orig 2018-06-20 12:05:33.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-jul18a/admin/gildas-env.sh 2018-07-02 17:34:15.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -252,11 +252,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OLDIFS=$IFS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IFS=:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for DIR in $GAGENV_SEARCH_PATH; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if file_present "liblapack." "${DIR}"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if file_present "libLAPACK." "${DIR}"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LAPACK_PRESENT=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LAPACK_LIB_DIR=$DIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if file_present "libblas." "${DIR}"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if file_present "libBLAS." "${DIR}"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BLAS_PRESENT=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BLAS_LIB_DIR=$DIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -265,13 +265,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SLATEC_LIB_DIR=$DIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note: libfftw3 and libfftw3f must be in the same directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-oct19a/admin/gildas-env.sh.orig 2019-10-01 18:30:27.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-oct19a/admin/gildas-env.sh 2019-10-01 18:37:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -244,19 +244,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FFTW3_PRESENT=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FFTW3F_PRESENT=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OLDIFS=$IFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IFS=:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for DIR in $GAGENV_SEARCH_PATH; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Note: libfftw3 and libfftw3f must be in the same directory
</span> - if file_present "libfftw3." "${DIR}"; then
- FFTW3_PRESENT=yes
- FFTW3_LIB_DIR=$DIR
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +15,12 @@
</span> - FFTW3F_PRESENT=yes
- fi
- fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IFS=$OLDIFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# OLDIFS=$IFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# IFS=:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# for DIR in $GAGENV_SEARCH_PATH; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# # Note: libfftw3 and libfftw3f must be in the same directory
</span> +# if file_present "libfftw3." "${DIR}"; then
+# FFTW3_PRESENT=yes
+# FFTW3_LIB_DIR=$DIR
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,10 +28,12 @@
</span> +# FFTW3F_PRESENT=yes
+# fi
+# fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IFS=$OLDIFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# IFS=$OLDIFS
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -432,24 +432,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "$FFTW3F_PRESENT" = "yes" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gagenv_message "Found FFTW v3 libraries in $FFTW3_LIB_DIR"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -397,24 +397,24 @@
</span> PYTHON_LIB=no
NUMPY_PRESENT=no
SQLITE3_PRESENT=no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +65,7 @@
</span> if [ -e "$NUMPY_INC_DIR/numpy/arrayobject.h" ]; then
NUMPY_INC_PRESENT=yes
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -457,7 +457,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -422,7 +422,7 @@
</span> fi
fi
# Search for sqlite3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +74,7 @@
</span> SQLITE3_PRESENT=yes
fi
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -760,6 +760,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -725,6 +725,8 @@
</span> # environment variables:
#
unset GAG_LIB_DEP_PATH GAG_INC_DEP_PATH # Incremented by detection functions
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 31ce203..0000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,68 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# HG changeset patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# User Sean Farley <sean.michael.farley@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date 1397871654 18000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fri Apr 18 20:40:54 2014 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Node ID d903f416ef63711865f0b8325cd5bb06132af03e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Parent 0e344bcb0edfc864c73ef9072be1698768a94c55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-make: use frameworks for lapack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/admin/Makefile.build b/admin/Makefile.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/admin/Makefile.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/admin/Makefile.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -377,9 +377,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # only the shared libraries are installed (i.e. the corresponding archive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libraries are missing).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---lblas:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---llapack:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+-framework:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Accelerate:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lslatec:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/admin/Makefile.def b/admin/Makefile.def
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/admin/Makefile.def
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/admin/Makefile.def
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -536,11 +536,11 @@ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STDCpp_LIB += @STDCXXLIB@
</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;'>- # Kernel libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LEGACY_LIBS = -lslatec -llapack -lblas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LEGACY_LIBS = -lslatec -framework Accelerate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _GAG_LIBS = -lggui -lgcore -lgio -lgfits -lgwcs -lgmath -lgsys -lginc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifndef GAG_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GAG_LIBS = $(_GAG_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GAG_LIBS = -lgkernel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/legacy/slatec/Makefile b/legacy/slatec/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-may15a/legacy/slatec/Makefile.orig 2014-12-09 11:31:56.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-may15a/legacy/slatec/Makefile 2015-05-26 10:42:52.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- U-all.o V-all.o W-all.o X-all.o Y-all.o Z-all.o d1mach.o i1mach.o pimach.o \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r1mach.o dummy.o P-all.o P-value.o Dp-1vlu.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIB_DEPENDS = -llapack -lblas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIB_DEPENDS = -framework Accelerate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(GAG_COMPILER_FKIND),ifc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPTION_FFLAGS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/packages/clic/lib/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/packages/clic/lib/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,11 +62,11 @@ CLIC_LIB_OBJECTS = blockdata.o check.o c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sg_line_table.o table_passband.o clic_index.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Mathematical library dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(LINEAR),lapack)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LINEAR_LIB_OBJECTS = singular.o mth_lapack.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LINEAR_LIB_DEPENDS = -llapack -lblas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LINEAR_LIB_DEPENDS = -framework Accelerate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(LINEAR),nag)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LINEAR_LIB_OBJECTS = mth_nag.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LINEAR_LIB_DEPENDS = -lnag
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span></pre><pre style='margin:0'>
</pre>