<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/4cccce94528cf34ba0ac86ee26d8f33b43351214">https://github.com/macports/macports-ports/commit/4cccce94528cf34ba0ac86ee26d8f33b43351214</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 4cccce94528 Gildas: updated to version jul21b
</span>4cccce94528 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4cccce94528cf34ba0ac86ee26d8f33b43351214
</span>Author: Sebastien Bardeau <bardeau@iram.fr>
AuthorDate: Mon Jul 19 16:32:41 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> Gildas: updated to version jul21b
</span>---
science/gildas/Portfile | 38 +++++++++++++++++++-------------------
science/gildas/files/astro.in | 2 +-
science/gildas/files/class.in | 2 +-
science/gildas/files/clic.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 +-
11 files changed, 29 insertions(+), 29 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 bebdb7b0077..1fef8395dbf 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,9 +5,9 @@ PortGroup compilers 1.0
</span> PortGroup active_variants 1.1
name gildas
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 202107a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 202107b
</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]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs arm64 x86_64
</span> set my_machine [if {[string match *arm* ${os.arch}]} {list arm64} {list x86_64}]
categories science
platforms darwin
<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 26d636d3844704fba4011a5b49efb7a9a2bd950f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7fd7b1c1f34806418a9121eaca434fab575218bb5ccf982dd31a17cdcda29cfa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 43004808
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c86708f2a1e0e0203e3e1f5910bfe0190503b16e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fa4890d1930c2d9144aaf732325b96a4a8d2d7d5f95b23543aed7e2cf8831db7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 42984508
</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 port:gtk2 \
port:libpng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python38 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python39 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py39-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.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python3.9
</span>
configure {
set cxxstdlib {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,17 +73,16 @@ configure {
</span> set cxxstdlib [string map {lib -l} ${configure.cxx_stdlib}]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath}/admin "s|@PREFIX@|${prefix}|g" define-system.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath}/admin "s|@CC@|${configure.cc}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath}/admin "s|@CCFLAGS@|${configure.cflags}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath}/admin "s|@FC@|${configure.fc}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath}/admin "s|@FCFLAGS@|${configure.fcflags}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath}/admin "s|@CXX@|${configure.cxx}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath}/admin "s|@CPP@|${configure.cpp}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath}/admin "s|@CPPFLAGS@|${configure.cppflags}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath}/admin "s|@LDFLAGS@|${configure.ldflags}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath}/admin "s|@PYTHON@|${configure.python}|g" Makefile.build Makefile.def Makefile.python gildas-env.sh define-system.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath}/admin "s|@STDCXXLIB@|${cxxstdlib}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath}/admin "s|@PREFIX@|${prefix}|g" define-system.sh gildas-env.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath}/admin "s|@CC@|${configure.cc}|g" define-system.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath}/admin "s|@CCFLAGS@|${configure.cflags}|g" Makefile.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath}/admin "s|@FC@|${configure.fc}|g" define-system.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath}/admin "s|@FCFLAGS@|${configure.fcflags}|g" Makefile.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath}/admin "s|@CXX@|${configure.cxx}|g" define-system.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath}/admin "s|@CPP@|${configure.cpp}|g" Makefile.def define-system.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath}/admin "s|@CPPFLAGS@|${configure.cppflags}|g" Makefile.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath}/admin "s|@LDFLAGS@|${configure.ldflags}|g" Makefile.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath}/admin "s|@PYTHON@|${configure.python}|g" Makefile.build Makefile.def Makefile.python gildas-env.sh
</span> }
build {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,6 +104,7 @@ destroot {
</span> xinstall ${filespath}/imager.in ${destroot}${prefix}/bin/imager
reinplace -W ${destroot}${prefix}/bin s|@PREFIX@|${prefix}|g astro class clic greg mapping mira mrtcal sic sched-30m imager
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${destroot}${prefix}/bin s|@ARCH@|${my_machine}|g astro class clic 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/astro.in b/science/gildas/files/astro.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d49abe917c..01a680f0939 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="x86_64-darwin-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-darwin-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 aceb9080a88..ea96b2d407b 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="x86_64-darwin-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-darwin-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 039377f9a85..6dad00bccd0 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="x86_64-darwin-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-darwin-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 52925800d10..ac64fac49c7 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="x86_64-darwin-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-darwin-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 2cc62660921..c574fa91516 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="x86_64-darwin-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-darwin-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 eccc0d57614..9191d74d8a9 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="x86_64-darwin-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-darwin-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 1042a4a4403..ea0b1abf27a 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="x86_64-darwin-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-darwin-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 9c07d8e863d..1fc50879f22 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="x86_64-darwin-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-darwin-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 be0ac4aa0b7..9fdc25b4830 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="x86_64-darwin-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-darwin-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 b11de187bb7..256cd86047c 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="x86_64-darwin-gfortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_EXEC_SYSTEM="@ARCH@-darwin-gfortran"
</span> if [ -z "\$PYTHONPATH" ]; then
PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python"
else
</pre><pre style='margin:0'>
</pre>