4 files changed, 74 insertions, 28 deletions
diff --git a/games/doomseeker/README b/games/doomseeker/README
index e7335513fb..0e20075e4e 100644
--- a/games/doomseeker/README
+++ b/games/doomseeker/README
@@ -2,15 +2,15 @@ doomseeker (server browser for Doom and related games)
 
 Doomseeker is a cross-platform server browser for Doom and related
 games. The goal of Doomseeker is to provide a smooth, consistent
-experience for players regardless of port or platform. Doomseeker provides
-support for Chocolate Doom, Odamex, Zandronum[*], Sonic Robo Blast 2
-(aka srb2), and Turok 2 Remastered[*].
+experience for players regardless of port or platform. Doomseeker
+provides support for Chocolate Doom, Odamex, Zandronum[*], Sonic Robo
+Blast 2 (aka srb2), and Turok 2 Remastered[*].
 
 The first time you run Doomseeker, you will have tell it the location
 of your game engine binaries and IWAD files. It won't look in your
-PATH for the binaries, they'll be in either /usr/bin, /usr/games,
-or similar. If you don't know where your IWAD file(s) are located,
-try /usr/share/games/doom.
+PATH for the binaries, they'll be in either /usr/bin, /usr/games, or
+similar. If you don't know where your IWAD file(s) are located, try
+/usr/share/games/doom.
 
 This requires one or more of chocolate-doom, odamex, or srb2: to be
 useful for anything, it needs at least one supported game engine.
diff --git a/games/doomseeker/doinst.sh b/games/doomseeker/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/doomseeker/doinst.sh
+++ b/games/doomseeker/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/doomseeker/doomseeker.SlackBuild b/games/doomseeker/doomseeker.SlackBuild
index 30f394999b..172e10f1fc 100644
--- a/games/doomseeker/doomseeker.SlackBuild
+++ b/games/doomseeker/doomseeker.SlackBuild
@@ -1,19 +1,35 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for doomseeker
 
-# 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.
 
+# 20230111 bkw: updated for v1.3.3.
+# 20211102 bkw:
+# - updated for v1.3.2.
+# - new-style icons.
+# - /usr/share/doomseeker => /usr/share/games/doomseeker.
+
+# 20201030 bkw: updated for v1.3.1
+# 20200122 bkw: updated for v1.3+20200119_b623ab1. Latest git fixes
+# a segfault issue that normally only occurs when starting doomseeker
+# without ~/.config/doomseeker/* (so the previous version worked for me,
+# but wouldn't for a new user).
 # 20191211 bkw: updated for v1.3. qt4 support was dropped, qt5 now required.
 # 20181218 bkw: updated for v1.2. Upstream has changed things around,
 # so this script won't build 1.1 any longer.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=doomseeker
-VERSION=${VERSION:-1.3}
+VERSION=${VERSION:-1.3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+TARVER="$( echo "$VERSION" | cut -d+ -f1 )"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -23,7 +39,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}
@@ -48,14 +68,18 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$TARVER
+tar xvf $CWD/$PRGNAM-$TARVER.tar.xz
+cd $PRGNAM-$TARVER
 
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+sed -i 's,Exec=,&/usr/games/,' media/*.desktop
+
+sed -i 's,share/doomseeker,share/games/doomseeker,' src/core/datapaths.cpp
+
 mkdir -p build
 cd build
   # Buggy cmake install target looks in wrong place for icon
@@ -70,34 +94,50 @@ cd build
   make install/strip DESTDIR=$PKG
 cd ..
 
+mkdir $PKG/usr/share/games
+mv $PKG/usr/share/$PRGNAM $PKG/usr/share/games
+
 # Shared lib gets installed to wrong place, easier to fix it here than patch.
 [ "$LIBDIRSUFFIX" != "" ] && \
   [ -e "$PKG/usr/lib" ] && \
   mv $PKG/usr/lib $PKG/usr/lib$LIBDIRSUFFIX
 
-# This is a game (or anyway a game utility, the binary
+# This is a game (or anyway a game utility), the binary
 # belongs in /usr/games. cmake accepts and totally ignores
 # "-DCMAKE_INSTALL_BINDIR=games" so just move the damn thing after
 # install.
 mv $PKG/usr/bin $PKG/usr/games
 
 # cmake is also ignoring -DCMAKE_INSTALL_DOCDIR.
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+if [ -e $PKG/usr/share/doc/$PRGNAM/ ]; then
+  mv $PKG/usr/share/doc/$PRGNAM/* $PKGDOC
+  rm -rf $PKG/usr/share/doc
+fi
 
 chmod 755 $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/engines/*.so
 strip $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/engines/*.so
 
-# only got the one PNG icon here
-mv $PKG/usr/share/icons $PKG/usr/share/pixmaps
+# upstream installs their *giant* icon directly in /usr/share/icons...
+rm -rf $PKG/usr/share/icons
+for px in 16 32 48 64 128; do
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  convert -resize $size media/icon.png $dir/$PRGNAM.png
+done
+
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
-cp -a LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a LICENSE *.md $PKGDOC
+sed -i 's,\r,,' $PKGDOC/*
+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/doomseeker/doomseeker.info b/games/doomseeker/doomseeker.info
index a52a8a003a..9fbfe2f348 100644
--- a/games/doomseeker/doomseeker.info
+++ b/games/doomseeker/doomseeker.info
@@ -1,10 +1,10 @@
 PRGNAM="doomseeker"
-VERSION="1.3"
-HOMEPAGE="http://doomseeker.drdteam.org/"
-DOWNLOAD="http://doomseeker.drdteam.org/files/doomseeker-1.3.tar.xz"
-MD5SUM="da27c9e3abfa89b3fd806850d5a9ba91"
+VERSION="1.3.3"
+HOMEPAGE="https://doomseeker.drdteam.org/"
+DOWNLOAD="https://doomseeker.drdteam.org/files/doomseeker-1.3.3.tar.xz"
+MD5SUM="16fbaef37e77ca97d30ca744fc98cb95"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5"
+REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"