games/nblood: Updated for version 1.01+20211016_b90417ed8.

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

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

5 files changed, 33 insertions, 24 deletions

diff --git a/games/nblood/README b/games/nblood/README
index bed9e75816ba..96e1a9c8b3c5 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 fc79a8aa69db..31a92a7478b2 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/git2tarxz.sh b/games/nblood/git2tarxz.sh
index 2c8c7f8829c5..d310d8d0c214 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 18c361cc610d..9a22d57a8fea 100644
--- a/games/nblood/nblood.SlackBuild
+++ b/games/nblood/nblood.SlackBuild
@@ -16,7 +16,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nblood
-VERSION=${VERSION:-1.01+20200428_069c52b26}
+VERSION=${VERSION:-1.01+20211016_b90417ed8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -29,9 +29,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# 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
@@ -65,19 +62,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
@@ -116,7 +114,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
diff --git a/games/nblood/nblood.info b/games/nblood/nblood.info
index d00dc5855ed4..22d0afd22ecb 100644
--- a/games/nblood/nblood.info
+++ b/games/nblood/nblood.info
@@ -1,8 +1,8 @@
 PRGNAM="nblood"
-VERSION="1.01+20200428_069c52b26"
+VERSION="1.01+20211016_b90417ed8"
 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+20211016_b90417ed8.tar.xz"
+MD5SUM="d892065de2150c2a9bc49e4fed5ca80b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""