summaryrefslogtreecommitdiffstats
path: root/academic/ccolamd
diff options
context:
space:
mode:
Diffstat (limited to 'academic/ccolamd')
-rw-r--r--academic/ccolamd/ccolamd.SlackBuild34
-rw-r--r--academic/ccolamd/ccolamd.info4
-rw-r--r--academic/ccolamd/patches/autoconfiscate.diff2
3 files changed, 25 insertions, 15 deletions
diff --git a/academic/ccolamd/ccolamd.SlackBuild b/academic/ccolamd/ccolamd.SlackBuild
index 0a8c854d2a..504b1668e9 100644
--- a/academic/ccolamd/ccolamd.SlackBuild
+++ b/academic/ccolamd/ccolamd.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for CCOLAMD
-# Copyright 2013-2019 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,13 +22,16 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=ccolamd
SRCNAM=SuiteSparse
SUBDIR=CCOLAMD
VERSION=${VERSION:-2.9.6}
-SRCVER=${SRCVER:-5.4.0}
-BUILD=${BUILD:-5}
+SRCVER=${SRCVER:-5.8.1}
+BUILD=${BUILD:-7}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$(uname -m)" in
@@ -38,15 +41,22 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM-$VERSION
+PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
DOCS="README.txt Doc/ChangeLog Doc/License.txt Doc/lesser.txt"
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -70,9 +80,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR
-cd $SRCNAM/$SUBDIR
+rm -rf $SRCNAM-$SRCVER
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM-$SRCVER/$SUBDIR
+cd $SRCNAM-$SRCVER/$SUBDIR
chown -R root:root .
chmod -R u+w,go-w,a+rX-st .
@@ -105,4 +115,4 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/academic/ccolamd/ccolamd.info b/academic/ccolamd/ccolamd.info
index da03a91af2..a7d008e0e5 100644
--- a/academic/ccolamd/ccolamd.info
+++ b/academic/ccolamd/ccolamd.info
@@ -1,8 +1,8 @@
PRGNAM="ccolamd"
VERSION="2.9.6"
HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-5.4.0.tar.gz"
-MD5SUM="4a6d4e74fc44c503f52996ae95cad03a"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz"
+MD5SUM="c414679bbc9432a3def01b31ad921140"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="suitesparseconfig"
diff --git a/academic/ccolamd/patches/autoconfiscate.diff b/academic/ccolamd/patches/autoconfiscate.diff
index d9cb98c357..54113bd55b 100644
--- a/academic/ccolamd/patches/autoconfiscate.diff
+++ b/academic/ccolamd/patches/autoconfiscate.diff
@@ -106,7 +106,7 @@ new file mode 100644
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.69])
-+AC_INIT([CCOLAMD],[2.9.6],[DrTimothyAldenDavis@gmail.com],[ccolamd],[http://www.suitesparse.com/])
++AC_INIT([CCOLAMD],[2.9.6],[https://github.com/DrTimothyAldenDavis/SuiteSparse],[ccolamd],[http://www.suitesparse.com/])
+AC_CONFIG_SRCDIR([Source/ccolamd.c])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])