Changes 2.1.0:

* added Axlon and Mosaic RAM expansions for Atari 400/800
* added emulation of 1400XL, 1450XLD, MIO and Black Box
* added support of .PRO copy-protected disk images
* implemented tape loading with variable bitrates
* implemented cassette writing via hardware registers
* added switching between NTSC and PAL color palettes
* added emulation of XEP80 and a prototype 80 column card
  for the Atari 1090 (SDL only currently)
* added emulation of CX85 numeric keyboard (Java and SDL only)
* event recording added (-record, -playback): save your game walkthrough
  using the "-record mygame.dat" and later impress your friends by
  your game skills or highest score using the "-playback mygame.dat"
* NTSC Filter option added to UI
* -directmouse added to SDL and X11 (used for -mouse pad or koala)
* monitor supports arrow keys - e.g. up-arrow for history
* SDL: interpolated scanlines (use -scanlinesnoint to disable)
* SDL: added -mouse, -mousespeed, -grabmouse (also Alt+M)
* SDL: visual configuration of keyboard joysticks layout in the UI
       (F1 -> Controller Configuration -> Define layout)
       default mapping changed to 4,8,6,5 (joy0) and A,W,D,S (joy1)
* R: device can be serial-only, network-only or both (selectable)
* R: device now supported on MS Windows and Dreamcast as well
* a completely new port to Java using NestedVM, running also as an applet
* Falcon/TT: removed Devpac dependency in asm files (now gcc friendly)

5 files changed, 43 insertions, 18 deletions

diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 6cf45ad5a56..19c250756ea 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2008/06/20 01:09:18 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2009/11/04 11:44:15 adam Exp $
 
-DISTNAME=	atari800-2.0.3
+DISTNAME=	atari800-2.1.0
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=atari800/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xf25.zip
@@ -8,6 +8,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xf25.zip
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://atari800.sourceforge.net/
 COMMENT=	Atari 800, 800XL, 130XE and 5200 emulator
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -26,7 +27,7 @@ INSTALLATION_DIRS+=	${PREFIX}/share/atari800
 .include "options.mk"
 
 # override HOME to avoid picking up a bad ${HOME}/.atari800 during the build
-MAKE_FLAGS+=	HOME=${WRKSRC:Q}
+MAKE_FLAGS+=	HOME=${WRKSRC}
 
 post-extract:
 	cd ${WRKDIR} && unzip -Lqo ${DISTDIR}/xf25.zip
diff --git a/emulators/atari800/distinfo b/emulators/atari800/distinfo
index 9d6bbbcae75..97dc4935b35 100644
--- a/emulators/atari800/distinfo
+++ b/emulators/atari800/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.14 2007/07/20 17:45:54 adam Exp $
+$NetBSD: distinfo,v 1.15 2009/11/04 11:44:15 adam Exp $
 
-SHA1 (atari800-2.0.3.tar.gz) = e6cfcd22b79874239bd664a476ff287c2d708924
-RMD160 (atari800-2.0.3.tar.gz) = 408fec88e001a234786e689d0875d820e2036d46
-Size (atari800-2.0.3.tar.gz) = 998685 bytes
+SHA1 (atari800-2.1.0.tar.gz) = 3888ad49718bb5e1232fb544375bb635654b5ca5
+RMD160 (atari800-2.1.0.tar.gz) = c793855b27843975fcf04fea47c49499909b49ee
+Size (atari800-2.1.0.tar.gz) = 1214047 bytes
 SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42
 RMD160 (xf25.zip) = e3960898223dd4d1b9a9cc5cfb1251bd726ea5a7
 Size (xf25.zip) = 188942 bytes
 SHA1 (patch-aa) = 6b610bab5957474e0eb63ec67f04c6cc3bc5287c
-SHA1 (patch-ab) = 685a706cd9062543f8716a360052422925af4f6f
-SHA1 (patch-ac) = 1815c2f531a8bdba6e12d5cf062206e8eb2740d9
+SHA1 (patch-ab) = ff02962059156632dc72d750ae82d91c012ab178
+SHA1 (patch-ac) = 69d0ec42303b04a38b8d6b2bd7c1311d42060a11
+SHA1 (patch-ad) = d4d17fd8c505b170ff45e4c432f8fc6c37843275
diff --git a/emulators/atari800/patches/patch-ab b/emulators/atari800/patches/patch-ab
index b723d8cd7c3..c587dc11849 100644
--- a/emulators/atari800/patches/patch-ab
+++ b/emulators/atari800/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2006/01/20 07:38:13 adam Exp $
+$NetBSD: patch-ab,v 1.7 2009/11/04 11:44:15 adam Exp $
 
---- atari.c.orig	2005-11-26 21:11:19.000000000 +0100
-+++ atari.c
-@@ -635,7 +635,7 @@ void Atari800_FindROMImages(const char *
+--- cfg.c.orig	2008-12-27 23:04:53.000000000 +0100
++++ cfg.c
+@@ -92,7 +92,7 @@ void CFG_FindROMImages(const char *direc
  #endif
  
  #ifndef SYSTEM_WIDE_CFG_FILE
diff --git a/emulators/atari800/patches/patch-ac b/emulators/atari800/patches/patch-ac
index 37e0bb319dc..7d43fcdb914 100644
--- a/emulators/atari800/patches/patch-ac
+++ b/emulators/atari800/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2004/01/08 15:24:42 adam Exp $
+$NetBSD: patch-ac,v 1.5 2009/11/04 11:44:15 adam Exp $
 
---- Makefile.in.orig	2004-01-08 15:57:43.000000000 +0000
+--- Makefile.in.orig	2008-10-30 01:13:48.000000000 +0100
 +++ Makefile.in
-@@ -5,15 +5,15 @@ DEFS = @DEFS@
- LIBS = @LIBS@
- TARGET = atari800@EXEEXT@
+@@ -16,15 +16,15 @@ else
+ 	FINALTARGET = $(TARGET)
+ endif
  
 -CFLAGS = @CFLAGS@
 -LDFLAGS = @LDFLAGS@
diff --git a/emulators/atari800/patches/patch-ad b/emulators/atari800/patches/patch-ad
new file mode 100644
index 00000000000..e4f6a63c4da
--- /dev/null
+++ b/emulators/atari800/patches/patch-ad
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.5 2009/11/04 11:44:15 adam Exp $
+
+--- configure.orig	2009-03-27 10:13:51.000000000 +0100
++++ configure
+@@ -3507,7 +3507,6 @@ case "$a8_target" in
+         if [ "$sdlcheck" != "X_" ]; then
+             CFLAGS="$CFLAGS `sdl-config --cflags`"
+             if [ "$a8_host" = "win" ]; then
+-                CFLAGS=${CFLAGS/-Dmain=SDL_main/}
+             fi
+         else
+             { { echo "$as_me:$LINENO: error: \"No output from sdl-config!  Is sdl-config installed?\"" >&5
+@@ -6558,10 +6557,8 @@ _ACEOF
+         OBJS="atari_sdl.o"
+         CFLAGS="$CFLAGS -ansi -pedantic -Waggregate-return -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wstrict-prototypes -Winline"
+         if [ "$a8_host" = "win" ]; then
+-            LIBS=${LIBS/-lSDLmain/}
+             OBJS="$OBJS SDL_win32_main.o"
+             CFLAGS="$CFLAGS -DNO_STDIO_REDIRECT"
+-            LIBS=${LIBS/-mwindows/}
+         fi
+ 
+ cat >>confdefs.h <<\_ACEOF