6 files changed, 30 insertions, 38 deletions
diff --git a/academic/scilab/README b/academic/scilab/README
index af52883e5d00..61342510b886 100644
--- a/academic/scilab/README
+++ b/academic/scilab/README
@@ -5,7 +5,3 @@ 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 fb38836b3c2b..28059c556005 100644
--- a/academic/scilab/profile.d/scilab.csh
+++ b/academic/scilab/profile.d/scilab.csh
@@ -1,3 +1,2 @@
 #!/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 18e5f88d18b4..e1d97ccc2c06 100644
--- a/academic/scilab/profile.d/scilab.sh
+++ b/academic/scilab/profile.d/scilab.sh
@@ -1,3 +1,2 @@
 #!/bin/sh
 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 4872772c26ed..63cc6b901394 100644
--- a/academic/scilab/scilab.SlackBuild
+++ b/academic/scilab/scilab.SlackBuild
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=scilab
-VERSION=${VERSION:-5.3.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-5.4.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -40,40 +40,38 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -e
-
 if [ "$ARCH" != "i686" ] && [ "$ARCH" != "x86_64" ]; then
-  printf "\n\n$ARCH is not supported... \n"
+  printf "\n\n$ARCH is not supported...\n"
   exit 1
 fi
 
-[ "${USE_SYSTEM_JVM:-no}" = "no" ] && \
-  EXCLUDE="" || EXCLUDE="--exclude thirdparty/java"
+set -e
 
 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
+mkdir -p $OUTPUT $TMP $PKG/opt/$PRGNAM
+cd $PKG/opt/$PRGNAM
+tar xvf $CWD/$PRGNAM-$VERSION.bin.linux-$ARCH.tar.gz \
+  --strip-components=1
+chown -R root:root .
 
-sed -i "/^Exec/s/-cli/-adv-cli/" \
-  $PKG/opt/$PRGNAM/share/applications/$PRGNAM-adv-cli.desktop
-sed -i "/^Icon/s/-cli//;/^Icon/s/\/usr/\/opt\/$PRGNAM/" \
-  $PKG/opt/$PRGNAM/share/applications/*.desktop
+sed -i "/^Icon/s/=.*\$/=$PRGNAM/;
+        /^Categories/s/Development\;//" \
+  share/applications/*.desktop
 sed -i "/^prefix/s/=.*\$/=\/opt\/$PRGNAM/" \
-  $PKG/opt/$PRGNAM/lib/pkgconfig/$PRGNAM.pc
+  lib/pkgconfig/$PRGNAM.pc
 
 mkdir -p $PKG/etc/profile.d
-cat $CWD/profile.d/scilab.sh > $PKG/etc/profile.d/scilab.sh
-cat $CWD/profile.d/scilab.csh > $PKG/etc/profile.d/scilab.csh
+cat $CWD/profile.d/$PRGNAM.sh > $PKG/etc/profile.d/$PRGNAM.sh
+cat $CWD/profile.d/$PRGNAM.csh > $PKG/etc/profile.d/$PRGNAM.csh
 chmod 0755 $PKG/etc/profile.d/*
 
-mkdir -p $PKG/usr/share/applications
-for TMPVAR in $(ls -1 $PKG/opt/$PRGNAM/share/applications); do
-  ln -s /opt/$PRGNAM/share/applications/$TMPVAR $PKG/usr/share/applications
-done
+mkdir -p $PKG/usr/lib $PKG/usr/share
+mv lib/pkgconfig $PKG/usr/lib
+mv share/applications share/icons share/mime $PKG/usr/share/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv *.txt ACKNOWLEDGE* COPYING* README* CHANGES* RELEASE* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -81,4 +79,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/scilab/scilab.info b/academic/scilab/scilab.info
index f16ba50f8575..90d29b94d2f7 100644
--- a/academic/scilab/scilab.info
+++ b/academic/scilab/scilab.info
@@ -1,10 +1,10 @@
 PRGNAM="scilab"
-VERSION="5.3.3"
+VERSION="5.4.0"
 HOMEPAGE="http://scilab.org"
-DOWNLOAD="http://www.scilab.org/download/5.3.3/scilab-5.3.3.bin.linux-i686.tar.gz"
-MD5SUM="57fa15a535a698f21b54a8b6845d0061"
-DOWNLOAD_x86_64="http://www.scilab.org/download/5.3.3/scilab-5.3.3.bin.linux-x86_64.tar.gz"
-MD5SUM_x86_64="f9d72cbe90176513d8c4592c38fc0f23"
+DOWNLOAD="http://www.scilab.org/download/5.4.0/scilab-5.4.0.bin.linux-i686.tar.gz"
+MD5SUM="6ecd2cb834b1713715601b668043f70e"
+DOWNLOAD_x86_64="http://www.scilab.org/download/5.4.0/scilab-5.4.0.bin.linux-x86_64.tar.gz"
+MD5SUM_x86_64="5a0907c06b289145a479ce47074700ee"
 REQUIRES="jdk"
 MAINTAINER="Fridrich von Stauffenberg"
 EMAIL="cancellor2@gmail.com"
diff --git a/academic/scilab/slack-desc b/academic/scilab/slack-desc
index 8f5ea6af87f4..8f911c36eeea 100644
--- a/academic/scilab/slack-desc
+++ b/academic/scilab/slack-desc
@@ -1,8 +1,8 @@
 # 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
+# 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------------------------------------------------------|