1 files changed, 50 insertions, 17 deletions
diff --git a/games/gtkballs/gtkballs.SlackBuild b/games/gtkballs/gtkballs.SlackBuild
index 08008b5bf4..b7783265b8 100644
--- a/games/gtkballs/gtkballs.SlackBuild
+++ b/games/gtkballs/gtkballs.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2010  Binh Nguyen <binhvng@gmail.com>
+# Copyright 2010  Binh Nguyen <email removed>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,12 +20,27 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Note to self: keep an eye on https://github.com/emorozov/gtkballs
+# It looks like the original author has started development again,
+# but so far there are no new releases.
+
+# 20211021 bkw: BUILD=3
+# - binary in /usr/games.
+# - /usr/share/gtkballs => /usr/share/games/gtkballs.
+# - new-style icons.
+# - install setgid games by default.
+# - add SETGID=no in case someone doesn't trust it.
+# - include upstream's "asp" theme.
+
 # 20140228 bkw: took over maintenance, simplified a bit
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gtkballs
 VERSION=${VERSION:-3.1.5}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +50,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}
@@ -62,16 +81,16 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+tar xvfC $CWD/asp.tar.bz2 $PRGNAM-data/themes
 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 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --bindir=/usr/games \
+  --datadir=/usr/share/games \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var/games/$PRGNAM \
@@ -81,25 +100,39 @@ CFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
-chown -R root:games $PKG/var/games/$PRGNAM
-chmod -R ug+w $PKG/var/games/$PRGNAM
+if [ "${SETGID:-yes}" = "yes" ]; then
+  chown -R root:games $PKG/var/games/$PRGNAM $PKG/usr/games/$PRGNAM
+  chmod g+s $PKG/usr/games/$PRGNAM
+  chmod -R ug+w $PKG/var/games/$PRGNAM
+fi
 
 gzip $PKG/usr/man/man?/$PRGNAM.*
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog NEWS README* TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a COPYING ChangeLog NEWS README TODO $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+# These 2 have Cyrillic characters:
+iconv -f iso-8859-5 AUTHORS -t utf-8 > $PKGDOC/AUTHORS
+iconv -f iso-8859-5 README.russian -t utf-8 > $PKGDOC/README.russian
 
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
+for i in $CWD/icons/*.png; do
+  px=$( basename $i | cut -d. -f1 )
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  cat $i > $dir/$PRGNAM.png
+done
+
 mkdir -p $PKG/usr/share/pixmaps
-ln -s ../$PRGNAM/${PRGNAM}_16x16.png $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/install
 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