5 files changed, 68 insertions, 27 deletions
diff --git a/games/atari++/README b/games/atari++/README
index c0b615414a..8517407876 100644
--- a/games/atari++/README
+++ b/games/atari++/README
@@ -1,8 +1,8 @@
-The Atari++ Emulator is a Unix based emulator of the Atari eight bit
-computers, namely the Atari 400 and 800, the Atari 600XL, 800XL and 130XE,
-and the Atari 5200 game console. The emulator is auto-configurable and
-will compile on a variety of systems (Linux, Solaris, Irix), and supports
-many emulation features.
+The Atari++ Emulator is a Unix based emulator of the Atari eight
+bit computers, namely the Atari 400 and 800, the Atari 600XL,
+800XL and 130XE, and the Atari 5200 game console. The emulator is
+auto-configurable and will compile on a variety of systems (Linux,
+Solaris, Irix), and supports many emulation features.
 
 Atari++ includes OS++, an open source replacement Atari 8-bit operating
 system, so it's able to run many games and applications without the
@@ -11,7 +11,16 @@ want the original ROMs. To get them, install the atari800_roms package,
 then use the atari++ GUI to set the ROM file paths to the images in
 /usr/share/atari800/roms/.
 
-Note: Atari++, by default, is built with a fancy set of CFLAGS that the
-author includes in his makefile. If you're picky about such things, or if
-you run into crashes or compile errors, try setting FORCE_SLACK_CFLAGS=yes
-in the environment before running atari++.SlackBuild
+Note: Atari++, by default, is built with a fancy set of CFLAGS
+that the author includes in his makefile. If you're picky about
+such things, or if you run into crashes or compile errors, try
+setting FORCE_SLACK_CFLAGS=yes in the environment before running
+atari++.SlackBuild
+
+Optional patch: If you *really* don't like the "Do you really want to
+quit?" prompt when you try to exit the emulator, set CONFIRM_QUIT=no
+in the environment before building atari++. You probably also want
+to skip the agree-to-the-GPL prompt at startup, which can be done
+with:
+
+$ echo "AcceptLicence=on" > ~/.atari++.conf
diff --git a/games/atari++/atari++.SlackBuild b/games/atari++/atari++.SlackBuild
index a829cb2f79..cc50ec00a1 100644
--- a/games/atari++/atari++.SlackBuild
+++ b/games/atari++/atari++.SlackBuild
@@ -1,17 +1,25 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for atari++
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# 20170122 bkw: update for 1.81
+# 20230106 bkw: update for 1.85
+# 20211007 bkw: update for 1.84
+# 20210323 bkw: BUILD=2
+# - add option to patch out "Do you really want to quit?" because it's *annoying*
+# - move binary to /usr/games
+# 20170122 bkw: update for 1.83
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=atari++
-VERSION=${VERSION:-1.81}
+VERSION=${VERSION:-1.85}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -21,7 +29,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}
@@ -57,11 +69,13 @@ rm -rf $PRGNAM
 tar xvf $CWD/${PRGNAM}_$VERSION.tar.gz
 cd $PRGNAM
 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 {} \+
+
+# 20210323 bkw: optional patch, disabled by default. Sorry, I can't
+# stand the "Do you really want to quit?" prompt, and there's no
+# config file or CLI option to disable it.
+[ "${CONFIRM_QUIT:-yes}" = "no" ] && patch -p1 < $CWD/no_confirm_quit.diff
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -81,9 +95,9 @@ fi
 
 # no DESTDIR support, --mandir is ignored, docs go to /usr/share/doc,
 # let's not use `make install' at all.
-mkdir -p $PKG/usr/bin $PKG/usr/man/man6 $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/games $PKG/usr/man/man6 $PKG/usr/doc/$PRGNAM-$VERSION
 
-install -s -m0755 -o root -g root $PRGNAM $PKG/usr/bin
+install -s -m0755 -o root -g root $PRGNAM $PKG/usr/games
 
 gzip -9c < $PRGNAM.man > $PKG/usr/man/man6/$PRGNAM.6.gz
 
@@ -105,4 +119,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/atari++/atari++.desktop b/games/atari++/atari++.desktop
index b2ea28b399..bd740d210e 100644
--- a/games/atari++/atari++.desktop
+++ b/games/atari++/atari++.desktop
@@ -3,7 +3,7 @@ Version=1.0
 Name=Atari++ Emulator
 GenericName=Atari 8-Bit Emulator
 Type=Application
-Exec=atari++
+Exec=/usr/games/atari++
 Icon=atari++
 Terminal=false
 StartupNotify=false
diff --git a/games/atari++/atari++.info b/games/atari++/atari++.info
index 9aa53d6a95..a10699fd20 100644
--- a/games/atari++/atari++.info
+++ b/games/atari++/atari++.info
@@ -1,10 +1,10 @@
 PRGNAM="atari++"
-VERSION="1.81"
+VERSION="1.85"
 HOMEPAGE="http://www.xl-project.com/"
-DOWNLOAD="http://www.xl-project.com/download/atari++_1.81.tar.gz"
-MD5SUM="9780e36d28d27ea5f3e89b418f04a44e"
+DOWNLOAD="http://www.xl-project.com/download/atari++_1.85.tar.gz"
+MD5SUM="2d71eaebe7bc6527fbcecc94b74a1093"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/games/atari++/no_confirm_quit.diff b/games/atari++/no_confirm_quit.diff
new file mode 100644
index 0000000000..12f22ddeb5
--- /dev/null
+++ b/games/atari++/no_confirm_quit.diff
@@ -0,0 +1,18 @@
+diff -Naur atari++/atari.cpp atari++.patched/atari.cpp
+--- atari++/atari.cpp	2020-03-21 13:13:35.000000000 -0400
++++ atari++.patched/atari.cpp	2021-03-23 00:21:48.022961292 -0400
+@@ -263,14 +263,7 @@
+       }
+     }
+     if (machine->Quit()) {
+-      // Check whether the user really wants to quit.
+-      if (YesNoRequester->Request("Do you really want to quit Atari++?",
+-				  "Continue Execution","Quit Program",NULL) == 0) {
+-	redo = true;
+-	machine->Quit() = false;
+-      } else {
+ 	redo = false;
+-      }
+     }
+   } while(redo);
+ }