Finish move of emulators/fuse to emulators/fuse-emulator

11 files changed, 2 insertions, 179 deletions

diff --git a/emulators/Makefile b/emulators/Makefile
index 588493840eb..a589e1e0be3 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.240 2015/12/12 01:28:37 kamil Exp $
+# $NetBSD: Makefile,v 1.241 2016/01/17 14:28:31 wiz Exp $
 #
 
 COMMENT=	Emulators for other operating systems
@@ -61,7 +61,7 @@ SUBDIR+=	free42
 SUBDIR+=	freebsd_lib
 SUBDIR+=	fs-uae
 SUBDIR+=	fs-uae-launcher
-SUBDIR+=	fuse
+SUBDIR+=	fuse-emulator
 SUBDIR+=	fuse-utils
 SUBDIR+=	gambatte
 SUBDIR+=	gcube
diff --git a/emulators/fuse/DESCR b/emulators/fuse/DESCR
deleted file mode 100644
index 8a9d12afd87..00000000000
--- a/emulators/fuse/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Fuse is the Free Unix Spectrum Emulator.
-* Working 48K/128K/+2/+2A Speccy emulation, running at true Speccy speed on any
-  computer you're likely to try it on.
-* Support for loading from .tzx files.
-* Sound (on system supporting the Open Sound System or BSD/Solaris).
-* Kempston joystick emulation.
-* Emulation of the various printers you could attach to the Spectrum.
-* Very basic support for RZX files.
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
deleted file mode 100644
index 8794bc37017..00000000000
--- a/emulators/fuse/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.62 2015/06/12 10:50:03 wiz Exp $
-
-DISTNAME=	fuse-1.1.1
-PKGREVISION=	7
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fuse-emulator/}
-
-MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://fuse-emulator.sourceforge.net/
-COMMENT=	ZX Spectrum Emulator
-LICENSE=	gnu-gpl-v2
-
-USE_TOOLS+=		perl pkg-config
-GNU_CONFIGURE=		yes
-
-CPPFLAGS+=		-DDEVOSSAUDIO=\"${DEVOSSAUDIO}\"
-LIBS+=			${LIBOSSAUDIO}
-
-.include "options.mk"
-
-BUILDLINK_API_DEPENDS.libspectrum+=	libspectrum>=1.1.1
-.include "../../emulators/libspectrum/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/fuse/PLIST b/emulators/fuse/PLIST
deleted file mode 100644
index 43aa8dd6479..00000000000
--- a/emulators/fuse/PLIST
+++ /dev/null
@@ -1,44 +0,0 @@
-@comment $NetBSD: PLIST,v 1.11 2013/06/14 20:53:04 wiz Exp $
-bin/fuse
-man/man1/fuse.1
-share/fuse/128-0.rom
-share/fuse/128-1.rom
-share/fuse/48.rom
-share/fuse/cassette.bmp
-share/fuse/disciple.rom
-share/fuse/disk_plus3.szx
-share/fuse/keyboard.scr
-share/fuse/menu_data.ui
-share/fuse/microdrive.bmp
-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/plus3e-0.rom
-share/fuse/plus3e-1.rom
-share/fuse/plus3e-2.rom
-share/fuse/plus3e-3.rom
-share/fuse/plusd.rom
-share/fuse/se-0.rom
-share/fuse/se-1.rom
-share/fuse/speccyboot-1.4.rom
-share/fuse/tape_128.szx
-share/fuse/tape_16.szx
-share/fuse/tape_2048.szx
-share/fuse/tape_2068.szx
-share/fuse/tape_48.szx
-share/fuse/tape_48_ntsc.szx
-share/fuse/tape_pentagon.szx
-share/fuse/tape_plus2.szx
-share/fuse/tape_plus2a.szx
-share/fuse/tape_plus3.szx
-share/fuse/tape_plus3e.szx
-share/fuse/tape_scorpion.szx
-share/fuse/tape_se.szx
-share/fuse/tape_ts2068.szx
-share/fuse/tc2048.rom
-share/fuse/tc2068-0.rom
-share/fuse/tc2068-1.rom
diff --git a/emulators/fuse/distinfo b/emulators/fuse/distinfo
deleted file mode 100644
index fff15643ea7..00000000000
--- a/emulators/fuse/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.18 2015/11/03 20:30:57 agc Exp $
-
-SHA1 (fuse-1.1.1.tar.gz) = 92dc42bf9e8d26c42858059d59d522255041ab5d
-RMD160 (fuse-1.1.1.tar.gz) = 5bb00bf401050101fe2da3ec9a7f9ccc3069e82c
-SHA512 (fuse-1.1.1.tar.gz) = 67d12c56057a13121d8a5c073002dd2168268894669bdb50f3aba977cb1f53afa48774bfcb438a627a5afdbd2288248d4449e57d744e17b9e3eba00970685a14
-Size (fuse-1.1.1.tar.gz) = 1881332 bytes
-SHA1 (patch-aa) = 68d610ec43b220400e7781ae84327926c9d5c498
-SHA1 (patch-ac) = 356002f998673f4a5ac2a78285e3bd7b1139be64
-SHA1 (patch-ad) = bdd8fab4de20b906128d3c19b9faffcbc6781e50
-SHA1 (patch-configure) = 7108d14dec459121301f93bf797671408861beb3
-SHA1 (patch-screenshot.c) = e09bf2cd264bf66bed57a41b623c1fa20e216c6b
diff --git a/emulators/fuse/options.mk b/emulators/fuse/options.mk
deleted file mode 100644
index 1719007385a..00000000000
--- a/emulators/fuse/options.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2007/03/24 15:51:41 adam Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.fuse
-PKG_SUPPORTED_OPTIONS=	sdl gtk
-PKG_SUGGESTED_OPTIONS=	gtk
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgtk)
-CONFIGURE_ARGS+=	--with-gtk2
-.include "../../x11/gtk2/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Msdl)
-CONFIGURE_ARGS+=	--with-sdl
-.include "../../devel/SDL/buildlink3.mk"
-.endif
diff --git a/emulators/fuse/patches/patch-aa b/emulators/fuse/patches/patch-aa
deleted file mode 100644
index d4a0127efce..00000000000
--- a/emulators/fuse/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2008/01/24 18:32:37 adam Exp $
-
---- sound/osssound.c.orig	2007-12-21 17:43:10.000000000 +0100
-+++ sound/osssound.c
-@@ -52,7 +52,7 @@ int sound_lowlevel_init(const char *devi
- int frag,tmp,flags;
- 
- /* select a default device if we weren't explicitly given one */
--if(device==NULL) device = "/dev/dsp";
-+if(device==NULL) device = DEVOSSAUDIO;
- 
- /* 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-ac b/emulators/fuse/patches/patch-ac
deleted file mode 100644
index 1f748445958..00000000000
--- a/emulators/fuse/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2010/12/20 20:53:47 adam Exp $
-
---- ui/gtk/gtkui.c.orig	2010-12-20 20:17:04.000000000 +0000
-+++ ui/gtk/gtkui.c
-@@ -28,8 +28,10 @@
- #include <stdio.h>
- 
- #include <gdk/gdkkeysyms.h>
--#include <gdk/gdkx.h>
- #include <gtk/gtk.h>
-+#ifndef GDK_WINDOWING_QUARTZ
-+#include <gdk/gdkx.h>
-+#endif
- 
- #include <glib.h>
- 
diff --git a/emulators/fuse/patches/patch-ad b/emulators/fuse/patches/patch-ad
deleted file mode 100644
index a7aed269cc8..00000000000
--- a/emulators/fuse/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2013/06/14 20:53:04 wiz Exp $
-
---- ui/gtk/Makefile.in.orig	2013-05-24 20:56:08.000000000 +0000
-+++ ui/gtk/Makefile.in
-@@ -314,7 +314,7 @@ libuigtk_la_SOURCES = binary.c browse.c 
- 	gtkmouse.c gtkui.c keysyms.c memory.c menu_data.c options.c \
- 	picture.c pixmaps.c pokefinder.c pokemem.c rollback.c roms.c \
- 	statusbar.c stock.c $(am__append_1)
--libuigtk_la_LIBADD = @GTK_LIBS@ -lX11 
-+libuigtk_la_LIBADD = @GTK_LIBS@
- BUILT_SOURCES = keysyms.c \
- 		menu_data.c \
- 		menu_data.ui \
diff --git a/emulators/fuse/patches/patch-configure b/emulators/fuse/patches/patch-configure
deleted file mode 100644
index 4abe969116c..00000000000
--- a/emulators/fuse/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2013/06/14 20:53:04 wiz Exp $
-
-Fix unportable test(1) construct.
-
---- configure.orig	2013-06-14 20:38:14.000000000 +0000
-+++ configure
-@@ -17868,7 +17868,7 @@ if test "$desktopdir" = yes; then
- else
-   DESKTOP_DATADIR="$datadir"
- fi
-- if test "$desktopdir" == yes; then
-+ if test "$desktopdir" = yes; then
-   DESKTOP_DATADIR_TRUE=
-   DESKTOP_DATADIR_FALSE='#'
- else
diff --git a/emulators/fuse/patches/patch-screenshot.c b/emulators/fuse/patches/patch-screenshot.c
deleted file mode 100644
index 3db8952b2b2..00000000000
--- a/emulators/fuse/patches/patch-screenshot.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-screenshot.c,v 1.2 2013/06/14 20:53:04 wiz Exp $
-
-Include Zlib header.
-
---- screenshot.c.orig	2013-05-16 20:26:23.000000000 +0000
-+++ screenshot.c
-@@ -47,6 +47,7 @@
- 
- #ifdef USE_LIBPNG
- 
-+#include <zlib.h>
- #include <png.h>
- #ifdef HAVE_ZLIB_H
- #include <zlib.h>