<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/16760b429fa61c72a8da07cf16a6a49a24a798d0">https://github.com/macports/macports-ports/commit/16760b429fa61c72a8da07cf16a6a49a24a798d0</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 16760b429fa Gildas: fixed installation under macOS 10.15 and earlier
</span>16760b429fa is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 16760b429fa61c72a8da07cf16a6a49a24a798d0
</span>Author: Sebastien Bardeau <bardeau@iram.fr>
AuthorDate: Wed Mar 27 17:34:26 2024 +0100

<span style='display:block; white-space:pre;color:#404040;'>    Gildas: fixed installation under macOS 10.15 and earlier
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: ticket https://trac.macports.org/ticket/69564
</span>---
 science/gildas/Portfile           | 17 ++++++++++++++---
 science/gildas/files/astro.in     |  2 +-
 science/gildas/files/class.in     |  2 +-
 science/gildas/files/clic.in      |  2 +-
 science/gildas/files/cube.in      |  2 +-
 science/gildas/files/greg.in      |  2 +-
 science/gildas/files/imager.in    |  2 +-
 science/gildas/files/mapping.in   |  2 +-
 science/gildas/files/mira.in      |  2 +-
 science/gildas/files/mrtcal.in    |  2 +-
 science/gildas/files/sched-30m.in |  2 +-
 science/gildas/files/sic.in       |  2 +-
 12 files changed, 25 insertions(+), 14 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 6a0f19c3300..75c322d9972 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,9 +7,9 @@ PortGroup           active_variants 1.1
</span> name                gildas
 version             202403a
 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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_machine      [if {[string match *arm* ${os.arch}]} {list arm64} {list x86_64}]
</span> categories          science
 platforms           darwin
 maintainers         {iram.fr:bardeau @bardeau}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,7 +91,14 @@ configure {
</span> }
 
 build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system -W ${worksrcpath} "source admin/gildas-env.sh -c ${configure.fc} ${my_build_opts} -s ${prefix}/include:${prefix}/lib:/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/Versions/Current/ && export GAG_SLDFLAGS='-shared -o ${prefix}/lib/gildas/${my_machine}-macos-gfortran/lib/\$(notdir \$@) -install_name ${prefix}/lib/gildas/${my_machine}-macos-gfortran/lib/\$(notdir \$@)' && export DYLD_LIBRARY_PATH=${worksrcpath}/integ/${my_machine}-macos-gfortran/lib  [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set my_machine   [if {[string match *arm* ${os.arch}]} {list arm64} {list x86_64}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set my_env_vers  [string tolower [exec sw_vers -productName | tr -d " "]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           "source admin/gildas-env.sh -c ${configure.fc} ${my_build_opts} -s ${prefix}/include:${prefix}/lib:/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/Versions/Current/ && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            export GAG_SLDFLAGS='-shared -o ${prefix}/lib/gildas/${my_machine}-${my_env_vers}-gfortran/lib/\$(notdir \$@) -install_name ${prefix}/lib/gildas/${my_machine}-${my_env_vers}-gfortran/lib/\$(notdir \$@)' && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            export DYLD_LIBRARY_PATH=${worksrcpath}/integ/${my_machine}-${my_env_vers}-gfortran/lib && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            export GAG_ADDONS=yes && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            make -w install"
</span> }
 
 destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,10 +116,14 @@ destroot {
</span>     xinstall ${filespath}/sched-30m.in ${destroot}${prefix}/bin/sched-30m
     xinstall ${filespath}/imager.in ${destroot}${prefix}/bin/imager
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    set my_machine   [if {[string match *arm* ${os.arch}]} {list arm64} {list x86_64}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set my_env_vers  [string tolower [exec sw_vers -productName | tr -d " "]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     reinplace -W ${destroot}${prefix}/bin s|@PREFIX@|${prefix}|g astro class clic cube greg mapping mira mrtcal sic sched-30m imager
     reinplace -W ${destroot}${prefix}/bin s|@ARCH@|${my_machine}|g astro class clic cube greg mapping mira mrtcal sic sched-30m imager
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace -W ${destroot}${prefix}/bin s|@OSNAME@|${my_env_vers}|g astro class clic cube greg mapping mira mrtcal sic sched-30m imager
</span> 
     # delete broken module
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    delete ${destroot}${prefix}/lib/gildas/${my_machine}-macos-gfortran/python/pyclassfiller
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    delete ${destroot}${prefix}/lib/gildas/${my_machine}-${my_env_vers}-gfortran/python/pyclassfiller
</span>     
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/astro.in b/science/gildas/files/astro.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ac60bf36db..7ef228eb4e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/astro.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/astro.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> export GAG_GAG="${HOME}/.gag"
 export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
 export GAG_PATH="${GAG_ROOT_DIR}/etc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-export GAG_EXEC_SYSTEM="@ARCH@-macos-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-@OSNAME@-gfortran"
</span> if [ -z "\$PYTHONPATH" ]; then
   PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python"
 else
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/class.in b/science/gildas/files/class.in
</span><span style='display:block; white-space:pre;color:#808080;'>index b99e95e3c04..a32ac9fea8d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/class.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/class.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> export GAG_GAG="${HOME}/.gag"
 export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
 export GAG_PATH="${GAG_ROOT_DIR}/etc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-export GAG_EXEC_SYSTEM="@ARCH@-macos-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-@OSNAME@-gfortran"
</span> if [ -z "\$PYTHONPATH" ]; then
   PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python"
 else
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/clic.in b/science/gildas/files/clic.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 69a9aba72a1..3468eb235ff 100644
</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;'>+++ b/science/gildas/files/clic.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> export GAG_GAG="${HOME}/.gag"
 export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
 export GAG_PATH="${GAG_ROOT_DIR}/etc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-export GAG_EXEC_SYSTEM="@ARCH@-macos-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-@OSNAME@-gfortran"
</span> if [ -z "\$PYTHONPATH" ]; then
   PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python"
 else
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/cube.in b/science/gildas/files/cube.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d82fce80ae..b27d1e749f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/cube.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/cube.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> export GAG_GAG="${HOME}/.gag"
 export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
 export GAG_PATH="${GAG_ROOT_DIR}/etc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-export GAG_EXEC_SYSTEM="@ARCH@-macos-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-@OSNAME@-gfortran"
</span> if [ -z "\$PYTHONPATH" ]; then
   PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python"
 else
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/greg.in b/science/gildas/files/greg.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 27d1f95aa67..c86b94e58f1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/greg.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/greg.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> export GAG_GAG="${HOME}/.gag"
 export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
 export GAG_PATH="${GAG_ROOT_DIR}/etc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-export GAG_EXEC_SYSTEM="@ARCH@-macos-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-@OSNAME@-gfortran"
</span> if [ -z "\$PYTHONPATH" ]; then
   PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python"
 else
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/imager.in b/science/gildas/files/imager.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 3ea106b4881..526284bc5bf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/imager.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/imager.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> export GAG_GAG="${HOME}/.gag"
 export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
 export GAG_PATH="${GAG_ROOT_DIR}/etc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-export GAG_EXEC_SYSTEM="@ARCH@-macos-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-@OSNAME@-gfortran"
</span> if [ -z "\$PYTHONPATH" ]; then
   PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python"
 else
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/mapping.in b/science/gildas/files/mapping.in
</span><span style='display:block; white-space:pre;color:#808080;'>index c9d97e2b000..b27fb832755 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/mapping.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/mapping.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> export GAG_GAG="${HOME}/.gag"
 export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
 export GAG_PATH="${GAG_ROOT_DIR}/etc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-export GAG_EXEC_SYSTEM="@ARCH@-macos-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-@OSNAME@-gfortran"
</span> if [ -z "\$PYTHONPATH" ]; then
   PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python"
 else
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/mira.in b/science/gildas/files/mira.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d77774c91b..e4eb4c93b1b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/mira.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/mira.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> export GAG_GAG="${HOME}/.gag"
 export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
 export GAG_PATH="${GAG_ROOT_DIR}/etc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-export GAG_EXEC_SYSTEM="@ARCH@-macos-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-@OSNAME@-gfortran"
</span> if [ -z "\$PYTHONPATH" ]; then
   PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python"
 else
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/mrtcal.in b/science/gildas/files/mrtcal.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a143a1e83a..79cc55aa14c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/mrtcal.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/mrtcal.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> export GAG_GAG="${HOME}/.gag"
 export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
 export GAG_PATH="${GAG_ROOT_DIR}/etc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-export GAG_EXEC_SYSTEM="@ARCH@-macos-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-@OSNAME@-gfortran"
</span> if [ -z "\$PYTHONPATH" ]; then
   PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python"
 else
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/sched-30m.in b/science/gildas/files/sched-30m.in
</span><span style='display:block; white-space:pre;color:#808080;'>index d443944c378..8896087c827 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/sched-30m.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/sched-30m.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> export GAG_GAG="${HOME}/.gag"
 export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
 export GAG_PATH="${GAG_ROOT_DIR}/etc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-export GAG_EXEC_SYSTEM="@ARCH@-macos-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-@OSNAME@-gfortran"
</span> if [ -z "\$PYTHONPATH" ]; then
   PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python"
 else
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/sic.in b/science/gildas/files/sic.in
</span><span style='display:block; white-space:pre;color:#808080;'>index f0bdde01ebe..c7fbb58ea9f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/sic.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/sic.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> export GAG_GAG="${HOME}/.gag"
 export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
 export GAG_PATH="${GAG_ROOT_DIR}/etc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-export GAG_EXEC_SYSTEM="@ARCH@-macos-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-@OSNAME@-gfortran"
</span> if [ -z "\$PYTHONPATH" ]; then
   PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python"
 else
</pre><pre style='margin:0'>

</pre>