1 files changed, 40 insertions, 21 deletions
diff --git a/games/pentagram/pentagram.SlackBuild b/games/pentagram/pentagram.SlackBuild
index d9d7d6a178..dc0d6a5581 100644
--- a/games/pentagram/pentagram.SlackBuild
+++ b/games/pentagram/pentagram.SlackBuild
@@ -1,15 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pentagram
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # 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}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +28,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,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
 
@@ -73,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,
@@ -103,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
@@ -115,4 +134,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE