academic/harminv: Updated for version 1.4.2.

Signed-off-by: bedlam <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 40 insertions, 18 deletions

diff --git a/academic/harminv/README b/academic/harminv/README
index fc3c9c0bc74fe..f574c1996c647 100644
--- a/academic/harminv/README
+++ b/academic/harminv/README
@@ -1,5 +1,14 @@
-Harminv is a program and library that solves the problem of
-harmonic inversion. It takes a discrete-time, finite-length
-signal, and decomposes it into a sum of finitely-many
-sinusoids, determining the frequencies, decay constants,
+harminv (harmonic inversion from a time series)
+
+Harminv is a program and library that solves the problem of 
+harmonic inversion. It takes a discrete-time, finite-length 
+signal, and decomposes it into a sum of finitely-many 
+sinusoids, determining the frequencies, decay constants, 
 amplitudes, and phases of those sinusoids.
+
+This package requires: lapack
+
+If the build script can find the ATLAS libraries, it will
+adapt the configure options to use them rather than the 
+default lapack.
+
diff --git a/academic/harminv/harminv.SlackBuild b/academic/harminv/harminv.SlackBuild
index d48c4804d05f1..7bbd8433bf72b 100644
--- a/academic/harminv/harminv.SlackBuild
+++ b/academic/harminv/harminv.SlackBuild
@@ -25,8 +25,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=harminv
-VERSION=${VERSION:-1.4.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.4.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -64,13 +64,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 # change annoying underscores into hyphens
 SVERSION=$(echo $VERSION | tr '_' '-')
 # make a custom list of doc files in advance
 DOCFILES="COPYING COPYRIGHT NEWS.md README.md doc/*.md "
 
-set -e
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -89,7 +89,20 @@ if [ ! -f ./configure ] ; then
   ./autogen.sh
 fi
 
-LOCALCONFIGS="--enable-shared --with-blas=atlas"
+
+LOCALCONFIGS="--enable-shared --enable-static=no "
+
+
+# check for the Atlas replacement for blas; if the libraries are found,
+#  add the configure option accordingly
+
+if [ -f /usr/lib/libatlas.a ] ; then
+  if [ -f /usr/lib/libatlas.so ] ; then
+    echo "NOTICE: libatlas was found, configure --with-blas=atlas"
+    LOCALCONFIGS=${LOCALCONFIGS}" --with-blas=atlas"
+  fi
+fi
+
 
 CFLAGS="$SLKCFLAGS" \
 CPPFLAGS="$SLKCFLAGS" \
@@ -99,12 +112,14 @@ CPPFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  --enable-static=no \
   $LOCALCONFIGS
 
 make
 make install DESTDIR=$PKG
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -115,8 +130,6 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 install -m 0644 $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-rm -f $PKG/usr/lib*/*.la
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/academic/harminv/harminv.info b/academic/harminv/harminv.info
index 4ba38e50700b7..298d496d12913 100644
--- a/academic/harminv/harminv.info
+++ b/academic/harminv/harminv.info
@@ -1,8 +1,8 @@
 PRGNAM="harminv"
-VERSION="1.4.1"
+VERSION="1.4.2"
 HOMEPAGE="https://github.com/NanoComp/harminv"
-DOWNLOAD="https://github.com/NanoComp/harminv/releases/download/v1.4.1/harminv-1.4.1.tar.gz"
-MD5SUM="a1ac921b1b97cd2c0354c35b2d8a77fc"
+DOWNLOAD="https://github.com/NanoComp/harminv/releases/download/v1.4.2/harminv-1.4.2.tar.gz"
+MD5SUM="0ad9ed9b2b345c2e8c2929f20bdf2492"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lapack"
diff --git a/academic/harminv/slack-desc b/academic/harminv/slack-desc
index 63773e4878ebf..7e7a2360d604c 100644
--- a/academic/harminv/slack-desc
+++ b/academic/harminv/slack-desc
@@ -8,9 +8,9 @@
        |-----handy-ruler------------------------------------------------------|
 harminv: harminv (harmonic inversion from a time series)
 harminv:
-harminv: Harminv is a program and library that solves the problem of
-harminv: harmonic inversion. It takes a discrete-time, finite-length
-harminv: signal, and decomposes it into a sum of finitely-many
+harminv: Harminv is a program and library that solves the problem of 
+harminv: harmonic inversion. It takes a discrete-time, finite-length 
+harminv: signal, and decomposes it into a sum of finitely-many 
 harminv: sinusoids, dettermining the frequencies, decay constants,
 harminv: amplitudes, and phases of those sinusoids.
 harminv: