<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/4024b5a28b69e98e0d9d8a34d46ba6f0c26a5e9b">https://github.com/macports/macports-ports/commit/4024b5a28b69e98e0d9d8a34d46ba6f0c26a5e9b</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 4024b5a28b6 Gildas: update to 202205a
</span>4024b5a28b6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4024b5a28b69e98e0d9d8a34d46ba6f0c26a5e9b
</span>Author: Sebastien Bardeau <bardeau@iram.fr>
AuthorDate: Mon May 16 14:33:44 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> Gildas: update to 202205a
</span>---
science/gildas/Portfile | 19 ++++++++++---------
science/gildas/files/cube.in | 14 ++++++++++++++
2 files changed, 24 insertions(+), 9 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 5a75b432b8b..d25dc537ca6 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 202204a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 202205a
</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 025d9f2b16b6a5962718da3466c302e341c5da85 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9ea01b6a077a5d50b142a558d95ad020a9f1a1a617f8f696156238756ed87d37 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 43917288
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b6c5b20a8cc1bdf36f249f9914916826071a77cb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 543ca65c959a06defb0bbdd2fa2a3d24ff5bd9640991b38384054b9c49a32274 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 44488328
</span>
patch.pre_args -p1
patchfiles patch-admin-Makefile.def.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,8 +45,8 @@ patchfiles patch-admin-Makefile.def.diff \
</span>
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:libpng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python39 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python310 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py310-numpy
</span>
# coreutils needed to use GNU gsort instead of native BSD sort as older version
# of sort do not support sort -V:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +65,7 @@ compilers.enforce_some_fortran cfitsio
</span>
compilers.choose fc
compilers.setup -gcc46 require_fortran
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python3.10
</span>
configure {
set cxxstdlib {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,6 +95,7 @@ destroot {
</span> xinstall ${filespath}/astro.in ${destroot}${prefix}/bin/astro
xinstall ${filespath}/class.in ${destroot}${prefix}/bin/class
xinstall ${filespath}/clic.in ${destroot}${prefix}/bin/clic
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall ${filespath}/cube.in ${destroot}${prefix}/bin/cube
</span> xinstall ${filespath}/greg.in ${destroot}${prefix}/bin/greg
xinstall ${filespath}/mapping.in ${destroot}${prefix}/bin/mapping
xinstall ${filespath}/mira.in ${destroot}${prefix}/bin/mira
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,8 +104,8 @@ 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:#ffe0e0;'>- reinplace -W ${destroot}${prefix}/bin s|@PREFIX@|${prefix}|g astro class clic greg mapping mira mrtcal sic sched-30m imager
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${destroot}${prefix}/bin s|@ARCH@|${my_machine}|g astro class clic greg mapping mira mrtcal sic sched-30m imager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${destroot}${prefix}/bin s|@PREFIX@|${prefix}|g astro class clic cube greg mapping mira mrtcal sic sched-30m imager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${destroot}${prefix}/bin s|@ARCH@|${my_machine}|g astro class clic cube greg mapping mira mrtcal sic sched-30m imager
</span>
# delete broken module
delete ${destroot}${prefix}/lib/gildas/${my_machine}-darwin-gfortran/python/pyclassfiller
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/cube.in b/science/gildas/files/cube.in
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0d8a0d8f64f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/bin/sh -e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_GAG="${HOME}/.gag"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_PATH="${GAG_ROOT_DIR}/etc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-darwin-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [ -z "\$PYTHONPATH" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python:${PYTHONPATH}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export PYTHONPATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export DYLD_LIBRARY_PATH=${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/lib/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exec ${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/bin/cube ${*}
</span></pre><pre style='margin:0'>
</pre>