9 files changed, 34 insertions, 21 deletions
diff --git a/games/yahtzee/doinst.sh b/games/yahtzee/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/games/yahtzee/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/yahtzee/yahtzee.png b/games/yahtzee/icons/128.png
index 4d41fbf51d..4d41fbf51d 100644
--- a/games/yahtzee/yahtzee.png
+++ b/games/yahtzee/icons/128.png
diff --git a/games/yahtzee/icons/16.png b/games/yahtzee/icons/16.png
new file mode 100644
index 0000000000..ddb2e4428c
--- /dev/null
+++ b/games/yahtzee/icons/16.png
diff --git a/games/yahtzee/icons/32.png b/games/yahtzee/icons/32.png
new file mode 100644
index 0000000000..df3471cdcd
--- /dev/null
+++ b/games/yahtzee/icons/32.png
diff --git a/games/yahtzee/icons/48.png b/games/yahtzee/icons/48.png
new file mode 100644
index 0000000000..6d2421d06f
--- /dev/null
+++ b/games/yahtzee/icons/48.png
diff --git a/games/yahtzee/icons/64.png b/games/yahtzee/icons/64.png
new file mode 100644
index 0000000000..69d71838d0
--- /dev/null
+++ b/games/yahtzee/icons/64.png
diff --git a/games/yahtzee/yahtzee.SlackBuild b/games/yahtzee/yahtzee.SlackBuild
index 34b8b813f2..d64d6f6e05 100644
--- a/games/yahtzee/yahtzee.SlackBuild
+++ b/games/yahtzee/yahtzee.SlackBuild
@@ -2,15 +2,18 @@
 
 # Slackware build script for yahtzee
 
-# 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.
 
+# 20230531 bkw: BUILD=3, actually use SLKCFLAGS.
+# 20211011 bkw: BUILD=2, new-style icons, add doinst.sh.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=yahtzee
 VERSION=${VERSION:-1.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -22,9 +25,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
@@ -36,16 +36,12 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -57,11 +53,10 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -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 {} \+
+
+sed -i "/^CFLAGS/s,-Os,$SLKCFLAGS," Makefile
 
 # By default, the Makefile builds one binary with the dumb, curses, and SDL
 # UIs. It tries to init SDL, then falls back on curses... unfortunately on a
@@ -82,10 +77,18 @@ for ui in sdl curses text; do
   install -s $PRGNAM $PKG/usr/games/$PRGNAM-$ui
 done
 
-# icon came from:
+# icons came from:
 # http://www.iconarchive.com/show/mahjong-icons-by-jommans/Trash-Full-Dice-icon.html
+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
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/64x64/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 # .desktop file written for this build
 mkdir -p $PKG/usr/share/applications
@@ -99,6 +102,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 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
diff --git a/games/yahtzee/yahtzee.desktop b/games/yahtzee/yahtzee.desktop
index d9283b8615..20fa68eed7 100644
--- a/games/yahtzee/yahtzee.desktop
+++ b/games/yahtzee/yahtzee.desktop
@@ -3,7 +3,7 @@ Type=Application
 Name=Yahtzee
 GenericName=Yahtzee
 Comment=Yahtzee dice/board game
-Exec=yahtzee-sdl
+Exec=/usr/games/yahtzee-sdl
 Icon=yahtzee
 Terminal=false
 Categories=Game;BoardGame;
diff --git a/games/yahtzee/yahtzee.info b/games/yahtzee/yahtzee.info
index 7f81b26c4e..8eea819e9d 100644
--- a/games/yahtzee/yahtzee.info
+++ b/games/yahtzee/yahtzee.info
@@ -1,10 +1,10 @@
 PRGNAM="yahtzee"
 VERSION="1.6"
-HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/yahtzee.html"
-DOWNLOAD="http://www.muppetlabs.com/~breadbox/pub/software/yahtzee-1.6.tar.gz"
-MD5SUM="6ad1c98eb0136ac378425d469d270060"
+HOMEPAGE="https://www.muppetlabs.com/~breadbox/software/yahtzee.html"
+DOWNLOAD="https://www.muppetlabs.com/~breadbox/pub/software/yahtzee-1.6.tar.gz"
+MD5SUM="d694df4091a5eafcc4fb5b0ee03424ce"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"