diff options
| author | krion <krion@FreeBSD.org> | 2004-02-06 22:16:24 +0800 |
|---|---|---|
| committer | krion <krion@FreeBSD.org> | 2004-02-06 22:16:24 +0800 |
| commit | ae42be8e85f1e229795d180db8008302aea7a722 (patch) | |
| tree | 1129e0dec77060bca48e23342682a2f09ea64e99 | |
| parent | b54a9ec460af706d2f5910849986316673c2f57e (diff) | |
| download | freebsd-ports-gnome-ae42be8e85f1e229795d180db8008302aea7a722.tar.gz freebsd-ports-gnome-ae42be8e85f1e229795d180db8008302aea7a722.tar.zst freebsd-ports-gnome-ae42be8e85f1e229795d180db8008302aea7a722.zip | |
- Fix build on -current
PR: ports/62431
Submitted by: Ports Fury
| -rw-r--r-- | math/netcdf/Makefile | 8 | ||||
| -rw-r--r-- | math/netcdf/files/patch-ncvalues.h | 20 | ||||
| -rw-r--r-- | science/netcdf/Makefile | 8 | ||||
| -rw-r--r-- | science/netcdf/files/patch-ncvalues.h | 20 | ||||
| -rw-r--r-- | science/netcdf4/Makefile | 8 | ||||
| -rw-r--r-- | science/netcdf4/files/patch-ncvalues.h | 20 |
6 files changed, 63 insertions, 21 deletions
diff --git a/math/netcdf/Makefile b/math/netcdf/Makefile index 1270af16e61c..13a6bf93e48d 100644 --- a/math/netcdf/Makefile +++ b/math/netcdf/Makefile @@ -24,12 +24,6 @@ INSTALLS_SHLIB= yes MAN1= ncdump.1 ncgen.1 MAN3= netcdf.3 netcdf.3f -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 502000 -BROKEN= "Does not compile" -.endif - post-build: @(cd ${WRKSRC}/libsrc && \ ${SETENV} ${MAKE_ENV} ${MAKE} linux_shared_library) @@ -42,4 +36,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/cxx/libnetcdf_c++.so ${PREFIX}/lib/libnetcdf_c++.so.1 ${LN} -sf libnetcdf_c++.so.1 ${PREFIX}/lib/libnetcdf_c++.so -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/math/netcdf/files/patch-ncvalues.h b/math/netcdf/files/patch-ncvalues.h new file mode 100644 index 000000000000..1988e2b8746d --- /dev/null +++ b/math/netcdf/files/patch-ncvalues.h @@ -0,0 +1,20 @@ +--- cxx/ncvalues.h.orig Thu Oct 29 02:10:16 1998 ++++ cxx/ncvalues.h Thu Feb 5 20:51:02 2004 +@@ -14,7 +14,7 @@ + #ifdef STRSTREAM_H_SPEC + # include STRSTREAM_H_SPEC + #else +-# include <strstream.h> ++# include <strstream> + #endif + #include <limits.h> + #include <string.h> +@@ -220,7 +220,7 @@ + char* NcVal(TYPE)::as_string( long n ) const \ + { \ + char* s = new char[32]; \ +- ostrstream ostr(s, sizeof(s)); \ ++ std::ostrstream ostr(s, sizeof(s)); \ + ostr << the_values[n] << ends; \ + return s; \ + } diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile index 1270af16e61c..13a6bf93e48d 100644 --- a/science/netcdf/Makefile +++ b/science/netcdf/Makefile @@ -24,12 +24,6 @@ INSTALLS_SHLIB= yes MAN1= ncdump.1 ncgen.1 MAN3= netcdf.3 netcdf.3f -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 502000 -BROKEN= "Does not compile" -.endif - post-build: @(cd ${WRKSRC}/libsrc && \ ${SETENV} ${MAKE_ENV} ${MAKE} linux_shared_library) @@ -42,4 +36,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/cxx/libnetcdf_c++.so ${PREFIX}/lib/libnetcdf_c++.so.1 ${LN} -sf libnetcdf_c++.so.1 ${PREFIX}/lib/libnetcdf_c++.so -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/science/netcdf/files/patch-ncvalues.h b/science/netcdf/files/patch-ncvalues.h new file mode 100644 index 000000000000..1988e2b8746d --- /dev/null +++ b/science/netcdf/files/patch-ncvalues.h @@ -0,0 +1,20 @@ +--- cxx/ncvalues.h.orig Thu Oct 29 02:10:16 1998 ++++ cxx/ncvalues.h Thu Feb 5 20:51:02 2004 +@@ -14,7 +14,7 @@ + #ifdef STRSTREAM_H_SPEC + # include STRSTREAM_H_SPEC + #else +-# include <strstream.h> ++# include <strstream> + #endif + #include <limits.h> + #include <string.h> +@@ -220,7 +220,7 @@ + char* NcVal(TYPE)::as_string( long n ) const \ + { \ + char* s = new char[32]; \ +- ostrstream ostr(s, sizeof(s)); \ ++ std::ostrstream ostr(s, sizeof(s)); \ + ostr << the_values[n] << ends; \ + return s; \ + } diff --git a/science/netcdf4/Makefile b/science/netcdf4/Makefile index 1270af16e61c..13a6bf93e48d 100644 --- a/science/netcdf4/Makefile +++ b/science/netcdf4/Makefile @@ -24,12 +24,6 @@ INSTALLS_SHLIB= yes MAN1= ncdump.1 ncgen.1 MAN3= netcdf.3 netcdf.3f -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 502000 -BROKEN= "Does not compile" -.endif - post-build: @(cd ${WRKSRC}/libsrc && \ ${SETENV} ${MAKE_ENV} ${MAKE} linux_shared_library) @@ -42,4 +36,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/cxx/libnetcdf_c++.so ${PREFIX}/lib/libnetcdf_c++.so.1 ${LN} -sf libnetcdf_c++.so.1 ${PREFIX}/lib/libnetcdf_c++.so -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/science/netcdf4/files/patch-ncvalues.h b/science/netcdf4/files/patch-ncvalues.h new file mode 100644 index 000000000000..1988e2b8746d --- /dev/null +++ b/science/netcdf4/files/patch-ncvalues.h @@ -0,0 +1,20 @@ +--- cxx/ncvalues.h.orig Thu Oct 29 02:10:16 1998 ++++ cxx/ncvalues.h Thu Feb 5 20:51:02 2004 +@@ -14,7 +14,7 @@ + #ifdef STRSTREAM_H_SPEC + # include STRSTREAM_H_SPEC + #else +-# include <strstream.h> ++# include <strstream> + #endif + #include <limits.h> + #include <string.h> +@@ -220,7 +220,7 @@ + char* NcVal(TYPE)::as_string( long n ) const \ + { \ + char* s = new char[32]; \ +- ostrstream ostr(s, sizeof(s)); \ ++ std::ostrstream ostr(s, sizeof(s)); \ + ostr << the_values[n] << ends; \ + return s; \ + } |