Changes 0.6.2:

* New features:
  + Real joystick support.
  + The 'pokefinder'.
  + Black and white TV mode for the GTK+ and SDL user interfaces.
  + The Timex 1.5x scaler and the reappearance of 3x3 mode for the GTK+ UI.
  + A simple memory browser.
  + Writes to disk will not affect the underlying file unless
    explicitly requested by the user.
  + Status bar for the GTK+ UI, and status icons for the SDL UI.
  + Options to disable the GTK+ confirmation dialogs and the printer emulation.

* Z80 core improvements

* Debugger improvements

* RZX improvements

* Minor bugfixes

4 files changed, 33 insertions, 18 deletions

diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index 3cd7d0849a1..fe7f9135de1 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -1,24 +1,23 @@
-# $NetBSD: Makefile,v 1.6 2004/01/23 21:50:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/13 13:40:15 adam Exp $
 
-DISTNAME=	fuse-0.6.1.1
-PKGREVISION=	2
+DISTNAME=	fuse-0.6.2
 CATEGORIES=	emulators
-MASTER_SITES=	http://www.srcf.ucam.org/~pak21/spectrum/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fuse-emulator/}
 
 MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://www.srcf.ucam.org/~pak21/spectrum/fuse.html
+HOMEPAGE=	http://fuse-emulator.sourceforge.net/
 COMMENT=	ZX Spectrum Emulator
 
-USE_BUILDLINK2=	yes
-USE_PERL5=	build
-USE_X11=	yes
-GNU_CONFIGURE=	yes
-LIBS+=		${LIBOSSAUDIO}
+USE_BUILDLINK2=		yes
+USE_PERL5=		build
+USE_X11=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-gtk2
 
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
 .include "../../emulators/libspectrum/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
 
 .include "../../mk/ossaudio.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/fuse/PLIST b/emulators/fuse/PLIST
index 53d8e2b4f06..334da6a88e2 100644
--- a/emulators/fuse/PLIST
+++ b/emulators/fuse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/16 09:55:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/13 13:40:15 adam Exp $
 bin/fuse
 man/man1/fuse.1
 share/fuse/128-0.rom
@@ -6,14 +6,16 @@ share/fuse/128-1.rom
 share/fuse/128p-0.rom
 share/fuse/128p-1.rom
 share/fuse/48.rom
-share/fuse/keyboard.scr
+share/fuse/cassette.bmp
 share/fuse/disk_plus3.z80
+share/fuse/keyboard.scr
 share/fuse/plus2-0.rom
 share/fuse/plus2-1.rom
 share/fuse/plus3-0.rom
 share/fuse/plus3-1.rom
 share/fuse/plus3-2.rom
 share/fuse/plus3-3.rom
+share/fuse/plus3disk.bmp
 share/fuse/tape_128.z80
 share/fuse/tape_16.z80
 share/fuse/tape_2048.z80
diff --git a/emulators/fuse/distinfo b/emulators/fuse/distinfo
index 88ba30b8966..2e9fa4613e9 100644
--- a/emulators/fuse/distinfo
+++ b/emulators/fuse/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/10/02 15:24:12 adam Exp $
+$NetBSD: distinfo,v 1.3 2004/02/13 13:40:15 adam Exp $
 
-SHA1 (fuse-0.6.1.1.tar.gz) = 4adb2f6f11409101360cf1abe7cb45558073f44d
-Size (fuse-0.6.1.1.tar.gz) = 509597 bytes
+SHA1 (fuse-0.6.2.tar.gz) = 3290614cb71b6cd262ff6df056d62648ac16b6f3
+Size (fuse-0.6.2.tar.gz) = 665425 bytes
+SHA1 (patch-aa) = 047ff628e454da6dbc9c3b140f6265353c317ae4
diff --git a/emulators/fuse/patches/patch-aa b/emulators/fuse/patches/patch-aa
new file mode 100644
index 00000000000..5c84ba83267
--- /dev/null
+++ b/emulators/fuse/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2004/02/13 13:40:15 adam Exp $
+
+--- osssound.c.orig	2004-02-13 13:59:02.000000000 +0000
++++ osssound.c
+@@ -21,7 +21,7 @@
+ 
+ #include <config.h>
+ 
+-#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>