Changes 1.3.2:

* R: can now be hooked to a real serial port (no runtime config yet)
* various ANTIC and POKEY fixes for perfect software compatibility
* disk and cartridge info saved in the state files
* casette handling greatly improved
* even more cartridges supported (40 now!)
* some rare buffer overflows fixed

6 files changed, 44 insertions, 63 deletions

diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 06081b82dbd..695c1b4aedb 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.21 2003/11/22 23:55:15 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/08 15:24:42 adam Exp $
 #
 
-DISTNAME=	atari800-1.3.0
+DISTNAME=	atari800-1.3.2
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=atari800/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xf25.zip
 
-EXTRACT_CMD_OPTS.zip=	-Lqo
-
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://atari800.atari.org
-COMMENT=	Atari 8-bit computer, 5200 console emulator
+HOMEPAGE=	http://atari800.sourceforge.net/
+COMMENT=	Atari 800, 800XL, 130XE and 5200 emulator
 
 RESTRICTED=		"copyrighted ROM images"
 NO_SRC_ON_FTP=		${RESTRICTED}
@@ -23,41 +21,20 @@ USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--target=x11
 
-BUILD_DIRS=	${WRKSRC}/build ${WRKSRC}/build-shm ${WRKSRC}/build-curses
-
-MAKE_FLAGS=	LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" \
-		CFLAGS="-c ${CFLAGS} -DDEVOSSAUDIO=\\\"${DEVOSSAUDIO}\\\" -DPREFIX=\\\"${PREFIX}\\\""
-#override HOME to avoid picking up a bad ${HOME}/.atari800 during the build
+# override HOME to avoid picking up a bad ${HOME}/.atari800 during the build
 MAKE_FLAGS+=	HOME=${WRKSRC}
 
 post-extract:
 	@cd ${WRKDIR} && ${LOCALBASE}/bin/unzip -Lqo ${DISTDIR}/xf25.zip
 	${SED} -e 's,@PREFIX@,${PREFIX},g' <${FILESDIR}/atari800.cfg \
-                >${WRKSRC}/atari800.cfg
-	mkdir ${BUILD_DIRS}
-
-do-configure:
-	@cd ${WRKSRC}/build-shm && LDFLAGS="${LDFLAGS} -s ${X11_LDFLAGS}" LIBS=${LIBOSSAUDIO} ../configure --prefix=${PREFIX} --with-x --enable-MONITOR_BREAK  --enable-MONITOR_HINTS --enable-MONITOR_ASSEMBLER  --enable-SOUND --enable-SET_LED --target=x11-shm --srcdir=..
-	@${ECHO} '#define PREFIX "${PREFIX}"' >> ${WRKSRC}/build-shm/config.h
-	@cd ${WRKSRC}/build-curses && LDFLAGS="-s ${LDFLAGS}" LIBS=${LIBOSSAUDIO} ../configure --prefix=${PREFIX} --enable-MONITOR_BREAK  --enable-MONITOR_HINTS --enable-MONITOR_ASSEMBLER  --enable-SOUND --enable-SET_LED --target=curses --srcdir=..
-	@${ECHO} '#define PREFIX "${PREFIX}"' >> ${WRKSRC}/build-curses/config.h
-	@cd ${WRKSRC}/build && LDFLAGS="-s ${LDFLAGS} ${X11_LDFLAGS}" LIBS=${LIBOSSAUDIO} ../configure --prefix=${PREFIX} --with-x --enable-MONITOR_BREAK  --enable-MONITOR_HINTS --enable-MONITOR_ASSEMBLER  --enable-SOUND --enable-SET_LED --target=x11 --srcdir=..
-	@${ECHO} '#define PREFIX "${PREFIX}"' >> ${WRKSRC}/build/config.h
-
-do-install:
+		>${WRKSRC}/atari800.cfg
+
+post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/atari800
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/atari800
-	${INSTALL_PROGRAM} ${WRKSRC}/build-shm/atari800 ${PREFIX}/bin/atari800-shm
-	${INSTALL_PROGRAM} ${WRKSRC}/build-curses/atari800 ${PREFIX}/bin/atari800-curses
-	${INSTALL_PROGRAM} ${WRKSRC}/build/atari800 ${PREFIX}/bin/atari800
 	${INSTALL_DATA} ${WRKDIR}/*.rom ${WRKDIR}/*.xfd ${WRKDIR}/*.atr \
 		${WRKSRC}/atari800.cfg ${PREFIX}/share/atari800/
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/DOC/README \
-		${WRKDIR}/${DISTNAME}/DOC/USAGE \
-		${PREFIX}/share/doc/atari800
-	${INSTALL_DATA} ${WRKSRC}/atari800.man ${PREFIX}/man/man1/atari800.1
 
 .include "../../mk/ossaudio.buildlink2.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/atari800/PLIST b/emulators/atari800/PLIST
index 536240f4da7..a91f4c7a4c6 100644
--- a/emulators/atari800/PLIST
+++ b/emulators/atari800/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2002/11/22 12:25:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/01/08 15:24:42 adam Exp $
 bin/atari800
-bin/atari800-curses
-bin/atari800-shm
 man/man1/atari800.1
 share/atari800/atari800.cfg
 share/atari800/ataribas.rom
@@ -11,7 +9,11 @@ share/atari800/demos1.xfd
 share/atari800/demos2.xfd
 share/atari800/dos25.xfd
 share/atari800/mydos45d.atr
+share/doc/atari800/COPYING
+share/doc/atari800/INSTALL
+share/doc/atari800/NEWS
 share/doc/atari800/README
+share/doc/atari800/README.1ST
 share/doc/atari800/USAGE
 @dirrm share/doc/atari800
 @dirrm share/atari800
diff --git a/emulators/atari800/distinfo b/emulators/atari800/distinfo
index a2ae8df3bb0..8d9334c1555 100644
--- a/emulators/atari800/distinfo
+++ b/emulators/atari800/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2003/07/13 17:51:49 dillo Exp $
+$NetBSD: distinfo,v 1.6 2004/01/08 15:24:42 adam Exp $
 
-SHA1 (atari800-1.3.0.tar.gz) = a03676e5ff77ff4b358be8ef973aaca695b1da73
-Size (atari800-1.3.0.tar.gz) = 671467 bytes
+SHA1 (atari800-1.3.2.tar.gz) = 3325fc0656a3d54b2718df1f7eb7cfda0985d5a2
+Size (atari800-1.3.2.tar.gz) = 998541 bytes
 SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42
 Size (xf25.zip) = 188942 bytes
-SHA1 (patch-aa) = 03dd0a94397a9047a533aeab0942dd1f23ea3661
-SHA1 (patch-ab) = 1afe2ab1134e877c7d13115cc678d350f1c90a78
-SHA1 (patch-ac) = 60466e5dbcc3c2001d04f9c1486241ef6678981b
+SHA1 (patch-aa) = cf2122ef21bb8a8e27f9aa723ed11f16630bfbef
+SHA1 (patch-ab) = 33edb843d4d8c4b29e725a7d0e0594a1f7c9626f
+SHA1 (patch-ac) = 1815c2f531a8bdba6e12d5cf062206e8eb2740d9
diff --git a/emulators/atari800/patches/patch-aa b/emulators/atari800/patches/patch-aa
index 0c923c7eecd..107b60b541a 100644
--- a/emulators/atari800/patches/patch-aa
+++ b/emulators/atari800/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2003/07/13 17:51:50 dillo Exp $
+$NetBSD: patch-aa,v 1.4 2004/01/08 15:24:42 adam Exp $
 
---- sound.c.orig	Sun Feb  9 22:24:12 2003
+--- sound.c.orig	2003-02-24 09:33:10.000000000 +0000
 +++ sound.c
-@@ -21,7 +21,7 @@
+@@ -44,7 +44,7 @@
  
  #define DEFDSPRATE 22050
  
diff --git a/emulators/atari800/patches/patch-ab b/emulators/atari800/patches/patch-ab
index 29aef653a9e..0a7b0e00262 100644
--- a/emulators/atari800/patches/patch-ab
+++ b/emulators/atari800/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2003/07/13 17:51:50 dillo Exp $
+$NetBSD: patch-ab,v 1.4 2004/01/08 15:24:42 adam Exp $
 
---- rt-config.c.orig	Mon Feb 10 13:41:11 2003
+--- rt-config.c.orig	2003-12-12 00:24:16.000000000 +0000
 +++ rt-config.c
-@@ -55,7 +55,7 @@ int stereo_enabled;
+@@ -79,7 +79,7 @@ int stereo_enabled;
  #endif
  
  #ifndef SYSTEM_WIDE_CFG_FILE
diff --git a/emulators/atari800/patches/patch-ac b/emulators/atari800/patches/patch-ac
index fd7c50ab8ae..37e0bb319dc 100644
--- a/emulators/atari800/patches/patch-ac
+++ b/emulators/atari800/patches/patch-ac
@@ -1,21 +1,23 @@
-$NetBSD: patch-ac,v 1.3 2003/07/13 17:51:50 dillo Exp $
+$NetBSD: patch-ac,v 1.4 2004/01/08 15:24:42 adam Exp $
 
---- Makefile.in.orig	Mon Jan 27 15:13:01 2003
+--- Makefile.in.orig	2004-01-08 15:57:43.000000000 +0000
 +++ Makefile.in
-@@ -6,13 +6,15 @@ EXEEXT=@EXEEXT@
- TARGET=atari800$(EXEEXT)
- CFLAGS=@CPPFLAGS@ @CFLAGS@
- DEFS=@DEFS@
-+srcdir=@srcdir@
+@@ -5,15 +5,15 @@ DEFS = @DEFS@
+ LIBS = @LIBS@
+ TARGET = atari800@EXEEXT@
  
- PREFIX		= @prefix@
- BIN_PATH	= ${PREFIX}/bin
- LIB_PATH	= ${PREFIX}/lib
- MAN_PATH	= ${PREFIX}/share/man
+-CFLAGS = @CFLAGS@
+-LDFLAGS = @LDFLAGS@
++CFLAGS = @CFLAGS@ -DPREFIX=\"${PREFIX}\" -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\"
++LDFLAGS = @LDFLAGS@ ${LIBOSSAUDIO}
  
--INCLUDE=-I.
-+INCLUDE=-I. -I$(srcdir)
-+VPATH=.:$(srcdir)
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
+ INSTALL_DATA = @INSTALL_DATA@
  
- LDFLAGS=@LDFLAGS@
- LIBS=@LIBS@
+ BIN_DIR = @prefix@/bin
+-MAN_DIR = @prefix@/share/man/man1
++MAN_DIR = @prefix@/man/man1
+ DOC_DIR = @prefix@/share/doc/atari800
+ 
+ DESTDIR =