academic/camd: Updated for version 2.4.6.

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

3 files changed, 27 insertions, 22 deletions

diff --git a/academic/camd/camd.SlackBuild b/academic/camd/camd.SlackBuild
index 331770d32e78b..e2f6b963ddec3 100644
--- a/academic/camd/camd.SlackBuild
+++ b/academic/camd/camd.SlackBuild
@@ -25,14 +25,14 @@
 PRGNAM=camd
 SRCNAM=SuiteSparse
 SUBDIR=CAMD
-VERSION=${VERSION:-2.4.1}
-SRCVER=${SRCVER:-4.4.6}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.4.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/License 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,12 @@ 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" \
+# Avoid rebuilding the docs.
+touch Doc/CAMD_UserGuide.pdf
+
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -88,7 +93,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/camd/camd.info b/academic/camd/camd.info
index 631d50b6e3274..ce37615cd4a84 100644
--- a/academic/camd/camd.info
+++ b/academic/camd/camd.info
@@ -1,8 +1,8 @@
 PRGNAM="camd"
-VERSION="2.4.1"
+VERSION="2.4.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/camd/autotoolize.diff b/academic/camd/patches/autotoolize.diff
index 3448e9b6dbc95..edf84b26036bb 100644
--- a/academic/camd/autotoolize.diff
+++ b/academic/camd/patches/autotoolize.diff
@@ -44,7 +44,7 @@ new file mode 100644
 --- /dev/null
 +++ b/Doc/Makefile.am
 @@ -0,0 +1,28 @@
-+EXTRA_DIST = ChangeLog License lesser.txt
++EXTRA_DIST = ChangeLog License.txt lesser.txt
 +
 +dist_noinst_SCRIPTS = cdiff docdiff
 +dist_noinst_DATA = CAMD_UserGuide.tex CAMD_UserGuide.bib camd.sed
@@ -83,11 +83,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 Doc
 +EXTRA_DIST = README.txt
 +
-+pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfig_DATA = camd.pc
 diff --git a/Source/Makefile.am b/Source/Makefile.am
 new file mode 100644
@@ -150,25 +149,23 @@ new file mode 100644
 +# Process this file with autoconf to produce a configure script.
 +
 +AC_PREREQ([2.69])
-+AC_INIT([CAMD],[2.4.1],[DrTimothyAldenDavis@gmail.com],[camd],[http://www.suitesparse.com/])
++AC_INIT([CAMD],[2.4.6],[DrTimothyAldenDavis@gmail.com],[camd],[http://www.suitesparse.com/])
 +AC_CONFIG_SRCDIR([Source/camd_order.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 stddef.h stdlib.h])
@@ -179,13 +176,15 @@ 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([
 +	camd.pc
 +	Makefile
 +	Demo/Makefile
 +	Doc/Makefile
 +	Include/Makefile
-+	Source/Makefile])
++	Source/Makefile
++])
 +AC_OUTPUT