games/hatari: Updated for version 1.6.2.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

3 files changed, 35 insertions, 17 deletions

diff --git a/games/hatari/README b/games/hatari/README
index 4647e7dc12..f221a6c6da 100644
--- a/games/hatari/README
+++ b/games/hatari/README
@@ -9,9 +9,8 @@ environment for running GEM applications, Hatari tries to emulate the
 hardware of a ST as close as possible so that it is able to run most
 of the old ST games and demos.
 
-Hatari is open source software and is distributed under the terms of the
-GNU General Public License (GPL). The SF project page is available at:
-http://sourceforge.net/projects/hatari/
+Optional dependency: if portaudio is installed, hatari will be built
+with it, which enables emulated Falcon microphone support.
 
 Before you can actually run the emulator, you also need a TOS image
 file. TOS is the built-in operating system of the Atari 16/32 bit
@@ -19,8 +18,11 @@ computers. Since it is not possible to ship one of these image files
 with Hatari, you either have to create your own image from your Atari
 or you have to use EmuTOS, a free TOS replacement.
 
-It's also possible to download the ROM images from the net. See the
-package hatari_tos_roms, also on slackbuilds.org.
+It's also possible to download the ROM images from the net. See
+the package hatari_tos_roms. If you're going to install the ROMs,
+it's easiest to install hatari first, then hatari_tos_roms (otherwise,
+you'll have to manually symlink /usr/share/hatari/tos.img to whichever
+ROM you want to use).
 
 EmuTOS is included in this package, so you can run at least some ST
 applications without installing the real ROMs, but not many programs
diff --git a/games/hatari/hatari.SlackBuild b/games/hatari/hatari.SlackBuild
index 372304b6a4..9a2efe580a 100644
--- a/games/hatari/hatari.SlackBuild
+++ b/games/hatari/hatari.SlackBuild
@@ -1,11 +1,14 @@
 #!/bin/sh
 
 # Slackware build script for hatari
+
 # Written by B. Watson (yalhcru@gmail.com)
 
+# Licensed under the WTFPL. See http://sam.zoy.org/wtfpl/ for details.
+
 PRGNAM=hatari
-VERSION=${VERSION-1.4.0}
-BUILD=${BUILD-2}
+VERSION=${VERSION-1.6.2}
+BUILD=${BUILD-1}
 TAG=${TAG-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -27,12 +30,14 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 set -e
 
 rm -rf $PKG $TMP/$PRGNAM-$VERSION
-mkdir -p $PKG $PKG/install $PKG/etc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG $PKG/install $PKG/etc/$PRGNAM
 
 # configure script is really a wrapper for cmake, doesn't support
 # --libdir, --mandir, --docdir. We'll just move everything where it
@@ -51,13 +56,24 @@ make install/strip DESTDIR=$PKG
 mv $PKG/usr/share/man $PKG/usr/man
 
 # Also, the docs are in the wrong place:
-mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
+WRONGDOCDIR=$PKG/usr/share/doc/$PRGNAM
+DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
+
+mkdir -p $DOCDIR
+mv $WRONGDOCDIR/* $DOCDIR
+rmdir $WRONGDOCDIR
+
+# However, the doc location is hardcoded in the UI. This works
+# because /usr/share/doc is really a symlink to /usr/doc on Slackware.
+ln -s $PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM
+
+cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild
 
 # these docs don't get installed for some reason:
-cat tools/hmsa/readme-hmsa.txt > $PKG/usr/doc/$PRGNAM-$VERSION/readme-hmsa.txt
-cat readme.txt > $PKG/usr/doc/$PRGNAM-$VERSION/readme.txt
-cat gpl.txt > $PKG/usr/doc/$PRGNAM-$VERSION/gpl.txt
+cp tools/hmsa/readme-hmsa.txt readme.txt gpl.txt $DOCDIR
+
+# Make sure hatariui shows up in desktop menu:
+echo 'Categories=Game;Emulator;' >> $PKG/usr/share/applications/${PRGNAM}ui.desktop
 
 ( cd $PKG/usr/share/$PRGNAM && mv tos.img emutos.img && ln -s emutos.img tos.img )
 
diff --git a/games/hatari/hatari.info b/games/hatari/hatari.info
index 48d76c2072..552fcadf4d 100644
--- a/games/hatari/hatari.info
+++ b/games/hatari/hatari.info
@@ -1,8 +1,8 @@
 PRGNAM="hatari"
-VERSION="1.4.0"
-HOMEPAGE="http://hatari.berlios.de/"
-DOWNLOAD="http://download.berlios.de/hatari/hatari-1.4.0.tar.bz2"
-MD5SUM="2f30e5c9e146ee92e3f2f5ae1cef3673"
+VERSION="1.6.2"
+HOMEPAGE="http://hatari.tuxfamily.org/"
+DOWNLOAD="http://download.tuxfamily.org/hatari/1.6.2/hatari-1.6.2.tar.bz2"
+MD5SUM="3957d0c5f8093313c798e565af9a92e1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""