games/atari800: Updated for version 4.1.0.

Signed-off-by: B. Watson <yalhcru@gmail.com>

3 files changed, 21 insertions, 12 deletions

diff --git a/games/atari800/README b/games/atari800/README
index 194a30beefe1..fff07912eeff 100644
--- a/games/atari800/README
+++ b/games/atari800/README
@@ -17,5 +17,5 @@ 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".
+When upgrading from 3.x to 4.x, 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 404aaf2b0627..9a2db8549e2a 100644
--- a/games/atari800/atari800.SlackBuild
+++ b/games/atari800/atari800.SlackBuild
@@ -6,6 +6,9 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20191126 bkw:
+# - update for v4.1.0. script can still build VERSION=3.1.0 or 4.0.0.
+
 # 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.
@@ -14,7 +17,7 @@
 # - minor script tweaks.
 
 PRGNAM=atari800
-VERSION=${VERSION:-4.0.0}
+VERSION=${VERSION:-4.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,19 +63,18 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || \
+  tar xvf $CWD/$PRGNAM-$VERSION-src.tgz
 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 \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+  \( -perm /111 -a \! -perm 755 \) -exec chmod 755 {} + -o \
+  \! -perm /111 -exec chmod 644 {} +
 
 DOCDIR=/usr/doc/$PRGNAM-$VERSION
 PKGDOCDIR=$PKG/$DOCDIR
 
-cd src
+[ ! -f configure ] && cd src
 
 # Include some optional extras. The monitor stuff is nice if you're
 # developing code for the Atari, and the extra sound stuff makes for
@@ -99,10 +101,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=$DOCDIR \
   --build=$ARCH-slackware-linux
 
+# in 4.0.0 and 4.1.0, the --enable-volonlysound is supposed to
+# define this, but for some reason it doesn't.
+#[ -e src/config.h ] && echo '#define VOL_ONLY_SOUND 1' >> src/config.h
+# Unfortunately, forcibly defining it like that, doesn't make the volume
+# only sound actually work. Must determine WTF's going on here.
+
 make
 make install DOC_DIR=$DOCDIR MAN_DIR=/usr/man/man1 DESTDIR=$PKG
 gzip $PKG/usr/man/man1/$PRGNAM.1
 cat $CWD/$PRGNAM.SlackBuild > $PKGDOCDIR/$PRGNAM.SlackBuild
+[ ! -d ../DOC ] && cd src
 
 # 'make install' misses a lot of the docs, let's add them.
 cd ../DOC
diff --git a/games/atari800/atari800.info b/games/atari800/atari800.info
index 6433c4966f52..5a4f29c24dc0 100644
--- a/games/atari800/atari800.info
+++ b/games/atari800/atari800.info
@@ -1,8 +1,8 @@
 PRGNAM="atari800"
-VERSION="4.0.0"
+VERSION="4.1.0"
 HOMEPAGE="https://atari800.github.io/"
-DOWNLOAD="http://downloads.sourceforge.net/project/atari800/atari800/4.0.0/atari800-4.0.0.tar.gz"
-MD5SUM="72ba8e390a8fba7d087c2c089dae6d3c"
+DOWNLOAD="https://github.com/atari800/atari800/releases/download/ATARI800_4_1_0/atari800-4.1.0-src.tgz"
+MD5SUM="b187cd33fec27897a409b0be94a5f3ef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""