academic/octave: Updated for version 3.4.0.

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

4 files changed, 26 insertions, 32 deletions

diff --git a/academic/octave/README b/academic/octave/README
index 006cd2b061b4..76a9de62c784 100644
--- a/academic/octave/README
+++ b/academic/octave/README
@@ -4,21 +4,8 @@ linear and nonlinear problems numerically, and for performing other numerical
 experiments using a language that is mostly compatible with Matlab.  It may
 also be used as a batch-oriented language.
 
+This requires blas and lapack.
+
 These optional dependencies will be used if found:
-* BLAS
-* LAPACK
-* AMD
-* CAMD
-* COLAMD
-* CCOLAMD
-* CHOLMOD
-* UMFPACK
-* CXSparse
-* glpk
-* arpack
-* qrupdate
-* qhull
-* HDF5
-* fltk
-* ftgl
-* GraphicsMagick
+AMD, CAMD, COLAMD, CCOLAMD, CHOLMOD, UMFPACK, CXSparse, glpk,
+arpack, qrupdate, qhull, HDF5, fltk, ftgl, and GraphicsMagick
diff --git a/academic/octave/doinst.sh b/academic/octave/doinst.sh
index 12009358229b..4e8ba7071dea 100644
--- a/academic/octave/doinst.sh
+++ b/academic/octave/doinst.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild
index 2747d1222d83..744a8dc5ea6a 100644
--- a/academic/octave/octave.SlackBuild
+++ b/academic/octave/octave.SlackBuild
@@ -2,11 +2,10 @@
 
 # Slackware build script for octave
 # Written by Kyle Guinn <elyk03@gmail.com>
-# HDF5 support by Aleksandar Samardzic <asamardzic@matf.bg.ac.yu>
 
 PRGNAM="octave"
-VERSION=${VERSION:-3.2.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.4.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -22,7 +21,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM-$VERSION
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="BUGS COPYING ChangeLog* INSTALL* NEWS* PROJECTS README* ROADMAP SENDING-PATCHES"
+DOCS="AUTHORS BUGS COPYING ChangeLog* INSTALL* NEWS* PROJECTS README*"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -49,6 +48,20 @@ 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" \
@@ -63,16 +76,12 @@ FFLAGS="$SLKCFLAGS" \
   --enable-shared \
   --disable-static \
   --enable-strict-warning-flags \
+  --with-amd-includedir=/usr/include/amd \
   --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
-# install-strip doesn't strip the files in usr/lib/octave-$VERSION,
-# so leave this in for now.
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 rm -f $PKG/usr/info/dir
diff --git a/academic/octave/octave.info b/academic/octave/octave.info
index ad3d03be0c78..3d529cf0e6ae 100644
--- a/academic/octave/octave.info
+++ b/academic/octave/octave.info
@@ -1,10 +1,10 @@
 PRGNAM="octave"
-VERSION="3.2.4"
+VERSION="3.4.0"
 HOMEPAGE="http://www.gnu.org/software/octave/"
-DOWNLOAD="ftp://ftp.octave.org/pub/octave/octave-3.2.4.tar.bz2"
-MD5SUM="608196657f4fa010420227b77333bb71"
+DOWNLOAD="ftp://ftp.gnu.org/gnu/octave/octave-3.4.0.tar.bz2"
+MD5SUM="c8144cee1d37e645d3368a8e8a5f1856"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"