5 files changed, 58 insertions, 27 deletions
diff --git a/games/domination/README b/games/domination/README
index 93b23e8101..f9731d3eb2 100644
--- a/games/domination/README
+++ b/games/domination/README
@@ -7,13 +7,7 @@ Domination is written in Java. It includes a map editor, single-player
 vs. AI, networked multiplayer, and many other features. It works in all
 OSes that run Java 1.4 or higher, and Android.
 
-Since Domination is a Java application, it will require a Java Virtual
-Machine to run. Any of these SBo builds will work:
-
-jdk
-openjdk
-openjdk6
-openjdk8
-
-All of the above install scripts in /etc/profile.d, meaning you must
-log out and back in to run Java applications (including Domination).
+Since Domination is a Java application, it will require a Java
+Virtual Machine to run. It has been tested with zulu-openjdk8 and
+zulu-openjdk11. Other JDK builds (e.g. jdk or openjdk) may work, but
+the SlackBuild author hasn't tested them.
diff --git a/games/domination/doinst.sh b/games/domination/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/domination/doinst.sh
+++ b/games/domination/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/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 usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/domination/domination.SlackBuild b/games/domination/domination.SlackBuild
index fd79e5d14c..d698208061 100644
--- a/games/domination/domination.SlackBuild
+++ b/games/domination/domination.SlackBuild
@@ -1,24 +1,37 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for domination
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 # See README_SBo.txt for more info on this script (I wrote too many
 # comments, moved them to a separate file).
 
+# 20230820 bkw: updated for v1.2.9.
+# 20230109 bkw: updated for v1.2.7.
+# 20211021 bkw: BUILD=2, new-style icons.
+# 20210310 bkw: updated for v1.2.3.
+# 20200928 bkw: updated for v1.2.2.
+# 20200307 bkw: updated fov v1.2.1.
 # 20191202 bkw: updated for v1.2.0.
 # 20161030 bkw: whoops, this should have been noarch to begin with.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=domination
-VERSION=${VERSION:-1.2.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.2.9}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+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}
@@ -41,25 +54,41 @@ find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
 # in fact upstream's wrapper scripts (we include our own).
 rm -rf *.exe *.app *.cmd *.zip *.htm *.sh ._*
 
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
 # Docs first, get rid of DOS line endings.
 sed -i 's,\r,,' *.txt
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+mv *.txt $PKGDOC
+
+mkdir -p $PKG/usr/share/icons/hicolor/16x16/apps
+mv resources/icon.png $PKG/usr/share/icons/hicolor/16x16/apps/$PRGNAM.png
 
 # Everything else goes in the game dir. share/ is OK as there's no
 # native binaries.
 mkdir -p $PKG/usr/share/games/$PRGNAM
 mv * $PKG/usr/share/games/$PRGNAM
 
+# not sure the copy in resources/ is even used, but keep it.
+ln -s ../../../icons/hicolor/16x16/apps/$PRGNAM.png \
+      $PKG/usr/share/games/$PRGNAM/resources/icon.png
+
 # Wrapper scripts.
 mkdir -p $PKG/usr/games
 install -m0755 $CWD/$PRGNAM.sh $PKG/usr/games/$PRGNAM
 ln -s $PRGNAM $PKG/usr/games/$PRGNAM-swing
 
-# resources/icon.png is only 16x16. Use 128x128 icon instead, extracted
-# from the OSX app bundle with icns2png.
+# resources/icon.png is only 16x16. Use 128x128 icon for the larger
+# sizes, extracted from the OSX app bundle with icns2png.
+for px in 32 48 64 128; do
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  convert -resize $size $CWD/$PRGNAM.png $dir/$PRGNAM.png
+done
+
 mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 # .desktop written for this SlackBuild.
 APPDIR=$PKG/usr/share/applications
@@ -69,9 +98,11 @@ cat $CWD/$PRGNAM-swing.desktop > $APPDIR/$PRGNAM-swing.desktop
 
 # no man pages, no command-line options.
 
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
 mkdir -p $PKG/install
 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/domination/domination.desktop b/games/domination/domination.desktop
index b6966b1b0a..2188409f54 100644
--- a/games/domination/domination.desktop
+++ b/games/domination/domination.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Domination
-Exec=domination
+Exec=/usr/games/domination
 Icon=domination
 Type=Application
 Terminal=false
diff --git a/games/domination/domination.info b/games/domination/domination.info
index 3d6f216542..5d9c4d49f6 100644
--- a/games/domination/domination.info
+++ b/games/domination/domination.info
@@ -1,10 +1,10 @@
 PRGNAM="domination"
-VERSION="1.2.0"
+VERSION="1.2.9"
 HOMEPAGE="http://domination.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/domination/Domination/1.2.0/Domination_1.2.0.zip"
-MD5SUM="46348ca2e7112fac7aad8f208c8b2ac6"
+DOWNLOAD="https://downloads.sourceforge.net/project/domination/Domination/1.2.9/Domination_1.2.9.zip"
+MD5SUM="afb8b81c75e18c0ec5c18a2b4ed32151"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"