1 files changed, 73 insertions, 21 deletions
diff --git a/games/ace/ace.SlackBuild b/games/ace/ace.SlackBuild
index 72a27330be..cdf87fb06a 100644
--- a/games/ace/ace.SlackBuild
+++ b/games/ace/ace.SlackBuild
@@ -2,27 +2,44 @@
 
 # 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 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}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   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
@@ -32,8 +49,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -55,39 +72,74 @@ 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
 
+SLKCFLAGS+=" -fcommon"
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --bindir=/usr/games \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-static=no \
+  --program-suffix=-ace \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-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
+make install-strip DESTDIR=$PKG
+
+# 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