aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--academic/octave/octave.SlackBuild22
-rw-r--r--academic/octave/octave.info6
2 files changed, 7 insertions, 21 deletions
diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild
index 57f1ecbfb73ae..f0fb5d54400eb 100644
--- a/academic/octave/octave.SlackBuild
+++ b/academic/octave/octave.SlackBuild
@@ -3,8 +3,8 @@
# Slackware build script for octave
# Written by Kyle Guinn <elyk03@gmail.com>
-PRGNAM="octave"
-VERSION=${VERSION:-3.4.2}
+PRGNAM=octave
+VERSION=${VERSION:-3.6.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -55,20 +55,6 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-st .
-# Several configure checks look for headers in the 'amd' directory
-# instead of 'cxsparse', 'camd', 'colamd', and 'ccolamd' directories
-# as liboctave/oct-sparse.h expects. Fix the typos and reconfigure.
-# Note that camd.h doesn't appear to be included anywhere, but is used
-# to determine if the CAMD library is present.
-sed -i -e 's| amd/cs\.h| cxsparse/cs.h|' \
- -e 's| amd/camd\.h| camd/camd.h|' \
- -e 's| amd/colamd\.h| colamd/colamd.h|' \
- -e 's| amd/ccolamd\.h| ccolamd/ccolamd.h|' configure.ac
-autoreconf -vif
-# If you have amd.h in some non-default location (e.g. /usr/include/amd/amd.h)
-# now the check for umfpack.h will fail because umfpack.h includes "amd.h"
-# instead of "amd/amd.h". The --with-amd-includedir option below fixes this.
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
FFLAGS="$SLKCFLAGS" \
@@ -87,8 +73,8 @@ FFLAGS="$SLKCFLAGS" \
--with-amd-includedir=/usr/include/amd \
--build=$ARCH-slackware-linux
-make
-make install-strip DESTDIR=$PKG
+LANG=C make
+make DESTDIR=$PKG install
find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/academic/octave/octave.info b/academic/octave/octave.info
index 15aab25c96523..07bd18e671d55 100644
--- a/academic/octave/octave.info
+++ b/academic/octave/octave.info
@@ -1,8 +1,8 @@
PRGNAM="octave"
-VERSION="3.4.2"
+VERSION="3.6.3"
HOMEPAGE="http://www.gnu.org/software/octave/"
-DOWNLOAD="ftp://ftp.gnu.org/gnu/octave/octave-3.4.2.tar.bz2"
-MD5SUM="31c744ab4555a2bf04d5e644b93f9b51"
+DOWNLOAD="ftp://ftp.gnu.org/gnu/octave/octave-3.6.3.tar.bz2"
+MD5SUM="29ab7e502e5c963c058906f788670245"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="lapack"