<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/66fbff8516344910e3e1b5f1a90c32c398a06032">https://github.com/macports/macports-ports/commit/66fbff8516344910e3e1b5f1a90c32c398a06032</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 66fbff8 ncarg: update to 6.4.0, closing #53794
</span><span style='display:block; white-space:pre;color:#404040;'> new bfead47 Merge branch 'master' of https://github.com/macports/macports-ports
</span>66fbff8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 66fbff8516344910e3e1b5f1a90c32c398a06032
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Tue Apr 18 15:50:52 2017 +0900
<span style='display:block; white-space:pre;color:#404040;'> ncarg: update to 6.4.0, closing #53794
</span>---
science/ncarg/Portfile | 27 +++++++++++-----------
science/ncarg/files/patch-Configure.diff | 6 ++---
.../files/patch-config-Project-accelerate.diff | 15 ++++++------
science/ncarg/files/patch-config-Project.diff | 13 +++++------
4 files changed, 30 insertions(+), 31 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncarg/Portfile b/science/ncarg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6418e4d..149dcd7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ncarg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ncarg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,7 @@ compilers.choose fc f77 f90
</span> compilers.setup -clang -dragonegg -gfortran -llvm
name ncarg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.4.0
</span> categories science
platforms darwin
maintainers takeshi openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,11 +27,11 @@ homepage http://www.ncl.ucar.edu/
</span>
distname ncl_${name}-${version}
master_sites http://www.ncl.ucar.edu/Download/files/:g2clib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "https://www.earthsystemgrid.org/download/fileDownload.htm?logicalFileId=bec58cb3-cd9b-11e4-bb80-00c0f03d5b7c&dummy=:ncl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "https://www.earthsystemgrid.org/download/fileDownload.html?logicalFileId=86b9bec2-fa01-11e6-a976-00c0f03d5b7c&dummy:ncl"
</span>
set ncl_src ${distname}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set g2clib_version 1.5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set g2clib_version 1.6.0
</span> set g2clib_src g2clib-${g2clib_version}-patch${extract.suffix}
set g2clib_worksrcdir g2clib-${g2clib_version}-patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,11 +39,11 @@ distfiles ${ncl_src}:ncl \
</span> ${g2clib_src}:g2clib
checksums ${ncl_src} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 99753e6319ef418ca60d6980fefc183c65a52e58 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 79a01d1c51537426a1a657bb78c8f32453d071c774ec21495800d90d3688b2f3\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e43ff5a6235dacb21e86f18af33cfc5775331b25 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ebc9ec9538044cc4887c0c46adac8522242528d40c974e0b88b5b5d756f22a17 \
</span> ${g2clib_src} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 221b308be9258ed3ec9ebe126d872aa451f879cf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1852aa7404426e4d2fecbf75dee47bb1ffeb2ef06c63644c068bad9b9433bfff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 112d90fd297f772643d6223041f741d6e4101b49 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ec79fb768ce9e45ca6c2c94fa4dfc99b30600d7f8f44d272cdb36ab542d59468
</span>
depends_lib path:lib/pkgconfig/cairo.pc:cairo \
port:proj \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,6 +56,7 @@ depends_lib path:lib/pkgconfig/cairo.pc:cairo \
</span> port:curl \
port:libpng \
port:libxml2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gsl \
</span> port:xorg-libXaw
depends_build port:hdf5-18 \
port:triangle \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,14 +89,14 @@ pre-configure {
</span> configure.cc ${prefix}/lib/hdf5-18/bin/h5cc
}
# build modified g2clib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|CC=cc|CC=${configure.cc}|" ${workpath}/${g2clib_worksrcdir}/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|INC=-I/usr/local/include|INC=${configure.cppflags} ${configure.cflags}|" ${workpath}/${g2clib_worksrcdir}/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|CC=gcc -fPIC|CC=${configure.cc}|" ${workpath}/${g2clib_worksrcdir}/makefile
</span> if {$build_arch eq "x86_64" || $build_arch eq "ppc64"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-DUSE_PNG$|-DUSE_PNG -D__64BIT__|" ${workpath}/${g2clib_worksrcdir}/makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set defs "-DUSE_JPEG2000 -DUSE_PNG -D__64BIT__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set defs "-DUSE_JPEG2000 -DUSE_PNG"
</span> }
system -W ${workpath}/${g2clib_worksrcdir} "patch -p0 < ${filespath}/patch-enc_jpeg2000.c.diff"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath}/${g2clib_worksrcdir} "make all"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath}/${g2clib_worksrcdir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "make CC=${configure.cc} INC=\"${configure.cppflags} ${configure.cflags}\" DEFS=\"${defs}\" all"
</span> file copy ${workpath}/${g2clib_worksrcdir}/libgrib2c.a ${worksrcpath}
# edit configurations
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,6 +170,7 @@ y
</span> y
y
y
<span style='display:block; white-space:pre;background:#e0ffe0;'>+y
</span> ${worksrcpath} ${prefix}/lib/hdfeos5/lib ${prefix}/lib
${prefix}/include/freetype2 ${prefix}/include/udunits2 ${prefix}/lib/hdfeos5/include ${prefix}/include
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncarg/files/patch-Configure.diff b/science/ncarg/files/patch-Configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 271dba8..5a91e6e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ncarg/files/patch-Configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ncarg/files/patch-Configure.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;'>---- Configure.orig 2015-03-17 06:22:17.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Configure 2016-04-18 04:58:36.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -550,7 +550,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Configure.orig 2017-02-24 04:11:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Configure 2017-04-18 09:42:20.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -552,7 +552,7 @@
</span> if ("$answer" == "q") goto cleanup
if (("$answer" != "") && ("$answer" != "$hdfwithszip")) then
set hdfwithszip = "$answer"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncarg/files/patch-config-Project-accelerate.diff b/science/ncarg/files/patch-config-Project-accelerate.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a0eedb..61ced98 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ncarg/files/patch-config-Project-accelerate.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ncarg/files/patch-config-Project-accelerate.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;'>---- config/Project.orig 2015-03-17 06:21:42.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/Project 2016-04-18 23:07:57.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -272,7 +272,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/Project.orig 2017-02-24 04:11:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/Project 2017-04-18 09:47:36.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -280,7 +280,7 @@
</span>
#ifdef BuildHDF5
#ifndef HDF5lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> #endif /* HDF5lib */
#else
#define HDF5lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -305,7 +305,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -317,7 +317,7 @@
</span> #endif /* NetCDFlib */
#ifndef NetCDF4lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> #endif /* NetCDF4lib */
#ifndef UdUnitslib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -522,8 +522,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -534,8 +534,6 @@
</span> ICTRANSLIBSRC = $(NVIEWLIBSRC)/libictrans
NCARGRASLIBSRC = $(NVIEWLIBSRC)/libncarg_ras
HLULIBSRC = $(NILIBSRC)/hlu
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@
</span> SPHERESRC = $(EXTERNALSRC)/sphere3.1_dp
FFTPACK5SRC = $(EXTERNALSRC)/fftpack5_dp
NGOLIBSRC = $(NILIBSRC)/ngo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -549,10 +547,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -561,10 +559,10 @@
</span> NIOLIB = -lnio
NCLLIB =
NCLAPILIB = -lNGncl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,11 +39,10 @@
</span> +LAPACKLIB = -lvecLibFort
+SPHERELIB = $(SPHERESRC)/libsphere3.1_dp.a
+FFTPACK5LIB = $(FFTPACK5SRC)/libfftpack5_dp.a
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span>
CTRANSLIB = -lNGctrans
ICTRANS_LIB = -lNGictrans
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -594,10 +593,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -606,10 +604,10 @@
</span> XCBLIB = _UseLib(-L$(XCBLIBSRC),-lXcb)
NCLLIB = _UseLib(-L$(NCLLIBSRC),-lncl)
NCLAPILIB = _UseLib(-L$(NCLLIBSRC),-lnclapi)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncarg/files/patch-config-Project.diff b/science/ncarg/files/patch-config-Project.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6e889d6..2ff1423 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ncarg/files/patch-config-Project.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ncarg/files/patch-config-Project.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;'>---- config/Project.orig 2015-03-17 06:21:42.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/Project 2016-04-18 23:07:17.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -272,7 +272,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/Project.orig 2017-02-24 04:11:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/Project 2017-04-18 09:51:39.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -280,7 +280,7 @@
</span>
#ifdef BuildHDF5
#ifndef HDF5lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> #endif /* HDF5lib */
#else
#define HDF5lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -305,7 +305,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -317,7 +317,7 @@
</span> #endif /* NetCDFlib */
#ifndef NetCDF4lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> #endif /* NetCDF4lib */
#ifndef UdUnitslib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -549,10 +549,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -561,10 +561,10 @@
</span> NIOLIB = -lnio
NCLLIB =
NCLAPILIB = -lNGncl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,11 +30,10 @@
</span> +LAPACKLIB = $(LAPACKSRC)/liblapack_ncl.a
+SPHERELIB = $(SPHERESRC)/libsphere3.1_dp.a
+FFTPACK5LIB = $(FFTPACK5SRC)/libfftpack5_dp.a
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span>
CTRANSLIB = -lNGctrans
ICTRANS_LIB = -lNGictrans
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -594,10 +595,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -606,10 +606,10 @@
</span> XCBLIB = _UseLib(-L$(XCBLIBSRC),-lXcb)
NCLLIB = _UseLib(-L$(NCLLIBSRC),-lncl)
NCLAPILIB = _UseLib(-L$(NCLLIBSRC),-lnclapi)
</pre><pre style='margin:0'>
</pre>