<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3376aaac90bb73975416a5434e47740ba9733bc7">https://github.com/macports/macports-ports/commit/3376aaac90bb73975416a5434e47740ba9733bc7</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 3376aaa cdo: update to 1.9.8
</span>3376aaa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3376aaac90bb73975416a5434e47740ba9733bc7
</span>Author: Remko Scharroo <remko@altimetrics.com>
AuthorDate: Fri Nov 8 09:04:59 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> cdo: update to 1.9.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This provides the following updates:
</span><span style='display:block; white-space:pre;color:#404040;'> * Update to upstream v1.9.8
</span><span style='display:block; white-space:pre;color:#404040;'> * Removed stale --with-jasper configuration (no longer needed or suppored)
</span><span style='display:block; white-space:pre;color:#404040;'> * Added test suite (skipping one test that is known to fail)
</span>---
science/cdo/Portfile | 22 ++++++++++++++--------
science/cdo/files/patch-skip-nc4-test.diff | 10 ++++++++++
2 files changed, 24 insertions(+), 8 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 f25bb8f..3bc0869 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,18 +5,18 @@ PortGroup mpi 1.0
</span> PortGroup cxx11 1.1
name cdo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.9.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.9.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> platforms darwin
maintainers {takeshi @tenomoto} openmaintainer
license GPL-2
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/19299
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 82a66d99bbe026254f8dea15ca078e3acaed29f0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b31474c94548d21393758caa33f35cf7f423d5dfc84562ad80a2bdcb725b5585 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10463349
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://code.mpimet.mpg.de/attachments/download/20826
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c26192d80274a193556f924ddbb767e3e9283024 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f2660ac6f8bf3fa071cf2a3a196b3ec75ad007deb3a782455e80f28680c5252a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10793380
</span>
long_description \
CDO is a collection of command line Operators \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +37,8 @@ depends_lib port:netcdf \
</span> port:proj \
port:fftw-3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-skip-nc4-test.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --with-netcdf=${prefix} \
--disable-dependency-tracking \
--disable-openmp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +51,11 @@ configure.args --with-netcdf=${prefix} \
</span> configure.cppflags-append -I${prefix}/include/udunits2
configure.ldflags-append -lhdf5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.dir ${worksrcpath}/test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.args -j1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Setting configure.cc h5pcc has been removed because it causes error
# because -Wl,-headerpad_max_install_names does not work with -pthread.
# See hdfeos5 Portfile to set h5pcc.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,8 +87,7 @@ variant grib_api description {obsoleted by eccodes variant} {
</span>
variant eccodes description {enable grib2 support} {
depends_lib-append port:ecCodes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-jasper=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-eccodes=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-eccodes=${prefix} \
</span> --disable-cgribex
configure.ldflags-append -lpng -lopenjpeg
}
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..24b2eff
</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-nc4-test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/tsformat.test.in.orig 2019-10-22 13:06:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/tsformat.test.in 2019-11-08 00:45:00.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "${FORMAT}" = nc4 ] ; then FILEFORMAT=netCDF4; fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAS_FORMAT=`${CDO} --config has-${FORMAT}`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ "${FORMAT}" = nc4 ] ; then HAS_FORMAT=no; fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ function testfunc()
</span></pre><pre style='margin:0'>
</pre>