From 59481eb94783413dc4cc4c88abef7f4c6fa33208 Mon Sep 17 00:00:00 2001
From: miwi <miwi@FreeBSD.org>
Date: Mon, 8 Feb 2010 22:03:10 +0000
Subject: - Update to 1.4.1

PR:		143516
Submitted by:	Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> (maintainer)
---
 science/cdo/Makefile | 32 +++++++++++++++++++++-----------
 science/cdo/distinfo |  6 +++---
 2 files changed, 24 insertions(+), 14 deletions(-)

(limited to 'science')

diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index 1685e218bc4b..f9d7f3a26783 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=		cdo
-PORTVERSION=		1.3.1
-PORTREVISION=		2
+PORTVERSION=		1.4.1
 CATEGORIES=		science
 MASTER_SITES=		http://www.mpimet.mpg.de/fileadmin/software/cdo/ \
 			http://sunpoet.net/distfiles/
@@ -29,6 +28,7 @@ NETCDF_VER?=		4
 HDF5_VER?=		18
 
 OPTIONS=		HDF5	"HDF5 support"		on \
+			JASPER	"Japser support"	on \
 			NETCDF	"NetCDF support"	on \
 			PROJ	"PROJ support"		on
 
@@ -42,17 +42,9 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -DPTHREAD_MUTEXATTR_CONDATTR"
 IGNORE=netCDF 4 requires HDF5 1.8.
 .endif
 
-.if defined(WITH_NETCDF)
-CONFIGURE_ARGS+=	--with-netcdf=${LOCALBASE}
-EXTRA_PATCHES+=		${FILESDIR}/extra-patch-src-Makefile.in
-.if (${NETCDF_VER} == 4)
+.if defined(WITH_NETCDF) && (${NETCDF_VER} == 4)
 HDF5_VER=		18
 WITH_HDF5=		yes
-LIB_DEPENDS+=		netcdf.6:${PORTSDIR}/science/netcdf4
-.else
-LIB_DEPENDS+=		netcdf.4:${PORTSDIR}/science/netcdf
-.endif
-PLIST_FILES+=		bin/cdotest
 .endif
 
 .if defined(WITH_HDF5)
@@ -64,6 +56,24 @@ 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
+.endif
+
+.if defined(WITH_NETCDF)
+CONFIGURE_ARGS+=	--with-netcdf=${LOCALBASE}
+EXTRA_PATCHES+=		${FILESDIR}/extra-patch-src-Makefile.in
+.if (${NETCDF_VER} == 4)
+LIB_DEPENDS+=		netcdf.6:${PORTSDIR}/science/netcdf4
+.else
+LIB_DEPENDS+=		netcdf.4:${PORTSDIR}/science/netcdf
+.endif
+PLIST_FILES+=		bin/cdotest
+.endif
+
 .if defined(WITH_PROJ)
 CONFIGURE_ARGS+=	--with-proj=${LOCALBASE}
 LIB_DEPENDS+=		proj.6:${PORTSDIR}/graphics/proj
diff --git a/science/cdo/distinfo b/science/cdo/distinfo
index 5ff437193113..56db14c1824c 100644
--- a/science/cdo/distinfo
+++ b/science/cdo/distinfo
@@ -1,3 +1,3 @@
-MD5 (cdo-1.3.1.tar.gz) = 98f81bf86e47573bc0d2ba700fc7400a
-SHA256 (cdo-1.3.1.tar.gz) = 18d481e56d7cafe78c1951834056329e3d9d97ceb4940833ba5a0f0eecae3775
-SIZE (cdo-1.3.1.tar.gz) = 2613036
+MD5 (cdo-1.4.1.tar.gz) = 774b8de3d537a1049e446ffdb50d55f1
+SHA256 (cdo-1.4.1.tar.gz) = 139de46904890a990879762d14cfdbea4108eb1dfbb859fc745b3eb236747a0c
+SIZE (cdo-1.4.1.tar.gz) = 2652758
-- 
cgit