Benoit Lecocq wrote:
Hi,
This is a diff for the latest version of netcdf 4.0.
Tested on i368/amd64.
I take maintainership with OK from Tom.
Diff updated, math/kst works well, graphics/gmt builds @amd64 (I do not
know how to use it).
A regression test still fails but Benoit will ask upstream about it.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/netcdf/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 29 Nov 2007 13:43:08 -0000 1.12
+++ Makefile 13 Mar 2009 19:25:37 -0000
@@ -3,16 +3,16 @@
COMMENT= library for machine-independent, array-oriented data access
-DISTNAME= netcdf-3.6.2
+DISTNAME= netcdf-4.0
CATEGORIES= math
-SHARED_LIBS= netcdf 4.0 \
- netcdff 4.0 \
- netcdf_c++ 4.0
+SHARED_LIBS= netcdf 5.0 # .4.0
+SHARED_LIBS+= netcdff 5.0 # .4.0
+SHARED_LIBS+= netcdf_c++ 5.0 # .4.0
HOMEPAGE= http://www.unidata.ucar.edu/packages/netcdf/
-MAINTAINER= Tom Knienieder <[email protected]>
+MAINTAINER= Benoit Lecocq <[email protected]>
# BSD-like
PERMIT_PACKAGE_CDROM= Yes
@@ -24,18 +24,21 @@ WANTLIB= c m
MASTER_SITES= ftp://ftp.unidata.ucar.edu/pub/netcdf/
-CONFIGURE_STYLE= gnu
-CONFIGURE_ENV= CPPFLAGS="-Df2cFortran"
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
- --disable-f90
-
USE_GMAKE= Yes
USE_LIBTOOL= Yes
-SEPARATE_BUILD= concurrent
+
+CONFIGURE_STYLE= gnu
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -Df2cFortran"
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
+ --disable-f90 \
+ --enable-examples \
+ --enable-docs-install
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/netcdf
- @cd ${WRKSRC}/man && ${INSTALL_DATA} *.txt *.pdf \
- ${PREFIX}/share/doc/netcdf
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/netcdf
+ @cd ${WRKSRC}/man && ${INSTALL_DATA} *.txt *.pdf \
+ ${PREFIX}/share/doc/netcdf
+
+NO_REGRESS= Yes
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/netcdf/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 29 Nov 2007 13:43:08 -0000 1.5
+++ distinfo 13 Mar 2009 19:25:37 -0000
@@ -1,5 +1,5 @@
-MD5 (netcdf-3.6.2.tar.gz) = p9RQ2pCB5KbkQHBeoxho0w==
-RMD160 (netcdf-3.6.2.tar.gz) = 3PHvqQt0eSFawKLY3CMdlN3cc9g=
-SHA1 (netcdf-3.6.2.tar.gz) = MvuB85/8yrU5EkzD1fYZllzkLzY=
-SHA256 (netcdf-3.6.2.tar.gz) = /qp2c/Np5ftX/MUUJuK+aUIo3cwUH8P9IDmSaftrkxE=
-SIZE (netcdf-3.6.2.tar.gz) = 5312882
+MD5 (netcdf-4.0.tar.gz) = r8BXsHtuaENVbc+8TO1ALA==
+RMD160 (netcdf-4.0.tar.gz) = RJOKBuEfjprm8bUwUHcHfo0X914=
+SHA1 (netcdf-4.0.tar.gz) = vqmYRiZeVeVL4sIArgBKzDoiHAo=
+SHA256 (netcdf-4.0.tar.gz) = T2k0/YYrLg9abdzY71+GoD2K6/0Qa8Ccl6/ID+KtXJY=
+SIZE (netcdf-4.0.tar.gz) = 11584002
Index: patches/patch-ncdump_dumplib_c
===================================================================
RCS file: patches/patch-ncdump_dumplib_c
diff -N patches/patch-ncdump_dumplib_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ncdump_dumplib_c 13 Mar 2009 19:25:37 -0000
@@ -0,0 +1,11 @@
+--- ncdump/dumplib.c.orig Thu Mar 12 21:05:48 2009
++++ ncdump/dumplib.c Thu Mar 12 21:07:25 2009
+@@ -1763,7 +1763,7 @@
+ /* For some reason, and on some machines (e.g. tweety)
+ utf8 characters such as \343 are considered control character. */
+ /* if(*cp && (isspace(*cp) | iscntrl(*cp)))*/
+- if((*cp >= 0x01 && *cp <= 0x32) || (*cp == 0x7f))
++ if((*cp >= 0x00 && *cp <= 0x20) || (*cp == 0x7f))
+ {
+ error("name begins with space or control-character: %c",*cp);
+ }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/netcdf/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 29 Nov 2007 13:43:09 -0000 1.5
+++ pkg/PLIST 13 Mar 2009 19:25:37 -0000
@@ -1,12 +1,19 @@
-...@comment $OpenBSD: PLIST,v 1.5 2007/11/29 13:43:09 okan Exp $
+...@comment $OpenBSD$
%%SHARED%%
-bin/ncdump
-bin/ncgen
+...@bin bin/ncdump
+...@bin bin/ncgen
include/ncvalues.h
include/netcdf.h
include/netcdf.hh
include/netcdf.inc
include/netcdfcpp.h
+...@info info/netcdf-c.info
+...@info info/netcdf-cxx.info
+...@info info/netcdf-f77.info
+...@info info/netcdf-f90.info
+...@info info/netcdf-install.info
+...@info info/netcdf-tutorial.info
+...@info info/netcdf.info
lib/libnetcdf.a
lib/libnetcdf.la
lib/libnetcdf_c++.a
@@ -18,17 +25,43 @@ lib/libnetcdff.la
@man man/man3/netcdf.3
@man man/man3/netcdf_f77.3
share/doc/netcdf/
+share/doc/netcdf/ncdump-man-1.html
+share/doc/netcdf/ncgen-man-1.html
+share/doc/netcdf/netcdf-c.html
+...@info share/doc/netcdf/netcdf-c.info
share/doc/netcdf/netcdf-c.pdf
+share/doc/netcdf/netcdf-c.ps
share/doc/netcdf/netcdf-c.txt
+share/doc/netcdf/netcdf-cxx.html
+...@info share/doc/netcdf/netcdf-cxx.info
share/doc/netcdf/netcdf-cxx.pdf
+share/doc/netcdf/netcdf-cxx.ps
share/doc/netcdf/netcdf-cxx.txt
+share/doc/netcdf/netcdf-f77.html
+...@info share/doc/netcdf/netcdf-f77.info
share/doc/netcdf/netcdf-f77.pdf
+share/doc/netcdf/netcdf-f77.ps
share/doc/netcdf/netcdf-f77.txt
+share/doc/netcdf/netcdf-f90.html
+...@info share/doc/netcdf/netcdf-f90.info
share/doc/netcdf/netcdf-f90.pdf
+share/doc/netcdf/netcdf-f90.ps
share/doc/netcdf/netcdf-f90.txt
+share/doc/netcdf/netcdf-install.html
+...@info share/doc/netcdf/netcdf-install.info
share/doc/netcdf/netcdf-install.pdf
+share/doc/netcdf/netcdf-install.ps
share/doc/netcdf/netcdf-install.txt
+share/doc/netcdf/netcdf-man-3.html
+share/doc/netcdf/netcdf-tutorial.html
+...@info share/doc/netcdf/netcdf-tutorial.info
share/doc/netcdf/netcdf-tutorial.pdf
+share/doc/netcdf/netcdf-tutorial.ps
share/doc/netcdf/netcdf-tutorial.txt
+share/doc/netcdf/netcdf.html
+...@info share/doc/netcdf/netcdf.info
share/doc/netcdf/netcdf.pdf
+share/doc/netcdf/netcdf.ps
share/doc/netcdf/netcdf.txt
+share/doc/netcdf/netcdf_f77-man.html
+share/doc/netcdf/netcdf_f90-man.html
