<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/ccf55d48dd1f1ca72a3e74b0412f9a40607ecdfc">https://github.com/macports/macports-ports/commit/ccf55d48dd1f1ca72a3e74b0412f9a40607ecdfc</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 ccf55d4 Gildas: update to 202002a
</span>ccf55d4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ccf55d48dd1f1ca72a3e74b0412f9a40607ecdfc
</span>Author: Sebastien Bardeau <bardeau@iram.fr>
AuthorDate: Mon Feb 3 14:42:11 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> Gildas: update to 202002a
</span>---
science/gildas/Portfile | 8 ++++----
science/gildas/files/patch-admin-Makefile.build.diff | 10 +++++-----
science/gildas/files/patch-admin-define-system.sh.diff | 12 ++++++------
3 files changed, 15 insertions(+), 15 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 60ee99c..8c3d70f 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 202001a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 202002a
</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 75d92d2a14a97e638e91bd5fa368bc0c63ff04b3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ff3bbdee7c3945a29f44cc0b6731d77ee07c0b54a3c720c2178fbfd3d545c08a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 41921308
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2fc26d21389625041f7004839d0ee3070f823302 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 46d453a58e00e769c060d6f658c5fade084bd9ac474daf1b71cfdd11ef24c315 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 41938500
</span>
patch.pre_args -p1
patchfiles patch-admin-Makefile.def.diff \
<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 0d32e70..75a5ef1 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,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-jan20a/admin/Makefile.build.orig 2020-01-08 09:56:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-jan20a/admin/Makefile.build 2020-01-08 10:02:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-feb20a/admin/Makefile.build.orig 2020-02-01 02:15:14.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-feb20a/admin/Makefile.build 2020-02-03 11:42:32.000000000 +0100
</span> @@ -296,10 +296,17 @@
# Copy into integration branch
ifdef GAG_USE_PYTHON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,9 +12,9 @@
</span> +# 0022).
PYRECIPE = \
if [ "$(PYTHON3_PRESENT)" = "yes" ]; then \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2to3 $< 2>/dev/null > cl; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -s cl; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2to3 $< 2>/dev/null > $<.patch; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -s $<.patch; then \
</span> + touch $@; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch -i cl -o $@; $(RM) cl; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch -i $<.patch -o $@; \
</span> else \
$(CP) $< $@; \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/patch-admin-define-system.sh.diff b/science/gildas/files/patch-admin-define-system.sh.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 17debb2..497c9ba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/patch-admin-define-system.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/patch-admin-define-system.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-jul16a/admin/define-system.sh.orig 2016-07-01 15:43:55.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-jul16a/admin/define-system.sh 2016-07-01 15:59:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -218,18 +218,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-feb20a/admin/define-system.sh.orig 2020-02-01 02:15:14.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-feb20a/admin/define-system.sh 2020-02-03 11:52:22.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -236,18 +236,18 @@
</span> else
GAG_MACHINE=pc
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,13 +25,13 @@
</span> fi
fi ;;
CYGWIN*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -439,10 +439,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -460,10 +460,12 @@
</span> fi
fi
#
- CPP_VERSION=`cpp --version | head -1 | \sed "s%.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*%\1%"`
+ CPP_VERSION=`@CPP@ --version | head -1 | \sed "s%.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*%\1%"`
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$CPP_VERSION" ">" "4.7.9" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if verle "4.8" "$CPP_VERSION"; then
</span> # See http://gcc.gnu.org/gcc-4.8/porting_to.html
GAG_COMPILER_CPPFLAGS="$GAG_COMPILER_CPPFLAGS -ffreestanding"
+ elif [ "$CPP_VERSION" != "${CPP_VERSION/clang/}" ]; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,7 @@
</span> fi
#
export GAG_COMPILER_FFLAGS GAG_COMPILER_FLIBS GAG_COMPILER_CPPFLAGS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -465,7 +467,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -486,7 +488,7 @@
</span> # source admin/gildas-env.sh -c ifort (use default ifort e.g. ifort 11) and
# source admin/gildas-env.sh -c ifort14 (i.e. use namely non default ifort 14)
# does not build their binaries in the same integration branch.
</pre><pre style='margin:0'>
</pre>