games/prboom-plus: Updated for version 2.5.1.7um, new maintainer.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 47 insertions, 27 deletions

diff --git a/games/prboom-plus/README b/games/prboom-plus/README
index 43eafc4b0e..d1bda4db65 100644
--- a/games/prboom-plus/README
+++ b/games/prboom-plus/README
@@ -1,3 +1,5 @@
+prboom-plus (Doom source port)
+
 PrBoom+ is a Doom source port developed from the original PrBoom project.
 
 Features uncapped framerate, widescreen aspect ratios, soundfont support,
@@ -5,8 +7,9 @@ variable gamespeed, re-record, walkcam, chasecam, full full mouselook, fov and
 other features along with full compatibility with the original Doom/Doom2
 engines.
 
-FluidSynth, needed for soundfont support, is an  optional dependency.
+FluidSynth, needed for soundfont support, is an optional dependency.
 
 The documentation refers to a directory into which an IWAD file (doom.wad,
 doom2.wad, tnt.wad, plutonia.wad, or the shareware doom1.wad) may be placed.
-The IWAD directory is /usr/share/games/doom.
+The IWAD directory is /usr/share/games/doom. If you don't have any IWADs,
+install doom_shareware_data to play shareware Doom.
diff --git a/games/prboom-plus/prboom-plus.SlackBuild b/games/prboom-plus/prboom-plus.SlackBuild
index 2ac6a047c3..ed96afa6b7 100644
--- a/games/prboom-plus/prboom-plus.SlackBuild
+++ b/games/prboom-plus/prboom-plus.SlackBuild
@@ -2,16 +2,27 @@
 
 # Slackware build script for prboom-plus
 
-# Written by Dugan Chen (thedoogster@gmail.com)
+# Originally written by Dugan Chen (email removed)
+# Modified and now maintained by B. Watson <yalhcru@gmail.com>.
+# Original had no license. Modified version released under the WTFPL. See
+# http://www.wtfpl.net/txt/copying/ for details.
+
+# 20200416 bkw:
+# - take over maintenance
+# - i486 => i586
+# - switch to coelckers github fork, since it's maintained
+# - SDL2_* now required
+# - install desktop, icon, bash completion
+# - game binaries in /usr/games
 
 PRGNAM=prboom-plus
-VERSION=${VERSION:-2.5.1.4}
+VERSION=${VERSION:-2.5.1.7um}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -22,8 +33,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -45,15 +56,16 @@ 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 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 {} \+
+
+[ -d prboom2 ] && cd prboom2
+[ -x configure ] || sh bootstrap
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
+  --bindir=/usr/games \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -63,21 +75,26 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-gl
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
 # Configure script insists on putting docs in /usr/share/doc, even when told not to.
-mv $PKG/usr/share/doc $PKG/usr
+# Also, the version number in the doc dir is wrong...
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/$PRGNAM-*/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share/doc
 
-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
+gzip $PKG/usr/man/man?/*.?
 
-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
+# desktop/icon/completion included in tarball but not installed
+mkdir -p $PKG/usr/share/applications \
+         $PKG/usr/share/icons/hicolor/scalable/apps \
+         $PKG/usr/share/bash-completion/completions
+cp ICONS/$PRGNAM.desktop $PKG/usr/share/applications
+cp ICONS/$PRGNAM.svg $PKG/usr/share/icons/hicolor/scalable/apps
+cp ICONS/$PRGNAM.bash $PKG/usr/share/bash-completion/completions/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  doc/ AUTHORS COPYING INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/prboom-plus/prboom-plus.info b/games/prboom-plus/prboom-plus.info
index 450e3d6e19..a80ee5990d 100644
--- a/games/prboom-plus/prboom-plus.info
+++ b/games/prboom-plus/prboom-plus.info
@@ -1,10 +1,10 @@
 PRGNAM="prboom-plus"
-VERSION="2.5.1.4"
+VERSION="2.5.1.7um"
 HOMEPAGE="http://prboom-plus.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/project/prboom-plus/prboom-plus/2.5.1.4/prboom-plus-2.5.1.4.tar.gz"
-MD5SUM="eff7878d4542259a2bd6b2fef79962ca"
+DOWNLOAD="https://github.com/coelckers/prboom-plus/archive/v2.5.1.7um/prboom-plus-2.5.1.7um.tar.gz"
+MD5SUM="2c36f7902f837057c7e299adb20e81fb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster@gmail.com"
+REQUIRES="SDL2 SDL2_net SDL2_image SDL2_mixer"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"