7 files changed, 67 insertions, 18 deletions
diff --git a/games/VASSAL/README b/games/VASSAL/README
index 1a71ca5c1e..448bc11ac3 100644
--- a/games/VASSAL/README
+++ b/games/VASSAL/README
@@ -1,3 +1,3 @@
-VASSAL is a game engine for building and playing online adaptations of board
-games and card games. Play live on the Internet or by email. VASSAL runs on all
-platforms, and is free, open-source software.
+VASSAL is a game engine for building and playing online adaptations
+of board games and card games. Play live on the Internet or by
+email. VASSAL runs on all platforms, and is free, open-source software.
diff --git a/games/VASSAL/VASSAL b/games/VASSAL/VASSAL
deleted file mode 100644
index 2f833e3399..0000000000
--- a/games/VASSAL/VASSAL
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/games/VASSAL
-./VASSAL.sh
diff --git a/games/VASSAL/VASSAL-mime.xml b/games/VASSAL/VASSAL-mime.xml
new file mode 100644
index 0000000000..9ce2e12f9c
--- /dev/null
+++ b/games/VASSAL/VASSAL-mime.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-vnd.vassalengine.module">
+    <sub-class-of type="application/octet-stream"/>
+    <comment>VASSAL module</comment>
+    <glob pattern="*.vmod"/>
+    <icon name="VASSAL"/>
+  </mime-type>
+  <mime-type type="application/x-vnd.vassalengine.module-extension">
+    <sub-class-of type="application/octet-stream"/>
+    <comment>VASSAL module extension</comment>
+    <glob pattern="*.vmdx"/>
+    <icon name="VASSAL"/>
+  </mime-type>
+  <mime-type type="application/x-vnd.vassalengine.game-log">
+    <sub-class-of type="application/octet-stream"/>
+    <comment>VASSAL game log</comment>
+    <glob pattern="*.vlog"/>
+    <icon name="VASSAL"/>
+  </mime-type>
+  <mime-type type="application/x-vnd.vassalengine.saved-game">
+    <sub-class-of type="application/octet-stream"/>
+    <comment>VASSAL saved game</comment>
+    <glob pattern="*.vsav"/>
+    <icon name="VASSAL"/>
+  </mime-type>
+</mime-info>
diff --git a/games/VASSAL/VASSAL.SlackBuild b/games/VASSAL/VASSAL.SlackBuild
index 8fabf966a7..dc1dc7380d 100644
--- a/games/VASSAL/VASSAL.SlackBuild
+++ b/games/VASSAL/VASSAL.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for VASSAL
 
-# Copyright 2019 Benjamin Trigona-Harant <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harant <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=VASSAL
-VERSION=${VERSION:-3.2.17}
+VERSION=${VERSION:-3.6.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,18 +82,22 @@ find -L . \
 mkdir -p $PKG/usr/bin $PKG/usr/share/games/$PRGNAM
 cp -rf lib $PKG/usr/share/games/$PRGNAM
 
-install -D -m0755 $PRGNAM.sh $PKG/usr/share/games/$PRGNAM/$PRGNAM.sh
-install -D -m0755 $CWD/VASSAL $PKG/usr/bin
+sed -i "s|^\(INSTALL_DIR=\).*|\1/usr/share/games/$PRGNAM|" $PRGNAM.sh
+
+install -D -m0755 $PRGNAM.sh $PKG/usr/bin/$PRGNAM
 
 mkdir -p $PKG/usr/share/applications
 install -D -m644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
+mkdir -p $PKG/usr/share/mime/packages
+install -D -m644 $CWD/$PRGNAM-mime.xml $PKG/usr/share/mime/packages/$PRGNAM-mime.xml
+
 mkdir -p $PKG/usr/share/pixmaps
 install -m644 -D $CWD/$PRGNAM.svg $PKG/usr/share/pixmaps/$PRGNAM.svg
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  CHANGES LICENSE README doc \
+  CHANGES LICENSE README.md doc \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 ln -s /usr/doc/$PRGNAM-$VERSION/doc $PKG/usr/share/games/$PRGNAM/doc
@@ -93,4 +107,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 $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/games/VASSAL/VASSAL.desktop b/games/VASSAL/VASSAL.desktop
index 54e0241956..53988fad6c 100644
--- a/games/VASSAL/VASSAL.desktop
+++ b/games/VASSAL/VASSAL.desktop
@@ -7,3 +7,4 @@ Terminal=false
 Type=Application
 Categories=Game
 GenericName=Board and card game engine
+MimeType=application/x-vnd.vassalengine.module;application/x-vnd.vassalengine.module-extension;application/x-vnd.vassalengine.game-log;application/x-vnd.vassalengine.saved-game
diff --git a/games/VASSAL/VASSAL.info b/games/VASSAL/VASSAL.info
index 985ec47196..b309fe29f5 100644
--- a/games/VASSAL/VASSAL.info
+++ b/games/VASSAL/VASSAL.info
@@ -1,10 +1,10 @@
 PRGNAM="VASSAL"
-VERSION="3.2.17"
+VERSION="3.6.5"
 HOMEPAGE="http://www.vassalengine.org/"
-DOWNLOAD="https://downloads.sourceforge.net/vassalengine/VASSAL-3.2.17-linux.tar.bz2"
-MD5SUM="dc43c18cafcf36cfbc1a0d9eb733d8d1"
+DOWNLOAD="https://github.com/vassalengine/vassal/releases/download/3.6.5/VASSAL-3.6.5-linux.tar.bz2"
+MD5SUM="39235edbc47ca85bfd5f2754ab72a62c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk17"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/games/VASSAL/doinst.sh b/games/VASSAL/doinst.sh
index 5fb28930db..aea0f894eb 100644
--- a/games/VASSAL/doinst.sh
+++ b/games/VASSAL/doinst.sh
@@ -1,3 +1,13 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi