3 files changed, 17 insertions, 27 deletions
diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild
index 0e2b9552c9..3f85721317 100644
--- a/academic/octave/octave.SlackBuild
+++ b/academic/octave/octave.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for octave
 
-# Copyright 2012 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2012-2013 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=octave
-VERSION=${VERSION:-3.6.3}
+VERSION=${VERSION:-3.6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,6 +67,10 @@ fi
 # Larger values will make your Magick package slower and use more memory.
 WITH_MAGICK=${WITH_MAGICK:-ImageMagick} # alternatively, "GraphicsMagick"
 
+# umfpack.h includes amd.h, which may be installed outside of the standard
+# search dirs if you use the SBo packages.  This ensures UMFPACK is found.
+WITH_AMD_INCLUDEDIR=${WITH_AMD_INCLUDEDIR:-/usr/include/amd}
+
 set -e
 
 rm -rf $PKG
@@ -76,21 +80,7 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 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.
+chmod -R u+w,go-w,a+rX-st .
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -107,7 +97,7 @@ FFLAGS="$SLKCFLAGS" \
   --disable-static \
   --enable-strict-warning-flags \
   --with-magick=$WITH_MAGICK \
-  --with-amd-includedir=/usr/include/amd \
+  --with-amd-includedir=$WITH_AMD_INCLUDEDIR \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/academic/octave/octave.info b/academic/octave/octave.info
index 07bd18e671..e39f690fda 100644
--- a/academic/octave/octave.info
+++ b/academic/octave/octave.info
@@ -1,10 +1,10 @@
 PRGNAM="octave"
-VERSION="3.6.3"
+VERSION="3.6.4"
 HOMEPAGE="http://www.gnu.org/software/octave/"
-DOWNLOAD="ftp://ftp.gnu.org/gnu/octave/octave-3.6.3.tar.bz2"
-MD5SUM="29ab7e502e5c963c058906f788670245"
+DOWNLOAD="ftp://ftp.gnu.org/gnu/octave/octave-3.6.4.tar.bz2"
+MD5SUM="e0d3e5e3d38a66d3f8593ba065c6e2fd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lapack"
+REQUIRES="%README% lapack"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
diff --git a/academic/octave/slack-desc b/academic/octave/slack-desc
index 273b8b09d9..7794ab954e 100644
--- a/academic/octave/slack-desc
+++ b/academic/octave/slack-desc
@@ -1,9 +1,9 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
 octave: GNU Octave (Matlab clone)