3 files changed, 25 insertions, 30 deletions
diff --git a/games/bstone/bstone.SlackBuild b/games/bstone/bstone.SlackBuild
index 1c518cdd88..2aa6a69ccb 100644
--- a/games/bstone/bstone.SlackBuild
+++ b/games/bstone/bstone.SlackBuild
@@ -6,6 +6,8 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20250618 bkw: update for v1.2.16.
+# 20250128 bkw: update for v1.2.13. once again, datadir.diff changed.
 # 20230111 bkw: update for v1.2.12.
 
 # 20211004 bkw:
@@ -27,7 +29,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=bstone
-VERSION=${VERSION:-1.2.12}
+VERSION=${VERSION:-1.2.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -53,16 +55,12 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -74,8 +72,8 @@ rm -rf $PRGNAM-$SRCVER
 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 \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 # look in /usr/share/games/bstone for game data files, not the
 # directory the executable lives in. the --data_dir option can
@@ -89,16 +87,13 @@ patch -p1 < $CWD/datadir.diff
 mkdir -p build
 cd build
   cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DMAN_INSTALL_DIR=/usr/man \
     -DCMAKE_BUILD_TYPE=Release ..
-  make
+  make VERBOSE=1
 
   mkdir -p $PKG/usr/games $PKG/usr/share/games/$PRGNAM
-  install -s -m0755 src/$PRGNAM $PKG/usr/games
+  install -s -m0755 src/$PRGNAM/$PRGNAM $PKG/usr/games
 
   unzip $CWD/1bs30.zip
   unzip BSSW30.SHR \*.BS1
@@ -119,7 +114,7 @@ gzip -9c < $CWD/$PRGNAM.6 > $PKG/usr/man/man6/$PRGNAM.6.gz
 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 LICENSE* README* TODO* CHANGE* $PKGDOC
 cp -a *.doc $PKGDOC/$LIC.doc
 cat $CWD/$LIC.txt > $PKGDOC/$LIC.txt
 cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
diff --git a/games/bstone/bstone.info b/games/bstone/bstone.info
index 257a6a6c63..b1fd401ae1 100644
--- a/games/bstone/bstone.info
+++ b/games/bstone/bstone.info
@@ -1,9 +1,9 @@
 PRGNAM="bstone"
-VERSION="1.2.12"
+VERSION="1.2.16"
 HOMEPAGE="https://bibendovsky.github.io/bstone/"
-DOWNLOAD="https://github.com/bibendovsky/bstone/archive/v1.2.12/bstone-1.2.12.tar.gz \
+DOWNLOAD="https://github.com/bibendovsky/bstone/archive/v1.2.16/bstone-1.2.16.tar.gz \
           https://archive.org/download/BlakeStoneAliensOfGold/1bs30.zip"
-MD5SUM="5975da0506152a67d955d2d768d241ae \
+MD5SUM="f98737735136fef42baa770cfc2c4e38 \
         a63c88fc5b399ffb5ed42dc215321f36"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/bstone/datadir.diff b/games/bstone/datadir.diff
index 268c10e3c1..c79f0090bc 100644
--- a/games/bstone/datadir.diff
+++ b/games/bstone/datadir.diff
@@ -1,7 +1,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 @@
+diff -Naur bstone-1.2.13/src/bstone/src/3d_main.cpp bstone-1.2.13.patched/src/bstone/src/3d_main.cpp
+--- bstone-1.2.13/src/bstone/src/3d_main.cpp	2024-12-14 10:29:49.000000000 -0500
++++ bstone-1.2.13.patched/src/bstone/src/3d_main.cpp	2025-01-29 03:30:03.334126326 -0500
+@@ -10837,20 +10837,7 @@
  
  const std::string& get_default_data_dir()
  {
@@ -12,7 +12,7 @@ diff -Naur bstone-1.2.11/src/3d_main.cpp bstone-1.2.11.patched/src/3d_main.cpp
 -	{
 -		is_initialized = true;
 -
--		result = bstone::file_system::get_working_dir();
+-		result = bstone::fs_utils::get_working_dir();
 -
 -#ifdef __vita__
 -		result = "ux0:/data/bstone/";
@@ -23,14 +23,14 @@ diff -Naur bstone-1.2.11/src/3d_main.cpp bstone-1.2.11.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());
+diff -Naur bstone-1.2.13/src/bstone/src/jm_free.cpp bstone-1.2.13.patched/src/bstone/src/jm_free.cpp
+--- bstone-1.2.13/src/bstone/src/jm_free.cpp	2024-12-14 10:29:49.000000000 -0500
++++ bstone-1.2.13.patched/src/bstone/src/jm_free.cpp	2025-01-29 03:30:37.581123103 -0500
+@@ -677,6 +677,7 @@
+ 			bstone::fs_utils::get_working_dir());
  
- 			add_search_path("working dir", working_full_dir, search_paths);
-+			add_search_path("system dir", "/usr/share/games/bstone", search_paths);
- 		}
+ 		add_search_path("working dir", working_full_dir, search_paths);
++		add_search_path("system dir", "/usr/share/games/bstone", search_paths);
+ 	}
  
- 		{
+ 	{