games/bstone: Updated for version 1.2.11.

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

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

7 files changed, 108 insertions, 27 deletions

diff --git a/games/bstone/README b/games/bstone/README
index 842423d0cb..72f207482d 100644
--- a/games/bstone/README
+++ b/games/bstone/README
@@ -6,7 +6,7 @@ Planet Strike.
 Features:
 * High resolution rendering of world (extended vanilla engine)
 * Modern and vanilla controls
-* Allows to customize control bindings
+* Allows customizing control bindings
 * Separate volume control of sound effects and music
 
 Supported games:
@@ -18,6 +18,9 @@ Supported games:
 * Planet Strike v1.0
 * Planet Strike v1.1
 
-The data files for Aliens of Gold v3.0 shareware are included in the
-package. To play one of the other games, copy its data files to
-/usr/share/games/bstone.
+The data files for Aliens of Gold v3.0 shareware are included in
+the package. To play one of the other games, copy its data files
+(*.bs6 or *.vsi) to /usr/share/games/bstone. When you start bstone,
+it will detect all the available games and ask which one you'd like to
+play. Note that the data files must be named either all uppercase or
+all lowercase.
diff --git a/games/bstone/blake_stone_source_code_license.txt b/games/bstone/blake_stone_source_code_license.txt
new file mode 100644
index 0000000000..945cb68c51
--- /dev/null
+++ b/games/bstone/blake_stone_source_code_license.txt
@@ -0,0 +1,53 @@
+Blake Stone: Planet Strike Source Code Release - July 5, 2013.
+
+Please note that this is being released without any kind of
+support from the original developers of this game or Apogee Software,
+LLC, Apogee Software, Ltd / 3DRealms Entertainment.  
+
+We are releasing this code for the entertainment of the user
+community. This is all the source we have relating to Blake Stone:
+Planet Strike.  We haven't looked at this stuff in years, and
+make no guarantee that you will be able to get it to work, nor do we
+guarantee that it won't blow up your computer if you do try and use
+it. ;)
+
+You will need the data from a released version of Blake Stone: Planet
+Strike to use the .exe built from this code. We cannot and will not
+help in getting this running.
+
+Caveat Emptor - Use at your own risk.
+
+Please note that while we are releasing the source code to Blake
+Stone: Planet Strike, the game itself has not been released in the
+same manner (in other words, Blake Stone: Planet Strike is still
+commercial software). You can still buy the game from us by visiting
+the Apogee Software online store at:
+
+http://apogeesoftware.com/products/blake-stone-planet-strike
+
+...or GOG.com at:
+
+http://www.gog.com/gamecard/blake_stone_planet_strike
+
+Thanks to all the fans who have enjoyed the game and to those that
+have contacted us about the possibility of releasing this source. If
+you produce something cool with this source code, drop us a line at
+info@apogeesoftware.com
+
+=====================================================================
+
+Copyright © 1992 - 2013.
+
+This Source code / program is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU General Public License for more details.You should have
+received a copy of the GNU General Public License along with this
+program; if not, write to the Free Software Foundation, Inc., 59
+Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/games/bstone/bstone.SlackBuild b/games/bstone/bstone.SlackBuild
index 770961632b..56ac327034 100644
--- a/games/bstone/bstone.SlackBuild
+++ b/games/bstone/bstone.SlackBuild
@@ -6,6 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211004 bkw:
+# - update for v1.2.11.
+# - include .txt version of license.
+# - datadir.diff changed again.
+# - update .desktop file.
+# - better README doc on how to play the full version.
+
 # 20201219 bkw: update for v1.2.9.
 # 20200804 bkw: update for v1.2.8. datadir.diff changed again.
 # 20200222 bkw: update for v1.1.16_2.
@@ -18,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=bstone
-VERSION=${VERSION:-1.2.9}
+VERSION=${VERSION:-1.2.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -33,9 +40,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,7 +69,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz || tar xvf $CWD/v$SRCVER.tar.gz
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
 cd $PRGNAM-$SRCVER
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
@@ -78,7 +82,8 @@ patch -p1 < $CWD/datadir.diff
 
 # make install and install/strip are borked, do manual install.
 # always include the shareware data in the package, the game will
-# only use it if the user hasn't installed the full version.
+# automatically use it if the user hasn't installed the full version,
+# or offer a choice of full version or shareware if he has both.
 mkdir -p build
 cd build
   cmake \
@@ -87,11 +92,11 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DMAN_INSTALL_DIR=/usr/man \
-    -DCMAKE_BUILD_TYPE=Release ../src
+    -DCMAKE_BUILD_TYPE=Release ..
   make
 
   mkdir -p $PKG/usr/games $PKG/usr/share/games/$PRGNAM
-  install -s -m0755 $PRGNAM $PKG/usr/games
+  install -s -m0755 src/$PRGNAM $PKG/usr/games
 
   unzip $CWD/1bs30.zip
   unzip BSSW30.SHR \*.BS1
@@ -105,9 +110,17 @@ cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 gzip -9c < $CWD/$PRGNAM.6 > $PKG/usr/man/man6/$PRGNAM.6.gz
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README.md *.doc src/bstone_todo.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# the original source code license is supplied only as a MS word .doc
+# file. we ship it as-is, but rename it to something without spaces in
+# the filename. also, ship a pre-converted text version (created with
+# wvText, then hand-edited to fix the formatting).
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+LIC=blake_stone_source_code_license
+mkdir -p $PKGDOC
+cp -a LICENSE README.md TODO.md CHANGE* $PKGDOC
+cp -a *.doc $PKGDOC/$LIC.doc
+cat $CWD/$LIC.txt > $PKGDOC/$LIC.txt
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/games/bstone/bstone.desktop b/games/bstone/bstone.desktop
index 57071359d0..0ef74b419e 100644
--- a/games/bstone/bstone.desktop
+++ b/games/bstone/bstone.desktop
@@ -1,7 +1,8 @@
 [Desktop Entry]
 Type=Application
 Name=Blake Stone
-Icon=bstone
-Exec=bstone
+GenericName=First Person Shooting Game
+Icon=/usr/share/pixmaps/bstone.png
+Exec=/usr/games/bstone
 Terminal=false
 Categories=Game;ActionGame;
diff --git a/games/bstone/bstone.info b/games/bstone/bstone.info
index 3f676dc1d0..71be8f68b8 100644
--- a/games/bstone/bstone.info
+++ b/games/bstone/bstone.info
@@ -1,9 +1,9 @@
 PRGNAM="bstone"
-VERSION="1.2.9"
-HOMEPAGE="http://bibendovsky.github.io/bstone/"
-DOWNLOAD="https://github.com/bibendovsky/bstone/archive/v1.2.9/bstone-1.2.9.tar.gz \
+VERSION="1.2.11"
+HOMEPAGE="https://bibendovsky.github.io/bstone/"
+DOWNLOAD="https://github.com/bibendovsky/bstone/archive/v1.2.11/bstone-1.2.11.tar.gz \
           https://archive.org/download/BlakeStoneAliensOfGold/1bs30.zip"
-MD5SUM="58bb68e6f7282fdf27f41a9aa90cdb6f \
+MD5SUM="2b8d6a48a20ae0dfeb942550fbf9721a \
         a63c88fc5b399ffb5ed42dc215321f36"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/bstone/datadir.diff b/games/bstone/datadir.diff
index 19a7100c32..268c10e3c1 100644
--- a/games/bstone/datadir.diff
+++ b/games/bstone/datadir.diff
@@ -1,7 +1,7 @@
-diff -Naur bstone-1.2.8/src/3d_main.cpp bstone-1.2.8.patched/src/3d_main.cpp
---- bstone-1.2.8/src/3d_main.cpp	2020-07-10 09:58:35.000000000 -0400
-+++ bstone-1.2.8.patched/src/3d_main.cpp	2020-08-04 03:07:36.266707676 -0400
-@@ -10722,20 +10722,7 @@
+diff -Naur bstone-1.2.11/src/3d_main.cpp bstone-1.2.11.patched/src/3d_main.cpp
+--- bstone-1.2.11/src/3d_main.cpp	2021-03-21 15:24:36.000000000 -0400
++++ bstone-1.2.11.patched/src/3d_main.cpp	2021-10-04 19:12:08.818938051 -0400
+@@ -10711,20 +10711,7 @@
  
  const std::string& get_default_data_dir()
  {
@@ -23,3 +23,14 @@ diff -Naur bstone-1.2.8/src/3d_main.cpp bstone-1.2.8.patched/src/3d_main.cpp
  	return result;
  }
  
+diff -Naur bstone-1.2.11/src/jm_free.cpp bstone-1.2.11.patched/src/jm_free.cpp
+--- bstone-1.2.11/src/jm_free.cpp	2021-03-21 15:24:36.000000000 -0400
++++ bstone-1.2.11.patched/src/jm_free.cpp	2021-10-04 19:12:39.570935256 -0400
+@@ -718,6 +718,7 @@
+ 				bstone::file_system::get_working_dir());
+ 
+ 			add_search_path("working dir", working_full_dir, search_paths);
++			add_search_path("system dir", "/usr/share/games/bstone", search_paths);
+ 		}
+ 
+ 		{
diff --git a/games/bstone/slack-desc b/games/bstone/slack-desc
index 8bf8b43f38..89634612e8 100644
--- a/games/bstone/slack-desc
+++ b/games/bstone/slack-desc
@@ -9,8 +9,8 @@
 bstone: bstone (first-person shooter game)
 bstone:
 bstone: A source port of Blake Stone: Aliens of Gold and Blake Stone:
-bstone: Planet Strike.
-bstone:
+bstone: Planet Strike. This package includes the game data for Aliens of Gold
+bstone: v3.0 Shareware.
 bstone:
 bstone:
 bstone: