<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1103444ff893cd91f193986dfb837559a8550124">https://github.com/macports/macports-ports/commit/1103444ff893cd91f193986dfb837559a8550124</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 1103444 gildas: update to 202003b
</span>1103444 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1103444ff893cd91f193986dfb837559a8550124
</span>Author: Sebastien Bardeau <bardeau@iram.fr>
AuthorDate: Mon Mar 2 15:47:37 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> gildas: update to 202003b
</span>---
science/gildas/Portfile | 16 ++++-------
science/gildas/files/astro.in | 1 +
science/gildas/files/class.in | 1 +
science/gildas/files/clic.in | 1 +
science/gildas/files/greg.in | 1 +
science/gildas/files/imager.in | 1 +
science/gildas/files/mapping.in | 1 +
science/gildas/files/mira.in | 1 +
science/gildas/files/mrtcal.in | 1 +
.../gildas/files/patch-admin-Makefile.build.diff | 32 +++++++++++-----------
science/gildas/files/sched-30m.in | 1 +
science/gildas/files/sic.in | 1 +
12 files changed, 31 insertions(+), 27 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 8c3d70f..119e2a7 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 202002a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 202003b
</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]
categories science
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,9 @@ master_sites http://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 2fc26d21389625041f7004839d0ee3070f823302 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 46d453a58e00e769c060d6f658c5fade084bd9ac474daf1b71cfdd11ef24c315 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 41938500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2f1981423def3d65ceabe997c8bfb45fcbfea826 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ea4bdb81fe0043e193826713d3198b25f61569015a6d6c75633df3cb48729bb6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 42964008
</span>
patch.pre_args -p1
patchfiles patch-admin-Makefile.def.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,12 +62,6 @@ compilers.choose fc
</span> compilers.setup -g95 -gcc44 -gcc45 -gcc46 require_fortran
configure.python ${prefix}/bin/python3.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![gcc_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath}/admin "s|-Wrealloc-lhs-all||" define-system.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure {
set cxxstdlib {}
if {[string match *clang* ${configure.cxx}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +76,7 @@ configure {
</span> reinplace -W ${worksrcpath}/admin "s|@CPP@|${configure.cpp}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
reinplace -W ${worksrcpath}/admin "s|@CPPFLAGS@|${configure.cppflags}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
reinplace -W ${worksrcpath}/admin "s|@LDFLAGS@|${configure.ldflags}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath}/admin "s|@PYTHON@|${configure.python}|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|@PYTHON@|${configure.python}|g" Makefile.build Makefile.def Makefile.python gildas-env.sh define-system.sh
</span> reinplace -W ${worksrcpath}/admin "s|@STDCXXLIB@|${cxxstdlib}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
}
<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 5ce13aa..9d49abe 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;'>@@ -1,5 +1,6 @@
</span> #!/bin/sh -e
<span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_GAG="${HOME}/.gag"
</span> export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
export GAG_PATH="${GAG_ROOT_DIR}/etc"
export GAG_EXEC_SYSTEM="x86_64-darwin-gfortran"
<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 0e858b5..aceb908 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;'>@@ -1,5 +1,6 @@
</span> #!/bin/sh -e
<span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_GAG="${HOME}/.gag"
</span> export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
export GAG_PATH="${GAG_ROOT_DIR}/etc"
export GAG_EXEC_SYSTEM="x86_64-darwin-gfortran"
<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 e01862a..039377f 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;'>@@ -1,5 +1,6 @@
</span> #!/bin/sh -e
<span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_GAG="${HOME}/.gag"
</span> export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
export GAG_PATH="${GAG_ROOT_DIR}/etc"
export GAG_EXEC_SYSTEM="x86_64-darwin-gfortran"
<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 1aea135..5292580 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;'>@@ -1,5 +1,6 @@
</span> #!/bin/sh -e
<span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_GAG="${HOME}/.gag"
</span> export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
export GAG_PATH="${GAG_ROOT_DIR}/etc"
export GAG_EXEC_SYSTEM="x86_64-darwin-gfortran"
<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 a7a3a9d..2cc6266 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;'>@@ -1,5 +1,6 @@
</span> #!/bin/sh -e
<span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_GAG="${HOME}/.gag"
</span> export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
export GAG_PATH="${GAG_ROOT_DIR}/etc"
export GAG_EXEC_SYSTEM="x86_64-darwin-gfortran"
<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 f849b30..eccc0d5 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;'>@@ -1,5 +1,6 @@
</span> #!/bin/sh -e
<span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_GAG="${HOME}/.gag"
</span> export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
export GAG_PATH="${GAG_ROOT_DIR}/etc"
export GAG_EXEC_SYSTEM="x86_64-darwin-gfortran"
<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 408fafd..1042a4a 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;'>@@ -1,5 +1,6 @@
</span> #!/bin/sh -e
<span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_GAG="${HOME}/.gag"
</span> export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
export GAG_PATH="${GAG_ROOT_DIR}/etc"
export GAG_EXEC_SYSTEM="x86_64-darwin-gfortran"
<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 3d8a498..9c07d8e 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;'>@@ -1,5 +1,6 @@
</span> #!/bin/sh -e
<span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_GAG="${HOME}/.gag"
</span> export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
export GAG_PATH="${GAG_ROOT_DIR}/etc"
export GAG_EXEC_SYSTEM="x86_64-darwin-gfortran"
<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 75a5ef1..eb17c47 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,20 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-feb20a/admin/Makefile.build.orig 2020-02-01 02:15:14.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-feb20a/admin/Makefile.build 2020-02-03 11:42:32.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -296,10 +296,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copy into integration branch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifdef GAG_USE_PYTHON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Pre-touch'ing the output file below is needed when building under
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# MacPorts to create the file with proper permissions (umask). Then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# patch will keep those permissions. Without this pre-touch, patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# does not create a file with proper permissions (readable for root
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# only, i.e. files are not accessible to users, even if umask is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# 0022).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-mar20a/admin/Makefile.build.orig 2020-03-02 11:18:21.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-mar20a/admin/Makefile.build 2020-03-02 11:19:09.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -304,7 +304,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if umask is 0022).
</span> PYRECIPE = \
if [ "$(PYTHON3_PRESENT)" = "yes" ]; then \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2to3 $< 2>/dev/null > $<.patch; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- python -c "import lib2to3.main; lib2to3.main.main('lib2to3.fixes',args=['$<'])" > $<.patch; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @PYTHON@ -c "import lib2to3.main; lib2to3.main.main('lib2to3.fixes',args=['$<'])" > $<.patch; \
</span> if test -s $<.patch; then \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ touch $@; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ touch $@; \
</span> patch -i $<.patch -o $@; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CP) $< $@; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -317,7 +317,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYCOMPILE = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- python -c "import py_compile; py_compile.compile('$@')"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @PYTHON@ -c "import py_compile; py_compile.compile('$@')"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(bindir)/%.py: %.py | $(bindir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(PYRECIPE)
</span><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 16f5305..be0ac4a 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;'>@@ -1,5 +1,6 @@
</span> #!/bin/sh -e
<span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_GAG="${HOME}/.gag"
</span> export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
export GAG_PATH="${GAG_ROOT_DIR}/etc"
export GAG_EXEC_SYSTEM="x86_64-darwin-gfortran"
<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 4278257..b11de18 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;'>@@ -1,5 +1,6 @@
</span> #!/bin/sh -e
<span style='display:block; white-space:pre;background:#e0ffe0;'>+export GAG_GAG="${HOME}/.gag"
</span> export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
export GAG_PATH="${GAG_ROOT_DIR}/etc"
export GAG_EXEC_SYSTEM="x86_64-darwin-gfortran"
</pre><pre style='margin:0'>
</pre>