Changes 0.50:

- A lot of internal code cleanup and bug fixes.
- Added a dialog for creating new blank floppy disk images.
- The source code has been optimized for better emulation speed.
- Added RS232 emulation (still very experimental and not very well tested! It
  seems not to work reliable yet. Help for debugging is very appreciated!).
- Some bugs in the 68000 emulation have been fixed.
- The emulator now checks for double bus errors and stops the emulation if
  necessary (instead of crashing the emulator).
- Timer-D is now patched correctly again.
- The old font has been replaced by two new fonts so that the GUI now looks
  better in high resolutions.
- The fonts are now linked into the executable.
- Added support for DIM floppy disk images.

5 files changed, 31 insertions, 26 deletions

diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index a842ee4ffce..b5698299cbe 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2004/10/03 00:14:40 tv Exp $
-#
+# $NetBSD: Makefile,v 1.12 2004/11/19 10:09:48 adam Exp $
 
-DISTNAME=	hatari-0.45
-PKGREVISION=	1
+DISTNAME=	hatari-0.50
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hatari/}
 
@@ -10,21 +8,15 @@ MAINTAINER=	cjep@NetBSD.org
 HOMEPAGE=	http://hatari.sourceforge.net/
 COMMENT=	Atari ST emulator
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-USE_BUILDLINK3=	YES
-USE_X11=	YES
-USE_GNU_TOOLS+=	make
+USE_BUILDLINK3=		YES
+USE_GNU_TOOLS+=		make
+USE_X11=		YES
+GNU_CONFIGURE=		YES
 
-ALL_TARGET=	hatari
-MAKE_FLAGS+=	DATADIR="${PREFIX}/share/hatari"
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hatari ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/hatari
-	${INSTALL_DATA} ${WRKSRC}/font8.bmp ${PREFIX}/share/hatari
+post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hatari
-	cd ${WRKSRC}/.. && ${INSTALL_DATA} *.txt ${PREFIX}/share/doc/hatari
-	cd ${WRKSRC}/../doc && ${INSTALL_DATA} *.txt manual.html	\
+	cd ${WRKSRC} && ${INSTALL_DATA} *.txt ${PREFIX}/share/doc/hatari
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.txt *.html \
 			${PREFIX}/share/doc/hatari
 
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/emulators/hatari/PLIST b/emulators/hatari/PLIST
index fadfa4d5f8c..75044fa0960 100644
--- a/emulators/hatari/PLIST
+++ b/emulators/hatari/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/01/01 03:18:15 cjep Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/11/19 10:09:48 adam Exp $
 bin/hatari
+share/hatari/tos.img
 share/doc/hatari/authors.txt
 share/doc/hatari/changelog.txt
 share/doc/hatari/gpl.txt
@@ -7,6 +8,5 @@ share/doc/hatari/keymap-sample.txt
 share/doc/hatari/manual.html
 share/doc/hatari/readme.txt
 share/doc/hatari/release-notes.txt
-share/hatari/font8.bmp
 @dirrm share/hatari
 @dirrm share/doc/hatari
diff --git a/emulators/hatari/distinfo b/emulators/hatari/distinfo
index de6fa7b1ab8..a84d95a7fad 100644
--- a/emulators/hatari/distinfo
+++ b/emulators/hatari/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2004/01/01 03:18:15 cjep Exp $
+$NetBSD: distinfo,v 1.4 2004/11/19 10:09:48 adam Exp $
 
-SHA1 (hatari-0.45.tar.gz) = 1cdaa5ac99330129391f70fdeac13de84b6b2c60
-Size (hatari-0.45.tar.gz) = 474055 bytes
-SHA1 (patch-aa) = 5e0711007a690d17903972ab15528177166ff747
+SHA1 (hatari-0.50.tar.gz) = 23e7086c3cb37dee30d04a3099def18efd2ec10d
+Size (hatari-0.50.tar.gz) = 497202 bytes
+SHA1 (patch-aa) = 1ebe2f92ee176cf5d5b1e4a7c5e2143b1d766ea8
+SHA1 (patch-ab) = 8879321fb8acb5f9724f26bc040900dec1ba0f79
diff --git a/emulators/hatari/patches/patch-aa b/emulators/hatari/patches/patch-aa
index 77848afd888..e05603a66b1 100644
--- a/emulators/hatari/patches/patch-aa
+++ b/emulators/hatari/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1 2004/01/01 03:34:49 cjep Exp $
+$NetBSD: patch-aa,v 1.2 2004/11/19 10:09:48 adam Exp $
 
---- includes/unzip.h.orig	2003-03-30 14:39:27.000000000 +0100
-+++ includes/unzip.h
+--- src/includes/unzip.h.orig	2003-03-30 14:39:27.000000000 +0100
++++ src/includes/unzip.h
 @@ -49,6 +49,14 @@
  #ifndef _unz_H
  #define _unz_H
diff --git a/emulators/hatari/patches/patch-ab b/emulators/hatari/patches/patch-ab
new file mode 100644
index 00000000000..f1e7018e225
--- /dev/null
+++ b/emulators/hatari/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2004/11/19 10:10:08 adam Exp $
+
+--- configure.orig	2004-11-19 10:59:03.000000000 +0000
++++ configure
+@@ -2158,7 +2158,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
+ 
+ # Use the following lines for a release versions:
+ if test x"${GCC}" = xyes; then
+-  CFLAGS="-O3 -fomit-frame-pointer"
+ fi
+ 
+ # extra command line options