diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2015-04-04 12:52:11 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2015-04-04 12:52:11 +0000 |
| commit | 18b158ac5770e44157bfae35243eb1399f12a1b4 (patch) | |
| tree | 76e6468451bba59ae1bde3346eab7b02b9ac16c9 /science | |
| parent | Convert to new USE_GITHUB (diff) | |
- Update to 1.6.8
Changes: https://code.zmaw.de/news/303
Notes
Notes:
svn path=/head/; revision=383209
Diffstat (limited to 'science')
| -rw-r--r-- | science/cdo/Makefile | 6 | ||||
| -rw-r--r-- | science/cdo/distinfo | 4 | ||||
| -rw-r--r-- | science/cdo/files/patch-src-EOFs.c | 20 |
3 files changed, 25 insertions, 5 deletions
diff --git a/science/cdo/Makefile b/science/cdo/Makefile index 83fe7251c1c1..81b7b51fc76d 100644 --- a/science/cdo/Makefile +++ b/science/cdo/Makefile @@ -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} diff --git a/science/cdo/distinfo b/science/cdo/distinfo index 9ad51a542789..9b8983e84bc1 100644 --- a/science/cdo/distinfo +++ b/science/cdo/distinfo @@ -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 diff --git a/science/cdo/files/patch-src-EOFs.c b/science/cdo/files/patch-src-EOFs.c new file mode 100644 index 000000000000..a3ae252d2833 --- /dev/null +++ b/science/cdo/files/patch-src-EOFs.c @@ -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!"); |