<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/54bacd44f8fb880df5ea6c0a2484958530da5140">https://github.com/macports/macports-ports/commit/54bacd44f8fb880df5ea6c0a2484958530da5140</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 54bacd4 gildas: update to version 202001a. (#6126)
</span>54bacd4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 54bacd44f8fb880df5ea6c0a2484958530da5140
</span>Author: bardeau <bardeau@iram.fr>
AuthorDate: Wed Jan 8 17:06:57 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> gildas: update to version 202001a. (#6126)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Switch to Python 3.8
</span>---
science/gildas/Portfile | 15 ++++++++-------
science/gildas/files/patch-admin-Makefile.build.diff | 20 ++++++++++++++++++++
2 files changed, 28 insertions(+), 7 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 9b54cb9..60ee99c 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 201912a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 202001a
</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,20 +30,21 @@ 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 31676d9fd1ddd2f207ddf8b75a16dd8d85b09f9a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 611974b126b03f4a172b3380a245251f5f5492e0796dbed49ab0f4fffe2b984f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 41920212
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 75d92d2a14a97e638e91bd5fa368bc0c63ff04b3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ff3bbdee7c3945a29f44cc0b6731d77ee07c0b54a3c720c2178fbfd3d545c08a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 41921308
</span>
patch.pre_args -p1
patchfiles patch-admin-Makefile.def.diff \
patch-admin-Makefile.python.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-admin-Makefile.build.diff \
</span> patch-admin-gildas-env.sh.diff \
patch-admin-define-system.sh.diff
depends_lib port:gtk2 \
port:libpng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python38 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py38-numpy
</span>
depends_build port:cfitsio \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +60,7 @@ compilers.enforce_some_fortran cfitsio
</span>
compilers.choose fc
compilers.setup -g95 -gcc44 -gcc45 -gcc46 require_fortran
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python3.8
</span>
post-extract {
if {![gcc_variant_isset]} {
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0d32e70
</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/patch-admin-Makefile.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-jan20a/admin/Makefile.build.orig 2020-01-08 09:56:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-jan20a/admin/Makefile.build 2020-01-08 10:02:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -296,10 +296,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy into integration branch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef GAG_USE_PYTHON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Pre-touch'ing the output file below is needed when building under
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# MacPorts to create the file with proper permissions (umask). Then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# patch will keep those permissions. Without this pre-touch, patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# does not create a file with proper permissions (readable for root
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# only, i.e. files are not accessible to users, even if umask is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# 0022).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYRECIPE = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "$(PYTHON3_PRESENT)" = "yes" ]; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2to3 $< 2>/dev/null > cl; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -s cl; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ touch $@; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch -i cl -o $@; $(RM) cl; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CP) $< $@; \
</span></pre><pre style='margin:0'>
</pre>