1 files changed, 27 insertions, 21 deletions
diff --git a/games/gargoyle/gargoyle.SlackBuild b/games/gargoyle/gargoyle.SlackBuild
index d399272e6a..bf1b7293ab 100644
--- a/games/gargoyle/gargoyle.SlackBuild
+++ b/games/gargoyle/gargoyle.SlackBuild
@@ -7,8 +7,8 @@
 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}
 
@@ -23,9 +23,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
@@ -44,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=""
@@ -60,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 -fpermissive" \
- -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
@@ -88,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