git: b85a57271055 - main - science/cdo: Update to 2.0.4

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b85a57271055240943a9e13d30b06c025f93a4e8

commit b85a57271055240943a9e13d30b06c025f93a4e8
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-03-07 17:50:50 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-03-07 18:10:58 +0000

    science/cdo: Update to 2.0.4
    
    Changes:        https://code.mpimet.mpg.de/projects/cdo/news
---
 science/cdo/Makefile                                 |  4 ++--
 science/cdo/distinfo                                 |  6 +++---
 science/cdo/files/patch-libcdi-src-namespace.c       |  4 ++--
 science/cdo/files/patch-libcdi-src-resource_handle.c | 10 +++++-----
 science/cdo/files/patch-libcdi_src_cgribexlib.c      |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index 2b699f3a317b..2847d63b673d 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -1,9 +1,9 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
 
 PORTNAME=	cdo
-PORTVERSION=	2.0.3
+PORTVERSION=	2.0.4
 CATEGORIES=	science
-MASTER_SITES=	https://code.mpimet.mpg.de/attachments/download/26676/ \
+MASTER_SITES=	https://code.mpimet.mpg.de/attachments/download/26761/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/science/cdo/distinfo b/science/cdo/distinfo
index e9a13803273e..b4f0c77b216e 100644
--- a/science/cdo/distinfo
+++ b/science/cdo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642102147
-SHA256 (cdo-2.0.3.tar.gz) = 25520260ccb4e5324c27fa2160dfafc8152b180dd7f0133bd80425df3ef7c65a
-SIZE (cdo-2.0.3.tar.gz) = 11781699
+TIMESTAMP = 1646057896
+SHA256 (cdo-2.0.4.tar.gz) = 73c0c1e5348632e6e8452ea8e617c35499bc55c845ee2c1d42b912a7e00e5533
+SIZE (cdo-2.0.4.tar.gz) = 11777977
diff --git a/science/cdo/files/patch-libcdi-src-namespace.c b/science/cdo/files/patch-libcdi-src-namespace.c
index 747e642168b3..30863b44180c 100644
--- a/science/cdo/files/patch-libcdi-src-namespace.c
+++ b/science/cdo/files/patch-libcdi-src-namespace.c
@@ -1,4 +1,4 @@
---- libcdi/src/namespace.c.orig	2020-01-21 20:19:01 UTC
+--- libcdi/src/namespace.c.orig	2022-01-21 08:38:53 UTC
 +++ libcdi/src/namespace.c
 @@ -88,11 +88,13 @@ static pthread_mutex_t namespaceMutex;
  static void
@@ -13,4 +13,4 @@
 +#endif
  }
  
- #  define NAMESPACE_LOCK()         pthread_mutex_lock(&namespaceMutex)
+ #define NAMESPACE_LOCK() pthread_mutex_lock(&namespaceMutex)
diff --git a/science/cdo/files/patch-libcdi-src-resource_handle.c b/science/cdo/files/patch-libcdi-src-resource_handle.c
index 4c184c1b97f5..f85ca289cdc4 100644
--- a/science/cdo/files/patch-libcdi-src-resource_handle.c
+++ b/science/cdo/files/patch-libcdi-src-resource_handle.c
@@ -1,15 +1,15 @@
---- libcdi/src/resource_handle.c.orig	2020-04-22 13:06:24 UTC
+--- libcdi/src/resource_handle.c.orig	2022-01-21 08:38:53 UTC
 +++ libcdi/src/resource_handle.c
-@@ -208,12 +208,14 @@ static
- void listInitialize ( void )
+@@ -209,12 +209,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_cgribexlib.c b/science/cdo/files/patch-libcdi_src_cgribexlib.c
index ef62f8c90f31..11aaf5c127f6 100644
--- a/science/cdo/files/patch-libcdi_src_cgribexlib.c
+++ b/science/cdo/files/patch-libcdi_src_cgribexlib.c
@@ -1,6 +1,6 @@
---- libcdi/src/cgribexlib.c.orig	2021-02-16 14:56:42 UTC
+--- libcdi/src/cgribexlib.c.orig	2022-01-28 10:46:29 UTC
 +++ libcdi/src/cgribexlib.c
-@@ -10,7 +10,7 @@
+@@ -12,7 +12,7 @@
  #pragma GCC diagnostic warning "-Wstrict-overflow"
  #endif
  
@@ -9,7 +9,7 @@
  #pragma options nostrict
  #include <ppu_intrinsics.h>
  #endif
-@@ -726,6 +726,19 @@ void sse2_minmax_val_double(const double *restrict buf
+@@ -734,6 +734,19 @@ void sse2_minmax_val_double(const double *restrict buf
  #endif // SIMD
  
  #if defined(_ARCH_PWR6)