<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/138defd7ecc6face0c38f6948e483c38038c4202">https://github.com/macports/macports-ports/commit/138defd7ecc6face0c38f6948e483c38038c4202</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 138defd7ecc Gildas: update to 202201a
</span>138defd7ecc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 138defd7ecc6face0c38f6948e483c38038c4202
</span>Author: Sebastien Bardeau <bardeau@iram.fr>
AuthorDate: Mon Jan 3 14:28:11 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> Gildas: update to 202201a
</span>---
science/gildas/Portfile | 10 +++----
.../gildas/files/patch-admin-Makefile.python.diff | 8 +++---
.../gildas/files/patch-admin-gildas-env.sh.diff | 31 +++++++++++++---------
3 files changed, 27 insertions(+), 22 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 985c63cd386..f1d161898f8 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,13 +5,13 @@ PortGroup compilers 1.0
</span> PortGroup active_variants 1.1
name gildas
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 202112a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 202201a
</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]
supported_archs arm64 x86_64
set my_machine [if {[string match *arm* ${os.arch}]} {list arm64} {list x86_64}]
categories science
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {bardeau @bardeau}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {iram.fr:bardeau @bardeau}
</span> license permissive
description Radioastronomy data analysis software
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,9 +32,9 @@ master_sites https://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 691a2bb84b080915c95a7695a68d8a5a0abf898d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7b8f01fe301180ed96baec97213bcc0231dbfb8a5e4b306cad70360051b28b5e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 43797152
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 468294d9d841551776193c65fdc064341be8d135 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9fc8f3dd64a9cdcd754f71f65fe1c009f0e0475ecd47098ffb2204acc33a7fcc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 43804968
</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 32444886a77..505d3c06833 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;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-nov15b/admin/Makefile.python.orig 2015-10-14 10:52:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-nov15b/admin/Makefile.python 2015-11-20 16:53:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-jan22a/admin/Makefile.python.orig 2022-01-01 05:00:18.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-jan22a/admin/Makefile.python 2022-01-03 11:45:53.000000000 +0100
</span> @@ -18,7 +18,7 @@
# Python 2: SO = .so EXT_SUFFIX = (undefined)
# Python 3: SO = .cpython-34m.so EXT_SUFFIX = .cpython-34m.so
# See also: https://bugs.python.org/issue16754
<span style='display:block; white-space:pre;background:#ffe0e0;'>--PYTHON_SO_EXT=$(shell python -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('SO'))")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PYTHON_SO_EXT=$(shell @PYTHON@ -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('SO'))")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PYTHON_SO_EXT=$(shell python -c "import sysconfig; print(sysconfig.get_config_var('SO'))")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PYTHON_SO_EXT=$(shell @PYTHON@ -c "import sysconfig; print(sysconfig.get_config_var('SO'))")
</span>
MOD_NAME = $(pythondir)/$(MOD_IDENTITY)$(PYTHON_SO_EXT)
<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 5ff7480aab8..7804f796e2c 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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 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:#ffe0e0;'>-+++ gildas-src-oct19a/admin/gildas-env.sh 2019-10-01 18:37:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -244,19 +244,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-jan22a/admin/gildas-env.sh.orig 2022-01-01 05:00:18.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-jan22a/admin/gildas-env.sh 2022-01-03 11:52:43.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -238,19 +238,19 @@
</span> FFTW3_PRESENT=no
FFTW3F_PRESENT=no
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,12 +31,12 @@
</span> +# done
+# IFS=$OLDIFS
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$FFTW3F_PRESENT" = "yes" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gagenv_message "Found FFTW v3 libraries in $FFTW3_LIB_DIR"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -397,24 +397,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_LIB=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "$GAG_CONFIG" = -openmp ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gagenv_message "FFTW v3 are not supported in OpenMP mode. Default to GILDAS FFT."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -396,24 +396,24 @@
</span> NUMPY_PRESENT=no
SQLITE3_PRESENT=no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETUPTOOLS_PRESENT=no
</span> - if \which python > /dev/null 2>&1; then
+ if \which @PYTHON@ > /dev/null 2>&1; then
# Check the version of python the user is currently using
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,11 +47,11 @@
</span> PYTHON_VERS=`echo $PYTHON_VERS_FULL | \sed "s%\([0-9]\.[0-9][0-9]*\).*%\1%"`
# Search for Python header and library. kernel/python/binding/setup.py
# does exactly the same, so this should be consistent
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON_INC_DIR=`python -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'))"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHON_INC_DIR=`@PYTHON@ -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'))"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PYTHON_INC_DIR=`python -c "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PYTHON_INC_DIR=`@PYTHON@ -c "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"`
</span> if [ -e "$PYTHON_INC_DIR/Python.h" ]; then PYTHON_INC=yes; else PYTHON_INC=no; fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON_LIB_DIR=`python -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBDIR'))"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHON_LIB_DIR=`@PYTHON@ -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBDIR'))"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PYTHON_LIB_DIR=`python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PYTHON_LIB_DIR=`@PYTHON@ -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))"`
</span> PYTHON_LIB=yes # libpython name on the various supported systems is just
# 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:#e0e0e0;'>@@ -65,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;'>-@@ -422,7 +422,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -421,11 +421,11 @@
</span> fi
fi
# Search for sqlite3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,8 +73,13 @@
</span> + if @PYTHON@ -c "import sqlite3" > /dev/null 2>&1; then
SQLITE3_PRESENT=yes
fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Search for setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if python -c "import setuptools" > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if @PYTHON@ -c "import setuptools" > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETUPTOOLS_PRESENT=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -725,6 +725,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -731,6 +731,8 @@
</span> # environment variables:
#
unset GAG_LIB_DEP_PATH GAG_INC_DEP_PATH # Incremented by detection functions
</pre><pre style='margin:0'>
</pre>