Changes 4.2.1.1:

Patched libdap2/ncdap3.c to fix DAP performance bug remotely accessing large files (> 2GiB).

Patched ncdump/dumplib.c to properly escape special characters in CDL output from ncdump for netCDF-4 string data.

7 files changed, 17 insertions, 195 deletions

diff --git a/devel/netcdf/Makefile b/devel/netcdf/Makefile
index 1cb67317c1e..ee23e15b4c4 100644
--- a/devel/netcdf/Makefile
+++ b/devel/netcdf/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2012/10/31 11:17:32 asau Exp $
+# $NetBSD: Makefile,v 1.33 2013/04/09 15:57:28 adam Exp $
 
-DISTNAME=	netcdf-4.1.3
+DISTNAME=	netcdf-4.2.1.1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.unidata.ucar.edu/downloads/netcdf/ftp/
 
@@ -11,10 +11,11 @@ COMMENT=	Library for array-oriented data access
 USE_LANGUAGES=		c c++ fortran77
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-f90
+CONFIGURE_ARGS+=	--disable-doxygen
 CONFIGURE_ARGS+=	--disable-examples
-CONFIGURE_ARGS+=	--disable-netcdf-4
 
 INFO_FILES=		yes
 
+.include "../../devel/hdf5/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/netcdf/PLIST b/devel/netcdf/PLIST
index 083663146f6..7222331ee13 100644
--- a/devel/netcdf/PLIST
+++ b/devel/netcdf/PLIST
@@ -1,32 +1,14 @@
-@comment $NetBSD: PLIST,v 1.6 2012/03/07 16:11:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/04/09 15:57:28 adam Exp $
 bin/nc-config
 bin/nccopy
 bin/ncdump
 bin/ncgen
 bin/ncgen3
-include/ncvalues.h
 include/netcdf.h
-include/netcdf.hh
-include/netcdf.inc
-include/netcdfcpp.h
-info/netcdf-c.info
-info/netcdf-c.info-1
-info/netcdf-c.info-2
-info/netcdf-cxx.info
-info/netcdf-f77.info
-info/netcdf-f77.info-1
-info/netcdf-f77.info-2
-info/netcdf-f90.info
-info/netcdf-install.info
-info/netcdf-tutorial.info
-info/netcdf.info
 lib/libnetcdf.la
-lib/libnetcdf_c++.la
-lib/libnetcdff.la
 lib/pkgconfig/netcdf.pc
 man/man1/nccopy.1
 man/man1/ncdump.1
 man/man1/ncgen.1
 man/man1/ncgen3.1
 man/man3/netcdf.3
-man/man3/netcdf_f77.3
diff --git a/devel/netcdf/buildlink3.mk b/devel/netcdf/buildlink3.mk
index 7ca854e06fa..a558322f32d 100644
--- a/devel/netcdf/buildlink3.mk
+++ b/devel/netcdf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2013/04/09 15:57:28 adam Exp $
 
 BUILDLINK_TREE+=	netcdf
 
@@ -8,6 +8,9 @@ NETCDF_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.netcdf+=	netcdf>=3.5
 BUILDLINK_ABI_DEPENDS.netcdf+=	netcdf>=3.5.0nb2
 BUILDLINK_PKGSRCDIR.netcdf?=	../../devel/netcdf
+
+.include "../../devel/hdf5/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .endif # NETCDF_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-netcdf
diff --git a/devel/netcdf/distinfo b/devel/netcdf/distinfo
index f04ae7d3e42..bcbcb278f77 100644
--- a/devel/netcdf/distinfo
+++ b/devel/netcdf/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.15 2012/03/07 16:11:29 adam Exp $
+$NetBSD: distinfo,v 1.16 2013/04/09 15:57:28 adam Exp $
 
-SHA1 (netcdf-4.1.3.tar.gz) = e600322478276f51612e17cca3cda38489003f81
-RMD160 (netcdf-4.1.3.tar.gz) = ac07f570873bba89a49cb2eb2275a40cbc8e502b
-Size (netcdf-4.1.3.tar.gz) = 11097157 bytes
-SHA1 (patch-an) = b3d3cf17c177779d18a2d3fcc3cb7186b3cc8374
-SHA1 (patch-configure) = b1ea50699ad3c7510e123a9f40d02683700af40c
-SHA1 (patch-nc_test4_run_bm_ar4.sh) = 1580189e460444b1169ef9d400570852e6afd90e
+SHA1 (netcdf-4.2.1.1.tar.gz) = 76631cb4e6b767c224338415cf6e5f5ff9bd1238
+RMD160 (netcdf-4.2.1.1.tar.gz) = 400d20e0afe7b37db7b24f9e5c19e585e0b15b3c
+Size (netcdf-4.2.1.1.tar.gz) = 4515856 bytes
+SHA1 (patch-configure) = 74457173c01355cd0f99f136ae10bdc67e831489
diff --git a/devel/netcdf/patches/patch-an b/devel/netcdf/patches/patch-an
deleted file mode 100644
index 37fb4920173..00000000000
--- a/devel/netcdf/patches/patch-an
+++ /dev/null
@@ -1,147 +0,0 @@
-$NetBSD: patch-an,v 1.3 2012/03/07 16:11:30 adam Exp $
-
---- cxx/nctst.cpp.orig	2011-06-30 23:22:19.000000000 +0000
-+++ cxx/nctst.cpp
-@@ -369,12 +369,12 @@ void DumpableNcFile::dumpdims( void )
- 
-     for (int n=0; n < num_dims(); n++) {
- 	NcDim* dim = get_dim(n);
--	cout << "\t" << dim->name() << " = " ;
-+	std::cout << "\t" << dim->name() << " = " ;
- 	if (dim->is_unlimited())
--	  cout << "UNLIMITED" << " ;\t " << "// " << dim->size() <<
-+	  std::cout << "UNLIMITED" << " ;\t " << "// " << dim->size() <<
- 	    " currently\n";
- 	else
--	  cout << dim->size() << " ;\n";
-+	  std::cout << dim->size() << " ;\n";
-     }
- }
- 
-@@ -383,9 +383,9 @@ void dumpatts(NcVar& var)
-     NcToken vname = var.name();
-     NcAtt* ap;
-     for(int n = 0; (ap = var.get_att(n)); n++) {
--	cout << "\t\t" << vname << ":" << ap->name() << " = " ;
-+	std::cout << "\t\t" << vname << ":" << ap->name() << " = " ;
- 	NcValues* vals = ap->values();
--	cout << *vals << " ;" << endl ;
-+	std::cout << *vals << " ;" << endl ;
- 	delete ap;
- 	delete vals;
-     }
-@@ -399,19 +399,19 @@ void DumpableNcFile::dumpvars( void )
-     NcVar* vp;
- 
-     for(n = 0; (vp = get_var(n)); n++) {
--	cout << "\t" << types[vp->type()] << " " << vp->name() ;
-+	std::cout << "\t" << types[vp->type()] << " " << vp->name() ;
- 
- 	if (vp->num_dims() > 0) {
--	    cout << "(";
-+	    std::cout << "(";
- 	    for (int d = 0; d < vp->num_dims(); d++) {
- 		NcDim* dim = vp->get_dim(d);
--		cout << dim->name();
-+		std::cout << dim->name();
- 		if (d < vp->num_dims()-1)
--		  cout << ", ";		  
-+		  std::cout << ", ";		  
- 	    }
--	    cout << ")";
-+	    std::cout << ")";
- 	}
--	cout << " ;\n";
-+	std::cout << " ;\n";
- 	// now dump each of this variable's attributes
- 	dumpatts(*vp);
-     }
-@@ -421,9 +421,9 @@ void DumpableNcFile::dumpgatts( void )
- {
-     NcAtt* ap;
-     for(int n = 0; (ap = get_att(n)); n++) {
--	cout << "\t\t" << ":" << ap->name() << " = " ;
-+	std::cout << "\t\t" << ":" << ap->name() << " = " ;
- 	NcValues* vals = ap->values();
--	cout << *vals << " ;" << endl ;
-+	std::cout << *vals << " ;" << endl ;
- 	delete vals;
- 	delete ap;
-     }
-@@ -433,9 +433,9 @@ void DumpableNcFile::dumpdata( )
- {
-     NcVar* vp;
-     for (int n = 0; (vp = get_var(n)); n++) {
--	cout << " " << vp->name() << " = ";
-+	std::cout << " " << vp->name() << " = ";
- 	NcValues* vals = vp->values();
--	cout << *vals << " ;" << endl ;
-+	std::cout << *vals << " ;" << endl ;
- 	delete vals;
-     }
- }
-@@ -444,25 +444,25 @@ void dump(const char* path)
- {
-     DumpableNcFile nc(path);	// default is open in read-only mode
- 
--    cout << "netcdf " << cdl_name(path) << " {" << endl <<
--	    "dimensions:" << endl ;
-+    std::cout << "netcdf " << cdl_name(path) << " {" << std::endl <<
-+	    "dimensions:" << std::endl ;
- 
-     nc.dumpdims();
- 
--    cout << "variables:" << endl;
-+    std::cout << "variables:" << std::endl;
- 
-     nc.dumpvars();
- 
-     if (nc.num_atts() > 0)
--      cout << "// global attributes" << endl ;
-+      std::cout << "// global attributes" << std::endl ;
- 
-     nc.dumpgatts();
- 
--    cout << "data:" << endl;
-+    std::cout << "data:" << std::endl;
- 
-     nc.dumpdata();
- 
--    cout << "}" << endl;
-+    std::cout << "}" << std::endl;
- }
- 
- /* Test everything for classic and 64-bit offsetfiles. If netcdf-4 is
-@@ -477,7 +477,7 @@ int
- main( void )	// test new netCDF interface
- {
- 
--   cout << "*** Testing C++ API with " << NUM_FORMATS 
-+   std::cout << "*** Testing C++ API with " << NUM_FORMATS 
- 	<< " different netCDF formats.\n";
- 
-    // Set up the format constants.
-@@ -501,18 +501,18 @@ main( void )	// test new netCDF interfac
-       if (gen(file_name[i], format[i]) || 
- 	  read(file_name[i], format[i]))
-       {
--	 cout << "*** FAILURE with file " << file_name[i] << "\n";
-+	 std::cout << "*** FAILURE with file " << file_name[i] << "\n";
- 	 errs++;
-       }
-       else
--	 cout << "*** SUCCESS with file " << file_name[i] << "\n";
-+	 std::cout << "*** SUCCESS with file " << file_name[i] << "\n";
-    }
- 
--   cout << "\n*** Total number of failures: " << errs << "\n";
-+   std::cout << "\n*** Total number of failures: " << errs << "\n";
-    if (errs)
--      cout << "*** nctst FAILURE!\n";
-+      std::cout << "*** nctst FAILURE!\n";
-    else
--      cout << "*** nctst SUCCESS!\n";
-+      std::cout << "*** nctst SUCCESS!\n";
-       
-    return errs;
- }
diff --git a/devel/netcdf/patches/patch-configure b/devel/netcdf/patches/patch-configure
index 156c51d70a8..a87784bae27 100644
--- a/devel/netcdf/patches/patch-configure
+++ b/devel/netcdf/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.1 2012/03/07 16:11:30 adam Exp $
+$NetBSD: patch-configure,v 1.2 2013/04/09 15:57:28 adam Exp $
 
 Adjust infodir.
 
 --- configure.orig	2012-03-07 14:46:36.000000000 +0000
 +++ configure
-@@ -947,7 +947,7 @@ localstatedir='${prefix}/var'
+@@ -909,7 +909,7 @@ localstatedir='${prefix}/var'
  includedir='${prefix}/include'
  oldincludedir='/usr/include'
  docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
diff --git a/devel/netcdf/patches/patch-nc_test4_run_bm_ar4.sh b/devel/netcdf/patches/patch-nc_test4_run_bm_ar4.sh
deleted file mode 100644
index 6ea981a1cd0..00000000000
--- a/devel/netcdf/patches/patch-nc_test4_run_bm_ar4.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-nc_test4_run_bm_ar4.sh,v 1.1 2012/03/07 16:11:30 adam Exp $
-
-Fix compatibility issue.
-
---- nc_test4/run_bm_ar4.sh.orig	2012-03-07 11:54:25.000000000 +0000
-+++ nc_test4/run_bm_ar4.sh
-@@ -44,7 +44,7 @@ do
- 	do
- 	    for c2 in 128
- 	    do
--		if test $d == -1; then
-+		if test $d = -1; then
- 		    file_out="pr_A1_${c0}_${c1}_${c2}.nc"
- 		else
- 		    file_out="pr_A1_z${d}_${c0}_${c1}_${c2}.nc"