<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/addd37ad5856629a90374accb95c9cd9bbf11154">https://github.com/macports/macports-ports/commit/addd37ad5856629a90374accb95c9cd9bbf11154</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 addd37ad585 wgrib2: update to v3.1.1
</span>addd37ad585 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit addd37ad5856629a90374accb95c9cd9bbf11154
</span>Author: Takeshi Enomoto <takeshi@enomosphere.net>
AuthorDate: Sun Sep 11 13:36:10 2022 +0900
<span style='display:block; white-space:pre;color:#404040;'> wgrib2: update to v3.1.1
</span>---
science/wgrib2/Portfile | 14 +++++----
.../files/patch-g2clib-1.4.0-dec_jpeg2000.c.diff | 15 +++++++++
science/wgrib2/files/patch-makefile.diff | 36 +++++++++++-----------
science/wgrib2/files/patch-wgrib2-makefile.diff | 6 ++--
science/wgrib2/files/patch-wgrib2-unpk.c.diff | 12 ++++++++
5 files changed, 56 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wgrib2/Portfile b/science/wgrib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 67d7cd6a824..7df2af9d132 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/wgrib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/wgrib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,8 @@ PortGroup legacysupport 1.0
</span> legacysupport.newest_darwin_requires_legacy 10
name wgrib2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> maintainers {takeshi @tenomoto}
license public-domain
categories science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,9 @@ master_sites ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/ \
</span> distname ${name}.tgz.v${version}
extract.suffix
set version_g2clib 1.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d4a1807fb7df6242f899f740e75f984cabcac9af \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 70bb21bb64648627c8678b0b8948d8f5558ce423752fda8603c674cacf8d9e68 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 28757467
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 86f2374fc52164c6432a9ef44db25485fa46a80f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9236f6afddad76d868c2cfdf5c4227f5bdda5e85ae40c18bafb37218e49bc04a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 30034766
</span> long_description \
wgrib2 is a swiss army knife for grib2 files. \
GRIB-2 has arrived and has begun replacing the the older standard GRIB-1. \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,8 +47,10 @@ patchfiles patch-makefile.diff \
</span> patch-makefile.gctpc.diff \
patch-ip2lib_d-Makefile.diff \
patch-g2clib-makefile.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-g2clib-1.4.0-dec_jpeg2000.c.diff \
</span> patch-g2clib-1.4.0-enc_jpeg2000.c.diff \
patch-sp_v2.0.2_d-Makefile.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-wgrib2-unpk.c.diff \
</span> patch-wgrib2-makefile.diff
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +66,7 @@ set g2c ${worksrcpath}/g2clib-${version_g2clib}
</span> set lg2c ${g2c}/libgrib2c.a
configure.cppflags-prepend -I${prefix}/lib/libaec/include -I${prefix}/libexec/jasper2/include -DJAS_VERSION_MAJOR=2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-prepend -L${prefix}/lib/proj5/lib -L${prefix}/lib/libaec/lib -L${prefix}/libexec/jasper2/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-prepend -L${prefix}/lib/proj8/lib -L${prefix}/lib/libaec/lib -L${prefix}/libexec/jasper2/lib
</span> variant universal {}
set cflags "${configure.cflags} [get_canonical_archflags cc]"
set ldflags "${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wgrib2/files/patch-g2clib-1.4.0-dec_jpeg2000.c.diff b/science/wgrib2/files/patch-g2clib-1.4.0-dec_jpeg2000.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..35cb427767d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/wgrib2/files/patch-g2clib-1.4.0-dec_jpeg2000.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- g2clib-1.4.0/dec_jpeg2000.c.orig 2012-02-15 22:54:35.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ g2clib-1.4.0/dec_jpeg2000.c 2022-09-11 13:20:35.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,9 +70,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Decode JPEG200 codestream into jas_image_t structure.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- image=jpc_decode(jpcstream,opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int fmt = jas_image_strtofmt((char*)"jpc");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ image=jas_image_decode(jpcstream, fmt, opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( image == 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- printf(" jpc_decode return\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf(" jas_image_decode return\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wgrib2/files/patch-makefile.diff b/science/wgrib2/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 52364947dba..ad402f429b3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/wgrib2/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/wgrib2/files/patch-makefile.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;'>---- makefile.orig 2021-02-25 22:59:36.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 2021-07-24 17:54:32.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -136,8 +136,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- makefile.orig 2022-04-13 23:50:45.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makefile 2022-09-11 13:24:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,8 +140,8 @@
</span>
# Warning do not set both USE_NETCDF3 and USE_NETCDF4 to one
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,17 +11,17 @@
</span> USE_REGEX=1
USE_TIGGE=1
USE_MYSQL=0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,7 +145,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -149,7 +149,7 @@
</span> USE_SPECTRAL=1
USE_UDF=0
USE_OPENMP=1
-USE_PROJ4=0
+USE_PROJ4=1
USE_WMO_VALIDATION=0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- DISABLE_TIMEZONE=0
</span> USE_NAMES=NCEP
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -153,7 +153,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DISABLE_ALARM=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKE_FTN_API=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,7 +157,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DISABLE_STAT=0
</span> MAKE_SHARED_LIB=0
-USE_G2CLIB=0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@
</span> USE_PNG=1
USE_JASPER=1
USE_OPENJPEG=0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -168,7 +168,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -172,7 +172,7 @@
</span> lib:=${cwd}/lib
tmp:=${cwd}/tmp
export TMPDIR=${tmp}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,25 +38,25 @@
</span> a:=$(shell mkdir -p ${lib})
a:=$(shell mkdir -p ${tmp})
wCPPFLAGS:=${CPPFLAGS} -I${cwd}/include
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -644,7 +644,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -654,7 +654,7 @@
</span> jsrc=jasper-1.900.1-14ubuntu3.2.debian.tgz
jlib=${lib}/libjasper.a
wLDFLAGS+=-ljasper
- wCPPFLAGS+=-I${jasperdir}/src/libjasper/include
+# wCPPFLAGS+=-I${jasperdir}/src/libjasper/include
a:=$(shell echo '$Hdefine USE_JASPER' >> ${CONFIG_H})
<span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a:=$(shell echo '//$Hdefine USE_JASPER' >> ${CONFIG_H})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -765,7 +765,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -777,7 +777,7 @@
</span> ifeq ($(USE_PNG),1)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pngsrc=${cwd}/libpng-1.2.57.tar.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pnglib=${lib}/libpng.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pngsrc=${cwd}/libpng-1.2.59.tar.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pnglib=${lib}/libpng12.a
</span> - wLDFLAGS+=-lpng12
+ wLDFLAGS+=-lpng
a:=$(shell echo '$Hdefine USE_PNG' >> ${CONFIG_H})
else
a:=$(shell echo '//$Hdefine USE_PNG' >> ${CONFIG_H})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -814,10 +814,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -826,10 +826,10 @@
</span> w=wgrib2
prog=$w/wgrib2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@
</span> cd "$w" && export LDFLAGS="${wLDFLAGS}" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE}
fast: $w/*.c $w/*.h ${jlib} ${aeclib} ${netcdf3lib} ${pnglib} ${hdf5lib} ${g2clib} ${netcdf4lib} ${iplib} ${spectrallib} ${gctpclib} ${proj4lib} ${ojlib}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -892,8 +892,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -904,8 +904,10 @@
</span> ${zlib}: ${zdir}
cd ${zdir} && export CFLAGS="${wCPPFLAGS}" && ./configure --prefix=${cwd} --static && ${MAKE} install
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,8 +82,8 @@
</span>
${gctpcdir}/source/makefile.gctpc:
cp ${gctpcsrc} tmpgctpc.tar.gz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -950,7 +952,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd "${hdf5dir}" && export CFLAGS="${hdf5CFLAGS}" && export LDFLAGS="${LDFLAGS}" && ./configure --disable-shared --with-zlib=$z --prefix=${cwd} && ${MAKE} -j 1 all check install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -965,7 +967,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "${hdf5dir}" && export CFLAGS="${hdf5CFLAGS}" && export LDFLAGS="${LDFLAGS}" && ./configure --disable-shared --with-zlib=${cwd} --disable-sharedlib-rpath --prefix=${cwd} --with-default-api-version=v110 && ${MAKE} -j 1 all check install
</span>
${iplib}:
- cd "${ipdir}" && export FFLAGS="${wFFLAGS}" && export FTN_REAL8=${FTN_REAL8} && ${MAKE} && cp $(notdir ${iplib}) ${iplib}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wgrib2/files/patch-wgrib2-makefile.diff b/science/wgrib2/files/patch-wgrib2-makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2b581e14f83..9a68906f3ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/wgrib2/files/patch-wgrib2-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/wgrib2/files/patch-wgrib2-makefile.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;'>---- wgrib2/makefile.orig 2021-02-10 23:31:23.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ wgrib2/makefile 2021-07-24 18:17:15.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,7 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- wgrib2/makefile.orig 2021-09-07 21:32:14.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ wgrib2/makefile 2022-09-11 11:51:28.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +22,7 @@
</span> ARFLAGS=-ruv
wgrib2: $h fnlist.c ${all}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wgrib2/files/patch-wgrib2-unpk.c.diff b/science/wgrib2/files/patch-wgrib2-unpk.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2709c4f4740
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/wgrib2/files/patch-wgrib2-unpk.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- wgrib2/unpk.c.orig 2021-05-04 03:12:43.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ wgrib2/unpk.c 2022-09-11 11:48:25.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -202,7 +202,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ image = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opts = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jpcstream=jas_stream_memopen((char *) sec[7]+5, (int) GB2_Sec7_size(sec)-5);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- image = jpc_decode(jpcstream, opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int fmt = jas_image_strtofmt((char*)"jpc");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ image = jas_image_decode(jpcstream, fmt, opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (image == NULL) fatal_error("jpeg2000 decoding", "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pcmpt = image->cmpts_[0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (image->numcmpts_ != 1 )
</span></pre><pre style='margin:0'>
</pre>