science/cdo: Update to 2.2.0

- Update LICENSE

Changes:	https://code.mpimet.mpg.de/projects/cdo/news

6 files changed, 21 insertions, 22 deletions

diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index f8ee410fcce6..2f2e4210923f 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -1,16 +1,15 @@
 PORTNAME=	cdo
-PORTVERSION=	2.1.1
-PORTREVISION=	2
+PORTVERSION=	2.2.0
 CATEGORIES=	science
-MASTER_SITES=	https://code.mpimet.mpg.de/attachments/download/27654/ \
+MASTER_SITES=	https://code.mpimet.mpg.de/attachments/download/28013/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Climate Data Operators
 WWW=		https://code.mpimet.mpg.de/projects/cdo
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 OPTIONS_DEFINE=	CGRIBEX ECCODES HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID
 OPTIONS_DEFAULT=CGRIBEX ECCODES HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID
diff --git a/science/cdo/distinfo b/science/cdo/distinfo
index f0cc84e7fb13..d7042ca36b0d 100644
--- a/science/cdo/distinfo
+++ b/science/cdo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674589534
-SHA256 (cdo-2.1.1.tar.gz) = c29d084ccbda931d71198409fb2d14f99930db6e7a3654b3c0243ceb304755d9
-SIZE (cdo-2.1.1.tar.gz) = 12079495
+TIMESTAMP = 1682616632
+SHA256 (cdo-2.2.0.tar.gz) = 679c8d105706caffcba0960ec5ddc4a1332c1b40c52f82c3937356999d8fadf2
+SIZE (cdo-2.2.0.tar.gz) = 13305096
diff --git a/science/cdo/files/patch-libcdi-src-cdilib.c b/science/cdo/files/patch-libcdi-src-cdilib.c
index 7f34ce787544..03eb7c4a2349 100644
--- a/science/cdo/files/patch-libcdi-src-cdilib.c
+++ b/science/cdo/files/patch-libcdi-src-cdilib.c
@@ -1,6 +1,6 @@
---- libcdi/src/cdilib.c.orig	2021-06-05 06:43:11 UTC
+--- libcdi/src/cdilib.c.orig	2023-04-18 19:43:48 UTC
 +++ libcdi/src/cdilib.c
-@@ -33941,11 +33941,13 @@ static pthread_mutex_t namespaceMutex;
+@@ -34701,11 +34701,13 @@ static pthread_mutex_t namespaceMutex;
  static void
  namespaceInitialize(void)
  {
@@ -13,17 +13,17 @@
 +#endif
  }
  
- #  define NAMESPACE_LOCK()         pthread_mutex_lock(&namespaceMutex)
-@@ -34401,12 +34403,14 @@ static
- void listInitialize ( void )
+ #define NAMESPACE_LOCK() pthread_mutex_lock(&namespaceMutex)
+@@ -35276,12 +35278,14 @@ static void
+ listInitialize(void)
  {
- #if  defined  (HAVE_LIBPTHREAD)
+ #if defined(HAVE_LIBPTHREAD)
 +#if defined(PTHREAD_MUTEXATTR)
    pthread_mutexattr_t ma;
    pthread_mutexattr_init(&ma);
    pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_RECURSIVE);
    /* initialize global API mutex lock */
-   pthread_mutex_init ( &listMutex, &ma);
+   pthread_mutex_init(&listMutex, &ma);
    pthread_mutexattr_destroy(&ma);
 +#endif
  #endif
diff --git a/science/cdo/files/patch-libcdi-src-namespace.c b/science/cdo/files/patch-libcdi-src-namespace.c
index 30863b44180c..8255c3117422 100644
--- a/science/cdo/files/patch-libcdi-src-namespace.c
+++ b/science/cdo/files/patch-libcdi-src-namespace.c
@@ -1,6 +1,6 @@
---- libcdi/src/namespace.c.orig	2022-01-21 08:38:53 UTC
+--- libcdi/src/namespace.c.orig	2023-04-16 12:23:50 UTC
 +++ libcdi/src/namespace.c
-@@ -88,11 +88,13 @@ static pthread_mutex_t namespaceMutex;
+@@ -99,11 +99,13 @@ static pthread_mutex_t namespaceMutex;
  static void
  namespaceInitialize(void)
  {
diff --git a/science/cdo/files/patch-libcdi-src-resource_handle.c b/science/cdo/files/patch-libcdi-src-resource_handle.c
index f85ca289cdc4..d5003822c965 100644
--- a/science/cdo/files/patch-libcdi-src-resource_handle.c
+++ b/science/cdo/files/patch-libcdi-src-resource_handle.c
@@ -1,6 +1,6 @@
---- libcdi/src/resource_handle.c.orig	2022-01-21 08:38:53 UTC
+--- libcdi/src/resource_handle.c.orig	2023-04-16 12:23:50 UTC
 +++ libcdi/src/resource_handle.c
-@@ -209,12 +209,14 @@ static void
+@@ -288,12 +288,14 @@ static void
  listInitialize(void)
  {
  #if defined(HAVE_LIBPTHREAD)
diff --git a/science/cdo/files/patch-libcdi_src_cgribexlib.c b/science/cdo/files/patch-libcdi_src_cgribexlib.c
index f7bc6e9ecbab..f61f6ab95330 100644
--- 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-05-25 13:46:13 UTC
+--- libcdi/src/cgribexlib.c.orig	2023-04-16 12:23:50 UTC
 +++ libcdi/src/cgribexlib.c
 @@ -12,7 +12,7 @@
  #pragma GCC diagnostic warning "-Wstrict-overflow"
@@ -9,7 +9,7 @@
  #pragma options nostrict
  #include <ppu_intrinsics.h>
  #endif
-@@ -737,8 +737,8 @@ void pwr6_minmax_val_double_unrolled6(const double *re
+@@ -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;
@@ -20,7 +20,7 @@
  
      for (size_t j = 0; j < __UNROLL_DEPTH_1; ++j) 
        {
-@@ -750,21 +750,21 @@ void pwr6_minmax_val_double_unrolled6(const double *re
+@@ -749,21 +749,21 @@ void pwr6_minmax_val_double_unrolled6(const double *re
        {
  	for (size_t j = 0; j < __UNROLL_DEPTH_1; ++j) 
  	  {