From nobody Mon Jan 30 13:06:08 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 4P57jF1015z3cYWh; Mon, 30 Jan 2023 13:06:09 +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 4P57jD6KCDz3CJf; Mon, 30 Jan 2023 13:06:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675083968; 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=FWmDCJYbFq4Ktph8I+Qq6uxVeCThjfU7zoqkaYiQkvk=; b=p7Q6ybpLXVzWSl7uAv1MdcX1J+DEsmVJcU+7Mnk31iqFuLYVeXCJGbalbQLndQ5PEEeUn0 kyozCqwZBxpmqnQqWRo/sLFDGjvmnTemiZoCifd8J2ZZ9fijGJnep8f9z/YnuakxrNqV5X yEddJWsKRPAHKOPPHfcdaH2y+1jnyaMQpLbEM9/kHH2CXMxR2+p1iAKNrfStdPfx/wZmB/ UVM/4/VgRRvjT27uXJC9BZOvmfZ91CvmEl4nMEiEh3kSy1zEMhiHs71Tkz0uAGyXBp2exb ZBfurmxYUqcipNF0O1j5I1I4b2/KOKb4ykrXCY7b8Ardje3ffrDFq+CQi2ouxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675083968; 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=FWmDCJYbFq4Ktph8I+Qq6uxVeCThjfU7zoqkaYiQkvk=; b=Qim2FSwJ/VbIK4sfU02ilzZPqJRTML+Zoi5DxA+5qtQl6H+Q1azxNb1mmlZu1PcUmaahpO xp/EEtpLH92Kv6krIYV5YginC1Urr8yOgxi9uB723xwqv74RFCqRxZyePOEaY4z03jJ7B3 rS41YnL6CCmzKPdtnOUNRJNZX6AFgY5uok6GZzq2W9cUoooEgowbMXQAb1wnaUUnN5tFEu n8N+XjxAKLnFjSvKMvBqv+hB+MKyPHwzzHvCdKxhwuRGZMP1AfEtARJSX3QZ0hRGNKI8Xt xbkUjEDQL7Uktbch4lfNpET23Dw3t+zbyORGtmHuTr4oe5L0zf6RxdY/OfyvKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675083968; a=rsa-sha256; cv=none; b=dZbFBgKIWjhL5X14f0KS+kadyS4e9wV8QVa50IGAzLiKpL2AxFzawJwoiYl0bjYxKcvylH lb22Ne4u9Dpoe9cGvwTMrwyxSRRNsqUceepM+NlkTfArQJDjQmISBDbgoxDrbSfiSc22Cb iXkoqIOC8U40Un3UhRuOnRF2BnxfbzMscYMVdv6ZqfbHTU0ceDrOlihxm/UEXMbKjYuGDS 1VBY4IKZpyP/ufLYd8+Vvma+9O2Wt9v3nMkd+BlN3VXPIL14qmNggH0hM1tSfYeAr3oc4Q l1xJJeni7jwEODZ5bwwG4Bjk0l4ts1s17QMC5nMhzJVdSeeJiZbqU0KpWQZyGA== 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 4P57jD5RRfz18Ct; Mon, 30 Jan 2023 13:06:08 +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 30UD68Is053275; Mon, 30 Jan 2023 13:06:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30UD68BI053274; Mon, 30 Jan 2023 13:06:08 GMT (envelope-from git) Date: Mon, 30 Jan 2023 13:06:08 GMT Message-Id: <202301301306.30UD68BI053274@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: 854f713ab23c - main - science/cdo: Update to 2.1.1 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: 854f713ab23c6284fd4598eb19b0f0bf55433ba1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=854f713ab23c6284fd4598eb19b0f0bf55433ba1 commit 854f713ab23c6284fd4598eb19b0f0bf55433ba1 Author: Po-Chuan Hsieh AuthorDate: 2023-01-30 12:28:04 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-01-30 12:59:08 +0000 science/cdo: Update to 2.1.1 Changes: https://code.mpimet.mpg.de/projects/cdo/news --- science/cdo/Makefile | 8 ++++---- science/cdo/distinfo | 6 +++--- science/cdo/files/patch-src_cdo__fft.cc | 13 ------------- science/cdo/pkg-plist | 4 ++-- 4 files changed, 9 insertions(+), 22 deletions(-) diff --git a/science/cdo/Makefile b/science/cdo/Makefile index c29dac20b01f..e0e1eecede17 100644 --- a/science/cdo/Makefile +++ b/science/cdo/Makefile @@ -1,8 +1,7 @@ PORTNAME= cdo -PORTVERSION= 2.0.6 -PORTREVISION= 2 +PORTVERSION= 2.1.1 CATEGORIES= science -MASTER_SITES= https://code.mpimet.mpg.de/attachments/download/27276/ \ +MASTER_SITES= https://code.mpimet.mpg.de/attachments/download/27654/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org @@ -23,7 +22,7 @@ UUID_DESC= UUID support PORTSCOUT= site:https://code.mpimet.mpg.de/projects/cdo/files -USES= compiler:c++17-lang gmake libtool localbase pathfix +USES= compiler:c++17-lang gmake libtool localbase pathfix python:build CONFIGURE_ARGS= --disable-data \ --disable-extra \ @@ -34,6 +33,7 @@ CONFIGURE_ARGS= --disable-data \ --enable-cdi-lib \ --program-transform-name="" \ --with-zlib=/usr +CONFIGURE_ENV= PYTHON=${PYTHON_CMD} GNU_CONFIGURE= yes INSTALL_TARGET= install-strip MAKE_JOBS_UNSAFE= yes diff --git a/science/cdo/distinfo b/science/cdo/distinfo index 4f7eb0320be2..f0cc84e7fb13 100644 --- a/science/cdo/distinfo +++ b/science/cdo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661599147 -SHA256 (cdo-2.0.6.tar.gz) = ef120dea9032b1be80a4cfa201958c3b910107205beb6674195675f1ee8ed402 -SIZE (cdo-2.0.6.tar.gz) = 11981469 +TIMESTAMP = 1674589534 +SHA256 (cdo-2.1.1.tar.gz) = c29d084ccbda931d71198409fb2d14f99930db6e7a3654b3c0243ceb304755d9 +SIZE (cdo-2.1.1.tar.gz) = 12079495 diff --git a/science/cdo/files/patch-src_cdo__fft.cc b/science/cdo/files/patch-src_cdo__fft.cc deleted file mode 100644 index a56fcd9d6428..000000000000 --- a/science/cdo/files/patch-src_cdo__fft.cc +++ /dev/null @@ -1,13 +0,0 @@ -- workaround for: https://code.mpimet.mpg.de/issues/10967 -- this fixes compilation failure when std::swap isn't completely defined and it fails with: -- ld: error: undefined hidden symbol: std::__1::enable_if<(is_move_constructible::value) && (is_move_assignable::value), void>::type std::__1::swap(double&, double&) - ---- src/cdo_fft.cc.orig 2022-09-17 16:10:25 UTC -+++ src/cdo_fft.cc -@@ -1,5 +1,6 @@ - // This source code is copied from PINGO version 1.5 - -+#include - #include - - namespace cdo diff --git a/science/cdo/pkg-plist b/science/cdo/pkg-plist index 31fd70b318c6..e3e5648b9f86 100644 --- a/science/cdo/pkg-plist +++ b/science/cdo/pkg-plist @@ -5,8 +5,8 @@ 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/cmake/cdi/cdi-config-version.cmake +lib/cmake/cdi/cdi-config.cmake lib/libcdi.a lib/libcdi.so lib/libcdi.so.0