6 files changed, 52 insertions, 28 deletions
diff --git a/games/nblood/README b/games/nblood/README
index bed9e75816..96e1a9c8b3 100644
--- a/games/nblood/README
+++ b/games/nblood/README
@@ -1,11 +1,13 @@
 nblood (game engine for Blood, Duke Nukem 3D, and Powerslave/Exhumed)
 
-nblood is a collection of reverse-engineered ports of Build games using
-EDuke32 engine technology and development principles.
+nblood is a collection of reverse-engineered ports of Build games
+using EDuke32 engine technology and development principles. Currently
+supported games are Blood, Duke Nukem 3D, and Powerslave aka Exhumed.
 
-This package only includes the game engines. You'll have to provide the
-game data to actually play any of the games. See README_game_data.txt
-for the list of supported games and the data required for each one.
+By default, the package only includes the game engines. You'll have
+to provide the game data to actually play any of the games. See
+README_game_data.txt for the list of supported game versions and the
+data required for each one.
 
-Optional dependency: isextract. This is only needed to extract the game
-data from the Blood install CD.
+Optional dependency: isextract. This is only needed to extract the
+game data from the Blood install CD or iso.
diff --git a/games/nblood/README_game_data.txt b/games/nblood/README_game_data.txt
index fc79a8aa69..31a92a7478 100644
--- a/games/nblood/README_game_data.txt
+++ b/games/nblood/README_game_data.txt
@@ -34,8 +34,9 @@ tracks and convert them to ogg or flac. Follow the instructions in
 rednukem
 ========
 
-The rednukem binary only plays Duke Nukem 3D: Atomic Edition v1.5 and
-possibly (untested) the Plutonium Pak.
+The rednukem binary plays Duke Nukem 3D: Atomic Edition v1.5 and
+possibly (untested) the Plutonium Pak. It does *not* play the
+shareware Duke Nukem 3D.
 
 For Atomic Edition, all you need is the DUKE3D.GRP file from the install
 CD (mine's in atominst/ on the CD) or an installed copy of the game. It's
@@ -44,6 +45,12 @@ Copy this file to /usr/share/games/eduke32/ (no, that's not a typo,
 rednukem uses eduke32's data directory). The filename actually doesn't
 matter, rednukem uses the checksum to detect it.
 
+rednukem may also be able to play the Duke Nukem 3D addons such as
+"Duke it out in D.C.", "Life's a Beach", or "Nuclear Winter". Also
+possibly other games such as "Nam", "Napalm", "WWII GI", "Platoon
+Leader", "Redneck Rampage", and "Redneck Rampage Rides Again". None of
+these have been tested by the SlackBuild author.
+
 
 pcexhumed
 =========
diff --git a/games/nblood/extract-blood-data.sh b/games/nblood/extract-blood-data.sh
index 374d2a13e5..abafbdba3c 100644
--- a/games/nblood/extract-blood-data.sh
+++ b/games/nblood/extract-blood-data.sh
@@ -3,7 +3,7 @@
 # extract-blood-data.sh - extract the game data from a mounted Blood
 # CD-ROM or (not mounted) .iso file in the current directory.
 
-# By B. Watson <yalhcru@gmail.com>, released under the WTPL: Do WTF you
+# By B. Watson <urchlay@slackware.uk>, released under the WTPL: Do WTF you
 # want with this.
 
 if [ "$( id -u )" != "0" ]; then
diff --git a/games/nblood/git2tarxz.sh b/games/nblood/git2tarxz.sh
index 2c8c7f8829..d310d8d0c2 100644
--- a/games/nblood/git2tarxz.sh
+++ b/games/nblood/git2tarxz.sh
@@ -59,7 +59,9 @@ GIT_SHA=$( git rev-parse --short HEAD )
 
 DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
 
-VERTAG=$( git tag -l | tail -1 )
+# 20211101 bkw: wha? there used to be tags, now they're gone.
+#VERTAG=$( git tag -l | tail -1 )
+VERTAG=v1.01
 
 VERSION=${VERTAG}+${DATE}_${GIT_SHA}
 
diff --git a/games/nblood/nblood.SlackBuild b/games/nblood/nblood.SlackBuild
index d96b3e63e0..9a104127d4 100644
--- a/games/nblood/nblood.SlackBuild
+++ b/games/nblood/nblood.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nblood
 
-# 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.
 
@@ -13,10 +13,18 @@
 # the shareware version from eduke32_shareware_data. I expect upstream
 # will finish the support for these at a later date...
 
+# 20230118 bkw: updated for v1.01+20230118_49af62a01, aka latest git.
+# It's not clear to me that the "1.01" is still correct: they don't
+# do releases or tags, and there's no mention of the version number
+# in README.md.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nblood
-VERSION=${VERSION:-1.01+20200428_069c52b26}
+VERSION=${VERSION:-1.01+20230118_49af62a01}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -26,7 +34,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}
@@ -55,19 +67,20 @@ find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
 
 # nblood looks in /usr/share/games/nblood/, which is fine.
 
-# pcexhumed doesn't look in /usr anywhere, so I'll make up a dir name
-# for it to use.
-sed -i \
-  '/^ *addsearchpath(cwd);/aaddsearchpath("/usr/share/games/pcexhumed");' \
-  source/exhumed/src/exhumed.cpp
+# pcexhumed now looks in /usr/share/games/pcexhumed, which is also the
+# dir I used to patch it to use.
 
 # The engine wants to write a log file in the current directory where
 # it gets run... and segfaults if it can't. The log file is just a copy
 # of the process's stderr it looks like, so let's disable it.
 sed -i.bak \
   's|OSD_SetLogFile(APPBASENAME ".log");|OSD_SetLogFile("/dev/null");|' \
-  source/blood/src/blood.cpp \
+  source/duke3d/src/game.cpp \
+  source/tekwar/src/tekgame.cpp \
+  source/sw/src/game.cpp \
   source/rr/src/game.cpp \
+  source/blood/src/blood.cpp \
+  source/witchaven/src/witchaven.cpp \
   source/exhumed/src/exhumed.cpp
 
 make
@@ -106,7 +119,7 @@ for icon in $CWD/icons/*.png; do
 done
 
 mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/icons/64.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a *.md source/blood/gpl-2.0.txt $PKG/usr/doc/$PRGNAM-$VERSION
@@ -117,4 +130,4 @@ sed "s,@WITHDATA@,$WITHDATA," $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/nblood/nblood.info b/games/nblood/nblood.info
index c3ed032e58..a91420c5fa 100644
--- a/games/nblood/nblood.info
+++ b/games/nblood/nblood.info
@@ -1,10 +1,10 @@
 PRGNAM="nblood"
-VERSION="1.01+20200428_069c52b26"
+VERSION="1.01+20230118_49af62a01"
 HOMEPAGE="https://github.com/nukeykt/NBlood"
-DOWNLOAD="https://slackware.uk/~urchlay/src/nblood-v1.01+20200428_069c52b26.tar.xz"
-MD5SUM="160e9effcc8ee2491453edabbcf8d7f8"
+DOWNLOAD="https://slackware.uk/~urchlay/src/nblood-v1.01+20230118_49af62a01.tar.xz"
+MD5SUM="30742a0879b179283d8b49d37df7d5f0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2"
+REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"