6 files changed, 61 insertions, 49 deletions
diff --git a/games/pentagram/README b/games/pentagram/README
index 34ffcdded7..70ae4acdf5 100644
--- a/games/pentagram/README
+++ b/games/pentagram/README
@@ -1,24 +1,27 @@
+pentagram (an Ultima 8 engine)
+
 Pentagram is a project aiming to create an Ultima 8 engine for use on
 modern operating systems, including Linux, Mac OS X and Windows.
 
-While it is currently possible to finish Ultima 8 using Pentagram,
-not everything is fully working yet. (Save regularly!) In the game
-itself, most notably, the combat AI of monsters is still very limited,
-and there are still quite a few minor things which are not working as
-well as they should.
+While it is currently possible to finish Ultima 8 using Pentagram, not
+everything is fully working yet. (Save regularly!) In the game itself,
+most notably, the combat AI of monsters is still very limited, and
+there are still quite a few minor things which are not working as well
+as they should.
 
-Optionally, pentagram can use TiMidity++ or fluidsynth for in-game music
-(detected at compile time, must be enabled in pentagram.ini or in-game
-menu).
+Optionally, pentagram can use TiMidity++ or fluidsynth for in-game
+music (detected at compile time, must be enabled in pentagram.ini or
+in-game menu).
 
 Pentagram is only an engine. To actually play the game, you will
-need an installed copy of "Ultima VIII: Pagan". Either copy the
-game directory (the one containing u8.exe) to /usr/share/pentagram
-(so that /usr/share/pentagram/u8.exe exists), or edit the 'path=' in
-~/.pentagram/pentagram.ini to point to your existing game directory.
-Pentagram is smart enough to ignore the case of filenames, so U8.exe or
-U8.EXE would also be OK.
+need an installed copy of "Ultima VIII: Pagan". Either copy the game
+directory (the one containing u8.exe) to /usr/share/games/pentagram
+(so that /usr/share/games/pentagram/u8.exe exists), or edit the
+'path=' in ~/.pentagram/pentagram.ini to point to your existing game
+directory.  Pentagram is smart enough to ignore the case of filenames,
+so U8.exe or U8.EXE would also be OK.
 
-YOU MUST OWN THE GAME in order to play it with pentagram. Do not contact
-pentagram's authors or the author of this SlackBuild asking for illegal
-copies of Ultima 8: such requests will be ignored, at best.
+YOU MUST OWN THE GAME in order to play it with pentagram. Do not
+contact pentagram's authors or the author of this SlackBuild asking
+for illegal copies of Ultima 8: such requests will be ignored,
+at best.
diff --git a/games/pentagram/pentagram.1 b/games/pentagram/pentagram.6
index c1f23fa6aa..c68f708891 100644
--- a/games/pentagram/pentagram.1
+++ b/games/pentagram/pentagram.6
@@ -1,4 +1,4 @@
-.TH pentagram 1 "29 Oct 2011" "20110229_svn" "Pentagram"
+.TH pentagram 6 "02 Nov 2021" "20110229_svn" "SlackBuilds.org"
 
 .SH NAME
 \fBpentagram\fR \- A reimplemented engine for the game
@@ -43,13 +43,14 @@ Config and savegame data.
 Configuration. Specifies the path to the game data, among other things.
 The SlackBuilds.org build of pentagram uses a shell script wrapper to
 create a default \fBpentagram.ini\fR if the user doesn't have one already.
-See \fI/usr/doc/pentagram\-@VERSION@/README\fR for full details of the options
-available in the config file.
+For full details of the options available in the config file, see:
+.br
+\fI/usr/doc/pentagram\-@VERSION@/README\fR
 .TP
 .B ~/.pentagram/u8\-save/
 Saved games. Not compatible with the original Ultima 8.
 .TP
-.B /usr/share/pentagram
+.B /usr/share/games/pentagram
 This is the default location where
 .B pentagram
 looks for the Ultima 8 data files. This directory should contain
@@ -80,8 +81,9 @@ options menu in the game, or by creating/editing
 the file \fI~/.pentagram/u8bindings.ini\fR.
 .TP
 .B ~ 
-hides/restores console. See \fI/usr/doc/pentagram\-@VERSION@/README\fR for
-available console commands.
+hides/restores console. For available console commands, see:
+.br
+\fI/usr/doc/pentagram\-@VERSION@/README\fR
 .TP
 .B arrow keys 
 moves Avatar around the map (no walking)
diff --git a/games/pentagram/pentagram.SlackBuild b/games/pentagram/pentagram.SlackBuild
index fe8fc58c1b..680e34783b 100644
--- a/games/pentagram/pentagram.SlackBuild
+++ b/games/pentagram/pentagram.SlackBuild
@@ -6,11 +6,17 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211102 bkw: BUILD=3
+# - new-style icons.
+# - binary in /usr/games.
+# - man page in section 6.
+# - /usr/share/pentagram => /usr/share/games/pentagram.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=pentagram
 VERSION=${VERSION:-20130617_svn}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -22,9 +28,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
@@ -57,11 +60,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 ./bootstrap
 
@@ -83,26 +83,35 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-make
-mkdir -p $PKG/usr/bin
-install -s -m0755 $PRGNAM $PKG/usr/bin/$PRGNAM-bin
-install -m0755 $CWD/$PRGNAM.sh $PKG/usr/bin/$PRGNAM
+make datapath=/usr/share/games/$PRGNAM
+
+mkdir -p $PKG/usr/games $PKG/usr/libexec/$PRGNAM
+install -s -m0755 $PRGNAM $PKG/usr/libexec/$PRGNAM/$PRGNAM-bin
+install -m0755 $CWD/$PRGNAM.sh $PKG/usr/games/$PRGNAM
+
+for px in 16 32 48 64 128; do
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  convert -resize $size system/desktop/$PRGNAM.png $dir/$PRGNAM.png
+done
 
 mkdir -p $PKG/usr/share/pixmaps
-cat ./system/desktop/$PRGNAM.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/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 # man page written for this build.
-mkdir -p $PKG/usr/man/man1
-sed "s/@VERSION@/$VERSION/g" $CWD/$PRGNAM.1 | gzip -9c > $PKG/usr/man/man1/$PRGNAM.1.gz
+MANDIR=$PKG/usr/man/man6
+mkdir -p $MANDIR
+sed "s/@VERSION@/$VERSION/g" $CWD/$PRGNAM.6 | gzip -9c > $MANDIR/$PRGNAM.6.gz
 
 # default config file contains all the options, commented out, plus
 # the default options for this build.
 
 # The default path= assumes the user has extracted or copied the Ultima 8
-# game directory to /usr/share/pentagram (so the file
-# /usr/share/pentagram/U8.exe should exist, possibly as u8.exe or U8.EXE).
+# game directory to /usr/share/games/pentagram (so the file
+# /usr/share/games/pentagram/U8.exe should exist, possibly as u8.exe or U8.EXE).
 
 # The default MIDI driver, at least on the author's system, crashes X and
 # panics the kernel for some reason. It wants to use the OSS sequencer,
@@ -113,8 +122,8 @@ sed "s/@VERSION@/$VERSION/g" $CWD/$PRGNAM.1 | gzip -9c > $PKG/usr/man/man1/$PRGN
 # Setting midi_driver=fmopl in the default config will avoid any problems
 # and users won't have to troubleshoot OSS sequencer crap themselves.
 
-mkdir -p $PKG/usr/share/$PRGNAM
-cat $CWD/$PRGNAM.ini.default > $PKG/usr/share/$PRGNAM/$PRGNAM.ini.default
+mkdir -p $PKG/usr/share/games/$PRGNAM
+cat $CWD/$PRGNAM.ini.default > $PKG/usr/share/games/$PRGNAM/$PRGNAM.ini.default
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog FAQ README $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/pentagram/pentagram.desktop b/games/pentagram/pentagram.desktop
index 905ff61074..7b6362b6b8 100644
--- a/games/pentagram/pentagram.desktop
+++ b/games/pentagram/pentagram.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Pentagram
 Comment=Ultima 8 Engine
-Exec=pentagram
+Exec=/usr/games/pentagram
 Icon=pentagram
 Terminal=false
 Type=Application
diff --git a/games/pentagram/pentagram.ini.default b/games/pentagram/pentagram.ini.default
index 6f552dcba7..37f6bbcce6 100644
--- a/games/pentagram/pentagram.ini.default
+++ b/games/pentagram/pentagram.ini.default
@@ -55,11 +55,9 @@ midi_driver=fmopl
 ## path=path to U8 directory
 
 # SBo default option:
-path=/usr/share/pentagram
+path=/usr/share/games/pentagram
 
 # replace with the directory you want Pentagram to save games to.
 
 # (no, loading of the original's savegames is not supported)
 ## save=path to U8 savegames directory
-
-
diff --git a/games/pentagram/pentagram.sh b/games/pentagram/pentagram.sh
index 5b468d4350..9a84e1f20f 100644
--- a/games/pentagram/pentagram.sh
+++ b/games/pentagram/pentagram.sh
@@ -7,7 +7,7 @@ set -e
 
 if [ ! -e ~/.pentagram/pentagram.ini ]; then
 	mkdir -p ~/.pentagram
-	cat /usr/share/pentagram/pentagram.ini.default > ~/.pentagram/pentagram.ini
+	cat /usr/share/games/pentagram/pentagram.ini.default > ~/.pentagram/pentagram.ini
 fi
 
-exec /usr/bin/pentagram-bin "$@"
+exec /usr/libexec/pentagram/pentagram-bin "$@"