<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/63d1dbc263675ce7a47eb6e13e2f11ee6d492a67">https://github.com/macports/macports-ports/commit/63d1dbc263675ce7a47eb6e13e2f11ee6d492a67</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 63d1dbc2636 Gildas: update to 202412a
</span>63d1dbc2636 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 63d1dbc263675ce7a47eb6e13e2f11ee6d492a67
</span>Author: Sebastien Bardeau <bardeau@iram.fr>
AuthorDate: Wed Dec 4 17:32:49 2024 +0100
<span style='display:block; white-space:pre;color:#404040;'> Gildas: update to 202412a
</span>---
science/gildas/Portfile | 8 ++++----
science/gildas/files/patch-admin-Makefile.build.diff | 15 +++------------
.../gildas/files/patch-admin-Makefile.python.diff | 15 ++++++---------
.../files/patch-admin-python-config-ldflags.py.diff | 20 ++++++++++----------
4 files changed, 23 insertions(+), 35 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 1c8dea823ea..9492dd6c8d9 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 202410a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 202412a
</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
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,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 32a232e1c2a408b70e9e5d5b7c5a622a4323273b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ace1d6fe157ea0931838f90ff4cd30b12d919f0e54942cd3a2dc309203544ef8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 46360536
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 27b13556ad740fb109518c022659249dccc5516f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e572889a513903a26303a2cbaa619ce08cda30c3e81c3a3c7143e6811b67129d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 46414444
</span>
patch.pre_args-replace -p0 -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.build.diff b/science/gildas/files/patch-admin-Makefile.build.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 55bf12c98e2..71fb2c90a2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/patch-admin-Makefile.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/patch-admin-Makefile.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-jul24b/admin/Makefile.build.orig 2024-07-03 14:30:28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-jul24b/admin/Makefile.build 2024-07-08 16:42:08
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -312,7 +312,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if umask is 0022).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYRECIPE = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$(PYTHON3_PRESENT)" = "yes" ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- python -c "import lib2to3.main; lib2to3.main.main('lib2to3.fixes',args=['$<'])" > $<.patch || exit $$?; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @PYTHON@ -c "import lib2to3.main; lib2to3.main.main('lib2to3.fixes',args=['$<'])" > $<.patch || exit $$?; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -s $<.patch; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- touch $@; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch -i $<.patch -o $@; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -328,7 +328,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-dec24a/admin/Makefile.build.orig 2024-12-02 17:31:56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-dec24a/admin/Makefile.build 2024-12-03 12:05:32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -313,7 +313,7 @@
</span>
PYCOMPILE = \
if [ "$(PYTHON_PRESENT)" = "yes" ]; then \
<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 f4a86e03982..29a498d49d2 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,18 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-sep24a/admin/Makefile.python.orig 2024-09-01 05:00:16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-sep24a/admin/Makefile.python 2024-09-04 10:31:16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,9 +20,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-dec24a/admin/Makefile.python.orig 2024-12-02 17:31:56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-dec24a/admin/Makefile.python 2024-12-03 12:01:28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Python 3.*: SO = .cpython-34m.so EXT_SUFFIX = .cpython-34m.so
</span> # Python 3.11: SO = (undefined) EXT_SUFFIX = .cpython-34m.so
# See also: https://bugs.python.org/issue16754
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(PYTHON3_PRESENT),yes)
</span> -PYTHON_SO_EXT=$(shell python -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))")
+PYTHON_SO_EXT=$(shell @PYTHON@ -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PYTHON_SO_EXT=$(shell python -c "import sysconfig; print(sysconfig.get_config_var('SO'))")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PYTHON_SO_EXT=$(shell @PYTHON@ -c "import sysconfig; print(sysconfig.get_config_var('SO'))")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span>
MOD_NAME = $(pythondir)/$(MOD_IDENTITY)$(PYTHON_SO_EXT)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,7 +54,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +50,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-python-config-ldflags.py.diff b/science/gildas/files/patch-admin-python-config-ldflags.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 43ea613961b..3534b32fb8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/patch-admin-python-config-ldflags.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/patch-admin-python-config-ldflags.py.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-nov22a/admin/python-config-ldflags.py.orig 2022-11-02 14:46:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-nov22a/admin/python-config-ldflags.py 2022-11-02 14:49:30.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # unpredictible under the variety of machines and configurations we
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import subprocess
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- output = subprocess.check_output(['python-config', '--ldflags','--embed'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ output = subprocess.check_output(['@PYTHON@-config', '--ldflags','--embed'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- output = output.decode('utf-8')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #print(output)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-dec24a/admin/python-config-ldflags.py.orig 2024-12-02 17:31:56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-dec24a/admin/python-config-ldflags.py 2024-12-03 12:09:03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # unpredictible under the variety of machines and configurations we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import subprocess
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-output = subprocess.check_output(['python-config', '--ldflags','--embed'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++output = subprocess.check_output(['@PYTHON@-config', '--ldflags','--embed'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ output = output.decode('utf-8')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #print(output)
</span>
</pre><pre style='margin:0'>
</pre>