ports/64507: Update port: math/netcdf to 3.5.1
KATO Tsuguru
tkato at prontomail.com
Sat Mar 20 16:40:18 UTC 2004
>Number: 64507
>Category: ports
>Synopsis: Update port: math/netcdf to 3.5.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 20 08:40:17 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.9-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 3.5.1
Remove file:
files/patch-nctst.cpp
files/patch-ncvalues.cpp
files/patch-ncvalues.h
files/patch-netcdfcpp.h
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/math/netcdf/Makefile math/netcdf/Makefile
--- /usr/ports/math/netcdf/Makefile Sat Feb 7 01:15:34 2004
+++ math/netcdf/Makefile Sat Mar 20 23:28:09 2004
@@ -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 @@
${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 -urN /usr/ports/math/netcdf/distinfo math/netcdf/distinfo
--- /usr/ports/math/netcdf/distinfo Fri Jan 30 14:49:32 2004
+++ math/netcdf/distinfo Sat Mar 20 23:08:58 2004
@@ -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 -urN /usr/ports/math/netcdf/files/patch-nctst.cpp math/netcdf/files/patch-nctst.cpp
--- /usr/ports/math/netcdf/files/patch-nctst.cpp Sat Feb 7 22:54:10 2004
+++ math/netcdf/files/patch-nctst.cpp Thu Jan 1 09:00:00 1970
@@ -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 -urN /usr/ports/math/netcdf/files/patch-ncvalues.cpp math/netcdf/files/patch-ncvalues.cpp
--- /usr/ports/math/netcdf/files/patch-ncvalues.cpp Sun Feb 8 02:34:20 2004
+++ math/netcdf/files/patch-ncvalues.cpp Thu Jan 1 09:00:00 1970
@@ -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 -urN /usr/ports/math/netcdf/files/patch-ncvalues.h math/netcdf/files/patch-ncvalues.h
--- /usr/ports/math/netcdf/files/patch-ncvalues.h Sun Feb 8 02:34:20 2004
+++ math/netcdf/files/patch-ncvalues.h Thu Jan 1 09:00:00 1970
@@ -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 -urN /usr/ports/math/netcdf/files/patch-netcdfcpp.h math/netcdf/files/patch-netcdfcpp.h
--- /usr/ports/math/netcdf/files/patch-netcdfcpp.h Mon Sep 16 17:47:01 2002
+++ math/netcdf/files/patch-netcdfcpp.h Thu Jan 1 09:00:00 1970
@@ -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 -urN /usr/ports/math/netcdf/pkg-plist math/netcdf/pkg-plist
--- /usr/ports/math/netcdf/pkg-plist Tue May 1 07:05:05 2001
+++ math/netcdf/pkg-plist Sat Mar 20 23:26:34 2004
@@ -11,3 +11,8 @@
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%%
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list