<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/a4bc9f39774ec3665e846e61b212099879225a0c">https://github.com/macports/macports-ports/commit/a4bc9f39774ec3665e846e61b212099879225a0c</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 a4bc9f3 wgrib2: update to 2.0.8
</span>a4bc9f3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a4bc9f39774ec3665e846e61b212099879225a0c
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Fri Nov 29 16:35:33 2019 +0900
<span style='display:block; white-space:pre;color:#404040;'> wgrib2: update to 2.0.8
</span>---
science/wgrib2/Portfile | 23 ++++++------
science/wgrib2/files/patch-ip2lib_d-Makefile.diff | 12 ++++++
science/wgrib2/files/patch-iplib-makefile.diff | 10 -----
science/wgrib2/files/patch-makefile.diff | 45 ++++++++++++-----------
4 files changed, 47 insertions(+), 43 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 74df35b..d1cd1c9 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;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup compilers 1.0
name wgrib2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0.8
</span> platforms darwin
maintainers {takeshi @tenomoto}
license public-domain
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,10 +15,10 @@ master_sites ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/ \
</span> http://www.ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/
distname ${name}.tgz.v${version}
extract.suffix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set version_iplib v3.0.0
</span> set version_g2clib 1.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1aaef76c16ff871645da243a5799cae6631faea4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d7f1a4f9872922c62b3c7818c022465532cca1f5666b75d3ac5735f0b2747793
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c14903e46ae5b412c2260de254a351c5693bbef0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5e6a0d6807591aa2a190d35401606f7e903d5485719655aea1c4866cc2828160 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 26050379
</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;'>@@ -39,8 +38,8 @@ depends_lib port:jasper \
</span> worksrcdir grib2
patchfiles patch-makefile.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ip2lib_d-Makefile.diff \
</span> patch-g2clib-makefile.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-iplib-makefile.diff \
</span> patch-g2clib-1.4.0-enc_jpeg2000.c.diff
use_configure no
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,8 +48,8 @@ if {[gcc_variant_isset] || [clang_variant_isset]} {
</span> default_variants +openmp
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set ip ${worksrcpath}/iplib.${version_iplib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set lipolate ${ip}/libipolate.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ip ${worksrcpath}/ip2lib_d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set lipolate ${ip}/libip2_d.a
</span> set g2c ${worksrcpath}/g2clib-${version_g2clib}
set lg2c ${g2c}/libgrib2c.a
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,16 +74,18 @@ pre-build {
</span> if {[fortran_variant_isset]} {
if {[variant_isset g95]} {
set fsymbol -DG95
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.fflags-append -r8
</span> } else {
set fsymbol -DGFORTRAN
build.args-append USE_OPENMP=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.fflags-append -fdefault-real-8 -fdefault-double-8
</span> }
if {[vercmp [macports_version] 2.5.99] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env FC=${configure.fc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append FC=${configure.fc} \
</span> F90=${configure.fc} \
"FFLAGS=${configure.fflags} ${ompflg}"
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env FC=\"${configure.fc}\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append FC=\"${configure.fc}\" \
</span> F90=\"${configure.fc}\" \
FFLAGS=\"${configure.fflags} ${ompflg}\"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,7 +111,7 @@ destroot {
</span> xinstall -m 755 ${worksrcpath}/aux_progs/${b} ${destroot}${prefix}/bin
}
if {[file exist ${lipolate}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "ranlib ${ip}/libipolate.a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "ranlib ${lipolate}"
</span> xinstall -m 644 ${lipolate} ${destroot}${prefix}/lib
xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 ${worksrcpath}/README.ipolates ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wgrib2/files/patch-ip2lib_d-Makefile.diff b/science/wgrib2/files/patch-ip2lib_d-Makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f3f50c1
</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-ip2lib_d-Makefile.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;'>+--- ip2lib_d/Makefile.orig 2018-05-10 22:24:33.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ip2lib_d/Makefile 2019-11-29 15:29:31.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SUFFIXES:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SUFFIXES: .F90 .f90 .o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .F90.o:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(FC) $(FFLAGS) ${FTN_REAL8} $(FPPFLAGS) $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(FC) $(FFLAGS) ${FTN_REAL8} $(FPPFLAGS) $< -c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .f90.o:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(FC) $(FFLAGS) ${FTN_REAL8} $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(FC) $(FFLAGS) ${FTN_REAL8} $< -c
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wgrib2/files/patch-iplib-makefile.diff b/science/wgrib2/files/patch-iplib-makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 25ca64f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/wgrib2/files/patch-iplib-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- iplib.v3.0.0/makefile.orig 2016-04-20 05:15:15.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ iplib.v3.0.0/makefile 2018-03-10 17:02:36.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,6 +23,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(LIB): $(objs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ar $(ARFLAGS) ${LIB} $(objs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ranlib ${LIB}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .f90.mod:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${FC} ${FFLAGS} -c $<
</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 ba0943f..6b6eb25 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 2017-12-30 00:14:43.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 2018-04-08 13:16:45.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -107,21 +107,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- makefile.orig 2019-02-08 02:53:47.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makefile 2019-11-29 15:00:31.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -115,8 +115,8 @@
</span>
# Warning do not set both USE_NETCDF3 and USE_NETCDF4 to one
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,8 @@
</span> USE_REGEX=1
USE_TIGGE=1
USE_MYSQL=0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- USE_IPOLATES=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -124,13 +124,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_SPECTRAL=0
</span> USE_UDF=0
USE_OPENMP=1
-USE_PROJ4=0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +27,7 @@
</span> USE_PNG=1
USE_JASPER=1
USE_AEC=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -417,8 +417,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -446,8 +446,8 @@
</span> # gctpc library
gctpcdir:=${cwd}/gctpc
gctpcsrc:=gctpc20a.tgz
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,41 +38,41 @@
</span> # wCPPFLAGS+=-I${gctpc}/source
# proj4 library
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -566,11 +566,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -613,11 +613,11 @@
</span> w=wgrib2
prog=$w/wgrib2
-all: ${netcdf4src} ${hdf5src} ${prog} aux_progs/gmerge aux_progs/smallest_grib2 aux_progs/smallest_4
+all: ${prog} aux_progs/gmerge aux_progs/smallest_grib2 aux_progs/smallest_4
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--${prog}: $w/*.c $w/*.h ${jlib} ${aeclib} ${netcdf3lib} ${pnglib} ${hdf5lib} ${g2clib} ${netcdf4lib} ${iplib} ${gctpclib} ${proj4lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-${prog}: $w/*.c $w/*.h ${jlib} ${aeclib} ${netcdf3lib} ${pnglib} ${hdf5lib} ${g2clib} ${netcdf4lib} ${iplib} ${spectrallib} ${gctpclib} ${proj4lib}
</span> - cd "$w" && export LDFLAGS="${wLDFLAGS}" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+${prog}: $w/*.c $w/*.h ${g2clib} ${iplib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++${prog}: $w/*.c $w/*.h ${g2clib} ${iplib}
</span> + cd "$w" && ${MAKE} LDFLAGS="${LDFLAGS} ${wLDFLAGS}" CPPFLAGS="-I${g2cdir} ${CPPFLAGS}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fast: $w/*.c $w/*.h ${jlib} ${aeclib} ${netcdf3lib} ${pnglib} ${hdf5lib} ${g2clib} ${netcdf4lib} ${iplib} ${gctpclib} ${proj4lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fast: $w/*.c $w/*.h ${jlib} ${aeclib} ${netcdf3lib} ${pnglib} ${hdf5lib} ${g2clib} ${netcdf4lib} ${iplib} ${spectrallib} ${gctpclib} ${proj4lib}
</span> cd "$w" && export LDFLAGS="${wLDFLAGS}" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} fast
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -626,8 +625,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -677,8 +677,11 @@
</span> ${zlib}: ${zdir}
cd ${zdir} && export CFLAGS="${wCPPFLAGS}" && ./configure --prefix=${cwd} --static && ${MAKE} install
-${g2clib}: ${jlib} ${pnglib} ${zlib}
- cd "$g2cdir" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} && cp libgrib2c.a ${lib}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+${g2clib}:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ touch ${g2clib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rm ${g2clib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd "${g2cdir}" && ${MAKE} && cp libgrib2c.a ${lib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ranlib ${g2clib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++${g2clib}:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ touch ${g2clib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm ${g2clib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cd "${g2cdir}" && ${MAKE} && cp libgrib2c.a ${lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ranlib ${g2clib}
</span>
${gctpcdir}/source/makefile.gctpc:
cp ${gctpcsrc} tmpgctpc.tar.gz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -683,7 +685,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -733,7 +736,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "${hdf5dir}" && export CFLAGS="${hdf5CFLAGS}" && export LDFLAGS="${LDFLAGS}" && ./configure --disable-shared --with-zlib=$z --prefix=${cwd} && ${MAKE} all check install
</span>
${iplib}:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- cd "${ipdir}" && export FFLAGS="${wFFLAGS}" && ${MAKE} && cp libipolate.a ${iplib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd "${ipdir}" && ${MAKE} && cp libipolate.a ${lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd "${ipdir}" && export FFLAGS="${wFFLAGS}" && export FTN_REAL8=${FTN_REAL8} && ${MAKE} && cp $(notdir ${iplib}) ${iplib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cd "${ipdir}" && ${MAKE} && cp $(notdir ${iplib}) ${iplib}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- aux_progs/gmerge: aux_progs/gmerge.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd aux_progs && ${MAKE} -f gmerge.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${spectrallib}:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "${spectraldir}" && export FFLAGS="${wFFLAGS}" && export FTN_REAL8=${FTN_REAL8} && ${MAKE} && cp $(notdir ${spectrallib}) ${spectrallib}
</span></pre><pre style='margin:0'>
</pre>