libraries/LDL: Updated for version 2.1.0.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 91 insertions, 46 deletions

diff --git a/libraries/LDL/LDL.SlackBuild b/libraries/LDL/LDL.SlackBuild
index 923356f434..338d8ba16f 100644
--- a/libraries/LDL/LDL.SlackBuild
+++ b/libraries/LDL/LDL.SlackBuild
@@ -1,10 +1,29 @@
 #!/bin/sh
 
 # Slackware build script for LDL
-# Written by Kyle Guinn <elyk03@gmail.com>
+
+# Copyright 2013 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.
+#
+# 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=LDL
-VERSION=${VERSION:-2.0.3}
+VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,9 +88,11 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-shared \
   --disable-static \
+  --disable-dependency-tracking \
   --build=$ARCH-slackware-linux
 
 make
+make check
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/LDL/LDL.info b/libraries/LDL/LDL.info
index a3cf93021d..99558de95a 100644
--- a/libraries/LDL/LDL.info
+++ b/libraries/LDL/LDL.info
@@ -1,10 +1,10 @@
 PRGNAM="LDL"
-VERSION="2.0.3"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/ldl/"
-DOWNLOAD="http://www.cise.ufl.edu/research/sparse/ldl/LDL-2.0.3.tar.gz"
-MD5SUM="d55531886f93b6f17fb0c8af97e5d720"
+VERSION="2.1.0"
+HOMEPAGE="https://www.cise.ufl.edu/research/sparse/ldl/"
+DOWNLOAD="https://www.cise.ufl.edu/research/sparse/ldl/LDL-2.1.0.tar.gz"
+MD5SUM="654e7b8a45a123b7cab7182dd01a2dc9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="AMD"
+REQUIRES="%README% SuiteSparse_config"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
diff --git a/libraries/LDL/README b/libraries/LDL/README
index 0b16f8d1d3..b3628fc188 100644
--- a/libraries/LDL/README
+++ b/libraries/LDL/README
@@ -6,3 +6,6 @@ including an elegant new method of sparse symmetric factorization that
 computes the factorization row-by-row but stores it column-by-column.
 
 This package is part of SuiteSparse.
+
+AMD is an optional dependency and will be used if found.
+It is primarily used for this package's test suite.
diff --git a/libraries/LDL/autotoolize.diff b/libraries/LDL/autotoolize.diff
index 455cfacacf..6fbfe7ce29 100644
--- a/libraries/LDL/autotoolize.diff
+++ b/libraries/LDL/autotoolize.diff
@@ -2,8 +2,8 @@ diff --git a/Demo/Makefile.am b/Demo/Makefile.am
 new file mode 100644
 --- /dev/null
 +++ b/Demo/Makefile.am
-@@ -0,0 +1,60 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include $(AMD_CFLAGS) $(UFCONFIG_CFLAGS)
+@@ -0,0 +1,57 @@
++AM_CPPFLAGS = -I$(top_srcdir)/Include $(AMD_CFLAGS) $(SUITESPARSECONFIG_CFLAGS)
 +LDADD = $(top_builddir)/Source/libldl.la
 +
 +EXTRA_DIST = \
@@ -19,13 +19,16 @@ new file mode 100644
 +%.out: %
 +
 +check_PROGRAMS = \
-+	ldlamd \
-+	ldllamd \
 +	ldlmain \
 +	ldllmain \
 +	ldlsimple \
 +	ldllsimple
 +
++if AMD
++check_PROGRAMS += \
++	ldlamd \
++	ldllamd
++
 +ldlamd_SOURCES = ldlmain.c
 +ldlamd_CPPFLAGS =  $(AM_CPPFLAGS) -DUSE_AMD
 +ldlamd_LDADD = $(LDADD) $(AMD_LIBS)
@@ -33,6 +36,7 @@ new file mode 100644
 +ldllamd_SOURCES = ldlmain.c
 +ldllamd_CPPFLAGS =  $(AM_CPPFLAGS) -DUSE_AMD -DLDL_LONG
 +ldllamd_LDADD = $(LDADD) $(AMD_LIBS)
++endif
 +
 +ldlmain_SOURCES = ldlmain.c
 +
@@ -44,49 +48,51 @@ new file mode 100644
 +ldllsimple_SOURCES = ldlsimple.c
 +ldllsimple_CPPFLAGS = $(AM_CPPFLAGS) -DLDL_LONG
 +
-+ldllmain.out: ldlmain.out
-+	$(LN_S) -f $< $@
-+
-+ldllsimple.out: ldlsimple.out
-+	$(LN_S) -f $< $@
-+
 +check-local: $(check_PROGRAMS) $(check_PROGRAMS:=.out)
 +	@for i in $(check_PROGRAMS); do \
 +		echo "Testing $$i"; \
-+		./$$i$(EXEEXT) > my_$$i.out; \
-+		if diff -u $$i.out my_$$i.out; then \
++		(cd $(srcdir) && $(abs_builddir)/$$i$(EXEEXT)) > my_$$i.out; \
++		if diff -u $(srcdir)/$$i.out my_$$i.out; then \
 +			echo "Test $$i PASSED."; \
 +		else \
 +			echo "Test $$i FAILED."; \
 +		fi; \
 +	done
 +
-+clean-local:
-+	-$(RM) my_*.out
++CLEANFILES = my_*.out
 diff --git a/Doc/Makefile.am b/Doc/Makefile.am
 new file mode 100644
 --- /dev/null
 +++ b/Doc/Makefile.am
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,23 @@
 +EXTRA_DIST = ChangeLog lesser.txt
 +
 +dist_noinst_DATA = ldl_userguide.tex ldl.bib
-+pdf_DATA = ldl_userguide.pdf
++dist_pdf_DATA = ldl_userguide.pdf
++
++.INTERMEDIATE: ldl_userguide.bib
++ldl_userguide.bib: ldl.bib
++	$(LN_S) -f $< $@
 +
-+ldl_userguide.pdf: ldl_userguide.tex ldl.bib
-+	pdflatex ldl_userguide
-+	bibtex ldl_userguide
-+	pdflatex ldl_userguide
-+	pdflatex ldl_userguide
++TEX = TEXINPUTS="$(srcdir):" pdflatex -interaction nonstopmode -file-line-error
++BIB = BIBINPUTS="$(srcdir):" bibtex
++%.pdf: %.tex %.bbl
++	$(TEX) $*
++	while grep -q "Rerun to get cross-references right" $*.log; do \
++		$(TEX) $*; \
++	done
++%.bbl: %.aux %.bib
++	$(BIB) $*
++%.aux: %.tex
++	$(TEX) $*
 +
-+clean-local:
-+	-$(RM) *.aux *.bbl *.blg *.log *.toc
++CLEANFILES = *.aux *.bbl *.blg *.log *.toc
++MAINTAINERCLEANFILES = $(dist_pdf_DATA)
 diff --git a/Include/Makefile.am b/Include/Makefile.am
 new file mode 100644
 --- /dev/null
 +++ b/Include/Makefile.am
-@@ -0,0 +1,2 @@
-+pkgincludedir = $(includedir)/ldl
+@@ -0,0 +1 @@
 +pkginclude_HEADERS = ldl.h
 diff --git a/Makefile.am b/Makefile.am
 new file mode 100644
@@ -112,7 +118,7 @@ new file mode 100644
 --- /dev/null
 +++ b/Source/Makefile.am
 @@ -0,0 +1,16 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include $(UFCONFIG_CFLAGS)
++AM_CPPFLAGS = -I$(top_srcdir)/Include $(SUITESPARSECONFIG_CFLAGS)
 +
 +LDLSRC = \
 +	ldl.c
@@ -127,39 +133,53 @@ new file mode 100644
 +
 +libldl_la_SOURCES =
 +libldl_la_LIBADD = libldli.la libldll.la
-+libldl_la_LDFLAGS = -no-undefined -version-info 2:3:0
++libldl_la_LDFLAGS = -no-undefined -version-number 2:1:0
 diff --git a/configure.ac b/configure.ac
 new file mode 100644
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,36 @@
-+AC_PREREQ([2.68])
-+AC_INIT([LDL],[2.0.3],[davis@cise.ufl.edu])
+@@ -0,0 +1,50 @@
++#                                               -*- Autoconf -*-
++# Process this file with autoconf to produce a configure script.
++
++AC_PREREQ([2.69])
++AC_INIT([LDL],[2.1.0],[DrTimothyAldenDavis@gmail.com],[ldl],[http://www.suitesparse.com/])
 +AC_CONFIG_SRCDIR([Source/ldl.c])
-+AC_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
 +AM_INIT_AUTOMAKE([foreign])
 +LT_INIT
 +
++# Checks for programs.
 +AC_PROG_INSTALL
 +AC_PROG_CC
 +AC_PROG_LN_S
 +
 +LIBS_SAVED=$LIBS
 +
-+AC_CHECK_HEADERS([stdlib.h])
-+
++# Checks for libraries.
 +PKG_PROG_PKG_CONFIG
-+PKG_CHECK_MODULES([UFCONFIG],[ufconfig],
++PKG_CHECK_MODULES([SUITESPARSECONFIG],[suitesparseconfig],
 +	[],
-+	[AC_MSG_ERROR([cannot find ufconfig])])
++	[AC_MSG_ERROR([cannot find suitesparseconfig])])
 +PKG_CHECK_MODULES([AMD],[amd],
-+	[],
-+	[AC_MSG_ERROR([cannot find amd])])
++	[amd="yes"],
++	[amd="no"])
++if test "x$amd" != "xyes"; then
++	AC_MSG_WARN([cannot find amd, disabling some functionality])
++fi
 +
++# Checks for header files.
++AC_CHECK_HEADERS([stdlib.h])
++
++# Checks for typedefs, structures, and compiler characteristics.
++
++# Checks for library functions.
 +AC_FUNC_MALLOC
 +
 +LIBS=$LIBS_SAVED
 +
++AM_CONDITIONAL([AMD], [test "x$amd" = "xyes"])
++
 +AC_CONFIG_FILES([
 +	ldl.pc
 +	Makefile
@@ -173,7 +193,7 @@ diff --git a/ldl.pc.in b/ldl.pc.in
 new file mode 100644
 --- /dev/null
 +++ b/ldl.pc.in
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,12 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
 +libdir=@libdir@
@@ -182,6 +202,7 @@ new file mode 100644
 +Name: @PACKAGE_NAME@
 +Description: A simple LDL^T factorization
 +Version: @PACKAGE_VERSION@
-+Requires.private: ufconfig
++URL: @PACKAGE_URL@
++Requires.private: suitesparseconfig
 +Libs: -L${libdir} -lldl
 +Cflags: -I${includedir}/ldl