Date: Mon, 30 Jan 2023 13:06:08 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 854f713ab23c - main - science/cdo: Update to 2.1.1 Message-ID: <202301301306.30UD68BI053274@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=854f713ab23c6284fd4598eb19b0f0bf55433ba1 commit 854f713ab23c6284fd4598eb19b0f0bf55433ba1 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-01-30 12:28:04 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> 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<double>::value) && (is_move_assignable<double>::value), void>::type std::__1::swap<double>(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 <algorithm> - #include <cmath> - - 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301301306.30UD68BI053274>