<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/f6e6923c71e845bcf5d047e1cb64025fe4c69f0b">https://github.com/macports/macports-ports/commit/f6e6923c71e845bcf5d047e1cb64025fe4c69f0b</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 f6e6923 wgrib2: update to 2.0.7
</span>f6e6923 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f6e6923c71e845bcf5d047e1cb64025fe4c69f0b
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Sat Mar 10 18:30:05 2018 +0900
<span style='display:block; white-space:pre;color:#404040;'> wgrib2: update to 2.0.7
</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/55970
</span>---
science/wgrib2/Portfile | 26 ++++-----
science/wgrib2/files/patch-iplib-makefile.diff | 10 ++--
science/wgrib2/files/patch-makefile.diff | 62 +++++++++++-----------
.../files/patch-wgrib2-enc_jpeg2000_clone.c.diff | 11 ----
4 files changed, 47 insertions(+), 62 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 9ea5cb0..cd30226 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,29 +4,28 @@ PortSystem 1.0
</span> PortGroup compilers 1.0
name wgrib2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0.7
</span> platforms darwin
maintainers takeshi
license public-domain
categories science
description program to read atmospheric data files in GRIB2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.cpc.ncep.noaa.gov/products/wesley/wgrib2/
</span> master_sites ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/ \
http://www.ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}_nolib.tgz.v${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}.tgz.v${version}
</span> extract.suffix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set version_iplib 2012
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set version_iplib v3.0.0
</span> set version_g2clib 1.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a7fc9942d51153933b8bc19c2b5df3f2ab0f6289 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 453e7e1c2b0d42f5b3d09a44ca1a4fe7c3fd0be4babfd6cf6e4968d0f04184a7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.cpc.ncep.noaa.gov/products/wesley/wgrib2/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1aaef76c16ff871645da243a5799cae6631faea4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d7f1a4f9872922c62b3c7818c022465532cca1f5666b75d3ac5735f0b2747793
</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. \
GRIB-2 can reduce the file size by up to 80% (NAM, JPEG2000 compression).
compilers.choose fc f77 f90
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compilers.setup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.setup require_fortran -dragonegg -clang -llvm
</span>
depends_build port:gctpc
depends_lib port:jasper \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +40,6 @@ worksrcdir grib2
</span> patchfiles patch-makefile.diff \
patch-g2clib-makefile.diff \
patch-iplib-makefile.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-wgrib2-enc_jpeg2000_clone.c.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;'>@@ -51,7 +49,7 @@ set lipolate ${ip}/libipolate.a
</span> set g2c ${worksrcpath}/g2clib-${version_g2clib}
set lg2c ${g2c}/libgrib2c.a
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-prepend -I${prefix}/include/gctpc -I${prefix}/lib/libaec/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-prepend -I${prefix}/include/gctpc -I${prefix}/lib/libaec/include -DJAS_VERSION_MAJOR=2
</span> configure.ldflags-prepend -L${prefix}/lib/libaec/lib
variant universal {}
if {[variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,12 +59,11 @@ if {[variant_isset universal]} {
</span> set cflags "${configure.cflags} ${configure.cc_archflags}"
set ldflags "${configure.ldflags} ${configure.cc_archflags}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args -f makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args -f makefile
</span>
pre-build {
set fsymbol ""
if {[fortran_variant_isset]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set iip "-I${ip}"
</span> if {[variant_isset g95]} {
set fsymbol -DG95
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,14 +73,11 @@ pre-build {
</span> build.env FC=\"${configure.fc}\" \
F90=\"${configure.fc}\" \
FFLAGS=\"${configure.fflags}\"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set iip ""
</span> }
build.env-append LDFLAGS=\"${configure.ldflags}\" \
CC=\"${configure.cc}\" \
CPPFLAGS=\"${fsymbol} ${configure.cppflags}\" \
CFLAGS=\"${cflags}\"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append iip=\"${iip}\"
</span> }
destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,3 +94,5 @@ destroot {
</span> xinstall -m 644 ${worksrcpath}/README.ipolates ${destroot}${prefix}/share/doc/${name}
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex ${name}\\.tgz\\.v(\\d+(?:\\.\\d+)*)
</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><span style='display:block; white-space:pre;color:#808080;'>index 76c80db..25ca64f 100644
</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;'>+++ b/science/wgrib2/files/patch-iplib-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- iplib.2012/makefile.orig 2012-02-25 04:57:49.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ iplib.2012/makefile 2014-06-15 08:31:21.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- iplib.v3.0.0/makefile.orig 2016-04-20 05:15:15.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ iplib.v3.0.0/makefile 2018-03-10 17:02:36.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,7 @@
</span>
$(LIB): $(objs)
ar $(ARFLAGS) ${LIB} $(objs)
+ ranlib ${LIB}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- .f.o:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(FC) ${FFLAGS} -c $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .f90.mod:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${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 6ca1630..3f9b42c 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,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- makefile.orig 2016-07-27 23:18:28.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 2016-11-15 15:24:10.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,20 +104,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- makefile.orig 2017-12-30 00:14:43.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makefile 2018-03-10 17:19:24.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,21 +107,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
# Warning do not set both USE_NETCDF3 and USE_NETCDF4 to one
-USE_NETCDF3=1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,67 +11,67 @@
</span> USE_REGEX=1
USE_TIGGE=1
USE_MYSQL=0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- USE_IPOLATES=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_IPOLATES=1
</span> USE_UDF=0
USE_OPENMP=1
-USE_PROJ4=0
+USE_PROJ4=1
USE_WMO_VALIDATION=0
DISABLE_TIMEZONE=0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MAKE_FTN_API=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;'>+ DISABLE_ALARM=0
</span>
-USE_G2CLIB=0
+USE_G2CLIB=1
USE_PNG=1
USE_JASPER=1
USE_AEC=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -337,9 +337,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -417,8 +417,8 @@
</span> # gctpc library
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gctpc:=${cwd}/gctpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gctpcdir:=${cwd}/gctpc
</span> gctpcsrc:=gctpc20a.tgz
-gctpclib:=${lib}/libgeo.a
-wLDFLAGS+=-lgeo
<span style='display:block; white-space:pre;background:#ffe0e0;'>--# wCPPFLAGS+=-I${gctpc}/source
</span> +gctpclib:=${lib}/libgctpc.a
+wLDFLAGS+=-lgctpc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# wCPPFLAGS+=-I${prefix}/include/gctpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # wCPPFLAGS+=-I${gctpc}/source
</span>
# proj4 library
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(USE_PROJ4),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -503,11 +503,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -566,11 +566,10 @@
</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} ${nlib} ${zlib} ${plib} ${h5lib} ${glib} ${n4lib} ${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} ${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 ${glib} ${iplib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd "$w" && ${MAKE} CPPFLAGS="-I${g} ${iip} ${CPPFLAGS}" LDFLAGS="${LDFLAGS} ${wLDFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++${prog}: $w/*.c $w/*.h ${g2clib} ${iplib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cd "$w" && ${MAKE} LDFLAGS="${LDFLAGS} ${wLDFLAGS}"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fast: $w/*.c $w/*.h ${jlib} ${aeclib} ${nlib} ${zlib} ${plib} ${h5lib} ${glib} ${n4lib} ${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} ${gctpclib} ${proj4lib}
</span> cd "$w" && export LDFLAGS="${wLDFLAGS}" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} fast
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -559,10 +559,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm tmpz.tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd "$z" && export CFLAGS="${wCPPFLAGS}" && ./configure --prefix=${cwd} --static && ${MAKE} check install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -626,8 +625,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${zlib}: ${zdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd ${zdir} && export CFLAGS="${wCPPFLAGS}" && ./configure --prefix=${cwd} --static && ${MAKE} install
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--${glib}: ${jlib} ${plib} ${zlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+${glib}:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- touch ${glib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm ${glib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd "$g" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} && cp libgrib2c.a ${lib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ranlib ${glib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-${g2clib}: ${jlib} ${pnglib} ${zlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd "$g2cdir" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} && cp libgrib2c.a ${lib}
</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>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${gctpclib}:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${gctpcdir}/source/makefile.gctpc:
</span> cp ${gctpcsrc} tmpgctpc.tar.gz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -610,7 +611,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(error ERROR, get hdf5 source by "wget http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8.16/src/hdf5-1.8.16.tar.gz" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -683,7 +685,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
${iplib}:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- cd "${ip}" && export FFLAGS="${wFFLAGS}" && ${MAKE} && cp libipolate.a ${iplib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd "${ip}" && ${MAKE} && cp libipolate.a ${lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd "${ipdir}" && export FFLAGS="${wFFLAGS}" && ${MAKE} && cp libipolate.a ${iplib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cd "${ipdir}" && ${MAKE} && cp libipolate.a ${lib}
</span>
aux_progs/gmerge: aux_progs/gmerge.c
cd aux_progs && ${MAKE} -f gmerge.make
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wgrib2/files/patch-wgrib2-enc_jpeg2000_clone.c.diff b/science/wgrib2/files/patch-wgrib2-enc_jpeg2000_clone.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 31386a9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/wgrib2/files/patch-wgrib2-enc_jpeg2000_clone.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- wgrib2/enc_jpeg2000_clone.c.orig 2015-11-10 13:23:00.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ wgrib2/enc_jpeg2000_clone.c 2016-11-15 14:48:07.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,7 +120,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image.clrspc_=JAS_CLRSPC_SGRAY; /* grayscale Image */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image.cmprof_=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- image.inmem_=1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// image.inmem_=1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmpt.tlx_=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmpt.tly_=0;
</span></pre><pre style='margin:0'>
</pre>