Date: Sat, 4 Apr 2015 12:52:11 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383209 - in head/science/cdo: . files Message-ID: <201504041252.t34CqCC6034774@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sat Apr 4 12:52:11 2015 New Revision: 383209 URL: https://svnweb.freebsd.org/changeset/ports/383209 Log: - Update to 1.6.8 Changes: https://code.zmaw.de/news/303 Added: head/science/cdo/files/patch-src-EOFs.c (contents, props changed) Modified: head/science/cdo/Makefile head/science/cdo/distinfo Modified: head/science/cdo/Makefile ============================================================================== --- head/science/cdo/Makefile Sat Apr 4 12:42:27 2015 (r383208) +++ head/science/cdo/Makefile Sat Apr 4 12:52:11 2015 (r383209) @@ -2,10 +2,9 @@ # $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 @@ -71,6 +70,7 @@ CFLAGS+= -DPTHREAD_MUTEXATTR_CONDATTR 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} Modified: head/science/cdo/distinfo ============================================================================== --- head/science/cdo/distinfo Sat Apr 4 12:42:27 2015 (r383208) +++ head/science/cdo/distinfo Sat Apr 4 12:52:11 2015 (r383209) @@ -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 Added: head/science/cdo/files/patch-src-EOFs.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/cdo/files/patch-src-EOFs.c Sat Apr 4 12:52:11 2015 (r383209) @@ -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!");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504041252.t34CqCC6034774>