6 files changed, 20 insertions, 35 deletions
diff --git a/academic/scilab/README b/academic/scilab/README
index 61342510b8..af52883e5d 100644
--- a/academic/scilab/README
+++ b/academic/scilab/README
@@ -5,3 +5,7 @@ enhancement, fluid dynamics simulations, numerical optimization, and
 modeling and simulation of explicit and implicit dynamical systems.
 MATLAB code, which is similar in syntax, can be converted to Scilab.
 Scilab is one of several open source alternatives to MATLAB.
+
+If you want Scilab to use the system JVM instead of its own (and
+eventually save about 100 MB of disk space), pass USE_SYSTEM_JVM=yes
+to the script (default is "no"). Note: this may cause problems.
diff --git a/academic/scilab/profile.d/scilab.csh b/academic/scilab/profile.d/scilab.csh
index a1819556e0..fb38836b3c 100644
--- a/academic/scilab/profile.d/scilab.csh
+++ b/academic/scilab/profile.d/scilab.csh
@@ -1,6 +1,3 @@
 #!/bin/csh
-
 setenv PATH ${PATH}:/opt/scilab/bin
-
 setenv PKG_CONFIG_PATH ${PKG_CONFIG_PATH}:/opt/scilab/lib/pkgconfig
-
diff --git a/academic/scilab/profile.d/scilab.sh b/academic/scilab/profile.d/scilab.sh
index 387c42c9c9..18e5f88d18 100644
--- a/academic/scilab/profile.d/scilab.sh
+++ b/academic/scilab/profile.d/scilab.sh
@@ -1,8 +1,3 @@
 #!/bin/sh
-
-PATH=${PATH}:/opt/scilab/bin
-export PATH
-
-PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/opt/scilab/lib/pkgconfig
-export PKG_CONFIG_PATH
-
+export PATH=${PATH}:/opt/scilab/bin
+export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/opt/scilab/lib/pkgconfig
diff --git a/academic/scilab/scilab.SlackBuild b/academic/scilab/scilab.SlackBuild
index 7737c13fc9..4872772c26 100644
--- a/academic/scilab/scilab.SlackBuild
+++ b/academic/scilab/scilab.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Scilab
 
-# Copyright 2011  Fridrich von Stauffenberg <cancellor2@gmail.com>
+# Copyright 2011-2012  Fridrich von Stauffenberg <cancellor2@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=scilab
 VERSION=${VERSION:-5.3.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -47,31 +47,20 @@ if [ "$ARCH" != "i686" ] && [ "$ARCH" != "x86_64" ]; then
   exit 1
 fi
 
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.bin.linux-$ARCH.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
+[ "${USE_SYSTEM_JVM:-no}" = "no" ] && \
+  EXCLUDE="" || EXCLUDE="--exclude thirdparty/java"
 
-mkdir -p $PKG/opt/$PRGNAM
-mv * $PKG/opt/$PRGNAM
+rm -rf $PKG
+mkdir -p $OUTPUT $TMP $PKG/opt
+tar xvf $CWD/$PRGNAM-$VERSION.bin.linux-$ARCH.tar.gz -C $PKG/opt $EXCLUDE
+mv $PKG/opt/$PRGNAM{-$VERSION,}
+chown -R root:root $PKG/opt/$PRGNAM
 
-# By default, scilab-cli.desktop executes scilab-cli,
-# but scilab-adv-cli.desktop does exactly the same. Why? Who knows.
-sed -i '/^Exec/s/-cli/-adv-cli/' \
+sed -i "/^Exec/s/-cli/-adv-cli/" \
   $PKG/opt/$PRGNAM/share/applications/$PRGNAM-adv-cli.desktop
-
-# By default, all *.desktop files are looking for their icons
-# somewhere inside /usr. Why? No idea.
-sed -i '/^Icon/s/-cli//;/^Icon/s/\/usr/\/opt\/scilab/' \
+sed -i "/^Icon/s/-cli//;/^Icon/s/\/usr/\/opt\/$PRGNAM/" \
   $PKG/opt/$PRGNAM/share/applications/*.desktop
-
-# By default, scilab.pc contains something like this:
-# "prefix=/home/scilab/SuperCC/sci_binary/scilab-5.3.3"
-# WTF? Don't even ask.
-sed -i '/^prefix/s/=.*$/=\/opt\/scilab/' \
+sed -i "/^prefix/s/=.*\$/=\/opt\/$PRGNAM/" \
   $PKG/opt/$PRGNAM/lib/pkgconfig/$PRGNAM.pc
 
 mkdir -p $PKG/etc/profile.d
diff --git a/academic/scilab/scilab.info b/academic/scilab/scilab.info
index ddf861d69f..120fade8b6 100644
--- a/academic/scilab/scilab.info
+++ b/academic/scilab/scilab.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64="http://www.scilab.org/download/5.3.3/scilab-5.3.3.bin.linux-x86
 MD5SUM_x86_64="f9d72cbe90176513d8c4592c38fc0f23"
 MAINTAINER="Fridrich von Stauffenberg"
 EMAIL="cancellor2@gmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/academic/scilab/slack-desc b/academic/scilab/slack-desc
index ef2fe92af8..8f5ea6af87 100644
--- a/academic/scilab/slack-desc
+++ b/academic/scilab/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-scilab: Scilab (numerical computing package)
+scilab: scilab (numerical computing package)
 scilab:
 scilab: Scilab is an open source, cross-platform numerical computational
 scilab: package and a high-level, numerically oriented programming language.