<pre style='margin:0'>
tenomoto pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/58cd0fc71828d98ba7c21109b33c1d616e30a1e1">https://github.com/macports/macports-ports/commit/58cd0fc71828d98ba7c21109b33c1d616e30a1e1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 58cd0fc71828d98ba7c21109b33c1d616e30a1e1
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Tue Nov 15 15:48:32 2016 +0900
<span style='display:block; white-space:pre;color:#404040;'> wgrib2: update to 2.0.5
</span>---
science/wgrib2/Portfile | 27 ++++-----
.../files/patch-g2clib-1.4.0-enc_jpeg2000.c.diff | 11 ++++
science/wgrib2/files/patch-makefile.diff | 66 +++++++++-------------
.../files/patch-wgrib2-enc_jpeg2000_clone.c.diff | 11 ++++
4 files changed, 61 insertions(+), 54 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 f3ffbe3..235e3f8 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.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0.5
</span> platforms darwin
maintainers takeshi
license public-domain
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +16,8 @@ distname ${name}_nolib.tgz.v${version}
</span> extract.suffix
set version_iplib 2012
set version_g2clib 1.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 47fcc30c1b4d4f883952fdd0cb683a97 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 eee050b720ba4bc4891d41e7f5c81ad2033c091c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f915db25714fb2af88c706988c0ac421e83321fc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a7fc9942d51153933b8bc19c2b5df3f2ab0f6289 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 453e7e1c2b0d42f5b3d09a44ca1a4fe7c3fd0be4babfd6cf6e4968d0f04184a7
</span> homepage http://www.cpc.ncep.noaa.gov/products/wesley/wgrib2/
long_description \
wgrib2 is a swiss army knife for grib2 files. \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,13 +31,16 @@ depends_build port:gctpc
</span> depends_lib port:jasper \
port:libpng \
port:netcdf \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hdf5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hdf5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libaec
</span>
worksrcdir grib2
patchfiles patch-makefile.diff \
patch-g2clib-makefile.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-iplib-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-iplib-makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-wgrib2-enc_jpeg2000_clone.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-g2clib-1.4.0-enc_jpeg2000.c.diff
</span> use_configure no
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,9 +48,9 @@ set ip ${worksrcpath}/iplib.${version_iplib}
</span> set lipolate ${ip}/libipolate.a
set g2c ${worksrcpath}/g2clib-${version_g2clib}
set lg2c ${g2c}/libgrib2c.a
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set lgctpc -lgctpc
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append -I${prefix}/include/gctpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append -I${prefix}/include/gctpc -I${prefix}/lib/libaec/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -L${prefix}/lib/libaec/lib
</span> variant universal {}
if {[variant_isset universal]} {
set cflags "${configure.cflags} ${configure.universal_cflags}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,15 +59,12 @@ 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:#ffe0e0;'>- zlib=\"\" plib=\"\" jlib=\"\" h5lib=\"\" n4lib=\"\" "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args -f makefile
</span>
pre-build {
set fsymbol ""
if {[fortran_variant_isset]} {
set iip "-I${ip}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libs "${lg2c} ${lgctpc} ${lipolate} ${compilers.libfortran}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append USE_IPOLATES=1
</span> if {[variant_isset g95]} {
set fsymbol -DG95
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,9 +76,8 @@ pre-build {
</span> FFLAGS=\"${configure.fflags}\"
} else {
set iip ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libs "${lg2c} ${lgctpc}"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append LDFLAGS=\"${libs} ${configure.ldflags} -lpng -ljasper -lnetcdf\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append LDFLAGS=\"${configure.ldflags}\" \
</span> CC=\"${configure.cc}\" \
CPPFLAGS=\"${fsymbol} ${configure.cppflags}\" \
CFLAGS=\"${cflags}\"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wgrib2/files/patch-g2clib-1.4.0-enc_jpeg2000.c.diff b/science/wgrib2/files/patch-g2clib-1.4.0-enc_jpeg2000.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fd35db6
</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-enc_jpeg2000.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- g2clib-1.4.0/enc_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/enc_jpeg2000.c 2016-11-15 15:30:51.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -121,7 +121,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ image.clrspc_=JAS_CLRSPC_SGRAY; /* grayscale Image */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ image.cmprof_=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- image.inmem_=1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// image.inmem_=1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmpt.tlx_=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmpt.tly_=0;
</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 90bee57..6ca1630 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 2014-06-07 03:37:11.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 2014-06-15 11:28:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,8 +92,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- makefile.orig 2016-07-27 23:18:28.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makefile 2016-11-15 15:24:10.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,20 +104,20 @@
</span> #
# Warning do not set both USE_NETCDF3 and USE_NETCDF4 to one
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,24 +11,21 @@
</span> USE_REGEX=1
USE_TIGGE=1
USE_MYSQL=0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -132,11 +132,11 @@
</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:#e0ffe0;'>+ USE_IPOLATES=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_UDF=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_OPENMP=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-USE_PROJ4=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++USE_PROJ4=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_WMO_VALIDATION=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DISABLE_TIMEZONE=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKE_FTN_API=0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(USE_NETCDF4),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ifeq ($(FC),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(error ERROR, USE_NETCDF4 = 1: must set fortran90 compiler by environement variable FC)
</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;'>-+#ifeq ($(USE_NETCDF4),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifeq ($(FC),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# $(error ERROR, USE_NETCDF4 = 1: must set fortran90 compiler by environement variable FC)
</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;'>- ifeq ($(USE_IPOLATES),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(FC),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -226,9 +226,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-USE_G2CLIB=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++USE_G2CLIB=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_PNG=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_JASPER=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_AEC=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -337,9 +337,9 @@
</span> # gctpc library
gctpc:=${cwd}/gctpc
gctpcsrc:=gctpc20a.tgz
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,11 +34,11 @@
</span> -# wCPPFLAGS+=-I${gctpc}/source
+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${prefix}/include/gctpc
</span>
# proj4 library
ifeq ($(USE_PROJ4),1)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -446,11 +446,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -503,11 +503,11 @@
</span> w=wgrib2
prog=$w/wgrib2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,16 +46,16 @@
</span> +all: ${prog} aux_progs/gmerge aux_progs/smallest_grib2 aux_progs/smallest_4
<span style='display:block; white-space:pre;background:#ffe0e0;'>--${prog}: $w/*.c $w/*.h ${jlib} ${nlib} ${zlib} ${plib} ${h5lib} ${glib} ${n4lib} ${iplib} ${gctpclib} ${proj4lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-${prog}: $w/*.c $w/*.h ${jlib} ${aeclib} ${nlib} ${zlib} ${plib} ${h5lib} ${glib} ${n4lib} ${iplib} ${gctpclib} ${proj4lib}
</span> - cd "$w" && export LDFLAGS="${wLDFLAGS}" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE}
+${prog}: $w/*.c $w/*.h ${glib} ${iplib}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd "$w" && ${MAKE} CPPFLAGS="-I${g} ${iip} ${CPPFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cd "$w" && ${MAKE} CPPFLAGS="-I${g} ${iip} ${CPPFLAGS}" LDFLAGS="${LDFLAGS} ${wLDFLAGS}"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fast: $w/*.c $w/*.h ${jlib} ${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} ${nlib} ${zlib} ${plib} ${h5lib} ${glib} ${n4lib} ${iplib} ${gctpclib} ${proj4lib}
</span> cd "$w" && export LDFLAGS="${wLDFLAGS}" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} fast
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -481,10 +481,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd "$z" && export CFLAGS="${wCPPFLAGS}" && ./configure --prefix=${cwd} && ${MAKE} check install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -559,10 +559,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm tmpz.tar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "$z" && export CFLAGS="${wCPPFLAGS}" && ./configure --prefix=${cwd} --static && ${MAKE} check install
</span>
-${glib}: ${jlib} ${plib} ${zlib}
+${glib}:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,17 +66,8 @@
</span>
${gctpclib}:
cp ${gctpcsrc} tmpgctpc.tar.gz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -492,7 +493,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tar -xvf tmpgctpc.tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm tmpgctpc.tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp makefile.gctpc proj.h ${gctpc}/source/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cd "${gctpc}/source" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} -f makefile.gctpc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd "${gctpc}/source" && ${MAKE} -f makefile.gctpc CPPFLAGS="-I${gctpc}/source ${CPPFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp ${gctpc}/source/libgeo.a ${lib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp ${gctpc}/source/proj.h ${cwd}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -532,7 +533,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.11/src/hdf5-1.8.11.tar.gz" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -610,7 +611,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(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>
${iplib}:
- cd "${ip}" && export FFLAGS="${wFFLAGS}" && ${MAKE} && cp libipolate.a ${iplib}
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..31386a9
</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-enc_jpeg2000_clone.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- wgrib2/enc_jpeg2000_clone.c.orig 2015-11-10 13:23:00.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ wgrib2/enc_jpeg2000_clone.c 2016-11-15 14:48:07.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,7 +120,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ image.clrspc_=JAS_CLRSPC_SGRAY; /* grayscale Image */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ image.cmprof_=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- image.inmem_=1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// image.inmem_=1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmpt.tlx_=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmpt.tly_=0;
</span></pre><pre style='margin:0'>
</pre>