diff options
Diffstat (limited to 'science')
| -rw-r--r-- | science/netcdf/Makefile | 16 | ||||
| -rw-r--r-- | science/netcdf/distinfo | 2 | ||||
| -rw-r--r-- | science/netcdf/pkg-plist | 5 | ||||
| -rw-r--r-- | science/netcdf4/Makefile | 16 | ||||
| -rw-r--r-- | science/netcdf4/distinfo | 2 | ||||
| -rw-r--r-- | science/netcdf4/pkg-plist | 5 |
6 files changed, 22 insertions, 24 deletions
diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile index 3d74fe7fbcb2..17e5215399c9 100644 --- a/science/netcdf/Makefile +++ b/science/netcdf/Makefile @@ -6,19 +6,19 @@ # PORTNAME= netcdf -PORTVERSION= 3.5b2 +PORTVERSION= 3.5b3 CATEGORIES= math MASTER_SITES= ftp://unidata.ucar.edu/pub/netcdf/ -DISTFILES= netcdf-3.5-beta2.tar.Z +DISTFILES= ${PORTNAME}-3.5-beta3.tar.Z MAINTAINER= ports@FreeBSD.org -WRKSRC= ${WRKDIR}/netcdf-3.5/src +WRKSRC= ${WRKDIR}/${PORTNAME}-3.5-beta3/src GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} -fPIC -DPIC -Df2cFortran" +CONFIGURE_ENV= CPPFLAGS="-fPIC -DPIC -Df2cFortran" MAN1= ncdump.1 ncgen.1 -MAN3= netcdf.3 netcdf.3f +MAN3= netcdf.3 post-build: @(cd ${WRKSRC}/libsrc && \ @@ -28,9 +28,9 @@ post-build: post-install: ${INSTALL_DATA} ${WRKSRC}/libsrc/libnetcdf.so ${PREFIX}/lib/libnetcdf.so.1 - ${LN} -sf ${PREFIX}/lib/libnetcdf.so.1 ${PREFIX}/lib/libnetcdf.so + ${LN} -sf libnetcdf.so.1 ${PREFIX}/lib/libnetcdf.so ${INSTALL_DATA} ${WRKSRC}/cxx/libnetcdf_c++.so ${PREFIX}/lib/libnetcdf_c++.so.1 - ${LN} -sf ${PREFIX}/lib/libnetcdf_c++.so.1 ${PREFIX}/lib/libnetcdf_c++.so - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + ${LN} -sf libnetcdf_c++.so.1 ${PREFIX}/lib/libnetcdf_c++.so + ${LDCONFIG} -m ${PREFIX}/lib .include <bsd.port.mk> diff --git a/science/netcdf/distinfo b/science/netcdf/distinfo index 31e774d392c4..f05694772387 100644 --- a/science/netcdf/distinfo +++ b/science/netcdf/distinfo @@ -1 +1 @@ -MD5 (netcdf-3.5-beta2.tar.Z) = 4a14728e5eecf6479095c9d625507f4a +MD5 (netcdf-3.5-beta3.tar.Z) = b6b0f1d6fd6c5ccf559032eb1e9d6950 diff --git a/science/netcdf/pkg-plist b/science/netcdf/pkg-plist index 1d84bd6662c3..699a8184c49b 100644 --- a/science/netcdf/pkg-plist +++ b/science/netcdf/pkg-plist @@ -3,7 +3,6 @@ bin/ncgen include/ncvalues.h include/netcdf.h include/netcdf.hh -include/netcdf.inc include/netcdfcpp.h lib/libnetcdf.a lib/libnetcdf.so @@ -11,5 +10,5 @@ lib/libnetcdf.so.1 lib/libnetcdf_c++.a lib/libnetcdf_c++.so lib/libnetcdf_c++.so.1 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R +@exec /sbin/ldconfig -m %B +@unexec /sbin/ldconfig -R diff --git a/science/netcdf4/Makefile b/science/netcdf4/Makefile index 3d74fe7fbcb2..17e5215399c9 100644 --- a/science/netcdf4/Makefile +++ b/science/netcdf4/Makefile @@ -6,19 +6,19 @@ # PORTNAME= netcdf -PORTVERSION= 3.5b2 +PORTVERSION= 3.5b3 CATEGORIES= math MASTER_SITES= ftp://unidata.ucar.edu/pub/netcdf/ -DISTFILES= netcdf-3.5-beta2.tar.Z +DISTFILES= ${PORTNAME}-3.5-beta3.tar.Z MAINTAINER= ports@FreeBSD.org -WRKSRC= ${WRKDIR}/netcdf-3.5/src +WRKSRC= ${WRKDIR}/${PORTNAME}-3.5-beta3/src GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} -fPIC -DPIC -Df2cFortran" +CONFIGURE_ENV= CPPFLAGS="-fPIC -DPIC -Df2cFortran" MAN1= ncdump.1 ncgen.1 -MAN3= netcdf.3 netcdf.3f +MAN3= netcdf.3 post-build: @(cd ${WRKSRC}/libsrc && \ @@ -28,9 +28,9 @@ post-build: post-install: ${INSTALL_DATA} ${WRKSRC}/libsrc/libnetcdf.so ${PREFIX}/lib/libnetcdf.so.1 - ${LN} -sf ${PREFIX}/lib/libnetcdf.so.1 ${PREFIX}/lib/libnetcdf.so + ${LN} -sf libnetcdf.so.1 ${PREFIX}/lib/libnetcdf.so ${INSTALL_DATA} ${WRKSRC}/cxx/libnetcdf_c++.so ${PREFIX}/lib/libnetcdf_c++.so.1 - ${LN} -sf ${PREFIX}/lib/libnetcdf_c++.so.1 ${PREFIX}/lib/libnetcdf_c++.so - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + ${LN} -sf libnetcdf_c++.so.1 ${PREFIX}/lib/libnetcdf_c++.so + ${LDCONFIG} -m ${PREFIX}/lib .include <bsd.port.mk> diff --git a/science/netcdf4/distinfo b/science/netcdf4/distinfo index 31e774d392c4..f05694772387 100644 --- a/science/netcdf4/distinfo +++ b/science/netcdf4/distinfo @@ -1 +1 @@ -MD5 (netcdf-3.5-beta2.tar.Z) = 4a14728e5eecf6479095c9d625507f4a +MD5 (netcdf-3.5-beta3.tar.Z) = b6b0f1d6fd6c5ccf559032eb1e9d6950 diff --git a/science/netcdf4/pkg-plist b/science/netcdf4/pkg-plist index 1d84bd6662c3..699a8184c49b 100644 --- a/science/netcdf4/pkg-plist +++ b/science/netcdf4/pkg-plist @@ -3,7 +3,6 @@ bin/ncgen include/ncvalues.h include/netcdf.h include/netcdf.hh -include/netcdf.inc include/netcdfcpp.h lib/libnetcdf.a lib/libnetcdf.so @@ -11,5 +10,5 @@ lib/libnetcdf.so.1 lib/libnetcdf_c++.a lib/libnetcdf_c++.so lib/libnetcdf_c++.so.1 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R +@exec /sbin/ldconfig -m %B +@unexec /sbin/ldconfig -R |