ports/120299: [MAINTAINER] science/cdo: update to 1.1.0

[Sunpoet Po-Chuan Hsieh]

On Sun, Feb 10, 2008 at 05:13:05PM +0000, thierry at FreeBSD.org wrote:
> Synopsis: [MAINTAINER] science/cdo: update to 1.1.0
> 
> State-Changed-From-To: open->feedback
> State-Changed-By: thierry
> State-Changed-When: Dim 10 f憝 2008 17:09:34 UTC
> State-Changed-Why: 
> 
> cdotest requires NetCDF support; when built with the default options, it
> fails with the message "Unsupported file type (library support not
> compiled in)".
> 
> BTW, would you consider using the target regression-test: ?
> 
> Regards,
> 
> 
> 
> Responsible-Changed-From-To: freebsd-ports-bugs->thierry
> Responsible-Changed-By: thierry
> Responsible-Changed-When: Dim 10 f憝 2008 17:09:34 UTC
> Responsible-Changed-Why: 
> 
> Take it.
> 
> 
> http://www.freebsd.org/cgi/query-pr.cgi?pr=120299

Thanks for your suggestion.
Now cdotest is executed and installed only if WITH_NETCDF is defined.
New patch is attached.

===> Generating patch
===> Viewing diff with less
diff -ruN --exclude=CVS /usr/ports/science/cdo/Makefile /usr/ports/sunpoet/cdo/Makefile
--- /usr/ports/science/cdo/Makefile	2007-10-26 12:41:14.000000000 +0800
+++ /usr/ports/sunpoet/cdo/Makefile	2008-02-14 15:02:47.000000000 +0800
@@ -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,10 @@
 		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=	HDF5	"HDF5 support"		off \
+		NETCDF	"NETCDF support"	off
 
 .include <bsd.port.pre.mk>
 
@@ -42,6 +42,13 @@
 .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 -ruN --exclude=CVS /usr/ports/science/cdo/distinfo /usr/ports/sunpoet/cdo/distinfo
--- /usr/ports/science/cdo/distinfo	2007-10-26 12:41:14.000000000 +0800
+++ /usr/ports/sunpoet/cdo/distinfo	2008-01-29 09:47:34.000000000 +0800
@@ -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 -ruN --exclude=CVS /usr/ports/science/cdo/files/extra-patch-src-Makefile.in /usr/ports/sunpoet/cdo/files/extra-patch-src-Makefile.in
--- /usr/ports/science/cdo/files/extra-patch-src-Makefile.in	1970-01-01 08:00:00.000000000 +0800
+++ /usr/ports/sunpoet/cdo/files/extra-patch-src-Makefile.in	2008-02-14 15:03:11.000000000 +0800
@@ -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
===> Done

-- 
                              Sunpoet Po-Chuan Hsieh <sunpoet at sunpoet.net>