games/doomseeker: Updated for version 1.2.

Signed-off-by: B. Watson <yalhcru@gmail.com>

4 files changed, 51 insertions, 42 deletions

diff --git a/games/doomseeker/README b/games/doomseeker/README
index 0f08422426..e7335513fb 100644
--- a/games/doomseeker/README
+++ b/games/doomseeker/README
@@ -1,13 +1,19 @@
-Doomseeker is a cross-platform server browser for Doom. The goal of
-Doomseeker is to provide a smooth, consistant experience for Doom players
-regardless of port or platform. Doomseeker provides support for Zandronum,
-Chocolate Doom, Odamex, and Vavoom.
+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[*].
 
 The first time you run Doomseeker, you will have tell it the location
-of your Doom engine binaries and IWAD files. It won't look in your
+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.
 
-This requires one or both of chocolate-doom or odamex (at least, to be
-useful for anything, it needs at least one supported Doom engine).
+This requires one or more of chocolate-doom, odamex, or srb2: to be
+useful for anything, it needs at least one supported game engine.
+
+[*] Not currently available from SBo. If you package one of these,
+please let me know so I can update this README.
diff --git a/games/doomseeker/doomseeker.SlackBuild b/games/doomseeker/doomseeker.SlackBuild
index 6aae4c0629..b0a5f8137d 100644
--- a/games/doomseeker/doomseeker.SlackBuild
+++ b/games/doomseeker/doomseeker.SlackBuild
@@ -6,8 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20181218 bkw: updated for v1.2. Upstream has changed things around,
+# so this script won't build 1.1 any longer.
+
 PRGNAM=doomseeker
-VERSION=${VERSION:-1.1}
+VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,53 +46,53 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-${VERSION}_src
-tar xvf $CWD/$PRGNAM-${VERSION}_src.tar.bz2
-cd $PRGNAM-${VERSION}_src
+
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 mkdir -p build
 cd build
   # Buggy cmake install target looks in wrong place for icon
   ln -s ../media .
   cmake \
+    -DFORCE_QT4=YES \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install/strip DESTDIR=$PKG
 cd ..
 
 # Shared lib gets installed to wrong place, easier to fix it here than patch.
-# Also note, doomseeker violates the FHS by placing shared objects in /usr/share.
-# I won't try to fix that, but I will strip them.
-[ "$LIBDIRSUFFIX" != "" ] && mv $PKG/usr/lib $PKG/usr/lib$LIBDIRSUFFIX
-chmod 755 $PKG/usr/share/$PRGNAM/engines/*.so
-strip $PKG/usr/share/$PRGNAM/engines/*.so
+[ "$LIBDIRSUFFIX" != "" ] && \
+  [ -e "$PKG/usr/lib" ] && \
+  mv $PKG/usr/lib $PKG/usr/lib$LIBDIRSUFFIX
 
-# Fix the .desktop file
-sed -i \
-  -e '/^Categories/s/$/;/' \
-  -e '/^Icon/s,=.*,=doomseeker,' \
-  $PKG/usr/share/applications/*desktop
-
-mkdir -p $PKG/usr/share/pixmaps
-ln -s ../$PRGNAM/icon.png $PKG/usr/share/pixmaps/$PRGNAM.png
+# 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
+
+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
 
-# Not only do they not ship docs, there aren't really any on their
-# web site, either. At least the GUI's easy to figure out.
-chmod -x LICENSE*
-cp -a LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/doomseeker/doomseeker.info b/games/doomseeker/doomseeker.info
index e0b583c971..15e36ef8ab 100644
--- a/games/doomseeker/doomseeker.info
+++ b/games/doomseeker/doomseeker.info
@@ -1,8 +1,8 @@
 PRGNAM="doomseeker"
-VERSION="1.1"
+VERSION="1.2"
 HOMEPAGE="http://doomseeker.drdteam.org/"
-DOWNLOAD="http://doomseeker.drdteam.org/files/doomseeker-1.1_src.tar.bz2"
-MD5SUM="3cf94d1e6fbdf1ae683bf3a9019a1431"
+DOWNLOAD="http://doomseeker.drdteam.org/files/doomseeker-1.2.tar.xz"
+MD5SUM="5a69adcda00a97c01d57f087b8ecfe35"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/doomseeker/slack-desc b/games/doomseeker/slack-desc
index dca9565812..dbde0e6267 100644
--- a/games/doomseeker/slack-desc
+++ b/games/doomseeker/slack-desc
@@ -6,13 +6,13 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
-doomseeker: doomseeker (server browser for Doom)
+doomseeker: doomseeker (server browser for Doom and related games)
 doomseeker:
 doomseeker: Doomseeker is a cross-platform server browser for Doom. The goal of
-doomseeker: Doomseeker is to provide a smooth, consistant experience for Doom
+doomseeker: Doomseeker is to provide a smooth, consistent experience for Doom
 doomseeker: players regardless of port or platform. Doomseeker provides support
-doomseeker: for Zandronum, Chocolate Doom, Odamex, and Vavoom.
-doomseeker:
+doomseeker: for Zandronum, Chocolate Doom, Sonic Robo Blast 2, and Turok 2
+doomseeker: Remastered.
 doomseeker:
 doomseeker:
 doomseeker: