6 files changed, 77 insertions, 21 deletions
diff --git a/games/ace/README b/games/ace/README
index 6f0acdb7b4..1531fd868d 100644
--- a/games/ace/README
+++ b/games/ace/README
@@ -1,4 +1,4 @@
-ace - a set of Unix/X solitaire games
+ace (a set of Unix/X solitaire games)
 
 The Ace of Penguins is a set of Unix/X solitaire games based on the
 ones available for Windows(tm) but with a number of enhancements.
@@ -10,3 +10,5 @@ thornq.
 The executables are installed with -ace suffix, e.g. solitaire-ace.
 This is to avoid conflicting with Slackware's bsd-games and xgames
 packages.
+
+While any of the games are running, press H for help, or Q to exit.
diff --git a/games/ace/ace.SlackBuild b/games/ace/ace.SlackBuild
index c5c579eeec..cdf87fb06a 100644
--- a/games/ace/ace.SlackBuild
+++ b/games/ace/ace.SlackBuild
@@ -2,20 +2,33 @@
 
 # Slackware build script for ace.
 
-# Written by G. Schoenmakers
+# Originally written by G. Schoenmakers.
+# Updated and now maintained by B. Watson (urchlay@slackware.uk).
+
+# Original had no license. Modified version licensed under the
+# WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20231130 bkw: BUILD=2
+# - take over maintenance.
+# - add .desktop files.
+# - add icon.
+# - add doinst.sh for desktop/icon.
+# - include AUTHORS ChangeLog NEWS README in doc dir.
+# - include images used by the HTML docs.
+# - tweak README and slack-desc slightly.
 
 # 20220219 bkw: Modified by SlackBuilds.org:
 # - fix build on Slackware 15.0.
 # - binaries in /usr/games.
 # - remove .la file.
 # - install binaries with -ace suffix, to avoid conflicting with
-#   canfield from Slackware's bsd-games and solitaire from xgames.
+#   canfield from Slackware's bsd-games and spider from xgames.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ace
 VERSION=${VERSION:-1.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -59,11 +72,8 @@ 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 {} +
 
 # Patch for libpng and other fixes thanks to Arch Linux
 patch -p1 < $CWD/ace14_fixes.patch
@@ -87,14 +97,49 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a docs/COPYING docs/intro.html docs/toolkit.html $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# Icon made from a chunk of as.gif. All the games use the same icon,
+# which shouldn't matter much. Might confuse the user if he's playing
+# 2 of these games at once, but who does that?
+# Install as aceofpeng.png because ace.png is pretty generic, might
+# conflict with something.
+for px in 16 22 32 48 64; do
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  convert -resize $size $CWD/$PRGNAM.png $dir/aceofpeng.png
+done
+
+dir=$PKG/usr/share/pixmaps
+mkdir -p $dir
+ln -s ../icons/hicolor/48x48/apps/aceofpeng.png $dir/aceofpeng.png
+
+# Generate the .desktop files.
+dir=$PKG/usr/share/applications
+mkdir -p $dir
+for exe in $PKG/usr/games/*; do
+  exe="$( basename $exe )"
+  name="$( basename ${exe^} -ace )"
+  cat > $dir/$exe.desktop <<EOF
+[Desktop Entry]
+Name=$name (Ace of Penguins)
+Exec=/usr/games/$exe
+Terminal=false
+Type=Application
+Icon=aceofpeng
+Categories=Game;CardGame;
+EOF
+done
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS ChangeLog NEWS README docs/* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 rm -f $PKG/usr/lib*/*.la
 
 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/ace/ace.info b/games/ace/ace.info
index 872341481a..0bf8e26e00 100644
--- a/games/ace/ace.info
+++ b/games/ace/ace.info
@@ -6,5 +6,5 @@ MD5SUM="b80169fa59d69758bb9686f31a84ad2b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="G. Schoenmakers"
-EMAIL="gschoen@iinet.net.au"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/games/ace/ace.png b/games/ace/ace.png
new file mode 100644
index 0000000000..c6a03dc720
--- /dev/null
+++ b/games/ace/ace.png
diff --git a/games/ace/doinst.sh b/games/ace/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/games/ace/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 -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/ace/slack-desc b/games/ace/slack-desc
index 6633991484..b671f5d51c 100644
--- a/games/ace/slack-desc
+++ b/games/ace/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
    |-----handy-ruler------------------------------------------------------|
-ace: ace (Unix/X solitaire games)
+ace: ace (a set of Unix/X solitaire games)
 ace:
-ace: The Ace of Penguins is a set of Unix/X solitaire games
-ace: based on the ones available for Windows(tm)
-ace: but with a number of enhancements.
-ace: The latest version includes clones of freecell, golf, mastermind,
-ace: merlin, minesweeper, pegged, solitaire, taipei (with editor)
-ace: and thornq.
+ace: The Ace of Penguins is a set of Unix/X solitaire games based
+ace: on the ones available for Windows(tm), but with a number of
+ace: enhancements. The latest version includes clones of freecell,
+ace: golf, mastermind, merlin, minesweeper, pegged, solitaire, taipei
+ace: (with editor) and thornq.
 ace:
 ace: Homepage: http://www.delorie.com/store/ace/
 ace:
+ace: