3 files changed, 33 insertions, 33 deletions
diff --git a/academic/amd/amd.SlackBuild b/academic/amd/amd.SlackBuild
index 86fb3dfc9a..ed8d18fe0f 100644
--- a/academic/amd/amd.SlackBuild
+++ b/academic/amd/amd.SlackBuild
@@ -2,29 +2,31 @@
 
 # Slackware build script for AMD
 
-# Copyright 2013 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2015 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
 # 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
+#    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=amd
-SRCNAM=AMD
-VERSION=${VERSION:-2.3.1}
+SRCNAM=SuiteSparse
+SUBDIR=AMD
+VERSION=${VERSION:-2.4.1}
+SRCVER=${SRCVER:-4.4.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,7 +60,7 @@ else
 fi
 
 # Recommended by SuiteSparse
-SLKCFLAGS="$SLKCFLAGS -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
+SLKCFLAGS="$SLKCFLAGS -fexceptions -D_FILE_OFFSET_BITS=64"
 
 set -e
 
@@ -66,14 +68,10 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+cd $SRCNAM/$SUBDIR
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod -R u+w,go-w,a+rX-st .
 
 patch -p1 < $CWD/autotoolize.diff
 autoreconf -vif
@@ -97,6 +95,8 @@ make
 make check
 make install-strip DESTDIR=$PKG
 
+find $PKG/usr/lib${LIBDIRSUFFIX} -name '*.la' -delete
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/academic/amd/amd.info b/academic/amd/amd.info
index aa8d4028d1..dfa2bae163 100644
--- a/academic/amd/amd.info
+++ b/academic/amd/amd.info
@@ -1,8 +1,8 @@
 PRGNAM="amd"
-VERSION="2.3.1"
-HOMEPAGE="https://www.cise.ufl.edu/research/sparse/amd/"
-DOWNLOAD="https://www.cise.ufl.edu/research/sparse/amd/AMD-2.3.1.tar.gz"
-MD5SUM="ee402611aa672257752611cfac10d7cd"
+VERSION="2.4.1"
+HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz"
+MD5SUM="e0af74476935c9ff6d971df8bb6b82fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/amd/autotoolize.diff b/academic/amd/autotoolize.diff
index 92a4b25e38..512fb57b0a 100644
--- a/academic/amd/autotoolize.diff
+++ b/academic/amd/autotoolize.diff
@@ -129,19 +129,19 @@ new file mode 100644
 +noinst_LTLIBRARIES = libamdi.la libamdl.la
 +
 +libamdi_la_SOURCES = $(AMDSRC)
-+libamdi_la_LIBADD = -lm
++libamdi_la_LIBADD = $(SUITESPARSECONFIG_LIBS) -lm
 +libamdi_la_CPPFLAGS = $(AM_CPPFLAGS) -DDINT
 +
 +libamdl_la_SOURCES = $(AMDSRC)
-+libamdl_la_LIBADD = -lm
++libamdl_la_LIBADD = $(SUITESPARSECONFIG_LIBS) -lm
 +libamdl_la_CPPFLAGS = $(AM_CPPFLAGS) -DDLONG
 +
-+libamd_la_SOURCES = amd_global.c
++libamd_la_SOURCES =
 +libamd_la_LIBADD = libamdl.la libamdi.la
-+libamd_la_LDFLAGS = -no-undefined -version-number 2:3:1
++libamd_la_LDFLAGS = -no-undefined -release $(PACKAGE_VERSION)
 +
 +libamdf77_la_SOURCES = amd.f amdbar.f
-+libamdf77_la_LDFLAGS = -no-undefined -version-number 2:3:1
++libamdf77_la_LDFLAGS = -no-undefined -release $(PACKAGE_VERSION)
 diff --git a/amd.pc.in b/amd.pc.in
 new file mode 100644
 --- /dev/null
@@ -169,8 +169,8 @@ new file mode 100644
 +# Process this file with autoconf to produce a configure script.
 +
 +AC_PREREQ([2.69])
-+AC_INIT([AMD],[2.3.1],[DrTimothyAldenDavis@gmail.com],[amd],[http://www.suitesparse.com/])
-+AC_CONFIG_SRCDIR([Source/amd_global.c])
++AC_INIT([AMD],[2.4.1],[DrTimothyAldenDavis@gmail.com],[amd],[http://www.suitesparse.com/])
++AC_CONFIG_SRCDIR([Source/amd_order.c])
 +AC_CONFIG_HEADERS([config.h])
 +AM_INIT_AUTOMAKE([foreign])
 +LT_INIT