<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/af929d2e6e9c73c48ce63602a1d3e1897588849d">https://github.com/macports/macports-ports/commit/af929d2e6e9c73c48ce63602a1d3e1897588849d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new af929d2e6e9 cdo: update to 2.1.0
</span>af929d2e6e9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit af929d2e6e9c73c48ce63602a1d3e1897588849d
</span>Author: Remko Scharroo <remko.scharroo@eumetsat.int>
AuthorDate: Sat Oct 15 22:46:03 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> cdo: update to 2.1.0
</span>---
science/cdo/Portfile | 12 +++----
.../cdo/files/patch-cdo-2.0.6-missing-include.diff | 13 -------
.../files/patch-skip-Multiyearstat-yseas-test.diff | 40 ++++++++++++++++++++++
3 files changed, 46 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/cdo/Portfile b/science/cdo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d22199f089..77fc34ded4d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/cdo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/cdo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup mpi 1.0
name cdo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.1.0
</span> revision 0
platforms darwin
maintainers {takeshi @tenomoto} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,11 +12,11 @@ license GPL-2
</span> categories science
description Climate Data Operators
homepage https://code.mpimet.mpg.de/projects/cdo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://code.mpimet.mpg.de/attachments/download/27276
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://code.mpimet.mpg.de/attachments/download/27481
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a1046c666449a2c465eb8af3b6be0d2b42fc95e0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ef120dea9032b1be80a4cfa201958c3b910107205beb6674195675f1ee8ed402 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11981469
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e1138d67d26fed3f866b2336d9eb65f134eba89d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b871346c944b05566ab21893827c74616575deaad0b20eacb472b80b1fa528cc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12056875
</span>
long_description \
CDO is a collection of command line Operators \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@ depends_lib port:netcdf \
</span> port:fftw-3
patchfiles patch-skip-nc4-test.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cdo-2.0.6-missing-include.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-skip-Multiyearstat-yseas-test.diff
</span>
configure.args --with-netcdf=${prefix} \
--disable-dependency-tracking \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/cdo/files/patch-cdo-2.0.6-missing-include.diff b/science/cdo/files/patch-cdo-2.0.6-missing-include.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 362477cf893..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/cdo/files/patch-cdo-2.0.6-missing-include.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch needed for cdo version 2.0.6. Should be fixed in next version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://code.mpimet.mpg.de/boards/2/topics/13186?r=13240#message-13240
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/cdo_fft.cc.orig 2022-07-11 14:51:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/cdo_fft.cc 2022-09-13 15:56:27.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // This source code is copied from PINGO version 1.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cmath>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <algorithm>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace cdo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/cdo/files/patch-skip-Multiyearstat-yseas-test.diff b/science/cdo/files/patch-skip-Multiyearstat-yseas-test.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fbb6faa1362
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/cdo/files/patch-skip-Multiyearstat-yseas-test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/Multiyearstat.test.in.orig 2022-08-11 09:06:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/Multiyearstat.test.in 2022-10-17 22:25:01.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,6 +18,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for TYPE in $OPERTYPES; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for STAT in $STATS; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ -z "$1" ] || [ $NTEST == $1 ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ "$TYPE" = "yseas" ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CDOTEST="${TYPE}$STAT"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST # SKIP test not enabled"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RSTAT=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if [ $TYPE = yday -o $TYPE = yhour ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ $TYPE = yhour ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,6 +50,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test $RSTAT -eq 0 || echo "not ok $NTEST - $CDOTEST"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f $OFILE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (( NTEST+=1 ))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,6 +60,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for TYPE in $OPERTYPES; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for STAT in $STATS; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ -z "$1" ] || [ $NTEST == $1 ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ "$TYPE" = "yseas" ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CDOTEST="${TYPE}$STAT with missing value"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST # SKIP test not enabled"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RSTAT=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if [ $TYPE = yday -o $TYPE = yhour ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ $TYPE = yhour ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,6 +92,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test $RSTAT -eq 0 || echo "not ok $NTEST - $CDOTEST"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f $OFILE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (( NTEST+=1 ))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span></pre><pre style='margin:0'>
</pre>