aboutsummaryrefslogtreecommitdiffstats
path: root/science/netcdf
diff options
context:
space:
mode:
authorkrion <krion@FreeBSD.org>2004-03-21 01:25:07 +0800
committerkrion <krion@FreeBSD.org>2004-03-21 01:25:07 +0800
commit76a952710075b988e5211145785e14edefd2bc0a (patch)
treeb5384f5d99970884fddb3afa6d10274fa9055a15 /science/netcdf
parentc900940615f1cbe6cd8aedae2a837b8ef330bdec (diff)
downloadfreebsd-ports-graphics-76a952710075b988e5211145785e14edefd2bc0a.tar.gz
freebsd-ports-graphics-76a952710075b988e5211145785e14edefd2bc0a.tar.zst
freebsd-ports-graphics-76a952710075b988e5211145785e14edefd2bc0a.zip
- Update to version 3.5.1
PR: ports/64507 Submitted by: Ports Fury
Diffstat (limited to 'science/netcdf')
-rw-r--r--science/netcdf/Makefile10
-rw-r--r--science/netcdf/distinfo4
-rw-r--r--science/netcdf/files/patch-nctst.cpp7
-rw-r--r--science/netcdf/files/patch-ncvalues.cpp33
-rw-r--r--science/netcdf/files/patch-ncvalues.h42
-rw-r--r--science/netcdf/files/patch-netcdfcpp.h29
-rw-r--r--science/netcdf/pkg-plist5
7 files changed, 16 insertions, 114 deletions
diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile
index 13a6bf93e48..f9f0e1d9b3a 100644
--- a/science/netcdf/Makefile
+++ b/science/netcdf/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= netcdf
-PORTVERSION= 3.5.0
+PORTVERSION= 3.5.1
CATEGORIES= math
MASTER_SITES= ftp://unidata.ucar.edu/pub/netcdf/
#DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/-beta/}
@@ -31,9 +31,17 @@ post-build:
${SETENV} ${MAKE_ENV} ${MAKE} linux_shared_library)
post-install:
+ @${STRIP_CMD} ${PREFIX}/bin/ncdump
+ @${STRIP_CMD} ${PREFIX}/bin/ncgen
${INSTALL_DATA} ${WRKSRC}/libsrc/libnetcdf.so ${PREFIX}/lib/libnetcdf.so.1
${LN} -sf libnetcdf.so.1 ${PREFIX}/lib/libnetcdf.so
${INSTALL_DATA} ${WRKSRC}/cxx/libnetcdf_c++.so ${PREFIX}/lib/libnetcdf_c++.so.1
${LN} -sf libnetcdf_c++.so.1 ${PREFIX}/lib/libnetcdf_c++.so
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+.for file in COMPATIBILITY COPYRIGHT README RELEASE_NOTES
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
.include <bsd.port.mk>
diff --git a/science/netcdf/distinfo b/science/netcdf/distinfo
index 3a4972ba22b..570598bf3cb 100644
--- a/science/netcdf/distinfo
+++ b/science/netcdf/distinfo
@@ -1,2 +1,2 @@
-MD5 (netcdf-3.5.0.tar.Z) = 28640a40a44f982f90f5eeb15e917a1f
-SIZE (netcdf-3.5.0.tar.Z) = 1319419
+MD5 (netcdf-3.5.1.tar.Z) = 52972e8765394010d2507a9a1dc02a56
+SIZE (netcdf-3.5.1.tar.Z) = 1333257
diff --git a/science/netcdf/files/patch-nctst.cpp b/science/netcdf/files/patch-nctst.cpp
deleted file mode 100644
index 6b98da703c0..00000000000
--- a/science/netcdf/files/patch-nctst.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
---- cxx/nctst.cpp.orig Sat Feb 7 14:04:34 2004
-+++ cxx/nctst.cpp Sat Feb 7 14:04:48 2004
-@@ -1,4 +1,3 @@
--#include <iostream.h>
- #include <string.h>
- #include "netcdfcpp.h"
-
diff --git a/science/netcdf/files/patch-ncvalues.cpp b/science/netcdf/files/patch-ncvalues.cpp
deleted file mode 100644
index 34e6f1f636a..00000000000
--- a/science/netcdf/files/patch-ncvalues.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- cxx/ncvalues.cpp.orig Tue Dec 22 19:21:49 1998
-+++ cxx/ncvalues.cpp Sat Feb 7 13:34:17 2004
-@@ -7,7 +7,6 @@
- * $Header: /upc/share/CVS/netcdf-3/cxx/ncvalues.cpp,v 1.3 1998/12/22 18:21:49 russ Exp $
- *********************************************************************/
-
--#include <iostream.h> // for debugging
- #include "ncvalues.h"
-
- NcValues::NcValues( void ) : the_number(0), the_type(ncNoType)
-@@ -310,7 +309,11 @@
- os << the_values[i] << ", ";
- if (the_number > 0)
- os << the_values[the_number-1] ;
-+#if (__GNUC__ == 2)
- os.flags(save);
-+#else
-+ os.flags(std::_Ios_Fmtflags(save));
-+#endif
- return os;
- }
-
-@@ -322,6 +325,10 @@
- os << the_values[i] << ", ";
- if (the_number > 0)
- os << the_values[the_number-1];
-+#if (__GNUC__ == 2)
- os.flags(save);
-+#else
-+ os.flags(std::_Ios_Fmtflags(save));
-+#endif
- return os;
- }
diff --git a/science/netcdf/files/patch-ncvalues.h b/science/netcdf/files/patch-ncvalues.h
deleted file mode 100644
index a6d8be1c942..00000000000
--- a/science/netcdf/files/patch-ncvalues.h
+++ /dev/null
@@ -1,42 +0,0 @@
---- cxx/ncvalues.h.orig Wed Oct 28 18:10:16 1998
-+++ cxx/ncvalues.h Sat Feb 7 14:03:13 2004
-@@ -10,12 +10,9 @@
- #ifndef Ncvalues_def
- #define Ncvalues_def
-
--#include <iostream.h>
--#ifdef STRSTREAM_H_SPEC
--# include STRSTREAM_H_SPEC
--#else
--# include <strstream.h>
--#endif
-+#include <bitset>
-+#include <iostream>
-+#include <sstream>
- #include <limits.h>
- #include <string.h>
- #include "netcdf.h"
-@@ -24,6 +21,8 @@
-
- #define NC_UNSPECIFIED ((nc_type)0)
-
-+using namespace std;
-+
- enum NcType
- {
- ncNoType = NC_UNSPECIFIED,
-@@ -219,9 +218,12 @@
- #define as_string_implement(TYPE) \
- char* NcVal(TYPE)::as_string( long n ) const \
- { \
-- char* s = new char[32]; \
-- ostrstream ostr(s, sizeof(s)); \
-+ static char s[32]; \
-+ ostringstream ostr; \
- ostr << the_values[n] << ends; \
-+ std::string data( ostr.str() ); \
-+ strncpy( s, data.data(), sizeof(s)-1); \
-+ s[ sizeof(s)-1 ] = 0; \
- return s; \
- }
-
diff --git a/science/netcdf/files/patch-netcdfcpp.h b/science/netcdf/files/patch-netcdfcpp.h
deleted file mode 100644
index 5d6747ad105..00000000000
--- a/science/netcdf/files/patch-netcdfcpp.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- cxx/netcdfcpp.h.orig Mon Sep 16 16:25:44 2002
-+++ cxx/netcdfcpp.h Mon Sep 16 16:26:23 2002
-@@ -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/science/netcdf/pkg-plist b/science/netcdf/pkg-plist
index 34c2fa05a1a..d1b4c3cdb96 100644
--- a/science/netcdf/pkg-plist
+++ b/science/netcdf/pkg-plist
@@ -11,3 +11,8 @@ lib/libnetcdf.so.1
lib/libnetcdf_c++.a
lib/libnetcdf_c++.so
lib/libnetcdf_c++.so.1
+%%PORTDOCS%%%%DOCSDIR%%/COMPATIBILITY
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%@dirrm %%DOCSDIR%%