From 5c9469e88f20f765f744d89c2787a8ca700626d0 Mon Sep 17 00:00:00 2001
From: Kyle Guinn <elyk03@gmail.com>
Date: Sun, 9 Oct 2011 00:44:49 -0300
Subject: academic/octave: Updated for version 3.4.2.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
---
 academic/octave/README            |  4 ++++
 academic/octave/octave.SlackBuild | 14 +++++++++++---
 academic/octave/octave.info       |  8 ++++----
 3 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'academic/octave')

diff --git a/academic/octave/README b/academic/octave/README
index 76a9de62c7..f7e281e3c6 100644
--- a/academic/octave/README
+++ b/academic/octave/README
@@ -9,3 +9,7 @@ This requires blas and lapack.
 These optional dependencies will be used if found:
 AMD, CAMD, COLAMD, CCOLAMD, CHOLMOD, UMFPACK, CXSparse, glpk,
 arpack, qrupdate, qhull, HDF5, fltk, ftgl, and GraphicsMagick
+
+ImageMagick (part of Slackware) will be used instead of GraphicsMagick by
+default.  To override this, use:
+WITH_MAGICK=GraphicsMagick ./octave.SlackBuild
diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild
index 744a8dc5ea..57f1ecbfb7 100644
--- a/academic/octave/octave.SlackBuild
+++ b/academic/octave/octave.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Kyle Guinn <elyk03@gmail.com>
 
 PRGNAM="octave"
-VERSION=${VERSION:-3.4.0}
+VERSION=${VERSION:-3.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -18,10 +18,10 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM-$VERSION
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS BUGS COPYING ChangeLog* INSTALL* NEWS* PROJECTS README*"
+DOCS="AUTHORS BUGS COPYING ChangeLog INSTALL* NEWS README"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -37,6 +37,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Default to use ImageMagick (shipped with Slackware) instead of
+# GraphicsMagick so that octave will have at least some sort of image
+# reading capabilities.  ImageMagick limits images to 16bpp, but if you're
+# running a multilib environment, it might be easier to accept this limit
+# rather than to compile GraphicsMagick.  (thanks to Joni Martikainen)
+WITH_MAGICK=${WITH_MAGICK:-ImageMagick} # alternatively, "GraphicsMagick"
+
 set -e
 
 rm -rf $PKG
@@ -76,6 +83,7 @@ FFLAGS="$SLKCFLAGS" \
   --enable-shared \
   --disable-static \
   --enable-strict-warning-flags \
+  --with-magick=$WITH_MAGICK \
   --with-amd-includedir=/usr/include/amd \
   --build=$ARCH-slackware-linux
 
diff --git a/academic/octave/octave.info b/academic/octave/octave.info
index 3d529cf0e6..d326be3bf6 100644
--- a/academic/octave/octave.info
+++ b/academic/octave/octave.info
@@ -1,10 +1,10 @@
 PRGNAM="octave"
-VERSION="3.4.0"
+VERSION="3.4.2"
 HOMEPAGE="http://www.gnu.org/software/octave/"
-DOWNLOAD="ftp://ftp.gnu.org/gnu/octave/octave-3.4.0.tar.bz2"
-MD5SUM="c8144cee1d37e645d3368a8e8a5f1856"
+DOWNLOAD="ftp://ftp.gnu.org/gnu/octave/octave-3.4.2.tar.bz2"
+MD5SUM="31c744ab4555a2bf04d5e644b93f9b51"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
-APPROVED="rworkman"
+APPROVED="Niels Horn"
-- 
cgit v1.2.3