From aaee1f3b972e0693c732f267e40a28182acfcbc2 Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Mon, 25 Nov 2013 02:00:00 -0600 Subject: libraries/RBio: Updated for version 2.1.1. Signed-off-by: Robby Workman --- libraries/RBio/RBio.SlackBuild | 25 +++++- libraries/RBio/RBio.info | 10 +-- libraries/RBio/autotoolize.diff | 163 +++++++++++++++++++++------------------- 3 files changed, 113 insertions(+), 85 deletions(-) (limited to 'libraries') diff --git a/libraries/RBio/RBio.SlackBuild b/libraries/RBio/RBio.SlackBuild index eca520f2e869..bfb5041fbcbb 100644 --- a/libraries/RBio/RBio.SlackBuild +++ b/libraries/RBio/RBio.SlackBuild @@ -1,10 +1,29 @@ #!/bin/sh # Slackware build script for RBio -# Written by Kyle Guinn + +# Copyright 2013 Kyle Guinn , 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=RBio -VERSION=${VERSION:-2.0.1} +VERSION=${VERSION:-2.1.1} 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/RBio/RBio.info b/libraries/RBio/RBio.info index 359864df75fd..81bb77ba3e16 100644 --- a/libraries/RBio/RBio.info +++ b/libraries/RBio/RBio.info @@ -1,10 +1,10 @@ PRGNAM="RBio" -VERSION="2.0.1" -HOMEPAGE="http://www.cise.ufl.edu/research/sparse/RBio/" -DOWNLOAD="http://www.cise.ufl.edu/research/sparse/RBio/RBio-2.0.1.tar.gz" -MD5SUM="5091a231fa676298e1edf4cb8bf88ca5" +VERSION="2.1.1" +HOMEPAGE="https://www.cise.ufl.edu/research/sparse/RBio/" +DOWNLOAD="https://www.cise.ufl.edu/research/sparse/RBio/RBio-2.1.1.tar.gz" +MD5SUM="07495e73e29683a8b348811a34e0e396" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="UFconfig" +REQUIRES="SuiteSparse_config" MAINTAINER="Kyle Guinn" EMAIL="elyk03@gmail.com" diff --git a/libraries/RBio/autotoolize.diff b/libraries/RBio/autotoolize.diff index d31eae387fb0..4c495922ee59 100644 --- a/libraries/RBio/autotoolize.diff +++ b/libraries/RBio/autotoolize.diff @@ -2,9 +2,9 @@ diff --git a/Demo/Makefile.am b/Demo/Makefile.am new file mode 100644 --- /dev/null +++ b/Demo/Makefile.am -@@ -0,0 +1,23 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/Include $(UFCONFIG_CFLAGS) -+LDADD = $(top_builddir)/Source/librbio.la $(UFCONFIG_LIBS) +@@ -0,0 +1,22 @@ ++AM_CPPFLAGS = -I$(top_srcdir)/Include $(SUITESPARSECONFIG_CFLAGS) ++LDADD = $(top_builddir)/Source/librbio.la $(SUITESPARSECONFIG_LIBS) + +EXTRA_DIST = \ + RBdemo.out @@ -19,19 +19,17 @@ new file mode 100644 +RBdemo_SOURCES = RBdemo.c + +RB = \ -+ ../RBio/private/west0479.rua ++ $(top_srcdir)/RBio/private/west0479.rua + +check-local: $(check_PROGRAMS) $(RB) -+ ./RBdemo < ../RBio/private/west0479.rua ++ ./RBdemo < $(top_srcdir)/RBio/private/west0479.rua + -+clean-local: -+ -$(RM) temp.rb ++CLEANFILES = temp.rb 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)/rbio +@@ -0,0 +1 @@ +pkginclude_HEADERS = RBio.h diff --git a/Makefile.am b/Makefile.am new file mode 100644 @@ -68,7 +66,7 @@ new file mode 100644 --- /dev/null +++ b/Source/Makefile.am @@ -0,0 +1,18 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/Include $(UFCONFIG_CFLAGS) ++AM_CPPFLAGS = -I$(top_srcdir)/Include $(SUITESPARSECONFIG_CFLAGS) + +RBIOSRC = \ + RBio.c @@ -77,24 +75,24 @@ new file mode 100644 +noinst_LTLIBRARIES = librbioi.la librbiol.la + +librbioi_la_SOURCES = $(RBIOSRC) -+librbioi_la_LIBADD = $(UFCONFIG_LIBS) ++librbioi_la_LIBADD = $(SUITESPARSECONFIG_LIBS) +librbioi_la_CPPFLAGS = $(AM_CPPFLAGS) -DINT + +librbiol_la_SOURCES = $(RBIOSRC) -+librbiol_la_LIBADD = $(UFCONFIG_LIBS) ++librbiol_la_LIBADD = $(SUITESPARSECONFIG_LIBS) + +librbio_la_SOURCES = +librbio_la_LIBADD = librbioi.la librbiol.la -+librbio_la_LDFLAGS = -no-undefined -version-info 2:1:0 ++librbio_la_LDFLAGS = -no-undefined -version-number 2:1:1 diff --git a/Tcov/Makefile.am b/Tcov/Makefile.am new file mode 100644 --- /dev/null +++ b/Tcov/Makefile.am -@@ -0,0 +1,94 @@ +@@ -0,0 +1,92 @@ +AM_CC = gcc +AM_CFLAGS = -O0 -g --coverage -+AM_CPPFLAGS = -I$(top_srcdir)/Include $(UFCONFIG_CFLAGS) -+LDADD = $(UFCONFIG_LIBS) ++AM_CPPFLAGS = -I$(top_srcdir)/Include $(SUITESPARSECONFIG_CFLAGS) ++LDADD = $(SUITESPARSECONFIG_LIBS) + +dist_noinst_DATA = \ + matrices/Tina_DisCog.tar.gz \ @@ -127,87 +125,95 @@ new file mode 100644 + RBdemo \ + RBtest + -+RBio.c: ../Source/RBio.c -+ $(LN_S) -f $< $@ -+ -+RBdemo.c: ../Demo/RBdemo.c -+ $(LN_S) -f $< $@ -+ -+RBdemo_SOURCES = RBdemo.c RBio.c -+RBtest_SOURCES = RBtest.c RBio.c ++RBdemo_SOURCES = $(top_srcdir)/Source/RBio.c $(top_srcdir)/Demo/RBdemo.c ++RBtest_SOURCES = $(top_srcdir)/Source/RBio.c RBtest.c + +TAR = tar -O -xvvzf + +RB = \ -+ ../RBio/private/bcsstk01.rb \ -+ ../RBio/private/farm.rb \ -+ ../RBio/private/lap_25.pse \ -+ ../RBio/private/lap_25.rb \ -+ ../RBio/private/west0479.rb \ -+ ../RBio/private/west0479.rua \ -+ $(dist_noinst_DATA) -+ -+check-local: $(check_PROGRAMS) $(RB) -+ -./RBdemo ../RBio/private/bcsstk01.rb -+ -./RBdemo ../RBio/private/farm.rb -+ -./RBdemo ../RBio/private/lap_25.pse -+ -./RBdemo ../RBio/private/lap_25.rb -+ -./RBdemo ../RBio/private/west0479.rb -+ -./RBdemo ../RBio/private/west0479.rua -+ -$(TAR) matrices/dwg961a.tar.gz dwg961a/dwg961a.rb | ./RBdemo -+ -$(TAR) matrices/mhd1280a.tar.gz mhd1280a/mhd1280a.rb | ./RBdemo -+ -$(TAR) matrices/mhd1280b.tar.gz mhd1280b/mhd1280b.rb | ./RBdemo -+ -$(TAR) matrices/qc324.tar.gz qc324/qc324.rb | ./RBdemo -+ -$(TAR) matrices/plskz362.tar.gz plskz362/plskz362.rb | ./RBdemo -+ -$(TAR) matrices/west0067.tar.gz west0067/west0067.rb | ./RBdemo -+ -$(TAR) matrices/Tina_DisCog.tar.gz Tina_DisCog/Tina_DisCog.rb | ./RBdemo -+ -./RBdemo matrices/m4.rb -+ -./RBdemo matrices/s4.rb -+ -./RBdemo matrices/m4b.rb -+ -./RBdemo mangled/1.rb -+ -./RBdemo mangled/2.rb -+ -./RBdemo mangled/3.rb -+ -./RBdemo mangled/4.rb -+ -./RBdemo mangled/5.rb -+ -./RBdemo mangled/6.rb -+ -./RBdemo mangled/7.rb -+ -./RBdemo mangled/8.rb -+ -./RBdemo mangled/9.rb -+ -./RBdemo mangled/10.rb -+ -./RBdemo mangled/11.rb -+ -./RBdemo mangled/12.rb -+ -./RBdemo mangled/13.rb -+ -./RBdemo mangled/14.rb -+ -./RBdemo mangled/15.rb ++ $(top_srcdir)/RBio/private/bcsstk01.rb \ ++ $(top_srcdir)/RBio/private/farm.rb \ ++ $(top_srcdir)/RBio/private/lap_25.pse \ ++ $(top_srcdir)/RBio/private/lap_25.rb \ ++ $(top_srcdir)/RBio/private/west0479.rb \ ++ $(top_srcdir)/RBio/private/west0479.rua \ ++ $(addprefix $(srcdir)/,$(dist_noinst_DATA)) ++ ++COV = \ ++ $(top_srcdir)/Source/RBio.c \ ++ $(top_srcdir)/Demo/RBdemo.c \ ++ $(srcdir)/RBtest.c ++ ++check-local: $(check_PROGRAMS) $(RB) $(COV) ++ -./RBdemo $(top_srcdir)/RBio/private/bcsstk01.rb ++ -./RBdemo $(top_srcdir)/RBio/private/farm.rb ++ -./RBdemo $(top_srcdir)/RBio/private/lap_25.pse ++ -./RBdemo $(top_srcdir)/RBio/private/lap_25.rb ++ -./RBdemo $(top_srcdir)/RBio/private/west0479.rb ++ -./RBdemo $(top_srcdir)/RBio/private/west0479.rua ++ -$(TAR) $(srcdir)/matrices/dwg961a.tar.gz dwg961a/dwg961a.rb | ./RBdemo ++ -$(TAR) $(srcdir)/matrices/mhd1280a.tar.gz mhd1280a/mhd1280a.rb | ./RBdemo ++ -$(TAR) $(srcdir)/matrices/mhd1280b.tar.gz mhd1280b/mhd1280b.rb | ./RBdemo ++ -$(TAR) $(srcdir)/matrices/qc324.tar.gz qc324/qc324.rb | ./RBdemo ++ -$(TAR) $(srcdir)/matrices/plskz362.tar.gz plskz362/plskz362.rb | ./RBdemo ++ -$(TAR) $(srcdir)/matrices/west0067.tar.gz west0067/west0067.rb | ./RBdemo ++ -$(TAR) $(srcdir)/matrices/Tina_DisCog.tar.gz Tina_DisCog/Tina_DisCog.rb | ./RBdemo ++ -./RBdemo $(srcdir)/matrices/m4.rb ++ -./RBdemo $(srcdir)/matrices/s4.rb ++ -./RBdemo $(srcdir)/matrices/m4b.rb ++ -./RBdemo $(srcdir)/mangled/1.rb ++ -./RBdemo $(srcdir)/mangled/2.rb ++ -./RBdemo $(srcdir)/mangled/3.rb ++ -./RBdemo $(srcdir)/mangled/4.rb ++ -./RBdemo $(srcdir)/mangled/5.rb ++ -./RBdemo $(srcdir)/mangled/6.rb ++ -./RBdemo $(srcdir)/mangled/7.rb ++ -./RBdemo $(srcdir)/mangled/8.rb ++ -./RBdemo $(srcdir)/mangled/9.rb ++ -./RBdemo $(srcdir)/mangled/10.rb ++ -./RBdemo $(srcdir)/mangled/11.rb ++ -./RBdemo $(srcdir)/mangled/12.rb ++ -./RBdemo $(srcdir)/mangled/13.rb ++ -./RBdemo $(srcdir)/mangled/14.rb ++ -./RBdemo $(srcdir)/mangled/15.rb + -./RBtest -+ -gcov *.c > gcov.out -+ -grep "#####" RBio.c.gcov | wc -l ++ -gcov -o $(builddir) $(COV) > gcov.out ++ -grep -c "#####" RBio.c.gcov + -+clean-local: -+ -$(RM) gcov.out *.gcov *.gcda *.gcno temp*.rb ++CLEANFILES = gcov.out *.gcov *.gcda *.gcno temp*.rb diff --git a/configure.ac b/configure.ac new file mode 100644 --- /dev/null +++ b/configure.ac -@@ -0,0 +1,31 @@ -+AC_PREREQ([2.68]) -+AC_INIT([RBio],[2.0.1],[davis@cise.ufl.edu]) +@@ -0,0 +1,41 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ([2.69]) ++AC_INIT([RBio],[2.1.1],[DrTimothyAldenDavis@gmail.com],[rbio],[http://www.suitesparse.com/]) +AC_CONFIG_SRCDIR([Source/RBio.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 + +LIBS_SAVED=$LIBS + -+AC_CHECK_HEADERS([stddef.h stdlib.h string.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])]) ++ ++# Checks for header files. ++AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) ++ ++# Checks for typedefs, structures, and compiler characteristics. ++ ++# Checks for library functions. + +LIBS=$LIBS_SAVED + @@ -225,7 +231,7 @@ diff --git a/rbio.pc.in b/rbio.pc.in new file mode 100644 --- /dev/null +++ b/rbio.pc.in -@@ -0,0 +1,11 @@ +@@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ @@ -234,6 +240,7 @@ new file mode 100644 +Name: @PACKAGE_NAME@ +Description: Toolbox for reading/writing sparse matrices in Rutherford/Boeing format +Version: @PACKAGE_VERSION@ -+Requires.private: ufconfig ++URL: @PACKAGE_URL@ ++Requires.private: suitesparseconfig +Libs: -L${libdir} -lrbio +Cflags: -I${includedir}/rbio -- cgit v1.2.3