mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

- Update to version 3.5.1

Browse Source 
PR:		ports/64507
Submitted by:	Ports Fury
This commit is contained in:
Kirill Ponomarev 2004-03-20 17:25:07 +00:00
parent 68314b6c66
commit d287666fd9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=104748
21 changed files with 48 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
math/netcdf/Makefile
View File

@ -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>

4
math/netcdf/distinfo
View File

@ -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

7
math/netcdf/files/patch-nctst.cpp
View File

@ -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"

33
math/netcdf/files/patch-ncvalues.cpp
View File

@ -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;
}

42
math/netcdf/files/patch-ncvalues.h
View File

@ -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; \
}

29
math/netcdf/files/patch-netcdfcpp.h
View File

@ -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;
};

5
math/netcdf/pkg-plist
View File

@ -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%%

10
science/netcdf/Makefile
View File

@ -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>

4
science/netcdf/distinfo
View File

@ -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

7
science/netcdf/files/patch-nctst.cpp
View File

@ -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"

33
science/netcdf/files/patch-ncvalues.cpp
View File

@ -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;
}

42
science/netcdf/files/patch-ncvalues.h
View File

@ -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; \
}

29
science/netcdf/files/patch-netcdfcpp.h
View File

@ -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;
};

5
science/netcdf/pkg-plist
View File

@ -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%%

10
science/netcdf4/Makefile
View File

@ -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>

4
science/netcdf4/distinfo
View File

@ -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

7
science/netcdf4/files/patch-nctst.cpp
View File

@ -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"

33
science/netcdf4/files/patch-ncvalues.cpp
View File

@ -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;
}

42
science/netcdf4/files/patch-ncvalues.h
View File

@ -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; \
}

29
science/netcdf4/files/patch-netcdfcpp.h
View File

@ -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;
};

5
science/netcdf4/pkg-plist
View File

@ -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%%