4 files changed, 38 insertions, 20 deletions
diff --git a/games/atari800/README b/games/atari800/README
index d045d090ff98..194a30beefe1 100644
--- a/games/atari800/README
+++ b/games/atari800/README
@@ -1,12 +1,21 @@
 atari800 (Atari 8-bit computer emulator)
 
-This is free and portable Atari 8-bit computer and 5200 console emulator,
-originally written by David Firth and now developed by the Atari800
-Development Team. This program is copyrighted and released under the GPL.
+This is a free and portable Atari 8-bit computer and 5200 console
+emulator, originally written by David Firth and now developed by the
+Atari800 Development Team. This program is copyrighted and released
+under the GPL.
 
 This build uses SDL for audio, and SDL+OpenGL for video by default. To
 build without OpenGL support (SDL software rendering only), set OPENGL=no
 in the script's environment.
 
-To run Atari software with atari800, you'll need the Atari system ROMs.
-These are packaged on SBo as atari800_roms.
+Starting with version 4.0.0, atari800 includes free replacements for the
+system ROMs, from the Altirra project. This allows you to run most Atari
+software without installing the original ROMs. However, for maximum
+compatibility, you'll need the Atari system ROMs. These are packaged
+on SBo as atari800_roms. After installing the ROMs, use the built-in
+menu in atari800 to set the paths (/usr/share/atari800/atari800_roms/*)
+and disable the built-in Altirra ROMs.
+
+When upgrading to 4.0.0, if the Atari's display is 'washed out' (too
+bright), remove your old "~/.atari800.cfg".
diff --git a/games/atari800/atari800.SlackBuild b/games/atari800/atari800.SlackBuild
index 64224403fb5e..404aaf2b0627 100644
--- a/games/atari800/atari800.SlackBuild
+++ b/games/atari800/atari800.SlackBuild
@@ -6,8 +6,15 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20180703 bkw:
+# - update for v4.0.0. script can still build VERSION=3.1.0 if needed.
+# - update README to mention the new Altirra OS stuff.
+# - minor slack-desc and README fix.
+# - don't install INSTALL in /usr/doc.
+# - minor script tweaks.
+
 PRGNAM=atari800
-VERSION=${VERSION:-3.1.0}
+VERSION=${VERSION:-4.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,9 +65,12 @@ 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 {} \+
+
+DOCDIR=/usr/doc/$PRGNAM-$VERSION
+PKGDOCDIR=$PKG/$DOCDIR
 
 cd src
 
@@ -86,24 +96,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --docdir=$DOCDIR \
   --build=$ARCH-slackware-linux
 
 make
-make install DOC_DIR=/usr/doc/$PRGNAM-$VERSION MAN_DIR=/usr/man/man1 DESTDIR=$PKG
-
+make install DOC_DIR=$DOCDIR MAN_DIR=/usr/man/man1 DESTDIR=$PKG
 gzip $PKG/usr/man/man1/$PRGNAM.1
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOCDIR/$PRGNAM.SlackBuild
 
 # 'make install' misses a lot of the docs, let's add them.
 cd ../DOC
-rm -f directx.txt
-cp -a BUGS CREDITS ChangeLog FAQ TODO *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+rm -f directx.txt $PKGDOCDIR/INSTALL
+cp -a BUGS CREDITS ChangeLog FAQ TODO *.txt $PKGDOCDIR
 cd ..
 
 # util/ is worth keeping, but mostly for reference (so it goes in /usr/doc)
 chmod -x util/*.* util/export
-cp -a util $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a util $PKGDOCDIR
 
 # the act/*.act files are palettes from the dark ages, leave them out.
 
diff --git a/games/atari800/atari800.info b/games/atari800/atari800.info
index 994569fe3c56..6433c4966f52 100644
--- a/games/atari800/atari800.info
+++ b/games/atari800/atari800.info
@@ -1,10 +1,10 @@
 PRGNAM="atari800"
-VERSION="3.1.0"
+VERSION="4.0.0"
 HOMEPAGE="https://atari800.github.io/"
-DOWNLOAD="http://downloads.sourceforge.net/project/atari800/atari800/3.1.0/atari800-3.1.0.tar.gz"
-MD5SUM="354f8756a7f33cf5b7a56377d1759e41"
+DOWNLOAD="http://downloads.sourceforge.net/project/atari800/atari800/4.0.0/atari800-4.0.0.tar.gz"
+MD5SUM="72ba8e390a8fba7d087c2c089dae6d3c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="atari800_roms"
+REQUIRES=""
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/games/atari800/slack-desc b/games/atari800/slack-desc
index ce022f0da0cc..253dfe562d38 100644
--- a/games/atari800/slack-desc
+++ b/games/atari800/slack-desc
@@ -8,7 +8,7 @@
         |-----handy-ruler------------------------------------------------------|
 atari800: atari800 (Atari 8-bit computer emulator)
 atari800:
-atari800: This is free and portable Atari 8-bit computer and 5200 console
+atari800: This is a free and portable Atari 8-bit computer and 5200 console
 atari800: emulator, originally written by David Firth and now developed by the
 atari800: Atari800 Development Team. This program is copyrighted and released
 atari800: under the GPL.