science/cdo: Update to 2.0.6

Changes: https://code.mpimet.mpg.de/projects/cdo/news
freebsd · Aug 31, 2022 · cd8920f · cd8920f
1 parent 5b7d75e
commit cd8920f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/science/cdo/Makefile b/science/cdo/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	cdo
-PORTVERSION=	2.0.5
-PORTREVISION=	2
+PORTVERSION=	2.0.6
 CATEGORIES=	science
-MASTER_SITES=	https://code.mpimet.mpg.de/attachments/download/26823/ \
+MASTER_SITES=	https://code.mpimet.mpg.de/attachments/download/27276/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -22,7 +21,7 @@ UUID_DESC=	UUID support
 
 PORTSCOUT=	site:https://code.mpimet.mpg.de/projects/cdo/files
 
-USES=		compiler:c++14-lang gmake libtool localbase pathfix
+USES=		compiler:c++17-lang gmake libtool localbase pathfix
 
 CONFIGURE_ARGS=	--disable-data \
 		--disable-extra \
@@ -37,7 +36,7 @@ GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	check
-USE_CXXSTD=	c++14
+USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
 CGRIBEX_CONFIGURE_WITH=	cgribex

diff --git a/science/cdo/distinfo b/science/cdo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1652122573
-SHA256 (cdo-2.0.5.tar.gz) = edeebbf1c3b1a1f0c642dae6bc8c7624e0c54babe461064dc5c7daca4a5b0dce
-SIZE (cdo-2.0.5.tar.gz) = 11791780
+TIMESTAMP = 1661599147
+SHA256 (cdo-2.0.6.tar.gz) = ef120dea9032b1be80a4cfa201958c3b910107205beb6674195675f1ee8ed402
+SIZE (cdo-2.0.6.tar.gz) = 11981469
diff --git a/science/cdo/files/patch-libcdi_src_cgribexlib.c b/science/cdo/files/patch-libcdi_src_cgribexlib.c
@@ -1,4 +1,4 @@
---- libcdi/src/cgribexlib.c.orig	2022-01-28 10:46:29 UTC
+--- libcdi/src/cgribexlib.c.orig	2022-05-25 13:46:13 UTC
 +++ libcdi/src/cgribexlib.c
 @@ -12,7 +12,7 @@
  #pragma GCC diagnostic warning "-Wstrict-overflow"
@@ -9,20 +9,20 @@
  #pragma options nostrict
  #include <ppu_intrinsics.h>
  #endif
-@@ -745,8 +745,8 @@ void pwr6_minmax_val_double_unrolled6(const double *re
-     size_t i, j;
+@@ -737,8 +737,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 ( j = 0; j < __UNROLL_DEPTH_1; j++) 
+     for (size_t j = 0; j < __UNROLL_DEPTH_1; ++j) 
        {
-@@ -758,21 +758,21 @@ void pwr6_minmax_val_double_unrolled6(const double *re
+@@ -750,21 +750,21 @@ void pwr6_minmax_val_double_unrolled6(const double *re
        {
- 	for (j = 0; j < __UNROLL_DEPTH_1; j++) 
+ 	for (size_t j = 0; j < __UNROLL_DEPTH_1; ++j) 
  	  {
 -	    dmin[j] = __fsel(dmin[j] - data[i+j], data[i+j], dmin[j]);
 -	    dmax[j] = __fsel(data[i+j] - dmax[j], data[i+j], dmax[j]);
@@ -31,15 +31,15 @@
  	  }
        }
 
-     for (j = 0; j < residual; j++) 
+     for (size_t j = 0; j < residual; ++j) 
        {
 -	dmin[j] = __fsel(dmin[j] - data[ofs+j], data[ofs+j], dmin[j]);
 -	dmax[j] = __fsel(data[ofs+j] - dmax[j], data[ofs+j], dmax[j]);
 +	dmin[j] = __builtin_ppc_fsel(dmin[j] - data[ofs+j], data[ofs+j], dmin[j]);
 +	dmax[j] = __builtin_ppc_fsel(data[ofs+j] - dmax[j], data[ofs+j], dmax[j]);
        }
 
-     for ( j = 0; j < __UNROLL_DEPTH_1; j++) 
+     for (size_t j = 0; j < __UNROLL_DEPTH_1; ++j) 
        {
 -	*fmin = __fsel(*fmin - dmin[j], dmin[j], *fmin);
 -	*fmax = __fsel(dmax[j] - *fmax, dmax[j], *fmax);

diff --git a/science/cdo/pkg-plist b/science/cdo/pkg-plist
@@ -1,7 +1,10 @@
 bin/cdi
 bin/cdo
+include/calendar.h
 include/cdi.h
 include/cdi.inc
+include/cdi_datetime.h
+include/julian_date.h
 lib/cmake/libcdi/cdi-config-version.cmake
 lib/cmake/libcdi/cdi-config.cmake
 lib/libcdi.a