<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/4dccf490ab1251f048f5b3948e09df100d40449f">https://github.com/macports/macports-ports/commit/4dccf490ab1251f048f5b3948e09df100d40449f</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 4dccf490ab1 cdo: update to 2.1.1
</span>4dccf490ab1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4dccf490ab1251f048f5b3948e09df100d40449f
</span>Author: Remko Scharroo <remko.scharroo@eumetsat.int>
AuthorDate: Wed Dec 21 13:48:01 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> cdo: update to 2.1.1
</span>---
science/cdo/Portfile | 14 ++++----
.../files/patch-skip-Multiyearstat-yseas-test.diff | 40 ----------------------
science/cdo/files/patch-skip-nc4-test.diff | 10 ------
3 files changed, 6 insertions(+), 58 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 337a0ee182e..a30656a1fef 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;'>@@ -5,7 +5,7 @@ PortGroup mpi 1.0
</span> PortGroup legacysupport 1.0
name cdo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.1.1
</span> revision 0
platforms darwin
maintainers {takeshi @tenomoto} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,11 +13,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/27481
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://code.mpimet.mpg.de/attachments/download/27654
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e1138d67d26fed3f866b2336d9eb65f134eba89d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b871346c944b05566ab21893827c74616575deaad0b20eacb472b80b1fa528cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12056875
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 234ae2c2b2dafa98b741fdc06743dbe24ffa201b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c29d084ccbda931d71198409fb2d14f99930db6e7a3654b3c0243ceb304755d9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12079495
</span>
long_description \
CDO is a collection of command line Operators \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,9 +40,7 @@ depends_lib port:netcdf \
</span> port:proj8 \
port:fftw-3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-skip-nc4-test.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-skip-Multiyearstat-yseas-test.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cdo-mach-task-10.8.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-cdo-mach-task-10.8.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-skip-Multiyearstat-yseas-test.diff b/science/cdo/files/patch-skip-Multiyearstat-yseas-test.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fbb6faa1362..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/cdo/files/patch-skip-Multiyearstat-yseas-test.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/Multiyearstat.test.in.orig 2022-08-11 09:06:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/Multiyearstat.test.in 2022-10-17 22:25:01.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,6 +18,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for TYPE in $OPERTYPES; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for STAT in $STATS; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -z "$1" ] || [ $NTEST == $1 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ "$TYPE" = "yseas" ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CDOTEST="${TYPE}$STAT"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST # SKIP test not enabled"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RSTAT=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if [ $TYPE = yday -o $TYPE = yhour ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $TYPE = yhour ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,6 +50,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test $RSTAT -eq 0 || echo "not ok $NTEST - $CDOTEST"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f $OFILE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (( NTEST+=1 ))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,6 +60,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for TYPE in $OPERTYPES; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for STAT in $STATS; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -z "$1" ] || [ $NTEST == $1 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ "$TYPE" = "yseas" ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CDOTEST="${TYPE}$STAT with missing value"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST # SKIP test not enabled"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RSTAT=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if [ $TYPE = yday -o $TYPE = yhour ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $TYPE = yhour ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,6 +92,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test $RSTAT -eq 0 || echo "not ok $NTEST - $CDOTEST"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f $OFILE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (( NTEST+=1 ))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/cdo/files/patch-skip-nc4-test.diff b/science/cdo/files/patch-skip-nc4-test.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 24b2efff809..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/cdo/files/patch-skip-nc4-test.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/tsformat.test.in.orig 2019-10-22 13:06:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/tsformat.test.in 2019-11-08 00:45:00.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "${FORMAT}" = nc4 ] ; then FILEFORMAT=netCDF4; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAS_FORMAT=`${CDO} --config has-${FORMAT}`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ "${FORMAT}" = nc4 ] ; then HAS_FORMAT=no; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function testfunc()
</span></pre><pre style='margin:0'>
</pre>