summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Kyle Guinn <elyk03@gmail.com>2010-08-30 06:44:08 -0500
committer Erik Hanson <erik@slackbuilds.org>2010-08-30 07:49:51 -0500
commit093b534a9e1aa6f9e976397cddc8dff2cf6037a8 (patch)
tree98bc474bc6f1db62b9b9ad43a2e7ac35ff44d40c
parentac874407e271711df6fc8dffe0fe3feb15e007b0 (diff)
downloadslackbuilds-093b534a9e1aa6f9e976397cddc8dff2cf6037a8.tar.gz
slackbuilds-093b534a9e1aa6f9e976397cddc8dff2cf6037a8.tar.xz
academic/octave: Build bump, various changes.
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
-rw-r--r--academic/octave/README12
-rw-r--r--academic/octave/octave.SlackBuild22
-rw-r--r--academic/octave/octave.info2
3 files changed, 15 insertions, 21 deletions
diff --git a/academic/octave/README b/academic/octave/README
index b2f23bd2ba..006cd2b061 100644
--- a/academic/octave/README
+++ b/academic/octave/README
@@ -7,8 +7,18 @@ also be used as a batch-oriented language.
These optional dependencies will be used if found:
* BLAS
* LAPACK
+* AMD
+* CAMD
+* COLAMD
+* CCOLAMD
+* CHOLMOD
+* UMFPACK
+* CXSparse
* glpk
+* arpack
+* qrupdate
* qhull
* HDF5
-* ftgl
* fltk
+* ftgl
+* GraphicsMagick
diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild
index 32e2bfd11a..2747d1222d 100644
--- a/academic/octave/octave.SlackBuild
+++ b/academic/octave/octave.SlackBuild
@@ -6,15 +6,13 @@
PRGNAM="octave"
VERSION=${VERSION:-3.2.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -51,14 +49,6 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-st .
-# qhull 2010.1 does not install qhull/qhull.h; this file is for "backwards
-# compatibility" and just redirects to qhull/libqhull.h. Octave tries to
-# use the old header only to compile a test during ./configure. The test
-# fails because the old header doesn't exist, and as a result Octave won't
-# use qhull. This line fixes the test, but you may need to comment it out
-# if you intend on using an older version of qhull.
-sed -i 's/qhull\/qhull\.h/qhull\/libqhull\.h/g' configure aclocal.m4
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
FFLAGS="$SLKCFLAGS" \
@@ -83,16 +73,10 @@ make install-strip DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $(find . -type l); do \
- ln -s $(readlink $i).gz $i.gz; \
- rm $i; \
- done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*
+gzip -9 $PKG/usr/info/*.info*
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/academic/octave/octave.info b/academic/octave/octave.info
index ae889c8f4c..ad3d03be0c 100644
--- a/academic/octave/octave.info
+++ b/academic/octave/octave.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Kyle Guinn"
EMAIL="elyk03@gmail.com"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"