Changes 1.3.1:

* Fixed HD boot drive when drive C: does not exist. TOS 2.06 was
  crashing during the boot process when drive C: did not exist, but
* Fixed drive enumeration of GEMDOS HD emulation. Single partition
  GEMDOS HD emulation did not work anymore when an ACSI HD image was
  also used, due to some problems with the automatic drive letter detection.
* Fix ConnectedDriveMask with multiple, non-contiguous GEMDOS partitions.
* Fix to incorrect use of DESTDIR in python-ui installation
* more compact debugger output (return to emulation msg)
* update copyright, fix trace settings names
* fix: debugger memdump/disasm show/save/load need now to use '$' for hex
* Improved the CSS of the manual and compatibility list. The "font-
  family:Fixed" did not work at all on Windows. Also cleaned up the
  CSS in general.
* The hatari icons for the Windows executable must not be put into an
  archive for linking.

3 files changed, 30 insertions, 11 deletions

diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index ac70d82930b..e26dd26e03b 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.26 2010/02/26 10:28:31 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/05/23 18:46:27 adam Exp $
 
-DISTNAME=	hatari-1.1.0
+DISTNAME=	hatari-1.3.1
 CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hatari/}
+MASTER_SITES=	http://download.berlios.de/hatari/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://hatari.sourceforge.net/
+HOMEPAGE=	http://hatari.berlios.de/
 COMMENT=	Atari ST emulator
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -24,4 +24,5 @@ post-install:
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/hatari/PLIST b/emulators/hatari/PLIST
index 34ff62ae5e4..f2624565bfe 100644
--- a/emulators/hatari/PLIST
+++ b/emulators/hatari/PLIST
@@ -1,20 +1,25 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 17:51:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/05/23 18:46:27 adam Exp $
 bin/hatari
+bin/hatari-console.py
+bin/hatariui
 bin/hmsa
+bin/zip2st
 man/man1/hatari.1
-share/doc/hatari/alsa-midi.txt
+share/applications/hatariui.desktop
 share/doc/hatari/authors.txt
 share/doc/hatari/changelog.txt
 share/doc/hatari/compatibility.html
 share/doc/hatari/emutos.txt
 share/doc/hatari/gpl.txt
 share/doc/hatari/images/devices.png
-share/doc/hatari/images/discs.png
 share/doc/hatari/images/fileselector.png
+share/doc/hatari/images/floppydisks.png
+share/doc/hatari/images/harddisks.png
 share/doc/hatari/images/joystick.png
 share/doc/hatari/images/keyboard.png
 share/doc/hatari/images/main.png
 share/doc/hatari/images/memory.png
+share/doc/hatari/images/newfloppy.png
 share/doc/hatari/images/screen.png
 share/doc/hatari/images/sound.png
 share/doc/hatari/images/system.png
@@ -22,8 +27,21 @@ share/doc/hatari/images/tos.png
 share/doc/hatari/keymap-sample.txt
 share/doc/hatari/manual.html
 share/doc/hatari/memory-usage.txt
+share/doc/hatari/midi-linux.txt
 share/doc/hatari/readme.txt
 share/doc/hatari/release-notes.txt
 share/doc/hatari/todo.txt
 share/hatari/hatari-icon.bmp
+share/hatari/hatariui/Changelog
+share/hatari/hatariui/README
+share/hatari/hatariui/TODO
+share/hatari/hatariui/config.py
+share/hatari/hatariui/debugui.py
+share/hatari/hatariui/dialogs.py
+share/hatari/hatariui/hatari-icon.png
+share/hatari/hatariui/hatari.png
+share/hatari/hatariui/hatari.py
+share/hatari/hatariui/hatariui.py
+share/hatari/hatariui/uihelpers.py
 share/hatari/tos.img
+share/icons/hicolor/32x32/apps/hatari-icon.png
diff --git a/emulators/hatari/distinfo b/emulators/hatari/distinfo
index 257dc292533..c22e87e8f97 100644
--- a/emulators/hatari/distinfo
+++ b/emulators/hatari/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2009/01/18 20:07:45 adam Exp $
+$NetBSD: distinfo,v 1.12 2010/05/23 18:46:27 adam Exp $
 
-SHA1 (hatari-1.1.0.tar.bz2) = 7d1d8ee22cdd56cb9bb67b78fdbfb06980861aae
-RMD160 (hatari-1.1.0.tar.bz2) = a1d96891bbfba8e55b37e57feee9f2a91773e4f3
-Size (hatari-1.1.0.tar.bz2) = 840629 bytes
+SHA1 (hatari-1.3.1.tar.bz2) = d603e1ddea34af9d0c1001f83f3e16081c136ef9
+RMD160 (hatari-1.3.1.tar.bz2) = 83a7a8138013be3324cf54e5f0df2efb0ebc40d3
+Size (hatari-1.3.1.tar.bz2) = 1045627 bytes
 SHA1 (patch-aa) = 1ebe2f92ee176cf5d5b1e4a7c5e2143b1d766ea8