From 3390b7b2836f5ab23bb05bd5bd1de896942d5152 Mon Sep 17 00:00:00 2001
From: ArTourter <artourter@gmail.com>
Date: Fri, 2 Sep 2022 23:34:57 +0100
Subject: academic/cdo: Updated for version 2.0.6

Signed-off-by: ArTourter <artourter@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 academic/cdo/README         |  7 +++++++
 academic/cdo/cdo.SlackBuild | 15 +++++++++------
 academic/cdo/cdo.info       |  6 +++---
 3 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'academic/cdo')

diff --git a/academic/cdo/README b/academic/cdo/README
index e767d4ea31..bd81fec126 100644
--- a/academic/cdo/README
+++ b/academic/cdo/README
@@ -5,3 +5,10 @@ Climate and NWP model Data.
 
 Supported data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and
 IEG. There are more than 600 operators available.
+
+By default, the script does not build nor run the tests. You can use the
+option TESTBUILD=YES to build and run the tests before the make install
+part.  Note that the hdf5 slackbuild builds the library in a
+non-thread-safe manner so one of the test will fail with a note in the
+test log about requiring the use of the -L flag to compensate, but the
+tests themself to not use that flag so fails.
diff --git a/academic/cdo/cdo.SlackBuild b/academic/cdo/cdo.SlackBuild
index 05ed056313..e49004c589 100644
--- a/academic/cdo/cdo.SlackBuild
+++ b/academic/cdo/cdo.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=cdo
-VERSION=${VERSION:-2.0.4}
+VERSION=${VERSION:-2.0.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -66,6 +66,8 @@ fi
 
 set -e
 
+TESTBUILD=${TESTBUILD:-NO}
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -79,26 +81,27 @@ find -L . \
   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# static.
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
   --with-szlib=yes \
   --with-netcdf=yes \
   --with-hdf5=yes \
-  --with-udunits2 \
   --with-threads=yes \
-  --disable-static \
+  --with-udunits2 \
   --with-fftw3 \
   --with-proj \
   --with-curl \
   --with-libxml2 \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-silent-rules \
   --build=$ARCH-slackware-linux
 
 make
+[[ $TESTBUILD == "YES" ]] && make check
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -106,7 +109,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS OPERATORS README \
+  AUTHORS COPYING ChangeLog NEWS OPERATORS README \
   doc/*.pdf \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/academic/cdo/cdo.info b/academic/cdo/cdo.info
index 8615f6071c..c1963336ed 100644
--- a/academic/cdo/cdo.info
+++ b/academic/cdo/cdo.info
@@ -1,8 +1,8 @@
 PRGNAM="cdo"
-VERSION="2.0.4"
+VERSION="2.0.6"
 HOMEPAGE="https://code.mpimet.mpg.de/projects/cdo"
-DOWNLOAD="https://code.mpimet.mpg.de/attachments/download/26761/cdo-2.0.4.tar.gz"
-MD5SUM="03c7d59cd80377dfa0b9bbc0ec79a427"
+DOWNLOAD="https://code.mpimet.mpg.de/attachments/download/27276/cdo-2.0.6.tar.gz"
+MD5SUM="511c7f0a306e4364367a6e65bce2bfcb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="proj udunits netcdf"
-- 
cgit v1.2.3-79-gdb01