cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

maintenance update to 3.6.2 from Carlos Valiente

Browse Source 
ok steven@
This commit is contained in:
okan 2007-11-29 13:43:08 +00:00
parent 05be51c6a2
commit 2b6e52403a
9 changed files with 51 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
math/netcdf/Makefile
View File

@ -1,49 +1,41 @@
# $OpenBSD: Makefile,v 1.11 2007/09/15 18:44:36 steven Exp $
# $OpenBSD: Makefile,v 1.12 2007/11/29 13:43:08 okan Exp $
# $FreeBSD: ports/math/netcdf/Makefile,v 1.7 2000/06/16 21:51:39 asami Exp $
COMMENT= library for machine-independent, array-oriented data access
DISTNAME= netcdf-3.5.0
PKGNAME= ${DISTNAME}p1
DISTNAME= netcdf-3.6.2
CATEGORIES= math
SHARED_LIBS= netcdf 1.0 \
netcdf_c++ 2.0
SHARED_LIBS= netcdf 4.0 \
netcdff 4.0 \
netcdf_c++ 4.0
HOMEPAGE= http://www.unidata.ucar.edu/packages/netcdf/
MAINTAINER= Tom Knienieder <tom@knienieder.com>
# BSD-like
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.unidata.ucar.edu/pub/netcdf/ \
ftp://ftp.unidata.ucar.edu/pub/netcdf/old/
EXTRACT_SUFX= .tar.Z
WANTLIB= c m
WRKSRC= ${WRKDIST}/src
MASTER_SITES= ftp://ftp.unidata.ucar.edu/pub/netcdf/
CONFIGURE_STYLE= gnu dest
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-Df2cFortran"
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-f90
MAKE_FLAGS= CPPFLAGS="-fPIC -DPIC -Df2cFortran -I${WRKSRC}/libsrc"
REGRESS_DEPENDS= ::math/netcdf
post-build:
@(cd ${WRKSRC}/libsrc && \
${SETENV} ${MAKE_ENV} ${MAKE} LIBVER=${LIBnetcdf_VERSION} shared_library)
@(cd ${WRKSRC}/cxx && \
${SETENV} ${MAKE_ENV} ${MAKE} LIBVER=${LIBnetcdf_c++_VERSION} shared_library)
USE_GMAKE= Yes
USE_LIBTOOL= Yes
SEPARATE_BUILD= concurrent
post-install:
${INSTALL_DATA} \
${WRKSRC}/libsrc/libnetcdf.so.${LIBnetcdf_VERSION} \
${WRKSRC}/cxx/libnetcdf_c++.so.${LIBnetcdf_c++_VERSION} \
${PREFIX}/lib
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/netcdf
@cd ${WRKSRC}/man && ${INSTALL_DATA} *.txt *.pdf \
${PREFIX}/share/doc/netcdf
.include <bsd.port.mk>

10
math/netcdf/distinfo
View File

@ -1,5 +1,5 @@
MD5 (netcdf-3.5.0.tar.Z) = KGQKQKRPmC+Q9e6xXpF6Hw==
RMD160 (netcdf-3.5.0.tar.Z) = QxPgD8Vic+hxwAO/snxTPUp/VW8=
SHA1 (netcdf-3.5.0.tar.Z) = 6cWphH2P+bPhuKGPXiFvahUIvOg=
SHA256 (netcdf-3.5.0.tar.Z) = 06IROpF02EXcN3EigmzWix4C+7JTwPDCU7jhwZnIS5c=
SIZE (netcdf-3.5.0.tar.Z) = 1319419
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

11
math/netcdf/patches/patch-src_cxx_nctst_cpp
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_cxx_nctst_cpp,v 1.1 2004/02/01 12:22:05 sturm Exp $
--- src/cxx/nctst.cpp.orig 2004-02-01 11:39:39.000000000 +0100
+++ src/cxx/nctst.cpp 2004-02-01 11:39:47.000000000 +0100
@@ -1,4 +1,6 @@
-#include <iostream.h>
+#include <iostream>
+using namespace std;
+
#include <string.h>
#include "netcdfcpp.h"

106
math/netcdf/patches/patch-src_cxx_ncvalues_cpp
View File

@ -1,106 +0,0 @@
$OpenBSD: patch-src_cxx_ncvalues_cpp,v 1.1 2004/02/01 12:22:05 sturm Exp $
--- src/cxx/ncvalues.cpp.orig 1998-12-22 19:21:49.000000000 +0100
+++ src/cxx/ncvalues.cpp 2004-02-01 11:54:51.000000000 +0100
@@ -7,7 +7,7 @@
* $Header: /home/cvs/ports/math/netcdf/patches/Attic/patch-src_cxx_ncvalues_cpp,v 1.1 2004/02/01 12:22:05 sturm Exp $
*********************************************************************/
-#include <iostream.h> // for debugging
+#include <iostream> // for debugging
#include "ncvalues.h"
NcValues::NcValues( void ) : the_number(0), the_type(ncNoType)
@@ -25,7 +25,7 @@ long NcValues::num( void )
return the_number;
}
-ostream& operator<< (ostream& os, const NcValues& vals)
+std::ostream& operator<< (std::ostream& os, const NcValues& vals)
{
return vals.print(os);
}
@@ -244,7 +244,7 @@ inline char* NcValues_char::as_string( l
return s;
}
-ostream& NcValues_short::print(ostream& os) const
+std::ostream& NcValues_short::print(std::ostream& os) const
{
for(int i = 0; i < the_number - 1; i++)
os << the_values[i] << ", ";
@@ -253,7 +253,7 @@ ostream& NcValues_short::print(ostream&
return os;
}
-ostream& NcValues_int::print(ostream& os) const
+std::ostream& NcValues_int::print(std::ostream& os) const
{
for(int i = 0; i < the_number - 1; i++)
os << the_values[i] << ", ";
@@ -262,7 +262,7 @@ ostream& NcValues_int::print(ostream& os
return os;
}
-ostream& NcValues_nclong::print(ostream& os) const
+std::ostream& NcValues_nclong::print(std::ostream& os) const
{
for(int i = 0; i < the_number - 1; i++)
os << the_values[i] << ", ";
@@ -271,7 +271,7 @@ ostream& NcValues_nclong::print(ostream&
return os;
}
-ostream& NcValues_long::print(ostream& os) const
+std::ostream& NcValues_long::print(std::ostream& os) const
{
for(int i = 0; i < the_number - 1; i++)
os << the_values[i] << ", ";
@@ -280,7 +280,7 @@ ostream& NcValues_long::print(ostream& o
return os;
}
-ostream& NcValues_ncbyte::print(ostream& os) const
+std::ostream& NcValues_ncbyte::print(std::ostream& os) const
{
for(int i = 0; i < the_number - 1; i++)
os << the_values[i] << ", ";
@@ -289,7 +289,7 @@ ostream& NcValues_ncbyte::print(ostream&
return os;
}
-ostream& NcValues_char::print(ostream& os) const
+std::ostream& NcValues_char::print(std::ostream& os) const
{
os << '"';
long len = the_number;
@@ -302,7 +302,7 @@ ostream& NcValues_char::print(ostream& o
return os;
}
-ostream& NcValues_float::print(ostream& os) const
+std::ostream& NcValues_float::print(std::ostream& os) const
{
long save=os.flags();
os.precision(7);
@@ -310,11 +310,11 @@ ostream& NcValues_float::print(ostream&
os << the_values[i] << ", ";
if (the_number > 0)
os << the_values[the_number-1] ;
- os.flags(save);
+ os.precision(save);
return os;
}
-ostream& NcValues_double::print(ostream& os) const
+std::ostream& NcValues_double::print(std::ostream& os) const
{
long save=os.flags();
os.precision(15);
@@ -322,6 +322,6 @@ ostream& NcValues_double::print(ostream&
os << the_values[i] << ", ";
if (the_number > 0)
os << the_values[the_number-1];
- os.flags(save);
+ os.precision(save);
return os;
}

60
math/netcdf/patches/patch-src_cxx_ncvalues_h
View File

@ -1,60 +0,0 @@
$OpenBSD: patch-src_cxx_ncvalues_h,v 1.1 2004/02/01 12:22:06 sturm Exp $
--- src/cxx/ncvalues.h.orig 1998-10-28 18:10:16.000000000 +0100
+++ src/cxx/ncvalues.h 2004-02-01 11:57:27.000000000 +0100
@@ -10,14 +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 <iostream>
+#include <sstream>
#include <limits.h>
-#include <string.h>
#include "netcdf.h"
typedef unsigned char ncbyte;
@@ -82,7 +77,7 @@ class NcVal(TYPE) : public NcValues
virtual int invalid( void ) const; \
private: \
TYPE* the_values; \
- ostream& print(ostream&) const; \
+ std::ostream& print(std::ostream&) const; \
};
#define NcTypeEnum(TYPE) makename2(_nc__,TYPE)
@@ -220,8 +215,10 @@ inline double NcVal(TYPE)::as_double( lo
char* NcVal(TYPE)::as_string( long n ) const \
{ \
char* s = new char[32]; \
- ostrstream ostr(s, sizeof(s)); \
- ostr << the_values[n] << ends; \
+ std::ostringstream ostr; \
+ ostr << the_values[n]; \
+ ostr.str().copy(s, std::string::npos); \
+ s[ostr.str().length()] = 0; \
return s; \
}
@@ -232,7 +229,7 @@ class NcValues // ABC for value blocks
NcValues(NcType, long);
virtual ~NcValues( void );
virtual long num( void );
- virtual ostream& print(ostream&) const = 0;
+ virtual std::ostream& print(std::ostream&) const = 0;
virtual void* base( void ) const = 0;
virtual int bytes_for_one( void ) const = 0;
@@ -252,7 +249,7 @@ class NcValues // ABC for value blocks
protected:
NcType the_type;
long the_number;
- friend ostream& operator<< (ostream&, const NcValues&);
+ friend std::ostream& operator<< (std::ostream&, const NcValues&);
};
declare(NcValues,ncbyte)

30
math/netcdf/patches/patch-src_cxx_netcdfcpp_h
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-src_cxx_netcdfcpp_h,v 1.1 2004/02/01 12:22:06 sturm Exp $
--- src/cxx/netcdfcpp.h.orig 2004-02-01 11:41:02.000000000 +0100
+++ src/cxx/netcdfcpp.h 2004-02-01 11:41:35.000000000 +0100
@@ -154,7 +154,7 @@ class NcDim
virtual ~NcDim( void );
// to construct dimensions, since constructor is private
- friend NcFile;
+ friend class NcFile;
};
@@ -357,7 +357,7 @@ class NcVar : public NcTypedComponent
void init_cur( void );
// to make variables, since constructor is private
- friend NcFile;
+ friend class NcFile;
};
@@ -388,7 +388,7 @@ class NcAtt : public NcTypedComponent
NcAtt( NcFile*, NcToken); // global attribute
// To make attributes, since constructor is private
- friend NcFile;
+ friend class NcFile;
friend NcAtt* NcVar::get_att( NcToken ) const;
};

21
math/netcdf/patches/patch-src_rules_make
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_rules_make,v 1.1 2005/12/24 14:45:38 steven Exp $
--- src/rules.make.orig Sat Dec 24 10:21:12 2005
+++ src/rules.make Sat Dec 24 10:27:53 2005
@@ -73,6 +73,8 @@ shared_library:
$(MAKE) irix_shared_library;; \
Linux*) \
$(MAKE) linux_shared_library;; \
+ OpenBSD*) \
+ $(MAKE) openbsd_shared_library;; \
OSF1*) \
$(MAKE) osf1_shared_library;; \
'SunOS 4'*) \
@@ -95,6 +97,8 @@ irix_shared_library:
-all $(LIBRARY) -none -lc -lC $(LIBS)
linux_shared_library:
ld -o $(LIBRARY:.a=.so) -shared --whole-archive $(LIBRARY)
+openbsd_shared_library:
+ ld -X -o $(LIBRARY:.a=.so).$(LIBVER) -shared --whole-archive $(LIBRARY)
osf1_shared_library:
ld -o $(LIBRARY:.a=.so) -shared -all $(LIBRARY)
sunos4_shared_library:

3
math/netcdf/pkg/PFRAG.shared
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/24 14:45:38 steven Exp $
@comment $OpenBSD: PFRAG.shared,v 1.4 2007/11/29 13:43:09 okan Exp $
@lib lib/libnetcdf.so.${LIBnetcdf_VERSION}
@lib lib/libnetcdf_c++.so.${LIBnetcdf_c++_VERSION}
@lib lib/libnetcdff.so.${LIBnetcdff_VERSION}

29
math/netcdf/pkg/PLIST
View File

@ -1,17 +1,34 @@
@comment $OpenBSD: PLIST,v 1.4 2005/12/24 14:45:38 steven Exp $
@comment $OpenBSD: PLIST,v 1.5 2007/11/29 13:43:09 okan Exp $
%%SHARED%%
bin/ncdump
bin/ncgen
include/ncvalues.h
include/netcdf.h
include/netcdf.hh
@comment include/netcdf.inc
include/netcdf.inc
include/netcdfcpp.h
lib/libnetcdf.a
lib/libnetcdf.la
lib/libnetcdf_c++.a
lib/libnetcdf_c++.la
lib/libnetcdff.a
lib/libnetcdff.la
@man man/man1/ncdump.1
@man man/man1/ncgen.1
@man man/man3/netcdf.3
@man man/man3/netcdf.3f
%%SHARED%%
@comment man/man3f/
@comment @man man/man3f/netcdf.3f
@man man/man3/netcdf_f77.3
share/doc/netcdf/
share/doc/netcdf/netcdf-c.pdf
share/doc/netcdf/netcdf-c.txt
share/doc/netcdf/netcdf-cxx.pdf
share/doc/netcdf/netcdf-cxx.txt
share/doc/netcdf/netcdf-f77.pdf
share/doc/netcdf/netcdf-f77.txt
share/doc/netcdf/netcdf-f90.pdf
share/doc/netcdf/netcdf-f90.txt
share/doc/netcdf/netcdf-install.pdf
share/doc/netcdf/netcdf-install.txt
share/doc/netcdf/netcdf-tutorial.pdf
share/doc/netcdf/netcdf-tutorial.txt
share/doc/netcdf/netcdf.pdf
share/doc/netcdf/netcdf.txt