From 5307ca63df81e5323f6a0f861c69b3c408c6cf8b Mon Sep 17 00:00:00 2001
From: Mauro Giachero <mauro_dot_giachero_at_gmail_dot_com>
Date: Thu, 13 May 2010 00:20:20 +0200
Subject: academic/qtoctave: Updated for version 0.8.1

---
 academic/qtoctave/README              |  2 +-
 academic/qtoctave/qtoctave.SlackBuild | 16 +++++++++++-----
 academic/qtoctave/qtoctave.info       |  2 ++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/academic/qtoctave/README b/academic/qtoctave/README
index 8717567203..63b623c501 100644
--- a/academic/qtoctave/README
+++ b/academic/qtoctave/README
@@ -1,4 +1,4 @@
 QtOctave is a graphical user interface for gnu octave, which is an
 open source program alternative to Matlab.
 
-QtOctave requires Octave and Qt4, both available on SlackBuilds.org.
+QtOctave requires Octave available on SlackBuilds.org.
diff --git a/academic/qtoctave/qtoctave.SlackBuild b/academic/qtoctave/qtoctave.SlackBuild
index fc0c8a2326..9c8f16d38a 100644
--- a/academic/qtoctave/qtoctave.SlackBuild
+++ b/academic/qtoctave/qtoctave.SlackBuild
@@ -18,10 +18,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686 -DNDEBUG"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686 -DNDEBUG"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-   SLKCFLAGS="-O2 -fPIC -DNDEBUG"
+  SLKCFLAGS="-O2 -fPIC -DNDEBUG"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e # Exit on most errors
@@ -43,7 +46,8 @@ cmake \
   -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
   -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-  .
+  -DLIB_SUFFIX:STRING=${LIBDIRSUFFIX}  .
+
 make
 
 # The install target doesn't have a DESTDIR or INSTALL_ROOT or equivalent,
@@ -73,8 +77,10 @@ find $PKG/usr/share -type f -exec chmod 0644 {} \;
 find $PKG/usr/share -type d -exec chmod 0755 {} \;
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -91,4 +97,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/qtoctave/qtoctave.info b/academic/qtoctave/qtoctave.info
index ac60be796f..7ab59b4610 100644
--- a/academic/qtoctave/qtoctave.info
+++ b/academic/qtoctave/qtoctave.info
@@ -2,7 +2,9 @@ PRGNAM="qtoctave"
 VERSION="0.8.1"
 HOMEPAGE="http://qtoctave.wordpress.com/"
 DOWNLOAD="http://forja.rediris.es/frs/download.php/877/qtoctave-0.8.1.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="b4e237b578f9c2624bb0fab2cb7ea691"
+MD5SUM_x86_64=""
 MAINTAINER="Mauro Giachero"
 EMAIL="mauro_dot_giachero_at_gmail_dot_com"
 APPROVED="David Somero"
-- 
cgit v1.2.3