[147086] trunk/dports/science/netcdf
takeshi at macports.org
takeshi at macports.org
Sat Mar 26 02:32:16 PDT 2016
Revision: 147086
https://trac.macports.org/changeset/147086
Author: takeshi at macports.org
Date: 2016-03-26 02:32:16 -0700 (Sat, 26 Mar 2016)
Log Message:
-----------
netcdf: update to 4.4.0 and use CMake, closing #50911
Modified Paths:
--------------
trunk/dports/science/netcdf/Portfile
Removed Paths:
-------------
trunk/dports/science/netcdf/files/patch-configure.diff
trunk/dports/science/netcdf/files/patch-libdap2-Makefile.in.diff
Modified: trunk/dports/science/netcdf/Portfile
===================================================================
--- trunk/dports/science/netcdf/Portfile 2016-03-26 09:16:31 UTC (rev 147085)
+++ trunk/dports/science/netcdf/Portfile 2016-03-26 09:32:16 UTC (rev 147086)
@@ -4,14 +4,13 @@
PortSystem 1.0
PortGroup mpi 1.0
PortGroup github 1.0
+PortGroup cmake 1.0
mpi.enforce_variant hdf5
-github.setup Unidata netcdf-c 4.3.3.1 v
-revision 4
+github.setup Unidata netcdf-c 4.4.0 v
epoch 2
name netcdf
-dist_subdir ${name}/${version}_1
maintainers takeshi openmaintainer
platforms darwin
categories science
@@ -25,46 +24,41 @@
homepage http://www.unidata.ucar.edu/software/netcdf/
-checksums md5 3ebfe346aa6e56fe0500679a1a601e17 \
- sha1 d8678a3e2c862e00de9d9fdeec4c0840afff73c7 \
- rmd160 e4a200455f1cffe730d050d530b349043b54493b
+checksums rmd160 0913cb8080f238b4582dfdf979ba8eef0a1d6277 \
+ sha256 ff7a5044564be7ddaa9710b452764b64f92153c8eeef9517ebb6b3465b633d01
compilers.choose cc cpp
mpi.setup
-patchfiles patch-configure.diff \
- patch-libdap2-Makefile.in.diff
+cmake.out_of_source yes
-configure.cppflags-append -DNDEBUG
-configure.cflags-append -fno-common
-configure.args --disable-doxygen \
- --disable-netcdf-4 \
- --disable-dap
+patchfiles patch-CMakeLists.txt.diff
+configure.args-append -DENABLE_NETCDF_4=OFF \
+ -DENABLE_DAP=OFF
+
test.run yes
test.target check
-destroot.destdir prefix=${destroot}${prefix} \
- MANDIR=\\\${prefix}/share/man
-
default_variants +netcdf4 +dap
variant netcdf4 description {enable support for netcdf-4 API} {
depends_lib-append port:hdf5
- configure.args-delete --disable-netcdf-4
- configure.args-append --enable-netcdf-4
+ configure.args-delete -DENABLE_NETCDF_4=OFF
+ configure.args-append -DENABLE_NETCDF_4=ON
}
variant hdf4 description {enable support for hdf4} {
depends_lib-append port:hdf4
configure.env-append LIBS=-ljpeg
- configure.args-append --enable-hdf4 \
- --disable-hdf4-file-tests
+ configure.args-append -DENABLE_HDF4=ON
}
variant dap description {enable dap} {
depends_lib-append port:curl
- configure.args-delete --disable-dap
+ configure.args-delete -DENABLE_DAP=OFF
+ configure.args-append -DENABLE_DAP=ON \
+ -DENABLE_DAP_REMOTE_TESTS=OFF
}
notes "
Deleted: trunk/dports/science/netcdf/files/patch-configure.diff
===================================================================
--- trunk/dports/science/netcdf/files/patch-configure.diff 2016-03-26 09:16:31 UTC (rev 147085)
+++ trunk/dports/science/netcdf/files/patch-configure.diff 2016-03-26 09:32:16 UTC (rev 147086)
@@ -1,10 +0,0 @@
---- configure.orig 2015-02-28 02:55:34.000000000 +0900
-+++ configure 2015-03-07 10:01:48.000000000 +0900
-@@ -17321,6 +17321,7 @@
- else
- USE_SZIP_TRUE='#'
- USE_SZIP_FALSE=
-+ LIBS=`echo ${LIBS} | sed 's/-lsz //'`
- fi
-
- if test ! "x$PNETCDFDIR" = x; then
Deleted: trunk/dports/science/netcdf/files/patch-libdap2-Makefile.in.diff
===================================================================
--- trunk/dports/science/netcdf/files/patch-libdap2-Makefile.in.diff 2016-03-26 09:16:31 UTC (rev 147085)
+++ trunk/dports/science/netcdf/files/patch-libdap2-Makefile.in.diff 2016-03-26 09:32:16 UTC (rev 147086)
@@ -1,25 +0,0 @@
---- libdap2/Makefile.in.orig 2014-04-24 05:44:02.000000000 +0900
-+++ libdap2/Makefile.in 2014-10-05 14:21:49.000000000 +0900
-@@ -130,7 +130,7 @@
- libdap2_la-dapdebug.lo libdap2_la-dapattr.lo \
- libdap2_la-ncd2dispatch.lo libdap2_la-getvara.lo \
- libdap2_la-dceconstraints.lo libdap2_la-dcetab.lo \
-- libdap2_la-dceparse.lo libdap2_la-dcelex.lo
-+ libdap2_la-dceparse.lo libdap2_la-dcelex.lo libdap2_la-ncdap.lo
- am__objects_2 =
- @BUILD_DAP_TRUE at am_libdap2_la_OBJECTS = $(am__objects_1) \
- @BUILD_DAP_TRUE@ $(am__objects_2)
-@@ -593,6 +593,13 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdap2_la-dcelex.lo `test -f 'dcelex.c' || echo '$(srcdir)/'`dcelex.c
-
-+libdap2_la-ncdap.lo: ncdap.c
-+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdap2_la-ncdap.lo -MD -MP -MF $(DEPDIR)/libdap2_la-ncdap.Tpo -c -o libdap2_la-ncdap.lo `test -f 'ncdap.c' || echo '$(srcdir)/'`ncdap.c
-+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap2_la-ncdap.Tpo $(DEPDIR)/libdap2_la-ncdap.Plo
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ncdap.c' object='libdap2_la-ncdap.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdap2_la-ncdap.lo `test -f 'ncdap.c' || echo '$(srcdir)/'`ncdap.c
-+
- mostlyclean-libtool:
- -rm -f *.lo
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160326/dc68121e/attachment.html>
More information about the macports-changes
mailing list