<pre style='margin:0'>
Takeshi Enomoto (tenomoto) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/78c904a6b54552a0d11ff65e3dab18caf6fed326">https://github.com/macports/macports-ports/commit/78c904a6b54552a0d11ff65e3dab18caf6fed326</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 78c904a6b54 gnudatalanguage: update to 1.0.0-rc.3
</span>78c904a6b54 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 78c904a6b54552a0d11ff65e3dab18caf6fed326
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Sat May 29 15:52:50 2021 +0900
<span style='display:block; white-space:pre;color:#404040;'> gnudatalanguage: update to 1.0.0-rc.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62938
</span>---
math/gnudatalanguage/Portfile | 20 +++++---------------
.../gnudatalanguage/files/patch-src-hdf_fun.cpp.diff | 16 ----------------
.../files/patch-src-magick_cl.cpp.diff | 13 -------------
math/gnudatalanguage/files/sincos.patch | 18 ------------------
4 files changed, 5 insertions(+), 62 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gnudatalanguage/Portfile b/math/gnudatalanguage/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 87290188adc..dbbe6d08822 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gnudatalanguage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/gnudatalanguage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup conflicts_build 1.0
</span> PortGroup mpi 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup gnudatalanguage gdl 0.9.9 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup gnudatalanguage gdl 1.0.0-rc.3 v
</span> revision 8
name ${github.author}
epoch 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,9 @@ distfiles ${gdlsrc}:gdl
</span> worksrcdir gdl-${version}
checksums ${gdlsrc} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1248d6270a9d3fd98a02bc1e53021a30bec3e43c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ad5de3fec095a5c58b46338dcc7367d2565c093794ab1bbcf180bba1a712cf14 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4478934
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e83bbdb6140211d4b4010208e836608ef6653e66 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0dc5c5a397d46002e763d24dba707f0aa55ba404062b4ba5d4c217af8a7da024 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 32650313
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,10 +63,6 @@ conflicts_build antlr
</span>
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-magick_cl.cpp.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-hdf_fun.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append sincos.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append -DEIGEN3DIR=${prefix} \
-DFFTW=ON \
-DFFTWDIR=${prefix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,21 +84,15 @@ configure.args-append -DEIGEN3DIR=${prefix} \
</span> -DLIBPROJ4=ON \
-DLIBPROJ4DIR=${prefix} \
-DMAGICK=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPICH=OFF \
</span> -DNCURSESDIR=${prefix} \
-DNETCDF=ON \
-DNETCDFDIR=${prefix} \
-DOPENMP=OFF \
-DPLPLOTDIR=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPSLIB=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPSLIBDIR=${prefix} \
</span> -DPYTHON=OFF \
-DPYTHON_MODULE=OFF \
-DREADLINE=ON \
-DREADLINEDIR=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUDUNITS=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUDUNITSDIR=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUDUNITS_INCLUDE_DIR=${prefix}/include/udunits2 \
</span> -DWXWIDGETS=OFF \
-DX11DIR=${prefix} \
-DZLIBDIR=${prefix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,7 +115,7 @@ post-destroot {
</span> file rename ${destroot}${prefix}/share/${name}/${f} \
${destroot}${prefix}/share/doc/${name}/
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} COPYING ChangeLog HACKING NEWS MAP_INSTALL README README.GRIB README.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} COPYING HACKING NEWS MAP_INSTALL README README.GRIB README.md \
</span> ${destroot}${prefix}/share/doc/${name}
file copy ${worksrcpath}/testsuite ${destroot}${prefix}/share/${name}/
if {[variant_isset python27]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gnudatalanguage/files/patch-src-hdf_fun.cpp.diff b/math/gnudatalanguage/files/patch-src-hdf_fun.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6cb0dfd890a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gnudatalanguage/files/patch-src-hdf_fun.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/hdf_fun.cpp.orig 2018-12-01 23:19:52.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/hdf_fun.cpp 2020-02-14 13:04:20.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -238,11 +238,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dims[0] = recsize*nRecs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rank = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (nFlds == 1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dims[0] = nRecs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dims[0] = recsize/sizeof(type) * nRecs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rank = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dims[0] = nFlds;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dims[1] = nRecs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dims[1] = recsize/sizeof(type) * nRecs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rank = 2;
</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;color:#808080;'>diff --git a/math/gnudatalanguage/files/patch-src-magick_cl.cpp.diff b/math/gnudatalanguage/files/patch-src-magick_cl.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00a2f3df5c2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gnudatalanguage/files/patch-src-magick_cl.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/magick_cl.cpp.orig 2018-12-01 23:19:52.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/magick_cl.cpp 2019-10-01 18:40:32.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,6 +66,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int gCount = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static bool notInitialized = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __attribute__((constructor)) static void init(void) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ START_MAGICK;
</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;'>- void magick_setup() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < 40; ++i) gValid[i] = 0;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gnudatalanguage/files/sincos.patch b/math/gnudatalanguage/files/sincos.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dba870aa57f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gnudatalanguage/files/sincos.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Provide a fallback implementation of sincos for OS X 10.8 and earlier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-which don't have __sincos.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/gnudatalanguage/gdl/commit/a7dbf138ba4fda9e428ceab15b9ea7b7f7bc0948
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/ssrfpack.c.orig 2018-12-01 08:19:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/ssrfpack.c 2019-10-04 06:30:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,8 +3,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * are not required to compile and link the sph supplement.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define sincos(x, s, c) __sincos(x, s, c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define sincosf(x, s, c) __sincosf(x, s, c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define sincos(x,s,c) (*s = sin(x), *c = cos(x))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __FreeBSD__
</span></pre><pre style='margin:0'>
</pre>