academic/colamd: Updated for version 2.9.6.

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

3 files changed, 24 insertions, 22 deletions

diff --git a/academic/colamd/colamd.SlackBuild b/academic/colamd/colamd.SlackBuild
index 0f5675bfc57d..4ebfacc06175 100644
--- a/academic/colamd/colamd.SlackBuild
+++ b/academic/colamd/colamd.SlackBuild
@@ -25,14 +25,14 @@
 PRGNAM=colamd
 SRCNAM=SuiteSparse
 SUBDIR=COLAMD
-VERSION=${VERSION:-2.9.1}
-SRCVER=${SRCVER:-4.4.6}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.9.6}
+SRCVER=${SRCVER:-4.5.3}
+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
@@ -43,11 +43,14 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="README.txt Doc/ChangeLog Doc/lesser.txt"
+DOCS="README.txt Doc/ChangeLog Doc/License.txt Doc/lesser.txt"
 
 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=""
@@ -73,10 +76,9 @@ cd $SRCNAM/$SUBDIR
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
-patch -p1 < $CWD/autotoolize.diff
+patch -p1 < $CWD/patches/autotoolize.diff
 autoreconf -vif
 
-CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -88,7 +90,8 @@ CFLAGS="$SLKCFLAGS" \
   --enable-shared \
   --disable-static \
   --disable-dependency-tracking \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux \
+  CFLAGS="$SLKCFLAGS" \
 
 make
 make check
diff --git a/academic/colamd/colamd.info b/academic/colamd/colamd.info
index c32425663b35..dc282358c721 100644
--- a/academic/colamd/colamd.info
+++ b/academic/colamd/colamd.info
@@ -1,8 +1,8 @@
 PRGNAM="colamd"
-VERSION="2.9.1"
+VERSION="2.9.6"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
-MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.5.3.tar.gz"
+MD5SUM="8ec57324585df3c6483ad7f556afccbd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/colamd/autotoolize.diff b/academic/colamd/patches/autotoolize.diff
index 3a525cf6d672..275143b8c85c 100644
--- a/academic/colamd/autotoolize.diff
+++ b/academic/colamd/patches/autotoolize.diff
@@ -43,11 +43,10 @@ diff --git a/Makefile.am b/Makefile.am
 new file mode 100644
 --- /dev/null
 +++ b/Makefile.am
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,4 @@
 +SUBDIRS = Include Source Demo
-+EXTRA_DIST = README.txt Doc/ChangeLog Doc/lesser.txt
++EXTRA_DIST = README.txt Doc/ChangeLog Doc/License.txt Doc/lesser.txt
 +
-+pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfig_DATA = colamd.pc
 diff --git a/Source/Makefile.am b/Source/Makefile.am
 new file mode 100644
@@ -99,25 +98,23 @@ new file mode 100644
 +# Process this file with autoconf to produce a configure script.
 +
 +AC_PREREQ([2.69])
-+AC_INIT([COLAMD],[2.9.1],[DrTimothyAldenDavis@gmail.com],[colamd],[http://www.suitesparse.com/])
++AC_INIT([COLAMD],[2.9.6],[DrTimothyAldenDavis@gmail.com],[colamd],[http://www.suitesparse.com/])
 +AC_CONFIG_SRCDIR([Source/colamd.c])
 +AC_CONFIG_HEADERS([config.h])
 +AM_INIT_AUTOMAKE([foreign])
 +LT_INIT
 +
 +# Checks for programs.
++PKG_PROG_PKG_CONFIG
 +AC_PROG_INSTALL
 +AC_PROG_CC
 +
-+LIBS_SAVED=$LIBS
++AS_VAR_SET([LIBS_SAVED], [$LIBS])
 +
 +# Checks for libraries.
 +AC_CHECK_LIB([m], [sqrt])
 +
-+PKG_PROG_PKG_CONFIG
-+PKG_CHECK_MODULES([SUITESPARSECONFIG],[suitesparseconfig],
-+	[],
-+	[AC_MSG_ERROR([cannot find suitesparseconfig])])
++PKG_CHECK_MODULES([SUITESPARSECONFIG], [suitesparseconfig])
 +
 +# Checks for header files.
 +AC_CHECK_HEADERS([limits.h stdlib.h])
@@ -128,12 +125,14 @@ new file mode 100644
 +# Checks for library functions.
 +AC_CHECK_FUNCS([sqrt])
 +
-+LIBS=$LIBS_SAVED
++AS_VAR_SET([LIBS], [$LIBS_SAVED])
 +
++PKG_INSTALLDIR
 +AC_CONFIG_FILES([
 +	colamd.pc
 +	Makefile
 +	Demo/Makefile
 +	Include/Makefile
-+	Source/Makefile])
++	Source/Makefile
++])
 +AC_OUTPUT