8 files changed, 94 insertions, 20 deletions
diff --git a/games/ZEsarUX/Makefile.patch b/games/ZEsarUX/Makefile.patch
new file mode 100644
index 0000000000..fc1e2d148c
--- /dev/null
+++ b/games/ZEsarUX/Makefile.patch
@@ -0,0 +1,20 @@
+--- Makefile	2022-06-02 21:37:14.244285088 +0100
++++ Makefile.new	2022-06-02 22:21:33.238469204 +0100
+@@ -477,7 +477,7 @@
+ 	echo "Generated file is : ZEsarUX_src-$(EMULATOR_VERSION).tar.gz"
+ 
+ bintargz: all
+-	./generate_install_sh.sh
++	./generate_install_sh.sh $(DESTDIR)
+ 	rm -fR bintargztemp
+ 	mkdir -p bintargztemp/ZEsarUX-$(EMULATOR_VERSION)
+ 	cp -a $(COMMONFILES) $(ONLYUNIXBINARIES) bintargztemp/ZEsarUX-$(EMULATOR_VERSION)/
+@@ -557,7 +557,7 @@
+ 
+ 
+ install: all
+-	./generate_install_sh.sh
++	./generate_install_sh.sh $(DESTDIR)
+ 	./install.sh
+ 
+ #utilities: $(UTILITIES)
diff --git a/games/ZEsarUX/README b/games/ZEsarUX/README
index b3129b9629..e7e79030ce 100644
--- a/games/ZEsarUX/README
+++ b/games/ZEsarUX/README
@@ -18,4 +18,4 @@ ZEsarUX source code and binaries are distributed under GNU GPL license.
 ZEsarUX also includes third-party roms, media, programs and
 games NOT covered by this license
 
-This package installs to /opt/zesarux
+This package installs to /opt/ZEsarUX
diff --git a/games/ZEsarUX/ZEsarUX.SlackBuild b/games/ZEsarUX/ZEsarUX.SlackBuild
index 6daa043863..31f5b1cba6 100644
--- a/games/ZEsarUX/ZEsarUX.SlackBuild
+++ b/games/ZEsarUX/ZEsarUX.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ZEsarUX
 
-# Copyright 2018 Antonio Leal, Porto Salvo, Oeiras, Portugal
+# Copyright 2023 Antonio Leal, Porto Salvo, Oeiras, Portugal
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ZEsarUX
-VERSION=${VERSION:-6.0}
+VERSION=${VERSION:-10.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,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}
@@ -55,31 +62,59 @@ else
 fi
 
 set -e
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvfz $CWD/$PRGNAM\_src-$VERSION.tar.gz
+
+# {
+# Temporary fix until normal versioning scheme resumes
+#tar xvfz $CWD/$PRGNAM\_src-$VERSION.tar.gz
+tar xvfz $CWD/ZEsarUX_src-X.tar.gz
+mv ZEsarUX-X ZEsarUX-10.10
+# }
+
 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 \
+  -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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+SLKCFLAGS+=" -fcommon"
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+./configure --prefix=/opt/ZEsarUX
+
+## Add support for DESTDIR ##
+patch Makefile $CWD/Makefile.patch
+patch generate_install_sh.sh $CWD/generate_install_sh.sh.patch
 
-sed "5iINSTALLPREFIX=$PKG/opt/ZEsarUX" generate_install_sh.sh > aux_generate_install_sh.sh
-mv aux_generate_install_sh.sh generate_install_sh.sh
-chmod +x generate_install_sh.sh
-./configure \
-  --prefix /opt/ZEsarUX
 make
 make install DESTDIR=$PKG
 
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+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
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+mkdir -p $PKG/opt/ZEsarUX
+mv $PKG/bin $PKG/opt/ZEsarUX/bin
+mv $PKG/share $PKG/opt/ZEsarUX/share
+mkdir -p $PKG/usr/share/pixmaps
+cp $CWD/ZEsarUX.png $PKG/usr/share/pixmaps
+mkdir -p $PKG/usr/share/applications
+cp $CWD/zesarux.desktop $PKG/usr/share/applications
+
+## Symlinks ##
+mkdir -p $PKG/usr/bin
+( cd $PKG/usr/bin ; rm -rf zesarux )
+( cd $PKG/usr/bin ; ln -sf /opt/ZEsarUX/bin/zesarux zesarux )
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -88,4 +123,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/ZEsarUX/ZEsarUX.info b/games/ZEsarUX/ZEsarUX.info
index d659e27d4c..064e6590a4 100644
--- a/games/ZEsarUX/ZEsarUX.info
+++ b/games/ZEsarUX/ZEsarUX.info
@@ -1,8 +1,8 @@
 PRGNAM="ZEsarUX"
-VERSION="6.0"
-HOMEPAGE="https://sourceforge.net/projects/zesarux"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/ZEsarUX_src-6.0.tar.gz"
-MD5SUM="a92d0a7cc38166e84a1f32a48c4f8c8f"
+VERSION="10.10"
+HOMEPAGE="https://github.com/chernandezba/zesarux"
+DOWNLOAD="https://github.com/chernandezba/zesarux/releases/download/ZEsarUX-X/ZEsarUX_src-X.tar.gz"
+MD5SUM="d6a8a847b6a3a19258898bd8a57d6312"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/ZEsarUX/ZEsarUX.png b/games/ZEsarUX/ZEsarUX.png
new file mode 100644
index 0000000000..79ea8e1efb
--- /dev/null
+++ b/games/ZEsarUX/ZEsarUX.png
diff --git a/games/ZEsarUX/generate_install_sh.sh.patch b/games/ZEsarUX/generate_install_sh.sh.patch
new file mode 100644
index 0000000000..3ea9c316fa
--- /dev/null
+++ b/games/ZEsarUX/generate_install_sh.sh.patch
@@ -0,0 +1,11 @@
+--- generate_install_sh.sh	2022-05-06 17:03:44.000000000 +0100
++++ generate_install_sh.sh.new	2022-06-02 21:45:10.648318076 +0100
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env bash
+ 
+ 
+-INSTALLPREFIX=`cat compileoptions.h |grep INSTALL_PREFIX|cut -d '"' -f2`
++INSTALLPREFIX=$1
+ EDITION_NAME_GAME=`cat cpu.h|grep EDITION_NAME_GAME|cut -d '"' -f2`
+ 
+ 
diff --git a/games/ZEsarUX/slack-desc b/games/ZEsarUX/slack-desc
index c5be5d6098..9de6c24393 100644
--- a/games/ZEsarUX/slack-desc
+++ b/games/ZEsarUX/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-ZEsarUX: ZEsarUX (Machines Emulator)
+ZEsarUX: ZEsarUX (retro machines emulator)
 ZEsarUX:
 ZEsarUX: ZEsarUX is a ZX Machines Emulator for Unix, including all the
 ZEsarUX: Sinclair computers: MK14, ZX80, ZX81, ZX Spectrum, QL, Z88 and
diff --git a/games/ZEsarUX/zesarux.desktop b/games/ZEsarUX/zesarux.desktop
new file mode 100644
index 0000000000..9cab60eab9
--- /dev/null
+++ b/games/ZEsarUX/zesarux.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=ZEsarUX
+Comment=ZX Machines Emulator
+Exec=/opt/ZEsarUX/bin/zesarux
+Icon=/usr/share/pixmaps/ZEsarUX.png
+Terminal=false
+Type=Application
+