<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/e1580c13bec6840a4e2c72b1199d8a2d981c1494">https://github.com/macports/macports-ports/commit/e1580c13bec6840a4e2c72b1199d8a2d981c1494</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e1580c13bec6840a4e2c72b1199d8a2d981c1494
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Sun Aug 12 23:01:27 2018 +0900
<span style='display:block; white-space:pre;color:#404040;'> ncarg: update to 6.5.0
</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/56870
</span>---
science/ncarg/Portfile | 15 ++++++++-------
science/ncarg/files/patch-Configure.diff | 4 ++--
science/ncarg/files/patch-config-Project-accelerate.diff | 16 ++++++++--------
science/ncarg/files/patch-config-Project.diff | 14 +++++++-------
4 files changed, 25 insertions(+), 24 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 aa18a8e..c8b5c3a 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;'>@@ -9,8 +9,8 @@ compilers.choose fc f77 f90
</span> compilers.setup -clang -gfortran
name ncarg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.4.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.5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set version_no_dot [join [split ${version} "."] ""]
</span> categories science
platforms darwin
maintainers {takeshi @tenomoto} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ 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.html?logicalFileId=86b9bec2-fa01-11e6-a976-00c0f03d5b7c&dummy=:ncl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://www.earthsystemgrid.org/dataset/ncl.${version_no_dot}.src/file/:ncl
</span>
set ncl_src ${distname}${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,11 +41,13 @@ distfiles ${ncl_src}:ncl \
</span> ${g2clib_src}:g2clib
checksums ${ncl_src} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 e43ff5a6235dacb21e86f18af33cfc5775331b25 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ebc9ec9538044cc4887c0c46adac8522242528d40c974e0b88b5b5d756f22a17 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 fadb97195f43cc09a628b18dabf8d70b8d436705 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cf7b8a255a434d2c9d385f995e84d2024fa9e6c04f847c91ecbcb3e4070c94d2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 61652896 \
</span> ${g2clib_src} \
rmd160 112d90fd297f772643d6223041f741d6e4101b49 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ec79fb768ce9e45ca6c2c94fa4dfc99b30600d7f8f44d272cdb36ab542d59468
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ec79fb768ce9e45ca6c2c94fa4dfc99b30600d7f8f44d272cdb36ab542d59468 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 184817
</span>
depends_lib path:lib/pkgconfig/cairo.pc:cairo \
port:proj \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +69,6 @@ depends_run bin:ESMF_RegridWeightGen:esmf \
</span> port:rangs-gshhs-ncarg
conflicts_build ncarg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span> universal_variant no
set usedap y
<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 5a91e6e..9706a7f 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,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Configure.orig 2017-02-24 04:11:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Configure 2017-04-18 09:42:20.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Configure.orig 2018-07-16 23:26:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Configure 2018-08-12 17:45:37.000000000 +0900
</span> @@ -552,7 +552,7 @@
if ("$answer" == "q") goto cleanup
if (("$answer" != "") && ("$answer" != "$hdfwithszip")) then
<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 61ced98..83cb02e 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,24 +1,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config/Project.orig 2017-02-24 04:11:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/Project 2017-04-18 09:47:36.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/Project.orig 2018-07-16 23:26:35.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/Project 2018-08-12 17:51:49.000000000 +0900
</span> @@ -280,7 +280,7 @@
#ifdef BuildHDF5
#ifndef HDF5lib
-#define HDF5lib -lhdf5_hl -lhdf5 -lsz -lz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HDF5lib -lhdf5_hl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HDF5lib -lhdf5_hl -lhdf5
</span> #endif /* HDF5lib */
#else
#define HDF5lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -317,7 +317,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -315,7 +315,7 @@
</span> #endif /* NetCDFlib */
#ifndef NetCDF4lib
-#define NetCDF4lib -lhdf5_hl -lhdf5 -lsz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define NetCDF4lib -lhdf5_hl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define NetCDF4lib -lhdf5_hl -lhdf5
</span> #endif /* NetCDF4lib */
#ifndef UdUnitslib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -534,8 +534,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -532,8 +532,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;'>-@@ -561,10 +559,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -559,10 +557,10 @@
</span> NIOLIB = -lnio
NCLLIB =
NCLAPILIB = -lNGncl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@
</span>
CTRANSLIB = -lNGctrans
ICTRANS_LIB = -lNGictrans
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -606,10 +604,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -604,10 +602,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 2ff1423..931244e 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,24 +1,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config/Project.orig 2017-02-24 04:11:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/Project 2017-04-18 09:51:39.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/Project.orig 2018-07-16 23:26:35.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/Project 2018-08-12 17:58:15.000000000 +0900
</span> @@ -280,7 +280,7 @@
#ifdef BuildHDF5
#ifndef HDF5lib
-#define HDF5lib -lhdf5_hl -lhdf5 -lsz -lz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HDF5lib -lhdf5_hl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HDF5lib -lhdf5_hl -lhdf5
</span> #endif /* HDF5lib */
#else
#define HDF5lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -317,7 +317,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -315,7 +315,7 @@
</span> #endif /* NetCDFlib */
#ifndef NetCDF4lib
-#define NetCDF4lib -lhdf5_hl -lhdf5 -lsz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define NetCDF4lib -lhdf5_hl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define NetCDF4lib -lhdf5_hl -lhdf5
</span> #endif /* NetCDF4lib */
#ifndef UdUnitslib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -561,10 +561,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -559,10 +559,10 @@
</span> NIOLIB = -lnio
NCLLIB =
NCLAPILIB = -lNGncl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@
</span>
CTRANSLIB = -lNGctrans
ICTRANS_LIB = -lNGictrans
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -606,10 +606,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -604,10 +604,10 @@
</span> XCBLIB = _UseLib(-L$(XCBLIBSRC),-lXcb)
NCLLIB = _UseLib(-L$(NCLLIBSRC),-lncl)
NCLAPILIB = _UseLib(-L$(NCLLIBSRC),-lnclapi)
</pre><pre style='margin:0'>
</pre>