3 files changed, 31 insertions, 17 deletions
diff --git a/games/wordwarvi/wordwarvi.SlackBuild b/games/wordwarvi/wordwarvi.SlackBuild
index 9fba3c69d8..e00930f81a 100644
--- a/games/wordwarvi/wordwarvi.SlackBuild
+++ b/games/wordwarvi/wordwarvi.SlackBuild
@@ -1,17 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wordwarvi
 
-# 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.
 
+# 20211015 bkw: BUILD=2, new-style icons
+# 20210224 bkw: update for v1.0.4
 # 20170302 bkw: use long-format github URL, add .desktop, BUILD=2
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wordwarvi
-VERSION=${VERSION:-1.0.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.0.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -21,7 +26,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}
@@ -49,18 +58,23 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 640 -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 {} \+
 
 make OPTIMIZE_FLAG="$SLKCFLAGS" MANDIR=/usr/man SCREENSAVERFLAG=-DDO_INHIBIT_SCREENSAVER
 make install MANDIR=/usr/man DESTDIR=$PKG
 strip $PKG/usr/games/$PRGNAM
 
 mkdir -p $PKG/usr/share/pixmaps $PKG/usr/share/applications
-cat icons/${PRGNAM}_icon_128x128.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+for i in icons/$PRGNAM*.png; do
+  px=$( basename $i | sed 's,.*_\([0-9][0-9]*\)x.*,\1,' )
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  cat $i > $dir/$PRGNAM.png
+done
+
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -72,4 +86,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
diff --git a/games/wordwarvi/wordwarvi.desktop b/games/wordwarvi/wordwarvi.desktop
index 5db69ac69d..b212402cee 100644
--- a/games/wordwarvi/wordwarvi.desktop
+++ b/games/wordwarvi/wordwarvi.desktop
@@ -2,6 +2,6 @@
 Name=Word War VI
 Type=Application
 Categories=Game;ArcadeGame;
-Exec=wordwarvi %F
+Exec=/usr/games/wordwarvi %F
 TryExec=wordwarvi
 Icon=wordwarvi
diff --git a/games/wordwarvi/wordwarvi.info b/games/wordwarvi/wordwarvi.info
index 2ee105d536..109ff99aa2 100644
--- a/games/wordwarvi/wordwarvi.info
+++ b/games/wordwarvi/wordwarvi.info
@@ -1,10 +1,10 @@
 PRGNAM="wordwarvi"
-VERSION="1.0.2"
+VERSION="1.0.4"
 HOMEPAGE="https://github.com/smcameron/wordwarvi"
-DOWNLOAD="https://github.com/smcameron/wordwarvi/archive/v1.0.2/wordwarvi-1.0.2.tar.gz"
-MD5SUM="c55fad24f42ad2be0e06ac70f5fbc0be"
+DOWNLOAD="https://github.com/smcameron/wordwarvi/archive/v1.0.4/wordwarvi-1.0.4.tar.gz"
+MD5SUM="3b25d6cc973cdba85db37266b73de950"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="portaudio"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"