5 files changed, 48 insertions, 43 deletions
diff --git a/games/hatari_tos_roms/README b/games/hatari_tos_roms/README
index 592885822bfb2..d9289e457aa3b 100644
--- a/games/hatari_tos_roms/README
+++ b/games/hatari_tos_roms/README
@@ -1,20 +1,12 @@
-TOS (Tramiel Operating System) ROM images for use with hatari.
-Versions 1.02 and 2.06 included.
+hatari_tos_roms (TOS ROM images for ST emulators)
 
-These images are copyrighted by Atari, Inc. It may be illegal to
-install this package in your jurisdiction!
+TOS (Tramiel Operating System) ROM images for use with hatari or other
+ST emulators. US and UK versions 1.02, 1.04, and 2.06 included.
 
-On the other hand, they're freely available on various web sites,
-and have been for many years with no legal action taken.
-
-The SlackBuild script requires the UK ROM images, which are sufficient
-for most uses. A few games and demos, however, will require the US ROM
-versions. If the file tos_us.zip is present in the directory with the
-SlackBuild, these ROMs will be included in the package as well. Get
-them from:
-
-http://steem.atari.st/tos_us.zip
-(md5sum bf250988783a0d468711a1057215fd73)
+These images are copyrighted by Atari, Inc. It may be illegal to install
+this package in your jurisdiction! On the other hand, they're freely
+available on various web sites, and have been for many years with no
+legal action taken.
 
 The hatari emulator will use /usr/share/hatari/tos.img by default. This
 package creates a symlink from tos-1.02-uk.img to tos.img, so the
diff --git a/games/hatari_tos_roms/doinst.sh b/games/hatari_tos_roms/doinst.sh
new file mode 100644
index 0000000000000..5d2f30e94b487
--- /dev/null
+++ b/games/hatari_tos_roms/doinst.sh
@@ -0,0 +1,4 @@
+# If there's no tos.img symlink, take over with "rainbow TOS"
+if [ ! -r usr/share/hatari/tos.img ]; then
+  ( cd usr/share/hatari ; ln -sf tos-1.04-uk.img tos.img )
+fi
diff --git a/games/hatari_tos_roms/hatari_tos_roms.SlackBuild b/games/hatari_tos_roms/hatari_tos_roms.SlackBuild
index 0f6c6c9b8d564..ff14c1eef1ba2 100644
--- a/games/hatari_tos_roms/hatari_tos_roms.SlackBuild
+++ b/games/hatari_tos_roms/hatari_tos_roms.SlackBuild
@@ -6,17 +6,20 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 # The version number is just the date when the script was written.
-# The actual TOS ROM versions are 1.02-uk, 2.06-uk, and optionally
-# 1.02-us and 2.06-us.
+# The actual TOS ROM versions are 1.02, 1.04, 2.06
 
-# the US ROMs are optional. They come from
-# http://steem.atari.st/tos_us.zip
-# (md5sum bf250988783a0d468711a1057215fd73)
-# If they're present, they get included in the package, and the
-# slack-desc gets modified to say so.
+# 20140825 bkw:
+# - include the 1.04 images, since hatari needs them to allow direct
+#   launching of .prg files from the command line.
+# - simplify script, the US images used to be optional, now they're
+#   required, and we don't need code to modify the slack-desc either.
+
+# I thought about gzipping these, since hatari supports gzipped roms, but
+# they're not taking up that much space (1088K uncompressed, 670K gzipped),
+# plus other emulators than hatari can use these, and might not support .gz
 
 PRGNAM=hatari_tos_roms
-VERSION=${VERSION-20090122}
+VERSION=${VERSION-20140825}
 ARCH=noarch
 BUILD=${BUILD-1}
 TAG=${TAG-_SBo}
@@ -32,25 +35,24 @@ rm -rf $PKG
 mkdir -p $PKG/usr/share/hatari $PKG/install
 
 cd $PKG/usr/share/hatari
+
 unzip $CWD/tos_uk.zip
+unzip $CWD/tos_us.zip
+unzip $CWD/tos104uk.zip
+unzip $CWD/tos104us.zip
 
 mv Tos206.img tos-2.06-uk.img
 mv Tos102.img tos-1.02-uk.img
+mv Tos206us.img tos-2.06-us.img
+mv Tos102us.img tos-1.02-us.img
+mv tos104uk.img tos-1.04-uk.img
+mv tos104us.img tos-1.04-us.img
 
-US="$PRGNAM: This package includes only the UK ROM images."
-if [ -f $CWD/tos_us.zip ]; then
-	unzip $CWD/tos_us.zip
-	mv Tos206us.img tos-2.06-us.img
-	mv Tos102us.img tos-1.02-us.img
-	US="$PRGNAM: This package includes both the US and UK ROM images."
-fi
-
-# hatari uses this image by default.
-# 1.02 is better for games...
-ln -s tos-1.02-uk.img tos.img
+chown root:root *
+chmod 644 *
 
 cat $CWD/slack-desc >$PKG/install/slack-desc
-echo "$US" >> $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}
diff --git a/games/hatari_tos_roms/hatari_tos_roms.info b/games/hatari_tos_roms/hatari_tos_roms.info
index 7c8e22f671045..dfe63dc29cc8b 100644
--- a/games/hatari_tos_roms/hatari_tos_roms.info
+++ b/games/hatari_tos_roms/hatari_tos_roms.info
@@ -1,8 +1,14 @@
 PRGNAM="hatari_tos_roms"
-VERSION="20090122"
+VERSION="20140825"
 HOMEPAGE="http://steem.atari.st/index.htm"
-DOWNLOAD="http://steem.atari.st/tos_uk.zip"
-MD5SUM="51778c08eaabe70020b30bf87b04ec7f"
+DOWNLOAD="http://steem.atari.st/tos_uk.zip \
+          http://steem.atari.st/tos_us.zip \
+          http://www.avtandil.narod.ru/tos/tos104uk.zip \
+          http://www.avtandil.narod.ru/tos/tos104us.zip"
+MD5SUM="51778c08eaabe70020b30bf87b04ec7f \
+        bf250988783a0d468711a1057215fd73 \
+        9e5d9087b977c15b69e46a491434eaf0 \
+        eceb4557808c544fae4bb3d4519911d4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/hatari_tos_roms/slack-desc b/games/hatari_tos_roms/slack-desc
index cbeac7e2efea0..712b3fdd510fe 100644
--- a/games/hatari_tos_roms/slack-desc
+++ b/games/hatari_tos_roms/slack-desc
@@ -6,13 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                |-----handy-ruler------------------------------------------------------|
-hatari_tos_roms: TOS (Tramiel Operating System) ROM images for hatari.
+hatari_tos_roms: hatari_tos_roms (TOS ROM images for ST emulators)
 hatari_tos_roms:
-hatari_tos_roms: TOS ROM Images for hatari - Versions 1.02 and 2.06 included.
+hatari_tos_roms: TOS (Tramiel Operating System) ROM images for use with hatari or
+hatari_tos_roms: other ST emulators. US and UK versions 1.02, 1.04, and 2.06 included.
 hatari_tos_roms:
 hatari_tos_roms: These images are copyrighted by Atari, Inc. It may be illegal
-hatari_tos_roms: to install this package in your jurisdiction!
+hatari_tos_roms: to install this package in your jurisdiction! On the other hand,
+hatari_tos_roms: they're freely available on various web sites, and have been for
+hatari_tos_roms: many years with no legal action taken.
 hatari_tos_roms:
-hatari_tos_roms: On the other hand, they're freely available on various web
-hatari_tos_roms: sites and have been for many years with no legal action taken.
 hatari_tos_roms: