Changes 3.0.0:

* Option to automatically save configuration on exit
* More settings saved in configuration:
  - currently attached tape file
  - cartridge settings, including currently attached cartridges
  - state of R-Time 8
  - system settings, including Mosaic/Axlon RAM size
* New Tape Management menu - can now create blank tape images, switch tape
  to read/write in order to save additional data at the end of the current
  tape image, rewind/fast forward the tape, and mark it as read-only. See
  DOC/USAGE for details.
* Displaying tape position when "Show sector/block counter" is enabled.
* Reworked Cartridge Management menu - now displays filename of the
  attached cartridge.
* Option to disable restarting of the machine after cartridge change.
* When attaching a cartridge from the command line, cartridge type can now
  be specified using the new -cart-type and -cart2-type options.
* New cartridge types supported:
  - OSS 8 KB cartridge
  - OSS two chip 16 KB cartridge (043M)
  - Blizzard 4 KB cartridge
  - AST 32 KB cartridge
  - Atrax SDX 64 KB cartridge
  - Atrax SDX 128 KB cartridge
  - Turbosoft 64 KB cartridge
  - Turbosoft 128 KB cartridge
  - Ultracart 32 KB cartridge
  - Low bank 8 KB cartridge
  - SIC! 128 KB cartridge
  - SIC! 256 KB cartridge
  - SIC! 512 KB cartridge
  - Standard 2 KB cartridge
  - Standard 4 KB cartridge
  - Right slot 4 KB cartridge
* The configure script can now auto-detect some of the available display and
  sound interfaces before compiling.
* Option to enable XEP80 added to The Emulator Settings menu.
* Emulation of the 1200XL, including console LEDs, no built-in BASIC, the
  F1-F4 keys (mapped to arrow keys in the SDL version) and the on-board
  J1 jumper.
* Emulation of the XE Game System, including the built-in game and
  detachable keyboard.
* Revamped the Select System menu (now called System Settings). Can now
  select many system settings, including RAM expansions, OS and BASIC
  revision, and more.
* System ROM settings moved to a separate menu. Now it stores paths to all
  known official revisions of the Atari OS, the 5200 BIOS, all BASIC
  revisions, and the XEGS built-in game. The OS revision to use is chosen
  automatically when selecting a machine type (for example, the 400/800 OS
  PAL or NTSC version is chosen depending on the selected TV system).
* 400/800: Emulation of all RAM sizes achievable with different combinations
  of the CX852 and CX853 modules - from 8 to 48 KB.
* Emulation of 32/48KB memory sizes in the XL/XE mode, compatible
  with memory expansions for the 600XL manufactured by RC Systems.
* Emulation of the MapRAM hardware hack.
* Display settings: "Hue" renamed to "Tint". Tint now configurable also in
  PAL mode.

8 files changed, 53 insertions, 40 deletions

diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 42639791048..bf920e0c8fa 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2013/02/16 11:21:03 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2013/05/19 07:35:56 adam Exp $
 
-DISTNAME=	atari800-2.2.1
-PKGREVISION=	1
+DISTNAME=	atari800-3.0.0
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=atari800/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xf25.zip
diff --git a/emulators/atari800/distinfo b/emulators/atari800/distinfo
index 033969ce20f..5af9e90ec35 100644
--- a/emulators/atari800/distinfo
+++ b/emulators/atari800/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.17 2012/08/26 19:42:09 marino Exp $
+$NetBSD: distinfo,v 1.18 2013/05/19 07:35:56 adam Exp $
 
-SHA1 (atari800-2.2.1.tar.gz) = 244167a1b90b52ea9d6a230e97216c99ff32f0c9
-RMD160 (atari800-2.2.1.tar.gz) = e1787d99b0f2c0061c0c8ae3b1ae6ee02b22a3b3
-Size (atari800-2.2.1.tar.gz) = 1419198 bytes
+SHA1 (atari800-3.0.0.tar.gz) = 24dca4580805d2c1d6aa28a2b440c552a2dd171f
+RMD160 (atari800-3.0.0.tar.gz) = 705e132d8f0e8a17f520a011fe6074bc27a6de20
+Size (atari800-3.0.0.tar.gz) = 1480143 bytes
 SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42
 RMD160 (xf25.zip) = e3960898223dd4d1b9a9cc5cfb1251bd726ea5a7
 Size (xf25.zip) = 188942 bytes
-SHA1 (patch-aa) = 6b610bab5957474e0eb63ec67f04c6cc3bc5287c
-SHA1 (patch-ab) = 8a9ff88adf6d2e563681bf38e88e0c6076d30bb9
-SHA1 (patch-ac) = eb657d13c20689ab85d42b08247c8aaba8414019
-SHA1 (patch-ad) = 24e15baf3759fa0bb2b6638fd017f7ef7d092140
+SHA1 (patch-aa) = 2bd0dc856397aec91f01ad3ab0f3835d6e062aed
+SHA1 (patch-ab) = 23062b3f9f858914c668b522e2a76d068dd24abf
+SHA1 (patch-ac) = c9ef6b078f48ebeedf3719af15469abf6959991d
+SHA1 (patch-ad) = 1567687cd851d606616aa35dc36a4e63e839181a
 SHA1 (patch-rdevice.c) = 9c17f7e600db506e7e6e9f1f3780e66b404813be
diff --git a/emulators/atari800/files/atari800.cfg b/emulators/atari800/files/atari800.cfg
index fb2eb1996f9..2c93d1a582f 100644
--- a/emulators/atari800/files/atari800.cfg
+++ b/emulators/atari800/files/atari800.cfg
@@ -1,9 +1,7 @@
-Atari 800 Emulator, Version 2.0.1
-OS/A_ROM=
+Atari 800 Emulator, Version 3.0.0
 OS/B_ROM=@PREFIX@/share/atari800/atariosb.rom
 XL/XE_ROM=@PREFIX@/share/atari800/atarixl.rom
 BASIC_ROM=@PREFIX@/share/atari800/ataribas.rom
-5200_ROM=
 H1_DIR=.
 H2_DIR=.
 H3_DIR=.
diff --git a/emulators/atari800/options.mk b/emulators/atari800/options.mk
index 3e046dd49f7..68d85aabeb9 100644
--- a/emulators/atari800/options.mk
+++ b/emulators/atari800/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2007/02/06 18:53:45 joerg Exp $
+# $NetBSD: options.mk,v 1.6 2013/05/19 07:35:56 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.atari800
 PKG_SUPPORTED_OPTIONS=	sdl x11
@@ -12,6 +12,7 @@ CONFIGURE_ARGS+=	--target=x11
 .endif
 
 .if !empty(PKG_OPTIONS:Msdl)
-CONFIGURE_ARGS+=	--target=sdl
+CONFIGURE_ARGS+=	--target=default
+CONFIGURE_ARGS+=	--with-video=sdl
 .include "../../devel/SDL/buildlink3.mk"
 .endif
diff --git a/emulators/atari800/patches/patch-aa b/emulators/atari800/patches/patch-aa
index 6c5241e2c01..3ebcbcea77d 100644
--- a/emulators/atari800/patches/patch-aa
+++ b/emulators/atari800/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.5 2006/01/20 07:38:13 adam Exp $
+$NetBSD: patch-aa,v 1.6 2013/05/19 07:35:56 adam Exp $
 
---- sound_oss.c.orig	2005-12-28 19:22:06.000000000 +0100
+--- sound_oss.c.orig	2011-11-16 18:01:37.000000000 +0000
 +++ sound_oss.c
-@@ -39,7 +39,7 @@
- #include "pokeysnd.h"
+@@ -40,7 +40,7 @@
+ #include "sound.h"
  #include "util.h"
  
 -static const char * const dspname = "/dev/dsp";
diff --git a/emulators/atari800/patches/patch-ab b/emulators/atari800/patches/patch-ab
index bc539947492..c9004ab1264 100644
--- a/emulators/atari800/patches/patch-ab
+++ b/emulators/atari800/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2012/08/26 19:42:09 marino Exp $
+$NetBSD: patch-ab,v 1.9 2013/05/19 07:35:56 adam Exp $
 
 --- cfg.c.orig	2011-04-18 01:47:48.000000000 +0000
 +++ cfg.c
-@@ -105,7 +105,7 @@ void CFG_FindROMImages(const char *direc
+@@ -64,7 +64,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 6937f3934a7..2d2127ad92a 100644
--- a/emulators/atari800/patches/patch-ac
+++ b/emulators/atari800/patches/patch-ac
@@ -1,14 +1,14 @@
-$NetBSD: patch-ac,v 1.6 2012/08/26 19:42:09 marino Exp $
+$NetBSD: patch-ac,v 1.7 2013/05/19 07:35:56 adam Exp $
 
---- Makefile.in.orig	2011-04-05 02:36:16.000000000 +0000
+--- Makefile.in.orig	2012-03-18 15:31:09.000000000 +0000
 +++ Makefile.in
 @@ -20,15 +20,15 @@ else
  	endif
  endif
  
--CFLAGS = @CFLAGS@
+-CFLAGS = @CFLAGS@ @CPPFLAGS@
 -LDFLAGS = @LDFLAGS@
-+CFLAGS = @CFLAGS@ -DPREFIX=\"${PREFIX}\" -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\"
++CFLAGS = @CFLAGS@ @CPPFLAGS@ -DPREFIX=\"${PREFIX}\" -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\"
 +LDFLAGS = @LDFLAGS@ ${LIBOSSAUDIO}
  
  INSTALL = @INSTALL@
diff --git a/emulators/atari800/patches/patch-ad b/emulators/atari800/patches/patch-ad
index f9d67366935..d0865340eac 100644
--- a/emulators/atari800/patches/patch-ad
+++ b/emulators/atari800/patches/patch-ad
@@ -1,8 +1,34 @@
-$NetBSD: patch-ad,v 1.7 2012/08/26 19:42:09 marino Exp $
+$NetBSD: patch-ad,v 1.8 2013/05/19 07:35:56 adam Exp $
 
---- configure.orig	2011-04-28 12:07:28.000000000 +0000
+Compatibility fixes.
+
+--- configure.orig	2013-03-03 15:58:11.000000000 +0000
 +++ configure
-@@ -8425,7 +8425,7 @@ $as_echo "#define IDE 1" >>confdefs.h
+@@ -7347,11 +7347,8 @@ $as_echo "#define SDL 1" >>confdefs.h
+             LIBS="$LIBS $SDL_LIBS"
+             CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+             if [ "$a8_host" = "win" ]; then
+-                CPPFLAGS=${CPPFLAGS/-Dmain=SDL_main/}
+-                LIBS=${LIBS/-lSDLmain/}
+                 OBJS="$OBJS SDL_win32_main.o"
+                 CPPFLAGS="$CPPFLAGS -DNO_STDIO_REDIRECT"
+-                LIBS=${LIBS/-mwindows/}
+             fi
+             a8_use_sdl=yes
+ 
+@@ -8259,11 +8256,8 @@ $as_echo "#define SDL 1" >>confdefs.h
+             LIBS="$LIBS $SDL_LIBS"
+             CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+             if [ "$a8_host" = "win" ]; then
+-                CPPFLAGS=${CPPFLAGS/-Dmain=SDL_main/}
+-                LIBS=${LIBS/-lSDLmain/}
+                 OBJS="$OBJS SDL_win32_main.o"
+                 CPPFLAGS="$CPPFLAGS -DNO_STDIO_REDIRECT"
+-                LIBS=${LIBS/-mwindows/}
+             fi
+             a8_use_sdl=yes
+ 
+@@ -8601,7 +8595,7 @@ $as_echo "#define IDE 1" >>confdefs.h
  
      fi
  
@@ -11,14 +37,3 @@ $NetBSD: patch-ad,v 1.7 2012/08/26 19:42:09 marino Exp $
      # Check whether --enable-largefile was given.
  if test "${enable_largefile+set}" = set; then :
    enableval=$enable_largefile;
-@@ -8878,10 +8878,8 @@ case "$a8_target" in
-         LIBS="$LIBS $SDL_LIBS"
-         CFLAGS="$CFLAGS $SDL_CFLAGS"
-         if [ "$a8_host" = "win" ]; then
--            LIBS=${LIBS/-lSDLmain/}
-             OBJS="$OBJS SDL_win32_main.o"
-             CFLAGS="$CFLAGS -DNO_STDIO_REDIRECT"
--            LIBS=${LIBS/-mwindows/}
-         fi
-         ;;
- esac