academic/arpack-ng: Updated for version 3.4.0.

Signed-off-by: Kyle Guinn <elyk03@gmail.com>

4 files changed, 39 insertions, 13 deletions

diff --git a/academic/arpack-ng/README b/academic/arpack-ng/README
index 645bb57646..e24427e956 100644
--- a/academic/arpack-ng/README
+++ b/academic/arpack-ng/README
@@ -5,9 +5,9 @@ This is a fork of ARPACK that is actively maintained.  As such, this
 package will conflict with the ARPACK package.  Do not install both.
 
 This requires a BLAS/LAPACK implementation.  Choose one of these package sets:
-* OpenBLAS (includes a LAPACK implementation)
-* atlas, lapack-atlas
-* blas, lapack (the Netlib reference implementations)
+ * OpenBLAS (includes both a BLAS and a LAPACK implementation)
+ * atlas (includes both a BLAS and a LAPACK implementation)
+ * blas, lapack (the Netlib reference implementations)
 If more than one set is installed (assuming there are no packaging conflicts)
 then the auto-detection will use the first implementation from this list that
 it finds.  If in doubt, choose the Netlib reference implementations; other
diff --git a/academic/arpack-ng/arpack-ng.SlackBuild b/academic/arpack-ng/arpack-ng.SlackBuild
index c387b95027..e54694c99a 100644
--- a/academic/arpack-ng/arpack-ng.SlackBuild
+++ b/academic/arpack-ng/arpack-ng.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for arpack-ng
 
-# Copyright 2014-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2014-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=arpack-ng
-VERSION=${VERSION:-3.3.0}
+VERSION=${VERSION:-3.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$(uname -m) ;;
   esac
@@ -45,6 +45,9 @@ DOCS="CHANGES COPYING PARPACK_CHANGES README TODO"
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -62,14 +65,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
+patch -p1 < $CWD/patches/atlas-lib-rename.diff
+
 ./bootstrap
-CFLAGS="$SLKCFLAGS" \
-FFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -81,7 +84,9 @@ FFLAGS="$SLKCFLAGS" \
   --enable-shared \
   --disable-static \
   --disable-dependency-tracking \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux \
+  CFLAGS="$SLKCFLAGS" \
+  FFLAGS="$SLKCFLAGS" \
 
 make
 make check
diff --git a/academic/arpack-ng/arpack-ng.info b/academic/arpack-ng/arpack-ng.info
index 0c2dfc35f3..ae53943471 100644
--- a/academic/arpack-ng/arpack-ng.info
+++ b/academic/arpack-ng/arpack-ng.info
@@ -1,8 +1,8 @@
 PRGNAM="arpack-ng"
-VERSION="3.3.0"
+VERSION="3.4.0"
 HOMEPAGE="https://github.com/opencollab/arpack-ng"
-DOWNLOAD="https://github.com/opencollab/arpack-ng/archive/3.3.0.tar.gz"
-MD5SUM="ed3648a23f0a868a43ef44c97a21bad5"
+DOWNLOAD="https://github.com/opencollab/arpack-ng/archive/3.4.0/arpack-ng-3.4.0.tar.gz"
+MD5SUM="ae9ca13f2143a7ea280cb0e2fd4bfae4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="blas lapack"
diff --git a/academic/arpack-ng/patches/atlas-lib-rename.diff b/academic/arpack-ng/patches/atlas-lib-rename.diff
new file mode 100644
index 0000000000..4801036f46
--- /dev/null
+++ b/academic/arpack-ng/patches/atlas-lib-rename.diff
@@ -0,0 +1,21 @@
+diff --git a/m4/ax_blas.m4 b/m4/ax_blas.m4
+--- a/m4/ax_blas.m4
++++ b/m4/ax_blas.m4
+@@ -116,13 +116,10 @@
+ 
+ # BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
+ if test $ax_blas_ok = no; then
+-	AC_CHECK_LIB(atlas, ATL_xerbla,
+-		[AC_CHECK_LIB(f77blas, $sgemm,
+-		[AC_CHECK_LIB(cblas, cblas_dgemm,
+-			[ax_blas_ok=yes
+-			 BLAS_LIBS="-lcblas -lf77blas -latlas"],
+-			[], [-lf77blas -latlas])],
+-			[], [-latlas])])
++	AC_CHECK_LIB(tatlas, $sgemm,
++		[ax_blas_ok=yes; BLAS_LIBS="-ltatlas"],
++		[AC_CHECK_LIB(satlas, $sgemm,
++			[ax_blas_ok=yes; BLAS_LIBS="-lsatlas"])])
+ fi
+ 
+ # BLAS in PhiPACK libraries? (requires generic BLAS lib, too)