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)

1 files changed, 24 insertions, 26 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"