updated to 1.3.0

 Highlights since last 1.2.5 release:
 ------------------------------------
 * new HiFi sound (you may en/disable it in the UI)
 * new cycle-exact Antic emulation
 * "H:" emulation complete (including subfolders)
 * Paged memory implementation (fast XE bank-switching)
 * new configuration file name and location ($HOME/.atari800.cfg)

5 files changed, 65 insertions, 54 deletions

diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 383c8e76aef..24a9b67946e 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.18 2003/06/02 01:20:01 jschauma Exp $
+# $NetBSD: Makefile,v 1.19 2003/07/13 17:51:49 dillo Exp $
 #
 
-DISTNAME=	atari800-1.2.5
+DISTNAME=	atari800-1.3.0
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=atari800/}
-DISTFILES=	atari800-1.2.5.tar.gz xf25.zip
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xf25.zip
+EXTRACT_CMD.zip=       ${LOCALBASE}/bin/unzip -Lqo $${extract_file}
 
 MAINTAINER=	tech-pkg@netbsd.org
 HOMEPAGE=	http://atari800.atari.org
 COMMENT=	Atari 8-bit computer, 5200 console emulator
 
-BUILD_DEPENDS=	unzip-[0-9]*:../../archivers/unzip
-
 RESTRICTED=		"copyrighted ROM images"
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
@@ -22,38 +21,35 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_X11=		YES
+GNU_CONFIGURE=		YES
+
+BUILD_DIRS=	${WRKSRC}/build ${WRKSRC}/build-shm ${WRKSRC}/build-curses
 
-EXTRACT_ONLY=	atari800-1.2.5.tar.gz
-MAKE_FLAGS=	LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" OBJ="atari_x11.o" \
-		CFLAGS="-c ${CFLAGS} -DPREFIX=\\\"${PREFIX}\\\""
+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
 MAKE_FLAGS+=	HOME=${WRKSRC}
 
 post-extract:
 	@cd ${WRKDIR} && ${LOCALBASE}/bin/unzip -Lqo ${DISTDIR}/xf25.zip
-
-do-build:
-	@cd ${WRKSRC} && LDFLAGS="-s ${X11_LDFLAGS}" LIBS=-lossaudio ./configure --prefix=${PREFIX} --with-x --enable-MONITOR_BREAK  --enable-MONITOR_HINTS --enable-MONITOR_ASSEMBLER  --enable-SOUND --enable-SET_LED --target=x11-shm
-	@${ECHO} '#define PREFIX "${PREFIX}"' >> ${WRKSRC}/config.h
-	@cd ${WRKSRC} && ${GMAKE}
-	${MV} ${WRKSRC}/atari800 ${WRKSRC}/atari800-shm
-	@cd ${WRKSRC} && ${GMAKE} clean
-	@cd ${WRKSRC} && LDFLAGS="-s" LIBS=-lossaudio ./configure --prefix=${PREFIX} --enable-MONITOR_BREAK  --enable-MONITOR_HINTS --enable-MONITOR_ASSEMBLER  --enable-SOUND --enable-SET_LED --target=curses
-	@${ECHO} '#define PREFIX "${PREFIX}"' >> ${WRKSRC}/config.h
-	@cd ${WRKSRC} && ${GMAKE}
-	${MV} ${WRKSRC}/atari800 ${WRKSRC}/atari800-curses
-	@cd ${WRKSRC} && ${GMAKE} clean
-	@cd ${WRKSRC} && LDFLAGS="-s ${X11_LDFLAGS}" LIBS=-lossaudio ./configure --prefix=${PREFIX} --with-x --enable-MONITOR_BREAK  --enable-MONITOR_HINTS --enable-MONITOR_ASSEMBLER  --enable-SOUND --enable-SET_LED --target=x11
-	@${ECHO} '#define PREFIX "${PREFIX}"' >> ${WRKSRC}/config.h
-	@cd ${WRKSRC} && ${GMAKE}
 	${SED} -e 's,@PREFIX@,${PREFIX},g' <${FILESDIR}/atari800.cfg \
-		>${WRKSRC}/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:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/atari800
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/atari800
-	${INSTALL_PROGRAM} ${WRKSRC}/atari800-shm ${WRKSRC}/atari800 \
-		${WRKSRC}/atari800-curses ${PREFIX}/bin/
+	${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 \
@@ -61,4 +57,6 @@ do-install:
 		${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/distinfo b/emulators/atari800/distinfo
index 94e6a3fafd2..a2ae8df3bb0 100644
--- a/emulators/atari800/distinfo
+++ b/emulators/atari800/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.4 2002/12/06 21:06:19 cjep Exp $
+$NetBSD: distinfo,v 1.5 2003/07/13 17:51:49 dillo Exp $
 
-SHA1 (atari800-1.2.5.tar.gz) = 90a16ec1164d5bcbe10330e2e99d2f86fb5dcd54
-Size (atari800-1.2.5.tar.gz) = 482781 bytes
+SHA1 (atari800-1.3.0.tar.gz) = a03676e5ff77ff4b358be8ef973aaca695b1da73
+Size (atari800-1.3.0.tar.gz) = 671467 bytes
 SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42
 Size (xf25.zip) = 188942 bytes
-SHA1 (patch-aa) = fc27bbb36aaec9269db461b8c76b0fbf2e2f5fd9
-SHA1 (patch-ab) = b21e1c68588caa8eb9c191fd0ad5638136ae65e7
+SHA1 (patch-aa) = 03dd0a94397a9047a533aeab0942dd1f23ea3661
+SHA1 (patch-ab) = 1afe2ab1134e877c7d13115cc678d350f1c90a78
+SHA1 (patch-ac) = 60466e5dbcc3c2001d04f9c1486241ef6678981b
diff --git a/emulators/atari800/patches/patch-aa b/emulators/atari800/patches/patch-aa
index 53894679190..0c923c7eecd 100644
--- a/emulators/atari800/patches/patch-aa
+++ b/emulators/atari800/patches/patch-aa
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2002/11/22 12:25:49 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2003/07/13 17:51:50 dillo Exp $
 
---- sound.c.orig	Wed Aug  7 10:43:58 2002
-+++ sound.c	Wed Nov 20 15:50:44 2002
-@@ -7,7 +7,7 @@
- #ifdef SOUND
- #include <fcntl.h>
- #include <sys/ioctl.h>
--#include <sys/soundcard.h>
-+#include <soundcard.h>
- 
- #include "pokeysnd.h"
- #include "log.h"
-@@ -20,7 +20,7 @@
+--- sound.c.orig	Sun Feb  9 22:24:12 2003
++++ sound.c
+@@ -21,7 +21,7 @@
  
  #define DEFDSPRATE 22050
  
 -static char *dspname = "/dev/dsp";
-+static char *dspname = "/dev/audio";
++static char *dspname = DEVOSSAUDIO;
  static int dsprate = DEFDSPRATE;
  static int fragstofill = 0;
  static int snddelay = 60;		/* delay in milliseconds */
diff --git a/emulators/atari800/patches/patch-ab b/emulators/atari800/patches/patch-ab
index f9ceef6d1cc..29aef653a9e 100644
--- a/emulators/atari800/patches/patch-ab
+++ b/emulators/atari800/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2002/11/22 12:25:49 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2003/07/13 17:51:50 dillo Exp $
 
---- rt-config.c.orig	Sun Apr  7 21:35:40 2002
-+++ rt-config.c	Wed Nov 20 15:53:16 2002
-@@ -53,7 +53,7 @@
- static char *rtconfig_filename1 = "atari800.cfg";
+--- rt-config.c.orig	Mon Feb 10 13:41:11 2003
++++ rt-config.c
+@@ -55,7 +55,7 @@ int stereo_enabled;
  #endif
  
--static char *rtconfig_filename2 = "/etc/atari800.cfg";
-+static char *rtconfig_filename2 = PREFIX "/share/atari800/atari800.cfg";
+ #ifndef SYSTEM_WIDE_CFG_FILE
+-#define SYSTEM_WIDE_CFG_FILE	"/etc/atari800.cfg"
++#define SYSTEM_WIDE_CFG_FILE	PREFIX "/share/atari800/atari800.cfg"
+ #endif
  
- int RtConfigLoad(char *rtconfig_filename)
- {
+ static char rtconfig_filename[FILENAME_MAX];
diff --git a/emulators/atari800/patches/patch-ac b/emulators/atari800/patches/patch-ac
new file mode 100644
index 00000000000..fd7c50ab8ae
--- /dev/null
+++ b/emulators/atari800/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.3 2003/07/13 17:51:50 dillo Exp $
+
+--- Makefile.in.orig	Mon Jan 27 15:13:01 2003
++++ Makefile.in
+@@ -6,13 +6,15 @@ EXEEXT=@EXEEXT@
+ TARGET=atari800$(EXEEXT)
+ CFLAGS=@CPPFLAGS@ @CFLAGS@
+ DEFS=@DEFS@
++srcdir=@srcdir@
+ 
+ PREFIX		= @prefix@
+ BIN_PATH	= ${PREFIX}/bin
+ LIB_PATH	= ${PREFIX}/lib
+ MAN_PATH	= ${PREFIX}/share/man
+ 
+-INCLUDE=-I.
++INCLUDE=-I. -I$(srcdir)
++VPATH=.:$(srcdir)
+ 
+ LDFLAGS=@LDFLAGS@
+ LIBS=@LIBS@