games/commandergenius: Updated for version 3.0.8.

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

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

4 files changed, 34 insertions, 42 deletions

diff --git a/games/commandergenius/commandergenius.6 b/games/commandergenius/commandergenius.6
index dc848ab2cc409..3aa1892bf7a46 100644
--- a/games/commandergenius/commandergenius.6
+++ b/games/commandergenius/commandergenius.6
@@ -1,8 +1,5 @@
 .\" Man page generated from reStructuredText.
 .
-.TH COMMANDERGENIUS 6 "2017-03-01" "1.9.8.7-Beta" "SlackBuilds.org"
-.SH NAME
-commandergenius \- open source engine for Commander Keen games
 .
 .nr rst2man-indent-level 0
 .
@@ -30,18 +27,15 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
+.TH "COMMANDERGENIUS" 6 "2021-10-21" "3.0.8" "SlackBuilds.org"
+.SH NAME
+commandergenius \- open source engine for Commander Keen games
 .\" RST source for commandergenius(6) man page. Convert with:
 .
 .\" rst2man.py commandergenius.rst > commandergenius.6
 .
 .\" rst2man.py comes from the SBo development/docutils package.
 .
-.\" converting from pod:
-.
-.\" s/B<\([^>]*\)>/**\1**/g
-.
-.\" s/I<\([^>]*\)>/*\1*/g
-.
 .SH SYNOPSIS
 .sp
 commandergenius [\fIdir=dir\fP] [\fIfinale=<on|off>\fP]
@@ -62,7 +56,7 @@ fan\-made mods.
 This man page is a brief summary. Full documentation can be found
 in:
 .sp
-/usr/doc/commandergenius\-1987beta/README
+/usr/doc/commandergenius\-3.0.8/README.md
 .SH OPTIONS
 .INDENT 0.0
 .TP
@@ -110,7 +104,7 @@ users may manually copy game data files here and add them to
 .UNINDENT
 .SH COPYRIGHT
 .sp
-See the file /usr/doc/commandergenius\-1987beta/COPYRIGHT for license information.
+See the file /usr/doc/commandergenius\-3.0.8/COPYRIGHT for license information.
 .SH AUTHORS
 .sp
 commandergenius was written by Gerhard Stein <\fI\%gerstrong@gmail.com\fP>.
diff --git a/games/commandergenius/commandergenius.SlackBuild b/games/commandergenius/commandergenius.SlackBuild
index 714f8597a5e9d..76a03b6a1f3e8 100644
--- a/games/commandergenius/commandergenius.SlackBuild
+++ b/games/commandergenius/commandergenius.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211021 bkw: updated for 3.0.8
 # 20210310 bkw: updated for 2.7.7
 # 20201224 bkw: updated for 2.7.3
 # 20201111 bkw: updated for 2.6.3.1
@@ -34,7 +35,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=commandergenius
-VERSION=${VERSION:-2.7.7}
+VERSION=${VERSION:-3.0.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -47,9 +48,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
@@ -86,8 +84,9 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-v$VERSION
 # OSX and Windows stuff takes up 31MB in /tmp, no need to extract it.
+# Also don't extract the prebuilt icotool binary (ugh).
 tar xvf $CWD/$SRCNAM-v$VERSION.tar.bz2 \
-        --wildcards --exclude='*/dlls' --exclude='*/Build/Xcode'
+        --wildcards --exclude='*/dlls' --exclude='*/Build/Xcode' --exclude='*/icotool'
 cd $SRCNAM-v$VERSION
 chown -R root:root .
 
@@ -96,13 +95,15 @@ find -L . -type f -a -exec chmod 644 '{}' '+'
 find -L . -type d -a -exec chmod 755 '{}' '+'
 
 # placate desktop-file-validate
-sed -i 's,Application;,,' share/$DESKTOP
+sed -i -e 's,Application;,,' \
+       -e 's,cg\.svg,'$PRGNAM',' \
+       share/$DESKTOP
 
 mkdir -p build
 cd build
-  export "PATH=/opt/cmake-202x/bin:$PATH"
   cmake \
     -DUSE_SDL2=yes \
+    -DDOCDIR=/usr/doc/$PRGNAM-$VERSION \
     -DGAMES_SHAREDIR:STRING=/usr/share/games \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
@@ -114,32 +115,34 @@ cd build
   make install/strip DESTDIR=$PKG
 cd ..
 
+# clean up the icon names
+for dir in $PKG/usr/share/icons/hicolor/*; do
+  px="$( basename $dir | cut -dx -f1 )"
+  mv $dir/apps/cg.$px.png $dir/apps/$PRGNAM.png
+done
+
 # upstream installs 2 identical-looking (but not byte-identical) icons
-rm -f $PKG/usr/share/icons/hicolor/512x512/apps/CGLogo.png
-ln -s ../../../../games/$PRGNAM/cglogo512.png \
-      $PKG/usr/share/icons/hicolor/512x512/apps/CGLogo.png
+rm -f $PKG/usr/share/games/$PRGNAM/CGLogo.png
+ln -s ../../icons/hicolor/512x512/apps/$PRGNAM.png \
+      $PKG/usr/share/games/$PRGNAM/CGLogo.png
+
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 # grrrr. don't force command-line users to remember the name is CGeniusExe
 ln -s $EXENAME $PKG/usr/games/$PRGNAM
 
-# the High Quality Pack. this is redundant for Keen 1 and 4 (just download
-# the Special versions of these games), so we only install the data for
-# 2 and 3. strace shows the files are being loaded, but TBH I haven't
-# played these games enough to notice the difference with/without the HQP.
-rm -rf hqp/games/keen1 hqp/games/keen4
+# the High Quality Pack.
 cp -a hqp/* $PKG/usr/share/games/$PRGNAM
+mv $PKG/usr/share/games/$PRGNAM/Readme_hqp.txt $PKG/usr/doc/$PRGNAM-$VERSION
 
 # man page written for this SlackBuild.
 mkdir -p $PKG/usr/man/man6
 gzip -9c < $CWD/$PRGNAM.6 > $PKG/usr/man/man6/$PRGNAM.6.gz
 ln -s $PRGNAM.6.gz $PKG/usr/man/man6/$EXENAME.6.gz
 
-# upstream installs most of the docs in /usr/share/games/$PRGNAM...
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+# most of the docs were already installed.
 cp -a COPYRIGHT $PKG/usr/doc/$PRGNAM-$VERSION
-for i in README changelog.txt Readme_hqp.txt; do
-  ln -s ../../share/games/$PRGNAM/$i $PKG/usr/doc/$PRGNAM-$VERSION
-done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/commandergenius/commandergenius.info b/games/commandergenius/commandergenius.info
index 63cf659f48c5c..11c3284ad2e36 100644
--- a/games/commandergenius/commandergenius.info
+++ b/games/commandergenius/commandergenius.info
@@ -1,8 +1,8 @@
 PRGNAM="commandergenius"
-VERSION="2.7.7"
+VERSION="3.0.8"
 HOMEPAGE="https://gitlab.com/Dringgstein/Commander-Genius"
-DOWNLOAD="https://gitlab.com/Dringgstein/Commander-Genius/-/archive/v2.7.7/Commander-Genius-v2.7.7.tar.bz2"
-MD5SUM="b5b0c2d92d8643e67d61cf3324c75d54"
+DOWNLOAD="https://gitlab.com/Dringgstein/Commander-Genius/-/archive/v3.0.8/Commander-Genius-v3.0.8.tar.bz2"
+MD5SUM="f4890bdc83636ba19db3a8333f2d69ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/commandergenius/commandergenius.rst b/games/commandergenius/commandergenius.rst
index 47821741d1ce8..76989b730dfab 100644
--- a/games/commandergenius/commandergenius.rst
+++ b/games/commandergenius/commandergenius.rst
@@ -2,14 +2,9 @@
 ..   rst2man.py commandergenius.rst > commandergenius.6
 .. rst2man.py comes from the SBo development/docutils package.
 
-.. |version| replace:: 1.9.8.7-Beta
-.. |dotlessversion| replace:: 1987beta
+.. |version| replace:: 3.0.8
 .. |date| date::
 
-.. converting from pod:
-.. s/B<\([^>]*\)>/**\1**/g
-.. s/I<\([^>]*\)>/*\1*/g
-
 ===============
 commandergenius
 ===============
@@ -46,7 +41,7 @@ fan-made mods.
 This man page is a brief summary. Full documentation can be found
 in:
 
-/usr/doc/commandergenius-|dotlessversion|/README
+/usr/doc/commandergenius-|version|/README.md
 
 OPTIONS
 =======
@@ -96,7 +91,7 @@ FILES
 COPYRIGHT
 =========
 
-See the file /usr/doc/commandergenius-|dotlessversion|/COPYRIGHT for license information.
+See the file /usr/doc/commandergenius-|version|/COPYRIGHT for license information.
 
 AUTHORS
 =======