Changes 0.7.0:

* New features:
  + Scorpion ZS 256 support
  + Spectrum SE support
  + Support for the simple 8-bit IDE interface (as used by the +3e)
    and the ZXATASP and ZXCF interfaces
  + Spectrum +3e support: just a +3 with different ROMs
  + Interface II support
  + Emulation of joysticks other than the Kempston

* Z80 core improvements:
  + Get undocumented flags right after SCF and BIT
  + Improved contended memory timings for RLD, RRD and
    instructions involving (HL), (SP), (IX+dd), (IY+dd)

* Debugger improvements:
  + Memory map pane showing what is present in each 8K chunk
  + Allow port values to be masked before checking for port read/write
    breakpoints
  + Ability to set breakpoints in non-RAM pages

* Miscellaneous improvements:
  + Improved display timings
  + Improved floating bus timings; Arkanoid and Sidewize now work
  + Save/restore the high bit of the R register; Bruce Lee now works
  + Fuse can now save snapshot formats other than .z80 and tape formats other
    than .tap; the appropriate format will be selected according to the
    extension given
  + Improved sound emulation, now using 16 bit samples
  + Allow real joystick buttons to be equivalent to either 'emulated joystick
    fire' or 'press a key'
  + The pokefinder can now search for bytes which have increased or decreased
    since the last search
  + HP-UX sound support (Stuart Brady).
  + After 'flashloading' a tape block, set the registers to the values they
    would have if the block had been loaded normally; 'The Rats' now loads
    successfully
  + GTK+ 2.x user interface preferred to GTK+ 1.2 by default if available
  + Don't display an error message if the same message was displayed within
    the last second
  + Writing to the Betadisk ports is a no-op if TR-DOS isn't active
  + Keep Timex Dock cartridge inserted after reset if it had been inserted
    via File/Open or from the command line
  + Split the 'ROM selection' dialog into one dialog for each machine
  + Unused bits of AY registers are zeroed
  + Remove segfault if one ROM of a multi-ROM machine didn't load
  + Don't segfault if Space rather than a mouse double click is used to select
    things in the GTK+ tape browser, debugger or pokefinder
  + Stop output to the serial printer when printer emulation is disabled;
    prevents the random appearance of 'printout.txt'

5 files changed, 43 insertions, 18 deletions

diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index 24a1216e2c7..bfe716435b7 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2004/02/25 18:54:58 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/20 13:12:15 adam Exp $
 
-DISTNAME=	fuse-0.6.2.1
-PKGREVISION=	1
+DISTNAME=	fuse-0.7.0
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fuse-emulator/}
 
@@ -14,6 +13,7 @@ USE_PERL5=		build
 USE_X11=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-gtk2
+LIBS+=	${LIBOSSAUDIO}
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../emulators/libspectrum/buildlink3.mk"
diff --git a/emulators/fuse/PLIST b/emulators/fuse/PLIST
index 334da6a88e2..b614e203308 100644
--- a/emulators/fuse/PLIST
+++ b/emulators/fuse/PLIST
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2004/02/13 13:40:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/07/20 13:12:15 adam Exp $
 bin/fuse
 man/man1/fuse.1
 share/fuse/128-0.rom
 share/fuse/128-1.rom
 share/fuse/128p-0.rom
 share/fuse/128p-1.rom
+share/fuse/256s-0.rom
+share/fuse/256s-1.rom
+share/fuse/256s-2.rom
+share/fuse/256s-3.rom
 share/fuse/48.rom
 share/fuse/cassette.bmp
 share/fuse/disk_plus3.z80
@@ -15,7 +19,13 @@ share/fuse/plus3-0.rom
 share/fuse/plus3-1.rom
 share/fuse/plus3-2.rom
 share/fuse/plus3-3.rom
+share/fuse/plus3e-0.rom
+share/fuse/plus3e-1.rom
+share/fuse/plus3e-2.rom
+share/fuse/plus3e-3.rom
 share/fuse/plus3disk.bmp
+share/fuse/se-0.rom
+share/fuse/se-1.rom
 share/fuse/tape_128.z80
 share/fuse/tape_16.z80
 share/fuse/tape_2048.z80
@@ -25,6 +35,7 @@ share/fuse/tape_pentagon.z80
 share/fuse/tape_plus2.z80
 share/fuse/tape_plus2a.z80
 share/fuse/tape_plus3.z80
+share/fuse/tape_scorpion.z80
 share/fuse/tc2048.rom
 share/fuse/tc2068-0.rom
 share/fuse/tc2068-1.rom
diff --git a/emulators/fuse/distinfo b/emulators/fuse/distinfo
index e7a7273c0b5..5f352fc1afd 100644
--- a/emulators/fuse/distinfo
+++ b/emulators/fuse/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2004/02/20 14:14:52 adam Exp $
+$NetBSD: distinfo,v 1.5 2004/07/20 13:12:15 adam Exp $
 
-SHA1 (fuse-0.6.2.1.tar.gz) = 6fa903848153dbc2919a779e6c8214286a938af2
-Size (fuse-0.6.2.1.tar.gz) = 668863 bytes
-SHA1 (patch-aa) = 047ff628e454da6dbc9c3b140f6265353c317ae4
+SHA1 (fuse-0.7.0.tar.gz) = 36e0485183bd1bbfc9140b8ebb9f0a4bf197ffe6
+Size (fuse-0.7.0.tar.gz) = 872031 bytes
+SHA1 (patch-aa) = d6c728522c4947137164bc84e77687f2b6ea06cf
+SHA1 (patch-ab) = 992f113337409db20c8ba35f3d5c7dcaeb7af17f
diff --git a/emulators/fuse/patches/patch-aa b/emulators/fuse/patches/patch-aa
index 5c84ba83267..21777faf4e1 100644
--- a/emulators/fuse/patches/patch-aa
+++ b/emulators/fuse/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2004/02/13 13:40:15 adam Exp $
+$NetBSD: patch-aa,v 1.2 2004/07/20 13:12:16 adam Exp $
 
---- osssound.c.orig	2004-02-13 13:59:02.000000000 +0000
-+++ osssound.c
-@@ -21,7 +21,7 @@
+--- sound/osssound.c.orig	2004-07-20 14:50:41.000000000 +0000
++++ sound/osssound.c
+@@ -56,7 +56,7 @@ int sound_lowlevel_init(const char *devi
+ int frag,tmp,flags;
  
- #include <config.h>
+ /* select a default device if we weren't explicitly given one */
+-if(device==NULL) device = "/dev/dsp";
++if(device==NULL) device = DEVOSSAUDIO;
  
--#if !defined(UI_SDL) && defined(HAVE_SYS_SOUNDCARD_H)	/* OSS sound */
-+#if !defined(UI_SDL) && defined(HAVE_SYS_SOUNDCARD_H) && !defined(HAVE_SYS_AUDIOIO_H)	/* OSS sound */
- 
- #include <stdio.h>
- #include <string.h>
+ /* Open the sound device non-blocking to avoid hangs if it is being
+  * used by something else, but then set it blocking again as that's what
diff --git a/emulators/fuse/patches/patch-ab b/emulators/fuse/patches/patch-ab
new file mode 100644
index 00000000000..6111921b9bd
--- /dev/null
+++ b/emulators/fuse/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2004/07/20 13:13:08 adam Exp $
+
+--- sound/Makefile.in.orig	2004-07-20 14:55:16.000000000 +0000
++++ sound/Makefile.in
+@@ -110,7 +110,7 @@ LIBRARIES =  $(noinst_LIBRARIES)
+ 
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS = @CPPFLAGS@ -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\"
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+ X_CFLAGS = @X_CFLAGS@