<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/f06cf7caef06a4c50059db20ca776c9832d84be0">https://github.com/macports/macports-ports/commit/f06cf7caef06a4c50059db20ca776c9832d84be0</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 f06cf7caef0 Gildas: fixed for Python setuptools
</span>f06cf7caef0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f06cf7caef06a4c50059db20ca776c9832d84be0
</span>Author: Sebastien Bardeau <bardeau@iram.fr>
AuthorDate: Fri Feb 7 17:47:28 2025 +0100
<span style='display:block; white-space:pre;color:#404040;'> Gildas: fixed for Python setuptools
</span>---
science/gildas/Portfile | 9 +++++----
science/gildas/files/clic.in | 14 --------------
2 files changed, 5 insertions(+), 18 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 2258b77a882..2a6ce76211c 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;'>@@ -7,6 +7,7 @@ PortGroup active_variants 1.1
</span> name gildas
version 202502b
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]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
supported_archs arm64 x86_64
categories science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +44,7 @@ patchfiles patch-admin-Makefile.def.diff \
</span> depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:libpng \
port:python313 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py313-setuptools \
</span> port:py313-numpy
# coreutils needed to use GNU gsort instead of native BSD sort as older version
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,7 +103,6 @@ destroot {
</span>
xinstall ${filespath}/astro.in ${destroot}${prefix}/bin/astro
xinstall ${filespath}/class.in ${destroot}${prefix}/bin/class
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall ${filespath}/clic.in ${destroot}${prefix}/bin/clic
</span> xinstall ${filespath}/cube.in ${destroot}${prefix}/bin/cube
xinstall ${filespath}/greg.in ${destroot}${prefix}/bin/greg
xinstall ${filespath}/mapping.in ${destroot}${prefix}/bin/mapping
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,8 +114,8 @@ destroot {
</span> set my_machine [if {[string match *arm* ${os.arch}]} {list arm64} {list x86_64}]
set my_env_vers [string tolower [exec sw_vers -productName | tr -d " "]]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${destroot}${prefix}/bin s|@PREFIX@|${prefix}|g astro class clic cube greg mapping mira mrtcal sic sched-30m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${destroot}${prefix}/bin s|@ARCH@|${my_machine}|g astro class clic cube greg mapping mira mrtcal sic sched-30m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${destroot}${prefix}/bin s|@OSNAME@|${my_env_vers}|g astro class clic cube greg mapping mira mrtcal sic sched-30m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${destroot}${prefix}/bin s|@PREFIX@|${prefix}|g astro class cube greg mapping mira mrtcal sic sched-30m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${destroot}${prefix}/bin s|@ARCH@|${my_machine}|g astro class cube greg mapping mira mrtcal sic sched-30m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${destroot}${prefix}/bin s|@OSNAME@|${my_env_vers}|g astro class cube greg mapping mira mrtcal sic sched-30m
</span>
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/clic.in b/science/gildas/files/clic.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3468eb235ff..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/clic.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh -e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-export GAG_GAG="${HOME}/.gag"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-export GAG_PATH="${GAG_ROOT_DIR}/etc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-export GAG_EXEC_SYSTEM="@ARCH@-@OSNAME@-gfortran"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -z "\$PYTHONPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python:${PYTHONPATH}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-export PYTHONPATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-export DYLD_LIBRARY_PATH=${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/lib/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-exec ${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/bin/clic ${*}
</span></pre><pre style='margin:0'>
</pre>