From nobody Fri Apr 28 00:00:13 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6t5n4VcKz4885Q; Fri, 28 Apr 2023 00:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q6t5n2QH8z3QXR; Fri, 28 Apr 2023 00:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682640013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rON06R8iPr7SWKpCYiVKplmCKkjVhSMOpwUX1lRorZc=; b=gKpCZakMTasFwIO/1A3fke241GzQb2183X4varsOIHORiRkt+i9wIg3pJ6KtXDsrj4m0Ov vXr7/vRZa8KX2KIn89qr0aLrVFVVYLwXALpE4vcOQr04DB45zWf5bYOo+Xsy4xeyFgoTZr dyVf+EcXpBopvQgOtTmtVqHsfpfrS1AIVlaoeHP5dzgclpiapG8waNSeJL8bNkd3gjd82e eGMPACPxWX5549HzOITh0oCA61Rzw7xWu4pFO9/jw8SfR/3+cNqyf6Rx4QcSled9IuwGl3 doBvd+6nlaCLX9Ns4Xl+ffFoG87KgrMRWvVWTVXLxL0TtJSCtrXeSY6IKE0jNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682640013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rON06R8iPr7SWKpCYiVKplmCKkjVhSMOpwUX1lRorZc=; b=PULTBocYuRt3cV9bWAoZdkd2FQTqBMbs5EGdH8HpfImTex9JEYJMP9NJ1el+avg5FfkUSq fYr7peYNQmKpoAWHXahnoj1cx6DhSgzOPvpM988NzHnVFYupN75Dl/IrI/Xl7aYnCglT7F 6CJUbs6N8q3ZlZ3OO0dDJyLkndj4DbnDXtOdTzABB64VkyO0Joo17q7bVq86sW8C12l+r2 QshRp5F1yiEVB5cuQqH2Ry/KVEOf7Qgs0zzAMep+wPzkCMS5OskMz0CJ2jwPTKKXveXPAl LbLIIQ+yEAPrTLBLmBTjZL2d1RDd14oc9IN7G9ANNSJs+hh1czU/4qdeySYjTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682640013; a=rsa-sha256; cv=none; b=pZ9jllL9QpC1pHs0jlBG/m2fXdepfCYnPuz2B+If0PcsX/GHDBdL+iMnsQ5RdRWjJcXDce dfuW625O7BvWxfKreDsdyZ1QRnL9Hnkhtle5Wr6cNYCHgLtXFBXlH4YzFwXtAKmfNXkqFa PrlNIOAhRsjHlVzYfdtGxfqkol4S+sLXoQgjdz9IFTy4qRFIZhzrcuZ57/Yw3FH7yYlrWG BGNstAFTG1nTK9SPGFT0fAuOBU+Q27yWlU2RJfMFqX1HJcx0PhvWxeIa0dhaB9QfGmKs0E m28hLJ+zKd1P36jRFh6mwg05LEG0NUQLO2jN4yOc7kyOm7kXiuNc6l//hGzFeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6t5n16mmzcwt; Fri, 28 Apr 2023 00:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33S00D8q031719; Fri, 28 Apr 2023 00:00:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33S00DS9031712; Fri, 28 Apr 2023 00:00:13 GMT (envelope-from git) Date: Fri, 28 Apr 2023 00:00:13 GMT Message-Id: <202304280000.33S00DS9031712@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: da27480fe942 - main - science/cdo: Update to 2.2.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da27480fe9425f6987578c40deaddadee70b189c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=da27480fe9425f6987578c40deaddadee70b189c commit da27480fe9425f6987578c40deaddadee70b189c Author: Po-Chuan Hsieh AuthorDate: 2023-04-27 23:58:16 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-04-27 23:58:16 +0000 science/cdo: Update to 2.2.0 - Update LICENSE Changes: https://code.mpimet.mpg.de/projects/cdo/news --- science/cdo/Makefile | 9 ++++----- science/cdo/distinfo | 6 +++--- science/cdo/files/patch-libcdi-src-cdilib.c | 14 +++++++------- science/cdo/files/patch-libcdi-src-namespace.c | 4 ++-- science/cdo/files/patch-libcdi-src-resource_handle.c | 4 ++-- science/cdo/files/patch-libcdi_src_cgribexlib.c | 6 +++--- 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 #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) {