3 files changed, 51 insertions, 25 deletions
diff --git a/games/gargoyle/doinst.sh b/games/gargoyle/doinst.sh
index 595fdd454b..34ca31c416 100644
--- a/games/gargoyle/doinst.sh
+++ b/games/gargoyle/doinst.sh
@@ -16,3 +16,13 @@ config etc/garglk.ini.new
 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
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/games/gargoyle/gargoyle.SlackBuild b/games/gargoyle/gargoyle.SlackBuild
index fd26829adf..bf1b7293ab 100644
--- a/games/gargoyle/gargoyle.SlackBuild
+++ b/games/gargoyle/gargoyle.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gargoyle
 # Written by Dugan Chen (thedoogster@gmail.com)
 # Yth | Pont-en-Royans, France | yth@ythogtha.org
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gargoyle
-VERSION=${VERSION:-2019.1.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2023.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=garglk
 SRCVER=${VERSION}
@@ -20,7 +23,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}
@@ -34,6 +41,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -50,26 +60,30 @@ cd $SRCNAM-$SRCVER
 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 \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-env -u BUILD \
-jam -s DESTDIR=$PKG \
- -s _BINDIR=/usr/libexec/gargoyle \
- -s _APPDIR=/usr/libexec/gargoyle \
- -s _LIBDIR=/usr/lib$LIBDIRSUFFIX/gargoyle \
- -s CCFLAGS="$SLKCFLAGS -fgnu89-inline" \
- -dx \
- install
+ -exec chmod 644 {} \+
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -fcommon -fgnu89-inline" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fcommon -fpermissive" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 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/bin
-install -m755 $CWD/gargoyle.sh $PKG/usr/bin/gargoyle
+mv $PKG/usr/share/man $PKG/usr/man
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
-ln -s gargoyle/libgarglk.so $PKG/usr/lib${LIBDIRSUFFIX}/libgarglk.so
+mkdir -p $PKG/usr/games
+mv $PKG/usr/bin/gargoyle $PKG/usr/games/gargoyle
 
 mkdir -p $PKG/etc
 cp garglk/garglk.ini $PKG/etc/garglk.ini.new
@@ -78,10 +92,12 @@ mkdir -p $PKG/usr/share/pixmaps
 cp garglk/gargoyle-house.png $PKG/usr/share/pixmaps
 
 mkdir -p $PKG/usr/share/applications
-cp garglk/gargoyle.desktop $PKG/usr/share/applications
+sed -e "/^Icon/s,=,=/usr/share/pixmaps/," \
+    -e "/^Exec/s,=,=/usr/games/," \
+    < garglk/gargoyle.desktop \
+    > $PKG/usr/share/applications/gargoyle.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -89,4 +105,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/gargoyle/gargoyle.info b/games/gargoyle/gargoyle.info
index 7c01f9fbd4..dd0215207d 100644
--- a/games/gargoyle/gargoyle.info
+++ b/games/gargoyle/gargoyle.info
@@ -1,10 +1,10 @@
 PRGNAM="gargoyle"
-VERSION="2019.1.1"
+VERSION="2023.1"
 HOMEPAGE="http://ccxvii.net/gargoyle/"
-DOWNLOAD="https://github.com/garglk/garglk/archive/2019.1.1/garglk-2019.1.1.tar.gz"
-MD5SUM="4b0a92f55adf583b9d5a0ea3e8b59df0"
+DOWNLOAD="https://github.com/garglk/garglk/archive/2023.1/garglk-2023.1.tar.gz"
+MD5SUM="8ded81038e47abe7e21a6d70f6466171"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL_sound jam linux-libertine-fonts smpeg"
+REQUIRES=""
 MAINTAINER="Yth - Arnaud"
 EMAIL="yth@ythogtha.org"