Index: head/science/cdo/Makefile
===================================================================
--- head/science/cdo/Makefile	(revision 262516)
+++ head/science/cdo/Makefile	(revision 262517)
@@ -1,100 +1,100 @@
 # ex:ts=8
 # New ports collection makefile for:	CDO
 # Date created:			29 May 2006
 # Whom:				Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=		cdo
-PORTVERSION=		1.4.5.1
+PORTVERSION=		1.4.6
 CATEGORIES=		science
-MASTER_SITES=		https://code.zmaw.de/attachments/download/307/ \
+MASTER_SITES=		https://code.zmaw.de/attachments/download/466/ \
 			LOCAL/sunpoet
 
 MAINTAINER=		sunpoet@FreeBSD.org
 COMMENT=		Climate Data Operators
 
 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}"
 
 PLIST_FILES=		bin/cdo
 
 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
 
 .include <bsd.port.pre.mk>
 
 .if (${OSVERSION} > 700000) || (${ARCH} != "sparc64")
 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.
 .endif
 
 .if !defined(WITHOUT_NETCDF) && (${NETCDF_VER} == 4)
 HDF5_VER=		18
 WITH_HDF5=		yes
 .endif
 
 .if !defined(WITHOUT_HDF5)
 CONFIGURE_ARGS+=	--with-hdf5=${LOCALBASE} --with-zlib=/usr
 WITH_SZIP=		yes
 .if (${HDF5_VER} == 18)
 LIB_DEPENDS+=		hdf5.6:${PORTSDIR}/science/hdf5-18
 .else
 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(WITHOUT_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(WITHOUT_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
 .endif
 
 post-build:
 .if !defined(WITHOUT_NETCDF)
 	@cd "${WRKSRC}/src" && ${SETENV} CDO_PATH="${WRKSRC}/src/cdo" "${WRKSRC}/src/cdotest"
 .endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 regression-test:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
 
 .include <bsd.port.post.mk>

Property changes on: head/science/cdo/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.27
\ No newline at end of property
+1.28
\ No newline at end of property
Index: head/science/cdo/distinfo
===================================================================
--- head/science/cdo/distinfo	(revision 262516)
+++ head/science/cdo/distinfo	(revision 262517)
@@ -1,3 +1,3 @@
-MD5 (cdo-1.4.5.1.tar.gz) = fe86f85725ba596a46e8b7fe16b74816
-SHA256 (cdo-1.4.5.1.tar.gz) = 81c40b281384ab00105cc3a446d70f3dab184105a8199665b5d21f5bec23a28d
-SIZE (cdo-1.4.5.1.tar.gz) = 2766602
+MD5 (cdo-1.4.6.tar.gz) = 05ddb0481b39c30aa7f25a15405e7f9d
+SHA256 (cdo-1.4.6.tar.gz) = 766ff70f96eb271f10c13821a7decf4e2c378cb956193b618483f2ff93077f75
+SIZE (cdo-1.4.6.tar.gz) = 4541953

Property changes on: head/science/cdo/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.17
\ No newline at end of property
+1.18
\ No newline at end of property
Index: head/science/cdo/files/extra-patch-src-Makefile.in
===================================================================
--- head/science/cdo/files/extra-patch-src-Makefile.in	(revision 262516)
+++ head/science/cdo/files/extra-patch-src-Makefile.in	(revision 262517)
@@ -1,13 +1,14 @@
---- src/Makefile.in.orig	2010-02-19 18:34:19.000000000 +0800
-+++ src/Makefile.in	2010-03-08 16:21:37.000000000 +0800
-@@ -32,8 +32,8 @@
+--- src/Makefile.in.orig	2010-10-03 01:21:26.000000000 +0800
++++ src/Makefile.in	2010-10-03 01:23:05.000000000 +0800
+@@ -34,9 +34,9 @@
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
--bin_PROGRAMS = cdo$(EXEEXT)
+-bin_PROGRAMS = cdo$(EXEEXT) $(am__EXEEXT_1)
++bin_PROGRAMS = cdo$(EXEEXT) cdotest$(EXEEXT) $(am__EXEEXT_1)
+ @ENABLE_ALL_STATIC_TRUE@am__append_1 = cdo_static
 -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

Property changes on: head/science/cdo/files/extra-patch-src-Makefile.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property