3 files changed, 35 insertions, 18 deletions
diff --git a/games/crispy-doom/README b/games/crispy-doom/README
index dd3e67c1c7..d6c441345c 100644
--- a/games/crispy-doom/README
+++ b/games/crispy-doom/README
@@ -3,3 +3,7 @@ display resolution, removes the static limits of the Doom engine and
 offers further optional visual, tactical and physical enhancements
 remaining entirely config file, savegame, netplay and demo compatible
 with the original.
+
+Only crispy-doom , crispy-heretic and crispy-hexen are built with this
+script.  For crispy-strife, please try one of the other DooM ports on
+SBo (like chocolate-doom, gzdoom, etc).
diff --git a/games/crispy-doom/crispy-doom.SlackBuild b/games/crispy-doom/crispy-doom.SlackBuild
index a651bd7445..f0f4cbd804 100644
--- a/games/crispy-doom/crispy-doom.SlackBuild
+++ b/games/crispy-doom/crispy-doom.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for crispy-doom
 
 # Copyright 2015 Dugan Chen Canada
-# Updates copyright 2019, 2020 Lenard Spencer
+# Updates copyright 2019, 2020, 2021 Lenard Spencer
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=crispy-doom
-VERSION=${VERSION:-5.7.2}
+VERSION=${VERSION:-6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+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}
@@ -70,17 +80,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-sh autogen.sh
+autoreconf -fiv
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --docdir=/usr/doc/$PRGNAM \
   --bindir=/usr/games \
   --build=$ARCH-slackware-linux
 
@@ -93,9 +100,15 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog *.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+# Remove unnecessary GNOME screensaver desktop entry:
+rm -rf $PKG/usr/share/applications/screensavers
+
+mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
+( cd $PKG/usr/doc/$PRGNAM-$VERSION
+  mkdir -p $PRGNAM
+  mv *.doom $PRGNAM
+  mv ../crispy-{heretic,hexen,strife} .
+  )
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -103,4 +116,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/crispy-doom/crispy-doom.info b/games/crispy-doom/crispy-doom.info
index 8a29c2d7ba..b081645215 100644
--- a/games/crispy-doom/crispy-doom.info
+++ b/games/crispy-doom/crispy-doom.info
@@ -1,10 +1,10 @@
 PRGNAM="crispy-doom"
-VERSION="5.7.2"
-HOMEPAGE="http://www.chocolate-doom.org/wiki/index.php/Crispy_Doom"
-DOWNLOAD="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-5.7.2.tar.gz"
-MD5SUM="bf0de157cb50d29b62b293e86192b9cd"
+VERSION="6.0"
+HOMEPAGE="https://www.chocolate-doom.org/wiki/index.php/Crispy_Doom"
+DOWNLOAD="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-6.0/crispy-doom-crispy-doom-6.0.tar.gz"
+MD5SUM="39e3166f08c8a3dd439ccde79b275cc3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2_net SDL2_mixer"
+REQUIRES=""
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"