diff --git a/academic/ccolamd/ccolamd.SlackBuild b/academic/ccolamd/ccolamd.SlackBuild index 0a8c854d2a..cec5eb80f1 100644 --- a/academic/ccolamd/ccolamd.SlackBuild +++ b/academic/ccolamd/ccolamd.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for CCOLAMD -# Copyright 2013-2019 Kyle Guinn +# Copyright 2013-2020 Kyle Guinn # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,8 +26,8 @@ PRGNAM=ccolamd SRCNAM=SuiteSparse SUBDIR=CCOLAMD VERSION=${VERSION:-2.9.6} -SRCVER=${SRCVER:-5.4.0} -BUILD=${BUILD:-5} +SRCVER=${SRCVER:-5.6.0} +BUILD=${BUILD:-6} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -70,9 +70,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 . diff --git a/academic/ccolamd/ccolamd.info b/academic/ccolamd/ccolamd.info index da03a91af2..e32e2118a3 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.6.0/SuiteSparse-5.6.0.tar.gz" +MD5SUM="af8b97cbded4cd5c6672e878bc0c37c2" 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])