Update to 2000-05-30.

Changes since the last version, from the authors web page:
Moved some event queue code out from pce.c to event.[ch].
Added automatic dependancy support to the Makefile.
Cleaned several things up to make porting easier.
Cleaned several things up to make cross-compilation easier.
Changed a couple headers to compile cleanly with a C++ compiler.
Added support for expansion cards to the Apple ][ emulation.
Added support for the language card to the Apple ][ emulation.
Added code to load more roms to the Apple ][ emulation.
Added preliminary Apple ][ disk support (can't use it without gdb, though).
Fixed color on Apple ][ text mode.
Added Apple ][ hires graphics mode.
Added a first approximation of Apple ][ lores graphics mode.
Added IRQ support to the emu68k core (no, genesis emulation still doesn't
work).
Added a new 6502 core (only used on NES right now, may be slightly buggy).
Made many improvements/fixes to the emu68k core (no, it _still_ doesn't
work).
Fixed genesis memory access to mask down to 24 bit addresses.
Fixed Apple ][ space bar key.
Removed the (unused) m6280 core.
Changed most NES mappers to not need to know how large the PRG ROM is.
Cleaned up the NES sprite renderer slightly.
Changed the video interface to not use procpointers.

10 files changed, 50 insertions, 60 deletions

diff --git a/emulators/darcnes/Makefile b/emulators/darcnes/Makefile
index 27c12f60ff4..8ff9872d994 100644
--- a/emulators/darcnes/Makefile
+++ b/emulators/darcnes/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2000/03/08 01:42:12 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2000/06/03 10:57:11 wiz Exp $
 
-DISTNAME=	dn9a0305
-PKGNAME=	darcnes-20000305
+DISTNAME=	dn9a0530
+PKGNAME=	darcnes-20000530
 WRKSRC=		${WRKDIR}/darcnes
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.netway.com/~nyef/
@@ -15,10 +15,6 @@ LICENSE=	no-commercial-use
 USE_X11=	yes
 USE_GMAKE=	yes
 
-# make dependencies
-post-patch:
-	cd ${WRKSRC} && ${GMAKE}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/darcnes ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/darcnes
diff --git a/emulators/darcnes/files/md5 b/emulators/darcnes/files/md5
index ae82c4fb76c..9eddace0d0e 100644
--- a/emulators/darcnes/files/md5
+++ b/emulators/darcnes/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/03/08 01:42:13 wiz Exp $
+$NetBSD: md5,v 1.5 2000/06/03 10:57:12 wiz Exp $
 
-MD5 (dn9a0305.tgz) = 0dc2cd9c6c8d0cfffc6eb2b9e6acaaa6
+MD5 (dn9a0530.tgz) = dbe043e8c46c457ebd36d2aee6f2eb42
diff --git a/emulators/darcnes/files/patch-sum b/emulators/darcnes/files/patch-sum
index 6d7ea986afb..fb806020cf1 100644
--- a/emulators/darcnes/files/patch-sum
+++ b/emulators/darcnes/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.3 2000/02/20 18:15:14 wiz Exp $
+$NetBSD: patch-sum,v 1.4 2000/06/03 10:57:12 wiz Exp $
 
-MD5 (patch-aa) = dde77dcc4474d70299ba9a8d32aa585c
-MD5 (patch-ab) = 91ba1ba5b132d34256e74eae72d12940
-MD5 (patch-ac) = 70fa597ae95b4dd9a2f861846454a5b6
-MD5 (patch-ad) = 7653f1e8ecc021932392acc7fca509ec
-MD5 (patch-ae) = 0c46cde110f4ae3616218068dd77cd8b
-MD5 (patch-ag) = c437935b2db34ac9a4c950dca458f1db
-MD5 (patch-ah) = 1aa5af7a684eccbdfb62f33eeb8fefec
+MD5 (patch-aa) = 94a30e3c235bf529b3097318dc31f1da
+MD5 (patch-ab) = c9f63900454e64bfa3548c4c3fa1a9b7
+MD5 (patch-ac) = d4b5b2c93ca2e854157ffe42483b6c5e
+MD5 (patch-ad) = 75eec64ccc41f9cd860acde669b6137a
+MD5 (patch-ae) = 6135951eb419ac279978285494db4e98
+MD5 (patch-ag) = fa812e0a108929d5d9212d48cc1be2cb
+MD5 (patch-ah) = ce787219a435675eb6f5ef772798aa52
diff --git a/emulators/darcnes/patches/patch-aa b/emulators/darcnes/patches/patch-aa
index c76262ba41e..e730d798b1a 100644
--- a/emulators/darcnes/patches/patch-aa
+++ b/emulators/darcnes/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2000/02/20 18:15:15 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2000/06/03 10:57:12 wiz Exp $
 
---- ./Makefile.orig	Mon Feb 14 03:36:58 2000
-+++ ./Makefile	Sun Feb 20 15:28:50 2000
-@@ -11,10 +11,10 @@
+--- Makefile.orig	Sun May  7 02:04:10 2000
++++ Makefile	Thu Jun  1 02:47:55 2000
+@@ -11,16 +11,16 @@
  
  #C_ONLY=-DC_ONLY
  
@@ -15,25 +15,23 @@ $NetBSD: patch-aa,v 1.3 2000/02/20 18:15:15 wiz Exp $
  
  DEBUG=-g
  
-@@ -25,7 +25,7 @@
- 
  OPTFLAGS=-O2 -fomit-frame-pointer
  
--BASE_CFLAGS=-Wall $(DEBUG) $(OPTFLAGS) $(CDFLAGS) $(C_ONLY) $(BYTE_ORDER) $(MACH_TYPES)
-+BASE_CFLAGS=-Wall $(DEBUG) $(OPTFLAGS) $(CDFLAGS) $(C_ONLY) $(MACH_TYPES)
- BASE_SFLAGS=-Wall $(DEBUG) $(OPTFLAGS) $(CDFLAGS)
+-BASE_CFLAGS=-Wall $(DEBUG) $(OPTFLAGS) $(C_ONLY) $(BYTE_ORDER) $(MACH_TYPES)
++BASE_CFLAGS=-Wall $(DEBUG) $(OPTFLAGS) $(C_ONLY) $(MACH_TYPES)
+ BASE_SFLAGS=-Wall $(DEBUG) $(OPTFLAGS)
  
  #
-@@ -51,9 +51,9 @@
- AS=gcc
- LD=gcc
- 
+@@ -38,9 +38,9 @@
+ #
+ ifeq ($(TARGET),Linux_X)
+ CONFFLAGS=-DPCE_CD_SUPPORT -DSOUND
 -LDFLAGS=-L/usr/X11R6/lib
--CFLAGS=$(BASE_CFLAGS) -I/usr/X11R6/include
--SFLAGS=$(BASE_SFLAGS) -I/usr/X11R6/include
+-CFLAGS+=-I/usr/X11R6/include
+-SFLAGS+=-I/usr/X11R6/include
 +LDFLAGS=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib
-+CFLAGS=$(BASE_CFLAGS) -I${X11BASE}/include
-+SFLAGS=$(BASE_SFLAGS) ${ASM_FLAGS} -I${X11BASE}/include
++CFLAGS+=-I${X11BASE}/include
++SFLAGS+=${ASM_FLAGS} -I${X11BASE}/include
+ SYSTEMSRCS=video_x.c ui_x.c snd_unix.c keyboard_x.c cd_unix.c
  BINFILE=darcnes
  LIBS=-lXext -lXaw -lXmu -lXt -lX11
- endif
diff --git a/emulators/darcnes/patches/patch-ab b/emulators/darcnes/patches/patch-ab
index 07d70a90923..e053b6f1ae9 100644
--- a/emulators/darcnes/patches/patch-ab
+++ b/emulators/darcnes/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2000/02/20 18:15:15 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2000/06/03 10:57:12 wiz Exp $
 
---- ./cd_unix.c.orig	Mon Feb 14 03:09:03 2000
-+++ ./cd_unix.c	Sun Feb 20 15:41:46 2000
-@@ -8,7 +8,7 @@
+--- cd_unix.c.orig	Wed Mar 15 04:48:04 2000
++++ cd_unix.c	Thu Jun  1 02:43:02 2000
+@@ -8,6 +8,6 @@
  
  /* #define CD_LINUX */		/* use linux-specific code */
 -#define CD_FREEBSD		/* use freebsd-specific code */
@@ -11,4 +11,3 @@ $NetBSD: patch-ab,v 1.3 2000/02/20 18:15:15 wiz Exp $
 +#define CD_NETBSD		/* use netbsd-specific code */
  
  #ifdef CD_LINUX
- #define CDROM_DEVICE "/dev/cdrom"
diff --git a/emulators/darcnes/patches/patch-ac b/emulators/darcnes/patches/patch-ac
index 65cc39ccf9c..8a8d273ebec 100644
--- a/emulators/darcnes/patches/patch-ac
+++ b/emulators/darcnes/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2000/02/20 18:15:15 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2000/06/03 10:57:12 wiz Exp $
 
---- ./snd_unix.c.orig	Mon Feb 14 03:04:13 2000
-+++ ./snd_unix.c	Sun Feb 20 15:41:22 2000
-@@ -8,7 +8,7 @@
+--- snd_unix.c.orig	Sun Apr  9 06:49:13 2000
++++ snd_unix.c	Thu Jun  1 02:43:03 2000
+@@ -8,6 +8,6 @@
  
  /* #define SOUND_LINUX */	/* use linux sound header */
 -#define SOUND_FREEBSD		/* use freebsd sound header */
@@ -11,4 +11,3 @@ $NetBSD: patch-ac,v 1.3 2000/02/20 18:15:15 wiz Exp $
 +#define SOUND_NETBSD		/* use netbsd sound system */
  
  #ifdef SOUND_LINUX
- #define SOUND_HEADER <sys/soundcard.h>
diff --git a/emulators/darcnes/patches/patch-ad b/emulators/darcnes/patches/patch-ad
index 4793e323274..7ce6c8326f4 100644
--- a/emulators/darcnes/patches/patch-ad
+++ b/emulators/darcnes/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2000/02/14 02:44:36 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2000/06/03 10:57:12 wiz Exp $
 
---- ./endian.h.orig	Mon Feb 14 03:05:25 2000
-+++ ./endian.h	Mon Feb 14 02:38:38 2000
+--- endian.h.orig	Thu Jun  1 02:43:03 2000
++++ endian.h	Thu Jun  1 02:43:04 2000
 @@ -0,0 +1,41 @@
 +#ifndef __HAD_MY_ENDIAN_H
 +#define __HAD_MY_ENDIAN_H
diff --git a/emulators/darcnes/patches/patch-ae b/emulators/darcnes/patches/patch-ae
index 110cc069d51..4981435baae 100644
--- a/emulators/darcnes/patches/patch-ae
+++ b/emulators/darcnes/patches/patch-ae
@@ -1,11 +1,9 @@
-$NetBSD: patch-ae,v 1.1 2000/02/14 02:44:39 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2000/06/03 10:57:12 wiz Exp $
 
---- ./mtypes.h.orig	Sat Aug  7 18:19:37 1999
-+++ ./mtypes.h	Mon Feb 14 02:37:16 2000
-@@ -11,4 +11,6 @@
+--- mtypes.h.orig	Sat Aug  7 18:19:37 1999
++++ mtypes.h	Thu Jun  1 02:43:05 2000
+@@ -11,2 +11,4 @@
  
 +#include "endian.h"
 +
  typedef unsigned char byte;
- typedef unsigned short word;
- typedef signed char offset;
diff --git a/emulators/darcnes/patches/patch-ag b/emulators/darcnes/patches/patch-ag
index 8435beaa20f..3c8cf6d2c85 100644
--- a/emulators/darcnes/patches/patch-ag
+++ b/emulators/darcnes/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1 2000/02/14 02:44:45 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2000/06/03 10:57:13 wiz Exp $
 
---- ./tool.c.orig	Sat Jan  1 05:12:05 2000
-+++ ./tool.c	Mon Feb 14 02:36:52 2000
+--- tool.c.orig	Sat May  6 23:50:17 2000
++++ tool.c	Thu Jun  1 02:43:09 2000
 @@ -19,6 +19,7 @@
  #include "video.h"
  #include "tool.h"
diff --git a/emulators/darcnes/patches/patch-ah b/emulators/darcnes/patches/patch-ah
index fb0e99d17c0..f6b618d3900 100644
--- a/emulators/darcnes/patches/patch-ah
+++ b/emulators/darcnes/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1 2000/02/14 02:44:47 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2000/06/03 10:57:13 wiz Exp $
 
---- ./types.h.orig	Tue Dec  7 03:01:23 1999
-+++ ./types.h	Mon Feb 14 02:37:37 2000
+--- types.h.orig	Tue Dec  7 03:01:23 1999
++++ types.h	Thu Jun  1 02:43:11 2000
 @@ -13,6 +13,8 @@
  #include MACH_TYPES
  #endif