<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/324013dae9e54f70a05b65ff172df0b99baf4b6b">https://github.com/macports/macports-ports/commit/324013dae9e54f70a05b65ff172df0b99baf4b6b</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 324013dae9e Gildas: update to 202212a
</span>324013dae9e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 324013dae9e54f70a05b65ff172df0b99baf4b6b
</span>Author: Sebastien Bardeau <bardeau@iram.fr>
AuthorDate: Fri Dec 2 11:55:18 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> Gildas: update to 202212a
</span>---
science/gildas/Portfile | 9 +++++----
science/gildas/files/patch-admin-Makefile.python.diff | 17 ++++++++++-------
science/gildas/files/patch-admin-gildas-env.sh.diff | 17 +++++++++++------
3 files changed, 26 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 68aa2d912b8..2fa2f53748c 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 202211b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 202212a
</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}]
<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 3821a9e6ac9a627c671ec462d91ae9577563db76 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8f4dfe85d078da2dbb2ccd4665f2c4bd796d0fb9ae29e43443a58cefc2ef83ba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 45014064
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6a26f5b114401bb4b5efcfc3fa021ba8842b8a57 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4cf076c219b58dfe735cd6dd5671c7b27ff651dfffd9feb80bfebf855d42fab3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 45110380
</span>
patch.pre_args -p1
patchfiles patch-admin-Makefile.def.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +53,7 @@ depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
</span> # of sort do not support sort -V:
depends_build port:cfitsio \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:groff \
</span> path:libexec/coreutils/libstdbuf.so:coreutils
set my_build_opts ""
<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 505d3c06833..17c0997e36e 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,15 +1,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-jan22a/admin/Makefile.python.orig 2022-01-01 05:00:18.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-jan22a/admin/Makefile.python 2022-01-03 11:45:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Python 2: SO = .so EXT_SUFFIX = (undefined)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Python 3: SO = .cpython-34m.so EXT_SUFFIX = .cpython-34m.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-dec22a/admin/Makefile.python.orig 2022-12-01 05:00:13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-dec22a/admin/Makefile.python 2022-12-02 09:28:10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,9 +20,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Python 3.11: SO = (undefined) EXT_SUFFIX = .cpython-34m.so
</span> # See also: https://bugs.python.org/issue16754
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(PYTHON3_PRESENT),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PYTHON_SO_EXT=$(shell python -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PYTHON_SO_EXT=$(shell @PYTHON@ -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span> -PYTHON_SO_EXT=$(shell python -c "import sysconfig; print(sysconfig.get_config_var('SO'))")
+PYTHON_SO_EXT=$(shell @PYTHON@ -c "import sysconfig; print(sysconfig.get_config_var('SO'))")
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span>
MOD_NAME = $(pythondir)/$(MOD_IDENTITY)$(PYTHON_SO_EXT)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,7 +49,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,7 +54,7 @@
</span> ifneq ($(MOD_IDENTITY),)
$(MOD_NAME): $(MOD_SOURCES) $(MOD_INCLUDES) $(MOD_EXTRAS) $(builddir)/setup.py $(SO_NAME) | $(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 7804f796e2c..46cbb3bff7d 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,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 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:#ffe0e0;'>-+++ 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;'>+--- gildas-src-dec22a/admin/gildas-env.sh.orig 2022-12-01 05:00:13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-dec22a/admin/gildas-env.sh 2022-12-02 09:35:21
</span> @@ -238,19 +238,19 @@
FFTW3_PRESENT=no
FFTW3F_PRESENT=no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,10 +33,10 @@
</span> #
if [ "$GAG_CONFIG" = -openmp ]; then
gagenv_message "FFTW v3 are not supported in OpenMP mode. Default to GILDAS FFT."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -396,24 +396,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NUMPY_PRESENT=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -397,24 +397,24 @@
</span> SQLITE3_PRESENT=no
SETUPTOOLS_PRESENT=no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHONCONFIG_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;'>@@ -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;'>-@@ -421,11 +421,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -422,15 +422,15 @@
</span> fi
fi
# Search for sqlite3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,8 +78,13 @@
</span> + if @PYTHON@ -c "import setuptools" > /dev/null 2>&1; then
SETUPTOOLS_PRESENT=yes
fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Search for python-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if \which python-config > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if \which @PYTHON@-config > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHONCONFIG_PRESENT=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -731,6 +731,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -740,6 +740,8 @@
</span> # environment variables:
#
unset GAG_LIB_DEP_PATH GAG_INC_DEP_PATH # Incremented by detection functions
</pre><pre style='margin:0'>
</pre>