From e2d5df716a3e429ba0b9752e0548657e773549ba Mon Sep 17 00:00:00 2001 From: Po-Chuan Hsieh Date: Mon, 4 Sep 2023 17:04:32 +0800 Subject: [PATCH] science/cdo: Update to 2.2.0 Changes: https://code.mpimet.mpg.de/projects/cdo/news --- science/cdo/Makefile | 5 ++--- science/cdo/distinfo | 6 +++--- science/cdo/files/patch-libcdi_src_cgribexlib.c | 11 ----------- science/cdo/pkg-plist | 4 ++-- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/science/cdo/Makefile b/science/cdo/Makefile index 7722340bb22a8..c6360fab1c7ce 100644 --- a/science/cdo/Makefile +++ b/science/cdo/Makefile @@ -1,8 +1,7 @@ PORTNAME= cdo -PORTVERSION= 2.2.0 -PORTREVISION= 2 +PORTVERSION= 2.2.2 CATEGORIES= science -MASTER_SITES= https://code.mpimet.mpg.de/attachments/download/28013/ \ +MASTER_SITES= https://code.mpimet.mpg.de/attachments/download/28882/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org diff --git a/science/cdo/distinfo b/science/cdo/distinfo index d7042ca36b0d0..598e925814cd0 100644 --- a/science/cdo/distinfo +++ b/science/cdo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682616632 -SHA256 (cdo-2.2.0.tar.gz) = 679c8d105706caffcba0960ec5ddc4a1332c1b40c52f82c3937356999d8fadf2 -SIZE (cdo-2.2.0.tar.gz) = 13305096 +TIMESTAMP = 1693333933 +SHA256 (cdo-2.2.2.tar.gz) = 419c77315244019af41a296c05066f474cccbf94debfaae9e2106da51bc7c937 +SIZE (cdo-2.2.2.tar.gz) = 13482347 diff --git a/science/cdo/files/patch-libcdi_src_cgribexlib.c b/science/cdo/files/patch-libcdi_src_cgribexlib.c index f61f6ab953306..1792d73ad1d1f 100644 --- a/science/cdo/files/patch-libcdi_src_cgribexlib.c +++ b/science/cdo/files/patch-libcdi_src_cgribexlib.c @@ -9,17 +9,6 @@ #pragma options nostrict #include #endif -@@ -736,8 +736,8 @@ void pwr6_minmax_val_double_unrolled6(const double *re - { - size_t residual = datasize % __UNROLL_DEPTH_1; - size_t ofs = datasize - residual; -- double register dmin[__UNROLL_DEPTH_1]; -- double register dmax[__UNROLL_DEPTH_1]; -+ double dmin[__UNROLL_DEPTH_1]; -+ double dmax[__UNROLL_DEPTH_1]; - - for (size_t j = 0; j < __UNROLL_DEPTH_1; ++j) - { @@ -749,21 +749,21 @@ void pwr6_minmax_val_double_unrolled6(const double *re { for (size_t j = 0; j < __UNROLL_DEPTH_1; ++j) diff --git a/science/cdo/pkg-plist b/science/cdo/pkg-plist index e246961a18720..e3e5648b9f86f 100644 --- a/science/cdo/pkg-plist +++ b/science/cdo/pkg-plist @@ -5,8 +5,8 @@ include/cdi.h include/cdi.inc include/cdi_datetime.h include/julian_date.h -lib/cmake/cdi-config-version.cmake -lib/cmake/cdi-config.cmake +lib/cmake/cdi/cdi-config-version.cmake +lib/cmake/cdi/cdi-config.cmake lib/libcdi.a lib/libcdi.so lib/libcdi.so.0