Index: head/science/cdo/Makefile
===================================================================
--- head/science/cdo/Makefile	(revision 383208)
+++ head/science/cdo/Makefile	(revision 383209)
@@ -1,81 +1,81 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
 # $FreeBSD$
 
 PORTNAME=	cdo
-PORTVERSION=	1.6.7
-PORTREVISION=	1
+PORTVERSION=	1.6.8
 CATEGORIES=	science
-MASTER_SITES=	https://code.zmaw.de/attachments/download/9444/ \
+MASTER_SITES=	https://code.zmaw.de/attachments/download/10030/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Climate Data Operators
 
 LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	CGRIBEX HDF5 JASPER NETCDF PROJ SZIP UDUNITS
 OPTIONS_DEFAULT=CGRIBEX HDF5 JASPER NETCDF PROJ SZIP UDUNITS
 OPTIONS_SUB=	yes
 
 CONFIGURE_ARGS=	--disable-cgribex \
 		--disable-data \
 		--disable-extra \
 		--disable-grib \
 		--disable-ieg \
 		--disable-service \
 		--enable-cdi-lib \
 		--program-transform-name="" \
 		--with-zlib=/usr
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 USES=		gmake libtool pathfix
 
 CGRIBEX_CONFIGURE_OFF=	--without-cgribex
 CGRIBEX_CONFIGURE_ON=	--with-cgribex=${LOCALBASE}
 CGRIBEX_LIB_DEPENDS=	libcgribex.so:${PORTSDIR}/science/cgribex
 HDF5_CONFIGURE_OFF=	--without-hdf5
 HDF5_CONFIGURE_ON=	--with-hdf5=${LOCALBASE}
 HDF5_LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
 JASPER_CONFIGURE_OFF=	--without-jasper
 JASPER_CONFIGURE_ON=	--with-jasper=${LOCALBASE}
 JASPER_LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper
 NETCDF_CONFIGURE_OFF=	--without-netcdf
 NETCDF_CONFIGURE_ON=	--with-netcdf=${LOCALBASE}
 NETCDF_LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
 PROJ_CONFIGURE_OFF=	--without-proj
 PROJ_CONFIGURE_ON=	--with-proj=${LOCALBASE}
 PROJ_LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj
 SZIP_CONFIGURE_OFF=	--without-szlib
 SZIP_CONFIGURE_ON=	--with-szlib=${LOCALBASE}
 SZIP_LIB_DEPENDS=	libsz.so:${PORTSDIR}/science/szip
 UDUNITS_CONFIGURE_OFF=	--without-udunits2
 UDUNITS_CONFIGURE_ON=	--with-udunits2=${LOCALBASE}
 UDUNITS_LIB_DEPENDS=	libudunits2.so:${PORTSDIR}/science/udunits
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHDF5} && !${PORT_OPTIONS:MSZIP}
 IGNORE=		HDF5 option requires SZIP option
 .endif
 
 .if ${PORT_OPTIONS:MNETCDF} && !${PORT_OPTIONS:MHDF5}
 IGNORE=		NETCDF option requires HDF5 option
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "sparc64"
 CFLAGS+=	-DPTHREAD_MUTEXATTR_CONDATTR
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/\($$$$pkgconfigfile\)|${PREFIX}/libdata/\1|' ${WRKSRC}/libcdi/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|unsigned32 |uint32_t |' ${WRKSRC}/libcdi/src/cdilib.c ${WRKSRC}/libcdi/src/util.c
 
 regression-test test: build
 .if ${PORT_OPTIONS:MNETCDF}
 	@cd ${WRKSRC}/ && ${SETENV} CDO_PATH=src/cdo src/cdotest
 .endif
 	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
Index: head/science/cdo/distinfo
===================================================================
--- head/science/cdo/distinfo	(revision 383208)
+++ head/science/cdo/distinfo	(revision 383209)
@@ -1,2 +1,2 @@
-SHA256 (cdo-1.6.7.tar.gz) = b7471dbe50d3726277ce30a92a429427158445e08bb90a8f9cb3aaa5b46f9e56
-SIZE (cdo-1.6.7.tar.gz) = 6285223
+SHA256 (cdo-1.6.8.tar.gz) = 323a87503014056300676d0400e3284720d81ed4434c44c6aaed1a37cba8a3d9
+SIZE (cdo-1.6.8.tar.gz) = 6345958
Index: head/science/cdo/files/patch-src-EOFs.c
===================================================================
--- head/science/cdo/files/patch-src-EOFs.c	(nonexistent)
+++ head/science/cdo/files/patch-src-EOFs.c	(revision 383209)
@@ -0,0 +1,20 @@
+--- src/EOFs.c.orig	2015-03-26 15:40:12.000000000 +0800
++++ src/EOFs.c	2015-04-04 04:31:05.863824152 +0800
+@@ -378,7 +378,7 @@
+ 	      npack = 0;
+ 	      for ( i = 0; i < gridsize; ++i )
+ 		{
+-		  if ( !DBL_IS_EQUAL(weight[i], 0) && !DBL_IS_EQUAL(weight[i], missval) &&
++		  if ( !DBL_IS_EQUAL(weight[i], (double)0) && !DBL_IS_EQUAL(weight[i], missval) &&
+ 		       !DBL_IS_EQUAL(in[i], missval) )
+ 		    pack[npack++] = i;
+ 		}
+@@ -393,7 +393,7 @@
+ 	  ipack = 0;
+ 	  for ( i = 0; i < gridsize; ++i )
+ 	    {
+-	      if ( !DBL_IS_EQUAL(weight[i], 0) && !DBL_IS_EQUAL(weight[i], missval) &&
++	      if ( !DBL_IS_EQUAL(weight[i], (double)0) && !DBL_IS_EQUAL(weight[i], missval) &&
+ 		   !DBL_IS_EQUAL(in[i], missval) && pack[ipack++] != i )
+ 		{
+ 		  cdoAbort("Missing values unsupported!");

Property changes on: head/science/cdo/files/patch-src-EOFs.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property