5 files changed, 89 insertions, 38 deletions
diff --git a/games/doomsday/README b/games/doomsday/README
index 9794cae7ee..7194930ef3 100644
--- a/games/doomsday/README
+++ b/games/doomsday/README
@@ -1,4 +1,6 @@
-A portable game engine for classic first person shooters such as
-DOOM, Heretic and Hexen. Lets you enjoy the original games using
-modern technology, including high-resolution OpenGL graphics, 3D
-models, and dynamic lighting effects.
+doomsday (portable game engine for Doom and related games)
+
+Doomsday is a portable game engine for classic first person shooters
+such as DOOM, Heretic and Hexen. Lets you enjoy the original games
+using modern technology, including high-resolution OpenGL graphics,
+3D models, and dynamic lighting effects.
diff --git a/games/doomsday/doinst.sh b/games/doomsday/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/doomsday/doinst.sh
+++ b/games/doomsday/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/doomsday/doomsday.SlackBuild b/games/doomsday/doomsday.SlackBuild
index aae23d6b0a..87ce49015a 100644
--- a/games/doomsday/doomsday.SlackBuild
+++ b/games/doomsday/doomsday.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for doomsday
 
@@ -24,6 +24,11 @@
 
 # Now maintained by B. Watson.
 
+# 20211102 bkw: someone else updated this for v2.3.1 BUILD=1.
+# - BUILD=2.
+# - new-style icons.
+# - binaries in /usr/games.
+
 # 20170207 bkw:
 # - Take over maintenance, BUILD=2
 # - Remove OpenAL and fmodapi from REQUIRES, since they are not
@@ -44,11 +49,13 @@
 #         that, do all of the above, then hand off maintenance to someone
 #         who can afford a shinier newer video card than I can.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=doomsday
-SRCNAM=${PRGNAM}-stable
-VERSION=${VERSION:-1.15.8}
+VERSION=${VERSION:-2.3.1}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -58,7 +65,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-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}
@@ -82,35 +93,67 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+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 {} \;
-
-cd $PRGNAM
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# build amethyst
+mkdir -p build-amethyst
+cd build-amethyst
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    ../doomsday/tools/amethyst
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
 
-qmake   # create Makefile
-make    # Build
-make INSTALL_ROOT=$PKG install  # Install engine
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
 cd ..
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+mv $PKG/usr/bin $PKG/usr/games
 
-# move man pages in right place
-mkdir -p $PKG/usr/man
-mv $PKG/usr/share/man/man6 $PKG/usr/man
-rm -rf $PKG/usr/share/man
+DESKDIR=$PKG/usr/share/applications
+chmod -x $DESKDIR/*
+sed -i -e 's,/bin/,/games/,g' \
+       -e '/^Encoding/d' \
+       $DESKDIR/*
+
+mkdir -p $PKG/usr/share/pixmaps
+convert -resize 48x48 \
+  $PKG/usr/share/icons/hicolor/256x256/apps/net.dengine.Doomsday.png \
+  $PKG/usr/share/pixmaps/$PRGNAM.png
+
+# duplicate PNG files
+rm -f $PKG/usr/share/doomsday/deng-logo-256.png
+ln -s ../icons/hicolor/256x256/apps/net.dengine.Doomsday.png \
+      $PKG/usr/share/doomsday/deng-logo-256.png
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# already provided by the assimp package
+rm -fR $PKG/usr/include/assimp
+
+# manually install man pages
+rm -rf $PKG/usr/share/man
+mkdir -p $PKG/usr/man/man6
+for i in doomsday/doc/*.6; do
+  gzip -9c < $i > $PKG/usr/man/man6/$( basename $i ).gz
+done
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc
+mv $PKG/usr/share/doc $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -119,4 +162,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/doomsday/doomsday.info b/games/doomsday/doomsday.info
index 1d21ad5463..7d8c36efaf 100644
--- a/games/doomsday/doomsday.info
+++ b/games/doomsday/doomsday.info
@@ -1,10 +1,10 @@
 PRGNAM="doomsday"
-VERSION="1.15.8"
-HOMEPAGE="http://dengine.net"
-DOWNLOAD="http://downloads.sourceforge.net/project/deng/Doomsday%20Engine/1.15.8/doomsday-stable-1.15.8.tar.gz"
-MD5SUM="14487b988bd3b46580164cdcfa5989d5"
+VERSION="2.3.1"
+HOMEPAGE="https://dengine.net"
+DOWNLOAD="https://downloads.sourceforge.net/deng/doomsday-2.3.1.tar.gz"
+MD5SUM="9ae2a3e053a6f11f37dfb450bb5e53cb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="wxPython assimp SDL2_mixer"
+REQUIRES="assimp"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/games/doomsday/slack-desc b/games/doomsday/slack-desc
index 7654ade002..d047e7f13c 100644
--- a/games/doomsday/slack-desc
+++ b/games/doomsday/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-doomsday: doomsday (portable game engine)
+doomsday: doomsday (portable game engine for Doom and related games)
 doomsday:
 doomsday: A portable game engine for classic first person shooters such as
 doomsday: DOOM, Heretic and Hexen. Lets you enjoy the original games using