From nobody Wed Aug 31 11:42:47 2022 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 4MHj3D0mfmz4b7jl; Wed, 31 Aug 2022 11:42:48 +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 4MHj3C67RZz4KWG; Wed, 31 Aug 2022 11:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661946167; 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=2hNqcevMzqH+yktADw9Y8DSN28Phu1jPTDbPJ0gYqVc=; b=GXC7xBJ4FHpBkCFLEsD/4Ca+3YiO0VlrFX7I4t8o7470zLf71laq+Q/iaVNs00HZcu8UEw 6Trjlk9RMpHVImwe2R2g8WGK12MeS6XLtFsNokpQJxs3BPFYX4PLcZF9gm7y9OkS2rZu8L lG7mcUGcJpxR6/WhMdC5+iAo+c4sRQtGRrSifDlyUqogudpUlGJA1Rwm5BBbeDp0CtFfn/ JsdShsow7ne8RuzIDDNRPfeBDCYt3jqXmgOyrHYND77/ZcfbCjajAE8CILgB2gwJ3dluAK N2Q6P7/UNpuN7nquT3LYg9FPyMK/2LR7NDhjLrWoBbH2pZjGSc+5ee54P7mKaA== 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 4MHj3C5CYqz16fy; Wed, 31 Aug 2022 11:42:47 +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 27VBglC8094163; Wed, 31 Aug 2022 11:42:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27VBglKB094162; Wed, 31 Aug 2022 11:42:47 GMT (envelope-from git) Date: Wed, 31 Aug 2022 11:42:47 GMT Message-Id: <202208311142.27VBglKB094162@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: cd8920fe0005 - main - science/cdo: Update to 2.0.6 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: cd8920fe0005d231f3a006f92861cc423460b01f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661946167; 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=2hNqcevMzqH+yktADw9Y8DSN28Phu1jPTDbPJ0gYqVc=; b=brhRBroUUByvGtIOHPh0OhBGnM7Jbvy6RtYi257ufzhpBICVzMtkpKnM9X12p7aHDQdarP ms/8Cj556rV/fCC8hZ7oLQEFK7ia6g+AkbdOe/ZPHbyHVpuunmToS3K7Vn++rpJ5aCGIW3 gXK0XNX3x5gqpGnt15X0mnGwquysh20vEkrhnAQSyqXDtlkw+XeT6iQkZxqCb2t2e4EK9g 7G3+sjAvatfmFj3BjX+Dj8SllnLnYuH75W3BjzEK6mPlVaXEZt/qFJcUhQM/QnV7LcQplS ZboYW+ExoSu4uoYQDffNbr75KqWo1WyGwAJgjj0QJ+521zcKJxwOMX7C1aWIcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661946167; a=rsa-sha256; cv=none; b=myaPHKNNcpgYP8meC7Mdgix9XDV2386aKWVfzoQqOSY10fV+ZuqVvNgcb1h8zWXYEN7sab jpDtdDXKNQbhxCoxV0fjl9ahNtvEpSxDBRep0Fl/yOdDsakt2FJrNk4srAfQ/+1DuD5sTF 33sHCIuL0H5+UW6sVRtLlz9TtuaoCk6BXlmyo5ovGEDCuPbRxXcpTEoBOZGhC3nz2DM/DJ 5E08T8OzaIONe0DefQ7JuKp4/IANBLmpmG4udPCCjaowYBkuvwobJniowlSlgMhudCnkxu 4t+wuZ42O8SELnN1geNBOAl9BzAny+L/nevwNX3rBJiP1zTKElqfGqPmwx+jxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd8920fe0005d231f3a006f92861cc423460b01f commit cd8920fe0005d231f3a006f92861cc423460b01f Author: Po-Chuan Hsieh AuthorDate: 2022-08-31 11:21:45 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-08-31 11:40:52 +0000 science/cdo: Update to 2.0.6 Changes: https://code.mpimet.mpg.de/projects/cdo/news --- science/cdo/Makefile | 9 ++++----- science/cdo/distinfo | 6 +++--- science/cdo/files/patch-libcdi_src_cgribexlib.c | 16 ++++++++-------- science/cdo/pkg-plist | 3 +++ 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/science/cdo/Makefile b/science/cdo/Makefile index 216902c948ee..52ab0c774cba 100644 --- 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 index 5583305fe167..4f7eb0320be2 100644 --- 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 index 904c7971669d..f7bc6e9ecbab 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-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,8 +9,8 @@ #pragma options nostrict #include #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]; @@ -18,11 +18,11 @@ + 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,7 +31,7 @@ } } - 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]); @@ -39,7 +39,7 @@ + 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 index c4c22add359b..31fd70b318c6 100644 --- 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