1 files changed, 21 insertions, 23 deletions
diff --git a/academic/scilab/scilab.SlackBuild b/academic/scilab/scilab.SlackBuild
index 4872772c26..63cc6b9013 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}