summaryrefslogtreecommitdiff
path: root/devel/netcdf
diff options
context:
space:
mode:
authoradam <adam>2005-02-25 09:52:47 +0000
committeradam <adam>2005-02-25 09:52:47 +0000
commiteeab49a79aa52fe51ebf4f8e3dd3ef3715bee161 (patch)
tree57d950016d3104d69f8e540604aecf5b20d3cac7 /devel/netcdf
parent8bfe02fb894e3c794b5d4d7572b13af276fdfd88 (diff)
downloadpkgsrc-eeab49a79aa52fe51ebf4f8e3dd3ef3715bee161.tar.gz
Changes 3.6.0-p1:
Patched version of 3.6.0 to fix potentially serious bug described at http://www.unidata.ucar.edu/packages/netcdf/docs/known_problems.html#cdf2-bug Changes 3.6.0: Added texinfo source for the documentation. Added large file tests to Windows directory in distribution. Modified win32 visual studio project files so that m4 is no longer required to build netcdf under visual studio. Modified rules.make to use install instead of cp, fixing install problem for cygwin users. Modified configure/install stuff to support HP-UX. Modified configure/install stuff to support G95. In the f90 interface, applied Arnaud Desitter's fixes to correct mismatches between scalar and array arguments, eliminating (legitimate) complaints by the NAGWare f95 compiler. Also fixed bugs introduced in 3.6.0-beta5 in the mapped array interfaces.
Diffstat (limited to 'devel/netcdf')
-rw-r--r--devel/netcdf/Makefile11
-rw-r--r--devel/netcdf/distinfo33
-rw-r--r--devel/netcdf/patches/patch-ab12
-rw-r--r--devel/netcdf/patches/patch-ac31
-rw-r--r--devel/netcdf/patches/patch-ad59
-rw-r--r--devel/netcdf/patches/patch-ae8
-rw-r--r--devel/netcdf/patches/patch-af12
-rw-r--r--devel/netcdf/patches/patch-ag6
-rw-r--r--devel/netcdf/patches/patch-ah8
-rw-r--r--devel/netcdf/patches/patch-ai6
-rw-r--r--devel/netcdf/patches/patch-aj16
-rw-r--r--devel/netcdf/patches/patch-ak31
-rw-r--r--devel/netcdf/patches/patch-al18
-rw-r--r--devel/netcdf/patches/patch-am28
-rw-r--r--devel/netcdf/patches/patch-an24
-rw-r--r--devel/netcdf/patches/patch-ao80
-rw-r--r--devel/netcdf/patches/patch-ap63
17 files changed, 86 insertions, 360 deletions
diff --git a/devel/netcdf/Makefile b/devel/netcdf/Makefile
index 7730f140b7f..4146aad8995 100644
--- a/devel/netcdf/Makefile
+++ b/devel/netcdf/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2005/01/12 15:32:00 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/02/25 09:52:47 adam Exp $
-DISTNAME= netcdf-3.5.0
-PKGREVISION= 2
+DISTNAME= netcdf-3.6.0-p1
+PKGNAME= netcdf-3.6.0p1
CATEGORIES= devel
MASTER_SITES= ftp://www.gfd-dennou.org/arch/netcdf/unidata-mirror/
-EXTRACT_SUFX= .tar.Z
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.unidata.ucar.edu/packages/netcdf/index.html
@@ -13,8 +12,8 @@ COMMENT= Library for array-oriented data access
WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_BUILDLINK3= yes
USE_LANGUAGES= c c++ fortran
-USE_LIBTOOL= # defined
-GNU_CONFIGURE= # defined
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
CPPFLAGS+= -Df2cFortran -Dunix
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/netcdf/distinfo b/devel/netcdf/distinfo
index 1a3c1ca1077..7bf2644a977 100644
--- a/devel/netcdf/distinfo
+++ b/devel/netcdf/distinfo
@@ -1,20 +1,15 @@
-$NetBSD: distinfo,v 1.10 2005/02/23 22:24:22 agc Exp $
+$NetBSD: distinfo,v 1.11 2005/02/25 09:52:47 adam Exp $
-SHA1 (netcdf-3.5.0.tar.Z) = e9c5a9847d8ff9b3e1b8a18f5e216f6a1508bce8
-RMD160 (netcdf-3.5.0.tar.Z) = 4313e00fc56273e871c003bfb27c533d4a7f556f
-Size (netcdf-3.5.0.tar.Z) = 1319419 bytes
-SHA1 (patch-ab) = 37bf389e76316b03cc3590a1c13855636907b8a5
-SHA1 (patch-ac) = 8a73893ae7c98dd45d61d795592c57abe76d3fde
-SHA1 (patch-ad) = 85f57ffe815df04a5222924285af791dd12e6f5a
-SHA1 (patch-ae) = e91f8111387c7ca3111e640dcbc16d9bca8ed898
-SHA1 (patch-af) = 42a96275cc048d796452c20c7c6f24ac651e8877
-SHA1 (patch-ag) = 214b7c241bc71e5ebbef1e3f9f8a661acaf05228
-SHA1 (patch-ah) = 11083d7a775ca6199162fe3b14776ca24b5c009a
-SHA1 (patch-ai) = fb8386c47a2b0e2468bf31a424738979c472de94
-SHA1 (patch-aj) = 7721c70d1ec33477a51863626cbfb68e2ed689bb
-SHA1 (patch-ak) = 334ba2656119c9b3682cb6795030a2320c8b6d98
-SHA1 (patch-al) = e34833121ee90a18318948705af40da7a4513afc
-SHA1 (patch-am) = ac8ade3c79380833a1339b7f4c99224e89b231e7
-SHA1 (patch-an) = 5e8e3d13f65664af37ef276d0968b9206de120e9
-SHA1 (patch-ao) = 873ed1497741ed4cc449f19f499f3e55c4d4f6ea
-SHA1 (patch-ap) = 90951e89f433f231d66ffa31f48e8527f24a82c7
+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-ab) = cbe412d8b7473dcee689b70f3a829109d2237f61
+SHA1 (patch-ac) = 82db04a3ed00b649c4f85ec0f72d1c9242244bfe
+SHA1 (patch-ad) = deadd0acf929a05b54fca49843ef1c4f9c00c9c5
+SHA1 (patch-ae) = 0813f13bb333f46042dac1d86730807bc17cce2e
+SHA1 (patch-af) = c15c86f7bad1959b66062ff43ad319f860f8038e
+SHA1 (patch-ag) = 49b2077ec60c05c32f0fc9f782cf0c6972039989
+SHA1 (patch-ah) = 49eb830457f1544cbd63c82671ef77267d544455
+SHA1 (patch-ai) = b6f3f113e9f952c4041daf1080b56f64590d2a75
+SHA1 (patch-al) = 2157008ecc8cc0f3330a41ee8a646233f19c5dbb
+SHA1 (patch-an) = 4cbf9b83f380d36a58ee3840bcd3e5a27404b58e
diff --git a/devel/netcdf/patches/patch-ab b/devel/netcdf/patches/patch-ab
index e5925d3a09f..efa8e748f76 100644
--- a/devel/netcdf/patches/patch-ab
+++ b/devel/netcdf/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2003/03/02 08:26:10 jtb Exp $
+$NetBSD: patch-ab,v 1.4 2005/02/25 09:52:47 adam Exp $
---- macros.make.in.orig Tue Mar 13 17:42:50 2001
+--- macros.make.in.orig 2004-12-18 16:32:32.000000000 +0000
+++ macros.make.in
@@ -29,10 +29,10 @@ CXXCPPFLAGS = $(CPPFLAGS)
@@ -16,8 +16,8 @@ $NetBSD: patch-ab,v 1.3 2003/03/02 08:26:10 jtb Exp $
+F90 = $(LIBTOOL) --mode=compile @F90@
CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
- FFLAGS = @FFLAGS@
-@@ -54,11 +54,11 @@ FLIBS = @FLIBS@
+ FFLAGS = @FFLAGS@ @IGNORE_FPE@
+@@ -53,11 +53,11 @@ FLIBS = @FLIBS@
F90LIBS = @F90LIBS@
LIBS = @LIBS@
F90LDFLAGS = $(LDFLAGS)
@@ -34,7 +34,7 @@ $NetBSD: patch-ab,v 1.3 2003/03/02 08:26:10 jtb Exp $
# Manual pages:
-@@ -69,9 +69,9 @@ MAKEWHATIS_CMD = @MAKEWHATIS_CMD@
+@@ -68,9 +68,9 @@ MAKEWHATIS_CMD = @MAKEWHATIS_CMD@
# Misc. Utilities:
@@ -42,7 +42,7 @@ $NetBSD: patch-ab,v 1.3 2003/03/02 08:26:10 jtb Exp $
-ARFLAGS = @ARFLAGS@
-RANLIB = @RANLIB@
+AR = $(LIBTOOL) --mode=link @CC@
-+ARFLAGS = -rpath $(LIBDIR) -version-info 3:5
++ARFLAGS = -rpath $(LIBDIR) -version-info 3:6
+RANLIB = echo
TARFLAGS = -chf
diff --git a/devel/netcdf/patches/patch-ac b/devel/netcdf/patches/patch-ac
index 80d68e871b0..aa76bb74fb0 100644
--- a/devel/netcdf/patches/patch-ac
+++ b/devel/netcdf/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2003/03/02 08:26:10 jtb Exp $
+$NetBSD: patch-ac,v 1.3 2005/02/25 09:52:47 adam Exp $
---- rules.make.orig Thu Feb 27 13:08:11 2003
+--- rules.make.orig 2004-12-17 20:34:48.000000000 +0000
+++ rules.make
@@ -55,8 +55,7 @@
lib: $(LIBRARY)
@@ -12,28 +12,15 @@ $NetBSD: patch-ac,v 1.2 2003/03/02 08:26:10 jtb Exp $
#-------------------------------------------------------------------------------
# Shared Libraries:
-@@ -115,19 +114,19 @@ sunos5_shared_library:
- # Installation:
+@@ -124,10 +123,10 @@ $(INCDIR)/$(HEADER3): $(INCDIR) $(HEADER
+ $(INSTALL) $(HEADER3) $@
- $(INCDIR)/$(HEADER): $(INCDIR) $(HEADER)
-- cp $(HEADER) $@
-+ $(BSD_INSTALL_DATA) $(HEADER) $@
- $(INCDIR)/$(HEADER1): $(INCDIR) $(HEADER1)
-- cp $(HEADER1) $@
-+ $(BSD_INSTALL_DATA) $(HEADER1) $@
- $(INCDIR)/$(HEADER2): $(INCDIR) $(HEADER2)
-- cp $(HEADER2) $@
-+ $(BSD_INSTALL_DATA) $(HEADER2) $@
- $(INCDIR)/$(HEADER3): $(INCDIR) $(HEADER3)
-- cp $(HEADER3) $@
-+ $(BSD_INSTALL_DATA) $(HEADER3) $@
+ $(LIBDIR)/$(LIBRARY): $(LIBDIR) $(LIBRARY) FORCE
+- $(INSTALL) $(LIBRARY) $@
++ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LIBRARY) $@
- $(LIBDIR)/$(LIBRARY): $(LIBDIR) $(LIBRARY)
-- cp $(LIBRARY) $@
-+ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIBRARY) $@
-
- $(BINDIR)/$(PROGRAM): $(BINDIR) $(PROGRAM)
-- cp $(PROGRAM) $@
+ $(BINDIR)/$(PROGRAM): $(BINDIR) $(PROGRAM) FORCE
+- $(INSTALL) $(PROGRAM) $@
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROGRAM) $@
$(BINDIR) \
diff --git a/devel/netcdf/patches/patch-ad b/devel/netcdf/patches/patch-ad
index a7010720673..a2283fe3564 100644
--- a/devel/netcdf/patches/patch-ad
+++ b/devel/netcdf/patches/patch-ad
@@ -1,37 +1,32 @@
-$NetBSD: patch-ad,v 1.4 2003/03/02 08:39:19 jtb Exp $
+$NetBSD: patch-ad,v 1.5 2005/02/25 09:52:47 adam Exp $
---- Makefile.orig Tue Feb 27 16:04:32 2001
+--- Makefile.orig 2004-12-18 16:32:58.000000000 +0000
+++ Makefile
-@@ -27,9 +27,8 @@ PACKING_LIST = \
- rules.make
-
+@@ -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 \
-- fortran/all \
-- f90/all \
+all: fortran/all \
+ libsrc/all \
ncdump/all \
ncgen/all \
- cxx/all
-@@ -43,7 +42,6 @@ check: test
-
- install: libsrc/install \
+- 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
-@@ -64,7 +62,7 @@ distclean: libsrc/distclean \
- nctest/distclean nc_test/distclean \
- fortran/distclean f90/distclean nf_test/distclean \
- ncdump/distclean ncgen/distclean cxx/distclean \
-- clean_macros
-+ clean_macros
-
- clean_macros:
- -cp macros.make.def macros.make
-@@ -162,7 +160,7 @@ subdir_target:
+@@ -167,7 +165,7 @@ subdir_target:
@echo "Returning to directory `pwd`"
@echo ""
@@ -40,25 +35,3 @@ $NetBSD: patch-ad,v 1.4 2003/03/02 08:39:19 jtb Exp $
whatis: $(MANDIR)/$(WHATIS)
$(MANDIR)/$(WHATIS): $(MANDIR)
$(MAKEWHATIS_CMD)
-@@ -189,7 +187,7 @@ check_system: FORCE
- *) exit 0;; \
- esac
-
--# Make a compressed, tar(1) file of the source distribution in the current
-+# Make a compressed, tar(1) file of the source distribution in the current
- # directory.
- #
- tar.Z: check_system FORCE
-@@ -225,10 +223,10 @@ ftp: check_system FORCE
-
- $(FTPDIR)/$(PACKAGE)-$(VERSION).tar.Z: $(PACKAGE)-$(VERSION).tar.Z
- rm -f $@
-- cp $(PACKAGE)-$(VERSION).tar.Z $@
-+ cp $(PACKAGE)-$(VERSION).tar.Z $@
- chmod u+rw,g+rw,o=r $@
-
--# Make a compressed, tar(1) file of the binary distribution in the
-+# Make a compressed, tar(1) file of the binary distribution in the
- # appropriate FTP directory.
- #
- binftp: FORCE
diff --git a/devel/netcdf/patches/patch-ae b/devel/netcdf/patches/patch-ae
index f768ffc66c2..8f993158133 100644
--- a/devel/netcdf/patches/patch-ae
+++ b/devel/netcdf/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/01/14 20:28:54 frueauf Exp $
+$NetBSD: patch-ae,v 1.2 2005/02/25 09:52:47 adam Exp $
---- fortran/Makefile.orig Sun Sep 27 19:52:28 1998
-+++ fortran/Makefile Sun Sep 27 19:56:28 1998
-@@ -68,7 +68,7 @@
+--- fortran/Makefile.orig 2004-12-18 18:08:01.000000000 +0000
++++ fortran/Makefile
+@@ -69,7 +69,7 @@ PACKING_LIST = \
#
diff --git a/devel/netcdf/patches/patch-af b/devel/netcdf/patches/patch-af
index 799e0433743..9bfd851e754 100644
--- a/devel/netcdf/patches/patch-af
+++ b/devel/netcdf/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/01/14 20:28:54 frueauf Exp $
+$NetBSD: patch-af,v 1.2 2005/02/25 09:52:47 adam Exp $
---- libsrc/Makefile.orig Mon Dec 8 23:04:42 1997
-+++ libsrc/Makefile Sun Sep 27 20:23:07 1998
-@@ -7,7 +7,7 @@
+--- libsrc/Makefile.orig 2004-12-18 18:08:01.000000000 +0000
++++ libsrc/Makefile
+@@ -7,7 +7,7 @@ include ../macros.make
INCLUDES = -I.
@@ -11,9 +11,9 @@ $NetBSD: patch-af,v 1.1.1.1 1999/01/14 20:28:54 frueauf Exp $
ld_netcdf = -L. -lnetcdf
HEADER = netcdf.h
-@@ -54,7 +54,23 @@
+@@ -54,7 +54,23 @@ PACKING_LIST = \
t_ncxx.c \
- t_ncx.c
+ t_ncx.c install-sh
-LIB_OBJS = $(LIB_CSRCS:.c=.o)
+FLIB_OBJS = \
diff --git a/devel/netcdf/patches/patch-ag b/devel/netcdf/patches/patch-ag
index 39275864ecf..ff1eed83ca0 100644
--- a/devel/netcdf/patches/patch-ag
+++ b/devel/netcdf/patches/patch-ag
@@ -1,9 +1,9 @@
-$NetBSD: patch-ag,v 1.2 2003/03/02 08:26:10 jtb Exp $
+$NetBSD: patch-ag,v 1.3 2005/02/25 09:52:47 adam Exp $
---- ncdump/Makefile.orig Thu Feb 27 13:28:14 2003
+--- 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
+ test0.cdl ncdump.1 Makefile install-sh
MANUAL = ncdump.1
-lib_netcdf = ../libsrc/libnetcdf.a
diff --git a/devel/netcdf/patches/patch-ah b/devel/netcdf/patches/patch-ah
index 4ef82a43cb3..9001f03ac05 100644
--- a/devel/netcdf/patches/patch-ah
+++ b/devel/netcdf/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 1999/01/14 20:28:54 frueauf Exp $
+$NetBSD: patch-ah,v 1.2 2005/02/25 09:52:47 adam Exp $
---- ncgen/Makefile.orig Sun Sep 27 20:11:07 1998
-+++ ncgen/Makefile Sun Sep 27 20:11:37 1998
-@@ -14,7 +14,7 @@
+--- 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
diff --git a/devel/netcdf/patches/patch-ai b/devel/netcdf/patches/patch-ai
index dbb05f0d229..818a9d7027e 100644
--- a/devel/netcdf/patches/patch-ai
+++ b/devel/netcdf/patches/patch-ai
@@ -1,10 +1,10 @@
-$NetBSD: patch-ai,v 1.2 2003/03/02 08:26:10 jtb Exp $
+$NetBSD: patch-ai,v 1.3 2005/02/25 09:52:47 adam Exp $
---- cxx/Makefile.orig Thu Feb 27 13:35:04 2003
+--- 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 cxxdoc.tex cxxdoc.ps texinfo.tex netcdf.hh
+ expected netcdf.hh install-sh
-LIBRARY = libnetcdf_c++.a
-lib_netcdf = ../libsrc/libnetcdf.a
diff --git a/devel/netcdf/patches/patch-aj b/devel/netcdf/patches/patch-aj
deleted file mode 100644
index d0c51275ac8..00000000000
--- a/devel/netcdf/patches/patch-aj
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2003/11/29 00:14:54 wiz Exp $
-
---- configure.orig 2003-10-26 08:17:58.000000000 +1100
-+++ configure 2003-10-26 08:18:12.000000000 +1100
-@@ -1232,9 +1232,9 @@
- extern "C" void exit(int);
- #endif
-
-- #include <iostream.h>
-+ #include <iostream>
- int main() {
-- cout << "";
-+ std::cout << "";
- return 0;
- }
-
diff --git a/devel/netcdf/patches/patch-ak b/devel/netcdf/patches/patch-ak
deleted file mode 100644
index 1b07e7a2f89..00000000000
--- a/devel/netcdf/patches/patch-ak
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2003/11/29 00:14:54 wiz Exp $
-
---- cxx/netcdfcpp.h.orig 2003-10-26 08:25:59.000000000 +1100
-+++ cxx/netcdfcpp.h 2003-10-26 08:26:58.000000000 +1100
-@@ -154,7 +154,7 @@
- virtual ~NcDim( void );
-
- // to construct dimensions, since constructor is private
-- friend NcFile;
-+ friend class NcFile;
- };
-
-
-@@ -357,7 +357,7 @@
- void init_cur( void );
-
- // to make variables, since constructor is private
-- friend NcFile;
-+ friend class NcFile;
- };
-
-
-@@ -388,7 +388,7 @@
- NcAtt( NcFile*, NcToken); // global attribute
-
- // To make attributes, since constructor is private
-- friend NcFile;
-+ friend class NcFile;
- friend NcAtt* NcVar::get_att( NcToken ) const;
- };
-
diff --git a/devel/netcdf/patches/patch-al b/devel/netcdf/patches/patch-al
index f308c5a0747..6b4b7896e0c 100644
--- a/devel/netcdf/patches/patch-al
+++ b/devel/netcdf/patches/patch-al
@@ -1,20 +1,8 @@
-$NetBSD: patch-al,v 1.1 2004/01/11 15:58:45 cjep Exp $
+$NetBSD: patch-al,v 1.2 2005/02/25 09:52:47 adam Exp $
---- aclocal.m4.orig 2001-03-22 21:43:11.000000000 +0000
+--- aclocal.m4.orig 2004-11-30 17:44:52.000000000 +0000
+++ aclocal.m4
-@@ -173,9 +173,9 @@ AC_DEFUN(UD_PROG_CXX,
- AC_MSG_CHECKING(C++ compiler \"$CXX\")
- AC_TRY_RUN(
- [
-- #include <iostream.h>
-+ #include <iostream>
- int main() {
-- cout << "";
-+ std::cout << "";
- return 0;
- }
- ],
-@@ -1141,7 +1141,7 @@ do
+@@ -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)
diff --git a/devel/netcdf/patches/patch-am b/devel/netcdf/patches/patch-am
deleted file mode 100644
index 676eea627c1..00000000000
--- a/devel/netcdf/patches/patch-am
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-am,v 1.1 2004/01/11 15:58:45 cjep Exp $
-
---- configure.in.orig 2001-03-22 21:43:13.000000000 +0000
-+++ configure.in
-@@ -3,13 +3,15 @@ dnl
- dnl Process this file with GNU autoconf(1) to produce a configure script.
- dnl
-
-+AC_INIT(netcdf, 3.5.0)
-+dnl AC_INIT(libsrc/ncconfig.in)
-+
-+
- dnl Defaults:
- CPPFLAGS=${CPPFLAGS--DNDEBUG}
- CFLAGS=${CFLAGS--O}
- FPPFLAGS=${FPPFLAGS-}
- FFLAGS=${FFLAGS-}
--
--AC_INIT(libsrc/ncconfig.in)
- UD_SRCDIR
- AC_PREFIX_DEFAULT(`(cd ..; pwd)`)
- AC_CONFIG_HEADER(
-@@ -55,4 +57,4 @@ UD_CHECK_SIZEOF(off_t)
- UD_CHECK_SIZEOF(size_t)
- UD_MAKEWHATIS
- UD_FTPBINDIR
--UD_OUTPUT(macros.make)
-+AC_OUTPUT(macros.make)
diff --git a/devel/netcdf/patches/patch-an b/devel/netcdf/patches/patch-an
index 27b515862ed..2e08f74e841 100644
--- a/devel/netcdf/patches/patch-an
+++ b/devel/netcdf/patches/patch-an
@@ -1,14 +1,16 @@
-$NetBSD: patch-an,v 1.1 2004/01/11 15:58:45 cjep Exp $
+$NetBSD: patch-an,v 1.2 2005/02/25 09:52:47 adam Exp $
---- cxx/nctst.cpp.orig 1999-09-17 18:21:23.000000000 +0100
+--- cxx/nctst.cpp.orig 2004-08-15 18:04:30.000000000 +0000
+++ cxx/nctst.cpp
-@@ -1,4 +1,4 @@
--#include <iostream.h>
+@@ -1,6 +1,6 @@
+ #include <iostream>
+ using namespace std;
+-
+#include <iostream>
#include <string.h>
#include "netcdfcpp.h"
-@@ -8,7 +8,7 @@ void gen(const char* path) // Generate
+@@ -22,7 +22,7 @@ void gen(const char* path, int version)
// Check if the file was opened successfully
if (! nc.is_valid()) {
@@ -17,7 +19,7 @@ $NetBSD: patch-an,v 1.1 2004/01/11 15:58:45 cjep Exp $
return;
}
-@@ -124,12 +124,12 @@ void DumpableNcFile::dumpdims( void )
+@@ -138,12 +138,12 @@ void DumpableNcFile::dumpdims( void )
for (int n=0; n < num_dims(); n++) {
NcDim* dim = get_dim(n);
@@ -33,7 +35,7 @@ $NetBSD: patch-an,v 1.1 2004/01/11 15:58:45 cjep Exp $
}
}
-@@ -137,10 +137,10 @@ void dumpatts(NcVar& var)
+@@ -151,10 +151,10 @@ void dumpatts(NcVar& var)
{
NcToken vname = var.name();
NcAtt* ap;
@@ -47,7 +49,7 @@ $NetBSD: patch-an,v 1.1 2004/01/11 15:58:45 cjep Exp $
delete ap;
delete vals;
}
-@@ -153,20 +153,20 @@ void DumpableNcFile::dumpvars( void )
+@@ -167,20 +167,20 @@ void DumpableNcFile::dumpvars( void )
{"","byte","char","short","long","float","double"};
NcVar* vp;
@@ -75,7 +77,7 @@ $NetBSD: patch-an,v 1.1 2004/01/11 15:58:45 cjep Exp $
// now dump each of this variable's attributes
dumpatts(*vp);
}
-@@ -175,10 +175,10 @@ void DumpableNcFile::dumpvars( void )
+@@ -189,10 +189,10 @@ void DumpableNcFile::dumpvars( void )
void DumpableNcFile::dumpgatts( void )
{
NcAtt* ap;
@@ -89,7 +91,7 @@ $NetBSD: patch-an,v 1.1 2004/01/11 15:58:45 cjep Exp $
delete vals;
delete ap;
}
-@@ -187,10 +187,10 @@ void DumpableNcFile::dumpgatts( void )
+@@ -201,10 +201,10 @@ void DumpableNcFile::dumpgatts( void )
void DumpableNcFile::dumpdata( )
{
NcVar* vp;
@@ -103,7 +105,7 @@ $NetBSD: patch-an,v 1.1 2004/01/11 15:58:45 cjep Exp $
delete vals;
}
}
-@@ -199,25 +199,25 @@ void dump(const char* path)
+@@ -213,25 +213,25 @@ void dump(const char* path)
{
DumpableNcFile nc(path); // default is open in read-only mode
diff --git a/devel/netcdf/patches/patch-ao b/devel/netcdf/patches/patch-ao
deleted file mode 100644
index a4e98d5424d..00000000000
--- a/devel/netcdf/patches/patch-ao
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/01/11 15:58:45 cjep Exp $
-
---- cxx/ncvalues.cpp.orig 1998-12-22 18:21:49.000000000 +0000
-+++ cxx/ncvalues.cpp
-@@ -8,5 +8,5 @@
- *********************************************************************/
-
--#include <iostream.h> // for debugging
-+#include <iostream> // for debugging
- #include "ncvalues.h"
-
-@@ -26,5 +26,5 @@ long NcValues::num( void )
- }
-
--ostream& operator<< (ostream& os, const NcValues& vals)
-+std::ostream& operator<< (std::ostream& os, const NcValues& vals)
- {
- return vals.print(os);
-@@ -245,5 +245,5 @@ inline char* NcValues_char::as_string( l
- }
-
--ostream& NcValues_short::print(ostream& os) const
-+std::ostream& NcValues_short::print(std::ostream& os) const
- {
- for(int i = 0; i < the_number - 1; i++)
-@@ -254,5 +254,5 @@ ostream& NcValues_short::print(ostream&
- }
-
--ostream& NcValues_int::print(ostream& os) const
-+std::ostream& NcValues_int::print(std::ostream& os) const
- {
- for(int i = 0; i < the_number - 1; i++)
-@@ -263,5 +263,5 @@ ostream& NcValues_int::print(ostream& os
- }
-
--ostream& NcValues_nclong::print(ostream& os) const
-+std::ostream& NcValues_nclong::print(std::ostream& os) const
- {
- for(int i = 0; i < the_number - 1; i++)
-@@ -272,5 +272,5 @@ ostream& NcValues_nclong::print(ostream&
- }
-
--ostream& NcValues_long::print(ostream& os) const
-+std::ostream& NcValues_long::print(std::ostream& os) const
- {
- for(int i = 0; i < the_number - 1; i++)
-@@ -281,5 +281,5 @@ ostream& NcValues_long::print(ostream& o
- }
-
--ostream& NcValues_ncbyte::print(ostream& os) const
-+std::ostream& NcValues_ncbyte::print(std::ostream& os) const
- {
- for(int i = 0; i < the_number - 1; i++)
-@@ -290,5 +290,5 @@ ostream& NcValues_ncbyte::print(ostream&
- }
-
--ostream& NcValues_char::print(ostream& os) const
-+std::ostream& NcValues_char::print(std::ostream& os) const
- {
- os << '"';
-@@ -303,7 +303,7 @@ ostream& NcValues_char::print(ostream& o
- }
-
--ostream& NcValues_float::print(ostream& os) const
-+std::ostream& NcValues_float::print(std::ostream& os) const
- {
-- long save=os.flags();
-+ std::ostream::fmtflags save=os.flags();
- os.precision(7);
- for(int i = 0; i < the_number - 1; i++)
-@@ -315,7 +315,7 @@ ostream& NcValues_float::print(ostream&
- }
-
--ostream& NcValues_double::print(ostream& os) const
-+std::ostream& NcValues_double::print(std::ostream& os) const
- {
-- long save=os.flags();
-+ std::ostream::fmtflags save=os.flags();
- os.precision(15);
- for(int i = 0; i < the_number - 1; i++)
diff --git a/devel/netcdf/patches/patch-ap b/devel/netcdf/patches/patch-ap
deleted file mode 100644
index b4245d4209f..00000000000
--- a/devel/netcdf/patches/patch-ap
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2004/01/11 15:58:45 cjep Exp $
-
---- cxx/ncvalues.h.orig 1998-10-28 17:10:16.000000000 +0000
-+++ cxx/ncvalues.h
-@@ -10,11 +10,11 @@
- #ifndef Ncvalues_def
- #define Ncvalues_def
-
--#include <iostream.h>
-+#include <iostream>
- #ifdef STRSTREAM_H_SPEC
- # include STRSTREAM_H_SPEC
- #else
--# include <strstream.h>
-+# include <sstream>
- #endif
- #include <limits.h>
- #include <string.h>
-@@ -82,7 +82,7 @@ class NcVal(TYPE) : public NcValues
- virtual int invalid( void ) const; \
- private: \
- TYPE* the_values; \
-- ostream& print(ostream&) const; \
-+ std::ostream& print(std::ostream&) const; \
- };
-
- #define NcTypeEnum(TYPE) makename2(_nc__,TYPE)
-@@ -219,9 +219,11 @@ inline double NcVal(TYPE)::as_double( lo
- #define as_string_implement(TYPE) \
- char* NcVal(TYPE)::as_string( long n ) const \
- { \
-- char* s = new char[32]; \
-- ostrstream ostr(s, sizeof(s)); \
-- ostr << the_values[n] << ends; \
-+ std::ostringstream ostr; \
-+ ostr << the_values[n] << std::ends; \
-+ std::string str(ostr.str()); \
-+ char *s = new char[str.size()]; \
-+ str.copy(s, str.size()); \
- return s; \
- }
-
-@@ -232,7 +234,7 @@ class NcValues // ABC for value blocks
- NcValues(NcType, long);
- virtual ~NcValues( void );
- virtual long num( void );
-- virtual ostream& print(ostream&) const = 0;
-+ virtual std::ostream& print(std::ostream&) const = 0;
- virtual void* base( void ) const = 0;
- virtual int bytes_for_one( void ) const = 0;
-
-@@ -250,9 +252,9 @@ class NcValues // ABC for value blocks
- virtual char* as_string( long n ) const = 0; // value as string
-
- protected:
-- NcType the_type;
- long the_number;
-- friend ostream& operator<< (ostream&, const NcValues&);
-+ NcType the_type;
-+ friend std::ostream& operator<< (std::ostream&, const NcValues&);
- };
-
- declare(NcValues,ncbyte)
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 00:49:00 +0000