aboutsummaryrefslogtreecommitdiff
path: root/science
diff options
context:
space:
mode:
authorThierry Thomas <thierry@FreeBSD.org>2008-02-17 20:35:17 +0000
committerThierry Thomas <thierry@FreeBSD.org>2008-02-17 20:35:17 +0000
commite3301dcda29c98536690fdf6cdd74af25afc4e57 (patch)
treebf93a74e7ecd7f9ded07aacabca765b88c3166e9 /science
parent4c752974adeb4e6895da57abea2568fb5d8894b2 (diff)
downloadports-e3301dcda29c98536690fdf6cdd74af25afc4e57.tar.gz
ports-e3301dcda29c98536690fdf6cdd74af25afc4e57.zip
Notes
Diffstat (limited to 'science')
-rw-r--r--science/cdo/Makefile19
-rw-r--r--science/cdo/distinfo6
-rw-r--r--science/cdo/files/extra-patch-src-Makefile.in13
3 files changed, 26 insertions, 12 deletions
diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index 4e9281e010c6..158f74e67e03 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= cdo
-PORTVERSION= 1.0.9
+PORTVERSION= 1.1.0
CATEGORIES= science
MASTER_SITES= http://www.mpimet.mpg.de/fileadmin/software/cdo/ \
http://sunpoet.net/distfiles/
@@ -23,10 +23,9 @@ CONFIGURE_ENV= CC="${CC}" \
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-PLIST_FILES= bin/cdo bin/cdotest
+PLIST_FILES= bin/cdo
-OPTIONS= HDF5 "HDF5 support" off \
- NETCDF "NETCDF support" off
+OPTIONS= NETCDF "NETCDF support" off
.include <bsd.port.pre.mk>
@@ -34,14 +33,16 @@ OPTIONS= HDF5 "HDF5 support" off \
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -DPTHREAD_MUTEXATTR_CONDATTR"
.endif
-.if defined(WITH_HDF5)
-CONFIGURE_ARGS+= --with-hdf5=${LOCALBASE}
-LIB_DEPENDS+= hdf5.0:${PORTSDIR}/science/hdf5
-.endif
-
.if defined(WITH_NETCDF)
CONFIGURE_ARGS+= --with-netcdf=${LOCALBASE}
LIB_DEPENDS+= netcdf.4:${PORTSDIR}/science/netcdf
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-Makefile.in
+PLIST_FILES+= bin/cdotest
+.endif
+
+post-build:
+.if defined(WITH_NETCDF)
+ cd "${WRKSRC}/src" && ${SETENV} CDO_PATH="${WRKSRC}/src/cdo" "${WRKSRC}/src/cdotest"
.endif
post-install:
diff --git a/science/cdo/distinfo b/science/cdo/distinfo
index c9b8dbdd25a3..966703d5d882 100644
--- a/science/cdo/distinfo
+++ b/science/cdo/distinfo
@@ -1,3 +1,3 @@
-MD5 (cdo-1.0.9.tar.gz) = daec09bb72336a6838f624d56bc57beb
-SHA256 (cdo-1.0.9.tar.gz) = 2d9df55c50caa7e7a8d8245c772b2242b79c4e770c272f78dcf9ba95b380946f
-SIZE (cdo-1.0.9.tar.gz) = 2383922
+MD5 (cdo-1.1.0.tar.gz) = 1b50c3e3dfa75bbf6f293e16facbcf67
+SHA256 (cdo-1.1.0.tar.gz) = 7ee16595ac1b9827787490aa6b70a903bf4f870be5ce767c3fe2062519088a88
+SIZE (cdo-1.1.0.tar.gz) = 2406322
diff --git a/science/cdo/files/extra-patch-src-Makefile.in b/science/cdo/files/extra-patch-src-Makefile.in
new file mode 100644
index 000000000000..f6e54dc31bad
--- /dev/null
+++ b/science/cdo/files/extra-patch-src-Makefile.in
@@ -0,0 +1,13 @@
+--- src/Makefile.in.orig 2008-01-04 20:42:09.000000000 +0800
++++ src/Makefile.in 2008-01-31 20:06:47.000000000 +0800
+@@ -37,8 +37,8 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-bin_PROGRAMS = cdo$(EXEEXT)
+-noinst_PROGRAMS = cdotest$(EXEEXT)
++bin_PROGRAMS = cdo$(EXEEXT) cdotest$(EXEEXT)
++noinst_PROGRAMS =
+ subdir = src
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/config.h.in