Initial addition of netcdf-3.4, a library for array-oriented data access.

Provided in pr 6745 by Rene Hexel.

9 files changed, 210 insertions, 0 deletions

diff --git a/devel/netcdf/patches/patch-aa b/devel/netcdf/patches/patch-aa
new file mode 100644
index 00000000000..d94e0bd11cd
--- /dev/null
+++ b/devel/netcdf/patches/patch-aa
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.1.1.1 1999/01/14 20:28:54 frueauf Exp $
+
+--- ncgen/ncgentab.c.orig	Wed Sep 17 20:31:03 1997
++++ ncgen/ncgentab.c	Sun Sep 27 12:15:56 1998
+@@ -82,7 +82,13 @@
+ #include <memory.h>
+ #endif
+ 
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#endif
++ 
++#ifndef BSD
+ #include <values.h>
++#endif
+ 
+ #ifdef __cplusplus
+ 
diff --git a/devel/netcdf/patches/patch-ab b/devel/netcdf/patches/patch-ab
new file mode 100644
index 00000000000..134410d105f
--- /dev/null
+++ b/devel/netcdf/patches/patch-ab
@@ -0,0 +1,45 @@
+$NetBSD: patch-ab,v 1.1.1.1 1999/01/14 20:28:54 frueauf Exp $
+
+--- macros.make.in.orig	Thu Sep 18 22:56:04 1997
++++ macros.make.in	Sun Sep 27 19:11:17 1998
+@@ -28,9 +28,9 @@
+ 
+ 
+ # Compilation:
+-CC		= @CC@
+-CXX		= @CXX@
+-FC		= @FC@
++CC		= ${LIBTOOL} --mode=compile @CC@
++CXX		= ${LIBTOOL} --mode=compile @CXX@
++FC		= ${LIBTOOL} --mode=compile @FC@
+ CFLAGS		= @CFLAGS@
+ CXXFLAGS	= $(CFLAGS) @CXXFLAGS@
+ FFLAGS		= @FFLAGS@
+@@ -47,10 +47,10 @@
+ MATHLIB		= @MATHLIB@
+ FLIBS		= @FLIBS@
+ LIBS		= @LIBS@
+-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.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)
+ 
+ 
+ # NetCDF files:
+@@ -66,9 +66,9 @@
+ 
+ 
+ # Misc. Utilities:
+-AR		= @AR@
+-ARFLAGS		= cru	# NB: SunOS 4 doesn't like `-' option prefix
+-RANLIB		= @RANLIB@
++AR		= ${LIBTOOL} --mode=link @CC@
++ARFLAGS		= -rpath $(LIBDIR) -version-info 3:4
++RANLIB		= echo
+ TARFLAGS	= -chf
+ 
+ 
diff --git a/devel/netcdf/patches/patch-ac b/devel/netcdf/patches/patch-ac
new file mode 100644
index 00000000000..0f38540cf77
--- /dev/null
+++ b/devel/netcdf/patches/patch-ac
@@ -0,0 +1,27 @@
+$NetBSD: patch-ac,v 1.1.1.1 1999/01/14 20:28:54 frueauf Exp $
+
+--- rules.make.orig	Fri Dec 19 23:07:52 1997
++++ rules.make	Sun Sep 27 22:34:28 1998
+@@ -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:
+@@ -122,10 +121,10 @@
+ 	cp $(HEADER2) $@
+ 
+ $(LIBDIR)/$(LIBRARY):	$(LIBDIR) $(LIBRARY)
+-	cp $(LIBRARY) $@
++	${LIBTOOL} --mode=install cp $(LIBRARY) $@
+ 
+ $(BINDIR)/$(PROGRAM):	$(BINDIR) $(PROGRAM)
+-	cp $(PROGRAM) $@
++	${LIBTOOL} --mode=install cp $(PROGRAM) $@
+ 
+ $(BINDIR) \
+ $(INCDIR) \
diff --git a/devel/netcdf/patches/patch-ad b/devel/netcdf/patches/patch-ad
new file mode 100644
index 00000000000..260203e352c
--- /dev/null
+++ b/devel/netcdf/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1.1.1 1999/01/14 20:28:54 frueauf Exp $
+
+--- Makefile.orig	Sun Sep 27 19:49:58 1998
++++ Makefile	Sun Sep 27 19:50:16 1998
+@@ -25,8 +25,8 @@
+ 		rules.make
+ 
+ 
+-all:		libsrc/all	\
+-		fortran/all	\
++all:		fortran/all	\
++		libsrc/all	\
+ 		ncdump/all	\
+ 		ncgen/all	\
+ 		cxx/all
diff --git a/devel/netcdf/patches/patch-ae b/devel/netcdf/patches/patch-ae
new file mode 100644
index 00000000000..f768ffc66c2
--- /dev/null
+++ b/devel/netcdf/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 1999/01/14 20:28:54 frueauf Exp $
+
+--- fortran/Makefile.orig	Sun Sep 27 19:52:28 1998
++++ fortran/Makefile	Sun Sep 27 19:56:28 1998
+@@ -68,7 +68,7 @@
+ #
+ 
+ 
+-all:		$(LIBRARY) $(MANUAL)
++all:		$(LIB_OBJS) $(MANUAL)
+ 
+ test:		ftest FORCE
+ 	./ftest
diff --git a/devel/netcdf/patches/patch-af b/devel/netcdf/patches/patch-af
new file mode 100644
index 00000000000..799e0433743
--- /dev/null
+++ b/devel/netcdf/patches/patch-af
@@ -0,0 +1,38 @@
+$NetBSD: patch-af,v 1.1.1.1 1999/01/14 20:28:54 frueauf Exp $
+
+--- libsrc/Makefile.orig	Mon Dec  8 23:04:42 1997
++++ libsrc/Makefile	Sun Sep 27 20:23:07 1998
+@@ -7,7 +7,7 @@
+ 
+ INCLUDES = -I.
+ 
+-LIBRARY 	= libnetcdf.a
++LIBRARY 	= libnetcdf.la
+ ld_netcdf	= -L. -lnetcdf
+ 
+ HEADER	= netcdf.h
+@@ -54,7 +54,23 @@
+ 	t_ncxx.c \
+ 	t_ncx.c
+ 
+-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
new file mode 100644
index 00000000000..1ed3419231c
--- /dev/null
+++ b/devel/netcdf/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1.1.1 1999/01/14 20:28:54 frueauf Exp $
+
+--- ncdump/Makefile.orig	Sun Sep 27 20:07:07 1998
++++ ncdump/Makefile	Sun Sep 27 20:08:23 1998
+@@ -19,8 +19,8 @@
+ 		  test0.cdl ncdump.1 Makefile
+ MANUAL		= ncdump.1
+ 
+-lib_netcdf	= ../libsrc/libnetcdf.a
+-ld_netcdf	= -L../libsrc -lnetcdf
++lib_netcdf	= ../libsrc/libnetcdf.la
++ld_netcdf	= ${lib_netcdf}
+ OBJS		=  ncdump.o vardata.o dumplib.o
+ GARBAGE		= $(PROGRAM) test0.nc test1.nc test1.cdl test2.cdl
+ 
diff --git a/devel/netcdf/patches/patch-ah b/devel/netcdf/patches/patch-ah
new file mode 100644
index 00000000000..4ef82a43cb3
--- /dev/null
+++ b/devel/netcdf/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1.1.1 1999/01/14 20:28:54 frueauf Exp $
+
+--- ncgen/Makefile.orig	Sun Sep 27 20:11:07 1998
++++ ncgen/Makefile	Sun Sep 27 20:11:37 1998
+@@ -14,7 +14,7 @@
+ 		  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
new file mode 100644
index 00000000000..6b02ed670a1
--- /dev/null
+++ b/devel/netcdf/patches/patch-ai
@@ -0,0 +1,26 @@
+$NetBSD: patch-ai,v 1.1.1.1 1999/01/14 20:28:54 frueauf Exp $
+
+--- cxx/Makefile.orig	Sun Sep 27 20:12:34 1998
++++ cxx/Makefile	Sun Sep 27 20:17:51 1998
+@@ -11,9 +11,9 @@
+ 		  nctst.cc ncvalues.cc ncvalues.hh netcdf.cc netcdf.hh \
+ 		  expected cxxdoc.tex cxxdoc.ps texinfo.tex
+ 
+-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		= netcdf.hh
+ HEADER2		= ncvalues.hh
+@@ -42,7 +42,7 @@
+ install:	$(LIBDIR)/$(LIBRARY) $(INCDIR)/$(HEADER1) $(INCDIR)/$(HEADER2)
+ 
+ $(prog) : $(prog_objs) $(LIBRARY) $(lib_netcdf)
+-	$(CXX) -o $@ $(CXXCPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(prog_objs) $(libs)
++	$(LINK.cxx) -o $@ $(CXXCPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(prog_objs) $(libs)
+ 
+ nctst_src: nctst.cc netcdf.cc ncvalues.cc
+ 	#load -I../libsrc $(nctst_src)