academic/jalview: Updated for version 2.11.1.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 9 insertions, 42 deletions

diff --git a/academic/jalview/jalview b/academic/jalview/jalview
index 31813c2c2a..cfdcceef1f 100644
--- a/academic/jalview/jalview
+++ b/academic/jalview/jalview
@@ -1,16 +1,2 @@
 #!/bin/sh
-
-# This wrapper script is taken from Arch Linux AUR entry of jalview.
-# https://aur.archlinux.org/packages/jalview/
-# Maintainer of the PKGBUILD is Stefan Seemayer.
-
-progname="jalview"
-mainclass="jalview.bin.Jalview"
-basedir="/usr/share/java/$progname"
-
-# build classpath: all jars in $basedir
-cp=$( ls $basedir/*.jar | xargs echo | sed "s/ /:/g" );
-
-
-# run jar
-"$JAVA_HOME/bin/java" -cp $cp $mainclass
+java -jar /opt/jalview/jalview
diff --git a/academic/jalview/jalview.SlackBuild b/academic/jalview/jalview.SlackBuild
index 1ec9acf47f..30d2cdbe8f 100644
--- a/academic/jalview/jalview.SlackBuild
+++ b/academic/jalview/jalview.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jalview
 
-# Copyright 2013-2016 Petar Petrov slackalaxy@gmail.com
+# Copyright 2013-2020 Petar Petrov slackalaxy@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,15 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# With help from the jalview PKGBUILD at Arch linux AUR:
-# https://aur.archlinux.org/packages/jalview/
-
 PRGNAM=jalview
-VERSION=${VERSION:-2.10.0b1}
+VERSION=${VERSION:-2.11.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
+JAVA=j1.8
+
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -42,27 +41,11 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p $PKG/usr/share/java/$PRGNAM
-cp -a *.jar $PKG/usr/share/java/$PRGNAM
 
-# The wrapper is from Arch. Thank you!
+install -D -m755 $CWD/$PRGNAM-all-$VERSION-$JAVA.jar $PKG/opt/$PRGNAM/$PRGNAM
 install -D -m755 $CWD/$PRGNAM $PKG/usr/bin/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  building.html exampleFeatures.txt LICENSE README_IA \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/TheJalviewTutorial_screen.pdf > $PKG/usr/doc/$PRGNAM-$VERSION/Tutorial.pdf
 cat $CWD/References > $PKG/usr/doc/$PRGNAM-$VERSION/References
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/academic/jalview/jalview.info b/academic/jalview/jalview.info
index 928c20cf89..499422a4d6 100644
--- a/academic/jalview/jalview.info
+++ b/academic/jalview/jalview.info
@@ -1,10 +1,8 @@
 PRGNAM="jalview"
-VERSION="2.10.0b1"
+VERSION="2.11.1.0"
 HOMEPAGE="http://www.jalview.org/"
-DOWNLOAD="http://sourceforge.net/projects/sboppetrov/files/JalView/2.10/jalview-2.10.0b1.tar.gz \
-	http://sourceforge.net/projects/sboppetrov/files/JalView/TheJalviewTutorial_screen.pdf"
-MD5SUM="fb5b30202210e21647ecc7da5242bab3 \
-	5e2f8da8f2528049f055263aecd2f8af"
+DOWNLOAD="http://www.jalview.org/getdown/release/jalview-all-2.11.1.0-j1.8.jar"
+MD5SUM="7f79b598a5bfd25d89adf6fe8c9b98f7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"