diff options
Diffstat (limited to 'devel/netcdf')
-rw-r--r-- | devel/netcdf/Makefile | 18 | ||||
-rw-r--r-- | devel/netcdf/PLIST | 22 | ||||
-rw-r--r-- | devel/netcdf/distinfo | 22 | ||||
-rw-r--r-- | devel/netcdf/patches/patch-aa | 12 | ||||
-rw-r--r-- | devel/netcdf/patches/patch-ab | 49 | ||||
-rw-r--r-- | devel/netcdf/patches/patch-ac | 27 | ||||
-rw-r--r-- | devel/netcdf/patches/patch-ad | 37 | ||||
-rw-r--r-- | devel/netcdf/patches/patch-ae | 21 | ||||
-rw-r--r-- | devel/netcdf/patches/patch-af | 38 | ||||
-rw-r--r-- | devel/netcdf/patches/patch-ag | 22 | ||||
-rw-r--r-- | devel/netcdf/patches/patch-ah | 13 | ||||
-rw-r--r-- | devel/netcdf/patches/patch-ai | 31 | ||||
-rw-r--r-- | devel/netcdf/patches/patch-al | 13 | ||||
-rw-r--r-- | devel/netcdf/patches/patch-an | 90 | ||||
-rw-r--r-- | devel/netcdf/patches/patch-configure | 15 | ||||
-rw-r--r-- | devel/netcdf/patches/patch-nc_test4_run_bm_ar4.sh | 15 |
16 files changed, 114 insertions, 331 deletions
diff --git a/devel/netcdf/Makefile b/devel/netcdf/Makefile index 6be5f4588bd..982f75ce417 100644 --- a/devel/netcdf/Makefile +++ b/devel/netcdf/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.30 2010/07/30 10:36:24 asau Exp $ +# $NetBSD: Makefile,v 1.31 2012/03/07 16:11:29 adam Exp $ -DISTNAME= netcdf-3.6.0-p1 -PKGNAME= netcdf-3.6.0p1 -PKGREVISION= 2 +DISTNAME= netcdf-4.1.3 CATEGORIES= devel -MASTER_SITES= ftp://www.gfd-dennou.org/arch/netcdf/unidata-mirror/ +MASTER_SITES= http://www.unidata.ucar.edu/downloads/netcdf/ftp/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.unidata.ucar.edu/software/netcdf/index.html @@ -12,13 +10,13 @@ COMMENT= Library for array-oriented data access PKG_DESTDIR_SUPPORT= user-destdir -WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_LANGUAGES= c c++ fortran77 USE_LIBTOOL= yes GNU_CONFIGURE= yes -MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} \ - exec_prefix=${DESTDIR}${PREFIX} -CPPFLAGS+= -Df2cFortran -Dunix -MAKE_JOBS_SAFE= no +CONFIGURE_ARGS+= --disable-f90 +CONFIGURE_ARGS+= --disable-examples +CONFIGURE_ARGS+= --disable-netcdf-4 + +INFO_FILES= yes .include "../../mk/bsd.pkg.mk" diff --git a/devel/netcdf/PLIST b/devel/netcdf/PLIST index 14bcc4486f3..083663146f6 100644 --- a/devel/netcdf/PLIST +++ b/devel/netcdf/PLIST @@ -1,14 +1,32 @@ -@comment $NetBSD: PLIST,v 1.5 2006/11/11 22:46:14 rillig Exp $ +@comment $NetBSD: PLIST,v 1.6 2012/03/07 16:11:29 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.3f +man/man3/netcdf_f77.3 diff --git a/devel/netcdf/distinfo b/devel/netcdf/distinfo index e44e933c622..f04ae7d3e42 100644 --- a/devel/netcdf/distinfo +++ b/devel/netcdf/distinfo @@ -1,16 +1,8 @@ -$NetBSD: distinfo,v 1.14 2009/10/06 00:52:28 dmcmahill Exp $ +$NetBSD: distinfo,v 1.15 2012/03/07 16:11:29 adam Exp $ -SHA1 (netcdf-3.6.0-p1.tar.gz) = 7e02a62a1abe9c1f00222f44ed44d63def3cc3d2 -RMD160 (netcdf-3.6.0-p1.tar.gz) = f59877c5f1f70b7099f263f0a34c1b1bd12d41d9 -Size (netcdf-3.6.0-p1.tar.gz) = 842025 bytes -SHA1 (patch-aa) = c8ecb2b6d6bb7c7573b56531530d4e43e9b383e6 -SHA1 (patch-ab) = 74b40940c888f661b122f2498b94662118e88f80 -SHA1 (patch-ac) = 82db04a3ed00b649c4f85ec0f72d1c9242244bfe -SHA1 (patch-ad) = deadd0acf929a05b54fca49843ef1c4f9c00c9c5 -SHA1 (patch-ae) = 73e17b16250cd93eb971e0bda356069f20c5b45e -SHA1 (patch-af) = c15c86f7bad1959b66062ff43ad319f860f8038e -SHA1 (patch-ag) = 49b2077ec60c05c32f0fc9f782cf0c6972039989 -SHA1 (patch-ah) = 49eb830457f1544cbd63c82671ef77267d544455 -SHA1 (patch-ai) = b6f3f113e9f952c4041daf1080b56f64590d2a75 -SHA1 (patch-al) = 2157008ecc8cc0f3330a41ee8a646233f19c5dbb -SHA1 (patch-an) = 4cbf9b83f380d36a58ee3840bcd3e5a27404b58e +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 diff --git a/devel/netcdf/patches/patch-aa b/devel/netcdf/patches/patch-aa deleted file mode 100644 index d625cff0f86..00000000000 --- a/devel/netcdf/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2009/10/06 00:52:28 dmcmahill Exp $ - -Fix for gcc-4.4.1 - ---- cxx/ncvalues.cpp.orig 2004-11-17 20:13:30.000000000 +0000 -+++ cxx/ncvalues.cpp 2009-10-05 17:05:41.000000000 +0000 -@@ -9,4 +9,5 @@ - - #include <iostream> -+#include <cstring> - - #include "ncvalues.h" diff --git a/devel/netcdf/patches/patch-ab b/devel/netcdf/patches/patch-ab deleted file mode 100644 index 4a30403c120..00000000000 --- a/devel/netcdf/patches/patch-ab +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2009/06/30 00:07:13 joerg Exp $ - ---- macros.make.in.orig 2004-12-18 16:32:32.000000000 +0000 -+++ macros.make.in -@@ -29,10 +29,10 @@ CXXCPPFLAGS = $(CPPFLAGS) - - - # Compilation: --CC = @CC@ --CXX = @CXX@ --FC = @FC@ --F90 = @F90@ -+CC = $(LIBTOOL) --mode=compile @CC@ -+CXX = $(LIBTOOL) --mode=compile @CXX@ -+FC = $(LIBTOOL) --mode=compile @FC@ -+F90 = $(LIBTOOL) --mode=compile @F90@ - CFLAGS = @CFLAGS@ - CXXFLAGS = @CXXFLAGS@ - FFLAGS = @FFLAGS@ @IGNORE_FPE@ -@@ -53,11 +53,11 @@ FLIBS = @FLIBS@ - F90LIBS = @F90LIBS@ - LIBS = @LIBS@ - F90LDFLAGS = $(LDFLAGS) --LINK.c = $(CC) -o $@ $(CFLAGS) $(LDFLAGS) --LINK.cxx = $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) --LINK.F = $(FC) -o $@ $(FFLAGS) $(FLDFLAGS) --LINK.f = $(FC) -o $@ $(FFLAGS) $(FLDFLAGS) --LINK.F90 = $(F90) -o $@ $(F90FLAGS) $(F90LDFLAGS) -+LINK.c = $(LIBTOOL) --mode=link @CC@ -o $@ $(CFLAGS) $(LDFLAGS) -+LINK.cxx = $(LIBTOOL) --mode=link @CXX@ -o $@ $(CXXFLAGS) $(LDFLAGS) -+LINK.F = $(LIBTOOL) --mode=link @FC@ -o $@ $(FFLAGS) $(FLDFLAGS) -+LINK.f = $(LIBTOOL) --mode=link @FC@ -o $@ $(FFLAGS) $(FLDFLAGS) -+LINK.F90 = $(LIBTOOL) --mode=link @F90@ -o $@ $(F90FLAGS) $(F90LDFLAGS) - - - # Manual pages: -@@ -68,9 +68,9 @@ MAKEWHATIS_CMD = @MAKEWHATIS_CMD@ - - - # Misc. Utilities: --AR = @AR@ --ARFLAGS = @ARFLAGS@ --RANLIB = @RANLIB@ -+AR = $(LIBTOOL) --mode=link @CC@ -+ARFLAGS = -rpath $(prefix)/lib -version-info 3:6 -+RANLIB = echo - TARFLAGS = -chf - - diff --git a/devel/netcdf/patches/patch-ac b/devel/netcdf/patches/patch-ac deleted file mode 100644 index aa76bb74fb0..00000000000 --- a/devel/netcdf/patches/patch-ac +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2005/02/25 09:52:47 adam Exp $ - ---- rules.make.orig 2004-12-17 20:34:48.000000000 +0000 -+++ rules.make -@@ -55,8 +55,7 @@ - lib: $(LIBRARY) - - $(LIBRARY): $(LIB_OBJS) FORCE -- $(AR) $(ARFLAGS) $@ $(LIB_OBJS) -- $(RANLIB) $@ -+ $(AR) $(ARFLAGS) -o $(.TARGET:.a=.la) $(LIB_OBJS:.o=.lo) - - #------------------------------------------------------------------------------- - # Shared Libraries: -@@ -124,10 +123,10 @@ $(INCDIR)/$(HEADER3): $(INCDIR) $(HEADER - $(INSTALL) $(HEADER3) $@ - - $(LIBDIR)/$(LIBRARY): $(LIBDIR) $(LIBRARY) FORCE -- $(INSTALL) $(LIBRARY) $@ -+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LIBRARY) $@ - - $(BINDIR)/$(PROGRAM): $(BINDIR) $(PROGRAM) FORCE -- $(INSTALL) $(PROGRAM) $@ -+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROGRAM) $@ - - $(BINDIR) \ - $(INCDIR) \ diff --git a/devel/netcdf/patches/patch-ad b/devel/netcdf/patches/patch-ad deleted file mode 100644 index a2283fe3564..00000000000 --- a/devel/netcdf/patches/patch-ad +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2005/02/25 09:52:47 adam Exp $ - ---- Makefile.orig 2004-12-18 16:32:58.000000000 +0000 -+++ Makefile -@@ -29,12 +29,11 @@ PACKING_LIST = \ - - # I moved fortran to the bottom of the list, sometimes AIX make get's confused - # if the C library and the fortran library are built in the same second. - Ed --all: libsrc/all \ -+all: fortran/all \ -+ libsrc/all \ - ncdump/all \ - ncgen/all \ -- cxx/all \ -- fortran/all \ -- f90/all -+ cxx/all - - test: fortran/all \ - libsrc/test \ -@@ -52,7 +51,6 @@ check: test - install: all \ - libsrc/install \ - fortran/install \ -- f90/install \ - ncdump/install \ - ncgen/install \ - cxx/install -@@ -167,7 +165,7 @@ subdir_target: - @echo "Returning to directory `pwd`" - @echo "" - --install: whatis -+install: - whatis: $(MANDIR)/$(WHATIS) - $(MANDIR)/$(WHATIS): $(MANDIR) - $(MAKEWHATIS_CMD) diff --git a/devel/netcdf/patches/patch-ae b/devel/netcdf/patches/patch-ae deleted file mode 100644 index d3287325383..00000000000 --- a/devel/netcdf/patches/patch-ae +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2006/11/11 22:46:14 rillig Exp $ - ---- fortran/Makefile.orig 2004-12-18 18:08:01.000000000 +0000 -+++ fortran/Makefile -@@ -69,14 +69,14 @@ PACKING_LIST = \ - # - - --all: $(LIBRARY) $(MANUAL) -+all: $(LIB_OBJS) $(MANUAL) - - test: ftest FORCE - ./ftest - - - install: $(INCDIR)/$(HEADER) \ -- $(MANDIR)/man3f/$(MANUAL) -+ $(MANDIR)/man3/$(MANUAL) - - uninstall: - -rm -f $(INCDIR)/$(HEADER) diff --git a/devel/netcdf/patches/patch-af b/devel/netcdf/patches/patch-af deleted file mode 100644 index 9bfd851e754..00000000000 --- a/devel/netcdf/patches/patch-af +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-af,v 1.2 2005/02/25 09:52:47 adam Exp $ - ---- libsrc/Makefile.orig 2004-12-18 18:08:01.000000000 +0000 -+++ libsrc/Makefile -@@ -7,7 +7,7 @@ include ../macros.make - - INCLUDES = -I. - --LIBRARY = libnetcdf.a -+LIBRARY = libnetcdf.la - ld_netcdf = -L. -lnetcdf - - HEADER = netcdf.h -@@ -54,7 +54,23 @@ PACKING_LIST = \ - t_ncxx.c \ - t_ncx.c install-sh - --LIB_OBJS = $(LIB_CSRCS:.c=.o) -+FLIB_OBJS = \ -+ ../fortran/fort-attio.o \ -+ ../fortran/fort-control.o \ -+ ../fortran/fort-dim.o \ -+ ../fortran/fort-genatt.o \ -+ ../fortran/fort-geninq.o \ -+ ../fortran/fort-genvar.o \ -+ ../fortran/fort-lib.o \ -+ ../fortran/fort-misc.o \ -+ ../fortran/fort-v2compat.o \ -+ ../fortran/fort-vario.o \ -+ ../fortran/fort-var1io.o \ -+ ../fortran/fort-varaio.o \ -+ ../fortran/fort-varmio.o \ -+ ../fortran/fort-varsio.o -+ -+LIB_OBJS = $(LIB_CSRCS:.c=.o) $(FLIB_OBJS) - - GARBAGE = t_ncio.o t_ncio t_ncx.o t_ncx t_ncxx.o t_ncxx \ - t_nc.o t_nc test.nc *.so diff --git a/devel/netcdf/patches/patch-ag b/devel/netcdf/patches/patch-ag deleted file mode 100644 index ff1eed83ca0..00000000000 --- a/devel/netcdf/patches/patch-ag +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2005/02/25 09:52:47 adam Exp $ - ---- ncdump/Makefile.orig 2004-12-18 18:08:01.000000000 +0000 -+++ ncdump/Makefile -@@ -16,7 +16,7 @@ PACKING_LIST = $(c_sources) $(headers) d - test0.cdl ncdump.1 Makefile install-sh - MANUAL = ncdump.1 - --lib_netcdf = ../libsrc/libnetcdf.a -+lib_netcdf = ../libsrc/libnetcdf.la - - # Don't use "-L../libsrc -lnetcdf" in the following because that doesn't - # work on a CRAY T90 (sigh). -@@ -28,7 +28,7 @@ GARBAGE = $(PROGRAM) test0.nc test1.nc - all: $(PROGRAM) - - $(PROGRAM): $(lib_netcdf) $(OBJS) -- $(LINK.c) $(OBJS) $(ld_netcdf) $(LIBS) -+ $(LINK.c) $(OBJS) $(ld_netcdf) $(LIBS) - - test: $(PROGRAM) FORCE - $(NCGEN) -b test0.cdl diff --git a/devel/netcdf/patches/patch-ah b/devel/netcdf/patches/patch-ah deleted file mode 100644 index 9001f03ac05..00000000000 --- a/devel/netcdf/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2005/02/25 09:52:47 adam Exp $ - ---- ncgen/Makefile.orig 2004-12-18 18:08:01.000000000 +0000 -+++ ncgen/Makefile -@@ -15,7 +15,7 @@ GARBAGE = $(PROGRAM) \ - ctest.c ctest ctest0.nc ctest1.cdl \ - ftest.f ftest ftest0.nc ftest1.cdl - --lib_netcdf = ../libsrc/libnetcdf.a -+lib_netcdf = ../libsrc/libnetcdf.la - # Don't use "-L../libsrc -lnetcdf" in the following because that doesn't - # work on a CRAY T90 (sigh). - ld_netcdf = $(lib_netcdf) diff --git a/devel/netcdf/patches/patch-ai b/devel/netcdf/patches/patch-ai deleted file mode 100644 index 818a9d7027e..00000000000 --- a/devel/netcdf/patches/patch-ai +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2005/02/25 09:52:47 adam Exp $ - ---- cxx/Makefile.orig 2004-12-18 18:09:20.000000000 +0000 -+++ cxx/Makefile -@@ -11,9 +11,9 @@ PACKING_LIST = Makefile README depend ex - nctst.cpp ncvalues.cpp ncvalues.h netcdf.cpp netcdfcpp.h \ - expected netcdf.hh install-sh - --LIBRARY = libnetcdf_c++.a --lib_netcdf = ../libsrc/libnetcdf.a --ld_netcdf = -L../libsrc -lnetcdf -+LIBRARY = libnetcdf_c++.la -+lib_netcdf = ../libsrc/libnetcdf.la -+ld_netcdf = $(lib_netcdf) - - HEADER1 = netcdfcpp.h - HEADER2 = ncvalues.h -@@ -51,7 +51,7 @@ uninstall: - -rm -f $(INCDIR)/$(HEADER3) - - $(prog) : $(prog_objs) $(LIBRARY) $(lib_netcdf) -- $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(prog_objs) $(libs) -+ $(LINK.cxx) -o $@ $(CXXFLAGS) $(LDFLAGS) $(prog_objs) $(libs) - - nctst_src: nctst.cpp netcdf.cpp ncvalues.cpp - #load -I../libsrc $(nctst_src) -@@ -95,4 +95,3 @@ ncvalues.o: ncvalues.h ncvalues.cpp - nctst.o: netcdfcpp.h nctst.cpp - - include depend -- diff --git a/devel/netcdf/patches/patch-al b/devel/netcdf/patches/patch-al deleted file mode 100644 index 6b4b7896e0c..00000000000 --- a/devel/netcdf/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.2 2005/02/25 09:52:47 adam Exp $ - ---- aclocal.m4.orig 2004-11-30 17:44:52.000000000 +0000 -+++ aclocal.m4 -@@ -1147,7 +1147,7 @@ do - echo "running [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]ac_configure_args --no-create --no-recursion" - exec [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) -- echo "$CONFIG_STATUS generated by autoconf version AC_ACVERSION" -+ echo "$CONFIG_STATUS generated by autoconf version ?unknown?" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "[\$]ac_cs_usage"; exit 0 ;; diff --git a/devel/netcdf/patches/patch-an b/devel/netcdf/patches/patch-an index 2e08f74e841..37fb4920173 100644 --- a/devel/netcdf/patches/patch-an +++ b/devel/netcdf/patches/patch-an @@ -1,25 +1,8 @@ -$NetBSD: patch-an,v 1.2 2005/02/25 09:52:47 adam Exp $ +$NetBSD: patch-an,v 1.3 2012/03/07 16:11:30 adam Exp $ ---- cxx/nctst.cpp.orig 2004-08-15 18:04:30.000000000 +0000 +--- cxx/nctst.cpp.orig 2011-06-30 23:22:19.000000000 +0000 +++ cxx/nctst.cpp -@@ -1,6 +1,6 @@ - #include <iostream> - using namespace std; -- -+#include <iostream> - #include <string.h> - #include "netcdfcpp.h" - -@@ -22,7 +22,7 @@ void gen(const char* path, int version) - - // Check if the file was opened successfully - if (! nc.is_valid()) { -- cerr << "can't create netCDF file " << path << "\n"; -+ std::cerr << "can't create netCDF file " << path << "\n"; - return; - } - -@@ -138,12 +138,12 @@ void DumpableNcFile::dumpdims( void ) +@@ -369,12 +369,12 @@ void DumpableNcFile::dumpdims( void ) for (int n=0; n < num_dims(); n++) { NcDim* dim = get_dim(n); @@ -35,27 +18,23 @@ $NetBSD: patch-an,v 1.2 2005/02/25 09:52:47 adam Exp $ } } -@@ -151,10 +151,10 @@ void dumpatts(NcVar& var) - { +@@ -383,9 +383,9 @@ void dumpatts(NcVar& var) NcToken vname = var.name(); NcAtt* ap; -- for(int n = 0; ap = var.get_att(n); n++) { + for(int n = 0; (ap = var.get_att(n)); n++) { - cout << "\t\t" << vname << ":" << ap->name() << " = " ; -+ for(int n = 0; (ap = var.get_att(n)); n++) { + std::cout << "\t\t" << vname << ":" << ap->name() << " = " ; NcValues* vals = ap->values(); - cout << *vals << " ;" << endl ; -+ std::cout << *vals << " ;" << std::endl ; ++ std::cout << *vals << " ;" << endl ; delete ap; delete vals; } -@@ -167,20 +167,20 @@ void DumpableNcFile::dumpvars( void ) - {"","byte","char","short","long","float","double"}; +@@ -399,19 +399,19 @@ void DumpableNcFile::dumpvars( void ) NcVar* vp; -- for(n = 0; vp = get_var(n); n++) { + for(n = 0; (vp = get_var(n)); n++) { - cout << "\t" << types[vp->type()] << " " << vp->name() ; -+ for(n = 0; (vp = get_var(n)); n++) { + std::cout << "\t" << types[vp->type()] << " " << vp->name() ; if (vp->num_dims() > 0) { @@ -67,7 +46,7 @@ $NetBSD: patch-an,v 1.2 2005/02/25 09:52:47 adam Exp $ + std::cout << dim->name(); if (d < vp->num_dims()-1) - cout << ", "; -+ std::cout << ", "; ++ std::cout << ", "; } - cout << ")"; + std::cout << ")"; @@ -77,35 +56,31 @@ $NetBSD: patch-an,v 1.2 2005/02/25 09:52:47 adam Exp $ // now dump each of this variable's attributes dumpatts(*vp); } -@@ -189,10 +189,10 @@ void DumpableNcFile::dumpvars( void ) - void DumpableNcFile::dumpgatts( void ) +@@ -421,9 +421,9 @@ void DumpableNcFile::dumpgatts( void ) { NcAtt* ap; -- for(int n = 0; ap = get_att(n); n++) { + for(int n = 0; (ap = get_att(n)); n++) { - cout << "\t\t" << ":" << ap->name() << " = " ; -+ for(int n = 0; (ap = get_att(n)); n++) { + std::cout << "\t\t" << ":" << ap->name() << " = " ; NcValues* vals = ap->values(); - cout << *vals << " ;" << endl ; -+ std::cout << *vals << " ;" << std::endl ; ++ std::cout << *vals << " ;" << endl ; delete vals; delete ap; } -@@ -201,10 +201,10 @@ void DumpableNcFile::dumpgatts( void ) - void DumpableNcFile::dumpdata( ) +@@ -433,9 +433,9 @@ void DumpableNcFile::dumpdata( ) { NcVar* vp; -- for (int n = 0; vp = get_var(n); n++) { + for (int n = 0; (vp = get_var(n)); n++) { - cout << " " << vp->name() << " = "; -+ for (int n = 0; (vp = get_var(n)); n++) { + std::cout << " " << vp->name() << " = "; NcValues* vals = vp->values(); - cout << *vals << " ;" << endl ; -+ std::cout << *vals << " ;" << std::endl ; ++ std::cout << *vals << " ;" << endl ; delete vals; } } -@@ -213,25 +213,25 @@ void dump(const char* path) +@@ -444,25 +444,25 @@ void dump(const char* path) { DumpableNcFile nc(path); // default is open in read-only mode @@ -136,4 +111,37 @@ $NetBSD: patch-an,v 1.2 2005/02/25 09:52:47 adam Exp $ + 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 new file mode 100644 index 00000000000..156c51d70a8 --- /dev/null +++ b/devel/netcdf/patches/patch-configure @@ -0,0 +1,15 @@ +$NetBSD: patch-configure,v 1.1 2012/03/07 16:11:30 adam Exp $ + +Adjust infodir. + +--- configure.orig 2012-03-07 14:46:36.000000000 +0000 ++++ configure +@@ -947,7 +947,7 @@ localstatedir='${prefix}/var' + includedir='${prefix}/include' + oldincludedir='/usr/include' + docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +-infodir='${datarootdir}/info' ++infodir='${prefix}/info' + htmldir='${docdir}' + dvidir='${docdir}' + pdfdir='${docdir}' diff --git a/devel/netcdf/patches/patch-nc_test4_run_bm_ar4.sh b/devel/netcdf/patches/patch-nc_test4_run_bm_ar4.sh new file mode 100644 index 00000000000..6ea981a1cd0 --- /dev/null +++ b/devel/netcdf/patches/patch-nc_test4_run_bm_ar4.sh @@ -0,0 +1,15 @@ +$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" |