Sun May 19 07:35:56 2013 UTC ()
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.


(adam)
diff -r1.49 -r1.50 pkgsrc/emulators/atari800/Makefile
diff -r1.17 -r1.18 pkgsrc/emulators/atari800/distinfo
diff -r1.5 -r1.6 pkgsrc/emulators/atari800/options.mk
diff -r1.3 -r1.4 pkgsrc/emulators/atari800/files/atari800.cfg
diff -r1.5 -r1.6 pkgsrc/emulators/atari800/patches/patch-aa
diff -r1.8 -r1.9 pkgsrc/emulators/atari800/patches/patch-ab
diff -r1.6 -r1.7 pkgsrc/emulators/atari800/patches/patch-ac
diff -r1.7 -r1.8 pkgsrc/emulators/atari800/patches/patch-ad
cvs diff -r1.49 -r1.50 pkgsrc/emulators/atari800/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/atari800/Makefile 2013/02/16 11:21:03 1.49
+++ pkgsrc/emulators/atari800/Makefile 2013/05/19 07:35:56 1.50
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.49 2013/02/16 11:21:03 wiz Exp $ 1# $NetBSD: Makefile,v 1.50 2013/05/19 07:35:56 adam Exp $
2 2
3DISTNAME= atari800-2.2.1 3DISTNAME= atari800-3.0.0
4PKGREVISION= 1 
5CATEGORIES= emulators 4CATEGORIES= emulators
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=atari800/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=atari800/}
7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xf25.zip 6DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xf25.zip
8 7
9MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
10HOMEPAGE= http://atari800.sourceforge.net/ 9HOMEPAGE= http://atari800.sourceforge.net/
11COMMENT= Atari 800, 800XL, 130XE and 5200 emulator 10COMMENT= Atari 800, 800XL, 130XE and 5200 emulator
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14RESTRICTED= copyrighted ROM images 13RESTRICTED= copyrighted ROM images
15NO_BIN_ON_CDROM= ${RESTRICTED} 14NO_BIN_ON_CDROM= ${RESTRICTED}
16NO_BIN_ON_FTP= ${RESTRICTED} 15NO_BIN_ON_FTP= ${RESTRICTED}
17NO_SRC_ON_CDROM= ${RESTRICTED} 16NO_SRC_ON_CDROM= ${RESTRICTED}
cvs diff -r1.17 -r1.18 pkgsrc/emulators/atari800/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/atari800/distinfo 2012/08/26 19:42:09 1.17
+++ pkgsrc/emulators/atari800/distinfo 2013/05/19 07:35:56 1.18
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.17 2012/08/26 19:42:09 marino Exp $ 1$NetBSD: distinfo,v 1.18 2013/05/19 07:35:56 adam Exp $
2 2
3SHA1 (atari800-2.2.1.tar.gz) = 244167a1b90b52ea9d6a230e97216c99ff32f0c9 3SHA1 (atari800-3.0.0.tar.gz) = 24dca4580805d2c1d6aa28a2b440c552a2dd171f
4RMD160 (atari800-2.2.1.tar.gz) = e1787d99b0f2c0061c0c8ae3b1ae6ee02b22a3b3 4RMD160 (atari800-3.0.0.tar.gz) = 705e132d8f0e8a17f520a011fe6074bc27a6de20
5Size (atari800-2.2.1.tar.gz) = 1419198 bytes 5Size (atari800-3.0.0.tar.gz) = 1480143 bytes
6SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42 6SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42
7RMD160 (xf25.zip) = e3960898223dd4d1b9a9cc5cfb1251bd726ea5a7 7RMD160 (xf25.zip) = e3960898223dd4d1b9a9cc5cfb1251bd726ea5a7
8Size (xf25.zip) = 188942 bytes 8Size (xf25.zip) = 188942 bytes
9SHA1 (patch-aa) = 6b610bab5957474e0eb63ec67f04c6cc3bc5287c 9SHA1 (patch-aa) = 2bd0dc856397aec91f01ad3ab0f3835d6e062aed
10SHA1 (patch-ab) = 8a9ff88adf6d2e563681bf38e88e0c6076d30bb9 10SHA1 (patch-ab) = 23062b3f9f858914c668b522e2a76d068dd24abf
11SHA1 (patch-ac) = eb657d13c20689ab85d42b08247c8aaba8414019 11SHA1 (patch-ac) = c9ef6b078f48ebeedf3719af15469abf6959991d
12SHA1 (patch-ad) = 24e15baf3759fa0bb2b6638fd017f7ef7d092140 12SHA1 (patch-ad) = 1567687cd851d606616aa35dc36a4e63e839181a
13SHA1 (patch-rdevice.c) = 9c17f7e600db506e7e6e9f1f3780e66b404813be 13SHA1 (patch-rdevice.c) = 9c17f7e600db506e7e6e9f1f3780e66b404813be
cvs diff -r1.5 -r1.6 pkgsrc/emulators/atari800/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/emulators/atari800/Attic/options.mk 2007/02/06 18:53:45 1.5
+++ pkgsrc/emulators/atari800/Attic/options.mk 2013/05/19 07:35:56 1.6
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: options.mk,v 1.5 2007/02/06 18:53:45 joerg Exp $ 1# $NetBSD: options.mk,v 1.6 2013/05/19 07:35:56 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.atari800 3PKG_OPTIONS_VAR= PKG_OPTIONS.atari800
4PKG_SUPPORTED_OPTIONS= sdl x11 4PKG_SUPPORTED_OPTIONS= sdl x11
5PKG_SUGGESTED_OPTIONS= sdl 5PKG_SUGGESTED_OPTIONS= sdl
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mx11) 9.if !empty(PKG_OPTIONS:Mx11)
10CONFIGURE_ARGS+= --target=x11 10CONFIGURE_ARGS+= --target=x11
11.include "../../x11/libX11/buildlink3.mk" 11.include "../../x11/libX11/buildlink3.mk"
12.endif 12.endif
13 13
14.if !empty(PKG_OPTIONS:Msdl) 14.if !empty(PKG_OPTIONS:Msdl)
15CONFIGURE_ARGS+= --target=sdl 15CONFIGURE_ARGS+= --target=default
 16CONFIGURE_ARGS+= --with-video=sdl
16.include "../../devel/SDL/buildlink3.mk" 17.include "../../devel/SDL/buildlink3.mk"
17.endif 18.endif
cvs diff -r1.3 -r1.4 pkgsrc/emulators/atari800/files/atari800.cfg (expand / switch to unified diff)

--- pkgsrc/emulators/atari800/files/atari800.cfg 2012/08/26 19:42:09 1.3
+++ pkgsrc/emulators/atari800/files/atari800.cfg 2013/05/19 07:35:56 1.4
@@ -1,19 +1,17 @@ @@ -1,19 +1,17 @@
1Atari 800 Emulator, Version 2.0.1 1Atari 800 Emulator, Version 3.0.0
2OS/A_ROM= 
3OS/B_ROM=@PREFIX@/share/atari800/atariosb.rom 2OS/B_ROM=@PREFIX@/share/atari800/atariosb.rom
4XL/XE_ROM=@PREFIX@/share/atari800/atarixl.rom 3XL/XE_ROM=@PREFIX@/share/atari800/atarixl.rom
5BASIC_ROM=@PREFIX@/share/atari800/ataribas.rom 4BASIC_ROM=@PREFIX@/share/atari800/ataribas.rom
65200_ROM= 
7H1_DIR=. 5H1_DIR=.
8H2_DIR=. 6H2_DIR=.
9H3_DIR=. 7H3_DIR=.
10H4_DIR=. 8H4_DIR=.
11HD_READ_ONLY=1 9HD_READ_ONLY=1
12PRINT_COMMAND=lpr %s 10PRINT_COMMAND=lpr %s
13SCREEN_REFRESH_RATIO=1 11SCREEN_REFRESH_RATIO=1
14MACHINE_TYPE=Atari XL/XE 12MACHINE_TYPE=Atari XL/XE
15RAM_SIZE=64 13RAM_SIZE=64
16DEFAULT_TV_MODE=PAL 14DEFAULT_TV_MODE=PAL
17DISABLE_BASIC=1 15DISABLE_BASIC=1
18ENABLE_SIO_PATCH=1 16ENABLE_SIO_PATCH=1
19ENABLE_H_PATCH=1 17ENABLE_H_PATCH=1
cvs diff -r1.5 -r1.6 pkgsrc/emulators/atari800/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/emulators/atari800/patches/Attic/patch-aa 2006/01/20 07:38:13 1.5
+++ pkgsrc/emulators/atari800/patches/Attic/patch-aa 2013/05/19 07:35:56 1.6
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aa,v 1.5 2006/01/20 07:38:13 adam Exp $ 1$NetBSD: patch-aa,v 1.6 2013/05/19 07:35:56 adam Exp $
2 2
3--- sound_oss.c.orig 2005-12-28 19:22:06.000000000 +0100 3--- sound_oss.c.orig 2011-11-16 18:01:37.000000000 +0000
4+++ sound_oss.c 4+++ sound_oss.c
5@@ -39,7 +39,7 @@ 5@@ -40,7 +40,7 @@
6 #include "pokeysnd.h" 6 #include "sound.h"
7 #include "util.h" 7 #include "util.h"
8  8
9-static const char * const dspname = "/dev/dsp"; 9-static const char * const dspname = "/dev/dsp";
10+static const char * const dspname = DEVOSSAUDIO; 10+static const char * const dspname = DEVOSSAUDIO;
11 static int dsprate = 22050; 11 static int dsprate = 22050;
12  12
13 static int sound_enabled = TRUE; 13 static int sound_enabled = TRUE;
cvs diff -r1.8 -r1.9 pkgsrc/emulators/atari800/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/emulators/atari800/patches/Attic/patch-ab 2012/08/26 19:42:09 1.8
+++ pkgsrc/emulators/atari800/patches/Attic/patch-ab 2013/05/19 07:35:56 1.9
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ab,v 1.8 2012/08/26 19:42:09 marino Exp $ 1$NetBSD: patch-ab,v 1.9 2013/05/19 07:35:56 adam Exp $
2 2
3--- cfg.c.orig 2011-04-18 01:47:48.000000000 +0000 3--- cfg.c.orig 2011-04-18 01:47:48.000000000 +0000
4+++ cfg.c 4+++ cfg.c
5@@ -105,7 +105,7 @@ void CFG_FindROMImages(const char *direc 5@@ -64,7 +64,7 @@ void CFG_FindROMImages(const char *direc
6 #endif 6 #endif
7  7
8 #ifndef SYSTEM_WIDE_CFG_FILE 8 #ifndef SYSTEM_WIDE_CFG_FILE
9-#define SYSTEM_WIDE_CFG_FILE "/etc/atari800.cfg" 9-#define SYSTEM_WIDE_CFG_FILE "/etc/atari800.cfg"
10+#define SYSTEM_WIDE_CFG_FILE PREFIX "/share/atari800/atari800.cfg" 10+#define SYSTEM_WIDE_CFG_FILE PREFIX "/share/atari800/atari800.cfg"
11 #endif 11 #endif
12  12
13 static char rtconfig_filename[FILENAME_MAX]; 13 static char rtconfig_filename[FILENAME_MAX];
cvs diff -r1.6 -r1.7 pkgsrc/emulators/atari800/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/emulators/atari800/patches/Attic/patch-ac 2012/08/26 19:42:09 1.6
+++ pkgsrc/emulators/atari800/patches/Attic/patch-ac 2013/05/19 07:35:56 1.7
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-ac,v 1.6 2012/08/26 19:42:09 marino Exp $ 1$NetBSD: patch-ac,v 1.7 2013/05/19 07:35:56 adam Exp $
2 2
3--- Makefile.in.orig 2011-04-05 02:36:16.000000000 +0000 3--- Makefile.in.orig 2012-03-18 15:31:09.000000000 +0000
4+++ Makefile.in 4+++ Makefile.in
5@@ -20,15 +20,15 @@ else 5@@ -20,15 +20,15 @@ else
6 endif 6 endif
7 endif 7 endif
8  8
9-CFLAGS = @CFLAGS@ 9-CFLAGS = @CFLAGS@ @CPPFLAGS@
10-LDFLAGS = @LDFLAGS@ 10-LDFLAGS = @LDFLAGS@
11+CFLAGS = @CFLAGS@ -DPREFIX=\"${PREFIX}\" -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\" 11+CFLAGS = @CFLAGS@ @CPPFLAGS@ -DPREFIX=\"${PREFIX}\" -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\"
12+LDFLAGS = @LDFLAGS@ ${LIBOSSAUDIO} 12+LDFLAGS = @LDFLAGS@ ${LIBOSSAUDIO}
13  13
14 INSTALL = @INSTALL@ 14 INSTALL = @INSTALL@
15 INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s 15 INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
16 INSTALL_DATA = @INSTALL_DATA@ 16 INSTALL_DATA = @INSTALL_DATA@
17  17
18 BIN_DIR = @prefix@/bin 18 BIN_DIR = @prefix@/bin
19-MAN_DIR = @prefix@/share/man/man1 19-MAN_DIR = @prefix@/share/man/man1
20+MAN_DIR = @prefix@/man/man1 20+MAN_DIR = @prefix@/man/man1
21 DOC_DIR = @prefix@/share/doc/atari800 21 DOC_DIR = @prefix@/share/doc/atari800
22  22
23 DESTDIR = 23 DESTDIR =
cvs diff -r1.7 -r1.8 pkgsrc/emulators/atari800/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/emulators/atari800/patches/Attic/patch-ad 2012/08/26 19:42:09 1.7
+++ pkgsrc/emulators/atari800/patches/Attic/patch-ad 2013/05/19 07:35:56 1.8
@@ -1,24 +1,39 @@ @@ -1,24 +1,39 @@
1$NetBSD: patch-ad,v 1.7 2012/08/26 19:42:09 marino Exp $ 1$NetBSD: patch-ad,v 1.8 2013/05/19 07:35:56 adam Exp $
2 2
3--- configure.orig 2011-04-28 12:07:28.000000000 +0000 3Compatibility fixes.
 4
 5--- configure.orig 2013-03-03 15:58:11.000000000 +0000
4+++ configure 6+++ configure
5@@ -8425,7 +8425,7 @@ $as_echo "#define IDE 1" >>confdefs.h 7@@ -7347,11 +7347,8 @@ $as_echo "#define SDL 1" >>confdefs.h
 8 LIBS="$LIBS $SDL_LIBS"
 9 CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
 10 if [ "$a8_host" = "win" ]; then
 11- CPPFLAGS=${CPPFLAGS/-Dmain=SDL_main/}
 12- LIBS=${LIBS/-lSDLmain/}
 13 OBJS="$OBJS SDL_win32_main.o"
 14 CPPFLAGS="$CPPFLAGS -DNO_STDIO_REDIRECT"
 15- LIBS=${LIBS/-mwindows/}
 16 fi
 17 a8_use_sdl=yes
 18
 19@@ -8259,11 +8256,8 @@ $as_echo "#define SDL 1" >>confdefs.h
 20 LIBS="$LIBS $SDL_LIBS"
 21 CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
 22 if [ "$a8_host" = "win" ]; then
 23- CPPFLAGS=${CPPFLAGS/-Dmain=SDL_main/}
 24- LIBS=${LIBS/-lSDLmain/}
 25 OBJS="$OBJS SDL_win32_main.o"
 26 CPPFLAGS="$CPPFLAGS -DNO_STDIO_REDIRECT"
 27- LIBS=${LIBS/-mwindows/}
 28 fi
 29 a8_use_sdl=yes
 30
 31@@ -8601,7 +8595,7 @@ $as_echo "#define IDE 1" >>confdefs.h
6  32
7 fi 33 fi
8  34
9-if [ "$WANT_IDE" == "yes" ]; then 35-if [ "$WANT_IDE" == "yes" ]; then
10+if [ "$WANT_IDE" = "yes" ]; then 36+if [ "$WANT_IDE" = "yes" ]; then
11 # Check whether --enable-largefile was given. 37 # Check whether --enable-largefile was given.
12 if test "${enable_largefile+set}" = set; then : 38 if test "${enable_largefile+set}" = set; then :
13 enableval=$enable_largefile; 39 enableval=$enable_largefile;
14@@ -8878,10 +8878,8 @@ case "$a8_target" in 
15 LIBS="$LIBS $SDL_LIBS" 
16 CFLAGS="$CFLAGS $SDL_CFLAGS" 
17 if [ "$a8_host" = "win" ]; then 
18- LIBS=${LIBS/-lSDLmain/} 
19 OBJS="$OBJS SDL_win32_main.o" 
20 CFLAGS="$CFLAGS -DNO_STDIO_REDIRECT" 
21- LIBS=${LIBS/-mwindows/} 
22 fi 
23 ;; 
24 esac