aboutsummaryrefslogtreecommitdiff
path: root/science
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2011-04-12 15:17:01 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2011-04-12 15:17:01 +0000
commit042f7a485d088016f44e3cf2bb579894f9e16b11 (patch)
treeb690e2316782d82f10ab4db563c537c4dde663d5 /science
parentfb91e15fb36a876e883ca4081e197a11702bff9d (diff)
downloadports-042f7a485d088016f44e3cf2bb579894f9e16b11.tar.gz
ports-042f7a485d088016f44e3cf2bb579894f9e16b11.zip
- Update to 1.5.0
- Update netcdf4 dependency - CPPFLAGS is now added to CONFIGURE_ENV by Mk/bsd.port.Mk - Remove OSVERSION check - Space/Tab twiddle Changes: https://code.zmaw.de/news/50
Notes
Notes: svn path=/head/; revision=272621
Diffstat (limited to 'science')
-rw-r--r--science/cdo/Makefile78
-rw-r--r--science/cdo/distinfo4
2 files changed, 39 insertions, 43 deletions
diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index 41da02de221b..12672f6d2fb5 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
# New ports collection makefile for: CDO
# Date created: 29 May 2006
# Whom: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
@@ -6,32 +5,31 @@
# $FreeBSD$
#
-PORTNAME= cdo
-PORTVERSION= 1.4.7
-CATEGORIES= science
-MASTER_SITES= https://code.zmaw.de/attachments/download/704/ \
- LOCAL/sunpoet
+PORTNAME= cdo
+PORTVERSION= 1.5.0
+CATEGORIES= science
+MASTER_SITES= https://code.zmaw.de/attachments/download/898/ \
+ LOCAL/sunpoet
-MAINTAINER= sunpoet@FreeBSD.org
-COMMENT= Climate Data Operators
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= Climate Data Operators
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --program-transform-name=""
-CONFIGURE_ENV= CC="${CC}" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ARGS= --program-transform-name=""
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-PLIST_FILES= bin/cdo
+PLIST_FILES= bin/cdo
-NETCDF_VER?= 4
-HDF5_VER?= 18
+NETCDF_VER?= 4
+HDF5_VER?= 18
-OPTIONS= HDF5 "HDF5 support" on \
- JASPER "Japser support" off \
- NETCDF "NetCDF support" on \
- PROJ "PROJ support" on \
- SZIP "SZIP support" on
+OPTIONS= HDF5 "HDF5 support" on \
+ JASPER "Japser support" off \
+ NETCDF "NetCDF support" on \
+ PROJ "PROJ support" on \
+ SZIP "SZIP support" on
.include <bsd.port.pre.mk>
@@ -40,49 +38,47 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS} -DPTHREAD_MUTEXATTR_CONDATTR"
.endif
.if (!defined(WITHOUT_NETCDF) && !defined(WITHOUT_HDF5) && (${NETCDF_VER} == 4) && (${HDF5_VER} == 16))
-IGNORE=netCDF 4 requires HDF5 1.8.
+IGNORE= netCDF 4 requires HDF5 1.8
.endif
.if !defined(WITHOUT_NETCDF) && (${NETCDF_VER} == 4)
-HDF5_VER= 18
-WITH_HDF5= yes
+HDF5_VER= 18
+WITH_HDF5= yes
.endif
.if !defined(WITHOUT_HDF5)
-CONFIGURE_ARGS+= --with-hdf5=${LOCALBASE} --with-zlib=/usr
-WITH_SZIP= yes
+CONFIGURE_ARGS+=--with-hdf5=${LOCALBASE} --with-zlib=/usr
+WITH_SZIP= yes
.if (${HDF5_VER} == 18)
-LIB_DEPENDS+= hdf5.6:${PORTSDIR}/science/hdf5-18
+LIB_DEPENDS+= hdf5.6:${PORTSDIR}/science/hdf5-18
.else
-LIB_DEPENDS+= hdf5.0:${PORTSDIR}/science/hdf5
+LIB_DEPENDS+= hdf5.0:${PORTSDIR}/science/hdf5
.endif
.endif
.if defined(WITH_JASPER)
-CONFIGURE_ARGS+= --with-jasper=${LOCALBASE}
-LIB_DEPENDS+= jasper:${PORTSDIR}/graphics/jasper
-PLIST_SUB+= JPEG2000=""
-.else
+CONFIGURE_ARGS+=--with-jasper=${LOCALBASE}
+LIB_DEPENDS+= jasper:${PORTSDIR}/graphics/jasper
.endif
.if !defined(WITHOUT_NETCDF)
-CONFIGURE_ARGS+= --with-netcdf=${LOCALBASE}
+CONFIGURE_ARGS+=--with-netcdf=${LOCALBASE}
.if (${NETCDF_VER} == 4)
-LIB_DEPENDS+= netcdf.6:${PORTSDIR}/science/netcdf4
+LIB_DEPENDS+= netcdf.7:${PORTSDIR}/science/netcdf4
.else
-LIB_DEPENDS+= netcdf.4:${PORTSDIR}/science/netcdf
+LIB_DEPENDS+= netcdf.4:${PORTSDIR}/science/netcdf
.endif
-PLIST_FILES+= bin/cdotest
+PLIST_FILES+= bin/cdotest
.endif
.if !defined(WITHOUT_PROJ)
-CONFIGURE_ARGS+= --with-proj=${LOCALBASE}
-LIB_DEPENDS+= proj.6:${PORTSDIR}/graphics/proj
+CONFIGURE_ARGS+=--with-proj=${LOCALBASE}
+LIB_DEPENDS+= proj.6:${PORTSDIR}/graphics/proj
.endif
.if !defined(WITHOUT_SZIP)
-CONFIGURE_ARGS+= --with-szlib=${LOCALBASE}
-LIB_DEPENDS+= sz.2:${PORTSDIR}/science/szip
+CONFIGURE_ARGS+=--with-szlib=${LOCALBASE}
+LIB_DEPENDS+= sz.2:${PORTSDIR}/science/szip
.endif
post-patch:
@@ -94,7 +90,7 @@ post-patch:
.endif
post-build:
-.if !defined(WITHOUT_NETCDF) && (${OSVERSION} >= 700000)
+.if !defined(WITHOUT_NETCDF)
@cd "${WRKSRC}/src" && ${SETENV} CDO_PATH="${WRKSRC}/src/cdo" "${WRKSRC}/src/cdotest"
.endif
diff --git a/science/cdo/distinfo b/science/cdo/distinfo
index 9c8e4869c9a1..5199479fb6c0 100644
--- a/science/cdo/distinfo
+++ b/science/cdo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cdo-1.4.7.tar.gz) = 731311518112c48be95e9ad79bf6d4b7c441835abf68115040fd47ca5a66fee4
-SIZE (cdo-1.4.7.tar.gz) = 5156585
+SHA256 (cdo-1.5.0.tar.gz) = efcb78a5f9f171a86715fee28da99882c2547bbef4cfc4bffa11b257708ad4be
+SIZE (cdo-1.5.0.tar.gz) = 5211816