Creating branch jlam-pkgviewsjlam-pkgviews

1135 files changed, 0 insertions, 34218 deletions

diff --git a/emulators/BasiliskII/DESCR b/emulators/BasiliskII/DESCR
deleted file mode 100644
index a4910623292..00000000000
--- a/emulators/BasiliskII/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Basilisk II is an Open Source 68k Macintosh emulator. That is, it
-enables you to run 68k MacOS software on you computer, even if you
-are using a different operating system. However, you still need a
-copy of MacOS and a Macintosh ROM image to use Basilisk II.
diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile
deleted file mode 100644
index a10318a721f..00000000000
--- a/emulators/BasiliskII/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.29 2007/02/22 19:01:18 wiz Exp $
-
-DISTNAME=	BasiliskII_src_01052006
-PKGNAME=	BasiliskII-1.0.20060501
-CATEGORIES=	emulators
-MASTER_SITES=	http://gwenole.beauchesne.info/projects/basilisk2/files/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://gwenole.beauchesne.info/projects/basilisk2/
-COMMENT=	Open Source 68k Macintosh emulator
-
-WRKSRC=			${WRKDIR}/BasiliskII-1.0
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-CONFIGURE_DIRS=		src/Unix
-CONFIGURE_ARGS+=	--disable-fbdev-dga
-CONFIGURE_ARGS+=	--enable-addressing=banks
-CONFIGURE_ARGS+=	--without-mon
-# disable gnome support, or configure will break if gnome-libs is installed
-CONFIGURE_ENV+=		ac_cv_path_GNOME_CONFIG=no
-BUILD_DIRS=		${CONFIGURE_DIRS}
-
-.include "options.mk"
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/BasiliskII
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/BasiliskII/
-	${INSTALL_DATA} ${WRKSRC}/TECH ${PREFIX}/share/doc/BasiliskII/
-	${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/doc/BasiliskII/
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/BasiliskII/PLIST b/emulators/BasiliskII/PLIST
deleted file mode 100644
index 17221fb8e3d..00000000000
--- a/emulators/BasiliskII/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/07/01 12:34:32 adam Exp $
-bin/BasiliskII
-man/man1/BasiliskII.1
-share/BasiliskII/fbdevices
-share/BasiliskII/keycodes
-share/BasiliskII/tunconfig
-share/doc/BasiliskII/README
-share/doc/BasiliskII/TECH
-share/doc/BasiliskII/TODO
-@dirrm share/doc/BasiliskII
-@dirrm share/BasiliskII
diff --git a/emulators/BasiliskII/distinfo b/emulators/BasiliskII/distinfo
deleted file mode 100644
index 069a0cee376..00000000000
--- a/emulators/BasiliskII/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.14 2006/05/13 20:52:35 adam Exp $
-
-SHA1 (BasiliskII_src_01052006.tar.bz2) = 6373b33adf6caec53c5d1ed46a00adcac89ad3bb
-RMD160 (BasiliskII_src_01052006.tar.bz2) = bb1a061c504bd7d28b869e0eec2806cf8a79cf8d
-Size (BasiliskII_src_01052006.tar.bz2) = 1310908 bytes
-SHA1 (patch-aa) = 387f7a3f6edac21b99d81ba88a0eeed4591c75ef
-SHA1 (patch-ab) = 4ada93db64772e70e95c58b6a324019c1da6a72d
-SHA1 (patch-ac) = ac4d313a8c60a807a5ea563dcca995e092be9c15
-SHA1 (patch-ad) = 6a215532e891848fe449ef5fe4307793c34bb9d6
-SHA1 (patch-ae) = dcac9287614535fa72fe9c8b0e3c516575e40887
-SHA1 (patch-af) = 2087a41aeda1fcab49408428decf1e5082fc8896
-SHA1 (patch-ag) = 079a62bc2e193fe4a8de1862c1e5334ee657ecf4
-SHA1 (patch-ah) = 0f67eed6f59e6c381c1a6fbeb98261cad4697760
-SHA1 (patch-ai) = fc527be478576f157bffbd6a91eb1bdc85903fb1
-SHA1 (patch-aj) = c331aa7080b330cf58f58c72456b91b0e5a2156f
-SHA1 (patch-ak) = 1dad263b22ae3257a6e34b90972ba264ada7b287
diff --git a/emulators/BasiliskII/options.mk b/emulators/BasiliskII/options.mk
deleted file mode 100644
index ff57a1032c2..00000000000
--- a/emulators/BasiliskII/options.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: options.mk,v 1.4 2007/02/06 18:16:02 joerg Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.BasiliskII
-PKG_SUPPORTED_OPTIONS=	esound gtk sdl
-PKG_OPTIONS_LEGACY_OPTS+=	esd:esound
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mesound)
-CONFIGURE_ARGS+=	--with-esd
-.include "../../audio/esound/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-esd
-.endif
-
-.if !empty(PKG_OPTIONS:Mgtk)
-CONFIGURE_ARGS+=	--with-gtk
-.include "../../x11/gtk/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-gtk
-.endif
-
-.if !empty(PKG_OPTIONS:Msdl)
-CONFIGURE_ARGS+=	--enable-sdl-audio
-CONFIGURE_ARGS+=	--enable-sdl-video
-.include "../../devel/SDL/buildlink3.mk"
-.else
-BUILDLINK_DEPMETHOD.libXt?=	build
-
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.endif
diff --git a/emulators/BasiliskII/patches/patch-aa b/emulators/BasiliskII/patches/patch-aa
deleted file mode 100644
index 79c920ea81f..00000000000
--- a/emulators/BasiliskII/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/11/23 12:17:56 adam Exp $
-
---- src/dummy/ether_dummy.cpp.orig	2005-05-14 10:10:09.000000000 +0200
-+++ src/dummy/ether_dummy.cpp
-@@ -174,7 +174,7 @@ void EtherInterrupt(void)
- 			length = recvfrom(fd, Mac2HostAddr(packet), 1514, 0, (struct sockaddr *)&from, &from_len);
- 			if (length < 14)
- 				break;
--			ether_udp_read(packet, length, &from);
-+			ether_udp_read((uint32)packet, length, &from);
- 		}
- 	}
- #endif
diff --git a/emulators/BasiliskII/patches/patch-ab b/emulators/BasiliskII/patches/patch-ab
deleted file mode 100644
index e001cf353a5..00000000000
--- a/emulators/BasiliskII/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2006/05/13 20:52:35 adam Exp $
-
---- src/Unix/video_x.cpp.orig	2006-01-03 23:03:27.000000000 +0100
-+++ src/Unix/video_x.cpp
-@@ -2326,7 +2326,7 @@ static void update_display_dynamic(int t
- static void update_display_static(driver_window *drv)
- {
- 	// Incremental update code
--	unsigned wide = 0, high = 0, x1, x2, y1, y2, i, j;
-+	int wide = 0, high = 0, x1, x2, y1, y2, i, j;
- 	const video_mode &mode = drv->monitor.get_current_mode();
- 	int bytes_per_row = mode.bytes_per_row;
- 	int bytes_per_pixel = mode.bytes_per_row / mode.x;
diff --git a/emulators/BasiliskII/patches/patch-ac b/emulators/BasiliskII/patches/patch-ac
deleted file mode 100644
index 925c149343b..00000000000
--- a/emulators/BasiliskII/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/11/03 21:34:23 rillig Exp $
-
---- src/Unix/vm_alloc.cpp.orig	2005-01-30 21:42:14.000000000 +0000
-+++ src/Unix/vm_alloc.cpp
-@@ -39,6 +39,7 @@
- #include "vm_alloc.h"
- 
- #ifdef HAVE_MACH_VM
-+#include <mach/mach.h>
- #ifndef HAVE_MACH_TASK_SELF
- #ifdef HAVE_TASK_SELF
- #define mach_task_self task_self
diff --git a/emulators/BasiliskII/patches/patch-ad b/emulators/BasiliskII/patches/patch-ad
deleted file mode 100644
index 99e517f7fd8..00000000000
--- a/emulators/BasiliskII/patches/patch-ad
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2005/11/03 21:34:23 rillig Exp $
-
---- src/Unix/sshpty.c.orig	2003-08-17 10:20:22.000000000 +0000
-+++ src/Unix/sshpty.c
-@@ -18,6 +18,7 @@ RCSID("$OpenBSD: sshpty.c,v 1.4 2001/12/
- /* Selections from openssh's "includes.h" */
- #include "config.h"
- 
-+#include <signal.h>
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
-@@ -145,19 +146,30 @@ pty_allocate(int *ptyfd, int *ttyfd, cha
- 	 */
- 	int ptm;
- 	char *pts;
-+#ifdef __sunos__
- 	mysig_t old_signal;
--
-+#else
-+	sig_t old_signal;
-+#endif
- 	ptm = open("/dev/ptmx", O_RDWR | O_NOCTTY);
- 	if (ptm < 0) {
- 		error("/dev/ptmx: %.100s", strerror(errno));
- 		return 0;
- 	}
-+#ifdef __sunos__
- 	old_signal = mysignal(SIGCHLD, SIG_DFL);
-+#else
-+	old_signal = signal(SIGCHLD, SIG_DFL);
-+#endif
- 	if (grantpt(ptm) < 0) {
- 		error("grantpt: %.100s", strerror(errno));
- 		return 0;
- 	}
-+#ifdef __sunos__
- 	mysignal(SIGCHLD, old_signal);
-+#else
-+	signal(SIGCHLD, old_signal);
-+#endif
- 	if (unlockpt(ptm) < 0) {
- 		error("unlockpt: %.100s", strerror(errno));
- 		return 0;
-@@ -175,7 +187,7 @@ pty_allocate(int *ptyfd, int *ttyfd, cha
- 		close(*ptyfd);
- 		return 0;
- 	}
--#ifndef HAVE_CYGWIN
-+#if !defined(__NetBSD__)
- 	/*
- 	 * Push the appropriate streams modules, as described in Solaris pts(7).
- 	 * HP-UX pts(7) doesn't have ttcompat module.
-@@ -184,7 +196,7 @@ pty_allocate(int *ptyfd, int *ttyfd, cha
- 		error("ioctl I_PUSH ptem: %.100s", strerror(errno));
- 	if (ioctl(*ttyfd, I_PUSH, "ldterm") < 0)
- 		error("ioctl I_PUSH ldterm: %.100s", strerror(errno));
--#ifndef __hpux
-+#if !defined(__NetBSD__)
- 	if (ioctl(*ttyfd, I_PUSH, "ttcompat") < 0)
- 		error("ioctl I_PUSH ttcompat: %.100s", strerror(errno));
- #endif
-@@ -277,7 +289,7 @@ pty_allocate(int *ptyfd, int *ttyfd, cha
- 		}
- 		/* set tty modes to a sane state for broken clients */
- 		if (tcgetattr(*ptyfd, &tio) < 0)
--			log("Getting tty modes for pty failed: %.100s", strerror(errno));
-+			error("Getting tty modes for pty failed: %.100s", strerror(errno));
- 		else {
- 			tio.c_lflag |= (ECHO | ISIG | ICANON);
- 			tio.c_oflag |= (OPOST | ONLCR);
-@@ -285,7 +297,7 @@ pty_allocate(int *ptyfd, int *ttyfd, cha
- 
- 			/* Set the new modes for the terminal. */
- 			if (tcsetattr(*ptyfd, TCSANOW, &tio) < 0)
--				log("Setting tty modes for pty failed: %.100s", strerror(errno));
-+				error("Setting tty modes for pty failed: %.100s", strerror(errno));
- 		}
- 
- 		return 1;
diff --git a/emulators/BasiliskII/patches/patch-ae b/emulators/BasiliskII/patches/patch-ae
deleted file mode 100644
index 9f24cecc6c5..00000000000
--- a/emulators/BasiliskII/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/11/17 16:56:39 joerg Exp $
-
---- src/Unix/timer_unix.cpp.orig	2005-11-17 14:22:31.000000000 +0000
-+++ src/Unix/timer_unix.cpp
-@@ -228,7 +228,7 @@ uint64 GetTicks_usec(void)
- // Linux select() changes its timeout parameter upon return to contain
- // the remaining time. Most other unixen leave it unchanged or undefined.
- #define SELECT_SETS_REMAINING
--#elif defined(__FreeBSD__) || defined(__sun__) || (defined(__MACH__) && defined(__APPLE__))
-+#elif defined(__FreeBSD__) || defined(__sun__) || (defined(__MACH__) && defined(__APPLE__)) || defined(__DragonFly__)
- #define USE_NANOSLEEP
- #elif defined(HAVE_PTHREADS) && defined(sgi)
- // SGI pthreads has a bug when using pthreads+signals+nanosleep,
diff --git a/emulators/BasiliskII/patches/patch-af b/emulators/BasiliskII/patches/patch-af
deleted file mode 100644
index ab3ed4920ec..00000000000
--- a/emulators/BasiliskII/patches/patch-af
+++ /dev/null
@@ -1,157 +0,0 @@
-$NetBSD: patch-af,v 1.3 2006/05/13 20:52:35 adam Exp $
-
---- src/Unix/sys_unix.cpp.orig	2005-11-24 18:23:43.000000000 +0100
-+++ src/Unix/sys_unix.cpp
-@@ -37,7 +37,7 @@
- #include <dirent.h>
- #endif
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- #include <sys/cdio.h>
- #endif
- 
-@@ -64,7 +64,7 @@ struct file_handle {
- 
- #if defined(__linux__)
- 	int cdrom_cap;		// CD-ROM capability flags (only valid if is_cdrom is true)
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 	struct ioc_capability cdrom_cap;
- #elif defined(__APPLE__) && defined(__MACH__)
- 	char	*ioctl_name;	// For CDs on OS X - a device for special ioctls
-@@ -220,7 +220,7 @@ void SysAddCDROMPrefs(void)
- 	// Until I can convince the other guys that my Darwin code is useful,
- 	// we just do nothing (it is safe to have no cdrom device)
-   #endif
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 	PrefsAddString("cdrom", "/dev/cd0c");
- #endif
- }
-@@ -240,7 +240,7 @@ void SysAddSerialPrefs(void)
- 		PrefsAddString("seriala", "/dev/tts/0");
- 		PrefsAddString("serialb", "/dev/tts/1");
- 	}
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 	PrefsAddString("seriala", "/dev/cuaa0");
- 	PrefsAddString("serialb", "/dev/cuaa1");
- #elif defined(__NetBSD__)
-@@ -302,7 +302,7 @@ static bool is_drive_mounted(const char 
- void *Sys_open(const char *name, bool read_only)
- {
- 	bool is_file = strncmp(name, "/dev/", 5) != 0;
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- 	                // SCSI                             IDE
- 	bool is_cdrom = strncmp(name, "/dev/cd", 7) == 0 || strncmp(name, "/dev/acd", 8) == 0;
- #else
-@@ -351,7 +351,7 @@ void *Sys_open(const char *name, bool re
- 	}
- 
- 	// Open file/device
--#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 	int fd = open(name, (read_only ? O_RDONLY : O_RDWR) | (is_cdrom ? O_NONBLOCK : 0));
- #else
- 	int fd = open(name, read_only ? O_RDONLY : O_RDWR);
-@@ -394,7 +394,7 @@ void *Sys_open(const char *name, bool re
- #else
- 					fh->cdrom_cap = 0;
- #endif
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 					fh->is_floppy = ((st.st_rdev >> 16) == 2);
- #ifdef CDIOCCAPABILITY
- 					if (is_cdrom) {
-@@ -557,7 +557,7 @@ void SysEject(void *arg)
- 		close(fh->fd);	// Close and reopen so the driver will see the media change
- 		fh->fd = open(fh->name, O_RDONLY | O_NONBLOCK);
- 	}
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 	if (fh->is_floppy) {
- 		fsync(fh->fd);
- 	} else if (fh->is_cdrom) {
-@@ -697,7 +697,7 @@ bool SysIsDiskInserted(void *arg)
- #endif
- 		cdrom_tochdr header;
- 		return ioctl(fh->fd, CDROMREADTOCHDR, &header) == 0;
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 	} else if (fh->is_floppy) {
- 		return false;	//!!
- 	} else if (fh->is_cdrom) {
-@@ -805,7 +805,7 @@ bool SysCDReadTOC(void *arg, uint8 *toc)
- 		extern	bool	DarwinCDReadTOC(char *name, uint8 *toc);
- 
- 		return	DarwinCDReadTOC(fh->name, toc);
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 		uint8 *p = toc + 2;
- 
- 		// Header
-@@ -916,7 +916,7 @@ bool SysCDGetPosition(void *arg, uint8 *
- 		*pos++ = chan.cdsc_reladdr.msf.second;
- 		*pos++ = chan.cdsc_reladdr.msf.frame;
- 		return true;
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 		struct ioc_read_subchannel chan;
- 		chan.data_format = CD_MSF_FORMAT;
- 		chan.address_format = CD_MSF_FORMAT;
-@@ -968,7 +968,7 @@ bool SysCDPlay(void *arg, uint8 start_m,
- 		play.cdmsf_sec1 = end_s;
- 		play.cdmsf_frame1 = end_f;
- 		return ioctl(fh->fd, CDROMPLAYMSF, &play) == 0;
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 		struct ioc_play_msf play;
- 		play.start_m = start_m;
- 		play.start_s = start_s;
-@@ -998,7 +998,7 @@ bool SysCDPause(void *arg)
- 	if (fh->is_cdrom) {
- #if defined(__linux__)
- 		return ioctl(fh->fd, CDROMPAUSE) == 0;
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 		return ioctl(fh->fd, CDIOCPAUSE) == 0;
- #else
- 		return false;
-@@ -1021,7 +1021,7 @@ bool SysCDResume(void *arg)
- 	if (fh->is_cdrom) {
- #if defined(__linux__)
- 		return ioctl(fh->fd, CDROMRESUME) == 0;
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 		return ioctl(fh->fd, CDIOCRESUME) == 0;
- #else
- 		return false;
-@@ -1044,7 +1044,7 @@ bool SysCDStop(void *arg, uint8 lead_out
- 	if (fh->is_cdrom) {
- #if defined(__linux__)
- 		return ioctl(fh->fd, CDROMSTOP) == 0;
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 		return ioctl(fh->fd, CDIOCSTOP) == 0;
- #else
- 		return false;
-@@ -1085,7 +1085,7 @@ void SysCDSetVolume(void *arg, uint8 lef
- 		vol.channel0 = vol.channel2 = left;
- 		vol.channel1 = vol.channel3 = right;
- 		ioctl(fh->fd, CDROMVOLCTRL, &vol);
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 		struct ioc_vol vol;
- 		vol.vol[0] = vol.vol[2] = left;
- 		vol.vol[1] = vol.vol[3] = right;
-@@ -1112,7 +1112,7 @@ void SysCDGetVolume(void *arg, uint8 &le
- 		ioctl(fh->fd, CDROMVOLREAD, &vol);
- 		left = vol.channel0;
- 		right = vol.channel1;
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 		struct ioc_vol vol;
- 		ioctl(fh->fd, CDIOCGETVOL, &vol);
- 		left = vol.vol[0];
diff --git a/emulators/BasiliskII/patches/patch-ag b/emulators/BasiliskII/patches/patch-ag
deleted file mode 100644
index 36c2992430d..00000000000
--- a/emulators/BasiliskII/patches/patch-ag
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2006/05/13 20:52:35 adam Exp $
-
---- src/Unix/sigsegv.cpp.orig	2006-03-31 00:45:49.000000000 +0200
-+++ src/Unix/sigsegv.cpp
-@@ -226,7 +226,7 @@ static void powerpc_decode_instruction(i
- 
- #if HAVE_SIGINFO_T
- // Generic extended signal handler
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #define SIGSEGV_ALL_SIGNALS				FAULT_HANDLER(SIGBUS)
- #else
- #define SIGSEGV_ALL_SIGNALS				FAULT_HANDLER(SIGSEGV)
-@@ -264,7 +264,7 @@ static void powerpc_decode_instruction(i
- #define SIGSEGV_SKIP_INSTRUCTION		ix86_skip_instruction
- #endif
- #endif
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #if (defined(i386) || defined(__i386__))
- #define SIGSEGV_FAULT_INSTRUCTION		(((struct sigcontext *)scp)->sc_eip)
- #define SIGSEGV_REGISTER_FILE			((unsigned long *)&(((struct sigcontext *)scp)->sc_edi)) /* EDI is the first GPR (even below EIP) in sigcontext */
-@@ -451,7 +451,7 @@ static sigsegv_address_t get_fault_addre
- #define SIGSEGV_ALL_SIGNALS				FAULT_HANDLER(SIGSEGV)
- #endif
- #endif
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #if (defined(i386) || defined(__i386__))
- #define SIGSEGV_ALL_SIGNALS				FAULT_HANDLER(SIGBUS)
- #define SIGSEGV_FAULT_HANDLER_ARGLIST	int sig, int code, struct sigcontext *scp, char *addr
-@@ -721,7 +721,7 @@ enum {
- #endif
- };
- #endif
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- enum {
- #if (defined(i386) || defined(__i386__))
- 	X86_REG_EIP = 10,
diff --git a/emulators/BasiliskII/patches/patch-ah b/emulators/BasiliskII/patches/patch-ah
deleted file mode 100644
index 7187523367d..00000000000
--- a/emulators/BasiliskII/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2006/05/13 20:52:35 adam Exp $
-
---- src/Unix/serial_unix.cpp.orig	2005-12-04 16:03:11.000000000 +0100
-+++ src/Unix/serial_unix.cpp
-@@ -212,7 +212,7 @@ int16 XSERDPort::open(uint16 config)
- 		if (fstat(fd, &st) == 0)
- 			if (S_ISCHR(st.st_mode))
- 				protocol = ((MAJOR(st.st_rdev) == LP_MAJOR) ? parallel : serial);
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 		// Parallel port?
- 		struct stat st;
- 		if (fstat(fd, &st) == 0)
diff --git a/emulators/BasiliskII/patches/patch-ai b/emulators/BasiliskII/patches/patch-ai
deleted file mode 100644
index 4906191bddb..00000000000
--- a/emulators/BasiliskII/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2006/05/13 20:52:35 adam Exp $
-
---- src/Unix/prefs_editor_gtk.cpp.orig	2006-04-30 23:16:48.000000000 +0200
-+++ src/Unix/prefs_editor_gtk.cpp
-@@ -1283,7 +1283,7 @@ static GList *add_serial_names(void)
- 		while ((de = readdir(d)) != NULL) {
- #if defined(__linux__)
- 			if (strncmp(de->d_name, "ttyS", 4) == 0 || strncmp(de->d_name, "lp", 2) == 0) {
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 			if (strncmp(de->d_name, "cuaa", 4) == 0 || strncmp(de->d_name, "lpt", 3) == 0) {
- #elif defined(__NetBSD__)
- 			if (strncmp(de->d_name, "tty0", 4) == 0 || strncmp(de->d_name, "lpt", 3) == 0) {
-@@ -1322,7 +1322,7 @@ static GList *add_ether_names(void)
- 			struct ifreq req, *ifr = ifc.ifc_req;
- 			for (int i=0; i<ifc.ifc_len; i+=sizeof(ifreq), ifr++) {
- 				req = *ifr;
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(sgi)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(sgi) || defined(__DragonFly__)
- 				if (ioctl(s, SIOCGIFADDR, &req) == 0 && (req.ifr_addr.sa_family == ARPHRD_ETHER || req.ifr_addr.sa_family == ARPHRD_ETHER+1)) {
- #elif defined(__linux__)
- 				if (ioctl(s, SIOCGIFHWADDR, &req) == 0 && req.ifr_hwaddr.sa_family == ARPHRD_ETHER) {
diff --git a/emulators/BasiliskII/patches/patch-aj b/emulators/BasiliskII/patches/patch-aj
deleted file mode 100644
index e6c8a47136f..00000000000
--- a/emulators/BasiliskII/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2006/05/13 20:52:35 adam Exp $
-
---- src/Unix/ether_unix.cpp.orig	2006-04-02 23:06:50.000000000 +0200
-+++ src/Unix/ether_unix.cpp
-@@ -49,7 +49,7 @@
- #include <stdio.h>
- #include <map>
- 
--#if defined(__FreeBSD__) || defined(sgi) || (defined(__APPLE__) && defined(__MACH__))
-+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(sgi) || (defined(__APPLE__) && defined(__MACH__))
- #include <net/if.h>
- #endif
- 
diff --git a/emulators/BasiliskII/patches/patch-ak b/emulators/BasiliskII/patches/patch-ak
deleted file mode 100644
index 70e6ef93b85..00000000000
--- a/emulators/BasiliskII/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2005/12/15 02:56:58 dogcow Exp $
-
---- src/Unix/audio_oss_esd.cpp.orig	2005-11-17 14:30:41.000000000 +0000
-+++ src/Unix/audio_oss_esd.cpp
-@@ -30,7 +30,7 @@
- #include <linux/soundcard.h>
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <sys/soundcard.h>
- #endif
- 
diff --git a/emulators/Cygne-SDL/DESCR b/emulators/Cygne-SDL/DESCR
deleted file mode 100644
index 0d34f8cd6ea..00000000000
--- a/emulators/Cygne-SDL/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-Originally Cygne was developed by Dox as a Bandai Wonderswan (Colour)
-emulator for Windows systems. From version 2.1 Dox decided to
-release the Windows sources to the public in GPL form which allows
-others to use the source and hack it :)
-
-Cygne/SDL is a Cygne port using the Simple Directmedia Layer (SDL)
-library.  Cygne/SDL is released as OpenSource under the GPL license.
-It uses code from the orignal Cygne (allthough a bit modified),
-code from the MAME NEC CPU core as well as portions from several
-SDLemu emulation projects. Anybody may hack the current sourcecode
-if they like or can make additional changes into it.
diff --git a/emulators/Cygne-SDL/Makefile b/emulators/Cygne-SDL/Makefile
deleted file mode 100644
index 730eb7eaf23..00000000000
--- a/emulators/Cygne-SDL/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2006/12/18 01:34:54 wiz Exp $
-#
-
-DISTNAME=		Cygne-SDL-0.1-src
-PKGNAME=		${DISTNAME:S/-src//}
-PKGREVISION=		5
-CATEGORIES=		emulators
-MASTER_SITES=		http://sdlemu.ngemu.com/OpenProjects/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://icculus.org/Cygne-SDL/
-COMMENT=		Bandai Wonderswan Color handheld emulator
-
-BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
-BUILD_DEPENDS+=		zip>=2.0:../../archivers/zip
-
-WRKSRC=			${WRKDIR}/Cygne-SDL-0.1
-MAKE_FILE=		Makefiles/Makefile.unix
-NO_CONFIGURE=		yes
-BUILD_DIRS=		src
-USE_LANGUAGES=		c c++
-
-# Uses i386 assembly code
-ONLY_FOR_PLATFORM=	*-*-i386
-
-INSTALLATION_DIRS=	bin
-
-post-build:
-	cd ${WRKSRC}/WonderSnake && \
-		${LOCALBASE}/bin/zip Wondersnake.zip Wondersnake.wsc
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/cygne ${PREFIX}/bin/Cygne-SDL
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Cygne-SDL
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/Cygne-SDL
-	${INSTALL_DATA_DIR} ${PREFIX}/share/Cygne-SDL
-	${INSTALL_DATA} ${WRKSRC}/WonderSnake/Wondersnake.txt \
-		${PREFIX}/share/Cygne-SDL
-	${INSTALL_DATA} ${WRKSRC}/WonderSnake/Wondersnake.zip \
-		${PREFIX}/share/Cygne-SDL
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/Cygne-SDL/PLIST b/emulators/Cygne-SDL/PLIST
deleted file mode 100644
index 3bcaa6b6267..00000000000
--- a/emulators/Cygne-SDL/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/11/05 13:59:21 wiz Exp $
-bin/Cygne-SDL
-share/Cygne-SDL/Wondersnake.txt
-share/Cygne-SDL/Wondersnake.zip
-share/doc/Cygne-SDL/README
-@dirrm share/doc/Cygne-SDL
-@dirrm share/Cygne-SDL
diff --git a/emulators/Cygne-SDL/distinfo b/emulators/Cygne-SDL/distinfo
deleted file mode 100644
index 36555c8c667..00000000000
--- a/emulators/Cygne-SDL/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/11/03 21:38:04 rillig Exp $
-
-SHA1 (Cygne-SDL-0.1-src.tar.gz) = f9c50702d1911d0ff1728e5aa089e67cfdfd0030
-RMD160 (Cygne-SDL-0.1-src.tar.gz) = 6d9fd7195a936f17fc3984a66722272c7e30991a
-Size (Cygne-SDL-0.1-src.tar.gz) = 106448 bytes
-SHA1 (patch-aa) = ee9dd0b364d278a45f2ac8d038b43aaf8f0c5c96
-SHA1 (patch-ab) = faff74d577fb243635a3aed7e6c17132bc43fe07
-SHA1 (patch-ac) = b8037825c79bd36aa65bf18745a3b09470b34ec0
-SHA1 (patch-ad) = 1bf79e577e70d13fb3032d331235dcd6e2d611f2
diff --git a/emulators/Cygne-SDL/patches/patch-aa b/emulators/Cygne-SDL/patches/patch-aa
deleted file mode 100644
index f16974016bf..00000000000
--- a/emulators/Cygne-SDL/patches/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/11/03 21:38:04 rillig Exp $
-
---- src/Makefiles/Makefile.unix.orig	2002-03-26 17:50:55.000000000 +0100
-+++ src/Makefiles/Makefile.unix
-@@ -1,5 +1,4 @@
--CC = gcc
--LD = gcc 
-+#LD = g++
- NASM = nasm
- 
- ### Include and lib stuff ####
-@@ -8,17 +7,13 @@ STDLIB     = /usr/lib 
- SDLINCLUDE = /usr/local/include/SDL
- SDLLIB	   = /usr/local/lib
- 
--CFLAGS = -O1 -DUNIX -DTARGET_UNIX -DGCC -DUSES_16BIT_ONLY -D__SDL__ -fomit-frame-pointer -march=pentium \
--         -mpentium -finline-functions -fexpensive-optimizations -funroll-loops -funroll-all-loops -pipe \
--         -fschedule-insns2 -fstrength-reduce -malign-double -mfancy-math-387 -ffast-math -fforce-addr \
--         -fforce-mem `sdl-config --cflags` \
--         -L$(STDLIB) -L$(SDLLIB) -I$(STDINCLUDE) -I$(SDLINCLUDE)
-+CFLAGS += -DUNIX -DTARGET_UNIX -DGCC -DUSES_16BIT_ONLY -D__SDL__
- 
--LDFLAGS = $(CFLAGS)
-+LDFLAGS += `sdl-config --libs`
- 
- TARGET = cygne
- 
--OBJ = ddrawsdl.o filessdl.o gfx.o nec.o tcache.o memory.o mainsdl.o zlib/unzip.o
-+OBJ = ddrawsdl.o filessdl.o gfx.o nec.o tcache.o memory.o mainsdl.o unzip.o
- 
- LIBS = `sdl-config --libs` -lz
- 
-@@ -28,17 +23,22 @@ INCS = -I. `sdl-config --cflags`
- 
- THECC = $(CC) $(CFLAGS) $(INCS)
- 
--%.o: %.asm
-+.SUFFIXES: .asm
-+
-+.asm.o:
- 	$(NASM) -f elf -o $@ $<
- 
--%.o: %.c
--	$(THECC) -c $< -o $@
-+.c.o:
-+	$(CC) $(CFLAGS) $(INCS) -c $< -o $@
-+
-+.cpp.o:
-+	$(CXX) $(CFLAGS) $(INCS) -c $< -o $@
- 
--%.o: %.cpp
--	$(THECC) -c $< -o $@
-+unzip.o:
-+	$(CC) $(CFLAGS) $(INCS) -c zlib/unzip.c -o $@
- 
--cygne: $(OBJ) Makefile
--	$(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
-+cygne: $(OBJ)
-+	$(CXX) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
- 	 
- clean:
- 	rm -f cygne *.o zlib/*.o
diff --git a/emulators/Cygne-SDL/patches/patch-ab b/emulators/Cygne-SDL/patches/patch-ab
deleted file mode 100644
index 9cfb4bbd184..00000000000
--- a/emulators/Cygne-SDL/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/11/03 21:38:04 rillig Exp $
-
---- src/Usage.h.orig	2002-03-26 16:55:20.000000000 +0100
-+++ src/Usage.h
-@@ -1,13 +1,13 @@
- void Usage()
- {
- printf(
--"Usage: ./cygne romfile options
-- Where options are:
--
-- romfile           : Filename of the romfile. It can have several
--                     extensions (.ws/.wsc/.rom/.bin). Gzipped and
--                     zipped (.gz and .zip) are also supported.
-- -double           : Scale the screen 2 times the normal size.
-- -scanline         : Allows scanline output with scaling.
-+"Usage: ./cygne romfile options\n\
-+ Where options are:\n\
-+\n\
-+ romfile           : Filename of the romfile. It can have several\n\
-+                     extensions (.ws/.wsc/.rom/.bin). Gzipped and\n\
-+                     zipped (.gz and .zip) are also supported.\n\
-+ -double           : Scale the screen 2 times the normal size.\n\
-+ -scanline         : Allows scanline output with scaling.\n\
- ");
- }
diff --git a/emulators/Cygne-SDL/patches/patch-ac b/emulators/Cygne-SDL/patches/patch-ac
deleted file mode 100644
index 45d66b45ef5..00000000000
--- a/emulators/Cygne-SDL/patches/patch-ac
+++ /dev/null
@@ -1,235 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/11/03 21:38:04 rillig Exp $
-
---- src/ddrawsdl.cpp.orig	2002-03-26 16:02:25.000000000 +0100
-+++ src/ddrawsdl.cpp
-@@ -174,66 +174,66 @@ void UpdateFrame_h()
- {
- 	switch(fBlitterMode) {
- 		case 1:
--			__asm__ __volatile__(".align 32
--							 cld
--							 rep
-+			__asm__ __volatile__(".align 32\n\
-+							 cld\n\
-+							 rep\n\
- 							 movsw"
- 							 :
- 							 :"S"(dx_buffer), "D"(g_pDDSPrimary->pixels), "c"((g_pDDSPrimary->h * g_pDDSPrimary->pitch)>>1));
- 		break;
- 		case 2:
--			__asm__ __volatile__("pusha
--								 xorl %%eax, %%eax
--								 movl $448, %%ebx 
--								 emms
--								 sum:
--								 movq (%0, %%eax, 1), %%mm0
--								 movq %%mm0, %%mm1
--								 punpcklwd %%mm0, %%mm0
--								 addl $8, %%eax
--								 punpckhwd %%mm1,%%mm1
--								 movq %%mm0, -16(%1, %%eax, 2)
--								 cmpl %%ebx, %%eax
--								 
--								 movq %%mm1, -8(%1, %%eax, 2)
--								 jnz sum
--								 xorl %%eax, %%eax
--								 
--								 addl %2, %0
--								 decl %%edx
--								 
--								 leal (%1, %2, 4), %1
--								 jnz sum
--								 emms
-+			__asm__ __volatile__("pusha\n\
-+								 xorl %%eax, %%eax\n\
-+								 movl $448, %%ebx \n\
-+								 emms\n\
-+								 sum:\n\
-+								 movq (%0, %%eax, 1), %%mm0\n\
-+								 movq %%mm0, %%mm1\n\
-+								 punpcklwd %%mm0, %%mm0\n\
-+								 addl $8, %%eax\n\
-+								 punpckhwd %%mm1,%%mm1\n\
-+								 movq %%mm0, -16(%1, %%eax, 2)\n\
-+								 cmpl %%ebx, %%eax\n\
-+								 \n\
-+								 movq %%mm1, -8(%1, %%eax, 2)\n\
-+								 jnz sum\n\
-+								 xorl %%eax, %%eax\n\
-+								 \n\
-+								 addl %2, %0\n\
-+								 decl %%edx\n\
-+								 \n\
-+								 leal (%1, %2, 4), %1\n\
-+								 jnz sum\n\
-+								 emms\n\
- 								 popa"
- 			:
- 			: "S"(dx_buffer), "D"(g_pDDSPrimary->pixels), "c"(g_pDDSPrimary->pitch>>1), "d"(144));
- 		break;
- 		
- 		case 3:
--			__asm__ __volatile__("pusha
--								 xorl %%eax, %%eax
--								 movl $896, %%ebx 
--								 emms
--								 sum3:
--								 movq (%0, %%eax, 1), %%mm0
--								 movq %%mm0, %%mm1
--								 punpcklwd %%mm0, %%mm0
--								 addl $8, %%eax
--								 punpckhwd %%mm1,%%mm1
--								 movq %%mm0, -16(%1, %%eax, 2)
--								 cmpl %%ebx, %%eax
--								 
--								 movq %%mm1, -8(%1, %%eax, 2)
--								 jnz sum3
--								 xorl %%eax, %%eax
--								 
--								 addl %2, %0
--								 decl %%edx
--								 
--								 leal (%1, %2, 4), %1
--								 jnz sum3
--								 emms
-+			__asm__ __volatile__("pusha\n\
-+								 xorl %%eax, %%eax\n\
-+								 movl $896, %%ebx \n\
-+								 emms\n\
-+								 sum3:\n\
-+								 movq (%0, %%eax, 1), %%mm0\n\
-+								 movq %%mm0, %%mm1\n\
-+								 punpcklwd %%mm0, %%mm0\n\
-+								 addl $8, %%eax\n\
-+								 punpckhwd %%mm1,%%mm1\n\
-+								 movq %%mm0, -16(%1, %%eax, 2)\n\
-+								 cmpl %%ebx, %%eax\n\
-+								 \n\
-+								 movq %%mm1, -8(%1, %%eax, 2)\n\
-+								 jnz sum3\n\
-+								 xorl %%eax, %%eax\n\
-+								 \n\
-+								 addl %2, %0\n\
-+								 decl %%edx\n\
-+								 \n\
-+								 leal (%1, %2, 4), %1\n\
-+								 jnz sum3\n\
-+								 emms\n\
- 								 popa"
- 			:
- 			: "S"(dx_buffer), "D"(g_pDDSPrimary->pixels), "c"(g_pDDSPrimary->pitch>>1), "d"(144));
-@@ -418,65 +418,65 @@ void UpdateFrame_v()
- {
- 	switch(fBlitterMode) {
- 		case 1:
--			__asm__ __volatile__(".align 32
--							 cld
--							 rep
-+			__asm__ __volatile__(".align 32\n\
-+							 cld\n\
-+							 rep\n\
- 							 movsw"
- 							 :
- 							 :"S"(dx_buffer), "D"(g_pDDSPrimary->pixels), "c"((g_pDDSPrimary->h * g_pDDSPrimary->pitch)>>1));
- 		break;
- 		case 2: // double scanlines
--			__asm__ __volatile__("pusha
--								 xorl %%eax, %%eax
--								 movl $288, %%ebx 
--								 emms
--								 sumb:
--								 movq (%0, %%eax, 1), %%mm0
--								 movq %%mm0, %%mm1
--								 punpcklwd %%mm0, %%mm0
--								 addl $8, %%eax
--								 punpckhwd %%mm1,%%mm1
--								 movq %%mm0, -16(%1, %%eax, 2)
--								 cmpl %%ebx, %%eax
--								 
--								 movq %%mm1, -8(%1, %%eax, 2)
--								 jnz sumb
--								 xorl %%eax, %%eax
--								 
--								 addl %2, %0
--								 decl %%edx
--								 
--								 leal (%1, %2, 4), %1
--								 jnz sumb
--								 emms
-+			__asm__ __volatile__("pusha\n\
-+								 xorl %%eax, %%eax\n\
-+								 movl $288, %%ebx \n\
-+								 emms\n\
-+								 sumb:\n\
-+								 movq (%0, %%eax, 1), %%mm0\n\
-+								 movq %%mm0, %%mm1\n\
-+								 punpcklwd %%mm0, %%mm0\n\
-+								 addl $8, %%eax\n\
-+								 punpckhwd %%mm1,%%mm1\n\
-+								 movq %%mm0, -16(%1, %%eax, 2)\n\
-+								 cmpl %%ebx, %%eax\n\
-+								 \n\
-+								 movq %%mm1, -8(%1, %%eax, 2)\n\
-+								 jnz sumb\n\
-+								 xorl %%eax, %%eax\n\
-+								 \n\
-+								 addl %2, %0\n\
-+								 decl %%edx\n\
-+								 \n\
-+								 leal (%1, %2, 4), %1\n\
-+								 jnz sumb\n\
-+								 emms\n\
- 								 popa"
- 			:
- 			: "S"(dx_buffer), "D"(g_pDDSPrimary->pixels), "c"(g_pDDSPrimary->pitch>>1), "d"(224));
- 		break;
- 		case 3: // double stretch mode
--			__asm__ __volatile__("pusha
--								 xorl %%eax, %%eax
--								 movl $576, %%ebx 
--								 emms
--								 sumc:
--								 movq (%0, %%eax, 1), %%mm0
--								 movq %%mm0, %%mm1
--								 punpcklwd %%mm0, %%mm0
--								 addl $8, %%eax
--								 punpckhwd %%mm1,%%mm1
--								 movq %%mm0, -16(%1, %%eax, 2)
--								 cmpl %%ebx, %%eax
--								 
--								 movq %%mm1, -8(%1, %%eax, 2)
--								 jnz sumc
--								 xorl %%eax, %%eax
--								 
--								 addl %2, %0
--								 decl %%edx
--								 
--								 leal (%1, %2, 4), %1
--								 jnz sumc
--								 emms
-+			__asm__ __volatile__("pusha\n\
-+								 xorl %%eax, %%eax\n\
-+								 movl $576, %%ebx \n\
-+								 emms\n\
-+								 sumc:\n\
-+								 movq (%0, %%eax, 1), %%mm0\n\
-+								 movq %%mm0, %%mm1\n\
-+								 punpcklwd %%mm0, %%mm0\n\
-+								 addl $8, %%eax\n\
-+								 punpckhwd %%mm1,%%mm1\n\
-+								 movq %%mm0, -16(%1, %%eax, 2)\n\
-+								 cmpl %%ebx, %%eax\n\
-+								 \n\
-+								 movq %%mm1, -8(%1, %%eax, 2)\n\
-+								 jnz sumc\n\
-+								 xorl %%eax, %%eax\n\
-+								 \n\
-+								 addl %2, %0\n\
-+								 decl %%edx\n\
-+								 \n\
-+								 leal (%1, %2, 4), %1\n\
-+								 jnz sumc\n\
-+								 emms\n\
- 								 popa"
- 			:
- 			: "S"(dx_buffer), "D"(g_pDDSPrimary->pixels), "c"(g_pDDSPrimary->pitch>>1), "d"(224));
diff --git a/emulators/Cygne-SDL/patches/patch-ad b/emulators/Cygne-SDL/patches/patch-ad
deleted file mode 100644
index 5745c3cc387..00000000000
--- a/emulators/Cygne-SDL/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/11/03 21:38:04 rillig Exp $
-
---- src/zlib/unzip.h.orig	2002-03-21 19:42:46.000000000 +0100
-+++ src/zlib/unzip.h
-@@ -49,6 +49,10 @@ extern "C" {
- #include "zlib.h"
- #endif
- 
-+#ifndef OF
-+#define OF(a)	a
-+#endif
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
-     from (void*) without cast */
diff --git a/emulators/DatLib/DESCR b/emulators/DatLib/DESCR
deleted file mode 100644
index 66159b1c83c..00000000000
--- a/emulators/DatLib/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-DatLib is a library for emulation data file formats.  It supports
-a variety of data file formats and handles the standard loading,
-cleansing, converting and saving operations that are required by
-tools such as DatUtil, MAMEDiff, ROMBuild, ROMInfo and ZipIdent.
diff --git a/emulators/DatLib/Makefile b/emulators/DatLib/Makefile
deleted file mode 100644
index 6ebdde94203..00000000000
--- a/emulators/DatLib/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2007/02/26 00:00:32 wiz Exp $
-#
-
-DISTNAME=		datlib220
-PKGNAME=		DatLib-2.20
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.logiqx.com/Tools/DatLib/
-EXTRACT_SUFX=		.zip
-
-MAINTAINER=		wiz@NetBSD.org
-HOMEPAGE=		http://www.logiqx.com/Tools/DatLib/DatLib.php
-COMMENT=		Data file library for some emulation tools
-
-USE_TOOLS+=		gmake
-WRKSRC=			${WRKDIR}
-MAKE_FILE=		makefile
-BUILD_TARGET=		datlib
-EXTRACT_OPTS_ZIP=	-Laaqo
-
-MAKE_ENV+=		RANLIB=${RANLIB:Q}
-INSTALLATION_DIRS=	lib
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/include/DatLib
-	${INSTALL_DATA_DIR} ${PREFIX}/include/DatLib/hash
-	${INSTALL_DATA_DIR} ${PREFIX}/include/DatLib/mame
-	${INSTALL_DATA_DIR} ${PREFIX}/include/DatLib/misc
-	${INSTALL_DATA} ${WRKSRC}/src/*.h ${PREFIX}/include/DatLib
-	${INSTALL_DATA} ${WRKSRC}/src/hash/*.h ${PREFIX}/include/DatLib/hash
-	${INSTALL_DATA} ${WRKSRC}/src/mame/*.h ${PREFIX}/include/DatLib/mame
-	${INSTALL_DATA} ${WRKSRC}/src/misc/*.h ${PREFIX}/include/DatLib/misc
-	${INSTALL_LIB} ${WRKSRC}/obj/libdatlib.a ${PREFIX}/lib/libdatlib.a
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/DatLib
-	${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/doc/DatLib
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/DatLib/PLIST b/emulators/DatLib/PLIST
deleted file mode 100644
index 542eb358b16..00000000000
--- a/emulators/DatLib/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/19 21:42:46 wiz Exp $
-include/DatLib/datlib.h
-include/DatLib/driver.h
-include/DatLib/hash/md5.h
-include/DatLib/hash/sha1.h
-include/DatLib/macro.h
-include/DatLib/mame/mame.h
-include/DatLib/mame/osd_cpu.h
-include/DatLib/mame/unzip.h
-include/DatLib/misc/getopt.h
-include/DatLib/token.h
-include/DatLib/type.h
-lib/libdatlib.a
-share/doc/DatLib/readme.txt
-share/doc/DatLib/whatsnew.txt
-@dirrm share/doc/DatLib
-@dirrm include/DatLib/hash
-@dirrm include/DatLib/mame
-@dirrm include/DatLib/misc
-@dirrm include/DatLib
diff --git a/emulators/DatLib/buildlink3.mk b/emulators/DatLib/buildlink3.mk
deleted file mode 100644
index 191e32785c0..00000000000
--- a/emulators/DatLib/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2007/02/26 00:00:32 wiz Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DATLIB_BUILDLINK3_MK:=	${DATLIB_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	DatLib
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NDatLib}
-BUILDLINK_PACKAGES+=	DatLib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}DatLib
-
-.if !empty(DATLIB_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.DatLib+=	DatLib>=2.20
-BUILDLINK_PKGSRCDIR.DatLib?=	../../emulators/DatLib
-.endif	# DATLIB_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/emulators/DatLib/distinfo b/emulators/DatLib/distinfo
deleted file mode 100644
index 5112618339d..00000000000
--- a/emulators/DatLib/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.12 2007/02/26 00:00:32 wiz Exp $
-
-SHA1 (datlib220.zip) = 05281aa81ea9130ba5b8b7ad029fada0369e69e0
-RMD160 (datlib220.zip) = a74f33b6bbc5c6c93557315efec448a4f2417506
-Size (datlib220.zip) = 95340 bytes
-SHA1 (patch-aa) = 58052a8c72989212d83081691f685574af6b40d4
-SHA1 (patch-ab) = e01959114bafc63ae29fcde587b507f67e1c69b2
-SHA1 (patch-ac) = 55d7c856fc86aa40e625bcbde401b2c66b1d5b0c
diff --git a/emulators/DatLib/patches/patch-aa b/emulators/DatLib/patches/patch-aa
deleted file mode 100644
index 3dec2b0490d..00000000000
--- a/emulators/DatLib/patches/patch-aa
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/02/26 00:00:32 wiz Exp $
-
---- makefile.orig	2007-01-01 18:13:12.000000000 +0000
-+++ makefile
-@@ -5,20 +5,20 @@
- MD=mkdir
- 
- CC=@gcc
--CFLAGS+=-Wall -O3 -I $(LOGIQX)/dev
-+CFLAGS+=-Wall -O3 -I .
- 
- LD=@gcc
- LIBS+=-lz -lm
- 
- UPX=@upx -9
- 
--DLSRC=$(LOGIQX)/dev/datlib/src
-+DLSRC=./src
- 
- DLINCS=	$(DLSRC)/macro.h \
- 	$(DLSRC)/type.h \
- 	$(DLSRC)/token.h \
- 
--DLOBJ=$(LOGIQX)/dev/datlib/obj
-+DLOBJ=./obj
- 
- DLOBJDIRS=$(DLOBJ) \
- 	$(DLOBJ)/drv \
-@@ -42,7 +42,7 @@ DLOBJS=	$(DLOBJ)/datlib.o \
- # Build the obj tree then build the EXE
- #
- 
--datlib: dlmaketree $(DLOBJS)
-+datlib: dlmaketree $(DLOBJS) $(DLOBJ)/libdatlib.a
- 
- #
- # Creating obj directory tree
-@@ -53,6 +53,10 @@ dlmaketree: $(sort $(DLOBJDIRS))
- $(sort $(DLOBJDIRS)):
- 	$(MD) $@
- 
-+$(DLOBJ)/libdatlib.a: $(DLOBJS)
-+	@echo Creating $@...
-+	$(AR) r $@ $(DLOBJS)
-+	$(RANLIB) $@
- #
- # Compiling of separate modules
- #
diff --git a/emulators/DatLib/patches/patch-ab b/emulators/DatLib/patches/patch-ab
deleted file mode 100644
index 85deae47fc1..00000000000
--- a/emulators/DatLib/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/11/08 16:56:46 tv Exp $
-
---- src/token.h.orig	2005-03-08 22:22:26.000000000 -0500
-+++ src/token.h
-@@ -7,7 +7,9 @@
- /* --- Standard includes --- */
- 
- #include <string.h>
-+#ifndef __INTERIX
- #include <stdint.h>
-+#endif
- 
- 
- /* --- Token structure (the description field is used by the directory scan and for debugging output) --- */
diff --git a/emulators/DatLib/patches/patch-ac b/emulators/DatLib/patches/patch-ac
deleted file mode 100644
index f6070e31723..00000000000
--- a/emulators/DatLib/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/11/08 16:56:46 tv Exp $
-
---- src/type.h.orig	2005-02-21 21:57:16.000000000 -0500
-+++ src/type.h
-@@ -8,7 +8,9 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#ifndef __INTERIX
- #include <stdint.h>
-+#endif
- 
- 
- /* --- DatLib Includes --- */
diff --git a/emulators/DatUtil/DESCR b/emulators/DatUtil/DESCR
deleted file mode 100644
index 1cc23549303..00000000000
--- a/emulators/DatUtil/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-DatUtil was created to aid in the creation of dat files for Rom
-Managers such as ClrMamePro and RomCenter (Roman Scherzer / Eric
-Bole-Feysot). It can convert between formats, extract individual
-games (and optionally their clones) and cleanse dats. It supports
-a variety of formats.
diff --git a/emulators/DatUtil/Makefile b/emulators/DatUtil/Makefile
deleted file mode 100644
index cfd3704426f..00000000000
--- a/emulators/DatUtil/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2007/02/26 00:00:42 wiz Exp $
-#
-
-DISTNAME=		dutil231
-PKGNAME=		DatUtil-2.31
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.logiqx.com/Tools/DatUtil/
-EXTRACT_SUFX=		.zip
-
-MAINTAINER=		wiz@NetBSD.org
-HOMEPAGE=		http://www.logiqx.com/Tools/DatUtil/DatUtil.php
-COMMENT=		Create and convert emulator rom checksum files
-
-USE_TOOLS+=		gmake
-WRKSRC=			${WRKDIR}
-MAKE_FILE=		makefile
-BUILD_TARGET=		datutil
-EXTRACT_OPTS_ZIP=	-Laaqo
-
-INSTALLATION_DIRS=	bin
-
-post-extract:
-	${MKDIR} ${WRKSRC}/obj
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/datutil ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/DatUtil
-	${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/doc/DatUtil
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../emulators/DatLib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/DatUtil/PLIST b/emulators/DatUtil/PLIST
deleted file mode 100644
index 63dab2db4d7..00000000000
--- a/emulators/DatUtil/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/19 21:43:08 wiz Exp $
-bin/datutil
-share/doc/DatUtil/readme.txt
-share/doc/DatUtil/whatsnew.txt
-@dirrm share/doc/DatUtil
diff --git a/emulators/DatUtil/distinfo b/emulators/DatUtil/distinfo
deleted file mode 100644
index f8e2529498a..00000000000
--- a/emulators/DatUtil/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.12 2007/02/26 00:00:42 wiz Exp $
-
-SHA1 (dutil231.zip) = 4b7aae37c862f26e763ca45a6c749622a02531fe
-RMD160 (dutil231.zip) = 28b32f1a988c75befedfa9b5c6bb42084c02c11b
-Size (dutil231.zip) = 182806 bytes
-SHA1 (patch-aa) = a6f3eee2549bc795bdf16b3672ec770ee16794a0
-SHA1 (patch-ab) = 2926b8e6dda83ca30e20de6f27933a318a2db404
diff --git a/emulators/DatUtil/patches/patch-aa b/emulators/DatUtil/patches/patch-aa
deleted file mode 100644
index 76e13364735..00000000000
--- a/emulators/DatUtil/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/03/14 16:20:58 wiz Exp $
-
---- makefile.orig	2004-07-01 16:25:16.000000000 +0200
-+++ makefile
-@@ -3,7 +3,7 @@
- #
- 
- NAME=datutil
--EXT=.exe
-+EXT=
- EXE=$(NAME)$(EXT)
- 
- SRC=src
-@@ -18,9 +18,10 @@ OBJS=	$(DLOBJS) \
- # Build the obj tree then build the EXE
- #
- 
--all: dlmaketree maketree $(EXE)
-+all: maketree $(EXE)
- 
--include $(LOGIQX)/dev/datlib/makefile
-+DLSRC=	$(PREFIX)/include/DatLib
-+CFLAGS+=	-I src -I $(PREFIX)/include
- 
- #
- # Creating obj directory tree
-@@ -45,8 +46,7 @@ $(OBJ)/%.o: $(SRC)/%.c $(SRC)/%.h $(DLSR
- 
- $(EXE): $(OBJS)
- 	@echo Linking $@...
--	$(LD) $(OBJS) $(LIBS) -o $@
--	$(UPX) $@
-+	$(CC) $(OBJS) $(LIBS) -o $@ -ldatlib -lm -lz
- 
- #
- # Complete removal of built objects
diff --git a/emulators/DatUtil/patches/patch-ab b/emulators/DatUtil/patches/patch-ab
deleted file mode 100644
index daa22e55b22..00000000000
--- a/emulators/DatUtil/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/03/14 16:20:58 wiz Exp $
-
---- src/datutil.c.orig	2005-02-22 21:04:44.000000000 +0100
-+++ src/datutil.c
-@@ -21,13 +21,13 @@
- 
- /* --- Dat library includes --- */
- 
--#include "datlib/src/datlib.h"
--#include "datlib/src/macro.h"
-+#include <DatLib/datlib.h>
-+#include <DatLib/macro.h>
- 
- 
- /* --- Misc library includes --- */
- 
--#include "datlib/src/misc/getopt.h"
-+#include <DatLib/misc/getopt.h>
- 
- 
- /* --- DatUtil definitions and macros --- */
diff --git a/emulators/MAMEDiff/DESCR b/emulators/MAMEDiff/DESCR
deleted file mode 100644
index a57e2308d0b..00000000000
--- a/emulators/MAMEDiff/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-MAMEDiff makes it easy to identify ROM related changes in a new
-release of MAME (it can even find game additions that aren't
-mentioned in whatsnew.txt). It can spot game renames and will not
-regard them as one game deleted and another added. When ROMs or
-games are renamed (or if there is a change in the way that sets
-are merged), MAMEDiff will just tell you how to rebuild the affected
-sets (i.e. no downloading required). A must-have for any MAME
-fanatic! It also works for new releases of MESS, RAINE, Final Burn
-Alpha, Kawaks, etc.
diff --git a/emulators/MAMEDiff/Makefile b/emulators/MAMEDiff/Makefile
deleted file mode 100644
index 41efca8c9f4..00000000000
--- a/emulators/MAMEDiff/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2007/02/26 00:00:56 wiz Exp $
-#
-
-DISTNAME=		mdiff226
-PKGNAME=		MAMEDiff-2.26
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.logiqx.com/Tools/MAMEDiff/
-EXTRACT_SUFX=		.zip
-
-MAINTAINER=		wiz@NetBSD.org
-HOMEPAGE=		http://www.logiqx.com/Tools/MAMEDiff/MAMEDiff.php
-COMMENT=		Compare MAME rom sets of different releases
-
-USE_TOOLS+=		gmake
-WRKSRC=			${WRKDIR}
-MAKE_FILE=		makefile
-BUILD_TARGET=		mamediff
-EXTRACT_OPTS_ZIP=	-Laaqo
-INSTALLATION_DIRS=	bin
-
-post-extract:
-	${MKDIR} ${WRKSRC}/obj
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mamediff ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/MAMEDiff
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/MAMEDiff
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../emulators/DatLib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/MAMEDiff/PLIST b/emulators/MAMEDiff/PLIST
deleted file mode 100644
index bf34cebc872..00000000000
--- a/emulators/MAMEDiff/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2007/02/26 00:00:56 wiz Exp $
-bin/mamediff
-share/doc/MAMEDiff/readme.txt
-@dirrm share/doc/MAMEDiff
diff --git a/emulators/MAMEDiff/distinfo b/emulators/MAMEDiff/distinfo
deleted file mode 100644
index 59956259101..00000000000
--- a/emulators/MAMEDiff/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.8 2007/02/26 00:00:56 wiz Exp $
-
-SHA1 (mdiff226.zip) = 498819c346210e8ff80b80ca0d777e115253540d
-RMD160 (mdiff226.zip) = bc8b90c4ed7c3a56db753b6ffd437e0ee4d3c901
-Size (mdiff226.zip) = 202186 bytes
-SHA1 (patch-aa) = da1422224efb2c332b2a4d1117f6b3184535cebe
-SHA1 (patch-ab) = 0558a1b50e869a40e5268ba567b0a6c23e354c07
-SHA1 (patch-ac) = d5095a349590a9f2a96173b973a9bec78f9fdd4f
-SHA1 (patch-ad) = 878633f71e1cab024801937307bd30e880a72eb0
diff --git a/emulators/MAMEDiff/patches/patch-aa b/emulators/MAMEDiff/patches/patch-aa
deleted file mode 100644
index 6fa5bc0dc44..00000000000
--- a/emulators/MAMEDiff/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/03/14 16:20:58 wiz Exp $
-
---- makefile.orig	2005-02-24 23:39:38.000000000 +0100
-+++ makefile
-@@ -3,7 +3,7 @@
- #
- 
- NAME=mamediff
--EXT=.exe
-+EXT=
- EXE=$(NAME)$(EXT)
- 
- SRC=src
-@@ -20,9 +20,10 @@ OBJS=	$(DLOBJS) \
- # Build the obj tree then build the EXE
- #
- 
--all: dlmaketree maketree $(EXE)
-+all: maketree $(EXE)
- 
--include $(LOGIQX)/dev/datlib/makefile
-+DLSRC=	$(PREFIX)/include/DatLib
-+CFLAGS+=	-I src -I $(PREFIX)/include
- 
- #
- # Creating obj directory tree
-@@ -51,8 +52,7 @@ $(OBJ)/%.o: $(SRC)/%.c $(SRC)/%.h $(SRC)
- 
- $(EXE): $(OBJS)
- 	@echo Linking $@...
--	$(LD) $(OBJS) $(LIBS) -o $@
--	$(UPX) $@
-+	$(CC) $(OBJS) $(LIBS) -o $@ -ldatlib -lm -lz
- 
- #
- # Complete removal of built objects
diff --git a/emulators/MAMEDiff/patches/patch-ab b/emulators/MAMEDiff/patches/patch-ab
deleted file mode 100644
index 869beb149b0..00000000000
--- a/emulators/MAMEDiff/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/03/14 16:20:58 wiz Exp $
-
---- src/mamediff.c.orig	2005-02-28 19:12:48.000000000 +0100
-+++ src/mamediff.c
-@@ -19,12 +19,12 @@
- 
- /* --- Dat library includes --- */
- 
--#include "datlib/src/datlib.h"
-+#include <DatLib/datlib.h>
- 
- 
- /* --- Misc library includes --- */
- 
--#include "datlib/src/misc/getopt.h"
-+#include <DatLib/misc/getopt.h>
- 
- 
- /* --- MAMEDiff definitions and macros --- */
diff --git a/emulators/MAMEDiff/patches/patch-ac b/emulators/MAMEDiff/patches/patch-ac
deleted file mode 100644
index abc0c19fbcb..00000000000
--- a/emulators/MAMEDiff/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/03/14 16:20:58 wiz Exp $
-
---- src/compare.c.orig	2005-02-20 16:08:38.000000000 +0100
-+++ src/compare.c
-@@ -15,8 +15,8 @@
- 
- /* --- Dat library includes --- */
- 
--#include "datlib/src/datlib.h"
--#include "datlib/src/macro.h"
-+#include "DatLib/datlib.h"
-+#include "DatLib/macro.h"
- 
- 
- /* --- MAMEDiff definitions and macros --- */
diff --git a/emulators/MAMEDiff/patches/patch-ad b/emulators/MAMEDiff/patches/patch-ad
deleted file mode 100644
index f073e5c7d96..00000000000
--- a/emulators/MAMEDiff/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/03/14 16:20:58 wiz Exp $
-
---- src/generate.c.orig	2005-02-13 16:11:00.000000000 +0100
-+++ src/generate.c
-@@ -15,8 +15,8 @@
- 
- /* --- Dat library includes --- */
- 
--#include "datlib/src/datlib.h"
--#include "datlib/src/macro.h"
-+#include "DatLib/datlib.h"
-+#include "DatLib/macro.h"
- 
- 
- /* --- MAMEDiff definitions and macros --- */
diff --git a/emulators/Makefile b/emulators/Makefile
deleted file mode 100644
index 86af35b5953..00000000000
--- a/emulators/Makefile
+++ /dev/null
@@ -1,154 +0,0 @@
-# $NetBSD: Makefile,v 1.158 2007/03/21 16:11:26 tron Exp $
-#
-
-COMMENT=	Emulators for other operating systems
-
-SUBDIR+=	BasiliskII
-SUBDIR+=	Cygne-SDL
-SUBDIR+=	DatLib
-SUBDIR+=	DatUtil
-SUBDIR+=	MAMEDiff
-SUBDIR+=	NeoPop-SDL
-SUBDIR+=	ROMBuild
-SUBDIR+=	ROMInfo
-SUBDIR+=	ZIPIdent
-SUBDIR+=	aliados
-SUBDIR+=	applyppf
-SUBDIR+=	aranym
-SUBDIR+=	arcem
-SUBDIR+=	arnold
-SUBDIR+=	atari800
-SUBDIR+=	blinkensim
-SUBDIR+=	bochs
-SUBDIR+=	ckmame
-SUBDIR+=	compat12
-SUBDIR+=	compat13
-SUBDIR+=	compat14
-SUBDIR+=	compat14-crypto
-SUBDIR+=	compat16
-SUBDIR+=	cygwin_esound
-SUBDIR+=	cygwin_lib
-SUBDIR+=	darcnes
-SUBDIR+=	darwin_lib
-SUBDIR+=	dega
-SUBDIR+=	dgen
-SUBDIR+=	dosbox
-SUBDIR+=	doscmd
-SUBDIR+=	e-uae
-SUBDIR+=	fceu
-SUBDIR+=	fmsx
-SUBDIR+=	freebsd_lib
-SUBDIR+=	fuse
-SUBDIR+=	fuse-utils
-SUBDIR+=	gcube
-SUBDIR+=	generator
-SUBDIR+=	generator-cbiere
-SUBDIR+=	gens
-SUBDIR+=	gnuboy
-SUBDIR+=	gnuboy-sdl
-SUBDIR+=	gpsim
-SUBDIR+=	gpsim-devel
-SUBDIR+=	gpsim-oscilloscope
-SUBDIR+=	gpsim-ptyusart
-SUBDIR+=	gxemul
-SUBDIR+=	hatari
-SUBDIR+=	hercules
-SUBDIR+=	hercules-images
-SUBDIR+=	ia64sim
-SUBDIR+=	kenigma
-SUBDIR+=	libspectrum
-SUBDIR+=	linuxppc_lib
-SUBDIR+=	lrmi
-SUBDIR+=	m1
-SUBDIR+=	makeppf
-SUBDIR+=	minivmac
-SUBDIR+=	mmix
-SUBDIR+=	netbsd32_compat14
-SUBDIR+=	netbsd32_compat15
-SUBDIR+=	netbsd32_compat16
-SUBDIR+=	openmsx
-SUBDIR+=	or1ksim
-SUBDIR+=	osf1_lib
-SUBDIR+=	p11
-SUBDIR+=	palmosemulator
-SUBDIR+=	pcemu
-SUBDIR+=	peace
-SUBDIR+=	pearpc
-SUBDIR+=	qemu
-SUBDIR+=	raine
-SUBDIR+=	simh
-SUBDIR+=	simulavr
-SUBDIR+=	ski
-SUBDIR+=	sms_sdl
-SUBDIR+=	snes9x
-SUBDIR+=	spim
-SUBDIR+=	stella
-SUBDIR+=	suse100_aspell
-SUBDIR+=	suse100_base
-SUBDIR+=	suse100_compat
-SUBDIR+=	suse100_expat
-SUBDIR+=	suse100_fontconfig
-SUBDIR+=	suse100_freetype2
-SUBDIR+=	suse100_gdk-pixbuf
-SUBDIR+=	suse100_glx
-SUBDIR+=	suse100_gtk
-SUBDIR+=	suse100_gtk2
-SUBDIR+=	suse100_libcups
-SUBDIR+=	suse100_libjpeg
-SUBDIR+=	suse100_libpng
-SUBDIR+=	suse100_libtiff
-SUBDIR+=	suse100_libxml2
-#SUBDIR+=	suse100_linux		# only contains Makefile fragments
-SUBDIR+=	suse100_locale
-SUBDIR+=	suse100_openmotif
-SUBDIR+=	suse100_openssl
-SUBDIR+=	suse100_slang
-SUBDIR+=	suse100_vmware
-SUBDIR+=	suse100_x11
-SUBDIR+=	suse91_aspell
-SUBDIR+=	suse91_base
-SUBDIR+=	suse91_compat
-SUBDIR+=	suse91_expat
-SUBDIR+=	suse91_fontconfig
-SUBDIR+=	suse91_freetype2
-SUBDIR+=	suse91_gdk-pixbuf
-SUBDIR+=	suse91_glx
-SUBDIR+=	suse91_gtk
-SUBDIR+=	suse91_gtk2
-SUBDIR+=	suse91_libjpeg
-SUBDIR+=	suse91_libpng
-SUBDIR+=	suse91_libtiff
-#SUBDIR+=	suse91_linux		# only contains Makefile fragments
-SUBDIR+=	suse91_locale
-SUBDIR+=	suse91_openmotif
-SUBDIR+=	suse91_slang
-SUBDIR+=	suse91_vmware
-SUBDIR+=	suse91_x11
-#SUBDIR+=	suse_linux		# only contains Makefile fragments
-SUBDIR+=	swarm
-SUBDIR+=	tme
-SUBDIR+=	tuxnes
-SUBDIR+=	twin
-SUBDIR+=	uae
-SUBDIR+=	ucon64
-SUBDIR+=	uips
-SUBDIR+=	vba
-SUBDIR+=	vice
-SUBDIR+=	vmips
-SUBDIR+=	vmware
-SUBDIR+=	vmware-module
-SUBDIR+=	vmware-module3
-SUBDIR+=	vmware3
-SUBDIR+=	wine
-SUBDIR+=	x48
-SUBDIR+=	xbeeb
-SUBDIR+=	xcopilot
-SUBDIR+=	xm7
-SUBDIR+=	xmame
-SUBDIR+=	xmess
-SUBDIR+=	xtrs
-SUBDIR+=	xyame
-SUBDIR+=	z26
-SUBDIR+=	zsnes
-
-.include "../mk/bsd.pkg.subdir.mk"
diff --git a/emulators/NeoPop-SDL/DESCR b/emulators/NeoPop-SDL/DESCR
deleted file mode 100644
index cbef6e086ce..00000000000
--- a/emulators/NeoPop-SDL/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-NeoPop-SDL is the SDL port of NeoPop, a portable NeoGeo Pocket
-emulator.  It supports black&white and color games, game state saving,
-screenshots (BMP and PNG), sound and music, double- and
-triple-size both in software and hardware scaling as well as
-full-screen-modes, joysticks and keyboard input, and reading from
-ZIP files.
diff --git a/emulators/NeoPop-SDL/Makefile b/emulators/NeoPop-SDL/Makefile
deleted file mode 100644
index a5f18b3aa4a..00000000000
--- a/emulators/NeoPop-SDL/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/06/12 16:28:06 wiz Exp $
-#
-
-DISTNAME=		NeoPop-SDL-0.2
-PKGREVISION=		6
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.nih.at/NeoPop-SDL/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		wiz@NetBSD.org
-HOMEPAGE=		http://www.nih.at/NeoPop-SDL/
-COMMENT=		SNK NeoGeo Pocket emulator
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-png=${BUILDLINK_PREFIX.png}
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/NeoPop-SDL/PLIST b/emulators/NeoPop-SDL/PLIST
deleted file mode 100644
index 8646743ccf8..00000000000
--- a/emulators/NeoPop-SDL/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/07/25 12:27:46 wiz Exp $
-bin/NeoPop-SDL
-man/man5/neopoprc.5
-man/man6/NeoPop-SDL.6
-share/doc/NeoPop-SDL/TODO
-share/doc/NeoPop-SDL/bugs-core.html
-@dirrm share/doc/NeoPop-SDL
diff --git a/emulators/NeoPop-SDL/distinfo b/emulators/NeoPop-SDL/distinfo
deleted file mode 100644
index 1d84b42752c..00000000000
--- a/emulators/NeoPop-SDL/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 18:49:17 agc Exp $
-
-SHA1 (NeoPop-SDL-0.2.tar.bz2) = b062a9d9f031617ba14e13f265d2deb659a58240
-RMD160 (NeoPop-SDL-0.2.tar.bz2) = 48494371b074b3a336a0090b470e5f3ee6815672
-Size (NeoPop-SDL-0.2.tar.bz2) = 222287 bytes
diff --git a/emulators/ROMBuild/DESCR b/emulators/ROMBuild/DESCR
deleted file mode 100644
index 249a8c5389d..00000000000
--- a/emulators/ROMBuild/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-ROMBuild is a ROM manipulation tool that is capable of creating
-ROMs for the older arcade emus using MAME ones. An example of this
-is by splitting ROMs in two or joining two together but ROMBuild
-supports much more than this. It can can split, join, extract,
-fill, patch, pad, interleave etc but to you the user that doesn't
-really matter. The important thing is that MAME ROMs go in and ROMs
-for another emulator come out. :)
-
-When used in conjunction with the CMPro/ROMCenter dats that I have
-produced you can generate ROM sets for practically any emulator
-from MAME ROMs. In fact, the only ROMs you can't generate from MAME
-sets are where MAME doesn't support the game.
diff --git a/emulators/ROMBuild/Makefile b/emulators/ROMBuild/Makefile
deleted file mode 100644
index 6f496327ca0..00000000000
--- a/emulators/ROMBuild/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2007/02/26 00:01:05 wiz Exp $
-#
-
-DISTNAME=		rbuild28
-PKGNAME=		ROMBuild-2.8
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.logiqx.com/Tools/ROMBuild/
-EXTRACT_SUFX=		.zip
-
-MAINTAINER=		wiz@NetBSD.org
-HOMEPAGE=		http://www.logiqx.com/Tools/ROMBuild/ROMBuild.php
-COMMENT=		Arcade ROM manipulation tool
-
-USE_TOOLS+=		gmake
-WRKSRC=			${WRKDIR}
-MAKE_FILE=		makefile
-BUILD_TARGET=		rombuild
-EXTRACT_OPTS_ZIP=	-Laaqo
-INSTALLATION_DIRS=	bin
-
-post-extract:
-	${MKDIR} ${WRKSRC}/obj
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rombuild ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ROMBuild
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/ROMBuild
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../emulators/DatLib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/ROMBuild/PLIST b/emulators/ROMBuild/PLIST
deleted file mode 100644
index 15fb7db675e..00000000000
--- a/emulators/ROMBuild/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2007/02/26 00:01:05 wiz Exp $
-bin/rombuild
-share/doc/ROMBuild/readme.txt
-@dirrm share/doc/ROMBuild
diff --git a/emulators/ROMBuild/distinfo b/emulators/ROMBuild/distinfo
deleted file mode 100644
index c7955224651..00000000000
--- a/emulators/ROMBuild/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.5 2007/02/26 00:01:05 wiz Exp $
-
-SHA1 (rbuild28.zip) = 053b8d45d203b1b339b17a7f36e15288aeeb276f
-RMD160 (rbuild28.zip) = 9bb91bbdb9e1b9327b97317161f13200372963b7
-Size (rbuild28.zip) = 108040 bytes
-SHA1 (patch-aa) = c7d5a9c16c2da0a97d30c2e21d99827b3ab8f2a6
-SHA1 (patch-ab) = 1fbc4887a532d1f956875589baa8a2e0211070fc
-SHA1 (patch-ac) = 484bd715983c109f41f1d01e7150266e7c2ca4d1
diff --git a/emulators/ROMBuild/patches/patch-aa b/emulators/ROMBuild/patches/patch-aa
deleted file mode 100644
index 195f281cf31..00000000000
--- a/emulators/ROMBuild/patches/patch-aa
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/03/14 16:20:58 wiz Exp $
-
---- makefile.orig	2004-07-01 16:25:18.000000000 +0200
-+++ makefile
-@@ -3,7 +3,7 @@
- #
- 
- NAME=rombuild
--EXT=.exe
-+EXT=
- EXE=$(NAME)$(EXT)
- 
- SRC=src
-@@ -11,19 +11,17 @@ OBJ=obj
- 
- OBJDIRS=$(OBJ)
- 
--OBJS=	$(DLOBJ)/misc/getopt.o \
--	$(DLOBJ)/mame/unzip.o \
--	$(DLOBJ)/mame/msdos/msdos.o \
--	$(OBJ)/$(NAME).o \
-+OBJS=	$(OBJ)/$(NAME).o \
- 	$(OBJ)/rominfo.o
- 
- #
- # Build the obj tree then build the EXE
- #
- 
--all: dlmaketree maketree $(EXE)
-+all: maketree $(EXE)
- 
--include $(LOGIQX)/dev/datlib/makefile
-+DLSRC=	$(PREFIX)/include/DatLib
-+CFLAGS+=	-I src -I $(PREFIX)/include
- 
- #
- # Creating obj directory tree
-@@ -52,8 +50,7 @@ $(OBJ)/rominfo.o: $(SRC)/rominfo.c $(SRC
- 
- $(EXE): $(OBJS)
- 	@echo Linking $@...
--	$(LD) $(OBJS) $(LIBS) -o $@
--	$(UPX) $@
-+	$(CC) $(OBJS) $(LIBS) -o $@ -ldatlib -lm -lz
- 
- #
- # Complete removal of built objects
diff --git a/emulators/ROMBuild/patches/patch-ab b/emulators/ROMBuild/patches/patch-ab
deleted file mode 100644
index 07dc6f619b5..00000000000
--- a/emulators/ROMBuild/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/03/14 16:20:58 wiz Exp $
-
---- src/rombuild.c.orig	2005-01-30 12:19:54.000000000 +0100
-+++ src/rombuild.c
-@@ -23,13 +23,13 @@
- 
- /* --- Dat library includes --- */
- 
--#include "datlib/src/macro.h"
-+#include "DatLib/macro.h"
- 
- 
- /* --- Misc library includes --- */
- 
--#include "datlib/src/misc/getopt.h"
--#include "datlib/src/mame/unzip.h"
-+#include "DatLib/misc/getopt.h"
-+#include "DatLib/mame/unzip.h"
- 
- 
- /* --- ROMBuild definitions and macros --- */
diff --git a/emulators/ROMBuild/patches/patch-ac b/emulators/ROMBuild/patches/patch-ac
deleted file mode 100644
index 6e597d1b499..00000000000
--- a/emulators/ROMBuild/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/03/14 16:20:58 wiz Exp $
-
---- src/rombuild.h.orig	2005-01-02 22:50:32.000000000 +0100
-+++ src/rombuild.h
-@@ -6,7 +6,7 @@
- 
- /* --- Dat library includes --- */
- 
--#include "datlib/src/macro.h"
-+#include "DatLib/macro.h"
- 
- 
- /* --- Types of ROMBuild operation --- */
diff --git a/emulators/ROMInfo/DESCR b/emulators/ROMInfo/DESCR
deleted file mode 100644
index f7fd1864bdd..00000000000
--- a/emulators/ROMInfo/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-ROMInfo is for identifying arcade ROMs and checking if they are
-emulated yet.  It does this using the CMPro dats from the CAESAR
-database and should cover every arcade game emulated so far.
diff --git a/emulators/ROMInfo/Makefile b/emulators/ROMInfo/Makefile
deleted file mode 100644
index c53d6f69700..00000000000
--- a/emulators/ROMInfo/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2007/02/26 00:01:18 wiz Exp $
-#
-
-DISTNAME=		rinfo27
-PKGNAME=		ROMInfo-2.7
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.logiqx.com/Tools/ROMInfo/
-EXTRACT_SUFX=		.zip
-
-MAINTAINER=		wiz@NetBSD.org
-HOMEPAGE=		http://www.logiqx.com/Tools/ROMInfo/ROMInfo.php
-COMMENT=		Identify arcade ROM sets
-
-USE_TOOLS+=		gmake
-WRKSRC=			${WRKDIR}
-MAKE_FILE=		makefile
-BUILD_TARGET=		rominfo
-EXTRACT_OPTS_ZIP=	-Laaqo
-INSTALLATION_DIRS=	bin
-
-post-extract:
-	${MKDIR} ${WRKSRC}/obj
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rominfo ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ROMInfo
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/ROMInfo
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../emulators/DatLib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/ROMInfo/PLIST b/emulators/ROMInfo/PLIST
deleted file mode 100644
index 02b6cb261c0..00000000000
--- a/emulators/ROMInfo/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2007/02/26 00:01:18 wiz Exp $
-bin/rominfo
-share/doc/ROMInfo/readme.txt
-@dirrm share/doc/ROMInfo
diff --git a/emulators/ROMInfo/distinfo b/emulators/ROMInfo/distinfo
deleted file mode 100644
index 5966b451df3..00000000000
--- a/emulators/ROMInfo/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.5 2007/02/26 00:01:18 wiz Exp $
-
-SHA1 (rinfo27.zip) = f6ef7ac9ce30d92e646f040ee82f264ef71f59c0
-RMD160 (rinfo27.zip) = c61b42578d35e815be50e7c9077e1e728d2d72f5
-Size (rinfo27.zip) = 140306 bytes
-SHA1 (patch-aa) = 5006204b7b458068be13f0258eddf739a984f23a
-SHA1 (patch-ab) = c8667dc5c0ba3085e14b56b88d1693a5a8abf329
diff --git a/emulators/ROMInfo/patches/patch-aa b/emulators/ROMInfo/patches/patch-aa
deleted file mode 100644
index b7a71fc96d2..00000000000
--- a/emulators/ROMInfo/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/03/14 16:20:58 wiz Exp $
-
---- makefile.orig	2005-02-24 23:39:06.000000000 +0100
-+++ makefile
-@@ -3,7 +3,7 @@
- #
- 
- NAME=rominfo
--EXT=.exe
-+EXT=
- EXE=$(NAME)$(EXT)
- 
- SRC=src
-@@ -18,9 +18,10 @@ OBJS=	$(DLOBJS) \
- # Build the obj tree then build the EXE
- #
- 
--all: dlmaketree maketree $(EXE)
-+all: maketree $(EXE)
- 
--include $(LOGIQX)/dev/datlib/makefile
-+DLSRC=	$(PREFIX)/include/DatLib
-+CFLAGS+=	-I src -I $(PREFIX)/include
- 
- #
- # Creating obj directory tree
-@@ -45,8 +46,7 @@ $(OBJ)/%.o: $(SRC)/%.c $(SRC)/%.h $(DLSR
- 
- $(EXE): $(OBJS)
- 	@echo Linking $@...
--	$(LD) $(OBJS) $(LIBS) -o $@
--	$(UPX) $@
-+	$(CC) $(OBJS) $(LIBS) -o $@ -ldatlib -lm -lz
- 
- #
- # Complete removal of built objects
diff --git a/emulators/ROMInfo/patches/patch-ab b/emulators/ROMInfo/patches/patch-ab
deleted file mode 100644
index 0a4341a5e30..00000000000
--- a/emulators/ROMInfo/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/03/14 16:20:58 wiz Exp $
-
---- src/rominfo.c.orig	2005-02-28 19:17:24.000000000 +0100
-+++ src/rominfo.c
-@@ -22,14 +22,14 @@
- 
- /* --- Dat library includes --- */
- 
--#include "datlib/src/datlib.h"
--#include "datlib/src/macro.h"
-+#include "DatLib/datlib.h"
-+#include "DatLib/macro.h"
- 
- 
- /* --- Misc library includes --- */
- 
--#include "datlib/src/misc/getopt.h"
--#include "datlib/src/mame/unzip.h"
-+#include "DatLib/misc/getopt.h"
-+#include "DatLib/mame/unzip.h"
- 
- 
- /* --- ROMInfo definitions and macros --- */
diff --git a/emulators/ZIPIdent/DESCR b/emulators/ZIPIdent/DESCR
deleted file mode 100644
index bbfefa1cc06..00000000000
--- a/emulators/ZIPIdent/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-ZIPIdent has been created to assist in the management of unemulated
-or 'needed soon' ROM collections. Anyone who possesses such a
-collection (emu developers for example) may find it difficult to
-spot games that become emulated and then remove them from the
-unemulated collection. ZIPIdent will identify ZIPs that should not
-be classified unemulated and if desired will even move them out of
-the 'unemulated' collection and into a separate directory.
-
-It is quite similar to MAME's '-romident' function except for the
-fact that it processes entire ROM collections, not just an individual
-ZIP. ZIPIdent probably has some additional logic that '-romident'
-doesn't contain too (not checked).
diff --git a/emulators/ZIPIdent/Makefile b/emulators/ZIPIdent/Makefile
deleted file mode 100644
index babeb6c65ca..00000000000
--- a/emulators/ZIPIdent/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2007/02/26 00:01:30 wiz Exp $
-#
-
-DISTNAME=		zident28
-PKGNAME=		ZIPIdent-2.8
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.logiqx.com/Tools/ZIPIdent/
-EXTRACT_SUFX=		.zip
-
-MAINTAINER=		wiz@NetBSD.org
-HOMEPAGE=		http://www.logiqx.com/Tools/ZIPIdent/ZIPIdent.php
-COMMENT=		Identify arcade ROM sets
-
-USE_TOOLS+=		gmake
-WRKSRC=			${WRKDIR}
-MAKE_FILE=		makefile
-BUILD_TARGET=		zipident
-EXTRACT_OPTS_ZIP=	-Laaqo
-INSTALLATION_DIRS=	bin
-
-post-extract:
-	${MKDIR} ${WRKSRC}/obj
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/zipident ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ZIPIdent
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/ZIPIdent
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../emulators/DatLib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/ZIPIdent/PLIST b/emulators/ZIPIdent/PLIST
deleted file mode 100644
index be4cb836a54..00000000000
--- a/emulators/ZIPIdent/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2007/02/26 00:01:30 wiz Exp $
-bin/zipident
-share/doc/ZIPIdent/readme.txt
-@dirrm share/doc/ZIPIdent
diff --git a/emulators/ZIPIdent/distinfo b/emulators/ZIPIdent/distinfo
deleted file mode 100644
index c35d2e4c560..00000000000
--- a/emulators/ZIPIdent/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.5 2007/02/26 00:01:30 wiz Exp $
-
-SHA1 (zident28.zip) = a530170234564665a179b31da2c634387f03d114
-RMD160 (zident28.zip) = f712115c1fc9001d2819f450c788e8e99be5bbdb
-Size (zident28.zip) = 148166 bytes
-SHA1 (patch-aa) = 2718a0187b02e57001d9f6f8e9b3b5c1760daea6
-SHA1 (patch-ab) = 67ad17076bff44fc854a7f0b076283b4f3c135de
diff --git a/emulators/ZIPIdent/patches/patch-aa b/emulators/ZIPIdent/patches/patch-aa
deleted file mode 100644
index 2d255b6649e..00000000000
--- a/emulators/ZIPIdent/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/03/14 16:20:58 wiz Exp $
-
---- makefile.orig	2004-07-01 16:25:20.000000000 +0200
-+++ makefile
-@@ -3,7 +3,7 @@
- #
- 
- NAME=zipident
--EXT=.exe
-+EXT=
- EXE=$(NAME)$(EXT)
- 
- SRC=src
-@@ -18,9 +18,10 @@ OBJS=	$(DLOBJS) \
- # Build the obj tree then build the EXE
- #
- 
--all: dlmaketree maketree $(EXE)
-+all: maketree $(EXE)
- 
--include $(LOGIQX)/dev/datlib/makefile
-+DLSRC=	$(PREFIX)/include/DatLib
-+CFLAGS+=	-I src -I $(PREFIX)/include
- 
- #
- # Creating obj directory tree
-@@ -45,8 +46,7 @@ $(OBJ)/%.o: $(SRC)/%.c $(SRC)/%.h $(DLSR
- 
- $(EXE): $(OBJS)
- 	@echo Linking $@...
--	$(LD) $(OBJS) $(LIBS) -o $@
--	$(UPX) $@
-+	$(CC) $(OBJS) $(LIBS) -o $@ -ldatlib -lm -lz
- 
- #
- # Complete removal of built objects
diff --git a/emulators/ZIPIdent/patches/patch-ab b/emulators/ZIPIdent/patches/patch-ab
deleted file mode 100644
index 0934d2b1a07..00000000000
--- a/emulators/ZIPIdent/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/03/14 16:20:58 wiz Exp $
-
---- src/zipident.c.orig	2005-02-13 14:07:40.000000000 +0100
-+++ src/zipident.c
-@@ -21,14 +21,14 @@
- 
- /* --- Dat library includes --- */
- 
--#include "datlib/src/datlib.h"
--#include "datlib/src/macro.h"
-+#include "DatLib/datlib.h"
-+#include "DatLib/macro.h"
- 
- 
- /* --- Misc library includes --- */
- 
--#include "datlib/src/misc/getopt.h"
--#include "datlib/src/mame/unzip.h"
-+#include "DatLib/misc/getopt.h"
-+#include "DatLib/mame/unzip.h"
- 
- 
- /* --- ZipIdent definitions and macros --- */
diff --git a/emulators/aliados/DESCR b/emulators/aliados/DESCR
deleted file mode 100644
index 519b4c85626..00000000000
--- a/emulators/aliados/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Aliados is a CP/M 80 emulator that instead of emulate a machine and
-run some variant of CP/M on it, emulates only the microprocessor and
-captures all CP/M system calls to execute it natively.  Actually only
-emulates a small part of CP/M, but with that already can execute many
-programs, such as WordStar, Micrsoft Basic, Mallard Basic, Hi-Tech C,
-Turbo Pascal and many others.  Aliados does not need to create disk
-images, it reads and writes in the native filesystem all files that
-match the CP/M name conventions.
diff --git a/emulators/aliados/Makefile b/emulators/aliados/Makefile
deleted file mode 100644
index 464cc69c69b..00000000000
--- a/emulators/aliados/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:42 tv Exp $
-#
-
-DISTNAME=		aliados-0.1.1
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.arrakis.es/~ninsesabe/aliados/
-EXTRACT_SUFX=		.tgz
-
-MAINTAINER=		ivaniclixx@gmail.com
-HOMEPAGE=		http://www.arrakis.es/~ninsesabe/aliados/
-COMMENT=		CP/M 80 emulator
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-NO_CONFIGURE=		YES
-USE_LANGUAGES=		c++
-USE_NCURSES=		# tigetstr tparm setupterm
-
-INSTALLATION_DIRS=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/aliados ${PREFIX}/bin/
-
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/aliados/PLIST b/emulators/aliados/PLIST
deleted file mode 100644
index 1b454c04b60..00000000000
--- a/emulators/aliados/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/11/09 05:47:28 minskim Exp $
-bin/aliados
diff --git a/emulators/aliados/distinfo b/emulators/aliados/distinfo
deleted file mode 100644
index 437769bfb6a..00000000000
--- a/emulators/aliados/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:17 agc Exp $
-
-SHA1 (aliados-0.1.1.tgz) = adcc43f7bafc2ee11222002d03f306e8f561e3f6
-RMD160 (aliados-0.1.1.tgz) = a4a37f349937d32c1449553816de5f3d87836545
-Size (aliados-0.1.1.tgz) = 50210 bytes
-SHA1 (patch-aa) = 2347332c491796a6df2468c6c814fbf9ffa04a8d
diff --git a/emulators/aliados/patches/patch-aa b/emulators/aliados/patches/patch-aa
deleted file mode 100644
index 2201976eeb2..00000000000
--- a/emulators/aliados/patches/patch-aa
+++ /dev/null
@@ -1,115 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/11/09 05:47:28 minskim Exp $
-
---- Makefile.orig	2004-03-20 13:31:28.000000000 -0600
-+++ Makefile
-@@ -1,16 +1,17 @@
- # Makefile para aliados
- 
- # Path to ncurses required in hp-ux.
--CPPFLAGS=-W -Wall -I/opt/ncurses/include
-+#CPPFLAGS=-W -Wall -I/opt/ncurses/include
-+CPPFLAGS+=	${CXXFLAGS}
- 
- # To compile with console emulation using curses.
--LDFLAGS=-lncurses -L/opt/ncurses/lib
-+LDFLAGS+="-lncurses"
- 
- # To compile without console emulation.
- #LDFLAGS=
- #CURSESFLAGS=-DNO_CURSES
- 
--all: aliados disassemble
-+all: aliados
- 
- # If you want to build the versions with and without libz80 at the same time.
- 
-@@ -21,17 +22,17 @@ both: aliados aliadoslz disassemble
- #------------------------------------------------
- 
- aliadoslz: aliadoslz.o cpmlz.o realconsole.o cpuz.o directory.o
--	g++ $(CPPFLAGS) $(LDFLAGS) -o aliadoslz -lz80 \
-+	$(CXX) $(CPPFLAGS) $(LDFLAGS) -o aliadoslz -lz80 \
- 		aliadoslz.o cpmlz.o realconsole.o cpuz.o directory.o printer.o
- 
- aliadoslz.o: aliados.cpp cpm.h console.h realconsole.h printer.h
--	g++ $(CPPFLAGS) -o aliadoslz.o -c aliados.cpp
-+	$(CXX) $(CPPFLAGS) -o aliadoslz.o -c aliados.cpp
- 
- cpmlz.o: cpm.cpp cpm.h cpu.h console.h directory.h printer.h
--	g++ $(CPPFLAGS) -o cpmlz.o -c cpm.cpp
-+	$(CXX) $(CPPFLAGS) -o cpmlz.o -c cpm.cpp
- 
- cpuz.o: cpu.cpp cpu.h
--	g++ $(CPPFLAGS) -o cpuz.o -c cpu.cpp
-+	$(CXX) $(CPPFLAGS) -o cpuz.o -c cpu.cpp
- 
- #------------------------------------------------
- #	Version using  ImcZ80.
-@@ -41,7 +42,7 @@ cpuz.o: cpu.cpp cpu.h
- 
- # Uncomment this if you compile with ImcZ80 and with libz80.
- #aliados: aliados.o cpm.o Z80.o realconsole.o cpu.o
--#	g++ $(CPPFLAGS) $(LDFLAGS) -o aliados \
-+#	$(CXX) $(CPPFLAGS) $(LDFLAGS) -o aliados \
- #		aliados.o cpm.o realconsole.o Z80.o cpu.o \
- #		directory.o printer.o \
- #		-lz80
-@@ -50,47 +51,47 @@ cpuz.o: cpu.cpp cpu.h
- aliados: aliados.o cpm.o Z80.o realconsole.o cpu.o disasm.o \
- 		directory.o printer.o
- 
--	g++ $(CPPFLAGS) -o aliados \
-+	$(CXX) $(CPPFLAGS) -o aliados \
- 		aliados.o cpm.o realconsole.o Z80.o cpu.o \
- 		disasm.o directory.o printer.o \
- 		$(LDFLAGS)
- 
- aliados.o: aliados.cpp cpm.h console.h realconsole.h printer.h
--	g++ $(CPPFLAGS) -DUSE_ImcZ80 -c aliados.cpp
-+	$(CXX) $(CPPFLAGS) -DUSE_ImcZ80 -c aliados.cpp
- 
- cpm.o: cpm.cpp cpm.h cpu.h console.h Z80.hxx directory.h printer.h
--	g++ $(CPPFLAGS) -DUSE_ImcZ80 -c cpm.cpp
-+	$(CXX) $(CPPFLAGS) -DUSE_ImcZ80 -c cpm.cpp
- 
- cpu.o: cpu.cpp cpu.h Z80.hxx disasm.h
--	g++ $(CPPFLAGS) -DUSE_ImcZ80 -c cpu.cpp
-+	$(CXX) $(CPPFLAGS) -DUSE_ImcZ80 -c cpu.cpp
- 
- Z80.o: Z80.cxx Z80.hxx z80ops.hxx cbops.hxx edops.hxx
--	g++ -c Z80.cxx
-+	$(CXX) -c Z80.cxx
- 
- #------------------------------------------------
- #	Common to all versions.
- #------------------------------------------------
- 
- realconsole.o: realconsole.cpp realconsole.h console.h
--	g++ $(CPPFLAGS) $(CURSESFLAGS) -c realconsole.cpp
-+	$(CXX) $(CPPFLAGS) $(CURSESFLAGS) -c realconsole.cpp
- 
- disasm.o: disasm.cpp disasm.h cpu.h
--	g++ $(CPPFLAGS) -c disasm.cpp
-+	$(CXX) $(CPPFLAGS) -c disasm.cpp
- 
- directory.o: directory.cpp directory.h
--	g++ $(CPPFLAGS) -c directory.cpp
-+	$(CXX) $(CPPFLAGS) -c directory.cpp
- 
- printer.o: printer.cpp printer.h
--	g++ $(CPPFLAGS) -c printer.cpp
-+	$(CXX) $(CPPFLAGS) -c printer.cpp
- 
- # disassemble is a tiny disassembler that uses the disassemble code
- # of the debugger. Works correctly only with .COM files.
- 
- disassemble.o: disassemble.cpp cpu.h disasm.h Z80.hxx
--	g++ $(CPPFLAGS) -c disassemble.cpp
-+	$(CXX) $(CPPFLAGS) -c disassemble.cpp
- 
- disassemble: disassemble.o cpu.o disasm.o Z80.o
--	g++ $(CPPFLAGS) -o disassemble disassemble.o cpu.o disasm.o Z80.o
-+	$(CXX) $(CPPFLAGS) -o disassemble disassemble.o cpu.o disasm.o Z80.o
- 
- tgz:
- 	tar cf - Makefile *.cpp *.h *.cxx *.hxx \
diff --git a/emulators/applyppf/DESCR b/emulators/applyppf/DESCR
deleted file mode 100644
index 1683053adf0..00000000000
--- a/emulators/applyppf/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-PPF (PlayStation Patch File) is a tool dedicated to all PlayStation
-coders and developers out there who are creating PAL/NTSC patches,
-trainer options and even cracks for your favourite console system.
-With the files in the PPF package you are in the position to make
-patchfiles similar to IPS on SuperNES.
-
-This package contains a tool to apply PPF patches.
diff --git a/emulators/applyppf/Makefile b/emulators/applyppf/Makefile
deleted file mode 100644
index 1cd104bac35..00000000000
--- a/emulators/applyppf/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/18 19:56:27 wiz Exp $
-#
-
-DISTNAME=	applyppf3_src
-PKGNAME=	applyppf-3.0
-CATEGORIES=	emulators
-MASTER_SITES=	http://www.paradogs.com/download/
-EXTRACT_SUFX=	.zip
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.paradogs.com/download/
-COMMENT=	PPF (Playstation Patch File) v3.0 apply tool
-
-WRKSRC=	${WRKDIR}
-
-do-build:
-	cd ${BUILD_DIRS} && ${CC} ${CPPFLAGS} ${CFLAGS} \
-		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
-		-D_LARGEFILE64_SOURCE -o applyppf applyppf3_linux.c
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/applyppf ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/applyppf/PLIST b/emulators/applyppf/PLIST
deleted file mode 100644
index 907a50bcb33..00000000000
--- a/emulators/applyppf/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/18 19:56:27 wiz Exp $
-bin/applyppf
diff --git a/emulators/applyppf/distinfo b/emulators/applyppf/distinfo
deleted file mode 100644
index e491b80b5b8..00000000000
--- a/emulators/applyppf/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/18 19:56:27 wiz Exp $
-
-SHA1 (applyppf3_src.zip) = d80dd39b322863defdea76a1703565a7ce569b23
-RMD160 (applyppf3_src.zip) = ec06579d49ef81148233f51bbacbd3fd948bb403
-Size (applyppf3_src.zip) = 5618 bytes
-SHA1 (patch-aa) = 2e35e964870ae2843265496c6770e1d2d8733ece
diff --git a/emulators/applyppf/patches/patch-aa b/emulators/applyppf/patches/patch-aa
deleted file mode 100644
index 1a7c37c4476..00000000000
--- a/emulators/applyppf/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/03/18 19:56:27 wiz Exp $
-
---- applyppf3_linux.c.orig	2001-11-26 16:48:30.000000000 +0000
-+++ applyppf3_linux.c
-@@ -20,7 +20,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
--#if defined(__APPLE__) || defined (MACOSX)
-+#if !defined(__linux__)
- 
- //////////////////////////////////////////////////////////////////////
- // fseeko is already 64 bit for Darwin/MacOS X!
-@@ -40,7 +40,7 @@
- 
- typedef	off_t			__off64_t;
- 
--#endif /* __APPLE__ || MACOSX */
-+#endif /* __linux__ */
- 
- //////////////////////////////////////////////////////////////////////
- // Macros for little to big Endian conversion.
diff --git a/emulators/aranym/DESCR b/emulators/aranym/DESCR
deleted file mode 100644
index b89029e185a..00000000000
--- a/emulators/aranym/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-ARAnyM is an acronym: Atari Running on Any Machine. It is a virtual machine
-software for running the Atari ST/TT/Falcon operating systems (TOS, FreeMiNT,
-MagiC and others) and TOS/GEM applications on any kind of hardware - be it
-an IBM clone (read it as "PC" :-), an Apple, an Unix server, a graphics
-workstation or even a portable computer.
diff --git a/emulators/aranym/Makefile b/emulators/aranym/Makefile
deleted file mode 100644
index f95ad292431..00000000000
--- a/emulators/aranym/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2006/06/12 16:28:06 wiz Exp $
-#
-
-DISTNAME=		aranym-0.8.9beta
-PKGREVISION=		4
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=aranym/}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://aranym.sourceforge.net/
-COMMENT=		Atari Running on Any Machine
-
-USE_TOOLS+=		gmake makedepend
-USE_LANGUAGES=		c c++
-GNU_CONFIGURE=		yes
-WRKSRC=			${WRKDIR}/${DISTNAME}/src/Unix
-USE_TOOLS+=		gzip
-MANCOMPRESSED=		yes
-
-BUILD_TARGET=		# void
-
-BUILD_DEFS+=		FIXED_FASTRAM
-
-FIXED_FASTRAM?=		64 # Default value
-
-CONFIGURE_ARGS+=	--enable-fullmmu
-CONFIGURE_ARGS+=	--enable-dsp-disasm
-CONFIGURE_ARGS+=	--enable-blitsdlblit
-CONFIGURE_ARGS+=	--enable-fixedvideoram
-CONFIGURE_ARGS+=	--enable-fixedfastram=${FIXED_FASTRAM:Q}
-CONFIGURE_ARGS+=	--enable-blitmemmove
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} != "NetBSD" && ${OPSYS} != "DragonFly"
-CONFIGURE_ARGS+=	--enable-nfpci
-.endif
-
-pre-build:
-	cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} depend
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/Mesa/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/aranym/PLIST b/emulators/aranym/PLIST
deleted file mode 100644
index 1d28d357864..00000000000
--- a/emulators/aranym/PLIST
+++ /dev/null
@@ -1,47 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/06 07:28:38 xtraeme Exp $
-bin/aranym
-man/man1/aranym.1
-share/aranym/arabridge
-share/aranym/atari/aranymrc.example
-share/aranym/atari/fvdi/aranym.sys.bz2
-share/aranym/atari/fvdi/fvdi.prg.bz2
-share/aranym/atari/fvdi/fvdi.sys
-share/aranym/atari/hostfs/README
-share/aranym/atari/hostfs/bdconfig.sys
-share/aranym/atari/hostfs/hostfs.dos.bz2
-share/aranym/atari/hostfs/hostfs.xfs.bz2
-share/aranym/atari/mmusetup.cnf
-share/aranym/atari/network/README
-share/aranym/atari/network/aranym.xif.bz2
-share/aranym/atari/network/eth0-config.sh
-share/aranym/atari/network/nfeth-config.bz2
-share/aranym/atari/newdesk.inf
-share/aranym/atari/nfcdrom/nfcdrom.bos.bz2
-share/aranym/atari/sound/README
-share/aranym/atari/sound/zmagxsnd.prg.bz2
-share/aranym/atari/tools/README
-share/aranym/atari/tools/clocky.prg.bz2
-share/aranym/atari/tools/fastram.prg.bz2
-share/aranym/atari/tools/pc101us.kbd.bz2
-share/aranym/atari/tools/pcpatch.prg.bz2
-share/aranym/etos512k.img
-share/aranym/floppy.sh
-share/doc/aranym/AUTHORS
-share/doc/aranym/BUGS
-share/doc/aranym/COPYING
-share/doc/aranym/FAQ
-share/doc/aranym/INSTALL
-share/doc/aranym/NEWS
-share/doc/aranym/README
-share/doc/aranym/TODO
-share/doc/aranym/changelog
-share/doc/aranym/documentation.txt
-@dirrm share/doc/aranym
-@dirrm share/aranym/atari/tools
-@dirrm share/aranym/atari/sound
-@dirrm share/aranym/atari/nfcdrom
-@dirrm share/aranym/atari/network
-@dirrm share/aranym/atari/hostfs
-@dirrm share/aranym/atari/fvdi
-@dirrm share/aranym/atari
-@dirrm share/aranym
diff --git a/emulators/aranym/distinfo b/emulators/aranym/distinfo
deleted file mode 100644
index 6dc3cfd070b..00000000000
--- a/emulators/aranym/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/04/28 14:10:12 joerg Exp $
-
-SHA1 (aranym-0.8.9beta.tar.gz) = 509ad0e79c53ace176a8acef2fb2a4f23fa87d69
-RMD160 (aranym-0.8.9beta.tar.gz) = b0b994d672f6be530e6d2f4baa0327a690972f26
-Size (aranym-0.8.9beta.tar.gz) = 1246180 bytes
-SHA1 (patch-aa) = fbb3606d92d1a30086ec3576aeb5f0f9f2d58221
-SHA1 (patch-ab) = 5d0120517eb94c0ff5fef3043b465b46fc23a0b6
-SHA1 (patch-ac) = a4ea32937e756c76d9972f0c76d1d48e05da673e
diff --git a/emulators/aranym/patches/patch-aa b/emulators/aranym/patches/patch-aa
deleted file mode 100644
index 053eddd4f17..00000000000
--- a/emulators/aranym/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/03/28 20:11:34 joerg Exp $
-
---- configure.orig	2006-03-28 17:40:31.000000000 +0000
-+++ configure
-@@ -1776,6 +1776,7 @@ case "$target_os" in
-   openbsd*)	OS_TYPE=openbsd;;
-   netbsd*)	OS_TYPE=netbsd;;
-   freebsd*)	OS_TYPE=freebsd;;
-+  dragonfly*)	OS_TYPE=freebsd;;
-   solaris*)	OS_TYPE=solaris;;
-   darwin*)	OS_TYPE=darwin;;
-   cygwin*)	OS_TYPE=cygwin;;
-@@ -10469,7 +10470,7 @@ _ACEOF
-   irix*)
-     EXTRASYSSRCS="parameters_unix.cpp irix/unaligned.c"
-     ;;
--  freebsd*)
-+  freebsd* | dragonfly*)
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_O_FSYNC 1
-@@ -11925,7 +11926,7 @@ echo "$as_me: error: Sorry, extended seg
-    { (exit 1); exit 1; }; }
-       fi
-       ;;
--    freebsd*)
-+    freebsd* | dragonfly*)
-       if [ "x$HAVE_I386" = "xyes" ]; then
-         SYSSRCS="$SYSSRCS xbsd/sigsegv_xbsd.cpp"
-       else
diff --git a/emulators/aranym/patches/patch-ab b/emulators/aranym/patches/patch-ab
deleted file mode 100644
index 25d16347a47..00000000000
--- a/emulators/aranym/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/03/28 20:11:34 joerg Exp $
-
---- ../cdrom.cpp.orig	2006-03-28 18:18:45.000000000 +0000
-+++ ../cdrom.cpp
-@@ -82,7 +82,7 @@ extern "C" {
- #include "cdrom_beos.h"
- #define BX_CD_FRAMESIZE 2048
- 
--#elif (defined (OS_netbsd) || defined(OS_openbsd) || defined(OS__freebsd))
-+#elif (defined (OS_netbsd) || defined(OS_openbsd) || defined(OS_freebsd))
- // OpenBSD pre version 2.7 may require extern "C" { } structure around
- // all the includes, because the i386 sys/disklabel.h contains code which 
- // c++ considers invalid.
diff --git a/emulators/aranym/patches/patch-ac b/emulators/aranym/patches/patch-ac
deleted file mode 100644
index 1ed7e827efe..00000000000
--- a/emulators/aranym/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/04/28 14:10:12 joerg Exp $
-
---- Makefile.in.orig	2006-04-28 13:11:06.000000000 +0000
-+++ Makefile.in
-@@ -140,8 +140,8 @@ $(APP_LIB): $(OBJ_DIR) $(OBJS)
- 
- install: $(APP) $(TAPIF) $(APP).1.gz installdirs
- 	$(INSTALL_PROGRAM) $(APP) $(DESTDIR)$(bindir)/$(APP)
--	if [ "x$(APP_IFC)" = "x$(TAPIF)" ]; then\
--	$(INSTALL_PROGRAM) $(APP_IFC) $(DESTDIR)$(bindir)/$(APP_IFC);\
-+	if [ "x$(APP_IFC)" = "x$(TAPIF)" ]; then \
-+	$(INSTALL_PROGRAM) $(APP_IFC) $(DESTDIR)$(bindir)/$(APP_IFC); \
- 	fi
- 	$(INSTALL_DATA) $(APP).1.gz $(DESTDIR)$(man1dir)/$(APP).1.gz
- 	$(INSTALL_DATA) ../../ChangeLog $(DESTDIR)$(docdir)/$(APP)/changelog
diff --git a/emulators/arcem/DESCR b/emulators/arcem/DESCR
deleted file mode 100644
index 67a40150895..00000000000
--- a/emulators/arcem/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package is Dave Gilbert's Acorn Archimedes emulator. Included
-is a Linux Boot ROM image and a Linux Hard Drive image.
diff --git a/emulators/arcem/MESSAGE b/emulators/arcem/MESSAGE
deleted file mode 100644
index 4b4f231db94..00000000000
--- a/emulators/arcem/MESSAGE
+++ /dev/null
@@ -1,16 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2004/12/03 15:15:23 skrll Exp $
-
-When you run arcem, you need to be in a directory containing the
-arcem files and the ROM file. The distribution is supplied with the
-Linux ROM and Hard Drive files from Dave Gilbert's site. The hard drive
-file needs to be writable by you. For example:
-
-  $ mkdir ~/Archimedes
-  $ cp ${PREFIX}/share/arcem/* ~/Archimedes
-  $ cp ~/Archimedes/dot.arcemrc ~/.arcemrc
-  $ cd ~/Archimedes
-  $ chmod +w HardImage1
-  $ arcem
-
-===========================================================================
diff --git a/emulators/arcem/Makefile b/emulators/arcem/Makefile
deleted file mode 100644
index 0327d1de4e0..00000000000
--- a/emulators/arcem/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2007/02/06 18:43:14 joerg Exp $
-#
-
-DISTNAME=	arcem-1.00-src
-PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	2
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=arcem/}
-
-EXTRACT_SUFX=	.tgz
-
-LINUX_FILES=	\
-		linux.rom.gz \
-		HardImage1.gz
-
-.for f in ${LINUX_FILES}
-SITES.${f}+=	\
-		ftp://ftp.arm.uk.linux.org/pub/linux/arcem/
-.endfor
-
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${LINUX_FILES}
-
-MAINTAINER=	cjep@NetBSD.org
-HOMEPAGE=	http://arcem.sourceforge.net/
-COMMENT=	Dave Gilbert's Acorn Archimedes emulator
-
-WRKSRC=		${WRKDIR}/arcem
-USE_TOOLS+=	gmake
-
-MAKE_ENV+=	SYSTEM=X
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/arcem
-	${INSTALL_DATA} ${WRKDIR}/linux.rom ${PREFIX}/share/arcem/ROM
-	${INSTALL_DATA} ${WRKDIR}/HardImage1 ${PREFIX}/share/arcem/HardImage1
-	${INSTALL_DATA} ${FILESDIR}/dot.arcemrc \
-		${PREFIX}/share/arcem/dot.arcemrc
-	${INSTALL_DATA} ${WRKSRC}/hexcmos ${PREFIX}/share/arcem/hexcmos
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/arcem/PLIST b/emulators/arcem/PLIST
deleted file mode 100644
index 5f79f04978a..00000000000
--- a/emulators/arcem/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/02/17 19:22:58 wiz Exp $
-bin/arcem
-share/arcem/HardImage1
-share/arcem/ROM
-share/arcem/dot.arcemrc
-share/arcem/hexcmos
-@comment share/arcem/hexcmos.2
-@comment share/arcem/README
-@comment share/arcem/README.OrElse
-@dirrm share/arcem
diff --git a/emulators/arcem/distinfo b/emulators/arcem/distinfo
deleted file mode 100644
index cc2731159c7..00000000000
--- a/emulators/arcem/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 18:49:17 agc Exp $
-
-SHA1 (arcem-1.00-src.tgz) = d2a487531ce6c66dfbeb59d1f1093c7d8fc3282a
-RMD160 (arcem-1.00-src.tgz) = 95044eed6e5cd871d5bd926c3d02d17706e0f93b
-Size (arcem-1.00-src.tgz) = 206416 bytes
-SHA1 (linux.rom.gz) = 5a3ed7b8bf7e560d14ede14232e50a40a96f9147
-RMD160 (linux.rom.gz) = 5bf035a3e6f054a61de62fcf880c52c996f503c6
-Size (linux.rom.gz) = 341085 bytes
-SHA1 (HardImage1.gz) = ab3c2ddd5a913a4051d4c21707e7701b27a103f3
-RMD160 (HardImage1.gz) = 09176071c9c325b50a3a2074938789f4e6136d44
-Size (HardImage1.gz) = 3545800 bytes
-SHA1 (patch-aa) = afc6f0a77315fb7476e10f472441093360b637e8
-SHA1 (patch-ab) = 92408b25cdd23444a7220191ba65348c6bef482f
-SHA1 (patch-ac) = a9f3edbd7e7a974b7098936d62790821c5d3d4a1
-SHA1 (patch-ad) = 61823a1e47f783d1852c1f50762cdecbe3aeb3fb
diff --git a/emulators/arcem/files/dot.arcemrc b/emulators/arcem/files/dot.arcemrc
deleted file mode 100644
index b4e7d208c78..00000000000
--- a/emulators/arcem/files/dot.arcemrc
+++ /dev/null
@@ -1,4 +0,0 @@
-MFM disc
-1 612 4 32 256
-MFM disc
-2 612 4 32 256
diff --git a/emulators/arcem/patches/patch-aa b/emulators/arcem/patches/patch-aa
deleted file mode 100644
index a81a7846cd4..00000000000
--- a/emulators/arcem/patches/patch-aa
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/12/03 15:15:23 skrll Exp $
-
---- Makefile.orig	2002-05-05 23:09:39.000000000 +0100
-+++ Makefile
-@@ -36,15 +36,14 @@ WARN = -Wall -Wno-return-type -Wno-unkno
- 
- 
- # add -DHOST_BIGENDIAN for big endian hosts, e.g. Sun, SGI, HP
--CFLAGS = -O3 -D$(ENDIAN) $(CFL) -DNOOS -DNOFPE $(WARN) \
-- -I$(SYSTEM) -Iarch -funroll-loops -fexpensive-optimizations -ffast-math \
-- -fomit-frame-pointer -frerun-cse-after-loop
-+#CFLAGS = -O3 -D$(ENDIAN) $(CFL) -DNOOS -DNOFPE $(WARN) \
-+# -I$(SYSTEM) -Iarch -funroll-loops -fexpensive-optimizations -ffast-math \
-+# -fomit-frame-pointer -frerun-cse-after-loop
-+CFLAGS = -g -D$(ENDIAN) $(CFL) -DNOOS -DNOFPE $(WARN) -I$(SYSTEM) -Iarch 
- 
- 
- 
--prefix=/usr/local
--
--INSTALL_DIR = $(prefix)/bin
-+INSTALL_DIR = $(PREFIX)/bin
- INSTALL=cp
- 
- 
-@@ -82,8 +81,8 @@ TARGET=!ArcEm/arcem
- endif
- 
- ifeq (${SYSTEM},X)
--CFLAGS += -DSYSTEM_X -I/usr/X11R6/include
--LIBS += -L/usr/X11R6/lib -lXext -lX11
-+CFLAGS += -DSYSTEM_X -I${X11BASE}/include
-+LIBS += -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXext -lX11
- endif
- 
- ifeq (${SYSTEM},win)
-@@ -110,7 +109,7 @@ VER=1.0
- all: $(TARGET)
- 
- install: all
--	$(INSTALL) armul $(INSTALL_DIR)
-+	$(INSTALL) arcem $(INSTALL_DIR)
- 
- $(TARGET): $(OBJS) $(MODEL).o
- 	$(CC) $(OBJS) $(LIBS) $(MODEL).o -o $@
diff --git a/emulators/arcem/patches/patch-ab b/emulators/arcem/patches/patch-ab
deleted file mode 100644
index 5bac55b5ee8..00000000000
--- a/emulators/arcem/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/12/03 15:15:23 skrll Exp $
-
---- X/DispKbd.c.orig	2002-05-05 23:09:39.000000000 +0100
-+++ X/DispKbd.c
-@@ -45,7 +45,9 @@
- #define HD HOSTDISPLAY
- #define DC DISPLAYCONTROL
- 
-+#if 0
- static unsigned AutoKey(ARMul_State *state);
-+#endif
- 
- static struct EventNode enodes[4];
- //static int autokeyenode=0; /* Flips between 0 and 1 */
-@@ -87,12 +89,14 @@ static unsigned long get_pixelval(unsign
- } /* get_pixval */
- 
- /*----------------------------------------------------------------------------*/
-+#if 0
- static unsigned AutoKey(ARMul_State *state) {
-   /*fprintf(stderr,"AutoKey!\n"); */
-   KBD.TimerIntHasHappened+=2;
- 
-   return 0;
- };
-+#endif
- /*-----------------------------------------------------------------------------*/
- /* I'm not confident that this is completely correct - if it's wrong all hell
-   is bound to break loose! If it works however it should speed things up
diff --git a/emulators/arcem/patches/patch-ac b/emulators/arcem/patches/patch-ac
deleted file mode 100644
index 1e4868c096c..00000000000
--- a/emulators/arcem/patches/patch-ac
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/12/03 15:15:23 skrll Exp $
-
---- armrdi.c.orig	2004-06-04 09:21:14.000000000 +0100
-+++ armrdi.c
-@@ -114,11 +114,13 @@ void ARMul_ConsolePrint(ARMul_State *sta
-   }
- }
- 
-+#if 0
- static void ARMul_DebugPause(ARMul_State *state)
- {
-   if(!(rdi_log & 8))
-   state->hostif->dbgpause(state->hostif->dbgarg);
- }
-+#endif
- 
- /***************************************************************************\
- *                                 RDI_open                                  *
-@@ -278,6 +280,7 @@ static int RDI_CPUwrite(unsigned mode, u
- *            Internal functions for breakpoint table manipulation           *
- \***************************************************************************/
- 
-+#if 0
- static void deletewatchnode(WatchNode **prevp)
- { WatchNode *p = *prevp;
-   *prevp = p->next;
-@@ -305,7 +308,7 @@ static WatchNode *installwatch(ARMword a
-   p->bound = bound;
-   return p;
- }
--
-+#endif
- /***************************************************************************\
- *                               RDI_execute                                 *
- \***************************************************************************/
diff --git a/emulators/arcem/patches/patch-ad b/emulators/arcem/patches/patch-ad
deleted file mode 100644
index 79678af0f3a..00000000000
--- a/emulators/arcem/patches/patch-ad
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/12/03 15:15:23 skrll Exp $
-
---- arch/armarc.c.orig	2002-05-06 09:52:53.000000000 +0100
-+++ arch/armarc.c
-@@ -355,7 +355,7 @@ unsigned ARMul_MemoryInit(ARMul_State *s
-  FILE *ROMFile;
-  unsigned int ROMWordNum,ROMWord;
-  int PresPage;
-- unsigned int index;
-+ unsigned int idx;
- 
-  PrivDPtr = (PrivateDataType *)malloc(sizeof(PrivateDataType));
-  if (PrivDPtr == NULL) {
-@@ -392,8 +392,8 @@ unsigned ARMul_MemoryInit(ARMul_State *s
-   exit(3);
-  };
- 

-- for (index = 0; index < (MEMC.RAMSize / 4); index++)
--   MEMC.PhysRamfuncs[index]=ARMul_Emulate_DecodeInstr;
-+ for (idx = 0; idx < (MEMC.RAMSize / 4); idx++)
-+   MEMC.PhysRamfuncs[idx]=ARMul_Emulate_DecodeInstr;
- 
-  MEMC.ROMMapFlag=1; /* Map ROM to address 0 */
-  MEMC.ControlReg=0; /* Defaults */
-@@ -461,8 +461,8 @@ unsigned ARMul_MemoryInit(ARMul_State *s
-  PRIVD->irqflags = 0;
-  PRIVD->fiqflags = 0;
- 
-- for(index = 0;index < (512 * 1024) / UPDATEBLOCKSIZE; index++) {
--   MEMC.UpdateFlags[index] = 1;
-+ for(idx = 0;idx < (512 * 1024) / UPDATEBLOCKSIZE; idx++) {
-+   MEMC.UpdateFlags[idx] = 1;
-  }
- 
-  MEMC.OldAddress1 = -1;
diff --git a/emulators/arnold/DESCR b/emulators/arnold/DESCR
deleted file mode 100644
index 69e5c27d493..00000000000
--- a/emulators/arnold/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Arnold is an Amstrad CPC, Amstrad CPC+ and KC Compact emulator.
-Arnold is accurate and emulates the Amstrad systems to the cycle
-level. It also emulates 99% of all demo effects.
diff --git a/emulators/arnold/Makefile b/emulators/arnold/Makefile
deleted file mode 100644
index 18e5330118a..00000000000
--- a/emulators/arnold/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/06/12 16:28:06 wiz Exp $
-#
-
-DISTNAME=		arnsrc27012002
-PKGNAME=		arnold-20020127
-PKGREVISION=		5
-CATEGORIES=		emulators
-MASTER_SITES=		http://arnold.emuunlim.com/download/
-EXTRACT_SUFX=		.zip
-
-MAINTAINER=		dillo@NetBSD.org
-HOMEPAGE=		http://arnold.emuunlim.com/
-COMMENT=		Amstrad CPC, Amstrad CPC+ and KC Compact emulator
-
-# we want case sensitive file names.
-EXTRACT_OPTS_ZIP=	-aqo
-
-WRKSRC=			${WRKDIR}/arnold
-GNU_CONFIGURE=		yes
-CONFIGURE_DIRS=		src
-BUILD_DIRS=		${CONFIGURE_DIRS}
-BUILD_TARGET=		arnold
-
-SHAREDIR=		${PREFIX}/share/arnold
-DOCDIR=			${PREFIX}/share/doc/arnold
-MAKE_ENV+=		SHAREDIR=${SHAREDIR:Q}
-INSTALLATION_DIRS=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/arnold ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${SHAREDIR}
-	${INSTALL_DATA_DIR} ${SHAREDIR}/roms
-	for dir in amsdose cpc464e cpc6128e cpc664e cpcplus kcc; \
-	do \
-		${INSTALL_DATA_DIR} ${SHAREDIR}/roms/$$dir; \
-		for f in ${WRKSRC}/roms/$$dir/*; \
-		do \
-			${INSTALL_DATA} $$f ${SHAREDIR}/roms/$$dir; \
-		done \
-	done
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/readme.linux ${DOCDIR}
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/arnold/PLIST b/emulators/arnold/PLIST
deleted file mode 100644
index f5846bbb9ca..00000000000
--- a/emulators/arnold/PLIST
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/24 10:53:27 dillo Exp $
-bin/arnold
-share/arnold/roms/amsdose/amsdos.rom
-share/arnold/roms/amsdose/file_id.diz
-share/arnold/roms/cpc464e/basic.rom
-share/arnold/roms/cpc464e/file_id.diz
-share/arnold/roms/cpc464e/os.rom
-share/arnold/roms/cpc6128e/basic.rom
-share/arnold/roms/cpc6128e/file_id.diz
-share/arnold/roms/cpc6128e/os.rom
-share/arnold/roms/cpc664e/basic.rom
-share/arnold/roms/cpc664e/file_id.diz
-share/arnold/roms/cpc664e/os.rom
-share/arnold/roms/cpcplus/out.tmp
-share/arnold/roms/cpcplus/system.cpr
-share/arnold/roms/kcc/kccbas.rom
-share/arnold/roms/kcc/kccos.rom
-share/doc/arnold/readme.txt
-share/doc/arnold/readme.linux
-@dirrm share/doc/arnold
-@dirrm share/arnold/roms/kcc
-@dirrm share/arnold/roms/cpcplus
-@dirrm share/arnold/roms/cpc664e
-@dirrm share/arnold/roms/cpc6128e
-@dirrm share/arnold/roms/cpc464e
-@dirrm share/arnold/roms/amsdose
-@dirrm share/arnold/roms
-@dirrm share/arnold
diff --git a/emulators/arnold/distinfo b/emulators/arnold/distinfo
deleted file mode 100644
index 594d61396b0..00000000000
--- a/emulators/arnold/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/10/18 23:30:46 wiz Exp $
-
-SHA1 (arnsrc27012002.zip) = de3102b954d79176dce259375dc1824189027f8e
-RMD160 (arnsrc27012002.zip) = 7b43c157cbc4f6171ee9ef14cc282cc1692188c6
-Size (arnsrc27012002.zip) = 916680 bytes
-SHA1 (patch-aa) = aff649f6c37cf7a321c182442d9faac44594b413
-SHA1 (patch-ab) = fde2730f3cf53d539543489a6d691ad7a6bc9d68
-SHA1 (patch-ac) = 0f7681cbf3f6345ce7427591936c607075fa76ac
diff --git a/emulators/arnold/patches/patch-aa b/emulators/arnold/patches/patch-aa
deleted file mode 100644
index 5b2ad7b844e..00000000000
--- a/emulators/arnold/patches/patch-aa
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/11/03 21:40:13 rillig Exp $
-
---- src/Makefile.in.orig	Sat Jan 19 15:49:14 2002
-+++ src/Makefile.in
-@@ -25,7 +25,7 @@ SDLINC = @SDL_CFLAGS@
- SDLLIB = @SDL_LIBS@
- 
- #-Wall for max warnings!
--CFLAGS = @CPPFLAGS@ @CFLAGS@ $(GTKINC) $(SDLINC) @DEFS@ $(X11INC) -I. -DUNIX -Wall -Wno-unused
-+CFLAGS = @CPPFLAGS@ @CFLAGS@ $(GTKINC) $(SDLINC) @DEFS@ $(X11INC) -I. -DUNIX -Wall -Wno-unused -DSHAREDIR=\"${SHAREDIR}\"
- #-g3 -pg -dm -dp -a
- LFLAGS1 = @LDFLAGS@ @LIBS@ $(GTKLIB) $(SDLLIB) $(X11LIBS)
- #debug
-@@ -55,9 +55,30 @@ IFACEGEN_O= ifacegen/ifacegen.o ifacegen
- UNIX_O= unix/main.o unix/host.o unix/global.o unix/settings.o \
- 	unix/display.o unix/display_sdl.o unix/gtkui.o unix/sdlsound.o
- 
-+CPC_O2=	arnold.o asic.o audioevent.o bmp.o cpc.o \
-+	crtc.o debugmain.o dirstuff.o dumpym.o fdc.o \
-+	garray.o multface.o printer.o psgplay.o \
-+	psg.o render.o render5.o scrsnap.o \
-+	snapshot.o sampload.o spo256.o \
-+	voc.o tzx.o wav.o westpha.o yiq.o \
-+	debug.o z8536.o \
-+	gdebug.o breakpt.o \
-+	diskimg.o \
-+	dsk.o extdsk.o \
-+	iextdsk.o maketrk.o \
-+	z80.o memdump.o \
-+	riff.o snapv3.o expbuf.o \
-+	cheatsys.o cpcdbg.o
-+ 
-+IFACEGEN_O2= ifacegen.o fnp.o romfn.o \
-+	filetool.o
-+ 
-+UNIX_O2= main.o host.o global.o settings.o \
-+	display.o display_sdl.o gtkui.o sdlsound.o
-+ 
- arnold:  $(CPC_O) $(IFACEGEN_O) $(UNIX_O)
--	$(BIND) -o arnold $(LFLAGS1) $(CPC_O) $(IFACEGEN_O)	\
--	$(UNIX_O) $(LFLAGS2) 
-+	$(BIND) -o arnold $(LFLAGS1) $(CPC_O2) $(IFACEGEN_O2)	\
-+	$(UNIX_O2) $(LFLAGS2) 
- 	mv arnold ..
- ctags:
- 	ctags -R
diff --git a/emulators/arnold/patches/patch-ab b/emulators/arnold/patches/patch-ab
deleted file mode 100644
index 72d72af94e5..00000000000
--- a/emulators/arnold/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/11/03 21:40:13 rillig Exp $
-
---- src/unix/main.c.orig	Sun Nov  4 21:15:22 2001
-+++ src/unix/main.c
-@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
- 		char LocalDirectory[1024];
- 		char ProgramDirectory[1024]="";
- 		
--		getcwd(ProgramDirectory, 1024);
-+		strcpy(ProgramDirectory, SHAREDIR);
- 
- sprintf(LocalDirectory,"%s/roms/amsdose/",ProgramDirectory);
- 	
-@@ -94,8 +94,6 @@ LocalDirectory);	
- 
- 	if (CPCEmulation_Initialise())
- 	  {
--		chdir(ProgramDirectory);
--
- 		CPC_SetCPCType(CPC_TYPE_CPC6128);
- 
- 		if (argc!=0)
diff --git a/emulators/arnold/patches/patch-ac b/emulators/arnold/patches/patch-ac
deleted file mode 100644
index 8087e5cdf27..00000000000
--- a/emulators/arnold/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/10/18 23:30:46 wiz Exp $
-
---- src/cpc/tzx.c.orig	2001-10-21 09:43:06.000000000 +0000
-+++ src/cpc/tzx.c
-@@ -57,7 +57,7 @@ static unsigned long TapeImage_Flags;
- static unsigned char *pTapeBlockPtr = NULL;
- 
- static void	TapeImage_GetNextDataBlock(void);
--int		TapeImage_GetBlockLength(unsigned char *pBlock);
-+static int	TapeImage_GetBlockLength(unsigned char *pBlock);
- static void	TapeImage_HandleBlock(unsigned char *);
- 
- 
diff --git a/emulators/atari800/DESCR b/emulators/atari800/DESCR
deleted file mode 100644
index d48d7407011..00000000000
--- a/emulators/atari800/DESCR
+++ /dev/null
@@ -1,24 +0,0 @@
-Atari 8-bit machine emulator for multiple platforms.
-
-Major features:
-o Atari 400, 800, 600 XL, 800XL, 130XE, 5200 Games System.
-o 130XE compatible memory expansions: 320K, 576K, 1088K.
-o Optional 4K RAM between 0xc000 and 0xcfff in 400/800 mode.
-o Cycle-exact 6502 emulation, all unofficial instructions.
-o Cycle-exact NMI interrupts, scanline-based POKEY interrupts.
-o Scanline-based ANTIC emulation, all display modes, precise timing.
-o Player/Missile Graphics, exact priority control and collision detection.
-o Exact POKEY shift registers (sound and random number generator).
-o 8 disk drives, emulated at computer-to-drive communication
-  and fast patched SIO levels.
-o ATR, XFD, DCM, ATR.GZ and XFD.GZ disk images.
-o Direct loading of Atari executable files.
-o 24 cartridge types, raw and CART format.
-o Cassette player, raw and CAS images.
-o Printer support.
-o Files can be stored directly on your host computer via the H: device.
-o Current emulation state can be saved in a state file.
-o Sound support (possibility to redirect it to WAV files).
-o Stereo (two POKEYs) emulation.
-o Joystick controller using numeric keypad and real joystick support.
-o Screen snapshots (normal and interlaced) to PCX files.
diff --git a/emulators/atari800/MESSAGE b/emulators/atari800/MESSAGE
deleted file mode 100644
index 31aae46b030..00000000000
--- a/emulators/atari800/MESSAGE
+++ /dev/null
@@ -1,19 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2002/11/22 12:26:25 wiz Exp $
-
-Please refer to ${PREFIX}/share/doc/atari800 for the distribution documents.
-A man page has also been installed. The system wide configuration file can
-be found at ${PREFIX}/share/atari800/atari800.cfg which you will probably
-want to copy to your home directory, at some stage, to personalise the
-settings.
-
-For more information please visit http://atari800.atari.org
-or the news group "comp.sys.atari.8bit".
-
-The ROM's for the Atari computers are, unfortunately, copyright. This
-port uses the ROM files distributed with another freeware Atari emulator
-for DOS called PC Xformer 2.5. If you would like to take a further look
-at XF2.5 you can find it in your distfiles directory. For more information
-on this emulator check out http://www.emulators.com/xformer.htm .
-
-===========================================================================
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
deleted file mode 100644
index 6efca4e0492..00000000000
--- a/emulators/atari800/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.39 2006/06/12 16:28:06 wiz Exp $
-
-DISTNAME=	atari800-2.0.2
-PKGREVISION=	2
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=atari800/}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xf25.zip
-
-MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://atari800.sourceforge.net/
-COMMENT=	Atari 800, 800XL, 130XE and 5200 emulator
-
-RESTRICTED=		copyrighted ROM images
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-
-.include "options.mk"
-
-# override HOME to avoid picking up a bad ${HOME}/.atari800 during the build
-MAKE_FLAGS+=	HOME=${WRKSRC:Q}
-
-post-extract:
-	@cd ${WRKDIR} && ${LOCALBASE}/bin/unzip -Lqo ${DISTDIR}/xf25.zip
-	${SED} -e 's,@PREFIX@,${PREFIX},g' <${FILESDIR}/atari800.cfg \
-		>${WRKSRC}/atari800.cfg
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/atari800
-	${INSTALL_DATA} ${WRKDIR}/*.rom ${WRKDIR}/*.xfd ${WRKDIR}/*.atr \
-		${WRKSRC}/atari800.cfg ${PREFIX}/share/atari800/
-
-.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/atari800/PLIST b/emulators/atari800/PLIST
deleted file mode 100644
index a91f4c7a4c6..00000000000
--- a/emulators/atari800/PLIST
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/01/08 15:24:42 adam Exp $
-bin/atari800
-man/man1/atari800.1
-share/atari800/atari800.cfg
-share/atari800/ataribas.rom
-share/atari800/atariosb.rom
-share/atari800/atarixl.rom
-share/atari800/demos1.xfd
-share/atari800/demos2.xfd
-share/atari800/dos25.xfd
-share/atari800/mydos45d.atr
-share/doc/atari800/COPYING
-share/doc/atari800/INSTALL
-share/doc/atari800/NEWS
-share/doc/atari800/README
-share/doc/atari800/README.1ST
-share/doc/atari800/USAGE
-@dirrm share/doc/atari800
-@dirrm share/atari800
diff --git a/emulators/atari800/distinfo b/emulators/atari800/distinfo
deleted file mode 100644
index f5cf6785308..00000000000
--- a/emulators/atari800/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.13 2006/04/09 08:31:13 adam Exp $
-
-SHA1 (atari800-2.0.2.tar.gz) = 23dd5e2ce9232945fb3c694cb011c86966b49863
-RMD160 (atari800-2.0.2.tar.gz) = a9e3d971b62192be945abf828552bab0a16a7fda
-Size (atari800-2.0.2.tar.gz) = 982758 bytes
-SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42
-RMD160 (xf25.zip) = e3960898223dd4d1b9a9cc5cfb1251bd726ea5a7
-Size (xf25.zip) = 188942 bytes
-SHA1 (patch-aa) = 6b610bab5957474e0eb63ec67f04c6cc3bc5287c
-SHA1 (patch-ab) = 685a706cd9062543f8716a360052422925af4f6f
-SHA1 (patch-ac) = 1815c2f531a8bdba6e12d5cf062206e8eb2740d9
diff --git a/emulators/atari800/files/atari800.cfg b/emulators/atari800/files/atari800.cfg
deleted file mode 100644
index a51b4bdf78f..00000000000
--- a/emulators/atari800/files/atari800.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-Atari 800 Emulator, Version 1.2.4
-OS/A_ROM=
-OS/B_ROM=@PREFIX@/share/atari800/atariosb.rom
-XL/XE_ROM=@PREFIX@/share/atari800/atarixl.rom
-BASIC_ROM=@PREFIX@/share/atari800/ataribas.rom
-5200_ROM=
-DISK_DIR=@PREFIX@/share/atari800/
-ROM_DIR=@PREFIX@/share/atari800/
-H1_DIR=.
-H2_DIR=.
-H3_DIR=.
-H4_DIR=.
-HD_READ_ONLY=1
-EXE_DIR=.
-STATE_DIR=
-PRINT_COMMAND=lpr %s
-SCREEN_REFRESH_RATIO=1
-MACHINE_TYPE=Atari XL/XE
-RAM_SIZE=64
-DEFAULT_TV_MODE=PAL
-DISABLE_BASIC=1
-ENABLE_SIO_PATCH=1
-ENABLE_H_PATCH=1
-ENABLE_P_PATCH=1
diff --git a/emulators/atari800/options.mk b/emulators/atari800/options.mk
deleted file mode 100644
index 3e046dd49f7..00000000000
--- a/emulators/atari800/options.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: options.mk,v 1.5 2007/02/06 18:53:45 joerg Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.atari800
-PKG_SUPPORTED_OPTIONS=	sdl x11
-PKG_SUGGESTED_OPTIONS=	sdl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mx11)
-CONFIGURE_ARGS+=	--target=x11
-.include "../../x11/libX11/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Msdl)
-CONFIGURE_ARGS+=	--target=sdl
-.include "../../devel/SDL/buildlink3.mk"
-.endif
diff --git a/emulators/atari800/patches/patch-aa b/emulators/atari800/patches/patch-aa
deleted file mode 100644
index 6c5241e2c01..00000000000
--- a/emulators/atari800/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/01/20 07:38:13 adam Exp $
-
---- sound_oss.c.orig	2005-12-28 19:22:06.000000000 +0100
-+++ sound_oss.c
-@@ -39,7 +39,7 @@
- #include "pokeysnd.h"
- #include "util.h"
- 
--static const char * const dspname = "/dev/dsp";
-+static const char * const dspname = DEVOSSAUDIO;
- static int dsprate = 22050;
- 
- static int sound_enabled = TRUE;
diff --git a/emulators/atari800/patches/patch-ab b/emulators/atari800/patches/patch-ab
deleted file mode 100644
index b723d8cd7c3..00000000000
--- a/emulators/atari800/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2006/01/20 07:38:13 adam Exp $
-
---- atari.c.orig	2005-11-26 21:11:19.000000000 +0100
-+++ atari.c
-@@ -635,7 +635,7 @@ void Atari800_FindROMImages(const char *
- #endif
- 
- #ifndef SYSTEM_WIDE_CFG_FILE
--#define SYSTEM_WIDE_CFG_FILE "/etc/atari800.cfg"
-+#define SYSTEM_WIDE_CFG_FILE PREFIX "/share/atari800/atari800.cfg"
- #endif
- 
- static char rtconfig_filename[FILENAME_MAX];
diff --git a/emulators/atari800/patches/patch-ac b/emulators/atari800/patches/patch-ac
deleted file mode 100644
index 37e0bb319dc..00000000000
--- a/emulators/atari800/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2004/01/08 15:24:42 adam Exp $
-
---- Makefile.in.orig	2004-01-08 15:57:43.000000000 +0000
-+++ Makefile.in
-@@ -5,15 +5,15 @@ DEFS = @DEFS@
- LIBS = @LIBS@
- TARGET = atari800@EXEEXT@
- 
--CFLAGS = @CFLAGS@
--LDFLAGS = @LDFLAGS@
-+CFLAGS = @CFLAGS@ -DPREFIX=\"${PREFIX}\" -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\"
-+LDFLAGS = @LDFLAGS@ ${LIBOSSAUDIO}
- 
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
- INSTALL_DATA = @INSTALL_DATA@
- 
- BIN_DIR = @prefix@/bin
--MAN_DIR = @prefix@/share/man/man1
-+MAN_DIR = @prefix@/man/man1
- DOC_DIR = @prefix@/share/doc/atari800
- 
- DESTDIR =
diff --git a/emulators/blinkensim/DESCR b/emulators/blinkensim/DESCR
deleted file mode 100644
index e68d430b6e1..00000000000
--- a/emulators/blinkensim/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Blinkensim is a Blinkenlights simulator.  The first version used to speak
-to the network that we used in the real thing.  If you haven't seen the
-real thing, you missed something, but this simulator will probably make
-you understand the Blinkenhype.
diff --git a/emulators/blinkensim/Makefile b/emulators/blinkensim/Makefile
deleted file mode 100644
index 8a016eecd3b..00000000000
--- a/emulators/blinkensim/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/04/17 13:46:23 wiz Exp $
-#
-
-DISTNAME=	blinkensim-2.2
-PKGREVISION=	5
-CATEGORIES=	emulators graphics
-MASTER_SITES=	http://sven.gimp.org/blinkenlights/old/
-
-MAINTAINER=	salo@NetBSD.org
-HOMEPAGE=	http://www.blinkenlights.de/
-COMMENT=	Blinkenlights graphics simulator
-
-DEPENDS+=	blinkenthemes>=0.8:../../graphics/blinkenthemes
-
-GNU_CONFIGURE=	YES
-USE_TOOLS+=	pkg-config
-
-post-install:
-	cd ${PREFIX}/bin && ${LN} -s blinkensim-gtk blinkensim
-
-.include "../../devel/blib/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/blinkensim/PLIST b/emulators/blinkensim/PLIST
deleted file mode 100644
index c6e94122e17..00000000000
--- a/emulators/blinkensim/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/27 22:44:00 salo Exp $
-bin/blinkensim
-bin/blinkensim-gtk
diff --git a/emulators/blinkensim/distinfo b/emulators/blinkensim/distinfo
deleted file mode 100644
index e834114d41e..00000000000
--- a/emulators/blinkensim/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:17 agc Exp $
-
-SHA1 (blinkensim-2.2.tar.gz) = 2d7867a28c99b46832a838138ab77c067f0d1457
-RMD160 (blinkensim-2.2.tar.gz) = 25812177a0def4969fe6d531ba378fbfc6ecb637
-Size (blinkensim-2.2.tar.gz) = 59111 bytes
diff --git a/emulators/bochs/DESCR b/emulators/bochs/DESCR
deleted file mode 100644
index adcb6931b19..00000000000
--- a/emulators/bochs/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-The program bochs is a highly portable open source x86 PC emulator
-written in C++, and runs on most popular platforms.  It includes
-emulation of the Intel x86 CPU, common IO devices, and a custom
-BIOS.  Currently, bochs can be compiled to emulate a 386, 486,
-Pentium, Pentium PRO or AMD64 CPU.
-
-Bochs is capable of running most operating systems inside the
-emulation including Linux, NetBSD, Windows 95, DOS, and Windows NT 4.
diff --git a/emulators/bochs/MESSAGE b/emulators/bochs/MESSAGE
deleted file mode 100644
index cd10a8cf47e..00000000000
--- a/emulators/bochs/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.5 2005/09/28 14:15:49 rillig Exp $
-
-You need to copy the ${PREFIX}/share/doc/bochs/bochsrc-sample.txt
-file to your home directory and name it .bochsrc.  Then edit it to
-your tastes defining the hard drives and floppies as needed.
-
-===========================================================================
diff --git a/emulators/bochs/MESSAGE.Darwin b/emulators/bochs/MESSAGE.Darwin
deleted file mode 100644
index a8f40a08bea..00000000000
--- a/emulators/bochs/MESSAGE.Darwin
+++ /dev/null
@@ -1,16 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.Darwin,v 1.1 2006/12/03 22:18:16 jmmv Exp $
-
-Bochs has been installed into ${PREFIX}/share/libexec/bochs.
-You can find there an application bundle (bochs.app) that you can copy to
-/Applications if you want to.
-
-There is also a sample configuration file in that location.  Note that you
-can use the $BXSHARE variable in your own configuration files to specify
-the location of the system BIOSes.  This variable will be automatically set
-to the appropriate location by Bochs when executed.
-
-For your convenience, a 'bochs' helper script has also been installed and
-should be available through your PATH as a regular command-line utility.
-
-===========================================================================
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
deleted file mode 100644
index 5983d554a06..00000000000
--- a/emulators/bochs/Makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# $NetBSD: Makefile,v 1.48 2007/02/09 14:58:30 joerg Exp $
-
-DISTNAME=		bochs-2.3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bochs/}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://bochs.sourceforge.net/
-COMMENT=		IA32 and AMD64 PC emulator
-
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
-USE_TOOLS+=		gunzip gzip
-USE_LANGUAGES=		c c++
-
-ONLY_FOR_COMPILER=	gcc
-CXXFLAGS+=		-DPARANOID
-
-CONFIGURE_ARGS+=	--enable-cdrom
-CONFIGURE_ARGS+=	--enable-ne2000
-
-MAKE_ENV+=		GZIP_CMD=${GZIP_CMD:Q}
-MAKE_ENV+=		GUNZIP_CMD=${GUNZIP_CMD:Q}
-MAKE_ENV+=		WGET=${FETCH_CMD:Q}
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.bochs
-PKG_SUPPORTED_OPTIONS+=	debug tiny
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.options.mk"
-
-# Debugging features for the client operating systems.  These options are
-# not enabled by default because they can adversely impact performance.
-.if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=	--enable-debugger
-CONFIGURE_ARGS+=	--enable-disasm
-CONFIGURE_ARGS+=	--enable-iodebug
-CONFIGURE_ARGS+=	--enable-x86-debugger
-.endif
-
-.if empty(PKG_OPTIONS:Mtiny)
-CONFIGURE_ARGS+=	--enable-3dnow
-CONFIGURE_ARGS+=	--enable-4meg-pages
-CONFIGURE_ARGS+=	--enable-all-optimizations
-CONFIGURE_ARGS+=	--enable-apic
-CONFIGURE_ARGS+=	--enable-cpu-level=6
-CONFIGURE_ARGS+=	--enable-daz
-CONFIGURE_ARGS+=	--enable-fpu
-CONFIGURE_ARGS+=	--enable-global-pages
-CONFIGURE_ARGS+=	--enable-guest2host-tlb
-CONFIGURE_ARGS+=	--enable-host-specific-asms
-CONFIGURE_ARGS+=	--enable-icache
-CONFIGURE_ARGS+=	--enable-mmx
-CONFIGURE_ARGS+=	--enable-new-pit
-CONFIGURE_ARGS+=	--enable-pae
-CONFIGURE_ARGS+=	--enable-pci
-CONFIGURE_ARGS+=	--enable-repeat-speedups
-CONFIGURE_ARGS+=	--enable-sep
-CONFIGURE_ARGS+=	--enable-sse=3
-CONFIGURE_ARGS+=	--enable-usb
-CONFIGURE_ARGS+=	--enable-vbe
-CONFIGURE_ARGS+=	--enable-x86-64
-
-.  if !empty(MACHINE_PLATFORM:M*-*-i386)
-CONFIGURE_ARGS+=	--enable-fast-function-calls
-.  endif
-
-.  if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--enable-sb16=osx
-.  elif ${OPSYS} == "FreeBSD"
-CONFIGURE_ARGS+=	--enable-sb16=freebsd
-.  elif ${OPSYS} == "Linux"
-CONFIGURE_ARGS+=	--enable-sb16=linux
-.  else
-CONFIGURE_ARGS+=	--enable-sb16=dummy
-.  endif
-.endif
-
-.if ${OPSYS} == "Linux"
-BOCHSRC_SUBST+=		-e 's,@FLOPPY_BSD@,\#,'
-BOCHSRC_SUBST+=		-e 's,@FLOPPY_LINUX@,,'
-.elif ${OPSYS} == "Darwin"
-BOCHSRC_SUBST+=		-e 's,@FLOPPY_BSD@,\#,'
-BOCHSRC_SUBST+=		-e 's,@FLOPPY_LINUX@,\#,'
-.else
-BOCHSRC_SUBST+=		-e 's,@FLOPPY_BSD@,,'
-BOCHSRC_SUBST+=		-e 's,@FLOPPY_LINUX@,\#,'
-.endif
-
-.if ${OPSYS} == "Darwin"
-INSTALL_MAKE_FLAGS+=	prefix=${PREFIX}/libexec/bochs
-MESSAGE_SRC=		${.CURDIR}/MESSAGE.Darwin
-PLIST_SRC=		${.CURDIR}/PLIST.Darwin
-
-post-build:
-	{ ${ECHO} '#! ${SH}'; \
-	  ${ECHO} 'exec ${PREFIX}/libexec/bochs/bochs.app/Contents/MacOS/bochs'\
-	          '"$$@"'; } >${WRKDIR}/bochs.sh
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/bochs.sh ${PREFIX}/bin/bochs
-	${LN} -fs ${PREFIX}/libexec/bochs/bxcommit ${PREFIX}/bin/bxcommit
-	${LN} -fs ${PREFIX}/libexec/bochs/bximage ${PREFIX}/bin/bximage
-.else
-BUILDLINK_DEPMETHOD.libXt?=	build
-
-.  include "../../x11/libSM/buildlink3.mk"
-.  include "../../x11/libX11/buildlink3.mk"
-.  include "../../x11/libXpm/buildlink3.mk"
-.  include "../../x11/libXt/buildlink3.mk"
-.endif
-
-pre-configure:
-	${SED} ${BOCHSRC_SUBST} <${WRKSRC}/.bochsrc >${WRKSRC}/.bochsrc.new
-	mv ${WRKSRC}/.bochsrc.new ${WRKSRC}/.bochsrc
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/bochs/PLIST b/emulators/bochs/PLIST
deleted file mode 100644
index e781267e4d3..00000000000
--- a/emulators/bochs/PLIST
+++ /dev/null
@@ -1,38 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2006/12/04 17:37:24 jmmv Exp $
-bin/bochs
-bin/bxcommit
-bin/bximage
-man/man1/bochs-dlx.1
-man/man1/bochs.1
-man/man1/bxcommit.1
-man/man1/bximage.1
-man/man5/bochsrc.5
-share/bochs/BIOS-bochs-latest
-share/bochs/VGABIOS-elpin-2.40
-share/bochs/VGABIOS-elpin-LICENSE
-share/bochs/VGABIOS-lgpl-README
-share/bochs/VGABIOS-lgpl-latest
-share/bochs/VGABIOS-lgpl-latest-cirrus
-share/bochs/VGABIOS-lgpl-latest-cirrus-debug
-share/bochs/VGABIOS-lgpl-latest-debug
-share/bochs/keymaps/sdl-pc-de.map
-share/bochs/keymaps/sdl-pc-us.map
-share/bochs/keymaps/x11-pc-be.map
-share/bochs/keymaps/x11-pc-da.map
-share/bochs/keymaps/x11-pc-de.map
-share/bochs/keymaps/x11-pc-es.map
-share/bochs/keymaps/x11-pc-fr.map
-share/bochs/keymaps/x11-pc-it.map
-share/bochs/keymaps/x11-pc-ru.map
-share/bochs/keymaps/x11-pc-se.map
-share/bochs/keymaps/x11-pc-si.map
-share/bochs/keymaps/x11-pc-uk.map
-share/bochs/keymaps/x11-pc-us.map
-share/doc/bochs/CHANGES
-share/doc/bochs/COPYING
-share/doc/bochs/README
-share/doc/bochs/TODO
-share/doc/bochs/bochsrc-sample.txt
-@dirrm share/doc/bochs
-@dirrm share/bochs/keymaps
-@dirrm share/bochs
diff --git a/emulators/bochs/PLIST.Darwin b/emulators/bochs/PLIST.Darwin
deleted file mode 100644
index 40ef2a49956..00000000000
--- a/emulators/bochs/PLIST.Darwin
+++ /dev/null
@@ -1,46 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.2 2006/12/04 17:37:24 jmmv Exp $
-bin/bochs
-bin/bxcommit
-bin/bximage
-libexec/bochs/BIOS-bochs-latest
-libexec/bochs/CHANGES.txt
-libexec/bochs/COPYING.txt
-libexec/bochs/README.txt
-libexec/bochs/TODO.txt
-libexec/bochs/VGABIOS-elpin-2.40
-libexec/bochs/VGABIOS-elpin-LICENSE.txt
-libexec/bochs/VGABIOS-lgpl-README.txt
-libexec/bochs/VGABIOS-lgpl-latest
-libexec/bochs/VGABIOS-lgpl-latest-cirrus
-libexec/bochs/VGABIOS-lgpl-latest-cirrus-debug
-libexec/bochs/VGABIOS-lgpl-latest-debug
-libexec/bochs/bochs.app/.build
-libexec/bochs/bochs.app/Contents/Info.plist
-libexec/bochs/bochs.app/Contents/MacOS/bochs
-libexec/bochs/bochs.app/Contents/PkgInfo
-libexec/bochs/bochs.app/Contents/Resources/bochs-icn.icns
-libexec/bochs/bochs.app/Contents/Resources/bochs.rsrc
-libexec/bochs/bochs.app/Contents/pbdevelopment.plist
-libexec/bochs/bochs.scpt
-libexec/bochs/bochsrc-sample.txt
-libexec/bochs/bxcommit
-libexec/bochs/bximage
-libexec/bochs/keymaps/sdl-pc-de.map
-libexec/bochs/keymaps/sdl-pc-us.map
-libexec/bochs/keymaps/x11-pc-be.map
-libexec/bochs/keymaps/x11-pc-da.map
-libexec/bochs/keymaps/x11-pc-de.map
-libexec/bochs/keymaps/x11-pc-es.map
-libexec/bochs/keymaps/x11-pc-fr.map
-libexec/bochs/keymaps/x11-pc-it.map
-libexec/bochs/keymaps/x11-pc-ru.map
-libexec/bochs/keymaps/x11-pc-se.map
-libexec/bochs/keymaps/x11-pc-si.map
-libexec/bochs/keymaps/x11-pc-uk.map
-libexec/bochs/keymaps/x11-pc-us.map
-@dirrm libexec/bochs/keymaps
-@dirrm libexec/bochs/bochs.app/Contents/Resources
-@dirrm libexec/bochs/bochs.app/Contents/MacOS
-@dirrm libexec/bochs/bochs.app/Contents
-@dirrm libexec/bochs/bochs.app
-@dirrm libexec/bochs
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
deleted file mode 100644
index d70556365db..00000000000
--- a/emulators/bochs/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.20 2006/12/04 17:37:24 jmmv Exp $
-
-SHA1 (bochs-2.3.tar.gz) = 2fe0dbdebd7fe9fe07d697bcbe1736bdaeb64aaf
-RMD160 (bochs-2.3.tar.gz) = 545e0bf3edd0fdd073a107e835f90c65451c100e
-Size (bochs-2.3.tar.gz) = 3812273 bytes
-SHA1 (patch-aa) = 65538ace00fa74f0871210364622ddc8027c2655
-SHA1 (patch-ab) = 51ebcc673c60258d19e4ec18f2464fb694548228
-SHA1 (patch-ac) = ab21b4c2c38d798e24244163b2c447430e012e8e
-SHA1 (patch-ad) = e305a33c204d9957d9da4048dddb194fff76dc12
-SHA1 (patch-ae) = b8092c73b77adebc054e7adf4a773206af726bf5
diff --git a/emulators/bochs/patches/patch-aa b/emulators/bochs/patches/patch-aa
deleted file mode 100644
index 90ba8d7863d..00000000000
--- a/emulators/bochs/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2006/12/04 17:37:24 jmmv Exp $
-
---- .bochsrc.orig	2006-06-22 20:50:47.000000000 +0200
-+++ .bochsrc
-@@ -196,13 +196,13 @@ vga: extension=vbe
- # such as a: or b: as the path.  The parameter 'image' works with image files
- # only. In that case the size must match one of the supported types.
- #=======================================================================
--floppya: 1_44=/dev/fd0, status=inserted
-+@FLOPPY_LINUX@floppya: 1_44=/dev/fd0, status=inserted
- #floppya: image=../1.44, status=inserted
- #floppya: 1_44=/dev/fd0H1440, status=inserted
- #floppya: 1_2=../1_2, status=inserted
- #floppya: 1_44=a:, status=inserted
- #floppya: 1_44=a.img, status=inserted
--#floppya: 1_44=/dev/rfd0a, status=inserted
-+@FLOPPY_BSD@floppya: 1_44=/dev/rfd0a, status=inserted
- 
- #=======================================================================
- # FLOPPYB:
-@@ -282,7 +282,7 @@ ata3: enabled=0, ioaddr1=0x168, ioaddr2=
- #   ata3-master: type=disk, mode=flat, path=483M.sample, cylinders=1024, heads=15, spt=63
- #   ata3-slave:  type=cdrom, path=iso.sample, status=inserted
- #=======================================================================
--ata0-master: type=disk, mode=flat, path="30M.sample", cylinders=615, heads=6, spt=17
-+#ata0-master: type=disk, mode=flat, path="30M.sample", cylinders=615, heads=6, spt=17
- #ata0-master: type=disk, mode=flat, path="c.img", cylinders=0 # autodetect
- #ata0-slave: type=cdrom, path=D:, status=inserted
- #ata0-slave: type=cdrom, path=/dev/cdrom, status=inserted
diff --git a/emulators/bochs/patches/patch-ab b/emulators/bochs/patches/patch-ab
deleted file mode 100644
index 2b69729d830..00000000000
--- a/emulators/bochs/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2006/12/04 17:37:24 jmmv Exp $
-
---- iodev/soundosx.cc.orig	2006-03-03 21:29:50.000000000 +0100
-+++ iodev/soundosx.cc
-@@ -5,7 +5,7 @@
- // This file (SOUNDOSX.CC) written and donated by Brian Huffman
- 
- #ifdef PARANOID
--#include <MacTypes.h>
-+#include <CoreServices/CoreServices.h>
- #else
- #define Float32 KLUDGE_Float32
- #define Float64 KLUDGE_Float64
diff --git a/emulators/bochs/patches/patch-ac b/emulators/bochs/patches/patch-ac
deleted file mode 100644
index 5da0ea2f419..00000000000
--- a/emulators/bochs/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2006/12/03 22:18:16 jmmv Exp $
-
---- configure.orig	2006-12-03 20:30:34.000000000 +0100
-+++ configure
-@@ -34338,7 +34338,7 @@ fi
-     *-pc-windows* | *-pc-winnt* | *-pc-cygwin* | *-pc-mingw32*)
-     NETLOW_OBJS="$NETLOW_OBJS eth_win32.o"
-     ;;
--    *-macosx* | *-darwin*)
-+    *-doesntwork-macosx* | *-doesntwork-darwin*)
-     NETLOW_OBJS="$NETLOW_OBJS eth_tuntap.o"
-     cat >>confdefs.h <<\_ACEOF
- #define HAVE_TUNTAP 1
diff --git a/emulators/bochs/patches/patch-ad b/emulators/bochs/patches/patch-ad
deleted file mode 100644
index 86f09503a5b..00000000000
--- a/emulators/bochs/patches/patch-ad
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2006/12/03 22:18:16 jmmv Exp $
-
---- Makefile.in.orig	2005-07-06 22:28:23.000000000 +0200
-+++ Makefile.in
-@@ -71,8 +71,8 @@ RMDIR=rmdir
- TAR=tar
- CHMOD=chmod
- # the GZIP variable is reserved by gzip program
--GZIP_BIN=gzip -9
--GUNZIP=gunzip
-+GZIP_BIN=${GZIP_CMD} -9
-+GUNZIP=${GUNZIP_CMD}
- ZIP=zip
- UNIX2DOS=unix2dos
- LIBTOOL=@LIBTOOL@
-@@ -574,7 +574,7 @@ RINCLUDES=/System/Library/Frameworks/Car
- REZ_ARGS=-append -i $RINCLUDES -d SystemSevenOrLater=1 -useDF
- STANDALONE_LIBDIR=`pwd`/$(APP)/Contents/$(APP_PLATFORM)/lib
- OSACOMPILE=/usr/bin/osacompile
--SETFILE=/Developer/Tools/Setfile
-+SETFILE=/Developer/Tools/SetFile
- 
- # On a MacOS X machine, you run rez, osacompile, and setfile to
- # produce the script executable, which has both a data fork and a
-@@ -651,18 +651,15 @@ $(APP)/.build_plugins: $(APP)/.build boc
- 	$(LIBTOOL) --finish $(STANDALONE_LIBDIR);
- 	touch $(APP)/.build_plugins
- 
--install_macosx: all download_dlx @INSTALL_DOCBOOK_VAR@
-+install_macosx: all @INSTALL_DOCBOOK_VAR@
- 	-mkdir -p $(prefix)
- 	for i in $(INSTALL_LIST_MACOSX); do if test -e $$i; then $(CPMAC) -r $$i $(prefix); else $(CPMAC) -r $(srcdir)/$$i $(prefix); fi; done
- 	$(CPMAC) $(srcdir)/.bochsrc $(prefix)/bochsrc-sample.txt
- 	-mkdir $(prefix)/keymaps
- 	$(CPMAC) $(srcdir)/gui/keymaps/*.map $(prefix)/keymaps
--	cat $(DLXLINUX_TAR) | (cd $(prefix) && tar xzvf -)
--	dlxrc=$(prefix)/dlxlinux/bochsrc.txt; mv "$$dlxrc" "$$dlxrc.orig" && sed < "$$dlxrc.orig" 's/\/usr\/local\/bochs\/latest/../' > "$$dlxrc" && rm -f "$$dlxrc.orig"
- 	mv $(prefix)/README $(prefix)/README.orig
- 	cat $(srcdir)/build/macosx/README.macosx-binary $(prefix)/README.orig > $(prefix)/README
- 	rm -f $(prefix)/README.orig
--	$(CPMAC) $(SCRIPT_EXEC) $(prefix)/dlxlinux
- 	for i in $(TEXT_FILE_LIST); do mv $(prefix)/$$i $(prefix)/$$i.txt; done
- 
- ###########################################
diff --git a/emulators/bochs/patches/patch-ae b/emulators/bochs/patches/patch-ae
deleted file mode 100644
index 230cc08d65a..00000000000
--- a/emulators/bochs/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2005/12/03 03:17:14 ben Exp $
-
---- iodev/eth_tuntap.cc.orig	2005-05-21 00:38:29.000000000 -0700
-+++ iodev/eth_tuntap.cc
-@@ -58,7 +58,7 @@
- #include <linux/if_tun.h>
- #else
- #include <net/if.h>
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__NetBSD__)
- #include <net/if_tap.h>
- #endif
- #endif
diff --git a/emulators/ckmame/DESCR b/emulators/ckmame/DESCR
deleted file mode 100644
index 2822c322740..00000000000
--- a/emulators/ckmame/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-  This is ckmame, a program to check ROM sets for MAME, the Multiple
-Arcade Machine Emulator (http://mame.retrogames.com).  It tells you
-which ROM files are missing or have a wrong checksum, and can delete
-unknown and unused files from the ROM sets, and rename or move ROM
-files.
diff --git a/emulators/ckmame/Makefile b/emulators/ckmame/Makefile
deleted file mode 100644
index 14be1eeab59..00000000000
--- a/emulators/ckmame/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2006/05/18 19:12:25 wiz Exp $
-#
-
-DISTNAME=		ckmame-0.8
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.nih.at/ckmame/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		dillo@NetBSD.org
-HOMEPAGE=		http://www.nih.at/ckmame/
-COMMENT=		Check ROM sets for MAME
-
-USE_TOOLS+=		pkg-config
-GNU_CONFIGURE=		yes
-TEST_TARGET=		check
-
-.include "../../archivers/libzip/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/db1.builtin.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/ckmame/PLIST b/emulators/ckmame/PLIST
deleted file mode 100644
index 7ca5641b457..00000000000
--- a/emulators/ckmame/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/12/28 21:44:26 wiz Exp $
-bin/ckmame
-bin/dumpgame
-bin/mkmamedb
-bin/mkmamedb-xmame.sh
-man/man1/ckmame.1
-man/man1/dumpgame.1
-man/man1/mkmamedb.1
-share/doc/ckmame/mame-0.96.dtd
-share/doc/ckmame/mess-0.97.dtd
-@dirrm share/doc/ckmame
diff --git a/emulators/ckmame/distinfo b/emulators/ckmame/distinfo
deleted file mode 100644
index af6e7eb7a78..00000000000
--- a/emulators/ckmame/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/05/18 19:12:25 wiz Exp $
-
-SHA1 (ckmame-0.8.tar.bz2) = a00daf9c9e9b992e5b0de71df889ea92cb744c97
-RMD160 (ckmame-0.8.tar.bz2) = 5bcd752e69deef7fe5681c448987679184255f45
-Size (ckmame-0.8.tar.bz2) = 206134 bytes
diff --git a/emulators/compat12/DEINSTALL b/emulators/compat12/DEINSTALL
deleted file mode 100644
index 5bb3b58fdf7..00000000000
--- a/emulators/compat12/DEINSTALL
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 18:53:07 jlam Exp $
-
-case ${STAGE} in
-POST-DEINSTALL)
-	COMPAT_LIBDIR=@COMPAT_LIBDIR@
-
-	${RMDIR} -p ${PKG_PREFIX}/${COMPAT_LIBDIR} 2>/dev/null || ${TRUE}
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/compat12/DESCR b/emulators/compat12/DESCR
deleted file mode 100644
index 3d5301a947f..00000000000
--- a/emulators/compat12/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This package supplies the user files necessary for full compatibility with
-dynamically linked executables compiled under NetBSD 1.1 through 1.2.1.
-You still need the option COMPAT_12 in your kernel configuration (and
-probably others; see options(4) for more information) to make use of
-NetBSD 1.2 binaries.
diff --git a/emulators/compat12/INSTALL b/emulators/compat12/INSTALL
deleted file mode 100644
index 41d5c283040..00000000000
--- a/emulators/compat12/INSTALL
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2003/08/30 18:53:07 jlam Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	OBJECT_FMT=@OBJECT_FMT@
-
-	# Only create the symlink on certain platform/object combinations.
-	#
-	create_emul_symlink=0
-	if [ "${OBJECT_FMT}" = "ELF" ] && \
-	   [ "${MACHINE_ARCH}" = "i386" -o "${MACHINE_ARCH}" = "sparc" ]
-	then
-		create_emul_symlink=1
-	fi
-
-	if [ ${create_emul_symlink} = 1 ]
-	then
-		# Create a symlink from /emul/aout --> ${PKG_PREFIX}/emul/out
-		# if it doesn't already exist.  Warn if we can't do this.
-		#
-		emul=aout
-		if [ "`cd /etc && cd ${PKG_PREFIX}/emul/$emul 2>/dev/null && pwd -P`" \
-		     != "`cd / && cd /emul/$emul 2>/dev/null && pwd -P`" ]
-		then
-			if [ -e /emul/$emul -o -L /emul/$emul ] || \
-			   [ \( -e /emul -o -L /emul \) -a ! -d /emul ]
-			then
-				${CAT} <<EOF
-==============================================================================
-	IMPORTANT:  You must create a symbolic link from /emul/$emul
-	to ${PKG_PREFIX}/emul/$emul in order for this package to work
-	properly.
-
-	(It seems there is something else located at /emul/$emul.)
-==============================================================================
-EOF
-			else
-				${MKDIR} -p /emul
-				${LN} -sf ${PKG_PREFIX}/emul/$emul /emul/$emul
-			fi
-		fi
-	fi
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/compat12/Makefile b/emulators/compat12/Makefile
deleted file mode 100644
index c0e8a99c274..00000000000
--- a/emulators/compat12/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: Makefile,v 1.32 2006/10/19 19:37:38 wiz Exp $
-#
-
-DISTNAME=		compat12-${MACHINE_ARCH}
-PKGNAME=		compat12-1.2.1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.2/index.html
-COMMENT=		Shared libraries for NetBSD 1.2 (and earlier) compatibility
-
-ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-ns32k \
-			NetBSD-*-sparc
-NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
-
-NO_BUILD=		yes
-NO_MTREE=		yes
-CHECK_SHLIBS_SUPPORTED=	no
-
-FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT:Q}
-FILES_SUBST+=		LDCONFIG=${LDCONFIG:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-# This installs in /usr (or /emul/aout/usr) to avoid dynamic linker annoyances
-.if ${OBJECT_FMT} == "ELF" && \
-    (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc")
-EMULSUBDIR=		emul/aout
-COMPAT_LIBDIR=		${EMULSUBDIR}/usr/lib
-.elif ${OPSYS} == "NetBSD"
-LOCALBASE=		/usr
-COMPAT_LIBDIR=		lib
-.endif
-
-PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR}
-	${INSTALL_DATA} ${WRKDIR}/lib*.so* ${PREFIX}/${COMPAT_LIBDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/compat12/PLIST b/emulators/compat12/PLIST
deleted file mode 100644
index dbf2bf5e0e5..00000000000
--- a/emulators/compat12/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:20 zuntum Exp $
-${COMPAT_LIBDIR}/libedit.so.0.0
-${COMPAT_LIBDIR}/libg++.so.2.0
-${COMPAT_LIBDIR}/libg++.so.3.0
-${COMPAT_LIBDIR}/libutil.so.3.2
diff --git a/emulators/compat12/distinfo b/emulators/compat12/distinfo
deleted file mode 100644
index a0a1efa216f..00000000000
--- a/emulators/compat12/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/10/23 14:32:06 rillig Exp $
-
-SHA1 (compat12-i386.tar.gz) = bce1f72c4fd9cdbe25a219a65ee0af7dd5257f16
-RMD160 (compat12-i386.tar.gz) = 63ea39032c6ea1a514aea0e80494d3910b31b33f
-Size (compat12-i386.tar.gz) = 285376 bytes
-SHA1 (compat12-m68k.tar.gz) = d319f63b47dbf28692796be296bbf7fcba2e5b4f
-RMD160 (compat12-m68k.tar.gz) = 55bb1555c20f617f950a917c2ebdf35ae5a7bcea
-Size (compat12-m68k.tar.gz) = 277202 bytes
-SHA1 (compat12-ns32k.tar.gz) = 66cb355f99369d2ce0a0e07c0f97593d57a5c2f1
-RMD160 (compat12-ns32k.tar.gz) = 688e2b2b812945861a289a8bc8459c7b1116bdee
-Size (compat12-ns32k.tar.gz) = 267367 bytes
-SHA1 (compat12-sparc.tar.gz) = 4af06ed70c66af5d676b292fe24dd0f945337916
-RMD160 (compat12-sparc.tar.gz) = e8e6d4a8b090e1f4bac9783ed49813bda70d52b7
-Size (compat12-sparc.tar.gz) = 298095 bytes
diff --git a/emulators/compat13/DEINSTALL b/emulators/compat13/DEINSTALL
deleted file mode 100644
index 71e6814ac9d..00000000000
--- a/emulators/compat13/DEINSTALL
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 18:57:03 jlam Exp $
-
-case ${STAGE} in
-POST-DEINSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	COMPAT_LIBDIR=@COMPAT_LIBDIR@
-
-	if [ "${MACHINE_ARCH}" = "mipsel" ]
-	then
-		${RM} -f ${PKG_PREFIX}/libexec/ld.so
-		${RMDIR} -p ${PKG_PREFIX}/libexec 2>/dev/null || ${TRUE}
-	fi
-
-	${RMDIR} -p ${PKG_PREFIX}/${COMPAT_LIBDIR} 2>/dev/null || ${TRUE}
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/compat13/DESCR b/emulators/compat13/DESCR
deleted file mode 100644
index 555ddc7bf08..00000000000
--- a/emulators/compat13/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-This package supplies the user files necessary for full compatibility with
-dynamically linked executables compiled under NetBSD 1.3.  You still need
-the option COMPAT_13 in your kernel configuration (and probably others;
-see options(4) for more information) to make use of NetBSD 1.3 binaries.
diff --git a/emulators/compat13/INSTALL b/emulators/compat13/INSTALL
deleted file mode 100644
index f3e467cb325..00000000000
--- a/emulators/compat13/INSTALL
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2003/08/30 18:57:03 jlam Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	OBJECT_FMT=@OBJECT_FMT@
-
-	if [ "${MACHINE_ARCH}" = "mipsel" ]
-	then
-		${LN} -sf ld.elf_so /usr/libexec/ld.so
-	fi
-
-	# Only create the symlink on certain platform/object combinations.
-	#
-	create_emul_symlink=0
-	if [ "${OBJECT_FMT}" = "ELF" ] && \
-	   [ "${MACHINE_ARCH}" = "i386" -o "${MACHINE_ARCH}" = "sparc" ]
-	then
-		create_emul_symlink=1
-	fi
-
-	if [ ${create_emul_symlink} = 1 ]
-	then
-		# Create a symlink from /emul/aout --> ${PKG_PREFIX}/emul/out
-		# if it doesn't already exist.  Warn if we can't do this.
-		#
-		emul=aout
-		if [ "`cd /etc && cd ${PKG_PREFIX}/emul/$emul 2>/dev/null && pwd -P`" \
-		     != "`cd / && cd /emul/$emul 2>/dev/null && pwd -P`" ]
-		then
-			if [ -e /emul/$emul -o -L /emul/$emul ] || \
-			   [ \( -e /emul -o -L /emul \) -a ! -d /emul ]
-			then
-				${CAT} <<EOF
-==============================================================================
-	IMPORTANT:  You must create a symbolic link from /emul/$emul
-	to ${PKG_PREFIX}/emul/$emul in order for this package to work
-	properly.
-
-	(It seems there is something else located at /emul/$emul.)
-==============================================================================
-EOF
-			else
-				${MKDIR} -p /emul
-				${LN} -sf ${PKG_PREFIX}/emul/$emul /emul/$emul
-			fi
-		fi
-	fi
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile
deleted file mode 100644
index b9684342741..00000000000
--- a/emulators/compat13/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# $NetBSD: Makefile,v 1.28 2006/10/19 19:37:38 wiz Exp $
-#
-
-DISTNAME=		compat13-${MACHINE_ARCH}${PKGMINOR}
-PKGNAME=		compat13-1.3.3
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.3/index.html
-COMMENT=		Shared libraries for NetBSD 1.3 (and earlier) compatibility
-
-ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm NetBSD-*-arm32	\
-			NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-mipsel	\
-			NetBSD-*-ns32k NetBSD-*-sparc
-NOT_FOR_PLATFORM=	NetBSD-1.3*-*
-NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
-
-NO_MTREE=		yes
-NO_BUILD=		yes
-CHECK_SHLIBS_SUPPORTED=	no
-
-FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT:Q}
-FILES_SUBST+=		LDCONFIG=${LDCONFIG:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-# This installs in /usr (or /emul/aout/usr) to avoid dynamic linker annoyances
-.if ${OBJECT_FMT} == "ELF" && \
-    (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc")
-EMULSUBDIR=		emul/aout
-COMPAT_LIBDIR=		${EMULSUBDIR}/usr/lib
-.elif ${OPSYS} == "NetBSD"
-LOCALBASE=		/usr
-COMPAT_LIBDIR=		lib
-.endif
-
-.if ${MACHINE_ARCH} == "alpha"
-PKGMINOR=	nb1
-.else
-PKGMINOR=
-.endif
-
-PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR}
-	${INSTALL_DATA} ${WRKDIR}/lib*.so* ${PREFIX}/${COMPAT_LIBDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/compat13/PLIST b/emulators/compat13/PLIST
deleted file mode 100644
index f474e8dee17..00000000000
--- a/emulators/compat13/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:25 zuntum Exp $
-${COMPAT_LIBDIR}/libedit.so.1.0
-${COMPAT_LIBDIR}/libg++.so.4.0
-${COMPAT_LIBDIR}/libstdc++.so.0.1
-${COMPAT_LIBDIR}/libutil.so.4.2
diff --git a/emulators/compat13/PLIST.alpha b/emulators/compat13/PLIST.alpha
deleted file mode 100644
index a26f534715f..00000000000
--- a/emulators/compat13/PLIST.alpha
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.alpha,v 1.1 2001/10/31 23:55:50 zuntum Exp $
-${COMPAT_LIBDIR}/libcurses.so.2.1
-${COMPAT_LIBDIR}/libcurses.so.2
diff --git a/emulators/compat13/distinfo b/emulators/compat13/distinfo
deleted file mode 100644
index b4547cb8c32..00000000000
--- a/emulators/compat13/distinfo
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: distinfo,v 1.6 2006/05/11 18:58:40 veego Exp $
-
-SHA1 (compat13-alphanb1.tar.gz) = 4e1fc306eb880dc3ba8a0906406da082fd6e6ca5
-RMD160 (compat13-alphanb1.tar.gz) = c09fa92bdef88fe7e5dd5ca28dfe13d0e045b840
-Size (compat13-alphanb1.tar.gz) = 478199 bytes
-SHA1 (compat13-arm.tar.gz) = 0dcae05d5ec15968665a71ab0a058f3b2a3d2f87
-RMD160 (compat13-arm.tar.gz) = 28232358015d5ab0a06ad0b5a7600426223d58b6
-Size (compat13-arm.tar.gz) = 247143 bytes
-SHA1 (compat13-arm32.tar.gz) = 0dcae05d5ec15968665a71ab0a058f3b2a3d2f87
-RMD160 (compat13-arm32.tar.gz) = 28232358015d5ab0a06ad0b5a7600426223d58b6
-Size (compat13-arm32.tar.gz) = 247143 bytes
-SHA1 (compat13-i386.tar.gz) = 4a33dd2381e790e3e71fccf4bb9f65a7d0859b9a
-RMD160 (compat13-i386.tar.gz) = e50d869813cd19bb079d8457a5b9f8e521b9e94e
-Size (compat13-i386.tar.gz) = 236494 bytes
-SHA1 (compat13-m68k.tar.gz) = a438a2d5f11106e431a8bba3061727069c5ec360
-RMD160 (compat13-m68k.tar.gz) = 6069d3e7790510eb7b6a3e543f670c9d3ecc89a2
-Size (compat13-m68k.tar.gz) = 231047 bytes
-SHA1 (compat13-mipsel.tar.gz) = 6dc5fefcd47db2d967b250ec628ac00495c35117
-RMD160 (compat13-mipsel.tar.gz) = 37b3e542dc407b21eb536effc64dd127a51a6d66
-Size (compat13-mipsel.tar.gz) = 411250 bytes
-SHA1 (compat13-ns32k.tar.gz) = 98068ed599e6ac2e79ea3ce1b7fb3df4510fc171
-RMD160 (compat13-ns32k.tar.gz) = f9f101da7df71bff97376a8aa4c0635450650f53
-Size (compat13-ns32k.tar.gz) = 223997 bytes
-SHA1 (compat13-sparc.tar.gz) = 67797480c5828792b434c5b06ab1ea02be3ad6b5
-RMD160 (compat13-sparc.tar.gz) = 0dbe2059a89039b20648bf6ca56e4df65ff66524
-Size (compat13-sparc.tar.gz) = 244099 bytes
diff --git a/emulators/compat14-crypto/DEINSTALL b/emulators/compat14-crypto/DEINSTALL
deleted file mode 100644
index 752c24352aa..00000000000
--- a/emulators/compat14-crypto/DEINSTALL
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 19:00:03 jlam Exp $
-
-case ${STAGE} in
-POST-DEINSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	COMPAT_LIBDIR=@COMPAT_LIBDIR@
-	COMPAT_XLIBDIR=@COMPAT_XLIBDIR@
-
-	if [ "${MACHINE_ARCH}" = "mipsel" ]
-	then
-		${RM} -f ${PKG_PREFIX}/libexec/ld.so
-		${RMDIR} -p ${PKG_PREFIX}/libexec 2>/dev/null || ${TRUE}
-	fi
-
-	${RMDIR} -p ${PKG_PREFIX}/${COMPAT_LIBDIR} ${PKG_PREFIX}/${COMPAT_XLIBDIR} 2>/dev/null || ${TRUE}
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/compat14-crypto/DESCR b/emulators/compat14-crypto/DESCR
deleted file mode 100644
index 6bfe6baf113..00000000000
--- a/emulators/compat14-crypto/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This package supplies the user files necessary for full compatibility with
-dynamically linked executables compiled under NetBSD 1.4.  You still need
-the option COMPAT_14 in your kernel configuration (and probably others;
-see options(4) for more information) to make use of NetBSD 1.4 binaries.
-This package includes the crypto-enabled "domestic" set libraries.
diff --git a/emulators/compat14-crypto/INSTALL b/emulators/compat14-crypto/INSTALL
deleted file mode 100644
index 7e66f1e0e74..00000000000
--- a/emulators/compat14-crypto/INSTALL
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2003/08/30 19:00:03 jlam Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	OBJECT_FMT=@OBJECT_FMT@
-
-	if [ "${MACHINE_ARCH}" = "mipsel" ]
-	then
-		${LN} -sf ld.elf_so /usr/libexec/ld.so
-	fi
-
-	# Only create the symlink on certain platform/object combinations.  Note
-	# that sparc64 a.out compatibility lives in /emul/aout, not /emul/netbsd32.
-	#
-	create_emul_symlink=0
-	if [ "${OBJECT_FMT}" = "ELF" ] && \
-	   [ "${MACHINE_ARCH}" = "i386" -o "${MACHINE_ARCH}" = "sparc" ]
-	then
-		create_emul_symlink=1
-	fi
-
-	if [ ${create_emul_symlink} = 1 ]
-	then
-		# Create a symlink from /emul/aout --> ${PKG_PREFIX}/emul/aout
-		# if it doesn't already exist.  Warn if we can't do this.
-		#
-		emul=aout
-		if [ "`cd /etc && cd ${PKG_PREFIX}/emul/$emul 2>/dev/null && pwd -P`" \
-		     != "`cd / && cd /emul/$emul 2>/dev/null && pwd -P`" ]
-		then
-			if [ -e /emul/$emul -o -L /emul/$emul ] || \
-			   [ \( -e /emul -o -L /emul \) -a ! -d /emul ]
-			then
-				${CAT} <<EOF
-==============================================================================
-	IMPORTANT:  You must create a symbolic link from /emul/$emul
-	to ${PKG_PREFIX}/emul/$emul in order for this package to work
-	properly.
-
-	(It seems there is something else located at /emul/$emul.)
-==============================================================================
-EOF
-			else
-				${MKDIR} -p /emul
-				${LN} -sf ${PKG_PREFIX}/emul/$emul /emul/$emul
-			fi
-		fi
-	fi
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/compat14-crypto/Makefile b/emulators/compat14-crypto/Makefile
deleted file mode 100644
index b821b21756f..00000000000
--- a/emulators/compat14-crypto/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/10/19 19:37:38 wiz Exp $
-#
-
-DISTNAME=		compat14-crypto-${MACHINE_ARCH}-${VERSION}
-PKGNAME=		compat14-crypto-${VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.4/index.html
-COMMENT=		Shared libraries for NetBSD 1.4 (and earlier) compatibility
-
-VERSION=		1.4.3.1
-
-CONFLICTS=		compat14-[0-9]*
-
-ONLY_FOR_PLATFORM=	NetBSD-*-sparc NetBSD-*-i386
-NOT_FOR_PLATFORM=	NetBSD-1.3*-* NetBSD-1.4*-*
-NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
-
-CRYPTO=			YES
-
-NO_MTREE=		yes
-NO_BUILD=		yes
-CHECK_SHLIBS_SUPPORTED=	no
-
-FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
-FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT:Q}
-FILES_SUBST+=		LDCONFIG=${LDCONFIG:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-# This installs in /usr (or /emul/aout/usr) to avoid dynamic linker annoyances
-.if ${OBJECT_FMT} == "ELF" && \
-    (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc")
-EMULSUBDIR=		emul/aout
-COMPAT_LIBDIR=		${EMULSUBDIR}/usr/lib
-COMPAT_XLIBDIR=		${EMULSUBDIR}/usr/X11R6/lib
-.elif ${OPSYS} == "NetBSD"
-LOCALBASE=		/usr
-COMPAT_LIBDIR=		lib
-COMPAT_XLIBDIR=		X11R6/lib
-.endif
-
-PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
-
-# note that the INSTALL_DATA for the lib*.so symlinks will copy the file, not the symlink.
-# FIXME.
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR}
-	${INSTALL_DATA} ${WRKDIR}/lib/lib*.so* ${PREFIX}/${COMPAT_LIBDIR}
-	if [ -d ${WRKDIR}/X11R6/lib ]; then \
-		${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_XLIBDIR}; \
-		${INSTALL_DATA} ${WRKDIR}/X11R6/lib/lib*.so* ${PREFIX}/${COMPAT_XLIBDIR}; \
-	fi
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/compat14-crypto/PLIST b/emulators/compat14-crypto/PLIST
deleted file mode 100644
index 0a06f5e1f82..00000000000
--- a/emulators/compat14-crypto/PLIST
+++ /dev/null
@@ -1,48 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/13 03:15:24 jdarrow Exp $
-${COMPAT_LIBDIR}/libacl.so.2.0
-${COMPAT_LIBDIR}/libamu.so.1.1
-${COMPAT_LIBDIR}/libbfd.so.3.0
-${COMPAT_LIBDIR}/libbz2.so.0.0
-${COMPAT_LIBDIR}/libc.so.12.40.2
-${COMPAT_LIBDIR}/libcom_err.so.2.0
-${COMPAT_LIBDIR}/libcrypt.so.0.0
-${COMPAT_LIBDIR}/libcurses.so.2.2
-${COMPAT_LIBDIR}/libdes.so.2.0
-${COMPAT_LIBDIR}/libedit.so.2.2
-${COMPAT_LIBDIR}/libg2c.so.0.0
-${COMPAT_LIBDIR}/libgnumalloc.so.0.0
-${COMPAT_LIBDIR}/libkadm.so.2.0
-${COMPAT_LIBDIR}/libkafs.so.3.0
-${COMPAT_LIBDIR}/libkdb.so.2.0
-${COMPAT_LIBDIR}/libkrb.so.2.0
-${COMPAT_LIBDIR}/libkstream.so.0.0
-${COMPAT_LIBDIR}/libkvm.so.5.0
-${COMPAT_LIBDIR}/libm.so.0.1
-${COMPAT_LIBDIR}/libntp.so.0.0
-${COMPAT_LIBDIR}/libobjc.so.0.0
-${COMPAT_LIBDIR}/libossaudio.so.0.0
-${COMPAT_LIBDIR}/libpcap.so.0.0
-${COMPAT_LIBDIR}/libposix.so.0.1
-${COMPAT_LIBDIR}/libresolv.so.1.0
-${COMPAT_LIBDIR}/libskey.so.0.0
-${COMPAT_LIBDIR}/libss.so.2.0
-${COMPAT_LIBDIR}/libstdc++.so.2.0
-${COMPAT_LIBDIR}/libtelnet.so.1.0
-${COMPAT_LIBDIR}/libtermcap.so.0.0
-${COMPAT_LIBDIR}/libtermlib.so.0.0
-${COMPAT_LIBDIR}/libutil.so.5.0
-${COMPAT_LIBDIR}/libwrap.so.0.0
-${COMPAT_LIBDIR}/libz.so.0.1
-${COMPAT_XLIBDIR}/libICE.so.6.3
-${COMPAT_XLIBDIR}/libPEX5.so.6.0
-${COMPAT_XLIBDIR}/libSM.so.6.0
-${COMPAT_XLIBDIR}/libX11.so.6.1
-${COMPAT_XLIBDIR}/libXIE.so.6.0
-${COMPAT_XLIBDIR}/libXaw.so.6.1
-${COMPAT_XLIBDIR}/libXext.so.6.3
-${COMPAT_XLIBDIR}/libXi.so.6.0
-${COMPAT_XLIBDIR}/libXmu.so.6.0
-${COMPAT_XLIBDIR}/libXp.so.6.2
-${COMPAT_XLIBDIR}/libXt.so.6.0
-${COMPAT_XLIBDIR}/libXtst.so.6.1
-${COMPAT_XLIBDIR}/liboldX.so.6.0
diff --git a/emulators/compat14-crypto/PLIST.i386 b/emulators/compat14-crypto/PLIST.i386
deleted file mode 100644
index 4d7ccccac47..00000000000
--- a/emulators/compat14-crypto/PLIST.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.i386,v 1.1.1.1 2002/08/13 03:15:24 jdarrow Exp $
-${COMPAT_LIBDIR}/libi386.so.0.2
-${COMPAT_LIBDIR}/libkeycap.so.0.0
diff --git a/emulators/compat14-crypto/distinfo b/emulators/compat14-crypto/distinfo
deleted file mode 100644
index 407baf570b3..00000000000
--- a/emulators/compat14-crypto/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/05/25 11:57:12 wiz Exp $
-
-SHA1 (compat14-crypto-i386-1.4.3.1.tar.gz) = 2b35c35de47b8c0be42813cb6e56e154e98ebfd5
-RMD160 (compat14-crypto-i386-1.4.3.1.tar.gz) = 5a28f1c5218eccd925bba73b7c9a1a2d3fd6c2b8
-Size (compat14-crypto-i386-1.4.3.1.tar.gz) = 1729167 bytes
-SHA1 (compat14-crypto-sparc-1.4.3.1.tar.gz) = 41d5937f5e1f40193c6363a9978fe6373d43e679
-RMD160 (compat14-crypto-sparc-1.4.3.1.tar.gz) = bbe9bcbf05328cb9829d192ef6a0be1479b9cdbe
-Size (compat14-crypto-sparc-1.4.3.1.tar.gz) = 1921545 bytes
diff --git a/emulators/compat14/DEINSTALL b/emulators/compat14/DEINSTALL
deleted file mode 100644
index a836e07aaf7..00000000000
--- a/emulators/compat14/DEINSTALL
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 19:02:33 jlam Exp $
-
-case ${STAGE} in
-POST-DEINSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	COMPAT_LIBDIR=@COMPAT_LIBDIR@
-	COMPAT_XLIBDIR=@COMPAT_XLIBDIR@
-
-	if [ "${MACHINE_ARCH}" = "mipsel" ]
-	then
-		${RM} -f ${PKG_PREFIX}/libexec/ld.so
-		${RMDIR} -p ${PKG_PREFIX}/libexec 2>/dev/null || ${TRUE}
-	fi
-
-	${RMDIR} -p ${PKG_PREFIX}/${COMPAT_LIBDIR} ${PKG_PREFIX}/${COMPAT_XLIBDIR} 2>/dev/null || ${TRUE}
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/compat14/DESCR b/emulators/compat14/DESCR
deleted file mode 100644
index 31b3a3a4f3e..00000000000
--- a/emulators/compat14/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-This package supplies the user files necessary for full compatibility with
-dynamically linked executables compiled under NetBSD 1.4.  You still need
-the option COMPAT_14 in your kernel configuration (and probably others;
-see options(4) for more information) to make use of NetBSD 1.4 binaries.
diff --git a/emulators/compat14/INSTALL b/emulators/compat14/INSTALL
deleted file mode 100644
index b37ac594721..00000000000
--- a/emulators/compat14/INSTALL
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2003/08/30 19:02:33 jlam Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	OBJECT_FMT=@OBJECT_FMT@
-
-	if [ "${MACHINE_ARCH}" = "mipsel" ]
-	then
-		${LN} -sf ld.elf_so /usr/libexec/ld.so
-	fi
-
-	# Only create the symlink on certain platform/object combinations.  Note
-	# that sparc64 a.out compatibility lives in /emul/aout, not /emul/netbsd32.
-	#
-	create_emul_symlink=0
-	if [ "${OBJECT_FMT}" = "ELF" ] && \
-	   [ "${MACHINE_ARCH}" = "i386" -o "${MACHINE_ARCH}" = "sparc" ]
-	then
-		create_emul_symlink=1
-	fi
-
-	if [ ${create_emul_symlink} = 1 ]
-	then
-		# Create a symlink from /emul/aout --> ${PKG_PREFIX}/emul/aout
-		# if it doesn't already exist.  Warn if we can't do this.
-		#
-		emul=aout
-		if [ "`cd /etc && cd ${PKG_PREFIX}/emul/$emul 2>/dev/null && pwd -P`" \
-		     != "`cd / && cd /emul/$emul 2>/dev/null && pwd -P`" ]
-		then
-			if [ -e /emul/$emul -o -L /emul/$emul ] || \
-			   [ \( -e /emul -o -L /emul \) -a ! -d /emul ]
-			then
-				${CAT} <<EOF
-==============================================================================
-	IMPORTANT:  You must create a symbolic link from /emul/$emul
-	to ${PKG_PREFIX}/emul/$emul in order for this package to work
-	properly.
-
-	(It seems there is something else located at /emul/$emul.)
-==============================================================================
-EOF
-			else
-				${MKDIR} -p /emul
-				${LN} -sf ${PKG_PREFIX}/emul/$emul /emul/$emul
-			fi
-		fi
-	fi
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/compat14/Makefile b/emulators/compat14/Makefile
deleted file mode 100644
index 8dcf86ee130..00000000000
--- a/emulators/compat14/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/10/19 19:37:38 wiz Exp $
-#
-
-DISTNAME=		compat14-${MACHINE_ARCH}-${VERSION}
-PKGNAME=		compat14-${VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.4/index.html
-COMMENT=		Shared libraries for NetBSD 1.4 (and earlier) compatibility
-
-VERSION=		1.4.3.1
-
-CONFLICTS=		compat14-crypto-[0-9]*
-
-ONLY_FOR_PLATFORM=	NetBSD-*-sparc NetBSD-*-i386
-NOT_FOR_PLATFORM=	NetBSD-1.3*-* NetBSD-1.4*-*
-NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
-
-NO_MTREE=		yes
-NO_BUILD=		yes
-CHECK_SHLIBS_SUPPORTED=	no
-
-FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
-FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT:Q}
-FILES_SUBST+=		LDCONFIG=${LDCONFIG:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-# This installs in /usr (or /emul/aout/usr) to avoid dynamic linker annoyances
-.if ${OBJECT_FMT} == "ELF" && \
-    (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc")
-EMULSUBDIR=		emul/aout
-COMPAT_LIBDIR=		${EMULSUBDIR}/usr/lib
-COMPAT_XLIBDIR=		${EMULSUBDIR}/usr/X11R6/lib
-.elif ${OPSYS} == "NetBSD"
-LOCALBASE=		/usr
-COMPAT_LIBDIR=		lib
-COMPAT_XLIBDIR=		X11R6/lib
-.endif
-
-PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
-
-# note that the INSTALL_DATA for the lib*.so symlinks will copy the file, not the symlink.
-# FIXME.
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR}
-	${INSTALL_DATA} ${WRKDIR}/lib/lib*.so* ${PREFIX}/${COMPAT_LIBDIR}
-	if [ -d ${WRKDIR}/X11R6/lib ]; then \
-		${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_XLIBDIR}; \
-		${INSTALL_DATA} ${WRKDIR}/X11R6/lib/lib*.so* ${PREFIX}/${COMPAT_XLIBDIR}; \
-	fi
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/compat14/PLIST b/emulators/compat14/PLIST
deleted file mode 100644
index eccc60d754e..00000000000
--- a/emulators/compat14/PLIST
+++ /dev/null
@@ -1,39 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:28 zuntum Exp $
-${COMPAT_LIBDIR}/libamu.so.1.1
-${COMPAT_LIBDIR}/libbfd.so.3.0
-${COMPAT_LIBDIR}/libbz2.so.0.0
-${COMPAT_LIBDIR}/libc.so.12.40.2
-${COMPAT_LIBDIR}/libcrypt.so.0.0
-${COMPAT_LIBDIR}/libcurses.so.2.2
-${COMPAT_LIBDIR}/libedit.so.2.2
-${COMPAT_LIBDIR}/libg2c.so.0.0
-${COMPAT_LIBDIR}/libgnumalloc.so.0.0
-${COMPAT_LIBDIR}/libkvm.so.5.0
-${COMPAT_LIBDIR}/libm.so.0.1
-${COMPAT_LIBDIR}/libntp.so.0.0
-${COMPAT_LIBDIR}/libobjc.so.0.0
-${COMPAT_LIBDIR}/libossaudio.so.0.0
-${COMPAT_LIBDIR}/libpcap.so.0.0
-${COMPAT_LIBDIR}/libposix.so.0.1
-${COMPAT_LIBDIR}/libresolv.so.1.0
-${COMPAT_LIBDIR}/libskey.so.0.0
-${COMPAT_LIBDIR}/libstdc++.so.2.0
-${COMPAT_LIBDIR}/libtelnet.so.1.0
-${COMPAT_LIBDIR}/libtermcap.so.0.0
-${COMPAT_LIBDIR}/libtermlib.so.0.0
-${COMPAT_LIBDIR}/libutil.so.5.0
-${COMPAT_LIBDIR}/libwrap.so.0.0
-${COMPAT_LIBDIR}/libz.so.0.1
-${COMPAT_XLIBDIR}/libICE.so.6.3
-${COMPAT_XLIBDIR}/libPEX5.so.6.0
-${COMPAT_XLIBDIR}/libSM.so.6.0
-${COMPAT_XLIBDIR}/libX11.so.6.1
-${COMPAT_XLIBDIR}/libXIE.so.6.0
-${COMPAT_XLIBDIR}/libXaw.so.6.1
-${COMPAT_XLIBDIR}/libXext.so.6.3
-${COMPAT_XLIBDIR}/libXi.so.6.0
-${COMPAT_XLIBDIR}/libXmu.so.6.0
-${COMPAT_XLIBDIR}/libXp.so.6.2
-${COMPAT_XLIBDIR}/libXt.so.6.0
-${COMPAT_XLIBDIR}/libXtst.so.6.1
-${COMPAT_XLIBDIR}/liboldX.so.6.0
diff --git a/emulators/compat14/PLIST.i386 b/emulators/compat14/PLIST.i386
deleted file mode 100644
index ce15faaf68d..00000000000
--- a/emulators/compat14/PLIST.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.i386,v 1.1 2001/10/31 23:56:39 zuntum Exp $
-${COMPAT_LIBDIR}/libi386.so.0.2
-${COMPAT_LIBDIR}/libkeycap.so.0.0
diff --git a/emulators/compat14/distinfo b/emulators/compat14/distinfo
deleted file mode 100644
index fc2ee32e8e3..00000000000
--- a/emulators/compat14/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/05/25 11:58:39 wiz Exp $
-
-SHA1 (compat14-i386-1.4.3.1.tar.gz) = 7c00ede3cf18bfc437e9262f0e583bde5f134004
-RMD160 (compat14-i386-1.4.3.1.tar.gz) = 7e1aba3308a3efec20384a1170f4b7b2d5e7ac72
-Size (compat14-i386-1.4.3.1.tar.gz) = 1646083 bytes
-SHA1 (compat14-sparc-1.4.3.1.tar.gz) = 9c0e46ced11f1f56fde79158edebb12898ea4ffa
-RMD160 (compat14-sparc-1.4.3.1.tar.gz) = 02a4eb94bb962889a74e9439fbb108b3b3d3e883
-Size (compat14-sparc-1.4.3.1.tar.gz) = 1831758 bytes
diff --git a/emulators/compat16/DESCR b/emulators/compat16/DESCR
deleted file mode 100644
index 8103a3feea2..00000000000
--- a/emulators/compat16/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package supplies the user files necessary for full compatibility
-with dynamically linked executables compiled under NetBSD 1.6.
diff --git a/emulators/compat16/MESSAGE b/emulators/compat16/MESSAGE
deleted file mode 100644
index 5721a8b720a..00000000000
--- a/emulators/compat16/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/12/14 04:17:18 grant Exp $
-
-You will need the option COMPAT_16 in your kernel configuration to make
-use of NetBSD 1.6 binaries.
-
-===========================================================================
diff --git a/emulators/compat16/Makefile b/emulators/compat16/Makefile
deleted file mode 100644
index 6a317abffd1..00000000000
--- a/emulators/compat16/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/10/19 19:37:38 wiz Exp $
-#
-
-DISTNAME=		compat16-${MACHINE_ARCH}-${VERSION}
-PKGNAME=		compat16-${VERSION}
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.6/index.html
-COMMENT=		Shared libraries for NetBSD 1.6 (and earlier) compatibility
-
-VERSION=		1.6.0
-
-ONLY_FOR_PLATFORM=	NetBSD-1.6[A-Z]*-i386 NetBSD-[2-9]*-i386
-NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
-
-NO_MTREE=		yes
-NO_BUILD=		yes
-NO_CONFIGURE=		yes
-CHECK_SHLIBS_SUPPORTED=	no
-
-EMULSUBDIR=		emul/netbsd16
-
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${EMULSUBDIR}
-	(cd ${WRKDIR}; ${PAX} -rw usr ${PREFIX}/${EMULSUBDIR})
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/compat16/PLIST.i386 b/emulators/compat16/PLIST.i386
deleted file mode 100644
index 18ee63171ee..00000000000
--- a/emulators/compat16/PLIST.i386
+++ /dev/null
@@ -1,138 +0,0 @@
-@comment $NetBSD: PLIST.i386,v 1.1.1.1 2003/12/14 04:17:18 grant Exp $
-${EMULSUBDIR}/usr/lib/libamu.so.2
-${EMULSUBDIR}/usr/lib/libamu.so.2.1
-${EMULSUBDIR}/usr/lib/libasn1.so.6
-${EMULSUBDIR}/usr/lib/libasn1.so.6.0
-${EMULSUBDIR}/usr/lib/libbz2.so.1
-${EMULSUBDIR}/usr/lib/libbz2.so.1.0
-${EMULSUBDIR}/usr/lib/libc.so.12
-${EMULSUBDIR}/usr/lib/libc.so.12.83
-${EMULSUBDIR}/usr/lib/libcdk.so.1
-${EMULSUBDIR}/usr/lib/libcdk.so.1.0
-${EMULSUBDIR}/usr/lib/libcom_err.so.4
-${EMULSUBDIR}/usr/lib/libcom_err.so.4.1
-${EMULSUBDIR}/usr/lib/libcrypt.so.0
-${EMULSUBDIR}/usr/lib/libcrypt.so.0.0
-${EMULSUBDIR}/usr/lib/libcrypto.so.1
-${EMULSUBDIR}/usr/lib/libcrypto.so.1.1
-${EMULSUBDIR}/usr/lib/libcurses.so.5
-${EMULSUBDIR}/usr/lib/libcurses.so.5.0
-${EMULSUBDIR}/usr/lib/libdes.so.6
-${EMULSUBDIR}/usr/lib/libdes.so.6.0
-${EMULSUBDIR}/usr/lib/i18n/libBIG5.so.4
-${EMULSUBDIR}/usr/lib/i18n/libBIG5.so.4.0
-${EMULSUBDIR}/usr/lib/i18n/libEUC.so.4
-${EMULSUBDIR}/usr/lib/i18n/libEUC.so.4.0
-${EMULSUBDIR}/usr/lib/i18n/libEUCTW.so.4
-${EMULSUBDIR}/usr/lib/i18n/libEUCTW.so.4.0
-${EMULSUBDIR}/usr/lib/i18n/libISO2022.so.4
-${EMULSUBDIR}/usr/lib/i18n/libISO2022.so.4.0
-${EMULSUBDIR}/usr/lib/i18n/libMSKanji.so.4
-${EMULSUBDIR}/usr/lib/i18n/libMSKanji.so.4.0
-${EMULSUBDIR}/usr/lib/i18n/libUTF8.so.4
-${EMULSUBDIR}/usr/lib/i18n/libUTF8.so.4.0
-${EMULSUBDIR}/usr/lib/libedit.so.2
-${EMULSUBDIR}/usr/lib/libedit.so.2.6
-${EMULSUBDIR}/usr/lib/libform.so.3
-${EMULSUBDIR}/usr/lib/libform.so.3.0
-${EMULSUBDIR}/usr/lib/libgnumalloc.so.0
-${EMULSUBDIR}/usr/lib/libgnumalloc.so.0.0
-${EMULSUBDIR}/usr/lib/libgssapi.so.4
-${EMULSUBDIR}/usr/lib/libgssapi.so.4.0
-${EMULSUBDIR}/usr/lib/libhdb.so.8
-${EMULSUBDIR}/usr/lib/libhdb.so.8.0
-${EMULSUBDIR}/usr/lib/libintl.so.0
-${EMULSUBDIR}/usr/lib/libintl.so.0.0
-${EMULSUBDIR}/usr/lib/libipsec.so.2
-${EMULSUBDIR}/usr/lib/libipsec.so.2.0
-${EMULSUBDIR}/usr/lib/libkadm.so.5
-${EMULSUBDIR}/usr/lib/libkadm.so.5.0
-${EMULSUBDIR}/usr/lib/libkadm5clnt.so.7
-${EMULSUBDIR}/usr/lib/libkadm5clnt.so.7.0
-${EMULSUBDIR}/usr/lib/libkadm5srv.so.8
-${EMULSUBDIR}/usr/lib/libkadm5srv.so.8.0
-${EMULSUBDIR}/usr/lib/libkafs.so.5
-${EMULSUBDIR}/usr/lib/libkafs.so.5.1
-${EMULSUBDIR}/usr/lib/libkdb.so.5
-${EMULSUBDIR}/usr/lib/libkdb.so.5.0
-${EMULSUBDIR}/usr/lib/libkrb.so.5
-${EMULSUBDIR}/usr/lib/libkrb.so.5.1
-${EMULSUBDIR}/usr/lib/libkrb5.so.18
-${EMULSUBDIR}/usr/lib/libkrb5.so.18.0
-${EMULSUBDIR}/usr/lib/libkstream.so.2
-${EMULSUBDIR}/usr/lib/libkstream.so.2.0
-${EMULSUBDIR}/usr/lib/libkvm.so.5
-${EMULSUBDIR}/usr/lib/libkvm.so.5.1
-${EMULSUBDIR}/usr/lib/libm.so.0
-${EMULSUBDIR}/usr/lib/libm.so.0.1
-${EMULSUBDIR}/usr/lib/libmenu.so.4
-${EMULSUBDIR}/usr/lib/libmenu.so.4.0
-${EMULSUBDIR}/usr/lib/libobjc.so.1
-${EMULSUBDIR}/usr/lib/libobjc.so.1.0
-${EMULSUBDIR}/usr/lib/libossaudio.so.0
-${EMULSUBDIR}/usr/lib/libossaudio.so.0.0
-${EMULSUBDIR}/usr/lib/libpcap.so.1
-${EMULSUBDIR}/usr/lib/libpcap.so.1.2
-${EMULSUBDIR}/usr/lib/libpci.so.0
-${EMULSUBDIR}/usr/lib/libpci.so.0.0
-${EMULSUBDIR}/usr/lib/libposix.so.0
-${EMULSUBDIR}/usr/lib/libposix.so.0.1
-${EMULSUBDIR}/usr/lib/libresolv.so.1
-${EMULSUBDIR}/usr/lib/libresolv.so.1.0
-${EMULSUBDIR}/usr/lib/libroken.so.12
-${EMULSUBDIR}/usr/lib/libroken.so.12.2
-${EMULSUBDIR}/usr/lib/libskey.so.1
-${EMULSUBDIR}/usr/lib/libskey.so.1.0
-${EMULSUBDIR}/usr/lib/libsl.so.2
-${EMULSUBDIR}/usr/lib/libsl.so.2.0
-${EMULSUBDIR}/usr/lib/libss.so.4
-${EMULSUBDIR}/usr/lib/libss.so.4.0
-${EMULSUBDIR}/usr/lib/libssl.so.2
-${EMULSUBDIR}/usr/lib/libssl.so.2.1
-${EMULSUBDIR}/usr/lib/libstdc++.so.4
-${EMULSUBDIR}/usr/lib/libstdc++.so.4.0
-${EMULSUBDIR}/usr/lib/libtelnet.so.4
-${EMULSUBDIR}/usr/lib/libtelnet.so.4.0
-${EMULSUBDIR}/usr/lib/libtermcap.so.0
-${EMULSUBDIR}/usr/lib/libtermcap.so.0.5
-${EMULSUBDIR}/usr/lib/libtermlib.so.0
-${EMULSUBDIR}/usr/lib/libtermlib.so.0.5
-${EMULSUBDIR}/usr/lib/libusbhid.so.1
-${EMULSUBDIR}/usr/lib/libusbhid.so.1.0
-${EMULSUBDIR}/usr/lib/libutil.so.6
-${EMULSUBDIR}/usr/lib/libutil.so.6.0
-${EMULSUBDIR}/usr/lib/libwrap.so.0
-${EMULSUBDIR}/usr/lib/libwrap.so.0.2
-${EMULSUBDIR}/usr/lib/libz.so.0
-${EMULSUBDIR}/usr/lib/libz.so.0.2
-${EMULSUBDIR}/usr/libexec/ld.elf_so
-${EMULSUBDIR}/usr/libexec/ld.so
-${EMULSUBDIR}/usr/X11R6/lib/libICE.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libICE.so.6.3
-${EMULSUBDIR}/usr/X11R6/lib/libSM.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libSM.so.6.0
-${EMULSUBDIR}/usr/X11R6/lib/libX11.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libX11.so.6.2
-${EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6.1
-${EMULSUBDIR}/usr/X11R6/lib/libXext.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libXext.so.6.4
-${EMULSUBDIR}/usr/X11R6/lib/libXi.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libXi.so.6.0
-${EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6.2
-${EMULSUBDIR}/usr/X11R6/lib/libXp.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libXp.so.6.2
-${EMULSUBDIR}/usr/X11R6/lib/libXt.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libXt.so.6.0
-${EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6.1
-${EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6
-${EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6.0
-@dirrm ${EMULSUBDIR}/usr/X11R6/lib
-@dirrm ${EMULSUBDIR}/usr/X11R6
-@dirrm ${EMULSUBDIR}/usr/libexec
-@dirrm ${EMULSUBDIR}/usr/lib/i18n
-@dirrm ${EMULSUBDIR}/usr/lib
-@dirrm ${EMULSUBDIR}/usr
-@dirrm ${EMULSUBDIR}
diff --git a/emulators/compat16/distinfo b/emulators/compat16/distinfo
deleted file mode 100644
index d9836c02ec8..00000000000
--- a/emulators/compat16/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:18 agc Exp $
-
-SHA1 (compat16-i386-1.6.0.tar.bz2) = 04c2fc19591941bb4ae79a2a909e5871b37dc33a
-RMD160 (compat16-i386-1.6.0.tar.bz2) = 175e64b53435ae1c2af3a143f3001ba6df7dad20
-Size (compat16-i386-1.6.0.tar.bz2) = 2478593 bytes
diff --git a/emulators/cygwin_esound/DESCR b/emulators/cygwin_esound/DESCR
deleted file mode 100644
index 6dd498f93cc..00000000000
--- a/emulators/cygwin_esound/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is the Enlightened Sound Daemon (EsounD) for Cygwin, providing the
-ability for Interix applications to output sound via the libesd client
-side library (audio/esound).
diff --git a/emulators/cygwin_esound/Makefile b/emulators/cygwin_esound/Makefile
deleted file mode 100644
index dd08f28f073..00000000000
--- a/emulators/cygwin_esound/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2006/03/22 22:50:32 tv Exp $
-#
-
-DISTNAME=		esound-0.2.35-1
-PKGNAME=		${DISTNAME:S/-/!/:S/-/./g:S/!/-/:S/^/cygwin_/}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_CYGWIN:=release/esound/} \
-			${MASTER_SITE_CYGWIN:=release/esound/libesound0/} \
-			${MASTER_SITE_CYGWIN:=release/audiofile/libaudiofile0/}
-EXTRACT_SUFX=		.tar.bz2
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
-			libesound0-0.2.35-1.tar.bz2 \
-			libaudiofile0-0.2.6-2.tar.bz2
-
-MAINTAINER=		tv@NetBSD.org
-COMMENT=		Enlightened sound daemon (daemon only) for Cygwin/Interix
-
-ONLY_FOR_PLATFORM=	Interix-*-*
-
-DIST_SUBDIR=		cygwin
-WRKSRC=			${WRKDIR}
-
-RCD_SCRIPTS=		cygwin_esd
-INSTALLATION_DIRS=	bin emul/cygwin/bin
-
-do-build: # nothing
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/cygaudiofile-0.dll ${PREFIX}/bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/cygesd-0.dll ${PREFIX}/bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/esd.exe ${PREFIX}/emul/cygwin/bin/
-
-.include "../../emulators/cygwin_lib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/cygwin_esound/PLIST b/emulators/cygwin_esound/PLIST
deleted file mode 100644
index e99636f0ca5..00000000000
--- a/emulators/cygwin_esound/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/02 20:33:59 reed Exp $
-bin/cygaudiofile-0.dll
-bin/cygesd-0.dll
-emul/cygwin/bin/esd.exe
-share/examples/rc.d/cygwin_esd
diff --git a/emulators/cygwin_esound/distinfo b/emulators/cygwin_esound/distinfo
deleted file mode 100644
index 15147db330a..00000000000
--- a/emulators/cygwin_esound/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/05/25 11:59:45 wiz Exp $
-
-SHA1 (cygwin/esound-0.2.35-1.tar.bz2) = 40dd08cfbf4aae24b8c2448c6038815e2ea21239
-RMD160 (cygwin/esound-0.2.35-1.tar.bz2) = 271d1bfe3d7fcf2180cc9194ec7e2c66bc1b641d
-Size (cygwin/esound-0.2.35-1.tar.bz2) = 125137 bytes
-SHA1 (cygwin/libesound0-0.2.35-1.tar.bz2) = 3219452e22a516995aa48713ad0a5999ff8e681a
-RMD160 (cygwin/libesound0-0.2.35-1.tar.bz2) = a31a073a8f0d76cf3ef90759d0be79229842beb8
-Size (cygwin/libesound0-0.2.35-1.tar.bz2) = 11251 bytes
-SHA1 (cygwin/libaudiofile0-0.2.6-2.tar.bz2) = 7c568a4366214e69810fefe62923beafd92ea6c1
-RMD160 (cygwin/libaudiofile0-0.2.6-2.tar.bz2) = 7d808b0cba96b05fedc932b4445a7a5b6be58435
-Size (cygwin/libaudiofile0-0.2.6-2.tar.bz2) = 58049 bytes
diff --git a/emulators/cygwin_esound/files/cygwin_esd.sh b/emulators/cygwin_esound/files/cygwin_esd.sh
deleted file mode 100644
index 44dad82f7b8..00000000000
--- a/emulators/cygwin_esound/files/cygwin_esd.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: cygwin_esd.sh,v 1.2 2004/10/11 21:02:53 tv Exp $
-#
-# PROVIDE: cygwin_esd
-# REQUIRE: DAEMON
-
-name="cygwin_esd"
-command="@PREFIX@/emul/cygwin/bin/esd.exe"
-command_args="-tcp"
-
-if [ ! -d /etc/rc.d ]
-then
-	@ECHO@ -n ' ${name}'
-	${command} ${command_args} &
-	exit
-fi
-
-. /etc/rc.subr
-
-load_rc_config $name
-command_args="${command_args} &"
-run_rc_command "$1"
diff --git a/emulators/cygwin_lib/DESCR b/emulators/cygwin_lib/DESCR
deleted file mode 100644
index 6803bc9da51..00000000000
--- a/emulators/cygwin_lib/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a package, mainly for Interix, that provides basic Cygwin
-functionality for emulation purposes.  This allows some Cygwin binaries to
-provide gatewaying services to Interix processes where "native" Interix
-services are unavailable.
diff --git a/emulators/cygwin_lib/Makefile b/emulators/cygwin_lib/Makefile
deleted file mode 100644
index 18da077c8b2..00000000000
--- a/emulators/cygwin_lib/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2006/03/22 22:50:32 tv Exp $
-#
-
-DISTNAME=		cygwin-1.5.13-1
-PKGNAME=		${DISTNAME:S/-/!/:S/-/./g:S/!/_lib-/}
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_CYGWIN:=release/cygwin/}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		tv@NetBSD.org
-HOMEPAGE=		http://www.cygwin.com/
-COMMENT=		Basic Cygwin library and executables for emulation
-
-ONLY_FOR_PLATFORM=	Interix-*-*
-
-DIST_SUBDIR=		cygwin
-WRKSRC=			${WRKDIR}
-
-SYMLINKS=		cygpath ipcrm ipcs kill mount ps regtool umount
-INSTALLATION_DIRS=	bin emul/cygwin/bin
-
-do-build: # nothing
-
-do-install:
-	${INSTALL_LIB} ${WRKSRC}/usr/bin/cygwin1.dll ${PREFIX}/bin/
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/emul/cygwin ${PREFIX}/emul/cygwin/bin
-	@for f in ${WRKSRC}/usr/bin/*.exe; do \
-		${INSTALL_LIB} $$f ${PREFIX}/emul/cygwin/bin/$$(basename $${f%.exe}); \
-	done
-.for f in ${SYMLINKS}
-	${LN} -sf ../emul/cygwin/bin/${f} ${PREFIX}/bin/cygwin-${f}
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/cygwin_lib/PLIST b/emulators/cygwin_lib/PLIST
deleted file mode 100644
index f509a0c9891..00000000000
--- a/emulators/cygwin_lib/PLIST
+++ /dev/null
@@ -1,29 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/11/29 02:10:48 tv Exp $
-bin/cygwin1.dll
-bin/cygwin-cygpath
-bin/cygwin-ipcrm
-bin/cygwin-ipcs
-bin/cygwin-kill
-bin/cygwin-mount
-bin/cygwin-ps
-bin/cygwin-regtool
-bin/cygwin-umount
-emul/cygwin/bin/cygcheck
-emul/cygwin/bin/cygpath
-emul/cygwin/bin/dumper
-emul/cygwin/bin/getfacl
-emul/cygwin/bin/ipcrm
-emul/cygwin/bin/ipcs
-emul/cygwin/bin/kill
-emul/cygwin/bin/mkgroup
-emul/cygwin/bin/mkpasswd
-emul/cygwin/bin/mount
-emul/cygwin/bin/passwd
-emul/cygwin/bin/ps
-emul/cygwin/bin/regtool
-emul/cygwin/bin/setfacl
-emul/cygwin/bin/ssp
-emul/cygwin/bin/strace
-emul/cygwin/bin/umount
-@dirrm emul/cygwin/bin
-@dirrm emul/cygwin
diff --git a/emulators/cygwin_lib/buildlink3.mk b/emulators/cygwin_lib/buildlink3.mk
deleted file mode 100644
index a8a17e99f08..00000000000
--- a/emulators/cygwin_lib/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:49 jlam Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CYGWIN_LIB_BUILDLINK3_MK:=	${CYGWIN_LIB_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	cygwin_lib
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncygwin_lib}
-BUILDLINK_PACKAGES+=	cygwin_lib
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cygwin_lib
-
-.if !empty(CYGWIN_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.cygwin_lib+=		cygwin_lib>=1.5.11.1
-BUILDLINK_PKGSRCDIR.cygwin_lib?=	../../emulators/cygwin_lib
-.endif	# CYGWIN_LIB_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/emulators/cygwin_lib/distinfo b/emulators/cygwin_lib/distinfo
deleted file mode 100644
index 02c4c6355a9..00000000000
--- a/emulators/cygwin_lib/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/03/29 23:30:26 tv Exp $
-
-SHA1 (cygwin/cygwin-1.5.13-1.tar.bz2) = c882483995805609a71c80d3a1764740566eecf5
-RMD160 (cygwin/cygwin-1.5.13-1.tar.bz2) = f266a256a864a5b3502805c12b921d66b73a0f14
-Size (cygwin/cygwin-1.5.13-1.tar.bz2) = 1209375 bytes
diff --git a/emulators/darcnes/DESCR b/emulators/darcnes/DESCR
deleted file mode 100644
index 79ec1913038..00000000000
--- a/emulators/darcnes/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-DarcNES is a multi-system emulator. Some of the systems it emulates
-are
-  o Sega Master System, Sega Game Gear (with sound)
-  o Nintende Entertainment System (with sound)
-  o PC-Engine
-and in development is support for
-  o Colecovision
-  o Sega Megadrive, also known as Sega Genesis
-  o Apple ][
-
-The keys are: 'A', 'S', '[', ']', arrows, and escape.
-
-By Nyef (Alastair Bridgewater).
diff --git a/emulators/darcnes/Makefile b/emulators/darcnes/Makefile
deleted file mode 100644
index 0fec8d4e896..00000000000
--- a/emulators/darcnes/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2007/02/15 22:20:15 joerg Exp $
-
-PKGNAME=	darcnes-20010401
-PKGREVISION=	2
-
-MAINTAINER=	wiz@NetBSD.org
-COMMENT=	Multi-system emulator (NES, SMS, GG, PCE, and others)
-
-MAKE_ENV+=	TARGET=Linux_X
-
-INSTALLATION_DIRS=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/darcnes ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/darcnes
-	${INSTALL_MAN} ${WRKSRC}/readme ${PREFIX}/share/doc/darcnes
-
-.include "Makefile.common"
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/darcnes/Makefile.common b/emulators/darcnes/Makefile.common
deleted file mode 100644
index 9588b2ac132..00000000000
--- a/emulators/darcnes/Makefile.common
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile.common,v 1.9 2005/05/22 20:07:57 jlam Exp $
-
-DISTNAME=	dn9b0401
-CATEGORIES=	emulators
-MASTER_SITES=	http://www.dridus.com/~nyef/darcnes/download/
-EXTRACT_SUFX=	.tgz
-
-HOMEPAGE=	http://www.dridus.com/~nyef/darcnes/
-
-LICENSE=	no-commercial-use
-
-WRKSRC=		${WRKDIR}/darcnes
-USE_TOOLS+=	gmake
-PATCHDIR=	${.CURDIR}/../../emulators/darcnes/patches
-DISTINFO_FILE=	${.CURDIR}/../../emulators/darcnes/distinfo
-
-# tool.c causes the sunpro acomp process to spin on the CPU.
-NOT_FOR_COMPILER=	sunpro
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ( ${OBJECT_FMT} == "a.out" )
-MAKE_FLAGS+=	ASM_FLAGS=-DASM_UNDERBARS
-MAKE_FLAGS+=	NO_MULTIPLE_COMMON_WARNING=-DNO_MULTIPLE_COMMON_WARNING
-.endif
-
-.if ( ${MACHINE_ARCH} == "i386" )
-MAKE_FLAGS+=	MACH_TYPES=-DMACH_TYPES=\\\"types-i386.h\\\"
-.else
-MAKE_FLAGS+=	C_ONLY=-DC_ONLY
-.endif
diff --git a/emulators/darcnes/PLIST b/emulators/darcnes/PLIST
deleted file mode 100644
index 5187d8ed51b..00000000000
--- a/emulators/darcnes/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:31 zuntum Exp $
-bin/darcnes
-share/doc/darcnes/readme
-@dirrm share/doc/darcnes
diff --git a/emulators/darcnes/distinfo b/emulators/darcnes/distinfo
deleted file mode 100644
index 795d1ed510e..00000000000
--- a/emulators/darcnes/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/12/20 14:11:03 joerg Exp $
-
-SHA1 (dn9b0401.tgz) = 3158ae8bd53891c2d17989cbb9d03493f1511132
-RMD160 (dn9b0401.tgz) = 82201c3a2da113fa39edeb9ea675ddeceeec2bf3
-Size (dn9b0401.tgz) = 199963 bytes
-SHA1 (patch-aa) = e7d2631d41d7914ed650a450a75f47ef711a3ca0
-SHA1 (patch-ab) = 896a42a538f8a54da70fc3e8d0d01ac13eeb151d
-SHA1 (patch-ad) = 1b3b493b41402edab814b6addaf19cc44dc2e8eb
-SHA1 (patch-ae) = b4a1029aebc356f10a90df35dcf3c392232a8c05
-SHA1 (patch-af) = 470abb49e62e0b508893c0a32e3248635395896a
-SHA1 (patch-ag) = 9a2689d2a0a18574a53c52404e380672cebefb54
-SHA1 (patch-ah) = caab7e9e0d3489883f242ab305f8534e99de9bca
-SHA1 (patch-ai) = f0c05c73ef4dae953edcd0dfde31e259c2632920
-SHA1 (patch-aj) = fd6f3c3eec4cc9353b12a896d6d8e8cd73b40e57
diff --git a/emulators/darcnes/patches/patch-aa b/emulators/darcnes/patches/patch-aa
deleted file mode 100644
index eb9c7144612..00000000000
--- a/emulators/darcnes/patches/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2001/07/08 18:12:00 wiz Exp $
-
---- Makefile.orig	Wed Mar 28 02:51:41 2001
-+++ Makefile
-@@ -11,16 +11,16 @@
- 
- #C_ONLY=-DC_ONLY
- 
--MACH_TYPES=-DMACH_TYPES=\"types-i386.h\"
-+#MACH_TYPES=-DMACH_TYPES=\"types-i386.h\"
- 
- #BYTE_ORDER=-DMSB_FIRST
--BYTE_ORDER=-DLSB_FIRST
-+#BYTE_ORDER=-DLSB_FIRST
- 
- DEBUG=-g
- 
- OPTFLAGS=-O2 -fomit-frame-pointer
- 
--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)
- BASE_LDFLAGS=
- 
-@@ -43,9 +43,9 @@
- #
- ifeq ($(TARGET),Linux_X)
- CONFFLAGS=-DPCE_CD_SUPPORT -DSOUND
--LDFLAGS+=-L/usr/X11R6/lib
--CFLAGS+=-I/usr/X11R6/include
--SFLAGS+=-I/usr/X11R6/include
-+LDFLAGS+=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib
-+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
diff --git a/emulators/darcnes/patches/patch-ab b/emulators/darcnes/patches/patch-ab
deleted file mode 100644
index f21a578121c..00000000000
--- a/emulators/darcnes/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2003/09/17 07:15:34 wiz Exp $
-
---- ui_x.c.orig	Mon Oct 30 23:15:31 2000
-+++ ui_x.c
-@@ -177,6 +177,12 @@ int main(int argc, char *argv[])
- 	return 1;
-     }
- 
-+    if (romfile == NULL) {
-+	printf("rom not specified.\n");
-+	usage(argv[0]);
-+	return 1;
-+    }
-+
-     initialize_window(display);
- 
-     activate_system(system_type, romfile);
diff --git a/emulators/darcnes/patches/patch-ad b/emulators/darcnes/patches/patch-ad
deleted file mode 100644
index 7ce6c8326f4..00000000000
--- a/emulators/darcnes/patches/patch-ad
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2000/06/03 10:57:12 wiz Exp $
-
---- 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
-+
-+#include <sys/param.h>
-+
-+#if (defined(BSD) && (BSD >= 199306))
-+/* this should filter out NetBSD, FreeBSD and OpenBSD */
-+#include <machine/endian.h>
-+
-+#if BYTE_ORDER == BIG_ENDIAN
-+#define MSB_FIRST 1
-+#undef LSB_FIRST
-+#else
-+#define LSB_FIRST 1
-+#undef MSB_FIRST
-+#endif
-+
-+#else
-+/* for Linux, perhaps use #ifdef __linux__? */
-+#include <sys/types.h>
-+
-+#if defined(__BYTE_ORDER)
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+#define MSB_FIRST 1
-+#undef LSB_FIRST
-+#else
-+#define LSB_FIRST 1
-+#undef MSB_FIRST
-+#endif /* __BYTE_ORDER == __BIG_ENDIAN */
-+
-+#else /* defined(__BYTE_ORDER) */
-+
-+/* not Linux, either, just set it to LSB */
-+#define LSB_FIRST 1
-+#undef MSB_FIRST
-+
-+#endif /* defined(__BYTE_ORDER) */
-+
-+#endif /* defined(BSD) && (BSD >= 199306) */
-+
-+#endif /* __HAD_MY_ENDIAN_H */
diff --git a/emulators/darcnes/patches/patch-ae b/emulators/darcnes/patches/patch-ae
deleted file mode 100644
index 4981435baae..00000000000
--- a/emulators/darcnes/patches/patch-ae
+++ /dev/null
@@ -1,9 +0,0 @@
-$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	Thu Jun  1 02:43:05 2000
-@@ -11,2 +11,4 @@
- 
-+#include "endian.h"
-+
- typedef unsigned char byte;
diff --git a/emulators/darcnes/patches/patch-af b/emulators/darcnes/patches/patch-af
deleted file mode 100644
index 512040ac3af..00000000000
--- a/emulators/darcnes/patches/patch-af
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-af,v 1.4 2000/10/28 23:04:31 wiz Exp $
-
---- cd_unix.c.orig	Sun Aug 20 03:25:53 2000
-+++ cd_unix.c
-@@ -62,7 +62,6 @@
- 
- void cd_play_track(u8 track)
- {
--#ifdef SYSTEM_FREEBSD
-     struct ioc_play_track playtrack;
- 
-     /* FIXME: CD keeps playing after program quits */
-@@ -74,12 +73,10 @@
-     playtrack.end_index = 1;
- 
-     ioctl(cd_drive, CDIOCPLAYTRACKS, &playtrack);
--#endif
- }
- 
- void cd_play_lba(u32 from, u32 to, int repeat)
- {
--#ifdef SYSTEM_FREEBSD
-     struct ioc_play_blocks playblocks;
- 
-     /* FIXME: ignores the repeat flag */
-@@ -94,7 +91,6 @@
-     playblocks.len = to - from;
- 
-     ioctl(cd_drive, CDIOCPLAYBLOCKS, &playblocks);
--#endif
- }
- 
- #ifdef SYSTEM_LINUX
diff --git a/emulators/darcnes/patches/patch-ag b/emulators/darcnes/patches/patch-ag
deleted file mode 100644
index 3c8cf6d2c85..00000000000
--- a/emulators/darcnes/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2000/06/03 10:57:13 wiz Exp $
-
---- 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"
- #include "system.h"
-+#include "endian.h"
- 
- unsigned long system_flags;
- 
diff --git a/emulators/darcnes/patches/patch-ah b/emulators/darcnes/patches/patch-ah
deleted file mode 100644
index f6b618d3900..00000000000
--- a/emulators/darcnes/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$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	Thu Jun  1 02:43:11 2000
-@@ -13,6 +13,8 @@
- #include MACH_TYPES
- #endif
- 
-+#include "endian.h"
-+
- typedef unsigned char u8;
- typedef signed char s8;
- 
diff --git a/emulators/darcnes/patches/patch-ai b/emulators/darcnes/patches/patch-ai
deleted file mode 100644
index 793fac67eff..00000000000
--- a/emulators/darcnes/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/12/20 14:11:03 joerg Exp $
-
---- video_x.c.orig	2005-12-20 13:56:32.000000000 +0000
-+++ video_x.c
-@@ -366,6 +366,7 @@ void handle_joypad_key(int type, KeySym 
- 	}
- 	
-     default:
-+	break;
-     }
- }
- 
diff --git a/emulators/darcnes/patches/patch-aj b/emulators/darcnes/patches/patch-aj
deleted file mode 100644
index 213fe71366b..00000000000
--- a/emulators/darcnes/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/12/20 14:11:03 joerg Exp $
-
---- unixdep.h.orig	2005-12-20 13:59:22.000000000 +0000
-+++ unixdep.h
-@@ -11,7 +11,7 @@
- 
- #include <sys/param.h>
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #define SYSTEM_FREEBSD
- #endif
- 
diff --git a/emulators/darwin_lib/DESCR b/emulators/darwin_lib/DESCR
deleted file mode 100644
index 3565b372b3c..00000000000
--- a/emulators/darwin_lib/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-These libraries are part of the Darwin compatibility option for
-NetBSD/powerpc and NetBSD/i386.
-
-The kernel options `EXEC_MACHO', `COMPAT_MACH' and `COMPAT_DARWIN'
-must be in your kernel config file for this to work.
diff --git a/emulators/darwin_lib/INSTALL b/emulators/darwin_lib/INSTALL
deleted file mode 100644
index ef08760521b..00000000000
--- a/emulators/darwin_lib/INSTALL
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: INSTALL,v 1.1 2006/06/23 15:52:34 jlam Exp $
-
-case "${STAGE}" in
-POST-INSTALL)
-	emulsubdir=darwin
-
-	emuldir="/emul/$emulsubdir"
-	pkgemuldir="${PKG_PREFIX}/emul/$emulsubdir"
-
-	emuldir_pwd=`cd $emuldir 2>/dev/null && ${PWD_CMD}`
-	pkgemuldir_pwd=`cd $pkgemuldir 2>/dev/null && ${PWD_CMD}`
-
-	if ${TEST} "$emuldir_pwd" != "$pkgemuldir_pwd"; then
-		if ${TEST} -e $emuldir -o -L $emuldir; then
-			${CAT} << EOF
-==============================================================================
-You must create a symbolic link for ${PKGNAME} to work properly:
-
-	$pkgemuldir  ->  $emuldir
-
-It seems there is something else located at $emuldir.
-==============================================================================
-EOF
-		else
-			${MKDIR} -p `${DIRNAME} $emuldir` && 
-			${LN} -fs $pkgemuldir $emuldir
-		fi
-	fi
-	;;
-esac
diff --git a/emulators/darwin_lib/MESSAGE b/emulators/darwin_lib/MESSAGE
deleted file mode 100644
index 0b980cfb286..00000000000
--- a/emulators/darwin_lib/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2006/07/02 10:05:55 rillig Exp $
-
-Do not forget to include EXEC_MACHO, COMPAT_MACH, and COMPAT_DARWIN
-in your kernel configuration file.  Darwin binaries require these
-options in order to work.
-===========================================================================
diff --git a/emulators/darwin_lib/Makefile b/emulators/darwin_lib/Makefile
deleted file mode 100644
index b8db3b00bf0..00000000000
--- a/emulators/darwin_lib/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/07/02 10:05:55 rillig Exp $
-
-DISTNAME=	darwin_lib-6.6.2
-PKGREVISION=	2
-CATEGORIES=	emulators
-MASTER_SITES=	http://www.opendarwin.org/downloads/6.6.2/RPMS/ \
-		http://www.opendarwin.org/downloads/6.6.2/RPMS/${DARWIN_ARCH}/
-DISTFILES=	org.opendarwin.Libsystem-6.6.2-4.fat.rpm \
-		org.opendarwin.Libm-6.6.2-4.fat.rpm \
-		org.opendarwin.cctools-6.6.2-4.fat.rpm \
-		org.opendarwin.ncurses-6.6.2-4.fat.rpm \
-		org.opendarwin.IOKitUser-6.6.2-4.fat.rpm \
-		org.opendarwin.XFree86-6.6.2-4.${DARWIN_ARCH}.rpm
-
-MAINTAINER=	abacau@yahoo.com.au
-HOMEPAGE=	http://www.opendarwin.org/
-COMMENT=	Darwin compatibility libraries (including X11)
-
-BUILD_DEPENDS+=	rpm2pkg>=1.3:../../pkgtools/rpm2pkg
-
-ONLY_FOR_PLATFORM=	NetBSD-1.6Z*-powerpc NetBSD-1.6Z*-i386 \
-			NetBSD-[2-9]*-powerpc NetBSD-[2-9]*-i386
-
-PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-
-DARWIN_ARCH=	${MACHINE_ARCH:C/powerpc/ppc/}
-
-RPM2PKG=	rpm2pkg
-RPMARGS=	-d ${PREFIX} -f ${WRKDIR}/PLIST_RPM2PKG -p emul/darwin	\
-		-i ./Developer -i ./usr/X11R6/lib/X11/doc/html		\
-		-i ./usr/share/man -i ./usr/include -i ./usr/X11R6/man	\
-		-i ./usr/X11R6/include -i ./usr/local/include		\
-		-i ./usr/local/man					\
-		${DISTFILES:S/^/${DISTDIR}\//}
-
-EXTRACT_ONLY=	# empty
-NO_BUILD=	yes
-
-do-install:
-	${RM} -f ${WRKDIR}/PLIST_RPM2PKG
-	${RPM2PKG} ${RPMARGS}
-	${SED} -e 's|^\./||' -e 's|/\./|/|g' -e 's|//*|/|g'		\
-		${WRKDIR}/PLIST_RPM2PKG > ${PLIST_SRC}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/darwin_lib/distinfo b/emulators/darwin_lib/distinfo
deleted file mode 100644
index 7df95b57cc7..00000000000
--- a/emulators/darwin_lib/distinfo
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 18:49:18 agc Exp $
-
-SHA1 (org.opendarwin.Libsystem-6.6.2-4.fat.rpm) = 933ede3dd6ea4188e66529ed9378db92c1934e0b
-RMD160 (org.opendarwin.Libsystem-6.6.2-4.fat.rpm) = 7732537e35f965d9ed34665dfebbbcb2ed662ab3
-Size (org.opendarwin.Libsystem-6.6.2-4.fat.rpm) = 6155242 bytes
-SHA1 (org.opendarwin.Libm-6.6.2-4.fat.rpm) = 5a7a7311e929a8f4867f0c7bd43c64e7fe450b08
-RMD160 (org.opendarwin.Libm-6.6.2-4.fat.rpm) = ed13229c4b94808fc1749f18e86e318f4fd24302
-Size (org.opendarwin.Libm-6.6.2-4.fat.rpm) = 463844 bytes
-SHA1 (org.opendarwin.cctools-6.6.2-4.fat.rpm) = 13c4d5a19ee63c008e11ef950b8d0c1b34852d3f
-RMD160 (org.opendarwin.cctools-6.6.2-4.fat.rpm) = 625a4598a8451ba054371f0dbb4934af39176510
-Size (org.opendarwin.cctools-6.6.2-4.fat.rpm) = 5060022 bytes
-SHA1 (org.opendarwin.ncurses-6.6.2-4.fat.rpm) = e20ffe8d410f456fe59ff27f4759a3f02869146c
-RMD160 (org.opendarwin.ncurses-6.6.2-4.fat.rpm) = 175dc483f3bd9f803cb666b3a38308311ec88410
-Size (org.opendarwin.ncurses-6.6.2-4.fat.rpm) = 1653506 bytes
-SHA1 (org.opendarwin.IOKitUser-6.6.2-4.fat.rpm) = 34199c0e0fc298df262c04886b0fce8fa9ea5e66
-RMD160 (org.opendarwin.IOKitUser-6.6.2-4.fat.rpm) = cf4e18543226dd9a53c2baa2c08b1ad85dbbcc09
-Size (org.opendarwin.IOKitUser-6.6.2-4.fat.rpm) = 418276 bytes
-SHA1 (org.opendarwin.XFree86-6.6.2-4.i386.rpm) = 3e5c5c6c9ad8e2508646520254d94869481a4d9d
-RMD160 (org.opendarwin.XFree86-6.6.2-4.i386.rpm) = 209b8de0981bcba7c9cc65af7f00bd286529706a
-Size (org.opendarwin.XFree86-6.6.2-4.i386.rpm) = 48481414 bytes
diff --git a/emulators/dega/DESCR b/emulators/dega/DESCR
deleted file mode 100644
index 288dfaef060..00000000000
--- a/emulators/dega/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Dega is a Sega Master System, Sega Mark III and Sega Game Gear emulator.
-It uses the SDL library.
diff --git a/emulators/dega/Makefile b/emulators/dega/Makefile
deleted file mode 100644
index b16da4d233a..00000000000
--- a/emulators/dega/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/06/12 16:28:06 wiz Exp $
-#
-
-DISTNAME=	dega-1.07
-PKGREVISION=	5
-CATEGORIES=	emulators
-MASTER_SITES=	http://www.emulinks.de/emus/
-
-MAINTAINER=	pancake@phreaker.net
-HOMEPAGE=	http://www.finalburn.com/dega/
-COMMENT=	Sega Game Gear, Sega Mark III and Sega Master System emulator
-
-BUILD_DEPENDS+=	nasm>=0.98:../../devel/nasm
-
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake
-
-# Uses i386 assembly code
-ONLY_FOR_PLATFORM=	*-*-i386
-
-INSTALLATION_DIRS=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dega ${PREFIX}/bin
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/dega/PLIST b/emulators/dega/PLIST
deleted file mode 100644
index c0955dfe944..00000000000
--- a/emulators/dega/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/14 19:10:01 jmmv Exp $
-bin/dega
diff --git a/emulators/dega/distinfo b/emulators/dega/distinfo
deleted file mode 100644
index 17e4605aff0..00000000000
--- a/emulators/dega/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:18 agc Exp $
-
-SHA1 (dega-1.07.tar.gz) = 1401e5af566bc3e7658a4552940219688c082ce8
-RMD160 (dega-1.07.tar.gz) = a20ad5d4ec47b3a8e65e64355557b6018a9dcfc4
-Size (dega-1.07.tar.gz) = 85189 bytes
diff --git a/emulators/dgen/DESCR b/emulators/dgen/DESCR
deleted file mode 100644
index ad2915c8459..00000000000
--- a/emulators/dgen/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-This is DGen/SDL, a semi-fantastic emulator for Unix-esque operating systems
-supported by the Simple DirectMedia Layer (SDL) library. It produces a virtual
-environment in which Sega Genesis (MegaDrive outside the US) games may run
-with fairly accurate audio and video.
diff --git a/emulators/dgen/Makefile b/emulators/dgen/Makefile
deleted file mode 100644
index 290fc9f42c2..00000000000
--- a/emulators/dgen/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/12/03 17:07:41 xtraeme Exp $
-#
-
-DISTNAME=	dgen-sdl-1.23
-PKGREVISION=	5
-CATEGORIES=	emulators
-MASTER_SITES=	http://www.pknet.com/~joe/
-
-MAINTAINER=	pancake@phreaker.net
-HOMEPAGE=	http://www.pknet.com/~joe/dgen-sdl.html
-COMMENT=	Genesis/Megadrive emulator for Unix platforms
-
-.if ${MACHINE_ARCH} == "i386"
-DEPENDS+=	nasm-[0-9]*:../../devel/nasm
-.endif
-
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake
-GNU_CONFIGURE=	yes
-
-CONFIGURE_ARGS+=	--with-extra-opt
-
-BUILDLINK_TRANSFORM+=	rm:-mpentium
-BUILDLINK_TRANSFORM+=	rm:-march=pentium
-BUILDLINK_TRANSFORM+=	rm:-fno-rtti
-
-.include "../../mk/compiler.mk"
-.if !empty(CC_VERSION:Mgcc-[34]*)
-BUILDLINK_TRANSFORM+=	'opt:-m\(align-loops.*\):-f\1'
-BUILDLINK_TRANSFORM+=	'opt:-m\(align-jumps.*\):-f\1'
-BUILDLINK_TRANSFORM+=	'opt:-m\(align-functions.*\):-f\1'
-.endif
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/dgen/PLIST b/emulators/dgen/PLIST
deleted file mode 100644
index bbe37fe7ad3..00000000000
--- a/emulators/dgen/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/25 04:53:23 xtraeme Exp $
-bin/dgen
-bin/tobin
-man/man1/dgen.1
-man/man1/tobin.1
-man/man5/dgenrc.5
diff --git a/emulators/dgen/distinfo b/emulators/dgen/distinfo
deleted file mode 100644
index 145a98727e7..00000000000
--- a/emulators/dgen/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/12/03 17:07:41 xtraeme Exp $
-
-SHA1 (dgen-sdl-1.23.tar.gz) = c37096e5dd7c9f2c2c75496769d6d2b610a3a488
-RMD160 (dgen-sdl-1.23.tar.gz) = ca5ac81b4c8436a63e8d776b182735ad63ffa77a
-Size (dgen-sdl-1.23.tar.gz) = 340556 bytes
-SHA1 (patch-aa) = c51dcde41d11df29aa7342fcd325d8022b6e4bd7
-SHA1 (patch-ab) = 7bc1285bc7654540cc802472dc049d4cd252faf1
diff --git a/emulators/dgen/patches/patch-aa b/emulators/dgen/patches/patch-aa
deleted file mode 100644
index 2fea8818874..00000000000
--- a/emulators/dgen/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/04/28 12:49:20 joerg Exp $
-
---- star/star.c.orig	2006-04-28 12:28:52.000000000 +0000
-+++ star/star.c
-@@ -1931,7 +1931,9 @@ static void selective_usereg(void) {
- 	case aind: case ainc: case adec:
- 	case adsp: case axdp:
- 		usereg();
-+		break;
- 	default:
-+		break;
- 	}
- }
- 
diff --git a/emulators/dgen/patches/patch-ab b/emulators/dgen/patches/patch-ab
deleted file mode 100644
index 59ec8c7966d..00000000000
--- a/emulators/dgen/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/12/03 17:07:41 xtraeme Exp $
-
---- musa/m68kmake.c.orig	2006-12-03 17:59:13.000000000 +0100
-+++ musa/m68kmake.c	2006-12-03 17:59:35.000000000 +0100
-@@ -1029,6 +1029,7 @@
- 	fprintf(filep, "/* ========================= OPCODE TABLE BUILDER ========================= */\n");
- 	fprintf(filep, "/* ======================================================================== */\n\n");
- 
-+	fprintf(filep, "#include <sys/types.h>\n\n");
- 	fprintf(filep, "#include \"m68kops.h\"\n");
- 	fprintf(filep, "#include \"m68kcpu.h\"\n");
- 	fprintf(filep, "#include <stdlib.h>\n\n");
diff --git a/emulators/dosbox/DESCR b/emulators/dosbox/DESCR
deleted file mode 100644
index 169fe578292..00000000000
--- a/emulators/dosbox/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-DOSBox is a DOS-emulator using SDL for easy portability to
-different platforms, DOSBox has already been ported to
-several different platforms, such as Windows, BeOS, Linux,
-Mac OS X...
-
-DOSBox emulates a 286/386 realmode CPU, Directory
-FileSystem/XMS/EMS, a SoundBlaster card for excellent sound
-compatibility with older games...
-
-You can "re-live" the good old days with the help of
-DOSBox, it can run plenty of the old classics that don't
-run on your new computer !
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
deleted file mode 100644
index 7ca03f1a6a2..00000000000
--- a/emulators/dosbox/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2007/01/20 02:25:31 rillig Exp $
-
-DISTNAME=	dosbox-0.65
-PKGREVISION=	3
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dosbox/}
-
-MAINTAINER=	cube@cubidou.net
-HOMEPAGE=	http://dosbox.sourceforge.net/
-COMMENT=	Multi-platform DOS emulator using SDL
-
-USE_LANGUAGES=		c c++
-GNU_CONFIGURE=		yes
-CPPFLAGS.SunOS+=	-DDISABLE_JOYSTICK
-INSTALLATION_DIRS=	share/doc/dosbox
-
-SUBST_CLASSES+=		fixme
-SUBST_STAGE.fixme=	post-patch
-SUBST_FILES.fixme=	docs/dosbox.1
-SUBST_SED.fixme=	-e s,/usr/share/,${PREFIX}/share/,g
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dosbox
-
-.include "../../audio/SDL_sound/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../net/SDL_net/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/dosbox/PLIST b/emulators/dosbox/PLIST
deleted file mode 100644
index 6b1f011bb49..00000000000
--- a/emulators/dosbox/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/11/22 14:12:29 adam Exp $
-bin/dosbox
-man/man1/dosbox.1
-share/doc/dosbox/README
-@dirrm share/doc/dosbox
diff --git a/emulators/dosbox/distinfo b/emulators/dosbox/distinfo
deleted file mode 100644
index b8bc34761ca..00000000000
--- a/emulators/dosbox/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.11 2007/01/20 02:25:31 rillig Exp $
-
-SHA1 (dosbox-0.65.tar.gz) = 4e9b65c9c2091ab30a952e3b7e63b74df605f419
-RMD160 (dosbox-0.65.tar.gz) = 1d05002ae0ddcac74071180d0fa81aba3092e6f1
-Size (dosbox-0.65.tar.gz) = 848989 bytes
-SHA1 (patch-aa) = 3393501f0d438e53a55481dc0e237c2bb2a75d3e
-SHA1 (patch-ab) = c4555ed9e6337380f52f271025d8f55ed7602aa6
-SHA1 (patch-ac) = 84c2a3173a483ccb62917da0b48fd2083963a13b
-SHA1 (patch-ad) = 3c0c0eabceb4cefa07918ae1d558e553ff18d592
diff --git a/emulators/dosbox/patches/patch-aa b/emulators/dosbox/patches/patch-aa
deleted file mode 100644
index cce56d3b0f9..00000000000
--- a/emulators/dosbox/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/10/06 00:09:23 wiz Exp $
-
---- src/dos/cdrom_image.cpp.orig	2004-08-23 11:35:15.000000000 +0200
-+++ src/dos/cdrom_image.cpp
-@@ -111,7 +111,7 @@ int CDROM_Interface_Image::AudioFile::ge
- 	while (true) {
- 		int success = Sound_Seek(sample, (unsigned int)(shift + time));
- 		if (!success) {
--			if (time == 1) return lround((double)shift * 176.4f);
-+			if (time == 1) return rint((double)shift * 176.4f);
- 			shift += time >> 1;
- 			time = 1;
- 		} else {
diff --git a/emulators/dosbox/patches/patch-ab b/emulators/dosbox/patches/patch-ab
deleted file mode 100644
index c9d7a1ae7ac..00000000000
--- a/emulators/dosbox/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/01/16 11:42:02 rillig Exp $
-
---- src/hardware/mpu401.cpp.orig	2006-03-19 13:30:46.000000000 +0100
-+++ src/hardware/mpu401.cpp	2007-01-10 01:38:43.568613836 +0100
-@@ -26,6 +26,9 @@
- #include "cpu.h"
- #include "support.h"
- 
-+#undef OVERFLOW			/* Solaris 10, /usr/include/math.h */
-+#undef XXXXXMARK		/* Solaris 10, /usr/include/prof.h */
-+
- void MIDI_RawOutByte(Bit8u data);
- bool MIDI_Available(void);
- 
diff --git a/emulators/dosbox/patches/patch-ac b/emulators/dosbox/patches/patch-ac
deleted file mode 100644
index 1735fd7fcfa..00000000000
--- a/emulators/dosbox/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/01/16 11:42:02 rillig Exp $
-
---- src/ints/xms.cpp.orig	2006-02-09 13:32:57.000000000 +0100
-+++ src/ints/xms.cpp	2007-01-10 01:41:09.543795112 +0100
-@@ -75,7 +75,9 @@ struct XMS_Block {
- 	bool	free;
- };
- 
-+#if !defined(__SUNPRO_CC)
- #pragma pack (push,1)
-+#endif
- struct XMS_MemMove{
- 	Bit32u length;
- 	Bit16u src_handle;
-@@ -90,7 +92,9 @@ struct XMS_MemMove{
- 	} dest;
- 
- } GCC_ATTRIBUTE(packed);
-+#if !defined(__SUNPRO_CC)
- #pragma pack (pop)
-+#endif
- 
- Bitu XMS_EnableA20(bool enable)
- {
diff --git a/emulators/dosbox/patches/patch-ad b/emulators/dosbox/patches/patch-ad
deleted file mode 100644
index 92d676e4fd8..00000000000
--- a/emulators/dosbox/patches/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/01/20 02:25:31 rillig Exp $
-
-Scancodes do not work on SunOS-2.10-sparc.
-
---- src/gui/sdlmain.cpp.orig	2006-03-29 14:54:42.000000000 +0200
-+++ src/gui/sdlmain.cpp	2007-01-16 14:15:35.312830340 +0100
-@@ -1291,7 +1291,12 @@ int main(int argc, char* argv[]) {
- 		sdl_sec->Add_bool("waitonerror",true);
- 		sdl_sec->Add_string("priority","higher,normal");
- 		sdl_sec->Add_string("mapperfile","mapper.txt");
-+#if defined(__sun)
-+		sdl_sec->Add_bool("usescancodes", false);
-+#else
- 		sdl_sec->Add_bool("usescancodes",true);
-+#endif
-+
- 
- 		MSG_Add("SDL_CONFIGFILE_HELP",
- 			"fullscreen -- Start dosbox directly in fullscreen.\n"
diff --git a/emulators/doscmd/DESCR b/emulators/doscmd/DESCR
deleted file mode 100644
index 191d0f038aa..00000000000
--- a/emulators/doscmd/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-doscmd, an MS-DOS emulator (NetBSD/i386 only)
-
-Doscmd simulates an MS-DOS environment for running DOS software. Rather
-than provide a software emulation of the 8086 CPU, it uses the
-NetBSD/i386 system call i386_vm86() call to access the VM86 mode of i386
-and later CPUs. It therefore runs much more quickly, at the cost of not
-running on other architectures.
diff --git a/emulators/doscmd/Makefile b/emulators/doscmd/Makefile
deleted file mode 100644
index d43e7a6b0f6..00000000000
--- a/emulators/doscmd/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:34 jlam Exp $
-#
-
-DISTNAME=		doscmd-19960502-2
-PKGNAME=		doscmd-19960502.2
-CATEGORIES=		emulators
-MASTER_SITES=		ftp://ftp.NetBSD.org/pub/NetBSD/arch/i386/doscmd/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-COMMENT=		MS-DOS emulator (NetBSD/i386 only)
-
-# mmap() portability (no MAP_FIXED), and objcopy problems on NetBSD-1.6-i386 and later
-ONLY_FOR_PLATFORM=	NetBSD-1.[345]*-i386
-
-WRKSRC=			${WRKDIR}/doscmd
-MAKE_ENV+=		X11BASE=${X11BASE:Q}
-
-MANCOMPRESSED_IF_MANZ=	yes
-
-do-configure:
-	@cd ${WRKSRC} && \
-	${SED} "s=%PREFIX%=${PREFIX}=" < doscmd.1 >doscmd.1.new && \
-	${MV} doscmd.1.new doscmd.1 && \
-	${SED} "s=%PREFIX%=${PREFIX}=" < doscmd_loader.c >dl.new && \
-	${MV} dl.new doscmd_loader.c
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/doscmd/PLIST b/emulators/doscmd/PLIST
deleted file mode 100644
index f46155d7e4a..00000000000
--- a/emulators/doscmd/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:33 zuntum Exp $
-bin/doscmd
-man/man1/doscmd.1
-man/cat1/doscmd.0
-libexec/doscmd.kernel
-libexec/instbsdi.exe
diff --git a/emulators/doscmd/distinfo b/emulators/doscmd/distinfo
deleted file mode 100644
index 18e487b474e..00000000000
--- a/emulators/doscmd/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 18:49:18 agc Exp $
-
-SHA1 (doscmd-19960502-2.tar.gz) = 85ec8e478d32d0f2861084d6d19186b5e1f0fc95
-RMD160 (doscmd-19960502-2.tar.gz) = e4eb842d7d765f6f608bdc0d08c7e2f1b4edb469
-Size (doscmd-19960502-2.tar.gz) = 109791 bytes
-SHA1 (patch-aa) = 56e3f9951ac3dcb6e07cd1f76c665286a694d67b
-SHA1 (patch-ab) = c83d7e5b8b514ca7f88b0bd3a0be963b7f77d3a4
-SHA1 (patch-ac) = 09757f9522e52b7491c3052dbb856a9b3828ce45
-SHA1 (patch-ae) = 6a33c0eff738caab4e30513dbe9b9f57d7b21d09
-SHA1 (patch-af) = b0091e54d0ffe8a2ebcae28a924fad24888ed20e
-SHA1 (patch-ag) = bbbca5339d66cb52b93019b712d21301d910d32b
-SHA1 (patch-ah) = 65e9a252e27b8ea339048d20df2d5f23977b5f66
-SHA1 (patch-ai) = e72e42897f221929aa269800a11e37ea2dd4419c
-SHA1 (patch-aj) = c400eb5ec1f46def1105ddb6e6a2a1397f8ec54e
diff --git a/emulators/doscmd/patches/patch-aa b/emulators/doscmd/patches/patch-aa
deleted file mode 100644
index 53a01de6491..00000000000
--- a/emulators/doscmd/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1998/11/29 23:39:30 sommerfe Exp $
-
---- signal.c.orig	Thu May  2 16:03:39 1996
-+++ signal.c	Sun Nov 29 18:27:37 1998
-@@ -98,11 +98,18 @@
- 	if (s >= 0 && s < NSIG) {
- 		handler[s] = h;
- 
--		sa.sa_handler = generichandler;
-+		sa.sa_handler = (void (*)())generichandler;
-+#if defined(__LIBC12_SOURCE__)
- 		sa.sa_mask = sigmask(SIGIO) | sigmask(SIGALRM);
-+#else
-+		sigemptyset(&sa.sa_mask);
-+		sigaddset(&sa.sa_mask, SIGIO);
-+		sigaddset(&sa.sa_mask, SIGALRM);
-+#endif
- 		sa.sa_flags = SA_ONSTACK;
- 		sigaction(s, &sa, NULL);
- 
-+		sigemptyset(&set);
- 		sigaddset(&set, s);
- 		sigprocmask(SIG_UNBLOCK, &set, 0);
- 	}
diff --git a/emulators/doscmd/patches/patch-ab b/emulators/doscmd/patches/patch-ab
deleted file mode 100644
index 2bc70622146..00000000000
--- a/emulators/doscmd/patches/patch-ab
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ab,v 1.6 1999/12/18 22:10:02 christos Exp $
-
---- Makefile.orig	Thu May  2 13:55:19 1996
-+++ Makefile	Sat Dec 18 17:02:32 1999
-@@ -8,30 +8,45 @@
- 	int1a.c int2f.c intff.c \
- 	mem.c mouse.c net.c null.c port.c setver.c signal.c timer.c trace.c trap.c tty.c xms.c
- 
-+BINDIR= ${PREFIX}/bin
-+MANDIR=	${PREFIX}/man
-+
- BINGRP=	kmem
- EXEGRP=	bin
- BINMODE=2555
- EXEMODE=444
--CFLAGS+=-I/usr/X11/include -DDISASSEMBLER -g
--LDFLAGS+=-L/usr/X11/lib
-+START_ADDRESS=0x110000
-+CFLAGS+=-I${X11BASE}/include -DDISASSEMBLER -g -DSTART_ADDRESS=${START_ADDRESS}
-+LDFLAGS+=-L${X11BASE}/lib -R${X11BASE}/lib
- LDADD+=	-lX11 -li386 -lgcc -lc -lgcc
--DPADD+=	/usr/X11/lib/libX11.a ${LIBC} ${LIBGCC}
-+DPADD+=	${X11BASE}/lib/libX11.a ${LIBC} ${LIBGCC}
-+
-+.include <bsd.prog.mk>
-+.if ${OBJECT_FMT} == "ELF"
-+TEXT=-e start -Ttext ${START_ADDRESS}
-+CRTBEGIN=/usr/lib/crtbegin.o
-+.else
-+TEXT=-e _start -T ${START_ADDRESS}
-+CRTBEGIN=
-+.endif
-+
- 
- afterinstall:
- 	install ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \
--		doscmd.kernel ${DESTDIR}/usr/libexec/doscmd.kernel
-+		doscmd.kernel ${PREFIX}/libexec/doscmd.kernel
- 	install -c -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \
--		${.CURDIR}/instbsdi.exe ${DESTDIR}/usr/dos/
-+		${.CURDIR}/instbsdi.exe ${PREFIX}/libexec/
- 
--doscmd: doscmd.kernel ${LIBCRT0} doscmd_loader.o
--	ld -N -Bstatic -o doscmd ${LDFLAGS} ${LIBCRT0} doscmd_loader.o ${LDADD}
-+doscmd: doscmd.kernel ${LIBCRT0} ${CRTBEGIN} doscmd_loader.o
-+	ld -N -Bstatic -o doscmd ${LDFLAGS:S/^-Wl,//g} ${LIBCRT0} ${CRTBEGIN} doscmd_loader.o ${LDADD}
- 
--.include <bsd.prog.mk>
- 
- .depend: doscmd_loader.c
- 
- doscmd.kernel: crt0.o ${OBJS}
--	ld -N -Bstatic -T 110000 -o doscmd.kernel ${LDFLAGS} crt0.o ${OBJS} ${LDADD}
-+	ld -N -Bstatic ${TEXT} -o doscmd.bin ${LDFLAGS:S/^-Wl,//g} crt0.o ${OBJS} ${LDADD}
-+	objcopy -O binary doscmd.bin $@
-+	@rm -f doscmd.bin
- 
- doscmd.0: doscmd.1
- 	tbl ${.IMPSRC} | nroff -mandoc > ${.TARGET}
diff --git a/emulators/doscmd/patches/patch-ac b/emulators/doscmd/patches/patch-ac
deleted file mode 100644
index 3571c88e6ca..00000000000
--- a/emulators/doscmd/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/02/27 17:20:10 wiz Exp $
-
---- doscmd.1.orig	Wed Apr 10 09:38:59 1996
-+++ doscmd.1	Tue Feb 27 18:17:16 2001
-@@ -305,13 +305,13 @@
- .Fl ro
- flag is specified, it is a read only file system.
- These assignments will not take place when booting DOS until the
--.Pa /usr/dos/instbsdi.exe
-+.Pa %PREFIX%/libexec/instbsdi.exe
- binary is run.
- .\"
- .\"
- .\"
- .It Cm assign Xo
--.Cm lpt Ns Op Cm 0-4 :
-+.Cm lpt Ns Op Cm 1-4 :
- .Op Cm direct
- .Ar path
- .Op Ar timeout
diff --git a/emulators/doscmd/patches/patch-ae b/emulators/doscmd/patches/patch-ae
deleted file mode 100644
index 5727c6b5bd3..00000000000
--- a/emulators/doscmd/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1998/10/28 01:29:16 hubertf Exp $
-
---- doscmd.h.BAK	Wed Oct 28 01:48:56 1998
-+++ doscmd.h	Wed Oct 28 01:49:02 1998
-@@ -58,7 +58,7 @@
- 
- #define	MAX_AVAIL_SEG 0xa000
- char *dosmem;
--char cmdname[];
-+char cmdname[256];
- int dosmem_size;
- 
- int pspseg;                                     /* segment # of PSP */
diff --git a/emulators/doscmd/patches/patch-af b/emulators/doscmd/patches/patch-af
deleted file mode 100644
index abdce1307e0..00000000000
--- a/emulators/doscmd/patches/patch-af
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-af,v 1.3 2001/03/16 13:58:58 wiz Exp $
-
---- doscmd.c.orig	Thu May  2 21:37:33 1996
-+++ doscmd.c
-@@ -100,7 +100,7 @@
- char *dos_path = 0;
- char cmdname[256];
- 
--char *memfile = "/tmp/doscmd.XXXXXX";
-+char memfile[] = "/tmp/doscmd.XXXXXX";
- 
- int
- main(int argc, char **argv)
-@@ -133,6 +133,14 @@
- 	if (fd != 3 && fd != 4)
- 		close (fd);
- 
-+#ifdef __ELF__
-+	if (mmap((void *)4096, 1024 * 1024, PROT_READ|PROT_WRITE,
-+	    MAP_ANON|MAP_FIXED|MAP_PRIVATE, -1, (off_t)0) == MAP_FAILED) {
-+		perror("mmap botch");
-+		quit(1);
-+	}
-+#endif
-+
- 	fd = -1;
- 
- 	debug_set(0);		/* debug any D_TRAPS without intnum */
-@@ -581,7 +589,11 @@
- 	SET16(sc.sc_fs, 0x0000);
- 	SET16(sc.sc_gs, 0x0000);
- 	
-+#if defined(__LIBC12_SOURCE__)
- 	sc.sc_mask = 0;
-+#else
-+	sigemptyset(&sc.sc_mask);
-+#endif
- 	sc.sc_onstack = 0;
- 
- 	if (tflag) {
diff --git a/emulators/doscmd/patches/patch-ag b/emulators/doscmd/patches/patch-ag
deleted file mode 100644
index 8974ccacb0f..00000000000
--- a/emulators/doscmd/patches/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2001/03/16 13:58:58 wiz Exp $
-
---- AsyncIO.c.orig	Thu May  2 08:51:00 1996
-+++ AsyncIO.c
-@@ -320,6 +320,7 @@
- 		abort();
- 	}
- 	if (stackp++ == 0) {
-+		sigemptyset(&set);
- 		sigaddset(&set, SIGIO);
- 		sigprocmask(SIG_BLOCK, &set, 0);
- 	}
-@@ -335,6 +336,7 @@
- 		abort();
- 	}
- 	if (--stackp == 0) {
-+		sigemptyset(&set);
- 		sigaddset(&set, SIGIO);
- 		sigprocmask(SIG_UNBLOCK, &set, 0);
- 	}
diff --git a/emulators/doscmd/patches/patch-ah b/emulators/doscmd/patches/patch-ah
deleted file mode 100644
index 81ddec5d65a..00000000000
--- a/emulators/doscmd/patches/patch-ah
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2003/06/06 11:55:07 jmmv Exp $
-
---- doscmd_loader.c.orig	2003-06-06 14:00:18.000000000 +0200
-+++ doscmd_loader.c
-@@ -31,38 +31,50 @@
-  */
- 
- #include <stdio.h>
--#include <a.out.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <sys/stat.h>
-+#include <sys/mman.h>
- 
- /*
-  * reserve space in "low" memory for the interrupt vector table
-  */
- static const char filler[4096] = { 0, };
- 
--#define _PATH_DOS_KERNEL_DIR	"/usr/libexec/"
-+#define _PATH_DOS_KERNEL_DIR	"%PREFIX%/libexec/"
- #define _PATH_DOS_KERNEL	"doscmd.kernel"
- 
--int
-+static char *locations[] = {
-+	_PATH_DOS_KERNEL,
-+	"obj/" _PATH_DOS_KERNEL,
-+	_PATH_DOS_KERNEL_DIR _PATH_DOS_KERNEL,
-+	NULL
-+};
-+
-+u_long
- load_kernel(void)
- {
--	FILE *fp;
--	struct exec exec;
--	int start_address;
--
--	if ((fp = fopen(_PATH_DOS_KERNEL, "r")) == NULL &&
--	    (fp = fopen("obj/" _PATH_DOS_KERNEL, "r")) == NULL &&
--	    (fp = fopen(_PATH_DOS_KERNEL_DIR _PATH_DOS_KERNEL, "r")) == NULL)
-+	int i, fd;
-+	size_t size;
-+	struct stat st;
-+
-+	for (i = 0; locations[i] != NULL; i++) {
-+		if ((fd = open(locations[i], O_RDONLY)) != -1)
-+			break;
-+	}
-+	if (locations[i] == NULL)
- 		err(1, "load_kernel");
- 
--	if (fread(&exec, sizeof(exec), 1, fp) != 1 || N_GETMAGIC(exec) != OMAGIC)
--		errx(1, "bad kernel file format");
-+	if (fstat(fd, &st) == -1)
-+		err(1, "fstat");
- 
--	start_address = exec.a_entry & (~(getpagesize() - 1));
--	if (brk(start_address + exec.a_text + exec.a_data + exec.a_bss) < 0)
--		err(1, "load_kernel");
--	fread((char *)start_address, exec.a_text + exec.a_data, 1, fp);
--	bzero((char *)(start_address + exec.a_text + exec.a_data), exec.a_bss);
--	fclose(fp);
--	return(exec.a_entry);
-+	size = st.st_size + START_ADDRESS;
-+
-+	if (mmap((void *)START_ADDRESS, st.st_size,
-+	    PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE, fd, 0) == MAP_FAILED)
-+		err(1, "mmap");
-+		
-+	return(START_ADDRESS);
- }
- 
- void
diff --git a/emulators/doscmd/patches/patch-ai b/emulators/doscmd/patches/patch-ai
deleted file mode 100644
index f9ff5fc3eeb..00000000000
--- a/emulators/doscmd/patches/patch-ai
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1999/12/18 01:46:29 christos Exp $
-
---- int13.c.orig	Thu May  2 16:49:57 1996
-+++ int13.c	Fri Dec 17 20:36:23 1999
-@@ -296,7 +296,7 @@
-     di->secsize = 512;
-     di->path = strdup(file);
- 
--    di->location = ((table & 0xf0000) << 12) | (table & 0xffff);
-+    di->location = ((htable & 0xf0000) << 12) | (htable & 0xffff);
- 
-     if (drive == 0) {
- 	ivec[0x41] = di->location;
-@@ -413,11 +413,11 @@
- 	di->path = strdup(file);
-     }
-     di->fd = -1;
--    di->location = ((table & 0xf0000) << 12) | (table & 0xffff);
-+    di->location = ((ftable & 0xf0000) << 12) | (ftable & 0xffff);
-     di->sector0 = 0;
-     di->offset = 0;
- 
--    ivec[0x1e] = ((ftable & 0xf0000) << 12) | (ftable & 0xffff);
-+    ivec[0x1e] = di->location;
- 
-     table = ftable + drive * 0x0a;
- 
diff --git a/emulators/doscmd/patches/patch-aj b/emulators/doscmd/patches/patch-aj
deleted file mode 100644
index 720af782e19..00000000000
--- a/emulators/doscmd/patches/patch-aj
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2001/03/16 13:59:54 wiz Exp $
-
---- port.c.orig	Wed Apr 10 12:52:15 1996
-+++ port.c
-@@ -63,7 +63,7 @@
- 	goto bad;
-     }
-     while (cnt--) {
--	ioports[port/32] |= (1 << (port%32));
-+	ioports[port/32] &= ~(1 << (port%32));
- 	port++;
-     }
-     if (i386_set_ioperm(ioports) < 0) {
-@@ -82,7 +82,7 @@
- 	goto bad;
-     }
-     while (cnt--) {
--	ioports[port/32] &= ~(1 << (port%32));
-+	ioports[port/32] |= (1 << (port%32));
- 	port++;
-     }
-     if (i386_set_ioperm(ioports) < 0) {
-@@ -169,6 +169,10 @@
- 	    portsw[i].p_inb = inb_nullport;
- 	if (portsw[i].p_outb == 0)
- 	    portsw[i].p_outb = outb_nullport;
-+    }
-+
-+    for (i = 0; i < MAXPORT/32; i++) {
-+	ioports[i] = 0xffffffff;
-     }
- }
- 
diff --git a/emulators/e-uae/DESCR b/emulators/e-uae/DESCR
deleted file mode 100644
index 44ffd942c42..00000000000
--- a/emulators/e-uae/DESCR
+++ /dev/null
@@ -1,22 +0,0 @@
-This is a fork of UAE, the Ubiquitous Amiga Emulator, with an emulation core
-based on WinUAE. It attempts to bring many of the great features of WinUAE
-to non-Windows platforms. This version now finally has a name, E-UAE, since
-that's what everybody was calling it anyway. The 'E' can stand for anything
-you fancy. Experimental, extreme, exciting, egalitarian, eggplant...
-
-E-UAE is open-source software and is made available under the terms of the
-GPL. See the COPYING file included with the E-UAE archive for details.
-
-E-UAE is based on the work of dozens of contributors including Bernd Schmidt
-(the original author and maintainer of UAE), Bernie Meyer (the author of the
-x86 JIT compiler), Toni Wilen (the current maintainer of WinUAE), and many
-more.
-
-To make full use of E-UAE you will need access to an image of some version
-of the Amiga Kickstart ROM (although UAE does include a ROM emulation which
-may work with some old games). The Amiga Kickstart ROMs are copyrighted
-material and may not be freely distributed (so don't ask me for a copy). If
-you don't have an Amiga from which you can legally make a ROM image, a
-selection of ROM images are available for purchase online from Cloanto
-(publishers of the Amiga Forever distribution). See
-http://www.amigaforever.com/
diff --git a/emulators/e-uae/Makefile b/emulators/e-uae/Makefile
deleted file mode 100644
index f6b1456fa80..00000000000
--- a/emulators/e-uae/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2006/10/22 19:38:58 rillig Exp $
-
-DISTNAME=	e-uae-0.8.28
-PKGREVISION=	2
-CATEGORIES=	emulators
-MASTER_SITES=	http://www.rcdrummond.net/uae/e-uae-0.8.28/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://www.rcdrummond.net/uae/
-COMMENT=	Enhanced Ubiquitous Amiga Emulator
-
-CONFLICTS+=	uae-[0-9]*
-
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-
-.include "options.mk"
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/uae
-	cd ${WRKSRC}/docs && ${INSTALL_DATA} *.txt ${PREFIX}/share/doc/uae
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/e-uae/PLIST b/emulators/e-uae/PLIST
deleted file mode 100644
index 39f763066da..00000000000
--- a/emulators/e-uae/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/24 20:21:46 adam Exp $
-bin/readdisk
-bin/uae
-share/doc/uae/bsdsocket.txt
-share/doc/uae/cmd-line.txt
-share/doc/uae/compiling.txt
-share/doc/uae/configuration.txt
-share/doc/uae/floppies.txt
-share/doc/uae/joystick.txt
-share/doc/uae/keyboard.txt
-share/doc/uae/scsi.txt
-@dirrm share/doc/uae
diff --git a/emulators/e-uae/distinfo b/emulators/e-uae/distinfo
deleted file mode 100644
index 07770e75f8b..00000000000
--- a/emulators/e-uae/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/10/22 19:38:58 rillig Exp $
-
-SHA1 (e-uae-0.8.28.tar.bz2) = 11e647ed64420f85893ac77c072e268b650ae183
-RMD160 (e-uae-0.8.28.tar.bz2) = 7e9fa21fa14b0ca3a32a28ccb236b9d7628a7f69
-Size (e-uae-0.8.28.tar.bz2) = 1148790 bytes
-SHA1 (patch-ab) = dfce48dafb163b91c7252da14088e67b3e13bb6c
-SHA1 (patch-ah) = 6f83d380dd0a44cdb9dd4316ca72f90b7b1df644
diff --git a/emulators/e-uae/options.mk b/emulators/e-uae/options.mk
deleted file mode 100644
index de14d090441..00000000000
--- a/emulators/e-uae/options.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/01/24 20:21:46 adam Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.e-uae
-PKG_SUPPORTED_OPTIONS=	gtk sdl x11
-PKG_SUGGESTED_OPTIONS=	gtk sdl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgtk)
-.include "../../x11/gtk2/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Msdl)
-CONFIGURE_ARGS+=	--with-sdl --with-sdl-gfx
-.include "../../devel/SDL/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mx11)
-CONFIGURE_ARGS+=	--enable-dga --enable-vidmode
-.include "../../mk/x11.buildlink3.mk"
-.endif
diff --git a/emulators/e-uae/patches/patch-ab b/emulators/e-uae/patches/patch-ab
deleted file mode 100644
index cfc62149985..00000000000
--- a/emulators/e-uae/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/01/24 20:21:46 adam Exp $
-
---- src/disk.c.orig	2005-07-08 07:44:16.000000000 +0200
-+++ src/disk.c
-@@ -2569,6 +2569,8 @@ void DSKLEN (uae_u16 v, unsigned int hpo
-     for (dr = 0; dr < MAX_FLOPPY_DRIVES; dr++)
- 	update_drive_gui (dr);
- 
-+    /* The following fails with some versions of Kickstart. Disable it. */
-+#if 0
-     /* Try to make floppy access from Kickstart faster.  */
-     if (dskdmaen != 2 && dskdmaen != 3)
- 	return;
-@@ -2639,6 +2641,7 @@ void DSKLEN (uae_u16 v, unsigned int hpo
- 	    return;
- 	}
-     }
-+#endif
- }
- 
- void DSKSYNC (unsigned int hpos, uae_u16 v)
diff --git a/emulators/e-uae/patches/patch-ah b/emulators/e-uae/patches/patch-ah
deleted file mode 100644
index d9c658f4b27..00000000000
--- a/emulators/e-uae/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/10/22 19:38:58 rillig Exp $
-
---- src/install_libscg.orig	2004-05-19 03:21:12.000000000 +0200
-+++ src/install_libscg	2006-10-22 21:34:07.000000000 +0200
-@@ -10,7 +10,7 @@
- #
- # check arguments
- #
--if [ $# -lt 1 ] || [ $# -gt 3 ] || [ "$1" == "--help" ]; then
-+if [ $# -lt 1 ] || [ $# -gt 3 ] || [ "$1" = "--help" ]; then
-     echo "usage: $0 <cdrtools dir> <machine type (optional)>"
-     exit 0
- fi
-@@ -32,7 +32,7 @@ else
-         echo "please specify your machine type - libscg was compiled for:"
-         echo "$machine"
-         exit 10
--    elif [ "$machine"x == x ]; then
-+    elif [ "$machine"x = x ]; then
-         echo "please compile cdrecord for your machine first"
-         exit 10
-     fi
diff --git a/emulators/fceu/DESCR b/emulators/fceu/DESCR
deleted file mode 100644
index 3046a1671c9..00000000000
--- a/emulators/fceu/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-FCE Ultra is an NTSC and PAL Famicom/NES emulator for various
-platforms. It is based upon Bero's original FCE source code. Current
-features include good PPU, CPU, pAPU, expansion chip, and joystick
-emulation. Also a feature unique to this emulator (at the current
-time) is authentic Game Genie emulation. Save states and snapshot
-features also have been implemented.
diff --git a/emulators/fceu/Makefile b/emulators/fceu/Makefile
deleted file mode 100644
index dcc4f7c8639..00000000000
--- a/emulators/fceu/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:53 rillig Exp $
-#
-
-DISTNAME=		fceu-0.98.13.src
-PKGNAME=		${DISTNAME:S/.src//}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		http://pdaxrom.theinternet.nl/fceu/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		wiz@NetBSD.org
-HOMEPAGE=		http://pdaxrom.theinternet.nl/fceu/
-COMMENT=		Portable NES and Famicom emulator
-
-WRKSRC=			${WRKDIR}/fceu
-USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
-
-SUBST_CLASSES+=		dsp
-SUBST_STAGE.dsp=	post-patch
-SUBST_MESSAGE.dsp=	Adjusting sound device path.
-SUBST_FILES.dsp=	src/drivers/sexyal/drivers/oss.c
-SUBST_SED.dsp=		-e "s|/dev/dsp|${DEVOSSAUDIO}|"
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/Documentation/fceu-sdl.6 \
-		${PREFIX}/${PKGMANDIR}/man6/fceu.6
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fceu
-	${INSTALL_DATA} ${WRKSRC}/Documentation/*.html \
-		${PREFIX}/share/doc/fceu
-	${INSTALL_DATA} ${WRKSRC}/Documentation/*.txt \
-		${PREFIX}/share/doc/fceu
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/fceu/PLIST b/emulators/fceu/PLIST
deleted file mode 100644
index e064c3527ea..00000000000
--- a/emulators/fceu/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/19 18:37:14 wiz Exp $
-bin/fceu
-man/man6/fceu.6
-share/doc/fceu/cheat.html
-share/doc/fceu/faq.html
-share/doc/fceu/fceultra.html
-share/doc/fceu/fcm.txt
-share/doc/fceu/fcs.txt
-share/doc/fceu/protocol.txt
-@dirrm share/doc/fceu
diff --git a/emulators/fceu/distinfo b/emulators/fceu/distinfo
deleted file mode 100644
index 810e439003d..00000000000
--- a/emulators/fceu/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.8 2005/10/30 11:47:56 wiz Exp $
-
-SHA1 (fceu-0.98.13.src.tar.bz2) = fed37a9858aa8b149472f964b2ca652168e9f29a
-RMD160 (fceu-0.98.13.src.tar.bz2) = fc736006ed1e9aa564de817622ed575f246bad48
-Size (fceu-0.98.13.src.tar.bz2) = 570842 bytes
-SHA1 (patch-aa) = 31ce24167b8f76df2961ce902d42f45b5278e451
-SHA1 (patch-ac) = 8a5297b11484c6eaf5d70a391bb486ff58475f35
-SHA1 (patch-af) = a2b55359d65c60ecb7e7d79390ef872873c0eba1
-SHA1 (patch-ah) = cc48e36406b6d9e4cf88179510824135507aa6f9
diff --git a/emulators/fceu/patches/patch-aa b/emulators/fceu/patches/patch-aa
deleted file mode 100644
index 4c68b470316..00000000000
--- a/emulators/fceu/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/10/30 11:47:56 wiz Exp $
-
-Make default keys match documentation.
-Also, add settings for joystick.
-
---- src/drivers/pc/input.c.orig	2004-09-11 10:04:33.000000000 +0200
-+++ src/drivers/pc/input.c
-@@ -276,6 +276,10 @@ static void KeyboardCommands(void)
- 
- #define MK(x)   {{BUTTC_KEYBOARD},{0},{MKK(x)},1}
- #define MK2(x1,x2)	{{BUTTC_KEYBOARD},{0},{MKK(x1),MKK(x2)},2}
-+#define MKJA(x, a, d)	{{BUTTC_KEYBOARD, BUTTC_JOYSTICK},	\
-+			 {0, 0},{MKK(x),0x8000|((d)<<14)|(a)},2}
-+#define MKJB(x, a)	{{BUTTC_KEYBOARD, BUTTC_JOYSTICK},	\
-+			 {0, 0},{MKK(x),(a)},2}
- 
- #define MKZ()   {{0},{0},{0},0}
- 
-@@ -284,8 +288,13 @@ static void KeyboardCommands(void)
- ButtConfig GamePadConfig[4][10]={
-         /* Gamepad 1 */
-         { 
--	 MK(KP3), MK(KP2), MK(TAB), MK(ENTER), MK(W),MK(Z),
--                MK(A), MK(S), MKZ(), MKZ()
-+	 MKJB(LEFTALT, 2), MKJB(LEFTCONTROL, 0), MKJB(TAB, 5), MKJB(ENTER, 7),
-+	 MKJA(CURSORUP, 1, 1), MKJA(CURSORDOWN, 1, 0),
-+	 MKJA(CURSORLEFT, 0, 1), MKJA(CURSORRIGHT, 0, 0), MKZ(), MKZ()
-+#if 0
-+         MK(LEFTALT), MK(LEFTCONTROL), MK(TAB), MK(ENTER), MK(CURSORUP),
-+	 MK(CURSORDOWN), MK(CURSORLEFT), MK(CURSORRIGHT), MKZ(), MKZ()
-+#endif
- 	},
- 
-         /* Gamepad 2 */
diff --git a/emulators/fceu/patches/patch-ac b/emulators/fceu/patches/patch-ac
deleted file mode 100644
index 293cc093bc8..00000000000
--- a/emulators/fceu/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/07/19 18:37:15 wiz Exp $
-
-NetBSD's zlib.h does not define OF().
-
---- src/unzip.h.orig	2004-01-21 21:50:00.000000000 +0100
-+++ src/unzip.h
-@@ -58,6 +58,9 @@ typedef unzFile__ *unzFile;
- typedef voidp unzFile;
- #endif
- 
-+#ifndef OF
-+#define OF(a)	a
-+#endif
- 
- #define UNZ_OK                                  (0)
- #define UNZ_END_OF_LIST_OF_FILE (-100)
diff --git a/emulators/fceu/patches/patch-af b/emulators/fceu/patches/patch-af
deleted file mode 100644
index bd5a749fc42..00000000000
--- a/emulators/fceu/patches/patch-af
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/10/30 11:47:56 wiz Exp $
-
-Fix display and sync on sound.  Ignore NoWaiting and the rest for now.
-
---- src/drivers/pc/main.c.orig	2004-09-16 04:55:00.000000000 +0200
-+++ src/drivers/pc/main.c
-@@ -466,14 +466,26 @@ void FCEUD_Update(uint8 *XBuf, int32 *Bu
-   if(can > Count) can=Count;
-   else uflow=0;
- 
--  WriteSound(Buffer,can);
-+  while (Count > 0) {
-+    WriteSound(Buffer,can);
-+    Count -= can;
-+    Buffer += can;
-+    if (Count == 0)
-+	break;
-+    SDL_Delay(1); 
-+    can = GetWriteSound();
-+    if(can > Count) can=Count;
-+   }
- 
-+   if(XBuf && (inited&4) && !(NoWaiting & 2))
-+    BlitScreen(XBuf);
-+   else
-+    printf("skipped\n");
-+#if 0
-   //if(uflow) puts("Underflow");
-   tmpcan = GetWriteSound();
-   if((tmpcan < Count*0.90) && !uflow)
-   {
--   if(XBuf && (inited&4) && !(NoWaiting & 2))
--    BlitScreen(XBuf);
-    Buffer+=can;
-    Count-=can;
-    if(Count)
-@@ -499,6 +511,7 @@ void FCEUD_Update(uint8 *XBuf, int32 *Bu
-   }
-   #endif
- 
-+#endif
-  }
-  else
-  {
diff --git a/emulators/fceu/patches/patch-ah b/emulators/fceu/patches/patch-ah
deleted file mode 100644
index bf80b76460e..00000000000
--- a/emulators/fceu/patches/patch-ah
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/10/30 11:47:56 wiz Exp $
-
---- configure.orig	2004-09-16 05:31:55.000000000 +0200
-+++ configure
-@@ -308,7 +308,7 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP CCAS CCASFLAGS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP WIN32_TRUE WIN32_FALSE UNIX_TRUE UNIX_FALSE USE_SEXYAL_TRUE USE_SEXYAL_FALSE NATIVEWIN32_TRUE NATIVEWIN32_FALSE OPENGL_TRUE OPENGL_FALSE HAVE_GTK_TRUE HAVE_GTK_FALSE EGREP SDL_CONFIG SDL_CFLAGS SDL_LIBS C80x86_TRUE C80x86_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP CCAS CCASFLAGS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP WIN32_TRUE WIN32_FALSE UNIX_TRUE UNIX_FALSE USE_SEXYAL_TRUE USE_SEXYAL_FALSE NATIVEWIN32_TRUE NATIVEWIN32_FALSE OPENGL_TRUE OPENGL_FALSE HAVE_GTK_TRUE HAVE_GTK_FALSE EGREP SDL_CONFIG SDL_CFLAGS SDL_LIBS LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -5130,21 +5130,13 @@ _ACEOF
- fi
- 
- 
--if expr match "$target_cpu" 'i.86' > /dev/null; then
-+if echo ${target_cpu} | grep -q 'i.86' > /dev/null; then
- 	cat >>confdefs.h <<\_ACEOF
- #define C80x86 1
- _ACEOF
- 
- 
- 
--if true; then
--  C80x86_TRUE=
--  C80x86_FALSE='#'
--else
--  C80x86_TRUE='#'
--  C80x86_FALSE=
--fi
--
- fi
- 
- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-@@ -5589,13 +5581,6 @@ echo "$as_me: error: conditional \"OPENG
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
--if test -z "${C80x86_TRUE}" && test -z "${C80x86_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"C80x86\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"C80x86\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
--fi
- 
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
-@@ -6188,8 +6173,6 @@ s,@EGREP@,$EGREP,;t t
- s,@SDL_CONFIG@,$SDL_CONFIG,;t t
- s,@SDL_CFLAGS@,$SDL_CFLAGS,;t t
- s,@SDL_LIBS@,$SDL_LIBS,;t t
--s,@C80x86_TRUE@,$C80x86_TRUE,;t t
--s,@C80x86_FALSE@,$C80x86_FALSE,;t t
- s,@LIBOBJS@,$LIBOBJS,;t t
- s,@LTLIBOBJS@,$LTLIBOBJS,;t t
- CEOF
diff --git a/emulators/fmsx/DESCR b/emulators/fmsx/DESCR
deleted file mode 100644
index c73d5b9bdcb..00000000000
--- a/emulators/fmsx/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-fMSX is a portable emulator of MSX home computers written in C. You
-can always get the latest fMSX source code and support files from
-
-		http://www.komkon.org/fms/fMSX/
-
-MSX is an old Z80-based family of home computers which appeared in
-1982 as an attempt to establish a single standard in home computing
-similar to VHS in video. They were popular in Asian (Korea, Japan) and
-South American (Brazil, Chile) countries as well as in Europe
-(Netherlands, France, Spain) and former Soviet Union, but they are
-virtually unknown in USA. Although MSX standard quietly died to year
-1988, the world got to see MSX2, MSX2+, and TurboR extensions of the
-standard.
diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
deleted file mode 100644
index 275cf1e2231..00000000000
--- a/emulators/fmsx/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2007/02/22 19:26:27 wiz Exp $
-
-DISTNAME=	fMSX24.tar
-PKGNAME=	fmsx-2.4
-PKGREVISION=	1
-CATEGORIES=	emulators x11
-MASTER_SITES=	http://fms.komkon.org/fMSX/
-EXTRACT_SUFX=	.Z
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://fms.komkon.org/fMSX/
-COMMENT=	MSX (Z80-based computer) emulator
-
-RESTRICTED=		ROM image copyright is questionable
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_FTP=		${RESTRICTED}
-
-WRKSRC=	${WRKDIR}/MSX
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
-USE_SUN_AUDIO?=	YES
-.else
-USE_SUN_AUDIO?=	NO
-.endif
-DEFS=		-DFontDir=\"${PREFIX:Q}/share/fmsx/\"
-DEFS+=		-DRomDir=\"${PREFIX:Q}/share/fmsx/\"
-DEFS+=		-DMITSHM -D${CUR_DEPTH} -DSOUND
-.if ${USE_SUN_AUDIO} == "YES"
-DEFS+=		-DSUN_AUDIO
-.endif
-
-MAKE_ENV+=	DEFS=${DEFS:Q}
-
-INSTALLATION_DIRS=	bin
-
-post-extract:
-	@${RM} ${WRKSRC}/CMOS.ROM
-	@${CHMOD} -R a+r ${WRKSRC}
-
-pre-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/fmsx
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html
-
-# Makefile of fMSX doesn't have install target.
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fmsx ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/rddsk ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/wrdsk ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/*.ROM ${PREFIX}/share/fmsx
-	${INSTALL_DATA} ${WRKSRC}/fMSX.html ${PREFIX}/share/doc/html
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
-
-# XXX It would be nice to customize for each user's display, but this
-#     way of doing it at build time depending on build environment is wrong.
-#.ifdef DISPLAY
-#CUR_DEPTH!=	( xwininfo -display ${DISPLAY} -root | fgrep Depth: | ${SED} 's-.*Depth: -BPP-' )
-#.else
-CUR_DEPTH= BPP8
-#.endif
diff --git a/emulators/fmsx/PLIST b/emulators/fmsx/PLIST
deleted file mode 100644
index 45d84ec2b1d..00000000000
--- a/emulators/fmsx/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:35 zuntum Exp $
-bin/fmsx
-bin/rddsk
-bin/wrdsk
-share/fmsx/DISK.ROM
-share/fmsx/FMPAC.ROM
-share/fmsx/KANJI.ROM
-share/fmsx/MSX.ROM
-share/fmsx/MSX2.ROM
-share/fmsx/MSX2EXT.ROM
-share/fmsx/MSX2P.ROM
-share/fmsx/MSX2PEXT.ROM
-share/fmsx/PAINTER.ROM
-share/doc/html/fMSX.html
-@dirrm share/fmsx
diff --git a/emulators/fmsx/distinfo b/emulators/fmsx/distinfo
deleted file mode 100644
index 713d2f58976..00000000000
--- a/emulators/fmsx/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/01/15 19:32:44 joerg Exp $
-
-SHA1 (fMSX24.tar.Z) = ea44eb273b9532ad0fb388e5ffbebdf348d00467
-RMD160 (fMSX24.tar.Z) = 1df5673271ed354ccc6ee720ad06ccbb07e60a91
-Size (fMSX24.tar.Z) = 506755 bytes
-SHA1 (patch-aa) = 07ee581d3dc3aab51a311c7504c2616f39e3409b
-SHA1 (patch-ab) = 58d44910dbae52ebecb42854f477f32b7a75e20b
-SHA1 (patch-ac) = 884f137a757be514a87005c82f2f3a0c4031190d
-SHA1 (patch-ad) = 8d0db8cc68283e1a98e355672db4cb7ca0de42e9
diff --git a/emulators/fmsx/patches/patch-aa b/emulators/fmsx/patches/patch-aa
deleted file mode 100644
index 6592bf5789e..00000000000
--- a/emulators/fmsx/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/01/15 19:32:44 joerg Exp $
-
---- Makefile.orig	Mon May 14 07:38:23 2001
-+++ Makefile	Sun Jun  3 04:48:12 2001
-@@ -42,10 +42,8 @@
- # If you are getting linker errors about not found X11 functions,
- # change the -L/usr/X11R6/lib to the directory where X11
- # libraries libX11.* and libXext.* are located on your system.
--CC      = gcc
--DEFINES = -DFMSX -DUNIX -DLSB_FIRST -DDEBUG -DMITSHM \
--          -DDISK -DNARROW -DSOUND -DBPP16
--CFLAGS  = -O3 -I/usr/X11R6/include -L/usr/X11R6/lib ${DEFINES}
-+DEFINES = -DFMSX -DUNIX -DDISK -DNARROW ${DEFS}
-+CFLAGS  = -O3 -Wall -fomit-frame-pointer -I${X11BASE}/include ${DEFINES}
- OBJECTS = fMSX.o MSX.o Z80.o AY8910.o YM2413.o SCC.o I8251.o V9938.o \
-           Patch.o Debug.o Disk.o Unix.o LibUnix.o SndUnix.o Sound.o
- 
-@@ -61,7 +59,11 @@
- # fMSX Unix/X requires X11 libraries. See note above if you are
- # experiencing any problems.
- fmsx:	${OBJECTS}
--	${CC} ${CFLAGS} -o fmsx ${OBJECTS} -lXext -lX11
-+.if defined(USE_SUN_AUDIO)
-+	${CC} ${CFLAGS} -o fmsx ${OBJECTS} -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lXext -lX11
-+.else
-+	${CC} ${CFLAGS} -o fmsx ${OBJECTS} -Wl,-R${X11BASE}/lib -L${X11BASE}/lib ${LIBOSSAUDIO} -lXext -lX11
-+.endif
- 
- # Clean up.
- clean:
diff --git a/emulators/fmsx/patches/patch-ab b/emulators/fmsx/patches/patch-ab
deleted file mode 100644
index 8914b46b7a6..00000000000
--- a/emulators/fmsx/patches/patch-ab
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2006/01/15 19:32:44 joerg Exp $
-
---- SndUnix.c.orig	2001-03-07 19:15:16.000000000 +0000
-+++ SndUnix.c
-@@ -31,7 +31,9 @@
- 
- #include <sys/audioio.h>
- #include <sys/conf.h>
-+#ifndef __NetBSD__
- #include <stropts.h>
-+#endif
- 
- #define AUDIO_CONV(A) (ULAW[0xFF&(128+(A))]) 
- 
-@@ -73,15 +75,11 @@ static unsigned char ULAW[256] =
- 
- #else /* SUN_AUDIO */
- 
--#ifdef __FreeBSD__
--#include <machine/soundcard.h>
--#endif
-- 
- #ifdef __NetBSD__
- #include <soundcard.h>
- #endif
-  
--#ifdef __linux__
-+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__linux__)
- #include <sys/soundcard.h>
- #endif
-     
-@@ -236,7 +234,7 @@ static void SoundSignal(int SIG)
-     case SIGUSR1:
-       /* Suspend execution, until SIGUSR2 catched */
- #ifndef SUN_AUDIO
--      ioctl(SoundFD,SNDCTL_DSP_RESET);
-+      ioctl(SoundFD,SNDCTL_DSP_RESET,1);
- #endif
-       close(SoundFD);
-       for(Suspended=1;Suspended;pause());
diff --git a/emulators/fmsx/patches/patch-ac b/emulators/fmsx/patches/patch-ac
deleted file mode 100644
index 7fedf04c10b..00000000000
--- a/emulators/fmsx/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2000/08/06 14:45:05 wiz Exp $
-
---- Z80.h.orig	Thu Aug  3 18:56:00 2000
-+++ Z80.h	Sun Aug  6 15:25:54 2000
-@@ -46,6 +46,15 @@
- #endif
- typedef signed char offset;
- 
-+#include <sys/endian.h>
-+#if (_BYTE_ORDER == _LITTLE_ENDIAN)
-+#define LSB_FIRST
-+#elif (_BYTE_ORDER == _BIG_ENDIAN)
-+#define MSB_FIRST
-+#else
-+#warn Check if your machine is big endian or not and define as appropriate one.
-+#endif
-+
- /** Structured Datatypes *************************************/
- /** NOTICE: #define LSB_FIRST for machines where least      **/
- /**         signifcant byte goes first.                     **/
diff --git a/emulators/fmsx/patches/patch-ad b/emulators/fmsx/patches/patch-ad
deleted file mode 100644
index 5d79e2a000e..00000000000
--- a/emulators/fmsx/patches/patch-ad
+++ /dev/null
@@ -1,180 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2001/06/03 17:34:58 kei Exp $
-
---- MSX.c.orig	Mon May 14 07:35:08 2001
-+++ MSX.c	Sun Jun  3 04:36:49 2001
-@@ -287,6 +287,7 @@
-   byte *P;
-   word A;
-   FILE *F;
-+  char string[FILENAME_MAX];
- 
-   /*** STARTUP CODE starts here: ***/
- 
-@@ -380,7 +381,7 @@
- 
-   /* Save current directory and cd to wherever system ROMs are */
-   if(ProgDir)
--    if(WorkDir=getcwd(NULL,0))
-+    if((WorkDir=getcwd(NULL,0)))
-     {
-       Chunks[CCount++]=WorkDir;
-       chdir(ProgDir);
-@@ -391,7 +392,10 @@
-   {
-     case 0:
-       if(Verbose) printf("  Opening MSX.ROM...");
--      P=LoadROM("MSX.ROM",0x8000,0);
-+      bzero(string, sizeof(string));
-+      strcpy(string, RomDir);
-+      strcat(string, "MSX.ROM");
-+      P=LoadROM(string,0x8000,0);
-       PRINTRESULT(P);
-       if(!P) return(0);
-       MemMap[0][0][0]=P;
-@@ -402,7 +406,10 @@
- 
-     case 1:
-       if(Verbose) printf("  Opening MSX2.ROM...");
--      P=LoadROM("MSX2.ROM",0x8000,0);
-+      bzero(string, sizeof(string));
-+      strcpy(string, RomDir);
-+      strcat(string, "MSX2.ROM");
-+      P=LoadROM(string,0x8000,0);
-       PRINTRESULT(P);
-       if(!P) return(0);
-       MemMap[0][0][0]=P;
-@@ -410,7 +417,10 @@
-       MemMap[0][0][2]=P+0x4000;
-       MemMap[0][0][3]=P+0x6000;
-       if(Verbose) printf("  Opening MSX2EXT.ROM...");
--      P=LoadROM("MSX2EXT.ROM",0x4000,0);
-+      bzero(string, sizeof(string));
-+      strcpy(string, RomDir);
-+      strcat(string, "MSX2EXT.ROM");
-+      P=LoadROM(string,0x4000,0);
-       PRINTRESULT(P);
-       if(!P) return(0);
-       MemMap[3][1][0]=P;
-@@ -419,7 +429,10 @@
- 
-     case 2:
-       if(Verbose) printf("  Opening MSX2P.ROM...");
--      P=LoadROM("MSX2P.ROM",0x8000,0);
-+      bzero(string, sizeof(string));
-+      strcpy(string, RomDir);
-+      strcat(string, "MSX2P.ROM");
-+      P=LoadROM(string,0x8000,0);
-       PRINTRESULT(P);
-       if(!P) return(0);
-       MemMap[0][0][0]=P;
-@@ -427,7 +440,10 @@
-       MemMap[0][0][2]=P+0x4000;
-       MemMap[0][0][3]=P+0x6000;
-       if(Verbose) printf("  Opening MSX2PEXT.ROM...");
--      P=LoadROM("MSX2PEXT.ROM",0x4000,0);
-+      bzero(string, sizeof(string));
-+      strcpy(string, RomDir);
-+      strcat(string, "MSX2PEXT.ROM");
-+      P=LoadROM(string,0x4000,0);
-       PRINTRESULT(P);
-       if(!P) return(0);
-       MemMap[3][1][0]=P;
-@@ -436,7 +452,10 @@
-   }
- 
-   /* Try loading DiskROM */
--  if(P=LoadROM("DISK.ROM",0x4000,0))
-+  bzero(string, sizeof(string));
-+  strcpy(string, RomDir);
-+  strcat(string, "DISK.ROM");
-+  if((P=LoadROM(string,0x4000,0)))
-   {
-     if(Verbose) puts("  Opening DISK.ROM...OK");
-     MemMap[3][1][2]=P;
-@@ -469,16 +488,25 @@
-   if(Verbose) printf("Loading other ROMs: ");
- 
-   /* Try loading CMOS memory contents */
--  if(LoadROM("CMOS.ROM",sizeof(RTC),(byte *)RTC))
-+  bzero(string, sizeof(string));
-+  strcpy(string, RomDir);
-+  strcat(string, "CMOS.ROM");
-+  if(LoadROM(string,sizeof(RTC),(byte *)RTC))
-   { if(Verbose) printf("CMOS.ROM.."); }
-   else memcpy(RTC,RTCInit,sizeof(RTC));
- 
-   /* Try loading Kanji alphabet ROM */
--  if(Kanji=LoadROM("KANJI.ROM",0x20000,0))
-+  bzero(string, sizeof(string));
-+  strcpy(string, RomDir);
-+  strcat(string, "KANJI.ROM");
-+  if((Kanji=LoadROM(string,0x20000,0)))
-   { if(Verbose) printf("KANJI.ROM.."); }
- 
-   /* Try loading RS232 support ROM */
--  if(P=LoadROM("RS232.ROM..",0x4000,0))
-+  bzero(string, sizeof(string));
-+  strcpy(string, RomDir);
-+  strcat(string, "RS232.ROM");
-+  if((P=LoadROM(string,0x4000,0)))
-   {
-     if(Verbose) printf("RS232.ROM..");
-     MemMap[3][0][2]=P;
-@@ -486,7 +514,10 @@
-   }
- 
-   /* Try loading FM-PAC support ROM */
--  if(P=LoadROM("FMPAC.ROM",0x4000,0))
-+  bzero(string, sizeof(string));
-+  strcpy(string, RomDir);
-+  strcat(string, "FMPAC.ROM");
-+  if((P=LoadROM(string,0x4000,0)))
-   {
-     if(Verbose) printf("FMPAC.ROM..");
-     MemMap[3][3][2]=P;
-@@ -574,7 +605,10 @@
-     if(J&&(MemMap[3][1][2]!=EmptyRAM))
-     {
-       if(J==2) ROMTypeB=1; else ROMTypeA=1;
--      if(LoadCart("MSXDOS2.ROM",J-1))
-+      bzero(string, sizeof(string));
-+      strcpy(string, RomDir);
-+      strcat(string, "MSXDOS2.ROM");
-+      if(LoadCart(string,J-1))
-         SetMegaROM(J-1,0,1,ROMMask[J-1]-1,ROMMask[J-1]);
-     }
- 
-@@ -584,15 +618,21 @@
-          else J=0;
- 
-     /* Try loading PAINTER ROM if slot found */
--    if(J) LoadCart("PAINTER.ROM",J-1);
-+    bzero(string, sizeof(string));
-+    strcpy(string, RomDir);
-+    strcat(string, "PAINTER.ROM");
-+    if(J) LoadCart(string,J-1);
-   }
- 
-   /* We are now back to working directory */
-   if(WorkDir) chdir(WorkDir);
- 
-   /* Try loading font */
--  if(Verbose) printf("Loading %s font...",FontName);
--  FontBuf=LoadROM(FontName,0x800,0);
-+  bzero(string, sizeof(string));
-+  strcpy(string, RomDir);
-+  strcat(string, FontName);
-+  if(Verbose) printf("Loading %s font...",string);
-+  FontBuf=LoadROM(string,0x800,0);
-   PRINTRESULT(FontBuf);
- 
-   /* Open stream for a printer */
-@@ -624,7 +664,7 @@
- 
-   /* Open casette image */
-   if(CasName)
--    if(CasStream=fopen(CasName,"r+b"))
-+    if((CasStream=fopen(CasName,"r+b")))
-       if(Verbose) printf("Using %s as a tape\n",CasName);
- 
-   if(Verbose)
diff --git a/emulators/freebsd_lib/DESCR b/emulators/freebsd_lib/DESCR
deleted file mode 100644
index 2ecb64e0282..00000000000
--- a/emulators/freebsd_lib/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-These libraries are part of the FreeBSD compatibility options
-for NetBSD.
-
-The kernel option `COMPAT_FREEBSD' needs to be in your kernel config
-file for this to work as well.
diff --git a/emulators/freebsd_lib/INSTALL b/emulators/freebsd_lib/INSTALL
deleted file mode 100644
index 633e153ed4a..00000000000
--- a/emulators/freebsd_lib/INSTALL
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: INSTALL,v 1.3 2006/06/23 15:48:50 jlam Exp $
-
-case "${STAGE}" in
-POST-INSTALL)
-	emulsubdir=freebsd
-
-	emuldir="/emul/$emulsubdir"
-	pkgemuldir="${PKG_PREFIX}/emul/$emulsubdir"
-
-	emuldir_pwd=`cd $emuldir 2>/dev/null && ${PWD_CMD}`
-	pkgemuldir_pwd=`cd $pkgemuldir 2>/dev/null && ${PWD_CMD}`
-
-	if ${TEST} "$emuldir_pwd" != "$pkgemuldir_pwd"; then
-		if ${TEST} -e $emuldir -o -L $emuldir; then
-			${CAT} << EOF
-==============================================================================
-You must create a symbolic link for ${PKGNAME} to work properly:
-
-	$pkgemuldir  ->  $emuldir
-
-It seems there is something else located at $emuldir.
-==============================================================================
-EOF
-		else
-			${MKDIR} -p `${DIRNAME} $emuldir` && 
-			${LN} -fs $pkgemuldir $emuldir
-		fi
-	fi
-	;;
-esac
diff --git a/emulators/freebsd_lib/MESSAGE b/emulators/freebsd_lib/MESSAGE
deleted file mode 100644
index 30cc236404c..00000000000
--- a/emulators/freebsd_lib/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-==============================================================================
-$NetBSD: MESSAGE,v 1.1 2006/06/19 23:20:59 jlam Exp $
-
-Do not forget to include COMPAT_FREEBSD in your kernel configuration
-file.  FreeBSD binaries require this option in order to work.
-
-Note that FreeBSD ELF binaries are not yet supported with this package.
-==============================================================================
diff --git a/emulators/freebsd_lib/Makefile b/emulators/freebsd_lib/Makefile
deleted file mode 100644
index 3315288412f..00000000000
--- a/emulators/freebsd_lib/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2006/06/23 15:48:50 jlam Exp $
-#
-
-DISTNAME=		freebsd_lib-2.2.7
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.flame.org/NetBSD/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-COMMENT=		Libraries necessary for FreeBSD compatibility, including XFree86
-
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
-
-WRKSRC=			${WRKDIR}
-NO_BUILD=		yes
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/emul/freebsd
-	${INSTALL_DATA_DIR} ${PREFIX}/emul/freebsd/var/run
-	(cd ${WRKSRC} && ${FIND} usr -type d -print) | \
-		(cd ${PREFIX}/emul/freebsd && ${XARGS} ${INSTALL_DATA_DIR})
-	cd ${WRKSRC} && for file in `${FIND} usr -name '*.*' -print`; do \
-		${INSTALL_DATA} $$file ${PREFIX}/emul/freebsd/$$file; \
-	done
-	${TOUCH} ${PREFIX}/emul/freebsd/var/run/ld.so.hints
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/freebsd_lib/PLIST b/emulators/freebsd_lib/PLIST
deleted file mode 100644
index b7f873fae44..00000000000
--- a/emulators/freebsd_lib/PLIST
+++ /dev/null
@@ -1,64 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/09/09 19:03:40 wiz Exp $
-emul/freebsd/usr/lib/compat/libgnumalloc.so.2.0
-emul/freebsd/usr/lib/compat/libresolv.so.2.0
-emul/freebsd/usr/lib/compat/liby.so.2.0
-emul/freebsd/usr/lib/libalias.so.2.4
-emul/freebsd/usr/lib/libc.so.3.1
-emul/freebsd/usr/lib/libcrypt.so.2.0
-emul/freebsd/usr/lib/libcalendar.so.2.0
-emul/freebsd/usr/lib/libcom_err.so.2.0
-emul/freebsd/usr/lib/libcurses.so.2.0
-emul/freebsd/usr/lib/libedit.so.2.0
-emul/freebsd/usr/lib/libf2c.so.2.0
-emul/freebsd/usr/lib/libftpio.so.4.0
-emul/freebsd/usr/lib/libipx.so.2.0
-emul/freebsd/usr/lib/libkvm.so.2.0
-emul/freebsd/usr/lib/libmytinfo.so.2.0
-emul/freebsd/usr/lib/libncurses.so.3.1
-emul/freebsd/usr/lib/libopie.so.2.0
-emul/freebsd/usr/lib/libpcap.so.2.2
-emul/freebsd/usr/lib/librpcsvc.so.2.0
-emul/freebsd/usr/lib/libscsi.so.2.0
-emul/freebsd/usr/lib/libskey.so.2.0
-emul/freebsd/usr/lib/libz.so.2.0
-emul/freebsd/usr/lib/libss.so.2.0
-emul/freebsd/usr/lib/libtermcap.so.2.1
-emul/freebsd/usr/lib/libtermlib.so.2.1
-emul/freebsd/usr/lib/libutil.so.2.2
-emul/freebsd/usr/lib/libvgl.so.1.0
-emul/freebsd/usr/lib/libxpg4.so.2.0
-emul/freebsd/usr/lib/libc_r.so.3.0
-emul/freebsd/usr/lib/libscrypt.so.2.0
-emul/freebsd/usr/lib/libtelnet.so.2.0
-emul/freebsd/usr/lib/libm.so.2.0
-emul/freebsd/usr/lib/libdialog.so.3.0
-emul/freebsd/usr/lib/libg++.so.4.0
-emul/freebsd/usr/lib/libgmp.so.3.0
-emul/freebsd/usr/lib/libmp.so.3.0
-emul/freebsd/usr/lib/libgnuregex.so.2.0
-emul/freebsd/usr/lib/libreadline.so.3.0
-emul/freebsd/usr/lib/libstdc++.so.2.0
-emul/freebsd/usr/libexec/ld.so
-emul/freebsd/usr/X11R6/lib/libICE.so.6.3
-emul/freebsd/usr/X11R6/lib/libPEX5.so.6.0
-emul/freebsd/usr/X11R6/lib/libSM.so.6.0
-emul/freebsd/usr/X11R6/lib/libX11.so.6.1
-emul/freebsd/usr/X11R6/lib/libXIE.so.6.0
-emul/freebsd/usr/X11R6/lib/libXaw.so.6.1
-emul/freebsd/usr/X11R6/lib/libXext.so.6.3
-emul/freebsd/usr/X11R6/lib/libXi.so.6.0
-emul/freebsd/usr/X11R6/lib/libXmu.so.6.0
-emul/freebsd/usr/X11R6/lib/libXp.so.6.2
-emul/freebsd/usr/X11R6/lib/libXt.so.6.0
-emul/freebsd/usr/X11R6/lib/libXtst.so.6.1
-emul/freebsd/usr/X11R6/lib/liboldX.so.6.0
-emul/freebsd/var/run/ld.so.hints
-@dirrm emul/freebsd/var/run
-@dirrm emul/freebsd/var
-@dirrm emul/freebsd/usr/X11R6/lib
-@dirrm emul/freebsd/usr/X11R6
-@dirrm emul/freebsd/usr/libexec
-@dirrm emul/freebsd/usr/lib/compat
-@dirrm emul/freebsd/usr/lib
-@dirrm emul/freebsd/usr
-@dirrm emul/freebsd
diff --git a/emulators/freebsd_lib/distinfo b/emulators/freebsd_lib/distinfo
deleted file mode 100644
index b9ecd4723d3..00000000000
--- a/emulators/freebsd_lib/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 18:49:18 agc Exp $
-
-SHA1 (freebsd_lib-2.2.7.tar.gz) = fb62fba4a442303d80df6820fd20592850fc877e
-RMD160 (freebsd_lib-2.2.7.tar.gz) = 32b862c4d6fab0192dbc59dadd382713990283fd
-Size (freebsd_lib-2.2.7.tar.gz) = 1950770 bytes
diff --git a/emulators/fuse-utils/DESCR b/emulators/fuse-utils/DESCR
deleted file mode 100644
index 388cb75a9e5..00000000000
--- a/emulators/fuse-utils/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 printer you could attach to the Spectrum.
-* Very basic support for RZX files.
diff --git a/emulators/fuse-utils/Makefile b/emulators/fuse-utils/Makefile
deleted file mode 100644
index 76553034630..00000000000
--- a/emulators/fuse-utils/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2007/02/19 17:53:44 joerg Exp $
-
-DISTNAME=	fuse-utils-0.7.0
-PKGREVISION=	3
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fuse-emulator/}
-
-MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://fuse-emulator.sourceforge.net/
-COMMENT=	ZX Spectrum Emulator utilities
-
-GNU_CONFIGURE=		yes
-
-LIBS+=			-lgcrypt
-LIBS+=			-lgpg-error
-
-.include "../../emulators/libspectrum/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../security/libgpg-error/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/fuse-utils/PLIST b/emulators/fuse-utils/PLIST
deleted file mode 100644
index 0aefdfd99a9..00000000000
--- a/emulators/fuse-utils/PLIST
+++ /dev/null
@@ -1,22 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/07/20 13:13:55 adam Exp $
-bin/createhdf
-bin/listbasic
-bin/rzxcheck
-bin/rzxdump
-bin/rzxtool
-bin/scl2trd
-bin/snap2tzx
-bin/snapconv
-bin/tapeconv
-bin/tzxlist
-man/man1/createhdf.1
-man/man1/fuse-utils.1
-man/man1/listbasic.1
-man/man1/rzxcheck.1
-man/man1/rzxdump.1
-man/man1/rzxtool.1
-man/man1/scl2trd.1
-man/man1/snap2tzx.1
-man/man1/snapconv.1
-man/man1/tapeconv.1
-man/man1/tzxlist.1
diff --git a/emulators/fuse-utils/distinfo b/emulators/fuse-utils/distinfo
deleted file mode 100644
index 073d806a9ca..00000000000
--- a/emulators/fuse-utils/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 18:49:18 agc Exp $
-
-SHA1 (fuse-utils-0.7.0.tar.gz) = 96aad91e1386180af49ddaa8e8b7ab82ef42ca94
-RMD160 (fuse-utils-0.7.0.tar.gz) = eac4ae543ff96f08ddf4b674ccd35f8e63714a03
-Size (fuse-utils-0.7.0.tar.gz) = 304345 bytes
diff --git a/emulators/fuse/DESCR b/emulators/fuse/DESCR
deleted file mode 100644
index 388cb75a9e5..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 printer 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 7214d8a8259..00000000000
--- a/emulators/fuse/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/04/17 13:46:23 wiz Exp $
-
-DISTNAME=	fuse-0.7.0
-PKGREVISION=	4
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fuse-emulator/}
-
-MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://fuse-emulator.sourceforge.net/
-COMMENT=	ZX Spectrum Emulator
-
-USE_TOOLS+=		perl pkg-config
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk2
-LIBS+=	${LIBOSSAUDIO}
-
-.include "../../emulators/libspectrum/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/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 b614e203308..00000000000
--- a/emulators/fuse/PLIST
+++ /dev/null
@@ -1,43 +0,0 @@
-@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
-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/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
-share/fuse/tape_2068.z80
-share/fuse/tape_48.z80
-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
-share/fuse/trdos.rom
-@dirrm share/fuse
diff --git a/emulators/fuse/distinfo b/emulators/fuse/distinfo
deleted file mode 100644
index c80cabe7fde..00000000000
--- a/emulators/fuse/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 18:49:18 agc Exp $
-
-SHA1 (fuse-0.7.0.tar.gz) = 36e0485183bd1bbfc9140b8ebb9f0a4bf197ffe6
-RMD160 (fuse-0.7.0.tar.gz) = 38abec9f44677f0f5b86b99bc0127a62cc7fb9cf
-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
deleted file mode 100644
index 21777faf4e1..00000000000
--- a/emulators/fuse/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/07/20 13:12:16 adam Exp $
-
---- 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;
- 
- /* 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-ab b/emulators/fuse/patches/patch-ab
deleted file mode 100644
index 6111921b9bd..00000000000
--- a/emulators/fuse/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$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@
diff --git a/emulators/gcube/DESCR b/emulators/gcube/DESCR
deleted file mode 100644
index d68cfb7c412..00000000000
--- a/emulators/gcube/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Gcube is an open source Nintendo GameCube(TM) emulator beeing developed
-by monk with the main purpose of running at least one commercial game
-fully emulated.
diff --git a/emulators/gcube/Makefile b/emulators/gcube/Makefile
deleted file mode 100644
index 3aead3b6b9a..00000000000
--- a/emulators/gcube/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2006/06/12 16:28:06 wiz Exp $
-#
-
-DISTNAME=		gcube-0.4-src
-PKGNAME=		${DISTNAME:S/-src//}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		http://gcube.exemu.net/downloads/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://gcube.exemu.net/
-COMMENT=		Opensource Nintendo GameCube(TM) emulator
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-USE_TOOLS+=		gmake
-WRKSRC=			${WRKDIR}/0.4
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(MACHINE_ARCH:Mi386)
-BUILD_DEPENDS+=		nasm-[0-9]*:../../devel/nasm
-CFLAGS+=		-DASM_X86=1
-.endif
-
-INSTALLATION_DIRS=	share/doc/${PKGBASE} bin
-
-do-install:
-.for prog in isopack gcube bin2dol gcmap tplx
-	${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${PREFIX}/bin
-.endfor
-.for f in README ChangeLog COPYING
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/${PKGBASE}
-.endfor
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/gcube/PLIST b/emulators/gcube/PLIST
deleted file mode 100644
index 0fdd3504144..00000000000
--- a/emulators/gcube/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/16 14:25:34 xtraeme Exp $
-bin/bin2dol
-bin/gcmap
-bin/gcube
-bin/isopack
-bin/tplx
-share/doc/gcube/COPYING
-share/doc/gcube/ChangeLog
-share/doc/gcube/README
-@dirrm share/doc/gcube
diff --git a/emulators/gcube/distinfo b/emulators/gcube/distinfo
deleted file mode 100644
index 3b0eea9eaf7..00000000000
--- a/emulators/gcube/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/06/26 10:56:57 rillig Exp $
-
-SHA1 (gcube-0.4-src.tar.bz2) = dae967f8aedfc2115c3720dfe2c523128fddc8b6
-RMD160 (gcube-0.4-src.tar.bz2) = 9a7c13ed611da22705f960686eea225e30b61dc6
-Size (gcube-0.4-src.tar.bz2) = 803503 bytes
-SHA1 (patch-aa) = 285ae801f3e000420713e4e9b22d20fb55b12e3c
-SHA1 (patch-ab) = 8907f650214bec5cdbf032464a1be39cccea5d81
-SHA1 (patch-ac) = 24e52c1b863d858863317de1c34fe9a917f83599
-SHA1 (patch-ad) = 2d21a509b768d6aa269cb30e1adf01279d98bc41
-SHA1 (patch-ae) = ca03b45a7e2e05371b3a495c55af8268d17f80c3
-SHA1 (patch-af) = 295f3c06b5942d19b8e9ad41c220fac42c3fb7f5
-SHA1 (patch-ag) = c84e395b61a849ca3cb6318a2c15aa8b5346a0bc
diff --git a/emulators/gcube/patches/patch-aa b/emulators/gcube/patches/patch-aa
deleted file mode 100644
index 0e3e484ae7c..00000000000
--- a/emulators/gcube/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/01/10 14:33:26 jmmv Exp $
-
---- Makefile.rules.orig	2005-01-12 14:34:18.000000000 +0100
-+++ Makefile.rules
-@@ -2,9 +2,9 @@
- SDL_CONFIG=sdl-config
- LIBS=`$(SDL_CONFIG) --libs` -mno-windows -mcygwin -lz -l$(OPENGL)
- 
--CFLAGS=-g -Wall -I/usr/include -I/usr/local/include
--PROFLAGS=-g -Wall -pg -fprofile-arcs -ftest-coverage
--OPTFLAGS=-O3 -fno-strict-aliasing -fomit-frame-pointer -ffast-math -march=$(CPU) $(OPTIMIZE)
-+#CFLAGS=-g -Wall -I/usr/include -I/usr/local/include
-+#PROFLAGS=-g -Wall -pg -fprofile-arcs -ftest-coverage
-+#OPTFLAGS=-O3 -fno-strict-aliasing -fomit-frame-pointer -ffast-math -march=$(CPU) $(OPTIMIZE)
- 
- OBJECTS=\
- 	 ppc_disasm.o\
-@@ -89,10 +89,10 @@ release: default
- profiler:	default
- 
- gcube:  $(OBJECTS) gcube.o
--	$(CC) $(CFLAGS) $^ -o $@ $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- gcubedbg:  $(OBJECTS) gcubedbg.o cpu_dbg.o
--	$(CC) $(CFLAGS) $^ -o $@ $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- bin2dol:	bin2dol.c general.o
- 	$(CC) $(CFLAGS) $^ -o $@
diff --git a/emulators/gcube/patches/patch-ab b/emulators/gcube/patches/patch-ab
deleted file mode 100644
index 63f0273b2b0..00000000000
--- a/emulators/gcube/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/01/10 14:33:26 jmmv Exp $
-
---- Makefile.orig	2005-01-12 03:11:22.000000000 +0100
-+++ Makefile
-@@ -1,8 +1,8 @@
- # use assembler optimizations
--ASM_X86=0
-+#ASM_X86=0
- 
- # use debugger: 1 - by default, 2 - compile in but don't use by default
--GDEBUG=0
-+#GDEBUG=0
- 
- # by default, no window will open until fb address is set
- # or video mode is specified. some programs might not reach that stage.
-@@ -18,7 +18,7 @@ DEFAULT_BUFFER_SIZE=512
- MEMHACK=0
- 
- # specify the cpu used (for -march, check gcc manual)
--CPU=i686
-+#CPU=i686
- #CPU=athlon-xp
- 
- # add here optimization flags
-@@ -28,7 +28,7 @@ CPU=i686
- OPENGL=GL
- 
- # compilator
--CC=gcc
-+#CC=gcc
- 
- # if byteswap.h is present
- USE_BYTESWAP_H=0
diff --git a/emulators/gcube/patches/patch-ac b/emulators/gcube/patches/patch-ac
deleted file mode 100644
index 6590fdca1d4..00000000000
--- a/emulators/gcube/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/01/10 14:33:26 jmmv Exp $
-
---- cpu.c.orig	2005-01-12 02:10:42.000000000 +0100
-+++ cpu.c
-@@ -45,10 +45,10 @@ __u32 mask[32][32];
- int RESERVE = 0;
- __u32 RESERVE_ADDR = 0;
- 
-+#if 0
- double (*fp_round[]) (double) = { round, trunc, ceil, floor };
- #define FP_ROUND(D)		(fp_round[FPSCR_RN] (D))
- 
--#if 0
- # include <fenv.h>
- int fp_round_mode[] = { FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD, FE_DOWNWARD };
- # define SET_ROUNDING_MODE				(fesetround (fp_round_mode[FPSCR_RN]))
diff --git a/emulators/gcube/patches/patch-ad b/emulators/gcube/patches/patch-ad
deleted file mode 100644
index dd6ff890ac0..00000000000
--- a/emulators/gcube/patches/patch-ad
+++ /dev/null
@@ -1,102 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/06/26 10:56:57 rillig Exp $
-
-Thou shalt not use reserved identifiers.
-
---- cpu.h.orig	2005-01-12 01:19:11.000000000 +0100
-+++ cpu.h	2006-06-26 12:51:48.000000000 +0200
-@@ -284,8 +284,8 @@ extern __u64 ps1[32];
- 
- #define SET_FIELD(X,n,Y)\
- 	({\
--			__u32 _n = (n);\
--			(X = (X &~ (0x0f << ((7-(_n)) << 2))) | ((Y) << ((7-(_n)) << 2)));\
-+			__u32 m_n = (n);\
-+			(X = (X &~ (0x0f << ((7-(m_n)) << 2))) | ((Y) << ((7-(m_n)) << 2)));\
- 	})
- #define CLEAR_FIELD(X,n)	(X = (X &~ (0x0f << ((7-(n)) << 2))))
- #define GET_FIELD(X,n)		((X >> (32 - (((n) + 1) << 2))) & 0x0f)
-@@ -293,16 +293,16 @@ extern __u64 ps1[32];
- // signed
- #define CALC_CR(n,X,Y)\
- 	({\
--			__s32 _X = (X);\
--			__s32 _Y = (Y);\
--			SET_FIELD (CR, n, ((IS_XER_SO) ? CR_SO : 0) | ((_X < _Y) ? CR_LT : 0) | ((_X > _Y) ? CR_GT : 0) | ((_X == _Y) ? CR_EQ : 0));\
-+			__s32 m_X = (X);\
-+			__s32 m_Y = (Y);\
-+			SET_FIELD (CR, n, ((IS_XER_SO) ? CR_SO : 0) | ((m_X < m_Y) ? CR_LT : 0) | ((m_X > m_Y) ? CR_GT : 0) | ((m_X == m_Y) ? CR_EQ : 0));\
- 	})
- // unsigned
- #define CALC_CRL(n,X,Y)\
- 	({\
--			__u32 _X = (X);\
--			__u32 _Y = (Y);\
--			SET_FIELD (CR, n, ((IS_XER_SO) ? CR_SO : 0) | ((_X < _Y) ? CR_LT : 0) | ((_X > _Y) ? CR_GT : 0) | ((_X == _Y) ? CR_EQ : 0));\
-+			__u32 m_X = (X);\
-+			__u32 m_Y = (Y);\
-+			SET_FIELD (CR, n, ((IS_XER_SO) ? CR_SO : 0) | ((m_X < m_Y) ? CR_LT : 0) | ((m_X > m_Y) ? CR_GT : 0) | ((m_X == m_Y) ? CR_EQ : 0));\
- 	})
- 
- // rewrite in asm
-@@ -315,14 +315,14 @@ extern __u64 ps1[32];
- #define IS_SNAN(X)				((((X) & 0x000fffffffffffffULL) != 0) && (((X) & 0x7ff8000000000000ULL) == 0x7ff0000000000000ULL))
- #define CALC_CRF(n,X,Y)\
- 	({\
--			double _X = (X);\
--			double _Y = (Y);\
--			if (_X < _Y)\
-+			double m_X = (X);\
-+			double m_Y = (Y);\
-+			if (m_X < m_Y)\
- 			{\
- 				SET_FIELD (CR, n, 8);\
- 				FPSCR |= 8 << FPSCR_FPCC;\
- 			}\
--			else if (_X > _Y)\
-+			else if (m_X > m_Y)\
- 			{\
- 				SET_FIELD (CR, n, 4);\
- 				FPSCR |= 4 << FPSCR_FPCC;\
-@@ -337,8 +337,8 @@ extern __u64 ps1[32];
- #define IS_NANS						IS_NAN
- #define CALC_CRFS(n,Xf,Xb,Yf,Yb)\
- 	({\
--			double _X = (Xf);\
--			double _Y = (Yf);\
-+			double m_X = (Xf);\
-+			double m_Y = (Yf);\
- 			FPSCR &= ~(0x1f << FPSCR_FPCC);\
- 			if (IS_NAN (Xb) || IS_NAN (Yb))\
- 			{\
-@@ -346,12 +346,12 @@ extern __u64 ps1[32];
- 				FPSCR |= 1 << FPSCR_FPCC;\
- 				FPSCR |= FPSCR_VXSNAN;\
- 			}\
--			else if (_X < _Y)\
-+			else if (m_X < m_Y)\
- 			{\
- 				SET_FIELD (CR, n, 8);\
- 				FPSCR |= 8 << FPSCR_FPCC;\
- 			}\
--			else if (_X > _Y)\
-+			else if (m_X > m_Y)\
- 			{\
- 				SET_FIELD (CR, n, 4);\
- 				FPSCR |= 4 << FPSCR_FPCC;\
-@@ -406,11 +406,11 @@ extern __u64 ps1[32];
- 
- #define GENMASK(X,Y)\
- 	({\
--			__u32 _X = (X);\
--			__u32 _Y = (Y);\
--			((_X <= _Y) ? \
--			((0xffffffff >> (_X)) ^ (((_Y) < 31)? (0xffffffff >> ((_Y) + 1)) : 0)) :\
--			(~((0xffffffff >> (_X)) ^ (((_Y) < 31)? (0xffffffff >> ((_Y) + 1)) : 0)))) ;\
-+			__u32 m_X = (X);\
-+			__u32 m_Y = (Y);\
-+			((m_X <= m_Y) ? \
-+			((0xffffffff >> (m_X)) ^ (((m_Y) < 31)? (0xffffffff >> ((m_Y) + 1)) : 0)) :\
-+			(~((0xffffffff >> (m_X)) ^ (((m_Y) < 31)? (0xffffffff >> ((m_Y) + 1)) : 0)))) ;\
- 	})
- #define MASK(X,Y)			(mask[X][Y])
- 
diff --git a/emulators/gcube/patches/patch-ae b/emulators/gcube/patches/patch-ae
deleted file mode 100644
index 119c87be6b3..00000000000
--- a/emulators/gcube/patches/patch-ae
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/06/26 10:56:57 rillig Exp $
-
-Thou shalt not use reserved identifiers.
-
---- gx_transform.c.orig	2005-01-12 02:23:37.000000000 +0100
-+++ gx_transform.c	2006-06-26 12:46:19.000000000 +0200
-@@ -52,15 +52,15 @@ inline __u32 color_unpack_rgb565 (__u32 
- 
- inline __u32 color_unpack_rgba4 (__u32 X)
- {
--	__u32 _X = X;
-+	__u32 m_X = X;
- 
- 
- #ifdef LIL_ENDIAN
--	_X = ((X & 0x0f00) <<  0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12);
-+	m_X = ((X & 0x0f00) <<  0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12);
- #else
--	_X = ((X & 0x0f00) <<  8) | ((X & 0x00f0) <<  4) | ((X & 0x000f) <<  0) | ((X & 0xf000) << 12);
-+	m_X = ((X & 0x0f00) <<  8) | ((X & 0x00f0) <<  4) | ((X & 0x000f) <<  0) | ((X & 0xf000) << 12);
- #endif
--	return (_X | (_X << 4));
-+	return (m_X | (m_X << 4));
- }
- 
- 
diff --git a/emulators/gcube/patches/patch-af b/emulators/gcube/patches/patch-af
deleted file mode 100644
index 9b3a7bf835a..00000000000
--- a/emulators/gcube/patches/patch-af
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/06/26 10:56:57 rillig Exp $
-
-Thou shalt not use reserved identifiers.
-
---- tools_c.h.orig	2004-12-13 22:54:33.000000000 +0100
-+++ tools_c.h	2006-06-26 12:52:17.000000000 +0200
-@@ -11,18 +11,18 @@
- #else
- # define BSWAP_16(B)\
- 	({\
--			__u16 _B = (B);\
--			(((__u16) ((_B) << 8) | ((_B) >> 8)));\
-+			__u16 m_B = (B);\
-+			(((__u16) ((m_B) << 8) | ((m_B) >> 8)));\
- 	})
- # define BSWAP_32(B)\
- 	({\
--			__u32 _B = (B);\
--			(((__u32) (_B << 24) | ((_B << 8) & 0xff0000) | ((_B >> 8) & 0xff00) | (_B >> 24)));\
-+			__u32 m_B = (B);\
-+			(((__u32) (m_B << 24) | ((m_B << 8) & 0xff0000) | ((m_B >> 8) & 0xff00) | (m_B >> 24)));\
- 	})
- # define BSWAP_64(B)\
- 	({\
--			__u64 _B = (B);\
--			__u32 *_B32 = (__u32 *) &_B;\
-+			__u64 m_B = (B);\
-+			__u32 *_B32 = (__u32 *) &m_B;\
- 			(((__u64) BSWAP32 (_B32[0])) << 32) | BSWAP32 (_B32[1]);\
- 	})
- #endif
-@@ -30,9 +30,9 @@
- 
- #define ROTL(X,n)\
- 	({\
--			__u32 _X = (X);\
--			__u32 _n = (n);\
--			((_X << _n) | (_X >> (32 - _n)));\
-+			__u32 m_X = (X);\
-+			__u32 m_n = (n);\
-+			((m_X << m_n) | (m_X >> (32 - m_n)));\
- 	})
- 
- 
diff --git a/emulators/gcube/patches/patch-ag b/emulators/gcube/patches/patch-ag
deleted file mode 100644
index 6073e6dada0..00000000000
--- a/emulators/gcube/patches/patch-ag
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/06/26 10:56:57 rillig Exp $
-
-Thou shalt not use reserved identifiers.
-
---- tplx.c.orig	2004-12-27 16:57:42.000000000 +0100
-+++ tplx.c	2006-06-26 12:50:49.000000000 +0200
-@@ -37,13 +37,13 @@
- 
- # define BSWAP_16(B)\
- 	({\
--			__u16 _B = (B);\
--			(((__u16) ((_B) << 8) | ((_B) >> 8)));\
-+			__u16 m_B = (B);\
-+			(((__u16) ((m_B) << 8) | ((m_B) >> 8)));\
- 	})
- # define BSWAP_32(B)\
- 	({\
--			__u32 _B = (B);\
--			(((__u32) (_B << 24) | ((_B << 8) & 0xff0000) | ((_B >> 8) & 0xff00) | (_B >> 24)));\
-+			__u32 m_B = (B);\
-+			(((__u32) (m_B << 24) | ((m_B << 8) & 0xff0000) | ((m_B >> 8) & 0xff00) | (m_B >> 24)));\
- 	})
- 
- #ifdef LIL_ENDIAN
-@@ -135,15 +135,15 @@ inline __u32 color_unpack_rgb565 (__u32 
- 
- inline __u32 color_unpack_rgba4 (__u32 X)
- {
--	__u32 _X = X;
-+	__u32 m_X = X;
- 
- 
- #ifdef LIL_ENDIAN
--	_X = ((X & 0x0f00) <<  0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12);
-+	m_X = ((X & 0x0f00) <<  0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12);
- #else
--	_X = ((X & 0x0f00) <<  8) | ((X & 0x00f0) <<  4) | ((X & 0x000f) <<  0) | ((X & 0xf000) << 12);
-+	m_X = ((X & 0x0f00) <<  8) | ((X & 0x00f0) <<  4) | ((X & 0x000f) <<  0) | ((X & 0xf000) << 12);
- #endif
--	return (_X | (_X << 4));
-+	return (m_X | (m_X << 4));
- }
- 
- 
diff --git a/emulators/generator-cbiere/DESCR b/emulators/generator-cbiere/DESCR
deleted file mode 100644
index 20cfe9f1d11..00000000000
--- a/emulators/generator-cbiere/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-This is a modified version of Generator by James Ponder based on
-version 0.35 and maintained by Christian Biere.
-
-Additional features
-
-    * Support for BZIP2, GZIP and ZIP compressed ROMs i.e., no more
-      manual decompression or wasted disk space. Yay!
-    * Support for X11's XVideo hardware acceleration by SDL for
-      faster and smoother graphics.
-    * Fullscreen support with or without the classic color frame.
-    * SDL audio support (in favour of OSS Audio) which means you can
-      use ESound and others for sharing the sound device among other
-      applications.
-    * Optional mute playing i.e., if you don't have a soundcard or
-      the soundcard is busy you can still play.
-    * Support for 48kHz sample rate (needs driver support).
-    * Automagic CPU usage reduction which is especially cool for
-      notebooks. The unpatched Generator uses more or less as much CPU
-      as it can get even if needs far less than 10% on any modern system.
-    * Working support for Game Genie codes.
diff --git a/emulators/generator-cbiere/Makefile b/emulators/generator-cbiere/Makefile
deleted file mode 100644
index 20c598f7be9..00000000000
--- a/emulators/generator-cbiere/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2006/06/12 16:28:06 wiz Exp $
-#
-
-DISTNAME=	generator-0.35-cbiere-r2
-PKGNAME=	generator-cbiere-0.35r2
-PKGREVISION=	3
-CATEGORIES=	emulators
-MASTER_SITES=	http://www.ghostwhitecrab.de/generator/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.ghostwhitecrab.de/generator/
-COMMENT=	Sega Mega drive genesis emulator (Improved)
-
-GNU_CONFIGURE=		yes
-
-.if (${MACHINE_ARCH} == "i386")
-BUILD_DEPENDS+=		nasm-[0-9]*:../../devel/nasm
-CONFIGURE_ARGS+=	--with-gtk --with-raze
-.else
-CONFIGURE_ARGS+=	--with-gtk --with-cmz80
-.endif
-
-CONFIGURE_ARGS+=	--with-sdl-audio
-
-.include "../../mk/endian.mk"
-
-.if ${MACHINE_ENDIAN} == "big"
-CFLAGS+=	-DBYTES_HIGHFIRST
-.endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/main/generator-gtk \
-		${PREFIX}/bin/generator-cbiere-gtk
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/generator-cbiere/PLIST b/emulators/generator-cbiere/PLIST
deleted file mode 100644
index fd1f6660679..00000000000
--- a/emulators/generator-cbiere/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/08/30 11:06:58 xtraeme Exp $
-bin/generator-cbiere-gtk
diff --git a/emulators/generator-cbiere/distinfo b/emulators/generator-cbiere/distinfo
deleted file mode 100644
index 6cd7d03aac7..00000000000
--- a/emulators/generator-cbiere/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/10/02 22:06:06 wiz Exp $
-
-SHA1 (generator-0.35-cbiere-r2.tar.bz2) = bb329925298ef7a087601e61f570af8d4e615915
-RMD160 (generator-0.35-cbiere-r2.tar.bz2) = 394145e32f3bf61ac4ed5fa21d2873978c5bd341
-Size (generator-0.35-cbiere-r2.tar.bz2) = 446101 bytes
diff --git a/emulators/generator/DESCR b/emulators/generator/DESCR
deleted file mode 100644
index 7d4dc2f6e2b..00000000000
--- a/emulators/generator/DESCR
+++ /dev/null
@@ -1,22 +0,0 @@
-Generator is an open source emulator designed to emulate the Sega
-Genesis / Mega Drive console, a popular games machine produced in the
-early 1990s.  It is a portable program written in C and has been
-ported to the Amiga, Macintosh, Windows and even pocket PCs such as
-the iPAQ and Cassiopeia.  Natively it compiles under unix for X
-Windows with either tcl/tk or gtk/SDL, for svgalib and even
-cross-compiles to DOS with djgpp/allegro.
-
-Generator uses its own custom 68000 processor emulation which is
-designed for dynamic recompilation, and uses techniques from this such
-as block-marking, flag calculation removal, operand pre-calculation,
-endian pre-conversion etc.  There are approximately 1600 C routines
-generated by the first stage of compilation to cope with the 67
-instruction families.  These routines are used as a 'backup' when
-dynamic recompilation isn't supported on your platform or the
-recompiler doesn't support a particular instruction.  The CPU engine
-is by all accounts very fast, whatever the mode.
-
-There is a 'test' recompiler written for the ARM processor, but it is
-no longer supported.  If someone with assembler knowledge wants to put
-the effort into writing a recompiling back-end for a processor (and it
-really is major effort), let me know - particularly if you know i386.
diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile
deleted file mode 100644
index 1df5bb6f1ff..00000000000
--- a/emulators/generator/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/06/12 16:28:06 wiz Exp $
-#
-
-DISTNAME=	generator-0.35
-PKGREVISION=	4
-CATEGORIES=	emulators
-MASTER_SITES=	http://www.squish.net/generator/files/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.squish.net/generator/
-COMMENT=	Sega Mega drive genesis emulator
-
-GNU_CONFIGURE=		yes
-
-.if (${MACHINE_ARCH} == "i386")
-BUILD_DEPENDS+=		nasm-[0-9]*:../../devel/nasm
-CONFIGURE_ARGS+=	--with-gtk --with-raze
-.else
-CONFIGURE_ARGS+=	--with-gtk --with-cmz80
-.endif
-
-.include "../../mk/endian.mk"
-
-.if ${MACHINE_ENDIAN} == "big"
-CFLAGS+=	-DBYTES_HIGHFIRST
-.endif
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/generator/PLIST b/emulators/generator/PLIST
deleted file mode 100644
index 2125ec7ad69..00000000000
--- a/emulators/generator/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/09 19:08:39 agc Exp $
-bin/generator-gtk
diff --git a/emulators/generator/distinfo b/emulators/generator/distinfo
deleted file mode 100644
index af60595b3bc..00000000000
--- a/emulators/generator/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/04/02 22:23:53 kristerw Exp $
-
-SHA1 (generator-0.35.tar.gz) = a61138579efd97028d3a69c54c3c6fcd0a3d74ab
-RMD160 (generator-0.35.tar.gz) = 6b448018b8ed0fd9755ddb850f48892304d12e78
-Size (generator-0.35.tar.gz) = 469541 bytes
-SHA1 (patch-aa) = 5b971a07345bbd8e3d86284127829df5f4f5a541
-SHA1 (patch-ab) = 487620ee83fc17119ad6b8ab3e9a19a1401a5c02
-SHA1 (patch-ac) = 7467437c39f7df56a261a330d8f021c0d9c0381b
-SHA1 (patch-ae) = 4e689421fe66aa7f635191e9f0100cd98daf8a76
-SHA1 (patch-af) = ef1c72b6da1ae93209a13b6836d5a85f66ffa51c
diff --git a/emulators/generator/patches/patch-aa b/emulators/generator/patches/patch-aa
deleted file mode 100644
index 50d9b2de140..00000000000
--- a/emulators/generator/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/04/02 22:23:53 kristerw Exp $
-
---- hdr/registers.h.orig	Sat Apr  2 23:59:51 2005
-+++ hdr/registers.h	Sun Apr  3 00:05:50 2005
-@@ -13,7 +13,7 @@
-        register uint32 *reg68k_regs asm ("6");
-        register t_sr reg68k_sr asm ("7");
- #  else
--#    ifdef PROCESSOR_INTEL
-+#    if defined (PROCESSOR_INTEL) && (__GNUC__ > 2)
-          register uint32 reg68k_pc asm ("%ebx");
-          register uint32 *reg68k_regs asm ("%edi");
-          register t_sr reg68k_sr asm ("%esi");
diff --git a/emulators/generator/patches/patch-ab b/emulators/generator/patches/patch-ab
deleted file mode 100644
index fdb745646bd..00000000000
--- a/emulators/generator/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/04/02 22:23:53 kristerw Exp $
-
---- main/reg68k.c.orig	Sun Apr  3 00:02:45 2005
-+++ main/reg68k.c	Sun Apr  3 00:04:24 2005
-@@ -21,7 +21,8 @@
- /*** global variables ***/
- 
- #if (!(defined(PROCESSOR_ARM) || defined(PROCESSOR_SPARC) \
--       || defined(PROCESSOR_INTEL)))
-+       || defined(PROCESSOR_INTEL))) \
-+    || (defined(PROCESSOR_INTEL) && (__GNUC__ <= 2))
- uint32 reg68k_pc;
- uint32 *reg68k_regs;
- t_sr reg68k_sr;
diff --git a/emulators/generator/patches/patch-ac b/emulators/generator/patches/patch-ac
deleted file mode 100644
index fe74976e436..00000000000
--- a/emulators/generator/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/01/31 23:58:33 xtraeme Exp $
-
---- configure.orig	2005-02-01 00:40:15.000000000 +0100
-+++ configure	2005-02-01 00:40:29.000000000 +0100
-@@ -1919,15 +1919,6 @@
- echo "${ECHO_T}Turning on gcc 3 optimisations" >&6
-         CFLAGS="$CFLAGS -minline-all-stringops -fno-math-errno"
-       fi
--      case $target_cpu in
--        i?86) echo "$as_me:$LINENO: result: Turning on pentium optimisations" >&5
--echo "${ECHO_T}Turning on pentium optimisations" >&6
--              # cannot do malign-double as we link to other libraries and it
--              # would break binary compatibility
--              CFLAGS="$CFLAGS -march=pentium -malign-loops=5"
--              CFLAGS="$CFLAGS -malign-jumps=5 -malign-functions=5"
--              ;;
--      esac
-     else
-       { echo "$as_me:$LINENO: WARNING: You did not opt for gcc optimisations!" >&5
- echo "$as_me: WARNING: You did not opt for gcc optimisations!" >&2;}
diff --git a/emulators/generator/patches/patch-ae b/emulators/generator/patches/patch-ae
deleted file mode 100644
index 16573fb052a..00000000000
--- a/emulators/generator/patches/patch-ae
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2005/01/31 23:58:33 xtraeme Exp $
-
---- hdr/generator.h.orig	2003-05-04 20:50:43.000000000 +0200
-+++ hdr/generator.h	2005-02-01 00:46:44.000000000 +0100
-@@ -21,6 +21,11 @@
-   #include <machine/endian.h>
-   #define SWAP16(x) bswap_16((x))
-   #define SWAP32(x) bswap_32((x))
-+#elif defined(__NetBSD__)
-+  #include <sys/types.h>
-+  #include <machine/endian.h>
-+  #define SWAP16(x) bswap16((x))
-+  #define SWAP32(x) bswap32((x))
- #else
-   #define SWAP16(y) (( ((y)>>8) & 0x00ff) | (( ((y)<<8) & 0xff00)))
-   #define SWAP32(y) (( ((y)>>24) & 0x000000ff) | \
-@@ -221,11 +226,11 @@
- #  define LOG_DEBUG3(x)   /* ui_log_debug3 ## x */
- #  define LOG_DEBUG2(x)   /* ui_log_debug2 ## x */
- #  define LOG_DEBUG1(x)   /* ui_log_debug1 ## x */
--#  define LOG_USER(x)     ui_log_user ## x
--#  define LOG_VERBOSE(x)  ui_log_verbose ## x
--#  define LOG_NORMAL(x)   ui_log_normal ## x
--#  define LOG_CRITICAL(x) ui_log_critical ## x
--#  define LOG_REQUEST(x)  ui_log_request ## x
-+#  define LOG_USER(x)     ui_log_user x
-+#  define LOG_VERBOSE(x)  ui_log_verbose x
-+#  define LOG_NORMAL(x)   ui_log_normal x
-+#  define LOG_CRITICAL(x) ui_log_critical x
-+#  define LOG_REQUEST(x)  ui_log_request x
- #endif
- 
- typedef struct {
diff --git a/emulators/generator/patches/patch-af b/emulators/generator/patches/patch-af
deleted file mode 100644
index 44176e03bff..00000000000
--- a/emulators/generator/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/02/13 23:41:28 kristerw Exp $
-
---- main/ui-gtk.c.orig	2004-02-14 00:30:00.000000000 +0100
-+++ main/ui-gtk.c	2004-02-14 00:30:20.000000000 +0100
-@@ -626,7 +626,7 @@
- /* logging is done this way because this was the best I could come up with
-    whilst battling with macros that can only take fixed numbers of arguments */
- 
--#define LOG_FUNC(name,level,txt) void ui_log_ ## name ## (const char *text, ...) \
-+#define LOG_FUNC(name,level,txt) void ui_log_ ## name (const char *text, ...) \
- { \
-   va_list ap; \
-   if (gen_loglevel >= level) { \
diff --git a/emulators/gens/DESCR b/emulators/gens/DESCR
deleted file mode 100644
index c2954770d5d..00000000000
--- a/emulators/gens/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Gens is an emulator of Sega's 16 bit consoles: Genesis (a.k.a
-Megadrive) and Sega CD (a.k.a Mega CD).  For Sega CD, you will need
-BIOS ROM images.
diff --git a/emulators/gens/Makefile b/emulators/gens/Makefile
deleted file mode 100644
index 4fe3629deb0..00000000000
--- a/emulators/gens/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2006/07/29 20:40:09 dillo Exp $
-#
-
-DISTNAME=		gens-rc3
-PKGNAME=		gens-2.12rc3
-PKGREVISION=		9
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gens/}
-
-MAINTAINER=		dillo@NetBSD.org
-HOMEPAGE=		http://gens.consolemul.com/
-COMMENT=		Sega Genesis emulator with Sega CD support
-
-BUILD_DEPENDS+=		nasm-[0-9]*:../../devel/nasm
-
-# contains i386 assembler sources
-ONLY_FOR_PLATFORM=	*-*-i386
-
-WRKSRC=			${WRKDIR}/GensForLinux
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gens
-	${INSTALL_DATA} ${WRKSRC}/gens.txt ${PREFIX}/share/doc/gens
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/gens/PLIST b/emulators/gens/PLIST
deleted file mode 100644
index cccd4417336..00000000000
--- a/emulators/gens/PLIST
+++ /dev/null
@@ -1,39 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/26 18:23:22 dillo Exp $
-bin/gens
-share/doc/gens/gens.txt
-share/gens/Gens2.ico
-share/gens/bitmap1.png
-share/gens/bmp00000.png
-share/gens/bmp00001.png
-share/gens/bmp00002.png
-share/gens/bmp00003.png
-share/gens/bmp00004.png
-share/gens/bmp00005.png
-share/gens/bmp00006.png
-share/gens/gens.ico
-share/gens/gens_big.bmp
-share/gens/gens_small.png
-share/gens/sonic.ico
-share/gens/sonic2.ico
-share/gens/file_text.png
-share/gens/2rightarrow.png
-share/gens/Modem.png
-share/gens/binary.png
-share/gens/cdrom2_unmount.png
-share/gens/editcopy.png
-share/gens/filleclose.png
-share/gens/folder_slin_open.png
-share/gens/history.png
-share/gens/kmix.png
-share/gens/ksysguard.png
-share/gens/memory.png
-share/gens/package_games.png
-share/gens/package_settings.png
-share/gens/password.png
-share/gens/reload.png
-share/gens/resource.png
-share/gens/viewmag.png
-share/gens/viewmag1.png
-share/gens/xpaint.png
-@dirrm share/gens
-@dirrm share/doc/gens
diff --git a/emulators/gens/distinfo b/emulators/gens/distinfo
deleted file mode 100644
index 5b482ffc758..00000000000
--- a/emulators/gens/distinfo
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: distinfo,v 1.7 2006/07/29 20:40:09 dillo Exp $
-
-SHA1 (gens-rc3.tar.gz) = 6057564665007686c9ea8df364be3220499f9917
-RMD160 (gens-rc3.tar.gz) = d2a36a5bdca8948b12624cba15dab0c5b527a688
-Size (gens-rc3.tar.gz) = 658729 bytes
-SHA1 (patch-aa) = e6a4768963e9da1799b80e775f0637eb07b2ca5c
-SHA1 (patch-ab) = dd38b7ebcbadc0a3881397916c2444d4a2ac2e35
-SHA1 (patch-ac) = 7c3f17c59727365ff4cf11d1a5d1c3da19943872
-SHA1 (patch-ad) = dae2ad294272f18067a640d88286ddfeb7775aaf
-SHA1 (patch-ae) = 6902f4e2abd38b2dcd946309c1321a95c3ded2b4
-SHA1 (patch-af) = 6e641ec6c0ae7fad6997ce70b48d417e2ec7dfd7
-SHA1 (patch-ag) = 8b91c6f85528ab2ef2fedf6d24b90a0f3a744e9d
-SHA1 (patch-ah) = e8a6264b351c4a7fb3fb1bd4dd5a482dcef763ae
-SHA1 (patch-ai) = 596fe718e5c38091a06198413bcf29b3c668571f
-SHA1 (patch-aj) = a046754c4734f5270c0c6d5bfb55dc8442991b36
-SHA1 (patch-ak) = fbf85318880857783cd98348af627b7c6e444382
-SHA1 (patch-al) = df28b32dc88d3d45867ff9fd771a364a0fabe9b2
-SHA1 (patch-am) = 3e49691329cdfaf60f89136d104ec5e87cd6e255
-SHA1 (patch-an) = 94a6a857238edbf3db0daea59400f5b13fc1ed2f
-SHA1 (patch-ao) = 04bbf581f156cf3f9f119295a00071f29c2b1ab7
-SHA1 (patch-ap) = 634fa5f851b06f09c0a511c65278c002944c29d4
-SHA1 (patch-aq) = af968fb3ce22aa147ac4b47d0739db45977eacf8
-SHA1 (patch-ar) = c97b6dfd255ca64f7a5efc02e2f6b0f4b39706ec
-SHA1 (patch-as) = ed6586473668f0226862741ae09bad16278a280b
-SHA1 (patch-at) = 37c78682d91516e0c757993ee29b61437f8e3496
-SHA1 (patch-au) = daae4256b95012356ae0cc4a7fde3509bb7f5964
-SHA1 (patch-av) = 7d6ccfae4f81ed89295a3b8f8aea751bca111600
diff --git a/emulators/gens/patches/patch-aa b/emulators/gens/patches/patch-aa
deleted file mode 100644
index bd6e38608ee..00000000000
--- a/emulators/gens/patches/patch-aa
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/08/15 12:13:53 dillo Exp $
-
---- src/gens/Makefile.in.orig	2004-05-19 22:48:47.000000000 +0200
-+++ src/gens/Makefile.in
-@@ -199,6 +199,8 @@ gens_SOURCES = \
- 		util/gym.h \
- 		util/scrshot.c \
- 		util/scrshot.h \
-+		util/chd.c \
-+		util/chd.h \
- 		util/unzip.c \
- 		util/unzip.h \
- 		util/wave.c \
-@@ -284,6 +286,7 @@ am_gens_OBJECTS = gens_core/cpu/68k/gens
- 	sdllayer/gens-g_sdlsound.$(OBJEXT) util/gens-rom.$(OBJEXT) \
- 	util/gens-save.$(OBJEXT) util/gens-ggenie.$(OBJEXT) \
- 	util/gens-gym.$(OBJEXT) util/gens-scrshot.$(OBJEXT) \
-+	util/gens-chd.$(OBJEXT) \
- 	util/gens-unzip.$(OBJEXT) util/gens-wave.$(OBJEXT) \
- 	port/gens-port.$(OBJEXT) port/gens-timer.$(OBJEXT) \
- 	emulator/gens-ui_proxy.$(OBJEXT) emulator/gens-g_main.$(OBJEXT) \
-@@ -343,6 +346,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
- @AMDEP_TRUE@	$(DEPDIR)/util/gens-rom.Po \
- @AMDEP_TRUE@	$(DEPDIR)/util/gens-save.Po \
- @AMDEP_TRUE@	$(DEPDIR)/util/gens-scrshot.Po \
-+@AMDEP_TRUE@	$(DEPDIR)/util/gens-chd.Po \
- @AMDEP_TRUE@	$(DEPDIR)/util/gens-unzip.Po \
- @AMDEP_TRUE@	$(DEPDIR)/util/gens-wave.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -502,6 +506,8 @@ util/gens-gym.$(OBJEXT): util/gym.c util
- 	$(DEPDIR)/util/.dirstamp
- util/gens-scrshot.$(OBJEXT): util/scrshot.c util/.dirstamp \
- 	$(DEPDIR)/util/.dirstamp
-+util/gens-chd.$(OBJEXT): util/chd.c util/.dirstamp \
-+	$(DEPDIR)/util/.dirstamp
- util/gens-unzip.$(OBJEXT): util/unzip.c util/.dirstamp \
- 	$(DEPDIR)/util/.dirstamp
- util/gens-wave.$(OBJEXT): util/wave.c util/.dirstamp \
-@@ -609,6 +615,7 @@ mostlyclean-compile:
- 	-rm -f util/gens-rom.$(OBJEXT)
- 	-rm -f util/gens-save.$(OBJEXT)
- 	-rm -f util/gens-scrshot.$(OBJEXT)
-+	-rm -f util/gens-chd.$(OBJEXT)
- 	-rm -f util/gens-unzip.$(OBJEXT)
- 	-rm -f util/gens-wave.$(OBJEXT)
- 
-@@ -684,6 +691,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/util/gens-rom.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/util/gens-save.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/util/gens-scrshot.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/util/gens-chd.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/util/gens-unzip.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/util/gens-wave.Po@am__quote@
- 
-@@ -1038,6 +1046,18 @@ util/gens-scrshot.obj: util/scrshot.c
- @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gens_CFLAGS) $(CFLAGS) -c -o util/gens-scrshot.obj `cygpath -w util/scrshot.c`
- 
-+util/gens-chd.o: util/chd.c
-+@AMDEP_TRUE@	source='util/chd.c' object='util/gens-chd.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	depfile='$(DEPDIR)/util/gens-chd.Po' tmpdepfile='$(DEPDIR)/util/gens-chd.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gens_CFLAGS) $(CFLAGS) -c -o util/gens-chd.o `test -f util/chd.c || echo '$(srcdir)/'`util/chd.c
-+
-+util/gens-chd.obj: util/chd.c
-+@AMDEP_TRUE@	source='util/chd.c' object='util/gens-chd.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	depfile='$(DEPDIR)/util/gens-chd.Po' tmpdepfile='$(DEPDIR)/util/gens-chd.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gens_CFLAGS) $(CFLAGS) -c -o util/gens-chd.obj `cygpath -w util/chd.c`
-+
- util/gens-unzip.o: util/unzip.c
- @AMDEP_TRUE@	source='util/unzip.c' object='util/gens-unzip.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@	depfile='$(DEPDIR)/util/gens-unzip.Po' tmpdepfile='$(DEPDIR)/util/gens-unzip.TPo' @AMDEPBACKSLASH@
diff --git a/emulators/gens/patches/patch-ab b/emulators/gens/patches/patch-ab
deleted file mode 100644
index 5e87d56e5a4..00000000000
--- a/emulators/gens/patches/patch-ab
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/08/15 12:13:53 dillo Exp $
-
---- src/gens/gtkui/support.c.orig	2004-05-18 20:04:29.000000000 +0200
-+++ src/gens/gtkui/support.c
-@@ -247,6 +247,7 @@ void
- sync_gens_ui ()
- {
- 	GtkWidget *vsync, *stretch, *sprite_limit, *perfect_synchro;
-+	GtkWidget *play_movie;
- 	GtkWidget *sram_size_0;
- 	GtkWidget *sram_size[4];
- 
-@@ -277,6 +278,7 @@ sync_gens_ui ()
- 	stretch = lookup_widget (gens_window, "stretch");
- 	sprite_limit = lookup_widget (gens_window, "sprite_limit");
- 	perfect_synchro = lookup_widget (gens_window, "perfect_synchro");
-+	play_movie = lookup_widget(gens_window, "play_movie");
- 
- 	sram_size_0 = lookup_widget (gens_window, "none");
- 	sram_size[0] = lookup_widget (gens_window, "_8_kb");
-@@ -393,6 +395,8 @@ sync_gens_ui ()
- 					Sprite_Over);
- 	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (perfect_synchro),
- 					SegaCD_Accurate);
-+	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (play_movie),
-+					MoviePlaying);
- 	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (enable_sound),
- 					Sound_Enable);
- 	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (stereo),
-@@ -781,14 +785,16 @@ addIsoFilter(GtkWidget* widget)
- {
- 	GtkFileFilter* filter;
- // "SegaCD image file\0*.bin;*.iso;*.raw\0All files\0*.*\0\0"
--	const char* bin = "*.[bb][iI][nN]";
-+	const char* bin = "*.[bB][iI][nN]";
- 	const char* iso = "*.[iI][sS][oO]";
-+	const char* chd = "*.[cC][hH][dD]";
- 	const char* raw = "*.[rR][aA][wW]";
- 	
- 	filter = gtk_file_filter_new ();
- 	gtk_file_filter_set_name (filter, "SegaCD image file");
- 	gtk_file_filter_add_pattern (filter, bin);
- 	gtk_file_filter_add_pattern (filter, iso);
-+	gtk_file_filter_add_pattern (filter, chd);
- 	gtk_file_filter_add_pattern (filter, raw);
- 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter);
- }
-@@ -803,6 +809,7 @@ addRomsFilter(GtkWidget* widget)
- 	const char* gen = "*.[gG][eE][nN]";
- 	const char* _32x = "*.32[xX]";
- 	const char* iso = "*.[iI][sS][oO]";
-+	const char* chd = "*.[cC][hH][dD]";
- 	const char* raw = "*.[rR][aA][wW]";
- 	const char* zip = "*.[zZ][iI][pP]";
- 	const char* gz ="*.[gG][zZ]";
-@@ -816,6 +823,7 @@ addRomsFilter(GtkWidget* widget)
- 	gtk_file_filter_add_pattern (filter, gen);
- 	gtk_file_filter_add_pattern (filter, _32x);
- 	gtk_file_filter_add_pattern (filter, iso);
-+	gtk_file_filter_add_pattern (filter, chd);
- 	gtk_file_filter_add_pattern (filter, raw);
- 	gtk_file_filter_add_pattern (filter, zip);
- 	gtk_file_filter_add_pattern (filter, gz);
-@@ -842,6 +850,7 @@ addRomsFilter(GtkWidget* widget)
- 	filter = gtk_file_filter_new ();
-     gtk_file_filter_set_name (filter, "SegaCD image");
- 	gtk_file_filter_add_pattern (filter, iso);
-+	gtk_file_filter_add_pattern (filter, chd);
- 	gtk_file_filter_add_pattern (filter, raw);
- 	gtk_file_filter_add_pattern (filter, bin);
- 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter);
-@@ -852,6 +861,18 @@ addRomsFilter(GtkWidget* widget)
- 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter);
- }
- 
-+void
-+addGmvFilter(GtkWidget* widget)
-+{
-+	GtkFileFilter* filter;
-+	const char* gmv = "*.[gG][mM][vV]";
-+	
-+	filter = gtk_file_filter_new ();
-+	gtk_file_filter_set_name (filter, "gens movie file");
-+	gtk_file_filter_add_pattern (filter, gmv);
-+	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter);
-+}
-+
- GtkWidget*
- create_file_chooser_dialog(const char* title, GtkFileChooserAction action)
- {
diff --git a/emulators/gens/patches/patch-ac b/emulators/gens/patches/patch-ac
deleted file mode 100644
index 355c7699f9b..00000000000
--- a/emulators/gens/patches/patch-ac
+++ /dev/null
@@ -1,118 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/08/15 12:13:53 dillo Exp $
-
---- src/gens/segacd/cd_aspi.c.orig	2004-05-18 22:34:00.000000000 +0200
-+++ src/gens/segacd/cd_aspi.c
-@@ -8,6 +8,8 @@
- #include "cd_aspi.h"
- #include "mem_s68k.h"
- 
-+#ifdef linux
-+
- #define HIBYTE(x) x >> 8
- #define LOBYTE(x) x & 0xff
- void Sleep (int i);
-@@ -2878,3 +2880,104 @@ Fill_SCD_TOC_Zero (void)
- 
-   CD_Present = 0;
- }
-+
-+#else
-+
-+int CUR_DEV;
-+int Num_CD_Drive;
-+
-+int
-+ASPI_Close_Tray_CDD_cC_COMP (SRB_ExecSCSICmd * s)
-+{
-+	return -1;
-+}
-+
-+int
-+ASPI_End (void)
-+{
-+	return 1;
-+}
-+
-+int
-+ASPI_Fast_Seek_COMP (SRB_ExecSCSICmd * s)
-+{
-+	return 0;
-+}
-+
-+void
-+ASPI_Flush_Cache_CDC (void)
-+{
-+	return;
-+}
-+
-+int
-+ASPI_Init (void)
-+{
-+	Num_CD_Drive = 0;
-+	return 0;
-+}
-+
-+int
-+ASPI_Lock (int flock)
-+{
-+	return 5;
-+}
-+
-+int
-+ASPI_Open_Tray_CDD_cD_COMP (SRB_ExecSCSICmd * s)
-+{
-+	return -1;
-+}
-+
-+void
-+ASPI_Read_One_LBA_CDC (void)
-+{
-+	return;
-+}
-+
-+void
-+ASPI_Reset_Drive (char *buf)
-+{
-+	return;
-+}
-+
-+int
-+ASPI_Seek (int pos, int async,
-+           int (*PostProc) (struct tagSRB32_ExecSCSICmd *))
-+{
-+	return 5;
-+}
-+
-+int
-+ASPI_Seek_CDD_c4_COMP (SRB_ExecSCSICmd * s)
-+{
-+	return -1;
-+}
-+
-+int
-+ASPI_Star_Stop_Unit (int op, int imm, int async,
-+                     int (*PostProc) (struct tagSRB32_ExecSCSICmd *))
-+{
-+	return 5;
-+}
-+
-+int
-+ASPI_Stop_CDD_c1_COMP (SRB_ExecSCSICmd * s)
-+{
-+	return 0;
-+}
-+
-+int
-+ASPI_Stop_Play_Scan (int async,
-+                     int (*PostProc) (struct tagSRB32_ExecSCSICmd *))
-+{
-+	return 5;
-+}
-+
-+void
-+Wait_Read_Complete (void)
-+{
-+	return;
-+}
-+
-+#endif
diff --git a/emulators/gens/patches/patch-ad b/emulators/gens/patches/patch-ad
deleted file mode 100644
index a72497da2b7..00000000000
--- a/emulators/gens/patches/patch-ad
+++ /dev/null
@@ -1,133 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/08/15 12:13:53 dillo Exp $
-
---- src/gens/segacd/cd_file.c.orig	2004-05-18 22:34:00.000000000 +0200
-+++ src/gens/segacd/cd_file.c
-@@ -39,7 +39,7 @@ FILE_End (void)
- int
- Load_ISO (char *buf, char *iso_name)
- {
--  FILE *File_Size;
-+  int fmt;
-   int i, j, num_track, Cur_LBA;
-   FILE *tmp_file;
-   char tmp_name[1024], tmp_ext[10];
-@@ -52,41 +52,62 @@ Load_ISO (char *buf, char *iso_name)
- 
-   Unload_ISO ();
- 
--  if (Detect_Format (iso_name) == SEGACD_IMAGE + 1)
-+  fmt = Detect_Format (iso_name);
-+  if (fmt == SEGACD_IMAGE + 1)
-     Tracks[0].Type = TYPE_BIN;
--  else if (Detect_Format (iso_name) == SEGACD_IMAGE)
-+  else if (fmt == SEGACD_IMAGE)
-     Tracks[0].Type = TYPE_ISO;
-   else
-     return -2;
- 
--  File_Size = fopen (iso_name, "rb");
--  fseek (File_Size, 0, SEEK_END);
--  Tracks[0].Lenght = ftell (File_Size);
--  fseek (File_Size, 0, SEEK_SET);
-+  if (!stricmp (".chd", &iso_name[strlen (iso_name) -4]))
-+    {
-+      Tracks[0].F = NULL;
-+      Tracks[0].chd = chd_open(iso_name, NULL);
-+      
-+      if (Tracks[0].chd == NULL)
-+	{
-+	  Tracks[0].Type = 0;
-+	  Tracks[0].Lenght = 0;
-+	  return -1;
-+	}
- 
--  if (Tracks[0].Type == TYPE_ISO)
--    Tracks[0].Lenght >>= 11;	// size in sectors
-+      Tracks[0].Lenght = Tracks[0].chd->total_len;
-+
-+      if (Tracks[0].Type == TYPE_ISO)
-+	chd_read_range(Tracks[0].chd, buf, 0x100, 0x200);
-+      else
-+	chd_read_range(Tracks[0].chd, buf, 0x110, 0x200);
-+    }
-   else
--    Tracks[0].Lenght /= 2352;	// size in sectors
-+    {
-+      Tracks[0].F = fopen (iso_name, "rb");
-+      Tracks[0].chd = NULL;
-+
-+      if (Tracks[0].F == NULL)
-+        {
-+	  Tracks[0].Type = 0;
-+	  Tracks[0].Lenght = 0;
-+	  return -1;
-+	}
- 
--  fclose (File_Size);
-+      fseek (Tracks[0].F, 0, SEEK_END);
-+      Tracks[0].Lenght = ftell (Tracks[0].F);
- 
--  Tracks[0].F = fopen (iso_name, "rb");
-+      if (Tracks[0].Type == TYPE_ISO)
-+	fseek (Tracks[0].F, 0x100, SEEK_SET);
-+      else
-+	fseek (Tracks[0].F, 0x110, SEEK_SET);
-+      
-+      fread (buf, 1, 0x200, Tracks[0].F);
-+      fseek (Tracks[0].F, 0, SEEK_SET);
- 
--  if (Tracks[0].F == NULL)
--    {
--      Tracks[0].Type = 0;
--      Tracks[0].Lenght = 0;
--      return -1;
-     }
- 
-   if (Tracks[0].Type == TYPE_ISO)
--    fseek (Tracks[0].F, 0x100, SEEK_SET);
-+    Tracks[0].Lenght >>= 11;	// size in sectors
-   else
--    fseek (Tracks[0].F, 0x110, SEEK_SET);
--
--  fread (buf, 1, 0x200, Tracks[0].F);
--  fseek (Tracks[0].F, 0, SEEK_SET);
-+    Tracks[0].Lenght /= 2352;	// size in sectors
- 
-   SCD.TOC.First_Track = 1;
- 
-@@ -219,6 +240,10 @@ Unload_ISO (void)
- 
-   Track_Played = 99;
- 
-+  if (Tracks[0].chd)
-+    chd_close(Tracks[0].chd);
-+  Tracks[0].chd = NULL;
-+
-   for (i = 0; i < 100; i++)
-     {
-       if (Tracks[i].F)
-@@ -237,7 +262,7 @@ FILE_Read_One_LBA_CDC (void)
- 
-   if (CDD.Control & 0x0100)	// DATA
-     {
--      if (Tracks[0].F == NULL)
-+      if (Tracks[0].F == NULL && Tracks[0].chd == NULL)
- 	return -1;
- 
-       if (SCD.Cur_LBA < 0)
-@@ -254,8 +279,13 @@ FILE_Read_One_LBA_CDC (void)
- 
- //              memset(cp_buf, 0, 2048);
- 
--      fseek (Tracks[0].F, where_read, SEEK_SET);
--      fread (cp_buf, 1, 2048, Tracks[0].F);
-+      if (Tracks[0].chd != NULL)
-+	  chd_read_range(Tracks[0].chd, cp_buf, where_read, 2048);
-+      else
-+        {
-+	  fseek (Tracks[0].F, where_read, SEEK_SET);
-+	  fread (cp_buf, 1, 2048, Tracks[0].F);
-+	}
- 
- #ifdef DEBUG_CD
-       fprintf (debug_SCD_file, "\n\nRead file CDC 1 data sector :\n");
diff --git a/emulators/gens/patches/patch-ae b/emulators/gens/patches/patch-ae
deleted file mode 100644
index 0932f63e336..00000000000
--- a/emulators/gens/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2004/08/15 12:13:53 dillo Exp $
-
---- src/gens/segacd/cd_file.h.orig	2004-03-14 15:34:33.000000000 +0100
-+++ src/gens/segacd/cd_file.h
-@@ -1,6 +1,8 @@
- #ifndef _CD_FILE_H
- #define _CD_FILE_H
- 
-+#include "chd.h"
-+
- #define TYPE_ISO 1
- #define TYPE_BIN 2
- #define TYPE_MP3 3
-@@ -9,6 +11,7 @@
- 
- struct _file_track {
- 	FILE *F;
-+	struct chd *chd;
- 	int Lenght;
- 	int Type;
- };
diff --git a/emulators/gens/patches/patch-af b/emulators/gens/patches/patch-af
deleted file mode 100644
index df10fec26bf..00000000000
--- a/emulators/gens/patches/patch-af
+++ /dev/null
@@ -1,405 +0,0 @@
-$NetBSD: patch-af,v 1.2 2004/08/15 12:13:53 dillo Exp $
-
---- src/gens/util/chd.c.orig	2004-08-15 11:35:14.000000000 +0200
-+++ src/gens/util/chd.c
-@@ -0,0 +1,400 @@
-+/*
-+  NiH: chd.c,v 1.6 2004/06/25 23:31:08 dillo Exp
-+
-+  chd.c -- accessing chd files
-+  Copyright (C) 2004 Dieter Baron and Thomas Klausner
-+
-+  This file is part of ckmame, a program to check rom sets for MAME.
-+  The authors can be contacted at <nih@giga.or.at>
-+
-+  This program is free software; you can redistribute it and/or modify
-+  it under the terms of the GNU General Public License, version 2, as
-+  published by the Free Software Foundation.
-+
-+  This program is distributed in the hope that it will be useful,
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+  GNU General Public License for more details.
-+
-+  You should have received a copy of the GNU General Public License
-+  along with this program; if not, write to the Free Software
-+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+
-+
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <zlib.h>
-+
-+#include "chd.h"
-+
-+
-+
-+#define MAX_HEADERLEN	120		/* maximum header length */
-+#define TAG		"MComprHD"
-+#define TAG_LEN		8		/* length of tag */
-+#define TAG_AND_LEN	12		/* length of tag + header length */
-+
-+#define MAP_ENTRY_SIZE_V12	8	/* size of map entry, versions 1 & 2 */
-+#define MAP_ENTRY_SIZE_V3	16	/* size of map entry, version 3 */
-+
-+#define GET_LONG(b)	(b+=4,((b)[-4]<<24)|((b)[-3]<<16)|((b)[-2]<<8)|(b)[-1])
-+#define GET_QUAD(b)	(b+=8,((uint64_t)(b)[-8]<<56)|((uint64_t)(b)[-7]<<48) \
-+			 |((uint64_t)(b)[-6]<<40)|((uint64_t)(b)[-5]<<32)     \
-+			 |((uint64_t)(b)[-4]<<24)|((uint64_t)(b)[-3]<<16)     \
-+			 |((uint64_t)(b)[-2]<<8)|((uint64_t)(b)[-1]))
-+#define GET_SHORT(b)	(b+=2,((b)[-2]<<8)|(b)[-1])
-+
-+static int read_header(struct chd *);
-+static int read_map(struct chd *);
-+
-+
-+
-+void
-+chd_close(struct chd *chd)
-+{
-+    fclose(chd->f);
-+    free(chd->name);
-+    free(chd->map);
-+    free(chd->buf);
-+    free(chd->hbuf);
-+    free(chd);
-+}   
-+
-+
-+
-+struct chd *
-+chd_open(const char *name, int *errp)
-+{
-+    struct chd *chd;
-+    FILE *f;
-+
-+    if ((f=fopen(name, "rb")) == NULL) {
-+	if (errp)
-+	    *errp = CHD_ERR_OPEN;
-+	return NULL;
-+    }
-+
-+    if ((chd=malloc(sizeof(*chd))) == NULL) {
-+	if (errp)
-+	    *errp = CHD_ERR_NOMEM;
-+	return NULL;
-+    }
-+    chd->f = f;
-+    if ((chd->name=strdup(name)) == NULL) {
-+	if (errp)
-+	    *errp = CHD_ERR_NOMEM;
-+	chd_close(chd);
-+	return NULL;
-+    }
-+    chd->error = 0;
-+    chd->map = NULL;
-+    chd->buf = NULL;
-+    chd->hno = -1;
-+    chd->hbuf = NULL;
-+
-+    if (read_header(chd) < 0) {
-+	if (errp)
-+	    *errp = chd->error;
-+	chd_close(chd);
-+	return NULL;
-+    }
-+
-+    return chd;
-+}
-+
-+
-+
-+int
-+chd_read_hunk(struct chd *chd, int idx, char *b)
-+{
-+    int i, n, err;
-+
-+    if (idx < 0 || idx > chd->total_hunks) {
-+	chd->error = CHD_ERR_INVAL;
-+	return -1;
-+    }
-+
-+    if (chd->map == NULL) {
-+	if (read_map(chd) < 0)
-+	    return -1;
-+    }
-+
-+    if (chd->map[idx].length > chd->hunk_len) {
-+	chd->error = CHD_ERR_NOTSUP;
-+	return -1;
-+    }
-+
-+    switch (chd->map[idx].flags & CHD_MAP_TYPE_MASK) {
-+    case CHD_MAP_TYPE_COMPRESSED:
-+	/* XXX: CHD_COMP_NONE? */
-+	if (chd->compression != CHD_COMP_ZLIB
-+	    && chd->compression != CHD_COMP_ZLIB_PLUS) {
-+	    chd->error = CHD_ERR_NOTSUP;
-+	    return -1;
-+	}
-+
-+	if (chd->buf == NULL) {
-+	    if ((chd->buf=malloc(chd->hunk_len)) == NULL) {
-+		chd->error = CHD_ERR_NOMEM;
-+		return -1;
-+	    }
-+	    chd->z.avail_in = 0;
-+	    chd->z.zalloc = Z_NULL;
-+	    chd->z.zfree = Z_NULL;
-+	    chd->z.opaque = NULL;
-+	    err = inflateInit2(&chd->z, -MAX_WBITS);
-+	}
-+	else
-+	    err = inflateReset(&chd->z);
-+	if (err != Z_OK) {
-+	    chd->error = CHD_ERR_ZLIB;
-+	    return -1;
-+	}
-+
-+	if (fseek(chd->f, chd->map[idx].offset, SEEK_SET) == -1) {
-+	    chd->error = CHD_ERR_SEEK;
-+	    return -1;
-+	}
-+	if ((n=fread(chd->buf, 1, chd->map[idx].length, chd->f)) < 0) {
-+	    chd->error = CHD_ERR_READ;
-+	    return -1;
-+	}
-+
-+	chd->z.next_in = chd->buf;
-+	chd->z.avail_in = n;
-+	chd->z.next_out = b;
-+	chd->z.avail_out = chd->hunk_len;
-+	/* XXX: should use Z_FINISH, but that returns Z_BUF_ERROR */
-+	if ((err=inflate(&chd->z, 0)) != Z_OK && err != Z_STREAM_END) {
-+	    chd->error = CHD_ERR_ZLIB;
-+	    return -1;
-+	}
-+	/* XXX: chd->z.avail_out should be 0 */
-+	n = chd->hunk_len - chd->z.avail_out;
-+	break;
-+
-+    case CHD_MAP_TYPE_UNCOMPRESSED:
-+	if (fseek(chd->f, chd->map[idx].offset, SEEK_SET) == -1) {
-+	    chd->error = CHD_ERR_SEEK;
-+	    return -1;
-+	}
-+	/* XXX: use chd->hunk_len instead? */
-+	if ((n=fread(b, 1, chd->map[idx].length, chd->f)) < 0) {
-+	    chd->error = CHD_ERR_READ;
-+	    return -1;
-+	}
-+	break;
-+
-+    case CHD_MAP_TYPE_MINI:
-+	b[0] = (chd->map[idx].offset >> 56) & 0xff;
-+	b[1] = (chd->map[idx].offset >> 48) & 0xff;
-+	b[2] = (chd->map[idx].offset >> 40) & 0xff;
-+	b[3] = (chd->map[idx].offset >> 32) & 0xff;
-+	b[4] = (chd->map[idx].offset >> 24) & 0xff;
-+	b[5] = (chd->map[idx].offset >> 16) & 0xff;
-+	b[6] = (chd->map[idx].offset >> 8) & 0xff;
-+	b[7] = chd->map[idx].offset & 0xff;
-+	n = chd->hunk_len;
-+	for (i=8; i<n; i++)
-+	    b[i] = b[i-8];
-+	break;
-+
-+    case CHD_MAP_TYPE_SELF_HUNK:
-+	/* XXX: check CRC here too? */
-+	return chd_read_hunk(chd, chd->map[idx].offset, b);
-+
-+    case CHD_MAP_TYPE_PARENT_HUNK:
-+	chd->error = CHD_ERR_NOTSUP;
-+	return -1;
-+
-+    default:
-+	chd->error = CHD_ERR_NOTSUP; /* XXX: wrong error */
-+	return -1;
-+    }
-+    
-+    if ((chd->map[idx].flags & CHD_MAP_FL_NOCRC) == 0) {
-+	if (crc32(0, b, n) != chd->map[idx].crc) {
-+	    chd->error = CHD_ERR_CRC;
-+	    return -1;
-+	}
-+    }
-+    
-+    return n;
-+}
-+
-+
-+
-+int
-+chd_read_range(struct chd *chd, char *b, int off, int len)
-+{
-+    int i, s, n;
-+    int copied, o2, l2;
-+
-+    /* XXX: error handling */
-+
-+    s = off/chd->hunk_len;
-+    n = (off+len+chd->hunk_len-1)/chd->hunk_len - s;
-+
-+    copied = 0;
-+    o2 = off % chd->hunk_len;
-+    l2 = chd->hunk_len - o2;
-+
-+    for (i=0; i<n; i++) {
-+	if (i == 1) {
-+	    o2 = 0;
-+	    l2 = chd->hunk_len;
-+	}
-+	if (i == n-1) {
-+	    if (l2 > len-copied)
-+		l2 = len-copied;
-+	}
-+	if (o2 == 0 && l2 == chd->hunk_len && s+i != chd->hno) {
-+	    if (chd_read_hunk(chd, s+i, b+copied) < 0)
-+		return -1;
-+	    copied += chd->hunk_len;
-+	}
-+	else {
-+	    if (chd->hbuf == NULL)
-+		if ((chd->hbuf=malloc(chd->hunk_len)) == NULL) {
-+		    chd->error = CHD_ERR_NOMEM;
-+		    return -1;
-+		}
-+	    if (s+i != chd->hno) {
-+		if (chd_read_hunk(chd, s+i, chd->hbuf) < 0)
-+		    return  -1;
-+		chd->hno = s+i;
-+	    }
-+	    memcpy(b+copied, chd->hbuf+o2, l2);
-+	    copied += l2;
-+	}
-+    }
-+
-+    return len;
-+}
-+
-+
-+
-+static int
-+read_header(struct chd *chd)
-+{
-+    uint32_t len;
-+
-+    unsigned char b[MAX_HEADERLEN], *p;
-+
-+    if (fread(b, TAG_AND_LEN, 1, chd->f) != 1) {
-+	chd->error = CHD_ERR_READ;
-+	return -1;
-+    }
-+
-+    if (memcmp(b, TAG, TAG_LEN) != 0) {
-+	chd->error = CHD_ERR_NO_CHD;
-+	return -1;
-+    }
-+
-+    p = b+TAG_LEN;
-+    len = GET_LONG(p);
-+    if (len > MAX_HEADERLEN) {
-+	chd->error = CHD_ERR_NO_CHD;
-+	return -1;
-+    }
-+    if (fread(p, len-TAG_AND_LEN, 1, chd->f) != 1) {
-+	chd->error = CHD_ERR_READ;
-+	return -1;
-+    }
-+    
-+    chd->hdr_length = len;
-+    chd->version = GET_LONG(p);
-+    chd->flags = GET_LONG(p);
-+    chd->compression = GET_LONG(p);
-+
-+    if (chd->version > 3) {
-+	chd->error = CHD_ERR_VERSION;
-+	return -1;
-+    }
-+    /* XXX: check chd->hdr_length against expected value for version */
-+
-+    if (chd->version < 3) {
-+	chd->hunk_len = GET_LONG(p);
-+	chd->total_hunks = GET_LONG(p);
-+	p += 12; /* skip c/h/s */
-+	memcpy(chd->md5, p, sizeof(chd->md5));
-+	p += sizeof(chd->md5);
-+	memcpy(chd->parent_md5, p, sizeof(chd->parent_md5));
-+	p += sizeof(chd->parent_md5);
-+
-+	if (chd->version == 1)
-+	    chd->hunk_len *= 512;
-+	else
-+	    chd->hunk_len *= GET_LONG(p);
-+	chd->total_len = chd->hunk_len * chd->total_hunks;
-+	chd->meta_offset = 0;
-+	memset(chd->sha1, 0, sizeof(chd->sha1));
-+	memset(chd->parent_sha1, 0, sizeof(chd->parent_sha1));
-+    }
-+    else {
-+	chd->total_hunks = GET_LONG(p);
-+	chd->total_len = GET_QUAD(p);
-+	chd->meta_offset = GET_QUAD(p);
-+	memcpy(chd->md5, p, sizeof(chd->md5));
-+	p += sizeof(chd->md5);
-+	memcpy(chd->parent_md5, p, sizeof(chd->parent_md5));
-+	p += sizeof(chd->parent_md5);
-+	chd->hunk_len = GET_LONG(p);
-+	memcpy(chd->sha1, p, sizeof(chd->sha1));
-+	p += sizeof(chd->sha1);
-+    }
-+
-+    return 0;
-+}
-+
-+
-+
-+static int
-+read_map(struct chd *chd)
-+{
-+    unsigned char b[MAP_ENTRY_SIZE_V3], *p;
-+    int i, len;
-+    uint64_t v;
-+
-+    if ((chd->map=malloc(sizeof(*chd->map)*chd->total_hunks)) == NULL) {
-+	chd->error = CHD_ERR_NOMEM;
-+	return -1;
-+    }
-+
-+    if (chd->version < 3)
-+	len = MAP_ENTRY_SIZE_V12;
-+    else
-+	len = MAP_ENTRY_SIZE_V3;
-+
-+    for (i=0; i<chd->total_hunks; i++) {
-+	if (fread(b, len, 1, chd->f) != 1) {
-+	    chd->error = CHD_ERR_READ;
-+	    return -1;
-+	}
-+	p = b;
-+
-+	if (i == 1832)
-+	    chd->version = 3;
-+
-+	if (chd->version < 3) {
-+	    v = GET_QUAD(p);
-+	    chd->map[i].offset = v & 0xFFFFFFFFFFFLL;
-+	    chd->map[i].crc = 0;
-+	    chd->map[i].length = v >> 44;
-+	    chd->map[i].flags = CHD_MAP_FL_NOCRC
-+		| (chd->map[i].length == chd->hunk_len
-+		   ? CHD_MAP_TYPE_UNCOMPRESSED : CHD_MAP_TYPE_COMPRESSED);
-+	}
-+	else {
-+	    chd->map[i].offset = GET_QUAD(p);
-+	    chd->map[i].crc = GET_LONG(p);
-+	    chd->map[i].length = GET_SHORT(p);
-+	    chd->map[i].flags = GET_SHORT(p);
-+	}
-+    }
-+
-+    return 0;
-+}
diff --git a/emulators/gens/patches/patch-ag b/emulators/gens/patches/patch-ag
deleted file mode 100644
index 7cdeb6306fc..00000000000
--- a/emulators/gens/patches/patch-ag
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2006/04/28 13:09:38 joerg Exp $
-
---- src/gens/util/chd.h.orig	2006-04-28 12:32:01.000000000 +0000
-+++ src/gens/util/chd.h
-@@ -0,0 +1,95 @@
-+#ifndef HAD_CHD_H
-+
-+/*
-+  NiH: chd.h,v 1.3 2004/06/25 23:31:08 dillo Exp
-+
-+  chd.h -- accessing chd files
-+  Copyright (C) 2004 Dieter Baron and Thomas Klausner
-+
-+  This file is part of ckmame, a program to check rom sets for MAME.
-+  The authors can be contacted at <nih@giga.or.at>
-+
-+  This program is free software; you can redistribute it and/or modify
-+  it under the terms of the GNU General Public License, version 2, as
-+  published by the Free Software Foundation.
-+
-+  This program is distributed in the hope that it will be useful,
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+  GNU General Public License for more details.
-+
-+  You should have received a copy of the GNU General Public License
-+  along with this program; if not, write to the Free Software
-+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+
-+#include <inttypes.h>
-+#include <stdio.h>
-+#include <zlib.h>
-+
-+#define CHD_ERR_NONE	0	/* N no error */
-+#define CHD_ERR_OPEN	1	/* S cannot open file */
-+#define CHD_ERR_READ	2	/* S read error */
-+#define CHD_ERR_NO_CHD	3	/* N not a CHD file */
-+#define CHD_ERR_VERSION	4	/* N unsupported version */
-+#define CHD_ERR_INVAL	5	/* N invalid argument */
-+#define CHD_ERR_SEEK	6	/* S seek error */
-+#define CHD_ERR_NOTSUP	7	/* N unsupported chd feature */
-+#define CHD_ERR_ZLIB	8	/* Z zlib error */
-+#define CHD_ERR_CRC	9	/* N CRC mismatch */
-+#define CHD_ERR_NOMEM	10	/* N out of memory */
-+
-+#define CHD_MAP_TYPE_COMPRESSED		0x01
-+#define CHD_MAP_TYPE_UNCOMPRESSED	0x02
-+#define CHD_MAP_TYPE_MINI		0x03
-+#define CHD_MAP_TYPE_SELF_HUNK		0x04
-+#define CHD_MAP_TYPE_PARENT_HUNK	0x05
-+#define CHD_MAP_TYPE_MASK		0x0f
-+#define CHD_MAP_FL_NOCRC		0x10
-+
-+#define CHD_COMP_NONE			0x0
-+#define CHD_COMP_ZLIB			0x1
-+#define CHD_COMP_ZLIB_PLUS		0x2
-+
-+
-+
-+struct chd_map_entry {
-+    uint64_t offset;	/* offse t within the file of the data */
-+    uint32_t crc;	/* 32-bit CRC of the data */
-+    uint16_t length;	/* length of the data */
-+    uint16_t flags;	/* misc flags */
-+};
-+
-+struct chd {
-+    FILE *f;
-+    char *name;
-+    int error;
-+
-+    uint32_t hdr_length;	/* length of header data */
-+    uint32_t version;		/* drive format version */
-+    uint32_t flags;		/* flags field */
-+    uint32_t compression;	/* compression type */
-+    uint32_t hunk_len;		/* number of bytes per hunk */
-+    uint32_t total_hunks;	/* total # of hunks represented */
-+    uint64_t total_len;		/* logical size of the data */
-+    uint64_t meta_offset;	/* offset in file of first metadata */
-+    uint8_t md5[16];		/* MD5 checksum of raw data */
-+    uint8_t parent_md5[16];	/* MD5 checksum of parent file */
-+    uint8_t sha1[20];           /* SHA1 checksum of raw data */
-+    uint8_t parent_sha1[20];	/* SHA1 checksum of parent file */
-+
-+    struct chd_map_entry *map;	/* hunk map */
-+    char *buf;			/* decompression buffer */
-+    z_stream z;			/* decompressor */
-+    int hno;			/* hunk currently in hbuf */
-+    char *hbuf;			/* hunk data buffer */
-+};
-+
-+
-+
-+void chd_close(struct chd *);
-+struct chd *chd_open(const char *, int *);
-+int chd_read_hunk(struct chd *, int, char *);
-+int chd_read_range(struct chd *, char *, int, int);
-+
-+#endif /* chd.h */
diff --git a/emulators/gens/patches/patch-ah b/emulators/gens/patches/patch-ah
deleted file mode 100644
index 0ba4e635e86..00000000000
--- a/emulators/gens/patches/patch-ah
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2004/08/15 12:13:53 dillo Exp $
-
---- src/gens/util/rom.c.orig	2004-05-18 22:33:59.000000000 +0200
-+++ src/gens/util/rom.c
-@@ -17,6 +17,7 @@
- #include "ccnet.h"
- #include "misc.h"
- #include "unzip.h"
-+#include "chd.h"
- #include "wave.h"
- #include "gym.h"
- #include <assert.h>
-@@ -168,6 +169,7 @@ Detect_Format (char *Name)
-   FILE *f;
-   unzFile zf;
-   unz_file_info zinf;
-+  struct chd *cf;
-   int i;
-   char buf[1024], zname[256];
- 
-@@ -225,6 +227,19 @@ Detect_Format (char *Name)
-       gzread (f, buf, 1024);
-       gzclose (f);
-     }
-+  else if (!stricmp (".chd", &Name[strlen (Name) -4]))
-+    {
-+      char *p;
-+      int n;
-+
-+      cf = chd_open(Name, NULL);
-+      if (cf == NULL)
-+	return -1;
-+
-+      chd_read_range(cf, buf, 0, 1024);
-+
-+      chd_close(cf);
-+    }
-   else
-     {
-       strcpy (zname, Name);
-@@ -389,7 +404,7 @@ Get_Rom ()
-   GtkWidget *widget;
-   gint res;
-   char Name[2048];
--  gchar *filename;
-+  gchar *filename = NULL;
-   int sys;
- 
-   widget =
-@@ -403,9 +418,12 @@ Get_Rom ()
-     }
-   gtk_widget_destroy (widget);
- 
--  strncpy (Name, filename, 2048);
--  g_free (filename);
--  Free_Rom (Game);
-+  if (filename)
-+    {
-+      strncpy (Name, filename, 2048);
-+      g_free (filename);
-+      Free_Rom (Game);
-+    }
- 
-   sys = Detect_Format (Name);
- 
diff --git a/emulators/gens/patches/patch-ai b/emulators/gens/patches/patch-ai
deleted file mode 100644
index e7a66ab6d74..00000000000
--- a/emulators/gens/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2004/08/15 12:13:53 dillo Exp $
-
---- src/gens/util/unzip.h.orig	2004-03-14 15:33:14.000000000 +0100
-+++ src/gens/util/unzip.h
-@@ -59,6 +59,10 @@ typedef voidp unzFile;
- #endif
- 
- 
-+#ifndef OF
-+# define OF(args)      args
-+#endif
-+
- #define UNZ_OK                                  (0)
- #define UNZ_END_OF_LIST_OF_FILE (-100)
- #define UNZ_ERRNO               (Z_ERRNO)
diff --git a/emulators/gens/patches/patch-aj b/emulators/gens/patches/patch-aj
deleted file mode 100644
index de76552e7f2..00000000000
--- a/emulators/gens/patches/patch-aj
+++ /dev/null
@@ -1,161 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2006/06/25 18:36:28 wiz Exp $
-
---- src/gens/emulator/g_main.c.orig	2004-05-18 20:34:00.000000000 +0000
-+++ src/gens/emulator/g_main.c
-@@ -55,8 +55,27 @@ int Intro_Style = 2;
- int SegaCD_Accurate = 0;
- int Kaillera_Client_Running = 0;
- 
-+int NbRerecord=0;
-+char MovieFileName[1024];
-+int MoviePlaying=0;
-+int FrameCount=0;
-+unsigned MovieLastFrame=0;
-+
-+FILE *MovieFile;
-+
-+struct type_MovieFrame
-+{
-+       char P1;
-+       char P2;
-+       char PX;
-+};
-+
-+struct type_MovieFrame *MovieData = NULL;
-+
- static int Gens_Running = 0;
- 
-+static int Build_Language_String (void);
-+
- void
- SetWindowText (const char *s)
- {
-@@ -394,6 +413,13 @@ update_SDL_events ()
- 
- 	      break;
- 
-+	    case SDLK_q:
-+	      if (KMOD_CTRL & mod)
-+		{
-+		  close_gens ();
-+		}
-+	      break;
-+
- 	    case SDLK_v:
- 	      if (KMOD_CTRL & mod)
- 		{
-@@ -429,14 +455,14 @@ update_SDL_events ()
- 	case SDL_JOYAXISMOTION:
- 	  if (event.jaxis.axis < 2)
- 	    {
--	      if (event.jaxis.value < -500)
-+	      if (event.jaxis.value < -10922)
- 		{
- 		  joystate[0x100 * event.jaxis.which +
- 			   ((event.jaxis.axis == 0) ? 0x3 : 0x1)] = 1;
- 		  joystate[0x100 * event.jaxis.which +
- 			   ((event.jaxis.axis == 0) ? 0x4 : 0x2)] = 0;
- 		}
--	      else if (event.jaxis.value > 500)
-+	      else if (event.jaxis.value > 10922)
- 		{
- 		  joystate[0x100 * event.jaxis.which +
- 			   ((event.jaxis.axis == 0) ? 0x4 : 0x2)] = 1;
-@@ -661,11 +687,11 @@ idle_loop (gpointer data)
- int
- main (int argc, char *argv[])
- {
--  Init_Genesis_Bios ();
--
-   char sdlbuf[32];
-   GtkWidget *widget;
- 
-+  Init_Genesis_Bios ();
-+
-   add_pixmap_directory (DATADIR);
-   gtk_init (&argc, &argv);
-   gens_window = create_gens_window ();
-@@ -850,3 +876,83 @@ Build_Language_String (void)
- 
-   return (0);
- }
-+
-+void PlayMovie()
-+{
-+	if(MoviePlaying) {
-+		StopMovie();
-+		return;
-+	}
-+	if(Change_File_L_MV(MovieFileName, State_Dir)==0)
-+		return;
-+	if (Genesis_Started)
-+	{
-+		Reset_Genesis();
-+	}
-+	else if (_32X_Started)
-+	{
-+		Reset_32X();
-+	}
-+	FrameCount=0;
-+	if(LoadMovieFromFile(MovieFile,MovieFileName)==0)
-+		return;
-+	MESSAGE_NUM_L("Playing movie from start: %d rerecords","Playing movie from start: %d rerecords",NbRerecord,1500);
-+	MoviePlaying=1;
-+}
-+
-+int LoadMovieFromFile(FILE *MovieFile,char* FileName)
-+{
-+	MovieFile=fopen(FileName,"r+b");
-+	if(MovieFile==NULL)
-+	{
-+		MESSAGE_L("Error loading movie:disk error","Error loading movie:disk error", 2000);
-+		return 0;
-+	}
-+
-+	fseek(MovieFile,0,SEEK_END);
-+	MovieLastFrame=(ftell(MovieFile)-64)/3;
-+	
-+	MovieData = malloc(sizeof(struct type_MovieFrame)*MovieLastFrame);
-+	if(!MovieData)
-+	{
-+		MESSAGE_L("Memory error allocating movie", "Memory error allocating movie", 2000);
-+		return 0;
-+	}
-+	fseek(MovieFile,64,SEEK_SET);
-+
-+	if(fread(MovieData, sizeof(*MovieData), MovieLastFrame, MovieFile) < MovieLastFrame)
-+	{
-+		MESSAGE_L("Error loading movie:file read","Error loading movie:file read", 2000);
-+		return 0;
-+	}
-+
-+	fseek(MovieFile,16,SEEK_SET);
-+	fread((char*)&NbRerecord,sizeof(NbRerecord),1,MovieFile);
-+
-+	fclose(MovieFile);
-+	MovieFile=NULL;
-+
-+	return 1;
-+}
-+void ReadInMovie(unsigned  frame, char *p1, char *p2, char *px)
-+{
-+	if(frame>MovieLastFrame)
-+	{
-+		MESSAGE_NUM_L("Overflow error reading frame : %d","Overflow error reading frame : %d",frame,2000);
-+		return;
-+	}
-+	*p1=MovieData[frame].P1;
-+	*p2=MovieData[frame].P2;
-+	*px=MovieData[frame].PX;
-+}
-+
-+void
-+StopMovie(void)
-+{
-+  if (!MoviePlaying)
-+    return;
-+
-+  MoviePlaying = 0;
-+  free(MovieData);
-+  MovieData = NULL;
-+}
diff --git a/emulators/gens/patches/patch-ak b/emulators/gens/patches/patch-ak
deleted file mode 100644
index 57c601eaf11..00000000000
--- a/emulators/gens/patches/patch-ak
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2004/08/15 12:13:53 dillo Exp $
-
---- src/gens/gtkui/glade/interface.c.orig	2004-05-19 21:49:28.000000000 +0200
-+++ src/gens/gtkui/glade/interface.c
-@@ -159,6 +159,7 @@ create_gens_window (void)
-   GtkWidget *reset_z80;
-   GtkWidget *separator8;
-   GtkWidget *perfect_synchro;
-+  GtkWidget *play_movie;
-   GtkWidget *item8;
-   GtkWidget *image2798;
-   GtkWidget *item8_menu;
-@@ -486,10 +487,13 @@ create_gens_window (void)
-   gtk_container_add (GTK_CONTAINER (item15_menu), separator16);
-   gtk_widget_set_sensitive (separator16, FALSE);
- 
--  quit = gtk_image_menu_item_new_with_mnemonic ("Quit");
-+  quit = gtk_image_menu_item_new_with_mnemonic ("_Quit");
-   gtk_widget_set_name (quit, "quit");
-   gtk_widget_show (quit);
-   gtk_container_add (GTK_CONTAINER (item15_menu), quit);
-+  gtk_widget_add_accelerator (quit, "activate", accel_group,
-+                              GDK_Q, GDK_CONTROL_MASK,
-+                              GTK_ACCEL_VISIBLE);
- 
-   image2789 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU);
-   gtk_widget_set_name (image2789, "image2789");
-@@ -966,6 +970,11 @@ create_gens_window (void)
-   gtk_widget_show (perfect_synchro);
-   gtk_container_add (GTK_CONTAINER (menuitem3_menu), perfect_synchro);
- 
-+  play_movie = gtk_check_menu_item_new_with_mnemonic ("Play Movie");
-+  gtk_widget_set_name (play_movie, "play_movie");
-+  gtk_widget_show (play_movie);
-+  gtk_container_add (GTK_CONTAINER (menuitem3_menu), play_movie);
-+
-   item8 = gtk_image_menu_item_new_with_mnemonic ("Sound");
-   gtk_widget_set_name (item8, "item8");
-   gtk_widget_show (item8);
-@@ -1498,6 +1507,9 @@ create_gens_window (void)
-   g_signal_connect ((gpointer) perfect_synchro, "activate",
-                     G_CALLBACK (on_perfect_synchro_activate),
-                     NULL);
-+  g_signal_connect ((gpointer) play_movie, "activate",
-+                    G_CALLBACK (on_play_movie_activate),
-+                    NULL);
-   g_signal_connect ((gpointer) enable_sound, "activate",
-                     G_CALLBACK (on_enable_sound_activate),
-                     NULL);
-@@ -1713,6 +1725,7 @@ create_gens_window (void)
-   GLADE_HOOKUP_OBJECT (gens_window, reset_z80, "reset_z80");
-   GLADE_HOOKUP_OBJECT (gens_window, separator8, "separator8");
-   GLADE_HOOKUP_OBJECT (gens_window, perfect_synchro, "perfect_synchro");
-+  GLADE_HOOKUP_OBJECT (gens_window, play_movie, "play_movie");
-   GLADE_HOOKUP_OBJECT (gens_window, item8, "item8");
-   GLADE_HOOKUP_OBJECT (gens_window, image2798, "image2798");
-   GLADE_HOOKUP_OBJECT (gens_window, item8_menu, "item8_menu");
diff --git a/emulators/gens/patches/patch-al b/emulators/gens/patches/patch-al
deleted file mode 100644
index 84ffe1f66fa..00000000000
--- a/emulators/gens/patches/patch-al
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/07/29 20:40:09 dillo Exp $
-
---- src/gens/emulator/parse.c.orig	2004-05-19 21:21:00.000000000 +0200
-+++ src/gens/emulator/parse.c
-@@ -510,10 +510,41 @@ parseArgs (int argc, char **argv)
- 
-   if (optind < argc)
-     {
--      printf ("non-option ARGV-elements: ");
--      while (optind < argc)
--		printf ("%s ", argv[optind++]);
--      printf ("\n");
-+      if (optind == argc-1)
-+	{
-+	  char fname[1024];
-+	  int l;
-+
-+	  if (argv[optind][0] == '/')
-+	    {
-+	      strncpy(fname, argv[optind], 1024);
-+	      fname[1023] = '\0';
-+	    }
-+	  else
-+	    {
-+	      getcwd(fname, 1024);
-+	      fname[1023] = '\0';
-+	      l = strlen(fname);
-+	      fname[l++] = '/';
-+	      strncpy(fname+l, argv[optind], 1024-l);
-+	      fname[1023] = '\0';
-+	    }
-+	  if (Pre_Load_Rom(fname))
-+  	    {
-+    	      printf("%s loaded.\n", fname);
-+  	    }
-+	  else
-+  	    {
-+    	      printf("cannot load %s.\n", fname);
-+  	    }
-+	}
-+      else
-+	{
-+      	  printf ("non-option ARGV-elements: ");
-+          while (optind < argc)
-+	    printf ("%s ", argv[optind++]);
-+          printf ("\n");
-+	}
-     }
- }
- 
diff --git a/emulators/gens/patches/patch-am b/emulators/gens/patches/patch-am
deleted file mode 100644
index ec864a4b887..00000000000
--- a/emulators/gens/patches/patch-am
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-am,v 1.1 2004/08/15 12:13:53 dillo Exp $
-
---- src/gens/emulator/g_main.h.orig	2004-04-15 22:22:49.000000000 +0200
-+++ src/gens/emulator/g_main.h
-@@ -21,6 +21,9 @@ extern int Country_Order[3];
- extern int Kaillera_Client_Running;
- extern int Intro_Style;
- extern int SegaCD_Accurate;
-+extern int MoviePlaying;
-+extern int FrameCount;
-+extern unsigned MovieLastFrame;
- extern int Active;
- 
- extern POINT Window_Pos;
-@@ -41,6 +44,10 @@ void SetWindowText(const char *text);
- int Set_Render(int Full, int Num, int Force);
- int Change_68K_Type(int hWnd, int Num, int Reset_SND);
- //extern void Read_To_68K_Space(int adr);
-+int LoadMovieFromFile(FILE *MovieFile,char* FileName);
-+void PlayMovie(void);
-+void StopMovie(void);
-+void ReadInMovie(unsigned frame, char *p1, char *p2, char *px);
- 
- void End_All(void);
- void Sleep(int i);
diff --git a/emulators/gens/patches/patch-an b/emulators/gens/patches/patch-an
deleted file mode 100644
index 5a9adb1f309..00000000000
--- a/emulators/gens/patches/patch-an
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/08/15 12:13:53 dillo Exp $
-
---- src/gens/emulator/gens.c.orig	2004-05-18 22:34:00.000000000 +0200
-+++ src/gens/emulator/gens.c
-@@ -2424,7 +2424,7 @@ Init_SegaCD (char *iso_name)
-   Z80_Reset ();
-   Reset_VDP ();
-   LC89510_Reset ();
--  Init_RS_GFX ();
-+  //Init_RS_GFX (); /* XXX: why? */
- 
-   if (CPU_Mode)
-     {
-@@ -2545,7 +2545,7 @@ Reset_SegaCD ()
-   Z80_Reset ();
-   LC89510_Reset ();
-   Reset_VDP ();
--  Init_RS_GFX ();
-+  //Init_RS_GFX (); /* XXX: why? */
-   Reset_PCM ();
-   YM2612_Reset ();
- 
diff --git a/emulators/gens/patches/patch-ao b/emulators/gens/patches/patch-ao
deleted file mode 100644
index 2b5d89da7a3..00000000000
--- a/emulators/gens/patches/patch-ao
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/08/15 12:13:53 dillo Exp $
-
---- src/gens/gtkui/glade/callbacks.c.orig	2004-05-18 22:36:26.000000000 +0200
-+++ src/gens/gtkui/glade/callbacks.c
-@@ -49,7 +49,10 @@ on_open_rom_activate                   (
- //	if ((Check_If_Kaillera_Running())) return 0;
- 	if (GYM_Playing) Stop_Play_GYM();
- 	if (Get_Rom() != -1)
-+          {
-+		StopMovie();
- 		sync_gens_ui();
-+	  }
- }
- 
- 
-@@ -64,6 +67,7 @@ on_close_rom_activate                  (
- 			if (Full_Screen) Set_Render( 0, -1, 1);
- 		}
- 		Free_Rom(Game);
-+		StopMovie();
- }
- 
- 
-@@ -480,6 +484,11 @@ on_perfect_synchro_activate            (
- {Change_SegaCD_Synchro();}
- 
- void
-+on_play_movie_activate            (GtkMenuItem     *menuitem,
-+                                   gpointer         user_data)
-+{PlayMovie();}
-+
-+void
- on_enable_sound_activate                     (GtkMenuItem     *menuitem,
- 											  gpointer         user_data)
- {Change_Sound();}
diff --git a/emulators/gens/patches/patch-ap b/emulators/gens/patches/patch-ap
deleted file mode 100644
index 9cfa62e7214..00000000000
--- a/emulators/gens/patches/patch-ap
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2004/08/15 12:13:53 dillo Exp $
-
---- src/gens/gtkui/glade/callbacks.h.orig	2004-03-14 15:33:41.000000000 +0100
-+++ src/gens/gtkui/glade/callbacks.h
-@@ -93,6 +93,10 @@ on_vsync_activate                      (
-                                         gpointer         user_data);
- 
- void
-+on_play_movie_activate                 (GtkMenuItem     *menuitem,
-+                                        gpointer         user_data);
-+
-+void
- on_stretch_activate                    (GtkMenuItem     *menuitem,
-                                         gpointer         user_data);
- 
diff --git a/emulators/gens/patches/patch-aq b/emulators/gens/patches/patch-aq
deleted file mode 100644
index 36597893820..00000000000
--- a/emulators/gens/patches/patch-aq
+++ /dev/null
@@ -1,112 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2004/08/15 12:13:53 dillo Exp $
-
---- src/gens/sdllayer/g_sdldraw.c.orig	2004-08-15 11:46:04.000000000 +0200
-+++ src/gens/sdllayer/g_sdldraw.c
-@@ -462,7 +462,11 @@ Update_Emulation (void)
- 	  Write_Sound_Buffer (NULL);
- 	}
- 
--      Update_Controllers ();
-+      if (MoviePlaying)
-+        MoviePlayingStuff();
-+      else
-+        Update_Controllers();
-+      FrameCount++;
- 
-       if (Frame_Number++ < Frame_Skip)
- 	{
-@@ -487,7 +491,12 @@ Update_Emulation (void)
- 	  //{
- 	  Write_Sound_Buffer (NULL);
- 	  //WP = (WP + 1) & (Sound_Segs - 1);
--	  Update_Controllers ();
-+          if (MoviePlaying)
-+            MoviePlayingStuff();
-+          else
-+            Update_Controllers();
-+          FrameCount++;
-+
- 
- 	  //if (WP != RP)
- 	  //{
-@@ -518,13 +527,21 @@ Update_Emulation (void)
- 
- 	  for (; Frame_Number > 1; Frame_Number--)
- 	    {
--	      Update_Controllers ();
-+              if (MoviePlaying)
-+                MoviePlayingStuff();
-+              else
-+                Update_Controllers();
-+              FrameCount++;
- 	      Update_Frame_Fast ();
- 	    }
- 
- 	  if (Frame_Number)
- 	    {
--	      Update_Controllers ();
-+              if (MoviePlaying)
-+                MoviePlayingStuff();
-+              else
-+                Update_Controllers();
-+              FrameCount++;
- 	      Update_Frame ();
- 	      Flip ();
- 	    }
-@@ -540,7 +557,12 @@ Update_Emulation (void)
- int
- Update_Emulation_One (void)
- {
--  Update_Controllers ();
-+  if (MoviePlaying)
-+    MoviePlayingStuff();
-+  else
-+   Update_Controllers();
-+  FrameCount++;
-+ 
-   Update_Frame ();
-   Flip ();
- 
-@@ -686,3 +708,42 @@ Take_Shot ()
- 	     surface->h, surface->w * 2);
-   return 0;
- }
-+
-+void
-+MoviePlayingStuff()
-+{
-+  char PadData[3]; //Modif
-+
-+  if(FrameCount >= MovieLastFrame)
-+    {
-+      MoviePlaying=0;
-+      sprintf(Str_Tmp, "Movie finished", Current_State);
-+      Put_Info(Str_Tmp, 2000);
-+      return;
-+    }
-+  ReadInMovie(FrameCount,&PadData[0],&PadData[1],&PadData[2]);
-+  Controller_1_Up=(PadData[0]&1);
-+  Controller_1_Down=(PadData[0]&2)>>1;
-+  Controller_1_Left=(PadData[0]&4)>>2;
-+  Controller_1_Right=(PadData[0]&8)>>3;
-+  Controller_1_A=(PadData[0]&16)>>4;
-+  Controller_1_B=(PadData[0]&32)>>5;
-+  Controller_1_C=(PadData[0]&64)>>6;
-+  Controller_1_Start=(PadData[0]&128)>>7;
-+  Controller_2_Up=(PadData[1]&1);
-+  Controller_2_Down=(PadData[1]&2)>>1;
-+  Controller_2_Left=(PadData[1]&4)>>2;
-+  Controller_2_Right=(PadData[1]&8)>>3;
-+  Controller_2_A=(PadData[1]&16)>>4;
-+  Controller_2_B=(PadData[1]&32)>>5;
-+  Controller_2_C=(PadData[1]&64)>>6;
-+  Controller_2_Start=(PadData[1]&128)>>7;
-+  Controller_1_X=(PadData[2]&1);
-+  Controller_1_Y=(PadData[2]&2)>>1;
-+  Controller_1_Z=(PadData[2]&4)>>2;
-+  Controller_1_Mode=(PadData[2]&8)>>3;
-+  Controller_2_X=(PadData[2]&16)>>4;
-+  Controller_2_Y=(PadData[2]&32)>>5;
-+  Controller_2_Z=(PadData[2]&64)>>6;
-+  Controller_2_Mode=(PadData[2]&128)>>7;
-+}
diff --git a/emulators/gens/patches/patch-ar b/emulators/gens/patches/patch-ar
deleted file mode 100644
index 0880f97ce12..00000000000
--- a/emulators/gens/patches/patch-ar
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2004/08/15 12:13:53 dillo Exp $
-
---- src/gens/sdllayer/g_sdldraw.h.orig	2004-03-14 15:34:21.000000000 +0100
-+++ src/gens/sdllayer/g_sdldraw.h
-@@ -4,6 +4,8 @@
- #include <time.h>
- #include <SDL.h>
- 
-+#include "io.h"
-+
- extern clock_t Last_Time;
- extern clock_t New_Time;
- extern clock_t Used_Time;
-@@ -40,6 +42,7 @@ int Show_Genesis_Screen(void);
- int Flip(void);
- void Restore_Primary(void);
- int Take_Shot();
-+void MoviePlayingStuff();
- void End_DDraw(void);
- void Put_Info(char *,int);
- extern SDL_Surface *surface;
diff --git a/emulators/gens/patches/patch-as b/emulators/gens/patches/patch-as
deleted file mode 100644
index c921cbfbf0d..00000000000
--- a/emulators/gens/patches/patch-as
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-as,v 1.2 2004/08/22 11:37:28 kristerw Exp $
-
---- src/gens/util/save.c.orig	Tue May 18 22:33:59 2004
-+++ src/gens/util/save.c	Sun Aug 22 13:24:38 2004
-@@ -101,8 +101,8 @@
- 
-   if (filename)
-     {
--      g_free (filename);
-       strcpy (Dest, filename);
-+      g_free (filename);
-       return 1;
-     }
-   return 0;
-@@ -130,8 +130,37 @@
- 
-   if (filename)
-     {
-+      strcpy (Dest, filename);
-       g_free (filename);
-+      return 1;
-+    }
-+  return 0;
-+}
-+
-+int
-+Change_File_L_MV (char *Dest, char *Dir)
-+{
-+
-+  gchar *filename = NULL;
-+  GtkWidget *widget;
-+  gint res;
-+  widget =
-+    create_file_chooser_dialog ("Load gens movie file",
-+				GTK_FILE_CHOOSER_ACTION_OPEN);
-+  addGmvFilter (widget);
-+//      fileselection_set_dir (fd.filesel, Rom_Dir);
-+  /* addStateFilter (widget); */
-+  res = gtk_dialog_run (GTK_DIALOG (widget));
-+  if (res == GTK_RESPONSE_OK)
-+    {
-+      filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
-+    }
-+  gtk_widget_destroy (widget);
-+
-+  if (filename)
-+    {
-       strcpy (Dest, filename);
-+      g_free (filename);
-       return 1;
-     }
-   return 0;
-@@ -268,11 +297,12 @@
- int
- Save_State (char *Name)
- {
--  if (Name == NULL)
--    return 0;
-   FILE *f;
-   unsigned char *buf;
-   int len;
-+
-+  if (Name == NULL)
-+    return 0;
- 
-   buf = State_Buffer;
-   if ((f = fopen (Name, "wb")) == NULL)
diff --git a/emulators/gens/patches/patch-at b/emulators/gens/patches/patch-at
deleted file mode 100644
index 3bdf6bc639f..00000000000
--- a/emulators/gens/patches/patch-at
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-at,v 1.1 2004/08/21 14:16:32 dillo Exp $
-
---- src/gens/emulator/ui_proxy.c.orig	2004-05-18 22:34:00.000000000 +0200
-+++ src/gens/emulator/ui_proxy.c
-@@ -55,6 +55,10 @@ system_reset ()
-     {
-       Reset_SegaCD ();
-     }
-+  if (MoviePlaying)
-+    {
-+      StopMovie();
-+    }
- }
- 
- int
diff --git a/emulators/gens/patches/patch-au b/emulators/gens/patches/patch-au
deleted file mode 100644
index 773c9d979b5..00000000000
--- a/emulators/gens/patches/patch-au
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-au,v 1.1 2004/08/22 11:37:28 kristerw Exp $
-
---- src/gens/sdllayer/g_sdlsound.c.orig	Sun Aug 22 13:22:13 2004
-+++ src/gens/sdllayer/g_sdlsound.c	Sun Aug 22 13:23:10 2004
-@@ -53,6 +53,7 @@
- int
- Init_Sound (void)
- {
-+  SDL_AudioSpec spec;
-   int i;
- 
-   if (Sound_Initialised)
-@@ -122,8 +123,6 @@
-     }
- 
-   pMsndOut = (unsigned char *) malloc (Seg_Lenght << 2);
--
--  SDL_AudioSpec spec;
- 
-   spec.freq = Sound_Rate;
-   spec.format = AUDIO_S16SYS;
diff --git a/emulators/gens/patches/patch-av b/emulators/gens/patches/patch-av
deleted file mode 100644
index 88b77d243f9..00000000000
--- a/emulators/gens/patches/patch-av
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-av,v 1.1 2004/08/22 11:37:28 kristerw Exp $
-
---- src/gens/util/gym.c.orig	Sun Aug 22 13:26:20 2004
-+++ src/gens/util/gym.c	Sun Aug 22 13:26:57 2004
-@@ -159,6 +159,9 @@
- int
- Start_Play_GYM (void)
- {
-+  gchar *filename = NULL;
-+  GtkWidget *widget;
-+  gint res;
-   char Name[1024];
- 
-   if (Game || !(Sound_Enable))
-@@ -185,9 +188,6 @@
- 
-   memset (Name, 0, 1024);
- 
--  gchar *filename = NULL;
--  GtkWidget *widget;
--  gint res;
-   widget =
-     create_file_chooser_dialog ("Load GYM file",
- 				GTK_FILE_CHOOSER_ACTION_OPEN);
diff --git a/emulators/gnuboy-sdl/DESCR b/emulators/gnuboy-sdl/DESCR
deleted file mode 100644
index 1da77948b17..00000000000
--- a/emulators/gnuboy-sdl/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Gnuboy is a portable program for emulating the Nintendo GameBoy Color
-software platform.  This is the SDL port, with joystick support.
diff --git a/emulators/gnuboy-sdl/Makefile b/emulators/gnuboy-sdl/Makefile
deleted file mode 100644
index 459c3a8f9a5..00000000000
--- a/emulators/gnuboy-sdl/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2006/06/12 16:28:06 wiz Exp $
-
-DISTNAME=	gnuboy-1.0.3
-PKGNAME=	${DISTNAME:S/-/-sdl-/}
-PKGREVISION=	5
-CATEGORIES=	emulators
-MASTER_SITES=	http://gnuboy.unix-fu.org/src/
-
-MAINTAINER=	dillo@NetBSD.org
-HOMEPAGE=	http://gnuboy.unix-fu.org/
-COMMENT=	SDL port of Gameboy emulator
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-sdl
-
-.include "../../devel/SDL/buildlink3.mk"
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnuboy-sdl
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnuboy-sdl
-	${INSTALL_PROGRAM} ${WRKSRC}/sdlgnuboy ${PREFIX}/bin/gnuboy-sdl
-	${INSTALL_DATA} ${WRKSRC}/etc/sample.rc \
-		${PREFIX}/share/examples/gnuboy-sdl/
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/docs/* \
-		${PREFIX}/share/doc/gnuboy-sdl/
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/gnuboy-sdl/PLIST b/emulators/gnuboy-sdl/PLIST
deleted file mode 100644
index 973160f1d24..00000000000
--- a/emulators/gnuboy-sdl/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/26 17:05:05 dillo Exp $
-bin/gnuboy-sdl
-share/doc/gnuboy-sdl/CHANGES
-share/doc/gnuboy-sdl/CONFIG
-share/doc/gnuboy-sdl/CREDITS
-share/doc/gnuboy-sdl/FAQ
-share/doc/gnuboy-sdl/HACKING
-share/doc/gnuboy-sdl/LIBERTY
-share/doc/gnuboy-sdl/README
-share/doc/gnuboy-sdl/README.old
-share/doc/gnuboy-sdl/WHATSNEW
-share/examples/gnuboy-sdl/sample.rc
-@dirrm share/examples/gnuboy-sdl
-@dirrm share/doc/gnuboy-sdl
diff --git a/emulators/gnuboy-sdl/distinfo b/emulators/gnuboy-sdl/distinfo
deleted file mode 100644
index f198141b08d..00000000000
--- a/emulators/gnuboy-sdl/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:18 agc Exp $
-
-SHA1 (gnuboy-1.0.3.tar.gz) = 4c371445b6599c6636d08ba9c5de7bb9fbf78437
-RMD160 (gnuboy-1.0.3.tar.gz) = dfaf927fe2d4e03f39d83079b7dd3aa02c8983b9
-Size (gnuboy-1.0.3.tar.gz) = 187627 bytes
-SHA1 (patch-aa) = 266f39882e2aa3cc3350a6080ecc6e8738c92160
diff --git a/emulators/gnuboy-sdl/patches/patch-aa b/emulators/gnuboy-sdl/patches/patch-aa
deleted file mode 100644
index dd114909e6b..00000000000
--- a/emulators/gnuboy-sdl/patches/patch-aa
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/07/26 17:05:05 dillo Exp $
-
---- sys/sdl/sdl.c.orig	2001-09-17 18:40:14.000000000 +0200
-+++ sys/sdl/sdl.c
-@@ -441,6 +441,8 @@ static int sound = 1;
- static int samplerate = 44100;
- static int stereo = 1;
- static volatile int audio_done;
-+static SDL_sem *pcm_rsem, *pcm_wsem;
-+static int atexit_done = 0;
- 
- rcvar_t pcm_exports[] =
- {
-@@ -453,8 +455,16 @@ rcvar_t pcm_exports[] =
- 
- static void audio_callback(void *blah, byte *stream, int len)
- {
-+	SDL_SemWait(pcm_rsem);
- 	memcpy(stream, pcm.buf, len);
--	audio_done = 1;
-+	SDL_SemPost(pcm_wsem);
-+}
-+
-+
-+static void audio_atexit(void)
-+{
-+	if (pcm_wsem)
-+		SDL_SemPost(pcm_rsem);
- }
- 
- 
-@@ -466,6 +476,13 @@ void pcm_init()
- 	if (!sound) return;
- 	
- 	SDL_InitSubSystem(SDL_INIT_AUDIO);
-+	/* XXX: check for NULL */
-+	pcm_rsem = SDL_CreateSemaphore(0);
-+	pcm_wsem = SDL_CreateSemaphore(0);
-+	if (!atexit_done) {
-+		atexit(audio_atexit);
-+		atexit_done = 1;
-+	}
- 	as.freq = samplerate;
- 	as.format = AUDIO_U8;
- 	as.channels = 1 + stereo;
-@@ -491,16 +508,20 @@ int pcm_submit()
- {
- 	if (!pcm.buf) return 0;
- 	if (pcm.pos < pcm.len) return 1;
--	while (!audio_done)
--		SDL_Delay(4);
--	audio_done = 0;
-+	SDL_SemPost(pcm_rsem);
-+	SDL_SemWait(pcm_wsem);
- 	pcm.pos = 0;
- 	return 1;
- }
- 
- void pcm_close()
- {
--	if (sound) SDL_CloseAudio();
-+	if (sound) {
-+		SDL_CloseAudio();
-+		SDL_DestroySemaphore(pcm_rsem);
-+		SDL_DestroySemaphore(pcm_wsem);
-+		pcm_rsem = pcm_wsem = 0;
-+	}
- }
- 
- 
diff --git a/emulators/gnuboy/DESCR b/emulators/gnuboy/DESCR
deleted file mode 100644
index bde513ae6a6..00000000000
--- a/emulators/gnuboy/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-gnuboy is a portable program for emulating the Nintendo GameBoy Color
-software platform.
diff --git a/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile
deleted file mode 100644
index e9f6217f6ed..00000000000
--- a/emulators/gnuboy/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2007/02/19 11:56:55 joerg Exp $
-
-DISTNAME=	gnuboy-1.0.3
-PKGREVISION=	2
-CATEGORIES=	emulators games
-MASTER_SITES=	http://gnuboy.unix-fu.org/src/
-
-MAINTAINER=	njl@sdf.lonestar.org
-HOMEPAGE=	http://gnuboy.unix-fu.org/
-COMMENT=	Gameboy emulator
-
-GNU_CONFIGURE=	yes
-
-INSTALLATION_DIRS=	bin
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnuboy
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnuboy
-	${INSTALL_PROGRAM} ${WRKSRC}/xgnuboy ${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/etc/sample.rc \
-		${PREFIX}/share/examples/gnuboy/
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/docs/* \
-		${PREFIX}/share/doc/gnuboy/
-
-BUILDLINK_DEPMETHOD.libXt?=	build
-
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/gnuboy/PLIST b/emulators/gnuboy/PLIST
deleted file mode 100644
index 6b22fd6c06a..00000000000
--- a/emulators/gnuboy/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/02/16 21:41:08 salo Exp $
-bin/xgnuboy
-share/doc/gnuboy/CHANGES
-share/doc/gnuboy/CONFIG
-share/doc/gnuboy/CREDITS
-share/doc/gnuboy/FAQ
-share/doc/gnuboy/HACKING
-share/doc/gnuboy/LIBERTY
-share/doc/gnuboy/README
-share/doc/gnuboy/README.old
-share/doc/gnuboy/WHATSNEW
-share/examples/gnuboy/sample.rc
-@dirrm share/examples/gnuboy
-@dirrm share/doc/gnuboy
diff --git a/emulators/gnuboy/distinfo b/emulators/gnuboy/distinfo
deleted file mode 100644
index 9f93f19e65e..00000000000
--- a/emulators/gnuboy/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 18:49:18 agc Exp $
-
-SHA1 (gnuboy-1.0.3.tar.gz) = 4c371445b6599c6636d08ba9c5de7bb9fbf78437
-RMD160 (gnuboy-1.0.3.tar.gz) = dfaf927fe2d4e03f39d83079b7dd3aa02c8983b9
-Size (gnuboy-1.0.3.tar.gz) = 187627 bytes
-SHA1 (patch-aa) = d99a316e40d1249685204f23e66e3709cefc03e3
-SHA1 (patch-ab) = 0941dc1827ed998ee6ff66014239bb30f85124fa
-SHA1 (patch-ac) = 491bad4bd58f99fb72210cda5a6801f48d6c17d8
-SHA1 (patch-ad) = cac88fded5d8422824faf57d8d32ab571a611fc1
diff --git a/emulators/gnuboy/patches/patch-aa b/emulators/gnuboy/patches/patch-aa
deleted file mode 100644
index 7fe9103acbb..00000000000
--- a/emulators/gnuboy/patches/patch-aa
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/02/14 20:06:01 salo Exp $
-
---- Makefile.in.orig	Tue Jul  3 12:31:18 2001
-+++ Makefile.in
-@@ -20,6 +20,8 @@ SYS_DEFS = @DEFS@ @ENDIAN@ @ASM@ @SYS_DE
- SYS_OBJS = sys/nix/nix.o $(ASM_OBJS)
- SYS_INCS = -I/usr/local/include @XINCS@ -I./sys/nix
- 
-+OSS_LIB = @OSS_LIB@
-+
- FB_OBJS = @FB_OBJS@ @JOY@ @SOUND@
- FB_LIBS = 
- 
-@@ -31,20 +33,20 @@ SDL_LIBS = @SDL_LIBS@
- SDL_CFLAGS = @SDL_CFLAGS@
- 
- X11_OBJS = sys/x11/xlib.o sys/x11/keymap.o @JOY@ @SOUND@
--X11_LIBS = @XLIBS@ -lX11 -lXext
-+X11_LIBS = -Wl,-R${X11BASE}/lib @XLIBS@ -lX11 -lXext
- 
- all: $(TARGETS)
- 
- include Rules
- 
- fbgnuboy: $(OBJS) $(SYS_OBJS) $(FB_OBJS)
--	$(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(FB_OBJS) -o $@ $(FB_LIBS)
-+	$(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(FB_OBJS) -o $@ $(FB_LIBS) $(OSS_LIB)
- 
- sgnuboy: $(OBJS) $(SYS_OBJS) $(SVGA_OBJS)
--	$(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(SVGA_OBJS) -o $@ $(SVGA_LIBS)
-+	$(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(SVGA_OBJS) -o $@ $(SVGA_LIBS) $(OSS_LIB)
- 
- sdlgnuboy: $(OBJS) $(SYS_OBJS) $(SDL_OBJS)
--	$(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(SDL_OBJS) -o $@ $(SDL_LIBS)
-+	$(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(SDL_OBJS) -o $@ $(SDL_LIBS) $(OSS_LIB)
- 
- sys/sdl/sdl.o: sys/sdl/sdl.c
- 	$(MYCC) $(SDL_CFLAGS) -c $< -o $@
-@@ -53,11 +55,11 @@ sys/sdl/keymap.o: sys/sdl/keymap.c
- 	$(MYCC) $(SDL_CFLAGS) -c $< -o $@
- 
- xgnuboy: $(OBJS) $(SYS_OBJS) $(X11_OBJS)
--	$(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(X11_OBJS) -o $@ $(X11_LIBS)
-+	$(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(X11_OBJS) -o $@ $(X11_LIBS) $(OSS_LIB)
- 
- install: all
--	$(INSTALL) -d $(bindir)
--	$(INSTALL) -m 755 $(TARGETS) $(bindir)
-+	$(INSTALL) -d $(prefix)$(bindir)
-+	$(INSTALL) -m 755 $(TARGETS) $(prefix)$(bindir)
- 
- clean:
- 	rm -f *gnuboy gmon.out *.o sys/*.o sys/*/*.o asm/*/*.o
diff --git a/emulators/gnuboy/patches/patch-ab b/emulators/gnuboy/patches/patch-ab
deleted file mode 100644
index 844be7893a9..00000000000
--- a/emulators/gnuboy/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/02/14 20:06:01 salo Exp $
-
---- configure.in.orig	Sun Sep 23 21:09:31 2001
-+++ configure.in
-@@ -53,6 +53,11 @@ OpenBSD)
- SYS_DEFS=-DIS_OBSD
- AC_CHECK_HEADERS(soundcard.h, [SOUND=sys/oss/oss.o])
- ;;
-+NetBSD)
-+SYS_DEFS=-DIS_NBSD
-+AC_CHECK_HEADERS(soundcard.h, [SOUND=sys/oss/oss.o])
-+OSS_LIB="$OSS_LIB -lossaudio"
-+;;
- esac
- 
- test "$SOUND" || SOUND=sys/dummy/nosound.o
-@@ -251,6 +256,7 @@ AC_SUBST(SDL_LIBS)
- AC_SUBST(TARGETS)
- AC_SUBST(XINCS)
- AC_SUBST(XLIBS)
-+AC_SUBST(OSS_LIB)
- 
- AC_CONFIG_HEADER(sys/nix/config.h)
- AC_OUTPUT(Makefile)
diff --git a/emulators/gnuboy/patches/patch-ac b/emulators/gnuboy/patches/patch-ac
deleted file mode 100644
index e39c78c42b3..00000000000
--- a/emulators/gnuboy/patches/patch-ac
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/02/14 20:06:02 salo Exp $
-
---- configure.orig	Tue Nov  6 03:03:13 2001
-+++ configure
-@@ -2499,6 +2499,59 @@ fi
- done
- 
- ;;
-+NetBSD)
-+SYS_DEFS=-DIS_NBSD
-+
-+for ac_header in soundcard.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:2508: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 2514 "configure"
-+#include "confdefs.h"
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:2518: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  egrep -v '^ *\+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:2524: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  eval "$as_ac_Header=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  eval "$as_ac_Header=no"
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+fi
-+echo "$as_me:2543: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+EOF
-+ SOUND=sys/oss/oss.o
-+fi
-+done
-+
-+OSS_LIB="$OSS_LIB -lossaudio"
-+;;
- esac
- 
- test "$SOUND" || SOUND=sys/dummy/nosound.o
-@@ -3679,6 +3732,7 @@ s,@SDL_LIBS@,$SDL_LIBS,;t t
- s,@TARGETS@,$TARGETS,;t t
- s,@XINCS@,$XINCS,;t t
- s,@XLIBS@,$XLIBS,;t t
-+s,@OSS_LIB@,$OSS_LIB,;t t
- CEOF
- 
- EOF
diff --git a/emulators/gnuboy/patches/patch-ad b/emulators/gnuboy/patches/patch-ad
deleted file mode 100644
index 97a22fba461..00000000000
--- a/emulators/gnuboy/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/02/14 20:06:02 salo Exp $
-
---- sys/oss/oss.c.orig	Sun Sep 23 14:01:10 2001
-+++ sys/oss/oss.c
-@@ -7,6 +7,12 @@ char *strdup();
- #include <sys/stat.h>
- #include <fcntl.h>
- 
-+#ifdef IS_NBSD
-+#include "sys/ioctl.h"
-+#include "soundcard.h"
-+#define DSP_DEVICE "/dev/audio"
-+#endif
-+
- #ifdef IS_FBSD
- #include "machine/soundcard.h"
- #define DSP_DEVICE "/dev/dsp"
diff --git a/emulators/gpsim-devel/DESCR b/emulators/gpsim-devel/DESCR
deleted file mode 100644
index 133d585a41b..00000000000
--- a/emulators/gpsim-devel/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-PIC simulator that supports X, stimulii, and modules
diff --git a/emulators/gpsim-devel/Makefile b/emulators/gpsim-devel/Makefile
deleted file mode 100644
index 5a0ccdeb70e..00000000000
--- a/emulators/gpsim-devel/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2007/01/27 10:58:38 wiz Exp $
-#
-
-DISTNAME=	gpsim-20050905
-PKGREVISION=	3
-CATEGORIES=	emulators
-MASTER_SITES=	http://www-asim.lip6.fr/~bouyer/pic/
-
-MAINTAINER=	bouyer@NetBSD.org
-HOMEPAGE=	http://www.dattalo.com/gnupic/gpsim.html
-COMMENT=	PIC emulator with X interface
-
-GNU_CONFIGURE=	YES
-USE_LANGUAGES=	c c++
-
-USE_TOOLS+=	bison gmake lex pkg-config
-USE_LIBTOOL=	YES
-
-GCC_REQD+=		3.0
-
-USE_GNU_READLINE=	YES
-# rl_callback_read_char, rl_copy_text,
-# rl_callback_handler_remove, rl_forced_update_display,
-# rl_callback_handler_install
-
-CONFLICTS=	eXdbm-[0-9]* gpsim-[0-9]*
-
-.include "../../devel/popt/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/gtk2+extra/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/gpsim-devel/PLIST b/emulators/gpsim-devel/PLIST
deleted file mode 100644
index 3d51af13bea..00000000000
--- a/emulators/gpsim-devel/PLIST
+++ /dev/null
@@ -1,84 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/09/07 20:17:46 bouyer Exp $
-bin/gpsim
-include/eXdbm/eXdbm.h
-include/eXdbm/eXdbmErrors.h
-include/eXdbm/eXdbmTypes.h
-include/gpsim/12bit-instructions.h
-include/gpsim/12bit-processors.h
-include/gpsim/14bit-instructions.h
-include/gpsim/14bit-processors.h
-include/gpsim/14bit-registers.h
-include/gpsim/14bit-tmrs.h
-include/gpsim/16bit-instructions.h
-include/gpsim/16bit-processors.h
-include/gpsim/16bit-registers.h
-include/gpsim/16bit-tmrs.h
-include/gpsim/attributes.h
-include/gpsim/bit.h
-include/gpsim/bitlog.h
-include/gpsim/breakpoints.h
-include/gpsim/bytelog.h
-include/gpsim/cmd_gpsim.h
-include/gpsim/cmd_manager.h
-include/gpsim/cod.h
-include/gpsim/eeprom.h
-include/gpsim/errors.h
-include/gpsim/exports.h
-include/gpsim/expr.h
-include/gpsim/gpsim_classes.h
-include/gpsim/gpsim_def.h
-include/gpsim/gpsim_interface.h
-include/gpsim/gpsim_object.h
-include/gpsim/gpsim_time.h
-include/gpsim/fopen-path.h
-include/gpsim/i2c-ee.h
-include/gpsim/icd.h
-include/gpsim/intcon.h
-include/gpsim/interface.h
-include/gpsim/ioports.h
-include/gpsim/lxt_write.h
-include/gpsim/modules.h
-include/gpsim/operator.h
-include/gpsim/p12x.h
-include/gpsim/p16x5x.h
-include/gpsim/p16f62x.h
-include/gpsim/p16x6x.h
-include/gpsim/p16x7x.h
-include/gpsim/p16x8x.h
-include/gpsim/p16f87x.h
-include/gpsim/p17c75x.h
-include/gpsim/p18x.h
-include/gpsim/packages.h
-include/gpsim/pic-instructions.h
-include/gpsim/pic-packages.h
-include/gpsim/pic-processor.h
-include/gpsim/pic-registers.h
-include/gpsim/picdis.h
-include/gpsim/pie.h
-include/gpsim/pir.h
-include/gpsim/processor.h
-include/gpsim/program_files.h
-include/gpsim/protocol.h
-include/gpsim/pthread-wrap.h
-include/gpsim/registers.h
-include/gpsim/sim_context.h
-include/gpsim/ssp.h
-include/gpsim/stimuli.h
-include/gpsim/stimulus_orb.h
-include/gpsim/symbol.h
-include/gpsim/symbol_orb.h
-include/gpsim/tmr0.h
-include/gpsim/trace.h
-include/gpsim/trace_orb.h
-include/gpsim/trigger.h
-include/gpsim/ttoken.h
-include/gpsim/uart.h
-include/gpsim/value.h
-include/gpsim/xref.h
-lib/libgpsim_eXdbm.la
-lib/libgpsim.la
-lib/libgpsimcli.la
-lib/libgpsim_modules.la
-lib/libgpsimgui.la
-@dirrm include/eXdbm
-@dirrm include/gpsim
diff --git a/emulators/gpsim-devel/buildlink3.mk b/emulators/gpsim-devel/buildlink3.mk
deleted file mode 100644
index d43784b9f52..00000000000
--- a/emulators/gpsim-devel/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/01/27 10:58:30 wiz Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GPSIM_BUILDLINK3_MK:=	${GPSIM_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gpsim
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngpsim}
-BUILDLINK_PACKAGES+=	gpsim
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gpsim
-
-.if !empty(GPSIM_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gpsim+=	gpsim>=20050905
-BUILDLINK_ABI_DEPENDS.gpsim+=	gpsim>=20050905nb3
-BUILDLINK_PKGSRCDIR.gpsim?=	../../emulators/gpsim-devel
-.endif	# GPSIM_BUILDLINK3_MK
-
-.include "../../x11/gtk2/buildlink3.mk"
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/emulators/gpsim-devel/distinfo b/emulators/gpsim-devel/distinfo
deleted file mode 100644
index 06186b6f609..00000000000
--- a/emulators/gpsim-devel/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.6 2007/01/27 11:08:57 wiz Exp $
-
-SHA1 (gpsim-20050905.tar.gz) = 46e7d0d69695961aca4324d8d3267181bd641081
-RMD160 (gpsim-20050905.tar.gz) = 1b717f0e51440c4e2db72a4bdfb90d2e8d5e4a3d
-Size (gpsim-20050905.tar.gz) = 2027957 bytes
-SHA1 (patch-aa) = f7d1c04b216ecabaf3071f92c97c7436a54f1e87
-SHA1 (patch-ab) = cd3ef9b6bef759e95ee18b1995d514546c2475ae
-SHA1 (patch-ac) = 47ff4e3cd8a9255a85519a29a61f1d1f51997965
-SHA1 (patch-ae) = 31c9ac582edf2e9e543905f0af6aed92da49f73c
-SHA1 (patch-af) = 7cc61d6a1b6476a2a120ae15f25c500693f1897f
diff --git a/emulators/gpsim-devel/patches/patch-aa b/emulators/gpsim-devel/patches/patch-aa
deleted file mode 100644
index 1786f99bc2a..00000000000
--- a/emulators/gpsim-devel/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/09/07 20:17:46 bouyer Exp $
-
---- gui/Makefile.in.orig	2005-08-31 17:03:41.000000000 +0200
-+++ gui/Makefile.in	2005-09-02 12:59:20.000000000 +0200
-@@ -235,9 +235,9 @@
- 
- libgpsimgui_la_LDFLAGS = @X_LDFLAGS@ @Y_LDFLAGS@
- pixmapdir = $(datadir)/gpsim
--AM_CFLAGS = -D DATADIR=\"~/.gpsim/\"
--AM_CXXFLAGS = -D DATADIR=\"~/.gpsim/\"
--AM_CPPFLAGS = -D DATADIR=\"~/.gpsim/\"
-+AM_CFLAGS = -DDATADIR=\"~/.gpsim/\"
-+AM_CXXFLAGS = -DDATADIR=\"~/.gpsim/\"
-+AM_CPPFLAGS = -DDATADIR=\"~/.gpsim/\"
- all: all-am
- 
- .SUFFIXES:
diff --git a/emulators/gpsim-devel/patches/patch-ab b/emulators/gpsim-devel/patches/patch-ab
deleted file mode 100644
index 8655378d8fc..00000000000
--- a/emulators/gpsim-devel/patches/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/04/28 15:33:28 joerg Exp $
-
---- src/os_dependent.cc.orig	2006-04-28 14:38:52.000000000 +0000
-+++ src/os_dependent.cc
-@@ -37,6 +37,10 @@ Boston, MA 02111-1307, USA.  */
- #include "exports.h"
- #include "modules.h"
- 
-+#if defined(__DragonFly__)
-+#include <glib/gstrfuncs.h>
-+#include <glib/gmem.h>
-+#endif
- #ifndef _WIN32
- #include <dlfcn.h>
- #define STRICMP strcasecmp
-@@ -348,7 +352,9 @@ unsigned long get_error() {
- }
- 
- char * get_error_message() {
--#ifndef _WIN32
-+#if defined(__DragonFly__)
-+  return g_strdup(dlerror());
-+#elif !defined(_WIN32)
-   return dlerror();
- #else
-   return g_win32_error_message(GetLastError());
-@@ -357,7 +363,7 @@ char * get_error_message() {
- 
- void free_error_message(char * pszError)
- {
--#ifdef _WIN32
-+#if defined(_WIN32) || defined(__DragonFly__)
-   g_free(pszError);
- #endif
- }
diff --git a/emulators/gpsim-devel/patches/patch-ac b/emulators/gpsim-devel/patches/patch-ac
deleted file mode 100644
index 6fe6710b9f0..00000000000
--- a/emulators/gpsim-devel/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2007/01/27 11:08:57 wiz Exp $
-
---- cli/ui_gpsim.cc.orig	2005-08-30 19:12:00.000000000 +0000
-+++ cli/ui_gpsim.cc
-@@ -33,7 +33,7 @@ public:
-   CGpsimUserInterface(const char *paStrings[]);
-   virtual ~CGpsimUserInterface() {}
- 
--  void CGpsimUserInterface::SetStreams(FILE *in, FILE *out);
-+  void SetStreams(FILE *in, FILE *out);
-   virtual ISimConsole &GetConsole();
-   virtual void DisplayMessage(unsigned int uStringID, ...);
-   virtual void DisplayMessage(FILE * pOut, unsigned int uStringID, ...);
diff --git a/emulators/gpsim-devel/patches/patch-ae b/emulators/gpsim-devel/patches/patch-ae
deleted file mode 100644
index 9a0460e3965..00000000000
--- a/emulators/gpsim-devel/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2007/01/27 11:08:57 wiz Exp $
-
---- src/p12x.h.orig	2005-08-31 14:48:18.000000000 +0000
-+++ src/p12x.h
-@@ -108,7 +108,7 @@ class P12CE518 : public P12C508
- 
-   virtual PROCESSOR_TYPE isa(void){return _P12CE518_;};
-   virtual void tris_instruction(unsigned int tris_register);
--  virtual void P12CE518::set_eeprom(I2C_EE *e);
-+  virtual void set_eeprom(I2C_EE *e);
- 
-   P12CE518(void);
-   static Processor *construct(void);
diff --git a/emulators/gpsim-devel/patches/patch-af b/emulators/gpsim-devel/patches/patch-af
deleted file mode 100644
index 4f506fda9aa..00000000000
--- a/emulators/gpsim-devel/patches/patch-af
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-af,v 1.3 2007/01/27 11:08:57 wiz Exp $
-
---- src/value.h.orig	2005-08-31 14:48:22.000000000 +0000
-+++ src/value.h
-@@ -290,7 +290,7 @@ public:
- 
-   bool getVal() { return value; }
- 
--  static Boolean* Boolean::typeCheck(Value* val, string valDesc);
-+  static Boolean* typeCheck(Value* val, string valDesc);
-   virtual bool compare(ComparisonOperator *compOp, Value *rvalue);
- 
-   virtual Value *copy() { return new Boolean(value); }
-@@ -353,9 +353,9 @@ public:
-   virtual char *toString(char *, int len);
-   virtual char *toBitStr(char *, int len);
- 
--  static Integer* Integer::typeCheck(Value* val, string valDesc);
--  static Integer* Integer::assertValid(Value* val, string valDesc, gint64 valMin);
--  static Integer* Integer::assertValid(Value* val, string valDesc, gint64 valMin, gint64 valMax);
-+  static Integer* typeCheck(Value* val, string valDesc);
-+  static Integer* assertValid(Value* val, string valDesc, gint64 valMin);
-+  static Integer* assertValid(Value* val, string valDesc, gint64 valMin, gint64 valMax);
-   virtual bool compare(ComparisonOperator *compOp, Value *rvalue);
- 
-   inline operator gint64() {
-@@ -498,7 +498,7 @@ public:
-   /// copy the object value to a user char array
-   virtual char *toString(char *, int len);
- 
--  static AbstractRange* AbstractRange::typeCheck(Value* val, string valDesc);
-+  static AbstractRange* typeCheck(Value* val, string valDesc);
-   virtual bool compare(ComparisonOperator *compOp, Value *rvalue);
- 
- private:
diff --git a/emulators/gpsim-oscilloscope/DESCR b/emulators/gpsim-oscilloscope/DESCR
deleted file mode 100644
index 7d5f934d915..00000000000
--- a/emulators/gpsim-oscilloscope/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-This is an oscilloscope module for gpsim. The module provide 8 probes, which
-you have to connect to nodes. For now the graphic interface doesn't
-update its display dynamically, it provides 2 input boxes in which have to
-enter the start and end cycles to draw.
diff --git a/emulators/gpsim-oscilloscope/Makefile b/emulators/gpsim-oscilloscope/Makefile
deleted file mode 100644
index 3a36fa969b5..00000000000
--- a/emulators/gpsim-oscilloscope/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/06/11 23:51:16 joerg Exp $
-#
-
-DISTNAME=	oscilloscope-0.1.2
-PKGNAME=	gpsim-${DISTNAME}
-PKGREVISION=	3
-CATEGORIES=	emulators
-MASTER_SITES=	http://www-asim.lip6.fr/~bouyer/pic/
-
-MAINTAINER=	bouyer@NetBSD.org
-COMMENT=	Oscilloscope module for gpsim
-
-GNU_CONFIGURE=	YES
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	pkg-config
-USE_LIBTOOL=	YES
-
-GCC_REQD+=		3.0
-
-EGDIR=		${PREFIX}/share/examples/gpsim-oscilloscope
-post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	cd ${WRKSRC}/examples;					\
-	${INSTALL_DATA} tst_txdot.asm ${EGDIR};			\
-	${INSTALL_DATA} tst_txdot.stc ${EGDIR};
-
-.include "../../emulators/gpsim-devel/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/gpsim-oscilloscope/PLIST b/emulators/gpsim-oscilloscope/PLIST
deleted file mode 100644
index 12105eaf874..00000000000
--- a/emulators/gpsim-oscilloscope/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/09/07 20:21:37 bouyer Exp $
-lib/libgpsim_oscilloscope.la
-share/examples/gpsim-oscilloscope/tst_txdot.asm
-share/examples/gpsim-oscilloscope/tst_txdot.stc
-@dirrm share/examples/gpsim-oscilloscope
diff --git a/emulators/gpsim-oscilloscope/distinfo b/emulators/gpsim-oscilloscope/distinfo
deleted file mode 100644
index 814b995f708..00000000000
--- a/emulators/gpsim-oscilloscope/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/09/07 20:21:37 bouyer Exp $
-
-SHA1 (oscilloscope-0.1.2.tar.gz) = 3ab26a7cb7568a25ac4cd22bf925e0f2bb0affbf
-RMD160 (oscilloscope-0.1.2.tar.gz) = a96e429975a566ac4979d9c11596c321456181e2
-Size (oscilloscope-0.1.2.tar.gz) = 623813 bytes
diff --git a/emulators/gpsim-ptyusart/DESCR b/emulators/gpsim-ptyusart/DESCR
deleted file mode 100644
index 9cee24eae9e..00000000000
--- a/emulators/gpsim-ptyusart/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-This is a serial module for gpsim, connecting the virtual Rx/Tx lines
-to a pseudo-tty (pty). You can then use your usual serial tools (cu, tip,
-minicom, etc ...) on this pty as you would do on a real serial port on
-your Unix workstation.
-Included is an example loopback program for a pic18f (that is, it will
-just echo back what you send it). tstloopback.c can be used along with
-cu or tip (or possibly minicom) to copy an arbitrary file though the
-serial port and the pic, which allows to check for data corruption
-(if you notice that 0x11 and 0x13 characters get lost, check for
-the XON/XOFF status of your pty :)
-
-This module has been developed for gpsim from CVS 20040816:
-http://www-asim.lip6.fr/~bouyer/pic/gpsim-20040826.tar.gz
-
-For now this has only been tested on NetBSD. It should work without
-much troubles on others BSDs. More work is needed for other unix-like
-operating systems (probably require a usart_external.cc per pty style).
-
-Please address comments, bug-fixes or updates to Manuel.Bouyer@lip6.fr
diff --git a/emulators/gpsim-ptyusart/Makefile b/emulators/gpsim-ptyusart/Makefile
deleted file mode 100644
index c6cce5eb745..00000000000
--- a/emulators/gpsim-ptyusart/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:27 wiz Exp $
-#
-
-DISTNAME=	ptyusart-0.3.2
-PKGNAME=	gpsim-${DISTNAME}
-PKGREVISION=	3
-CATEGORIES=	emulators
-MASTER_SITES=	http://www-asim.lip6.fr/~bouyer/pic/
-
-MAINTAINER=	bouyer@NetBSD.org
-COMMENT=	Pseudo-tty module for gpsim
-
-ONLY_FOR_PLATFORM=	NetBSD-*-*
-
-GNU_CONFIGURE=	YES
-USE_LANGUAGES=	c c++
-
-USE_LIBTOOL=	YES
-
-GCC_REQD+=		3.0
-
-EGDIR=		${PREFIX}/share/examples/gpsim-ptyusart
-post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	cd ${WRKSRC}/examples;					\
-	${INSTALL_DATA} tst_txdot.asm ${EGDIR};			\
-	${INSTALL_DATA} tst_txrx.asm ${EGDIR};			\
-	${INSTALL_DATA} tst_txrx.stc ${EGDIR};			\
-	${INSTALL_DATA} tstloopback.c ${EGDIR};
-
-.include "../../emulators/gpsim-devel/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/gpsim-ptyusart/PLIST b/emulators/gpsim-ptyusart/PLIST
deleted file mode 100644
index 74bfbee6bb1..00000000000
--- a/emulators/gpsim-ptyusart/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/09/07 20:23:12 bouyer Exp $
-lib/libgpsim_ptyusart.la
-share/examples/gpsim-ptyusart/tst_txdot.asm
-share/examples/gpsim-ptyusart/tst_txrx.asm
-share/examples/gpsim-ptyusart/tst_txrx.stc
-share/examples/gpsim-ptyusart/tstloopback.c
-@dirrm share/examples/gpsim-ptyusart
diff --git a/emulators/gpsim-ptyusart/distinfo b/emulators/gpsim-ptyusart/distinfo
deleted file mode 100644
index 9b945c22236..00000000000
--- a/emulators/gpsim-ptyusart/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/09/07 20:23:12 bouyer Exp $
-
-SHA1 (ptyusart-0.3.2.tar.gz) = cf2a8bf2fefac2dd52661e976b6991f45b8c3e76
-RMD160 (ptyusart-0.3.2.tar.gz) = 3d08f6b2c46f3879b87748b38238903ccc346a1b
-Size (ptyusart-0.3.2.tar.gz) = 629491 bytes
diff --git a/emulators/gpsim/DESCR b/emulators/gpsim/DESCR
deleted file mode 100644
index 133d585a41b..00000000000
--- a/emulators/gpsim/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-PIC simulator that supports X, stimulii, and modules
diff --git a/emulators/gpsim/Makefile b/emulators/gpsim/Makefile
deleted file mode 100644
index c7ffe6f731e..00000000000
--- a/emulators/gpsim/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/06/11 14:08:28 joerg Exp $
-#
-
-DISTNAME=	gpsim-0.21.11
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gpsim/}
-
-MAINTAINER=	snoonan@tbearsiberians.com
-HOMEPAGE=	http://www.dattalo.com/gnupic/gpsim.html
-COMMENT=	PIC emulator with X interface
-
-GNU_CONFIGURE=	YES
-USE_LANGUAGES=	c c++
-
-USE_TOOLS+=	gmake pkg-config
-USE_LIBTOOL=	YES
-USE_GNU_READLINE=	YES
-
-post-install:
-	${INSTALL_DATA_DIR}  ${PREFIX}/share/doc/gpsim
-	${INSTALL_DATA} ${WRKSRC}/doc/gpsim.pdf ${PREFIX}/share/doc/gpsim
-	${INSTALL_DATA} ${WRKSRC}/doc/gpsim.ps ${PREFIX}/share/doc/gpsim
-
-.include "../../devel/popt/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/gtk2+extra/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/gpsim/PLIST b/emulators/gpsim/PLIST
deleted file mode 100644
index 98b47aee136..00000000000
--- a/emulators/gpsim/PLIST
+++ /dev/null
@@ -1,87 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2006/06/04 06:14:11 dogcow Exp $
-bin/gpsim
-include/eXdbm/eXdbm.h
-include/eXdbm/eXdbmErrors.h
-include/eXdbm/eXdbmTypes.h
-include/gpsim/12bit-instructions.h
-include/gpsim/12bit-processors.h
-include/gpsim/14bit-instructions.h
-include/gpsim/14bit-processors.h
-include/gpsim/14bit-registers.h
-include/gpsim/14bit-tmrs.h
-include/gpsim/16bit-instructions.h
-include/gpsim/16bit-processors.h
-include/gpsim/16bit-registers.h
-include/gpsim/16bit-tmrs.h
-include/gpsim/attributes.h
-include/gpsim/bit.h
-include/gpsim/bitlog.h
-include/gpsim/breakpoints.h
-include/gpsim/bytelog.h
-include/gpsim/cmd_gpsim.h
-include/gpsim/cmd_manager.h
-include/gpsim/cod.h
-include/gpsim/eeprom.h
-include/gpsim/errors.h
-include/gpsim/exports.h
-include/gpsim/expr.h
-include/gpsim/fopen-path.h
-include/gpsim/gpsim_classes.h
-include/gpsim/gpsim_def.h
-include/gpsim/gpsim_interface.h
-include/gpsim/gpsim_object.h
-include/gpsim/gpsim_time.h
-include/gpsim/i2c-ee.h
-include/gpsim/icd.h
-include/gpsim/intcon.h
-include/gpsim/interface.h
-include/gpsim/ioports.h
-include/gpsim/lxt_write.h
-include/gpsim/modules.h
-include/gpsim/operator.h
-include/gpsim/p12x.h
-include/gpsim/p16f62x.h
-include/gpsim/p16f87x.h
-include/gpsim/p16x5x.h
-include/gpsim/p16x6x.h
-include/gpsim/p16x7x.h
-include/gpsim/p16x8x.h
-include/gpsim/p17c75x.h
-include/gpsim/p18x.h
-include/gpsim/packages.h
-include/gpsim/pic-instructions.h
-include/gpsim/pic-packages.h
-include/gpsim/pic-processor.h
-include/gpsim/pic-registers.h
-include/gpsim/picdis.h
-include/gpsim/pie.h
-include/gpsim/pir.h
-include/gpsim/processor.h
-include/gpsim/program_files.h
-include/gpsim/protocol.h
-include/gpsim/pthread-wrap.h
-include/gpsim/registers.h
-include/gpsim/sim_context.h
-include/gpsim/ssp.h
-include/gpsim/stimuli.h
-include/gpsim/stimulus_orb.h
-include/gpsim/symbol.h
-include/gpsim/symbol_orb.h
-include/gpsim/tmr0.h
-include/gpsim/trace.h
-include/gpsim/trace_orb.h
-include/gpsim/trigger.h
-include/gpsim/ttoken.h
-include/gpsim/uart.h
-include/gpsim/value.h
-include/gpsim/xref.h
-lib/libgpsim.la
-lib/libgpsim_eXdbm.la
-lib/libgpsim_modules.la
-lib/libgpsimcli.la
-lib/libgpsimgui.la
-share/doc/gpsim/gpsim.pdf
-share/doc/gpsim/gpsim.ps
-@dirrm share/doc/gpsim
-@dirrm include/gpsim
-@dirrm include/eXdbm
diff --git a/emulators/gpsim/distinfo b/emulators/gpsim/distinfo
deleted file mode 100644
index 3c3854cbf57..00000000000
--- a/emulators/gpsim/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.8 2006/06/19 22:05:14 joerg Exp $
-
-SHA1 (gpsim-0.21.11.tar.gz) = 05337560a6b48a9afb7a3f4be1ba606709f6b30a
-RMD160 (gpsim-0.21.11.tar.gz) = 36001180948fc2394043d8283dc1dd028ee4f922
-Size (gpsim-0.21.11.tar.gz) = 1218332 bytes
-SHA1 (patch-aa) = 0d102952cb8dbe7faaf50416a2d9bec24683c300
-SHA1 (patch-ab) = 199403ee700b145dcb44f42c258903903af20785
diff --git a/emulators/gpsim/patches/patch-aa b/emulators/gpsim/patches/patch-aa
deleted file mode 100644
index 85e259246da..00000000000
--- a/emulators/gpsim/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/06/04 06:14:11 dogcow Exp $
-
---- gui/Makefile.in.orig	2006-06-03 22:01:39.000000000 -0700
-+++ gui/Makefile.in	2006-06-03 21:55:02.000000000 -0700
-@@ -226,9 +226,9 @@ libgpsimgui_la_SOURCES = gui_break.cc gu
- 
- libgpsimgui_la_LDFLAGS = @X_LDFLAGS@ @Y_LDFLAGS@
- pixmapdir = $(datadir)/gpsim
--AM_CFLAGS = -D DATADIR=\"~/.gpsim/\"
--AM_CXXFLAGS = -D DATADIR=\"~/.gpsim/\"
--AM_CPPFLAGS = -D DATADIR=\"~/.gpsim/\"
-+AM_CFLAGS = -DDATADIR=\"~/.gpsim/\"
-+AM_CXXFLAGS = -DDATADIR=\"~/.gpsim/\"
-+AM_CPPFLAGS = -DDATADIR=\"~/.gpsim/\"
- all: all-am
- 
- .SUFFIXES:
diff --git a/emulators/gpsim/patches/patch-ab b/emulators/gpsim/patches/patch-ab
deleted file mode 100644
index 2f8895abce9..00000000000
--- a/emulators/gpsim/patches/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2006/06/19 22:05:14 joerg Exp $
-
---- src/os_dependent.cc.orig	2005-08-25 21:57:41.000000000 +0000
-+++ src/os_dependent.cc
-@@ -37,6 +37,10 @@ Boston, MA 02111-1307, USA.  */
- #include "exports.h"
- #include "modules.h"
- 
-+#if defined(__DragonFly__)
-+#include <glib/gstrfuncs.h>
-+#include <glib/gmem.h>
-+#endif
- #ifndef _WIN32
- #include <dlfcn.h>
- #define STRICMP strcasecmp
-@@ -348,7 +352,9 @@ unsigned long get_error() {
- }
- 
- char * get_error_message() {
--#ifndef _WIN32
-+#if defined(__DragonFly__)
-+  return g_strdup(dlerror());
-+#elif !defined(_WIN32)
-   return dlerror();
- #else
-   return g_win32_error_message(GetLastError());
-@@ -357,7 +363,7 @@ char * get_error_message() {
- 
- void free_error_message(char * pszError)
- {
--#ifdef _WIN32
-+#if defined(_WIN32) || defined(__DragonFly__)
-   g_free(pszError);
- #endif
- }
diff --git a/emulators/gxemul/DESCR b/emulators/gxemul/DESCR
deleted file mode 100644
index 8ef0c801333..00000000000
--- a/emulators/gxemul/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-GXemul is a machine emulator. The initial goal was to write a simple
-64-bit MIPS emulator for running multiprocessor experiments with a
-microkernel, but the emulator can be used for many other things. While
-some simulators only simulate a CPU, GXemul also simulates other
-hardware components, making it possible to use the emulator to run
-unmodified operating systems, such as NetBSD, OpenBSD, or Linux.
diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
deleted file mode 100644
index db0531049d0..00000000000
--- a/emulators/gxemul/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: Makefile,v 1.29 2007/03/18 21:05:38 xtraeme Exp $
-#
-
-DISTNAME=	gxemul-0.4.4.1
-CATEGORIES=	emulators
-MASTER_SITES=	http://gavare.se/gxemul/src/
-
-MAINTAINER=	xtraeme@NetBSD.org
-HOMEPAGE=	http://gavare.se/gxemul/
-COMMENT=	Machine emulator
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-USE_LANGUAGES=	c
-HAS_CONFIGURE=	yes
-BUILD_TARGET=	build
-
-INSTALLATION_DIRS=	bin share/doc/${PKGBASE}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gxemul ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/gxemul.1 ${PREFIX}/${PKGMANDIR}/man1
-.for f in README HISTORY TODO RELEASE LICENSE
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/${PKGBASE}
-.endfor
-	cd ${WRKSRC}/doc && ${PAX} -rwppm . ${PREFIX}/share/doc/${PKGBASE}
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.gxemul
-PKG_SUPPORTED_OPTIONS=	x11
-PKG_SUGGESTED_OPTIONS=	x11
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mx11)
-GLOBAL_LDFLAGS=		-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
-SUBST_CLASSES+=		x11
-SUBST_STAGE.x11=	post-patch
-SUBST_FILES.x11=	configure
-SUBST_SED.x11=		-e 's|-L/usr/X11R6/lib|${GLOBAL_LDFLAGS:Q}|g'
-SUBST_SED.x11+=		-e 's|/usr/X11R6|${X11BASE}|g'
-SUBST_MESSAGE.x11=	Fixing X linking flags.
-
-.include "../../x11/libX11/buildlink3.mk"
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/gxemul/PLIST b/emulators/gxemul/PLIST
deleted file mode 100644
index c2b1947e101..00000000000
--- a/emulators/gxemul/PLIST
+++ /dev/null
@@ -1,135 +0,0 @@
-@comment $NetBSD: PLIST,v 1.15 2007/03/18 21:05:38 xtraeme Exp $
-bin/gxemul
-man/man1/gxemul.1
-share/doc/gxemul/20040504-ultrix45-boot1.png
-share/doc/gxemul/20040504-ultrix45-boot1_small.png
-share/doc/gxemul/20040710-openbsd-pmax.png
-share/doc/gxemul/20040710-openbsd-pmax_small.png
-share/doc/gxemul/20040711-sprite-1.png
-share/doc/gxemul/20040711-sprite-1_small.png
-share/doc/gxemul/20041018-mach_pmax.png
-share/doc/gxemul/20041018-mach_pmax_small.png
-share/doc/gxemul/20041024-netbsd-arc-installed.gif
-share/doc/gxemul/20041024-netbsd-arc-installed_small.gif
-share/doc/gxemul/20041024-openbsd-arc-installed.gif
-share/doc/gxemul/20041024-openbsd-arc-installed_small.gif
-share/doc/gxemul/20041129-redhat_mips.png
-share/doc/gxemul/20041129-redhat_mips_small.png
-share/doc/gxemul/20041209-ultrix-tripplehead.jpg
-share/doc/gxemul/20041209-ultrix-tripplehead_small.jpg
-share/doc/gxemul/20041212-debian_1.png
-share/doc/gxemul/20041212-debian_1_small.gif
-share/doc/gxemul/20041212-debian_2.png
-share/doc/gxemul/20041212-debian_2_small.gif
-share/doc/gxemul/20041213-debian_3.png
-share/doc/gxemul/20041213-debian_3_small.gif
-share/doc/gxemul/20041213-debian_4.png
-share/doc/gxemul/20041213-debian_4_small.gif
-share/doc/gxemul/20050317-example.png
-share/doc/gxemul/20050317-example_small.png
-share/doc/gxemul/20050427-netbsd-hpcmips-1.png
-share/doc/gxemul/20050427-netbsd-hpcmips-1_small.png
-share/doc/gxemul/20050427-netbsd-hpcmips-2.png
-share/doc/gxemul/20050427-netbsd-hpcmips-2_small.png
-share/doc/gxemul/20050617-openbsd-sgi.png
-share/doc/gxemul/20050617-openbsd-sgi_small.png
-share/doc/gxemul/20050817-sgi-o2-success-7.png
-share/doc/gxemul/20050817-sgi-o2-success-7_small.png
-share/doc/gxemul/20050817-sgi-o2-success-8.png
-share/doc/gxemul/20050817-sgi-o2-success-8_small.png
-share/doc/gxemul/20051007-netbsd-cats-installed.png
-share/doc/gxemul/20051007-netbsd-cats-installed_small.png
-share/doc/gxemul/20051007-openbsd-cats-installed.png
-share/doc/gxemul/20051007-openbsd-cats-installed_small.png
-share/doc/gxemul/20051123-netbsd-prep.png
-share/doc/gxemul/20051123-netbsd-prep_small.png
-share/doc/gxemul/20060218-netbsd-evbarm.png
-share/doc/gxemul/20060218-netbsd-evbarm_small.png
-share/doc/gxemul/20060504-gdb-64bit-mips.png
-share/doc/gxemul/20060504-gdb-64bit-mips_small.png
-share/doc/gxemul/20060623-netbsd-sgimips-3.0.png
-share/doc/gxemul/20060623-netbsd-sgimips-3.0_small.png
-share/doc/gxemul/20060724-netbsd-netwinder-1.png
-share/doc/gxemul/20060724-netbsd-netwinder-1_small.png
-share/doc/gxemul/20060724-netbsd-netwinder-2.png
-share/doc/gxemul/20060724-netbsd-netwinder-2_small.png
-share/doc/gxemul/20060812-netbsd-cobalt-3.0.1.png
-share/doc/gxemul/20060812-netbsd-cobalt-3.0.1_small.png
-share/doc/gxemul/20060812-netbsd-malta-3.0.1.png
-share/doc/gxemul/20060812-netbsd-malta-3.0.1_small.png
-share/doc/gxemul/20060814-netbsd-algor-3.0.1.png
-share/doc/gxemul/20060814-netbsd-algor-3.0.1_small.png
-share/doc/gxemul/20061029-netbsd-dreamcast.png
-share/doc/gxemul/20061029-netbsd-dreamcast_small.png
-share/doc/gxemul/20061104-netbsd-dreamcast-real.jpg
-share/doc/gxemul/20061104-netbsd-dreamcast-real_small.png
-share/doc/gxemul/20070128-netbsd-dreamcast-livecd-1.png
-share/doc/gxemul/20070128-netbsd-dreamcast-livecd-1_small.png
-share/doc/gxemul/20070128-netbsd-dreamcast-livecd-2.png
-share/doc/gxemul/20070128-netbsd-dreamcast-livecd-2_small.png
-share/doc/gxemul/20070224-netbsd-landisk.png
-share/doc/gxemul/20070224-netbsd-landisk_small.png
-share/doc/gxemul/20070308-linux-dreamcast-1.png
-share/doc/gxemul/20070308-linux-dreamcast-1_small.png
-share/doc/gxemul/20070308-linux-dreamcast-2.png
-share/doc/gxemul/20070308-linux-dreamcast-2_small.png
-share/doc/gxemul/20070318-netbsd-macppc.png
-share/doc/gxemul/20070318-netbsd-macppc_small.png
-share/doc/gxemul/HISTORY
-share/doc/gxemul/LICENSE
-share/doc/gxemul/README
-share/doc/gxemul/RELEASE
-share/doc/gxemul/TODO
-share/doc/gxemul/configfiles.html
-share/doc/gxemul/debian-1-small.png
-share/doc/gxemul/debian-1.png
-share/doc/gxemul/debian-10-small.png
-share/doc/gxemul/debian-10.png
-share/doc/gxemul/debian-11-small.png
-share/doc/gxemul/debian-11.png
-share/doc/gxemul/debian-12-small.png
-share/doc/gxemul/debian-12.png
-share/doc/gxemul/debian-13-small.png
-share/doc/gxemul/debian-13.png
-share/doc/gxemul/debian-14-small.png
-share/doc/gxemul/debian-14.png
-share/doc/gxemul/debian-15-small.png
-share/doc/gxemul/debian-15.png
-share/doc/gxemul/debian-2-small.png
-share/doc/gxemul/debian-2.png
-share/doc/gxemul/debian-3-small.png
-share/doc/gxemul/debian-3.png
-share/doc/gxemul/debian-4-small.png
-share/doc/gxemul/debian-4.png
-share/doc/gxemul/debian-5-small.png
-share/doc/gxemul/debian-5.png
-share/doc/gxemul/debian-6-small.png
-share/doc/gxemul/debian-6.png
-share/doc/gxemul/debian-7-small.png
-share/doc/gxemul/debian-7.png
-share/doc/gxemul/debian-8-small.png
-share/doc/gxemul/debian-8.png
-share/doc/gxemul/debian-9-small.png
-share/doc/gxemul/debian-9.png
-share/doc/gxemul/dreamcast.html
-share/doc/gxemul/experiments.html
-share/doc/gxemul/gdb_remote.html
-share/doc/gxemul/guestoses.html
-share/doc/gxemul/index.html
-share/doc/gxemul/intro.html
-share/doc/gxemul/maddr.gif
-share/doc/gxemul/make_doc_footer.html
-share/doc/gxemul/make_doc_header.html
-share/doc/gxemul/misc.html
-share/doc/gxemul/networking.html
-share/doc/gxemul/openbsd-pmax-20040710.png
-share/doc/gxemul/openbsd-pmax-20040710_small.png
-share/doc/gxemul/sgi-o2-real.jpg
-share/doc/gxemul/sgi-o2-real_small.jpg
-share/doc/gxemul/simplified_dyntrans.png
-share/doc/gxemul/sprite-20040711.png
-share/doc/gxemul/sprite-20040711_small.png
-share/doc/gxemul/technical.html
-share/doc/gxemul/ultrix4.5-20040706.png
-share/doc/gxemul/ultrix4.5-20040706_small.png
-@dirrm share/doc/gxemul
diff --git a/emulators/gxemul/distinfo b/emulators/gxemul/distinfo
deleted file mode 100644
index 87e04d3ebe9..00000000000
--- a/emulators/gxemul/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.19 2007/03/18 21:05:38 xtraeme Exp $
-
-SHA1 (gxemul-0.4.4.1.tar.gz) = 3d7553c577cc7d00fcc30f6f909c7673e9e3d610
-RMD160 (gxemul-0.4.4.1.tar.gz) = 768acba728ad1df8bad734f2009b4dddb96366ca
-Size (gxemul-0.4.4.1.tar.gz) = 2155651 bytes
diff --git a/emulators/hatari/DESCR b/emulators/hatari/DESCR
deleted file mode 100644
index 91a9c07ede5..00000000000
--- a/emulators/hatari/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Hatari is an Atari ST emulator for systems supported by the SDL library.
-
-Hatari is based on two main sources:
-- The WinSTon sourcecode written by Paul Bates
-  (http://www.sourceforge.net/projects/winston/)
-- The UAE's CPU core (http://www.freiburg.linux.de/~uae/)
-
-You need a copy of an Atari ST TOS ROM to use this program. Then run
-the program as follows:	hatari --tos tos.image
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
deleted file mode 100644
index 8472c825f7e..00000000000
--- a/emulators/hatari/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2006/09/10 21:58:14 adam Exp $
-
-DISTNAME=	hatari-0.90
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hatari/}
-
-MAINTAINER=	cjep@NetBSD.org
-HOMEPAGE=	http://hatari.sourceforge.net/
-COMMENT=	Atari ST emulator
-
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-
-INSTALLATION_DIRS+=	share/doc/hatari
-
-post-install:
-	cd ${WRKSRC} && ${INSTALL_DATA} *.txt ${PREFIX}/share/doc/hatari
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.txt *.html \
-			${PREFIX}/share/doc/hatari
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/hatari/PLIST b/emulators/hatari/PLIST
deleted file mode 100644
index 1633a8dfea8..00000000000
--- a/emulators/hatari/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2006/09/10 21:58:14 adam Exp $
-bin/hatari
-share/doc/hatari/authors.txt
-share/doc/hatari/changelog.txt
-share/doc/hatari/gpl.txt
-share/doc/hatari/keymap-sample.txt
-share/doc/hatari/manual.html
-share/doc/hatari/memory-usage.txt
-share/doc/hatari/readme.txt
-share/doc/hatari/release-notes.txt
-share/doc/hatari/todo.txt
-share/hatari/tos.img
-@dirrm share/hatari
-@dirrm share/doc/hatari
diff --git a/emulators/hatari/distinfo b/emulators/hatari/distinfo
deleted file mode 100644
index b1655f41691..00000000000
--- a/emulators/hatari/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.9 2006/09/10 21:58:14 adam Exp $
-
-SHA1 (hatari-0.90.tar.gz) = d8f707cd5346b42aef431ce55100ca62ff229b3c
-RMD160 (hatari-0.90.tar.gz) = 914b97dd914329af858c6c0630671399b5231d78
-Size (hatari-0.90.tar.gz) = 687029 bytes
-SHA1 (patch-aa) = 1ebe2f92ee176cf5d5b1e4a7c5e2143b1d766ea8
diff --git a/emulators/hatari/patches/patch-aa b/emulators/hatari/patches/patch-aa
deleted file mode 100644
index e05603a66b1..00000000000
--- a/emulators/hatari/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/11/19 10:09:48 adam Exp $
-
---- src/includes/unzip.h.orig	2003-03-30 14:39:27.000000000 +0100
-+++ src/includes/unzip.h
-@@ -49,6 +49,14 @@
- #ifndef _unz_H
- #define _unz_H
- 
-+#ifndef OF /* function prototypes */
-+#  ifdef STDC
-+#    define OF(args)  args
-+#  else
-+#    define OF(args)  ()
-+#  endif
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/emulators/hercules-images/DESCR b/emulators/hercules-images/DESCR
deleted file mode 100644
index 424eb4455e3..00000000000
--- a/emulators/hercules-images/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-The files contained in this package are used to IPL the Hercules
-emulator.
-
-Taken from the Hercules FAQ:
-
-3.  Alternatively, you can download the mftr33.tar.gz package which
-contains a minimal MFT system on a 3330 image, with some minimal
-documentation.  The configuration is that of a 370/145 with 2
-megabytes of main storage, running OS/MFT Release 21.0, with several
-volumes of pre-loaded DASD.  2 program partitions (P0 and P1) have
-been genned.  There is no working TOD clock, and no SMF.  Volume
-DLIB01 which is specified does not exist in the zipped file, but can
-be created using a plf file with the CDROM of OS/360.  DLIB01 can be
-commented-out from the config (cnf) file if desired.  The mftr33
-package also includes the IPL text and program for the standalone
-IBCDASD program as file "ibcdasdi.rdr" which can be used if desired.
diff --git a/emulators/hercules-images/Makefile b/emulators/hercules-images/Makefile
deleted file mode 100644
index 48c17eae63a..00000000000
--- a/emulators/hercules-images/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/09/19 18:32:50 joerg Exp $
-
-DISTNAME=		mftr33
-PKGNAME=		hercules-images-20010222
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.conmicro.cx/hercules/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.conmicro.cx/hercules/
-COMMENT=		Images to IPL the Hercules emulator
-
-WRKSRC=			${WRKDIR}
-NO_BUILD=		yes
-NO_CONFIGURE=		yes
-EXTRACT_ONLY=
-USE_TOOLS+=		gzcat pax
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/data/hercules
-	cd ${PREFIX}/share/data/hercules &&				\
-		(gzcat ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; dd if=/dev/zero bs=10k count=2) | pax -O -r
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/hercules-images/PLIST b/emulators/hercules-images/PLIST
deleted file mode 100644
index 6143c372be9..00000000000
--- a/emulators/hercules-images/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:48 zuntum Exp $
-share/data/hercules/mftipl.txt
-share/data/hercules/os360.cnf
-share/data/hercules/sysgen.txt
-share/data/hercules/listvtoc.prn
-share/data/hercules/nucmap.prn
-share/data/hercules/mftr33.plf
-share/data/hercules/mftr33.lst
-share/data/hercules/ibcdasdi.rdr
-share/data/hercules/ibcdmprs.rdr
-share/data/hercules/ieaipl00.rdr
-share/data/hercules/dlib01.plf
-share/data/hercules/init3330.txt
-share/data/hercules/init2311.txt
-share/data/hercules/mftr33.150
-share/data/hercules/work01.151
-share/data/hercules/work02.192
-@dirrm share/data/hercules
diff --git a/emulators/hercules-images/distinfo b/emulators/hercules-images/distinfo
deleted file mode 100644
index 541833232ca..00000000000
--- a/emulators/hercules-images/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 18:49:19 agc Exp $
-
-SHA1 (mftr33.tar.gz) = 2ff8d1694558cd08bc445851993fef6fb7e22466
-RMD160 (mftr33.tar.gz) = 6b5cbc18fede7311dfd6468e8e3a54e664c5041d
-Size (mftr33.tar.gz) = 1709790 bytes
diff --git a/emulators/hercules/DESCR b/emulators/hercules/DESCR
deleted file mode 100644
index f1c4ad5a983..00000000000
--- a/emulators/hercules/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Hercules is an open source software implementation of the mainframe
-System/370 and ESA/390 architectures, in addition to the new 64-bit
-z/Architecure.  Hercules runs under Linux, Windows 98, Windows NT,
-Windows 2000, and NetBSD.  Hercules was created by Roger Bowler and is
-maintained by Jay Maynard.  Jan Jaeger designed and implemented many
-of the advanced features of Hercules, including dynamic
-reconfiguration, integrated console, interpretive execution, and
-z/Architecture support.
diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
deleted file mode 100644
index 5e40ba0d7dc..00000000000
--- a/emulators/hercules/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/09/09 02:41:59 obache Exp $
-
-DISTNAME=		hercules-2.11
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.conmicro.cx/hercules/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.conmicro.cx/hercules/
-COMMENT=		S370 emulator
-
-DEPENDS+=		hercules-images-[0-9]*:../../emulators/hercules-images
-
-USE_TOOLS+=		gmake
-MAKE_FILE=		makefile
-MAKE_ENV+=		HOST_ARCH=${MACHINE_ARCH:Q}
-
-PTHREAD_OPTS+=		require
-
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/hercules
-	${INSTALL_DATA} ${WRKSRC}/hercules.cnf ${PREFIX}/share/examples/hercules/
-	${INSTALL_DATA} ${WRKSRC}/zzsa.cnf ${PREFIX}/share/examples/hercules/
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/hercules/PLIST b/emulators/hercules/PLIST
deleted file mode 100644
index e889f42714c..00000000000
--- a/emulators/hercules/PLIST
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:46 zuntum Exp $
-bin/hercules
-bin/hercifc
-bin/dasdinit
-bin/dasdisup
-bin/dasdload
-bin/dasdls
-bin/dasdpdsu
-bin/tapecopy
-bin/tapelist
-bin/tapemap
-bin/tapesplit
-bin/cckd2ckd
-bin/cckdcdsk
-bin/ckd2cckd
-bin/cckdcomp
-bin/hetget
-bin/hetinit
-bin/hetmap
-bin/hetupd
-bin/dasdlist
-share/examples/hercules/hercules.cnf
-share/examples/hercules/zzsa.cnf
-@dirrm share/examples/hercules
diff --git a/emulators/hercules/distinfo b/emulators/hercules/distinfo
deleted file mode 100644
index 43037b15058..00000000000
--- a/emulators/hercules/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.9 2005/12/09 10:46:43 joerg Exp $
-
-SHA1 (hercules-2.11.tar.gz) = ec84388e29cfd070055afa5fc11a33c896f2333a
-RMD160 (hercules-2.11.tar.gz) = 113647be0bd80ecc52331319902a1140a81b56aa
-Size (hercules-2.11.tar.gz) = 616554 bytes
-SHA1 (patch-aa) = 8e9aa1bf76fabf80af76dec0686892d20f2becba
-SHA1 (patch-ab) = ea2802d8752411e964ba150d3a54f64a40fc2e70
-SHA1 (patch-ac) = 454ac972ad54f19f139033abe8ccabdbb0c3f88b
-SHA1 (patch-ad) = 51fa93cb9fbc8382de1da52748dffa4ec2bcbf9c
-SHA1 (patch-ae) = 14aafa5462a858e44c00ea6d43efd0f1cfef190e
-SHA1 (patch-af) = 759ad1ee2737ed8021b5a5fd956851677e99879a
-SHA1 (patch-ag) = 6dcec345641bdde0c617da10f57b6f2dd6b702ac
-SHA1 (patch-ah) = 06e03dc32c91ab5d3125a3b5489d15ef5c1e144c
-SHA1 (patch-aj) = b4beda52ced42d6d58f02b24c0eaf56109eab092
-SHA1 (patch-ak) = 5b594849074ac410f2b8c93f2df0dca874b4533a
-SHA1 (patch-al) = 60d90ed9c1476b8fcf0a905a8316f3aec9108169
-SHA1 (patch-am) = 4626f39156ac2beccd9911f795aff6f9fe7b997b
-SHA1 (patch-an) = 3c36e9745316ef84caf60ba66b541b7cc3007377
-SHA1 (patch-ao) = 4d389c21d36ab44565f8e90f90dad8acff24e747
diff --git a/emulators/hercules/patches/patch-aa b/emulators/hercules/patches/patch-aa
deleted file mode 100644
index affb00a9ebc..00000000000
--- a/emulators/hercules/patches/patch-aa
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2005/12/09 10:46:43 joerg Exp $
-
---- makefile.orig	2001-02-11 03:21:58.000000000 +0000
-+++ makefile
-@@ -8,11 +8,11 @@ VERSION  = 2.11
- #   besides /usr/bin. The $PREFIX (which defaults to nothing) can be
- #   overridden in the make command line, as in "PREFIX=/foo make install"
- #   (the directory is only used when installing).
--DESTDIR  = $(PREFIX)/usr/bin
-+DESTDIR  = $(PREFIX)/bin
- 
- # Standard flags for all architectures
- CFLAGS	 = -Wall -fomit-frame-pointer -DVERSION=$(VERSION) -DNO_BYTESWAP_H
--LFLAGS	 = -lpthread
-+LFLAGS	 = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- 
- # Add default flags for Pentium compilations
- ifndef HOST_ARCH
-@@ -21,26 +21,28 @@ endif
- 
- # Handle host architecture if specified
- ifeq ($(HOST_ARCH),i386)
--CFLAGS	 += -O3 -malign-double -DNO_ASM_BYTESWAP
--endif
-+CFLAGS	 += -O3 -DNO_ASM_BYTESWAP
-+else
- ifeq ($(HOST_ARCH),i586)
--CFLAGS	 += -O3 -malign-double -march=pentium
--endif
-+CFLAGS	 += -O3
-+else
- ifeq ($(HOST_ARCH),i686)
--CFLAGS	 += -O3 -malign-double -march=pentiumpro
--endif
-+CFLAGS	 += -O3
-+else
- ifeq ($(HOST_ARCH),alpha)
- CFLAGS	 += -O2 -DNO_ASM_BYTESWAP
--endif
--ifeq ($(HOST_ARCH),other)
-+else
- CFLAGS	 += -O3 -DNO_ASM_BYTESWAP
--endif
-+endif  # alpha
-+endif  # i686
-+endif  # i586
-+endif  # i386
- 
- # Uncomment these lines for NetBSD, with either the unproven-pthreads
- #   or pth packages
--#CFLAGS  += -I/usr/pkg/pthreads/include -I/usr/pkg/include
--#LFLAGS	 += -L/usr/pkg/pthreads/lib -R/usr/pkg/pthreads
--#LFLAGS	 += -L/usr/pkg/lib -R/usr/pkg/pthreads/lib
-+CFLAGS  += -I${PREFIX}/include
-+LFLAGS	 += -L${PREFIX}/lib -R${PREFIX}/lib
-+LFLAGS	 += -L${PREFIX}/lib
- 
- # Reverse the comments below to disable Compressed CKD Dasd support
- #CFLAGS  += -DNO_CCKD
diff --git a/emulators/hercules/patches/patch-ab b/emulators/hercules/patches/patch-ab
deleted file mode 100644
index 9619d8ed0e7..00000000000
--- a/emulators/hercules/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/02/19 12:35:21 agc Exp $
-
-Linux tape handling.
-
---- tapedev.c	2001/02/19 11:50:37	1.1
-+++ tapedev.c	2001/02/19 11:57:16
-@@ -1149,7 +1149,11 @@
-                 dev->filename, strerror(errno));
-         return 0;
-     }
-+#if (defined(BSD) && BSD >= 199306)
-+    stat = (stblk.mt_dsreg << 16) | stblk.mt_erreg;
-+#else
-     stat = stblk.mt_gstat;
-+#endif
- 
-     /* Display tape status */
-     if (dev->ccwtrace || dev->ccwstep)
-@@ -1240,7 +1244,11 @@
-     }
- 
-     /* Intervention required if no tape is mounted */
-+#if (defined(BSD) && BSD >= 199306)
-+    if (GMT_DR_OPEN(((stblk.mt_dsreg << 16) | stblk.mt_erreg)))
-+#else
-     if (GMT_DR_OPEN(stblk.mt_gstat))
-+#endif
-     {
-         dev->sense[0] = SENSE_IR;
-         dev->sense[1] = SENSE1_TAPE_TUB;
diff --git a/emulators/hercules/patches/patch-ac b/emulators/hercules/patches/patch-ac
deleted file mode 100644
index e45ea816b42..00000000000
--- a/emulators/hercules/patches/patch-ac
+++ /dev/null
@@ -1,79 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/06/13 14:03:28 agc Exp $
-
-Linux tape handling.
-
---- hercules.h	2004-06-13 14:44:50.000000000 +0100
-+++ hercules.h	2004-06-13 14:47:06.000000000 +0100
-@@ -34,6 +34,7 @@
-  #include <byteswap.h>
- #endif
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <sys/resource.h>
- #include <sys/stat.h>
- #include <sys/socket.h>
-@@ -110,6 +111,7 @@
- #define HAVE_STRUCT_TIMESPEC
- #endif
- #include <pthread.h>
-+#include <sched.h>
- #ifdef WIN32
- #undef DWORD
- #endif
-@@ -935,6 +937,56 @@
- #define CCKD_OPEN_RD           2
- #define CCKD_OPEN_RW           3
- 
-+#if defined(BSD) && BSD >= 199306
-+struct mt_tape_info {
-+	BYTE	t_type;
-+	const char *t_name;
-+};
-+
-+#define MT_TAPE_INFO							\
-+{									\
-+	{MT_ISUNKNOWN,          "Unknown type of tape device"},		\
-+	{MT_ISQIC02,            "Generic QIC-02 tape streamer"}		\
-+}
-+
-+/* Generic Mag Tape (device independent) status macros for examining
-+ * mt_gstat -- HP-UX compatible.
-+ * There is room for more generic status bits here, but I don't
-+ * know which of them are reserved. At least three or so should
-+ * be added to make this really useful.
-+ */
-+#define GMT_EOF(x)              ((x) & 0x80000000)
-+#define GMT_BOT(x)              ((x) & 0x40000000)
-+#define GMT_EOT(x)              ((x) & 0x20000000)
-+#define GMT_SM(x)               ((x) & 0x10000000)  /* DDS setmark */
-+#define GMT_EOD(x)              ((x) & 0x08000000)  /* DDS EOD */
-+#define GMT_WR_PROT(x)          ((x) & 0x04000000)
-+/* #define GMT_ ? ((x) & 0x02000000) */
-+#define GMT_ONLINE(x)           ((x) & 0x01000000)
-+#define GMT_D_6250(x)           ((x) & 0x00800000)
-+#define GMT_D_1600(x)           ((x) & 0x00400000)
-+#define GMT_D_800(x)            ((x) & 0x00200000)
-+/* #define GMT_ ? ((x) & 0x00100000) */
-+/* #define GMT_ ? ((x) & 0x00080000) */
-+#define GMT_DR_OPEN(x)          ((x) & 0x00040000)  /* door open (no tape) */
-+/* #define GMT_ ? ((x) & 0x00020000) */
-+#define GMT_IM_REP_EN(x)        ((x) & 0x00010000)  /* immediate report mode */
-+/* 16 generic status bits unused */
-+/* SCSI-tape specific definitions */
-+
-+/* Bitfield shifts in the status */
-+#define MT_ST_BLKSIZE_SHIFT 0
-+#define MT_ST_BLKSIZE_MASK 0xffffff
-+#define MT_ST_DENSITY_SHIFT 24
-+#define MT_ST_DENSITY_MASK 0xff000000
-+
-+#define MTSETBLK 20     /* set block length (SCSI) */
-+
-+#define MT_ISUNKNOWN 0x01
-+#define MT_ISQIC02 0x02 
-+
-+#endif
-+
- /*-------------------------------------------------------------------*/
- /* Global data areas in module config.c 			     */
- /*-------------------------------------------------------------------*/
diff --git a/emulators/hercules/patches/patch-ad b/emulators/hercules/patches/patch-ad
deleted file mode 100644
index 114010fb88f..00000000000
--- a/emulators/hercules/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/12/09 10:46:43 joerg Exp $
-
---- hercifc.c.orig	2001-01-28 18:05:40.000000000 +0000
-+++ hercifc.c
-@@ -64,7 +64,11 @@ struct sockaddr_in *sin;                
-     sin = (struct sockaddr_in*)
-             (oper == SIOCSIFADDR ? &ifreq.ifr_addr
-             :oper == SIOCSIFDSTADDR ? &ifreq.ifr_dstaddr
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-+            :oper == SIOCSIFNETMASK ? &ifreq.ifr_broadaddr
-+#else
-             :oper == SIOCSIFNETMASK ? &ifreq.ifr_netmask
-+#endif
-             :NULL);
- 
-     /* Store the IP address into the structure */
diff --git a/emulators/hercules/patches/patch-ae b/emulators/hercules/patches/patch-ae
deleted file mode 100644
index d1b98f85d49..00000000000
--- a/emulators/hercules/patches/patch-ae
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/02/19 12:35:21 agc Exp $
-
-Linux tape handling.
-
---- tapecopy.c	2001/02/19 12:10:13	1.1
-+++ tapecopy.c	2001/02/19 12:14:00
-@@ -113,6 +113,7 @@
- {
- int             rc;                     /* Return code               */
- struct mtget    stblk;                  /* Area for MTIOCGET ioctl   */
-+long		gstat;
- 
-     rc = ioctl (devfd, MTIOCGET, (char*)&stblk);
-     if (rc < 0)
-@@ -122,10 +123,15 @@
-         return -1;
-     }
- 
--    print_status (devname, stblk.mt_gstat);
-+#if (defined(BSD) && BSD >= 199306)
-+    gstat = (stblk.mt_dsreg << 16) | stblk.mt_erreg;
-+#else
-+    gstat = stblk.mt_gstat;
-+#endif
-+    print_status (devname, gstat);
- 
--    if (GMT_EOD(stblk.mt_gstat)) return 1;
--    if (GMT_EOT(stblk.mt_gstat)) return 1;
-+    if (GMT_EOD(gstat)) return 1;
-+    if (GMT_EOT(gstat)) return 1;
- 
-     return 0;
- } /* end function print_status */
-@@ -152,6 +158,7 @@
- long            density;                /* Tape density code         */
- BYTE            labelrec[81];           /* Standard label (ASCIIZ)   */
- AWSTAPE_BLKHDR  awshdr;                 /* AWSTAPE block header      */
-+long		gstat;
- 
-     /* The first argument is the tape device name */
-     if (argc > 1 && argv[1] != NULL && strlen(argv[1]) > 5
-@@ -209,9 +216,14 @@
-     else
-         printf ("%s tape density code: 0x%lX\n", devname, density);
- 
--    if (stblk.mt_gstat != 0)
-+#if (defined(BSD) && BSD >= 199306)
-+    gstat = (stblk.mt_dsreg << 16) | stblk.mt_erreg;
-+#else
-+    gstat = stblk.mt_gstat;
-+#endif
-+    if (gstat != 0)
-     {
--        print_status (devname, stblk.mt_gstat);
-+        print_status (devname, gstat);
-     }
- 
-     /* Set the tape device to process variable length blocks */
diff --git a/emulators/hercules/patches/patch-af b/emulators/hercules/patches/patch-af
deleted file mode 100644
index 19d73caae3d..00000000000
--- a/emulators/hercules/patches/patch-af
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/02/22 11:34:59 agc Exp $
-
-> From Wofgang Solfrank (ws@tools.de)
-> What I discovered was a problem in ckddasd.c, where there are two lseeks
-> with an offset of -(CKDDASD_RECHDR_SIZE).  Now CKDDASD_RECHDR_SIZE is
-> defined (in hercules.h) as sizeof(CKDDASD_RECHDR), which happens to be
-> an unsigned int.  Since the offset in the lseek (and in the ckd_lseek
-> that is used as an interface routine to it) is of type off_t, i.e. 64-bit,
-> the unsigned is zero-extended to 64 bits, and thus the sign is lost.
-
---- ckddasd.c	2001/02/22 10:54:55	1.1
-+++ ckddasd.c	2001/02/22 10:55:26
-@@ -1663,7 +1663,7 @@
-     }
- 
-     /* Backspace over end of track marker */
--    rc = ckd_lseek (dev, dev->fd, -(CKDDASD_RECHDR_SIZE), SEEK_CUR);
-+    rc = ckd_lseek (dev, dev->fd, (int) -(CKDDASD_RECHDR_SIZE), SEEK_CUR);
-     if (rc == -1)
-     {
-         /* Handle seek error condition */
-@@ -1813,7 +1813,7 @@
-     }
- 
-     /* Backspace over end of track marker */
--    rc = ckd_lseek (dev, dev->fd, -(CKDDASD_RECHDR_SIZE), SEEK_CUR);
-+    rc = ckd_lseek (dev, dev->fd, (int) -(CKDDASD_RECHDR_SIZE), SEEK_CUR);
-     if (rc == -1)
-     {
-         /* Handle seek error condition */
diff --git a/emulators/hercules/patches/patch-ag b/emulators/hercules/patches/patch-ag
deleted file mode 100644
index a4dca77392d..00000000000
--- a/emulators/hercules/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2004/05/29 23:32:19 kristerw Exp $
-
---- cpu.c.orig	Sat Feb 10 11:48:23 2001
-+++ cpu.c	Sun May 30 01:10:44 2004
-@@ -743,7 +743,7 @@
- {
- #define CPU_PRIORITY    15              /* CPU thread priority       */
- 
--#ifndef WIN32
-+#if 0
-     /* Set CPU thread priority */
-     if (setpriority(PRIO_PROCESS, 0, CPU_PRIORITY))
-         logmsg ("HHC621I CPU thread set priority failed: %s\n",
diff --git a/emulators/hercules/patches/patch-ah b/emulators/hercules/patches/patch-ah
deleted file mode 100644
index df0474a03f5..00000000000
--- a/emulators/hercules/patches/patch-ah
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2004/06/13 14:03:28 agc Exp $
-
-Silence some compiler warnings
-
---- featall.h	2004/06/13 13:54:33	1.1
-+++ featall.h	2004/06/13 13:55:55
-@@ -20,11 +20,11 @@
- #define OPTION_NO_INLINE_DAT		/* Performance option	     */
- #undef	OPTION_NO_INLINE_VSTORE 	/* Performance option	     */
- #undef	OPTION_NO_LINUX_INTERRUPT_PATCH /* Linux performance	     */
--#undef  OPTION_FOOTPRINT_BUFFER     256 /* Size must be a power of 2 */
-+#undef  OPTION_FOOTPRINT_BUFFER     /* (256) Size must be a power of 2 */
- #undef  OPTION_INSTRUCTION_COUNTING	/* First use trace and count */
- #define OPTION_CKD_KEY_TRACING		/* Trace CKD search keys     */
- #define OPTION_NO_DEVICE_THREAD 	/* Separate threads for I/O  */
--#undef	OPTION_CMPSC_DEBUGLVL	      3 /* 1=Exp 2=Comp 3=Both debug */
-+#undef	OPTION_CMPSC_DEBUGLVL	      /* (3) 1=Exp 2=Comp 3=Both debug */
- 
- #define FEATURE_ALD_FORMAT            0
- 
diff --git a/emulators/hercules/patches/patch-aj b/emulators/hercules/patches/patch-aj
deleted file mode 100644
index 2d4c961a452..00000000000
--- a/emulators/hercules/patches/patch-aj
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2001/03/23 16:20:56 agc Exp $
-
-Patch from Wofgang Solfrank:
-
-"Change the timeout value from 1 usec to 10 msec in the timer thread.
-At least with unproven-pthreads, the comment above that is wrong
-when stating that a 1 usec timeout would be stretched to the next
-system clock tick."
-
---- timer.c.orig	Thu Feb  8 20:02:41 2001
-+++ timer.c	Fri Mar 23 16:01:53 2001
-@@ -319,7 +319,7 @@
-                 /* Calculate instructions/millisecond for this CPU */
-                 regs->mipsrate =
-                     (regs->instcount - regs->prevcount) / msecctr;
--                regs->siosrate = regs->siocount;
-+                regs->siosrate = regs->siocount * 1000 / msecctr;
- 
-                 /* Save the instruction counter */
-                 regs->prevcount = regs->instcount;
-@@ -336,7 +336,7 @@
-         /* Sleep for one system clock tick by specifying a one-microsecond
-            delay, which will get stretched out to the next clock tick */
-         tv.tv_sec = 0;
--        tv.tv_usec = 1;
-+        tv.tv_usec = 10000;
-         select (0, NULL, NULL, NULL, &tv);
- 
-     } /* end while */
diff --git a/emulators/hercules/patches/patch-ak b/emulators/hercules/patches/patch-ak
deleted file mode 100644
index 1517dd688fa..00000000000
--- a/emulators/hercules/patches/patch-ak
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2004/06/13 14:03:28 agc Exp $
-
-Patch from Wolfgang Solfrank:
-
-Disabling the O_SYNC option when opening printer or punch.
-
-
---- printer.c.orig	Sun Jan 28 18:05:41 2001
-+++ printer.c	Fri Mar 23 16:01:53 2001
-@@ -149,7 +149,7 @@
-     if (dev->fd < 0 && !IS_CCW_SENSE(code))
-     {
-         rc = open (dev->filename,
--                    O_WRONLY | O_CREAT | O_TRUNC | O_SYNC,
-+                    O_WRONLY | O_CREAT | O_TRUNC,
-                     S_IRUSR | S_IWUSR | S_IRGRP);
-         if (rc < 0)
-         {
diff --git a/emulators/hercules/patches/patch-al b/emulators/hercules/patches/patch-al
deleted file mode 100644
index d0d46903ffa..00000000000
--- a/emulators/hercules/patches/patch-al
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-al,v 1.1 2001/03/23 16:20:56 agc Exp $
-
-Patch from Wolfgang Solfrank:
-
-A minor correction to the computation of the SIO rate.
-
---- console.c.orig	Sun Feb 11 03:52:30 2001
-+++ console.c	Fri Mar 23 16:01:53 2001
-@@ -1257,7 +1257,8 @@
-         } /* end for(dev) */
- 
-         /* Wait for a file descriptor to become ready */
--#ifdef WIN32
-+#ifndef	__notdef__
-+/*#ifdef WIN32*/
- 	{
- 	    struct timeval tv={0,500000};	/* half a second */
- 	    rc = select ( maxfd+1, &readset, NULL, NULL, &tv );
diff --git a/emulators/hercules/patches/patch-am b/emulators/hercules/patches/patch-am
deleted file mode 100644
index b73123135e7..00000000000
--- a/emulators/hercules/patches/patch-am
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-am,v 1.1 2001/03/23 16:20:56 agc Exp $
-
-Patch from Wolfgang Solfrank:
-
-Disabling the O_SYNC option when opening printer or punch.
-
---- cardpch.c.orig	Sun Jan 28 18:05:38 2001
-+++ cardpch.c	Fri Mar 23 16:01:53 2001
-@@ -155,9 +155,9 @@
-     {
-         rc = open (dev->filename,
- #ifdef WIN32
--                    O_WRONLY | O_CREAT | O_TRUNC | O_SYNC | O_BINARY,
-+                    O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,
- #else /* WIN32 */
--                    O_WRONLY | O_CREAT | O_TRUNC | O_SYNC,
-+                    O_WRONLY | O_CREAT | O_TRUNC,
- #endif /* WIN32 */
-                     S_IRUSR | S_IWUSR | S_IRGRP);
-         if (rc < 0)
diff --git a/emulators/hercules/patches/patch-an b/emulators/hercules/patches/patch-an
deleted file mode 100644
index 777dfa88dcc..00000000000
--- a/emulators/hercules/patches/patch-an
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-an,v 1.1 2001/05/11 11:17:39 dmcmahill Exp $
-
-regparm is only for i386
-
---- features.h.orig	Thu Feb  1 17:56:32 2001
-+++ features.h	Tue May  8 18:47:14 2001
-@@ -71,6 +71,11 @@
- #define ARCH_MODE	ARCH_370
- 
-+#ifdef __i386__
- #define DEF_INST(_name) \
- __attribute__ ((regparm(3))) void s370_ ## _name (BYTE inst[], int execflag, REGS *regs)
-+#else
-+#define DEF_INST(_name) \
-+void s370_ ## _name (BYTE inst[], int execflag, REGS *regs)
-+#endif
- 
- #define ARCH_DEP(_name) \
-@@ -130,6 +135,11 @@
- #define ARCH_MODE	ARCH_390
- 
-+#ifdef __i386__
- #define DEF_INST(_name) \
- __attribute__ ((regparm(3))) void s390_ ## _name (BYTE inst[], int execflag, REGS *regs)
-+#else
-+#define DEF_INST(_name) \
-+void s390_ ## _name (BYTE inst[], int execflag, REGS *regs)
-+#endif
- 
- #define ARCH_DEP(_name) \
-@@ -212,6 +222,11 @@
- #define SSGROUP_BIT	ASCE_G
- 
-+#ifdef __i386__
- #define DEF_INST(_name) \
- __attribute__ ((regparm(3))) void z900_ ## _name (BYTE inst[], int execflag, REGS *regs)
-+#else
-+#define DEF_INST(_name) \
-+void z900_ ## _name (BYTE inst[], int execflag, REGS *regs)
-+#endif
- 
- #define ARCH_DEP(_name) \
-@@ -268,6 +283,11 @@
- #define SSGROUP_BIT	ASCE_G
- 
-+#ifdef __i386__
- #define DEF_INST(_name) \
- __attribute__ ((regparm(3))) void z964_ ## _name (BYTE inst[], int execflag, REGS *regs)
-+#else
-+#define DEF_INST(_name) \
-+void z964_ ## _name (BYTE inst[], int execflag, REGS *regs)
-+#endif
- 
- #define ARCH_DEP(_name) \
diff --git a/emulators/hercules/patches/patch-ao b/emulators/hercules/patches/patch-ao
deleted file mode 100644
index 688e7cbf57f..00000000000
--- a/emulators/hercules/patches/patch-ao
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2001/05/11 11:17:40 dmcmahill Exp $
-
-regparm is only for i386
-
---- opcode.h.orig	Sat Feb 10 08:46:27 2001
-+++ opcode.h	Tue May  8 18:48:56 2001
-@@ -70,5 +70,9 @@
- 
- 
-+#ifdef __i386__
- typedef __attribute__ ((regparm(3))) void (*zz_func) (BYTE inst[], int execflag, REGS *regs);
-+#else
-+typedef void (*zz_func) (BYTE inst[], int execflag, REGS *regs);
-+#endif
- 
- extern zz_func opcode_table[][GEN_MAXARCH];
diff --git a/emulators/ia64sim/DESCR b/emulators/ia64sim/DESCR
deleted file mode 100644
index 7e2b4181f88..00000000000
--- a/emulators/ia64sim/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-IA64 ISA simulator, Alpha release, version 0.1
-----------------------------------------------
-
-This source distribution is placed in the public domain by its author,
-Jason Papadopoulos. You may use it for any purpose, free of charge,
-without having to notify anyone. I disclaim any responsibility for any
-errors, inconsistencies, and inaccuracies with real-world hardware
-implementations of the IA64 instruction set. If you build a mission-
-critical system based only on this simulator and something goes wrong,
-it's your own damned fault.
-
-Optionally, please be nice and tell me if you find this source to be
-useful. Again optionally, if you add to the functionality present here
-please consider making those additions public too, so that others may
-benefit from your work.
diff --git a/emulators/ia64sim/Makefile b/emulators/ia64sim/Makefile
deleted file mode 100644
index 33f5a47a81b..00000000000
--- a/emulators/ia64sim/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/10/04 21:38:37 wiz Exp $
-
-DISTNAME=		ia64sim
-PKGNAME=		ia64sim-0.3
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.boo.net/~jasonp/
-EXTRACT_SUFX=		.zip
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.boo.net/~jasonp/
-COMMENT=		IA64 simulator (Intel(R) Architecture 64)
-
-USE_TOOLS+=		gmake
-DIST_SUBDIR=		${PKGNAME_NOREV}
-
-MAKE_FILE=		makefile.unx
-INSTALLATION_DIRS=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ia64sim ${PREFIX}/bin/ia64sim
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/ia64sim/PLIST b/emulators/ia64sim/PLIST
deleted file mode 100644
index c7354713b8b..00000000000
--- a/emulators/ia64sim/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:51 zuntum Exp $
-bin/ia64sim
diff --git a/emulators/ia64sim/distinfo b/emulators/ia64sim/distinfo
deleted file mode 100644
index bb7e36ad1bb..00000000000
--- a/emulators/ia64sim/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 18:49:19 agc Exp $
-
-SHA1 (ia64sim-0.3/ia64sim.zip) = 8ec70627716bfcc59f7083f76655bb3ee09aa89f
-RMD160 (ia64sim-0.3/ia64sim.zip) = 20610c120d8eff5564555b50494de627a88de67b
-Size (ia64sim-0.3/ia64sim.zip) = 91846 bytes
-SHA1 (patch-aa) = ec595d6964bdc9df6ad5501e320523466af3b0cf
-SHA1 (patch-ab) = 27d7bd7c7e6b0603fa731850b83aa47145defed8
-SHA1 (patch-ac) = 42b237f44e4dde9be1897a83ffe97cf5ccf3f8d4
-SHA1 (patch-ad) = e1e97c022d64c1729a8c4ca836695148808804d6
diff --git a/emulators/ia64sim/patches/patch-aa b/emulators/ia64sim/patches/patch-aa
deleted file mode 100644
index 08c1f2bb5fd..00000000000
--- a/emulators/ia64sim/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/12/10 12:59:03 agc Exp $
-
---- makefile.unx	1999/12/10 12:46:49	1.1
-+++ makefile.unx	1999/12/10 12:47:03
-@@ -18,7 +18,7 @@
- OBJDIR = obj
- INCDIR = include
- CC = gcc
--CFLAGS = -O3 -m486 -fomit-frame-pointer -s -I$(INCDIR)
-+CFLAGS = -O3 -fomit-frame-pointer -s -I$(INCDIR)
- 
- ASMSRCS= assemble.c bundle.c asmfunc.c jumptbl.c decode.c
-  
diff --git a/emulators/ia64sim/patches/patch-ab b/emulators/ia64sim/patches/patch-ab
deleted file mode 100644
index 668d9acc226..00000000000
--- a/emulators/ia64sim/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/02/18 23:24:59 kristerw Exp $
-
---- include/ia64.h.orig	Thu Feb 19 00:15:01 2004
-+++ include/ia64.h	Thu Feb 19 00:16:20 2004
-@@ -35,7 +35,7 @@
-            0<=lo,hi<=63 and lo<=hi */
- 
- #define BITS(x,lo,hi) (      \
--           (uint32)(x##.q >> lo) &   \
-+           (uint32)(x.q >> lo) &   \
- 	   ( (1<<(hi-lo+1)) - 1 )    \
- 	   )
- 
-@@ -69,8 +69,8 @@
-    uint8 b[8];
- } qword;
- 
--#define HI(x)  (x##.d[1])
--#define LO(x)  (x##.d[0])
-+#define HI(x)  (x.d[1])
-+#define LO(x)  (x.d[0])
- 
- typedef struct {
-    qword dat;
diff --git a/emulators/ia64sim/patches/patch-ac b/emulators/ia64sim/patches/patch-ac
deleted file mode 100644
index 6ded469165d..00000000000
--- a/emulators/ia64sim/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1999/12/10 13:55:15 soren Exp $
-
---- asm/assemble.c.orig	Fri Dec 10 14:50:49 1999
-+++ asm/assemble.c	Fri Dec 10 14:50:58 1999
-@@ -280,7 +280,7 @@
-             break;
- 
-          case 'i':                                   /* signed immediate */
--            imm = strtoll(inptr, &throwaway, 0);
-+            imm = strtoq(inptr, &throwaway, 0);
-             if( isdigit(refptr[3]) )
-                maxbits = (refptr[2]-'0')*10 + (refptr[3]-'0');
-             else
-@@ -294,7 +294,7 @@
-             break;
- 
-          case 'u':                                 /* unsigned immediate */
--            imm = strtoll(inptr, &throwaway, 0);
-+            imm = strtoq(inptr, &throwaway, 0);
-             maxbits = (refptr[2]-'0');
- 	    if(maxbits==6)
- 	       index = 65;	      /* <-- some ops need 1-64, not 0-63 */
diff --git a/emulators/ia64sim/patches/patch-ad b/emulators/ia64sim/patches/patch-ad
deleted file mode 100644
index 70b42b7e30d..00000000000
--- a/emulators/ia64sim/patches/patch-ad
+++ /dev/null
@@ -1,102 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2001/02/20 11:33:53 wiz Exp $
-
---- ia64sim.c.orig	Wed Mar  8 04:54:20 2000
-+++ ia64sim.c
-@@ -98,7 +98,7 @@
-          stop(); /* Clear pending register hazzards */
-       }
-       else {
--         i1 = strtoll(first+1, &junk, 0);
-+         i1 = strtoq(first+1, &junk, 0);
-          if(*junk) {
-             printf("3syntax error\n");
-             return;
-@@ -138,7 +138,7 @@
-       }
-    }
-    else {
--      i1 = strtoll(first, &junk, 0);
-+      i1 = strtoq(first, &junk, 0);
-       if(*junk) {
-          printf("6syntax error\n");
-          return;
-@@ -159,7 +159,7 @@
-          size2 = sizeof(uint64);
-       }
-       else {
--         i2 = strtoll(second+1, &junk, 0);
-+         i2 = strtoq(second+1, &junk, 0);
-          if(*junk) {
-             printf("7syntax error\n");
-             return;
-@@ -200,7 +200,7 @@
-       }
-    }
-    else {
--      i2 = strtoll(second, &junk, 0);
-+      i2 = strtoq(second, &junk, 0);
-       if(*junk) {
-          printf("Asyntax error\n");
-          return;
-@@ -289,7 +289,7 @@
- 
-    base = strtok(NULL, tokens);
-    if(base) {
--      temp = strtoll(base, &junk, 0);
-+      temp = strtoq(base, &junk, 0);
-       if(*junk) {
-          printf("2syntax error\n");
-          return;
-@@ -355,7 +355,7 @@
-    }
-    if(!second) base = 0;
-    else {
--   base = strtoll(second, &junk, 0) & ~15;
-+   base = strtoq(second, &junk, 0) & ~15;
-    if(*junk) {
-       printf("Invalid base address\n");
-       return;
-@@ -397,7 +397,7 @@
-    }
-    if(!second) base = 0;
-    else {
--   base = strtoll(second, &junk, 0) & ~15;
-+   base = strtoq(second, &junk, 0) & ~15;
-    if(*junk) {
-       printf("Invalid base address\n");
-       return;
-@@ -436,13 +436,13 @@
-       return;
-    }
- 
--   base = strtoll(second, &junk, 0) & ~15;
-+   base = strtoq(second, &junk, 0) & ~15;
-    if(*junk) {
-       printf("Invalid base address\n");
-       return;
-    }
- 
--   module_size = strtoll(third, &junk, 0) & ~15;
-+   module_size = strtoq(third, &junk, 0) & ~15;
-    if(*junk) {
-       printf("Invalid length\n");
-       return;
-@@ -512,7 +512,7 @@
-      printf("Break point address is required\n"); 
-      return;
-    }
--   break_address = strtoll(first,&junk,0) & ~15;
-+   break_address = strtoq(first,&junk,0) & ~15;
-    if(*junk) {
-      printf("Invalid break point address\n");
-      return;
-@@ -556,6 +556,9 @@
-    while(1) {
-       printf("IA64sim>> ");
-       gets(cmd);
-+
-+      if (feof(stdin))
-+         return 0;
- 
-       nextchar = cmd;
-       while(*nextchar) *nextchar++ = tolower(*nextchar);
diff --git a/emulators/kenigma/DESCR b/emulators/kenigma/DESCR
deleted file mode 100644
index 3f5ee225b40..00000000000
--- a/emulators/kenigma/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-KEnigma is a replica of the German enigma code machine used in WW2 written in
-ruby/kde. This is an exact copy of the real machine (You could encode a
-message on a real enigma and decode it using this.)
diff --git a/emulators/kenigma/Makefile b/emulators/kenigma/Makefile
deleted file mode 100644
index ed12c2097ed..00000000000
--- a/emulators/kenigma/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2007/01/17 23:47:19 wiz Exp $
-
-DISTNAME=	28107-kenigma-1.2.1
-PKGNAME=	kenigma-1.2.1
-PKGREVISION=	1
-CATEGORIES=	emulators security
-MASTER_SITES=	http://www.kde-apps.org/content/files/
-
-MAINTAINER=	markd@NetBSD.org
-HOMEPAGE=	http://www.kde-apps.org/content/show.php?content=28107
-COMMENT=	Replica of the German enigma code machine used in WW2
-
-WRKSRC=		${WRKDIR}/kenigma
-
-NO_CONFIGURE=	yes
-USE_LANGUAGES=	# none
-
-APPDIR=		${KDEDIR}/share/kde/apps/kenigma
-
-do-build:
-	(cd ${WRKSRC}; \
-	${ECHO} "#!/bin/sh"; \
-	${ECHO} "cd ${APPDIR} && ${RUBY} main.rb") > ${WRKSRC}/kenigma
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/kenigma ${KDEDIR}/bin
-	${INSTALL_DATA} ${WRKSRC}/kenigma.desktop ${KDEDIR}/share/applications/kde
-	${INSTALL_DATA_DIR} ${APPDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.rb ${APPDIR}
-	${INSTALL_DATA} ${WRKSRC}/kenigma.dtd ${APPDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${APPDIR}
-
-
-.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../lang/ruby/buildlink3.mk"
-.include "../../x11/kdebindings-ruby/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/kenigma/PLIST b/emulators/kenigma/PLIST
deleted file mode 100644
index 5b64508c98b..00000000000
--- a/emulators/kenigma/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/10/12 12:03:28 markd Exp $
-bin/kenigma
-share/applications/kde/kenigma.desktop
-share/kde/apps/kenigma/README
-share/kde/apps/kenigma/kenigma.dtd
-share/kde/apps/kenigma/main.rb
-share/kde/apps/kenigma/options.rb
-share/kde/apps/kenigma/rotors.rb
-share/kde/apps/kenigma/stecker.rb
-share/kde/apps/kenigma/textwindow.rb
-share/kde/apps/kenigma/xmlsettings.rb
-@dirrm share/kde/apps/kenigma
diff --git a/emulators/kenigma/distinfo b/emulators/kenigma/distinfo
deleted file mode 100644
index 3e761eeafbd..00000000000
--- a/emulators/kenigma/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/10/12 12:03:28 markd Exp $
-
-SHA1 (28107-kenigma-1.2.1.tar.gz) = 7b80552ee7169c75bf9397895ccd0a8b196b7598
-RMD160 (28107-kenigma-1.2.1.tar.gz) = c0b57b913e08fa34cea05d97fe63a3cbcde0755d
-Size (28107-kenigma-1.2.1.tar.gz) = 32907 bytes
diff --git a/emulators/libspectrum/DESCR b/emulators/libspectrum/DESCR
deleted file mode 100644
index c807411d126..00000000000
--- a/emulators/libspectrum/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-libspectrum is a library designed to make the input and output of some
-ZX Spectrum emulator files slightly easier.  It is intended to be usable
-on Unix variants, Win32 and MacOSX.
diff --git a/emulators/libspectrum/Makefile b/emulators/libspectrum/Makefile
deleted file mode 100644
index 676ace310b1..00000000000
--- a/emulators/libspectrum/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2006/06/07 12:36:15 joerg Exp $
-
-DISTNAME=	libspectrum-0.2.2
-PKGREVISION=	2
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fuse-emulator/}
-
-MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://fuse-emulator.sourceforge.net/libspectrum.php
-COMMENT=	ZX Spectrum emulator file format library
-
-USE_TOOLS+=		perl pkg-config
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-
-DOCDIR=		${PREFIX}/share/doc/libspectrum
-
-post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/libspectrum.txt ${DOCDIR}
-
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/libspectrum/PLIST b/emulators/libspectrum/PLIST
deleted file mode 100644
index 4215f220f59..00000000000
--- a/emulators/libspectrum/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:30 jlam Exp $
-include/libspectrum.h
-lib/libspectrum.la
-man/man3/libspectrum.3
-share/doc/libspectrum/libspectrum.txt
-@dirrm share/doc/libspectrum
diff --git a/emulators/libspectrum/buildlink3.mk b/emulators/libspectrum/buildlink3.mk
deleted file mode 100644
index 06643914d52..00000000000
--- a/emulators/libspectrum/buildlink3.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:49 jlam Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBSPECTRUM_BUILDLINK3_MK:=	${LIBSPECTRUM_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libspectrum
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibspectrum}
-BUILDLINK_PACKAGES+=	libspectrum
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libspectrum
-
-.if !empty(LIBSPECTRUM_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libspectrum+=		libspectrum>=0.2.2
-BUILDLINK_ABI_DEPENDS.libspectrum+=	libspectrum>=0.2.2nb2
-BUILDLINK_PKGSRCDIR.libspectrum?=	../../emulators/libspectrum
-.endif	# LIBSPECTRUM_BUILDLINK3_MK
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/emulators/libspectrum/distinfo b/emulators/libspectrum/distinfo
deleted file mode 100644
index 4fc41f87476..00000000000
--- a/emulators/libspectrum/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 18:49:19 agc Exp $
-
-SHA1 (libspectrum-0.2.2.tar.gz) = 09217bfa89c2778c71a93bc1c0aea0604ed6e0f0
-RMD160 (libspectrum-0.2.2.tar.gz) = b28bfbcae5e70d228436e16eb2f795611a42964c
-Size (libspectrum-0.2.2.tar.gz) = 386960 bytes
diff --git a/emulators/linuxppc_lib/DESCR b/emulators/linuxppc_lib/DESCR
deleted file mode 100644
index 36175e17af1..00000000000
--- a/emulators/linuxppc_lib/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-These libraries are part of the Linux compatibility options
-for NetBSD/powerpc.
-
-The kernel option `COMPAT_LINUX' needs to be in your kernel config
-file for this to work as well.
diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile
deleted file mode 100644
index c470209a334..00000000000
--- a/emulators/linuxppc_lib/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-# $NetBSD: Makefile,v 1.29 2006/11/19 08:03:05 wiz Exp $
-
-DISTNAME=		linuxppc_lib-2000.4.6
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-RPMFILES=	glibc-2.1.3-15f.ppc.rpm glib-1.2.8-3.ppc.rpm \
-		libjpeg-6b-13.ppc.rpm libpng-1.0.5-3.ppc.rpm \
-		libstdc++-2.10.0-2n.ppc.rpm libtermcap-2.0.8-20.ppc.rpm \
-		libtiff-3.5.5-2.ppc.rpm XFree86-libs-3.3.6-20b.ppc.rpm \
-		zlib-1.1.3-6.ppc.rpm ldconfig-1.9.5-16.ppc.rpm \
-		libjpeg6a-6a-5.ppc.rpm xpm-3.4k-1.ppc.rpm \
-		ncurses-5.0-12.ppc.rpm readline-2.2.1-7a.ppc.rpm
-DISTFILES+=	${RPMFILES}
-DISTFILES+=	openmotif-2.1.30-3_MLI_jdk.tar.gz
-
-MAINTAINER=		manu@NetBSD.org
-COMMENT=		Libraries to run Linux binaries on NetBSD/powerpc (includes X11)
-
-BUILD_DEPENDS+=		rpm2pkg>=1.2:../../pkgtools/rpm2pkg
-
-CONFLICTS=		suse_base-[0-9]*
-
-ONLY_FOR_PLATFORM=	NetBSD-1.5[U-Z]-powerpc NetBSD-1.5Z[A-Z]-powerpc \
-			NetBSD-1.6*-powerpc NetBSD-[2-9]*-powerpc
-
-WRKSRC=			${WRKDIR}/${DISTNAME}
-CHECK_SHLIBS_SUPPORTED=	no
-DIST_SUBDIR=		linuxppc_lib
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-USE_TOOLS+=		gtar
-
-EMUL_LINUX=		emul/linux
-LINUX_LDCONFIG=		${PREFIX}/${EMUL_LINUX}/sbin/ldconfig
-RPM2PKG=		rpm2pkg
-SORT=			sort
-RPMARGS+=		-i usr/man -i usr/doc -i usr/info
-.for TEMP in ${RPMFILES}
-RPMARGS+=		${DISTDIR}/${DIST_SUBDIR}/${TEMP}
-.endfor
-
-do-extract:
-	${MKDIR} ${WRKSRC}
-
-do-build:	#do nothing
-
-do-install:
-	${RM} -f ${WRKDIR}/PLIST_DYNAMIC
-	${INSTALL_DATA_DIR} ${PREFIX}/${EMUL_LINUX}
-	${INSTALL_DATA_DIR} /${EMUL_LINUX}
-	${RPM2PKG} -d ${PREFIX} -f ${WRKDIR}/PLIST_DYNAMIC -p emul/linux ${RPMARGS}
-
-	# Fix Linux's ldd paths (ldd is a shell script on Linux)
-	${SED} 's|^\(TEXTDOMAINDIR=\)\(/usr/share/locale\)|\1${PREFIX}/${EMUL_LINUX}\2|; \
-		s|^\(RTLD=\)\(/lib/ld.so.1\)|\1${PREFIX}/${EMUL_LINUX}\2|' \
-		${PREFIX}/${EMUL_LINUX}/usr/bin/ldd > \
-		${PREFIX}/${EMUL_LINUX}/usr/bin/ldd.new
-	${MV} ${PREFIX}/${EMUL_LINUX}/usr/bin/ldd.new \
-	    ${PREFIX}/${EMUL_LINUX}/usr/bin/ldd
-	${CHMOD} 755 ${PREFIX}/${EMUL_LINUX}/usr/bin/ldd
-
-	# Unpack shared libraries for OpenMotif
-	cd ${PREFIX}/${EMUL_LINUX}/usr/X11R6 ; ${GTAR} -x 'lib/*.so*' \
-	    -zvf ${DISTDIR}/${DIST_SUBDIR}/openmotif-2.1.30-3_MLI_jdk.tar.gz | \
-	    ${SED} -e "s|^|${EMUL_LINUX}/usr/X11R6/|" >> ${WRKDIR}/PLIST_DYNAMIC
-
-	# Make the link /usr/pkg/emul/linux -> /emul/linux
-	${TEST} -f /emul/linux/lib/ld.so.1 || ( ${RMDIR} /${EMUL_LINUX} && \
-	    ${LN} -sf ${PREFIX}/${EMUL_LINUX} /${EMUL_LINUX} )
-
-	# Create ld.so.conf and ld.so.cache. (uses Linux's ldconfig)
-	${TOUCH} ${PREFIX}/${EMUL_LINUX}/etc/ld.so.cache~
-	${CP} ${FILESDIR}/ld.so.conf ${PREFIX}/${EMUL_LINUX}/etc/ld.so.conf
-	${LINUX_LDCONFIG} -r ${PREFIX}/${EMUL_LINUX} -v | \
-		${SED} -n '/^\/.*:$$/h; /(changed)$$/{G; \
-		s|[[:blank:]]\([^ ]\{1,\}\) =>.*\n/\(.*\):$$|${EMUL_LINUX}/\2/\1|p;}' \
-		>> ${WRKDIR}/PLIST_DYNAMIC
-	${ECHO} "${EMUL_LINUX}/etc/ld.so.conf" >> ${WRKDIR}/PLIST_DYNAMIC
-	${SORT} -r ${WRKDIR}/PLIST_DYNAMIC > ${WRKDIR}/PLIST_DYNAMIC.sorted
-	${MV} ${WRKDIR}/PLIST_DYNAMIC.sorted ${WRKDIR}/PLIST_DYNAMIC
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/linuxppc_lib/distinfo b/emulators/linuxppc_lib/distinfo
deleted file mode 100644
index 04664f01a67..00000000000
--- a/emulators/linuxppc_lib/distinfo
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 18:49:19 agc Exp $
-
-SHA1 (linuxppc_lib/glibc-2.1.3-15f.ppc.rpm) = 8a73a18041c6b1f41556dc974752dab55f2e125c
-RMD160 (linuxppc_lib/glibc-2.1.3-15f.ppc.rpm) = 7b6a7e784d9aac080abfaa83b3ef2665fd749da0
-Size (linuxppc_lib/glibc-2.1.3-15f.ppc.rpm) = 9503167 bytes
-SHA1 (linuxppc_lib/glib-1.2.8-3.ppc.rpm) = f067429860346dafb3c348eed8d59d370feb671b
-RMD160 (linuxppc_lib/glib-1.2.8-3.ppc.rpm) = d67d41fd8a72a19dd077995d5d6129eb5f9877e1
-Size (linuxppc_lib/glib-1.2.8-3.ppc.rpm) = 142829 bytes
-SHA1 (linuxppc_lib/libjpeg-6b-13.ppc.rpm) = a6b91fcc3348bb6625a70c843478d73dc2032e41
-RMD160 (linuxppc_lib/libjpeg-6b-13.ppc.rpm) = 8454c628897a303eeb1b5500352855555590bb48
-Size (linuxppc_lib/libjpeg-6b-13.ppc.rpm) = 125558 bytes
-SHA1 (linuxppc_lib/libpng-1.0.5-3.ppc.rpm) = 92a88a28142bf0698c3a71f82d40ebf86b8d97dc
-RMD160 (linuxppc_lib/libpng-1.0.5-3.ppc.rpm) = f1a15dda95fca48d0bb05807c6dab5e52d8fbaeb
-Size (linuxppc_lib/libpng-1.0.5-3.ppc.rpm) = 116067 bytes
-SHA1 (linuxppc_lib/libstdc++-2.10.0-2n.ppc.rpm) = a8cb630e24a180a0c2fce1fa13e444dab9660fc3
-RMD160 (linuxppc_lib/libstdc++-2.10.0-2n.ppc.rpm) = a63fa3107f393a10e9881d0fc46ea49fe382d2c7
-Size (linuxppc_lib/libstdc++-2.10.0-2n.ppc.rpm) = 1110869 bytes
-SHA1 (linuxppc_lib/libtermcap-2.0.8-20.ppc.rpm) = 84673baa788a90c00ce4a6f52a5bcba80cf9a19c
-RMD160 (linuxppc_lib/libtermcap-2.0.8-20.ppc.rpm) = d0437e1b8598d02f3c5630fb4faf2ede17a61d76
-Size (linuxppc_lib/libtermcap-2.0.8-20.ppc.rpm) = 57125 bytes
-SHA1 (linuxppc_lib/libtiff-3.5.5-2.ppc.rpm) = d406ae6353300a0b21c01282a5d2148c63ec05aa
-RMD160 (linuxppc_lib/libtiff-3.5.5-2.ppc.rpm) = 483c61188a6cd2e7aeaf11c14fac87072585456e
-Size (linuxppc_lib/libtiff-3.5.5-2.ppc.rpm) = 204823 bytes
-SHA1 (linuxppc_lib/XFree86-libs-3.3.6-20b.ppc.rpm) = 3ed6da7dca7b4fc5ac81acbbbefd0ccfd7b8472a
-RMD160 (linuxppc_lib/XFree86-libs-3.3.6-20b.ppc.rpm) = d91efda504df84ceeeebd01be4e332638904b3b2
-Size (linuxppc_lib/XFree86-libs-3.3.6-20b.ppc.rpm) = 939474 bytes
-SHA1 (linuxppc_lib/zlib-1.1.3-6.ppc.rpm) = 9a813540e080c5c621b2abb0ada4f48ea274bf09
-RMD160 (linuxppc_lib/zlib-1.1.3-6.ppc.rpm) = 0da794b1ee885717ff541ffc562c012156c42d42
-Size (linuxppc_lib/zlib-1.1.3-6.ppc.rpm) = 30894 bytes
-SHA1 (linuxppc_lib/ldconfig-1.9.5-16.ppc.rpm) = 785b2e72bc8cc51ddded7f746f1e4712aeca773b
-RMD160 (linuxppc_lib/ldconfig-1.9.5-16.ppc.rpm) = a92546b1b4d990f7a91743cf79fee7ca415b5bd2
-Size (linuxppc_lib/ldconfig-1.9.5-16.ppc.rpm) = 124309 bytes
-SHA1 (linuxppc_lib/libjpeg6a-6a-5.ppc.rpm) = 633da2a887d03c43acb7ddf9d66b6139c240cccd
-RMD160 (linuxppc_lib/libjpeg6a-6a-5.ppc.rpm) = 39da6439cd0058cfa7184d3b420d3e7fe57f0c11
-Size (linuxppc_lib/libjpeg6a-6a-5.ppc.rpm) = 62388 bytes
-SHA1 (linuxppc_lib/xpm-3.4k-1.ppc.rpm) = 94e080372f65d3dc91570175334d43273e1c216a
-RMD160 (linuxppc_lib/xpm-3.4k-1.ppc.rpm) = e66c42fc168a9b7ea2e388e6505d78d2f758a42f
-Size (linuxppc_lib/xpm-3.4k-1.ppc.rpm) = 73072 bytes
-SHA1 (linuxppc_lib/ncurses-5.0-12.ppc.rpm) = 1d5863dfc29473472bda89d237bafd84de602df4
-RMD160 (linuxppc_lib/ncurses-5.0-12.ppc.rpm) = 987b45dec71db60bbdefddb45aabfeb6dc8c8fa7
-Size (linuxppc_lib/ncurses-5.0-12.ppc.rpm) = 808456 bytes
-SHA1 (linuxppc_lib/readline-2.2.1-7a.ppc.rpm) = 29458422f6991affc2d88c5eba9c0f7f2c9d796b
-RMD160 (linuxppc_lib/readline-2.2.1-7a.ppc.rpm) = 91b32ac137fd03353931fa1768a917430a026c73
-Size (linuxppc_lib/readline-2.2.1-7a.ppc.rpm) = 145051 bytes
-SHA1 (linuxppc_lib/openmotif-2.1.30-3_MLI_jdk.tar.gz) = b9af158b947829d0bbe2831842ff4f4b4a7313a0
-RMD160 (linuxppc_lib/openmotif-2.1.30-3_MLI_jdk.tar.gz) = d6aea78941bbffc662c6d540908e3fbf986f684c
-Size (linuxppc_lib/openmotif-2.1.30-3_MLI_jdk.tar.gz) = 2631074 bytes
-SHA1 (patch-aa) = 04840c534103f659fce4c00b5a6d63f79e03bf08
diff --git a/emulators/linuxppc_lib/files/ld.so.conf b/emulators/linuxppc_lib/files/ld.so.conf
deleted file mode 100644
index eb2ad0fd4f7..00000000000
--- a/emulators/linuxppc_lib/files/ld.so.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-/lib
-/usr/lib
-/usr/X11R6/lib
diff --git a/emulators/linuxppc_lib/patches/patch-aa b/emulators/linuxppc_lib/patches/patch-aa
deleted file mode 100644
index d9934bc5e88..00000000000
--- a/emulators/linuxppc_lib/patches/patch-aa
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/01/23 22:29:48 manu Exp $
---- etc/ld.so.conf.orig	Sun Jan 14 22:29:50 2001
-+++ etc/ld.so.conf	Sun Jan 14 22:30:05 2001
-@@ -0,0 +1,4 @@
-+/lib
-+/usr/lib
-+/usr/local/lib
-+/usr/X11R6/lib
diff --git a/emulators/lrmi/DESCR b/emulators/lrmi/DESCR
deleted file mode 100644
index 5c6acd0589c..00000000000
--- a/emulators/lrmi/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-LRMI is a library for calling real mode BIOS routines under Linux.
diff --git a/emulators/lrmi/Makefile b/emulators/lrmi/Makefile
deleted file mode 100644
index a579fcca821..00000000000
--- a/emulators/lrmi/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/09/09 02:41:59 obache Exp $
-#
-
-DISTNAME=		lrmi-0.8
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=lrmi/}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://sourceforge.net/projects/lrmi/
-COMMENT=		Wrapper to the i386 vm86 mode
-
-ONLY_FOR_PLATFORM=	*-*-i386
-NOT_FOR_PLATFORM+=	Interix-*-* # cannot call real mode from Windows
-
-MAKE_FILE=		Makefile.bsd
-INSTALLATION_DIRS=	bin include lib
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/vbe.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/lrmi.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/liblrmi.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/liblrmi.so ${PREFIX}/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/vbetest ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/lrmi/PLIST b/emulators/lrmi/PLIST
deleted file mode 100644
index f648ea7911c..00000000000
--- a/emulators/lrmi/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/04/05 10:41:28 wiz Exp $
-bin/vbetest
-include/lrmi.h
-include/vbe.h
-lib/liblrmi.a
-lib/liblrmi.so
diff --git a/emulators/lrmi/buildlink3.mk b/emulators/lrmi/buildlink3.mk
deleted file mode 100644
index 5465677d726..00000000000
--- a/emulators/lrmi/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:49 jlam Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LRMI_BUILDLINK3_MK:=	${LRMI_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	lrmi
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlrmi}
-BUILDLINK_PACKAGES+=	lrmi
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lrmi
-
-.if !empty(LRMI_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.lrmi+=	lrmi>=0.8nb1
-BUILDLINK_PKGSRCDIR.lrmi?=	../../emulators/lrmi
-.endif	# LRMI_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/emulators/lrmi/distinfo b/emulators/lrmi/distinfo
deleted file mode 100644
index ff4f3cd5cb6..00000000000
--- a/emulators/lrmi/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/12/09 10:56:47 joerg Exp $
-
-SHA1 (lrmi-0.8.tar.gz) = e01ba74b5343551b8d717c2fa9c365cb11d1ab48
-RMD160 (lrmi-0.8.tar.gz) = 680c7f7e6599f71b942edef10846991e1c1ce14b
-Size (lrmi-0.8.tar.gz) = 9347 bytes
-SHA1 (patch-aa) = 1505e0095b79f0e3b7a601adb07541ede68ee15b
-SHA1 (patch-ab) = c7c63c4d69e842736e430960a4efe23eef776e86
-SHA1 (patch-ac) = 16174abce6d5959e0bd0bdbf28c573ccb1e1445e
diff --git a/emulators/lrmi/patches/patch-aa b/emulators/lrmi/patches/patch-aa
deleted file mode 100644
index e16f2f5e55f..00000000000
--- a/emulators/lrmi/patches/patch-aa
+++ /dev/null
@@ -1,197 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/12/09 10:56:47 joerg Exp $
-
---- lrmi.c.orig	2003-05-14 03:18:12.000000000 +0000
-+++ lrmi.c
-@@ -23,7 +23,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WI
- OTHER DEALINGS IN THE SOFTWARE.
- */
- 
--#if (defined(__linux__) || defined(__NetBSD__) || defined(__FreeBSD__)) && \
-+#if (defined(__linux__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)) && \
- 	defined(__i386__)
- 
- #include <stdio.h>
-@@ -37,7 +37,7 @@ OTHER DEALINGS IN THE SOFTWARE.
- #include <sys/vm86.h>
- #endif
- 
--#elif defined(__NetBSD__) || defined(__FreeBSD__)
-+#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
- 
- #include <sys/param.h>
- #include <signal.h>
-@@ -203,7 +203,7 @@ LRMI_free_real(void *m)
- 
- #if defined(__linux__)
- #define DEFAULT_VM86_FLAGS 	(IF_MASK | IOPL_MASK)
--#elif defined(__NetBSD__) || defined(__FreeBSD__)
-+#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
- #define DEFAULT_VM86_FLAGS  (PSL_I | PSL_IOPL)
- #define TF_MASK         PSL_T
- #define VIF_MASK        PSL_VIF
-@@ -211,13 +211,27 @@ LRMI_free_real(void *m)
- #define DEFAULT_STACK_SIZE 	0x1000
- #define RETURN_TO_32_INT 	255
- 
-+#if defined(__NetBSD__) && defined(SA_SIGINFO)
-+struct gregset_overlay {
-+	int gs, fs, es, ds;
-+	int edi, esi, ebp, esp, ebx, edx, ecx, eax;
-+	int _trapno, _err;
-+	int eip, cs, eflags, uesp, ss;
-+};
-+#endif
-+
- #if defined(__linux__)
- #define CONTEXT_REGS	context.vm.regs
- #define REG(x)			x
- #elif defined(__NetBSD__)
-+#if defined(SA_SIGINFO)
-+#define CONTEXT_REGS	(*(struct gregset_overlay *)&context.vm.substr.regs)
-+#define REG(x)		x
-+#else
- #define CONTEXT_REGS	context.vm.substr.regs
- #define REG(x)			vmsc.sc_ ## x
--#elif defined(__FreeBSD__)
-+#endif /* SA_SIGINFO */
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- #define CONTEXT_REGS	context.vm.uc
- #define REG(x)			uc_mcontext.mc_ ## x
- #endif
-@@ -228,16 +242,17 @@ static struct {
- 	unsigned short stack_seg, stack_off;
- #if defined(__linux__) || defined(__NetBSD__)
- 	struct vm86_struct vm;
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 	struct {
- 		struct vm86_init_args init;
- 		ucontext_t uc;
- 	} vm;
- #endif
--#if defined(__NetBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
- 	int success;
- 	jmp_buf env;
--	void *old_sighandler;
-+	struct sigaction old_sighandler;
-+	int sh_installed;
- 	int vret;
- #endif
- } context = { 0 };
-@@ -354,7 +369,7 @@ LRMI_init(void)
- 	set_bit(RETURN_TO_32_INT, &context.vm.int_revectored);
- #elif defined(__NetBSD__)
- 	set_bit(RETURN_TO_32_INT, &context.vm.int_byuser);
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 	set_bit(RETURN_TO_32_INT, &context.vm.init.int_map);
- #endif
- 
-@@ -805,13 +820,25 @@ run_vm86(void)
- 
- 	return 0;
- }
--#elif defined(__NetBSD__) || defined(__FreeBSD__)
-+#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
- #if defined(__NetBSD__)
- static void
--vm86_callback(int sig, int code, struct sigcontext *sc)
-+vm86_callback(int sig,
-+#if defined(SA_SIGINFO)
-+	      siginfo_t *info, void *vctx
-+#else
-+	      int code, struct sigcontext *sc
-+#endif
-+	      )
- {
- 	/* Sync our context with what the kernel develivered to us. */
-+#if defined(SA_SIGINFO)
-+	int code = info->si_trap;
-+	ucontext_t *ctx = vctx;
-+	memcpy(&CONTEXT_REGS, &ctx->uc_mcontext.__gregs, sizeof(CONTEXT_REGS));
-+#else
- 	memcpy(&CONTEXT_REGS, sc, sizeof(*sc));
-+#endif
- 
- 	switch (VM86_TYPE(code)) {
- 		case VM86_INTx:
-@@ -850,9 +877,13 @@ vm86_callback(int sig, int code, struct 
- 	}
- 
- 	/* ...and sync our context back to the kernel. */
-+#if defined(SA_SIGINFO)
-+	memcpy(&ctx->uc_mcontext.__gregs, &CONTEXT_REGS, sizeof(CONTEXT_REGS));
-+#else
- 	memcpy(sc, &CONTEXT_REGS, sizeof(*sc));
-+#endif
- }
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- static void
- vm86_callback(int sig, int code, struct sigcontext *sc)
- {
-@@ -899,34 +930,44 @@ vm86_callback(int sig, int code, struct 
- static int
- run_vm86(void)
- {
--	if (context.old_sighandler) {
-+	struct sigaction sa;
-+	int res;
-+
-+	if (context.sh_installed) {
- #ifdef LRMI_DEBUG
- 		fprintf(stderr, "run_vm86: callback already installed\n");
- #endif
- 		return (0);
- 	}
- 
-+	memset(&sa, 0, sizeof(sa));
-+#if defined(__NetBSD__) && defined(SA_SIGINFO)
-+	sa.sa_sigaction = vm86_callback;
-+	sa.sa_flags = SA_SIGINFO;
-+#else
-+	sa.sa_handler = (void (*)(int))vm86_callback;
-+#endif
- #if defined(__NetBSD__)
--	context.old_sighandler = signal(SIGURG, (void (*)(int))vm86_callback);
--#elif defined(__FreeBSD__)
--	context.old_sighandler = signal(SIGBUS, (void (*)(int))vm86_callback);
-+	res = sigaction(SIGURG, &sa, &context.old_sighandler);
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+	res = sigaction(SIGBUS, &sa, &context.old_sighandler);
- #endif
- 
--	if (context.old_sighandler == (void *)-1) {
--		context.old_sighandler = NULL;
-+	if (res < 0) {
- #ifdef LRMI_DEBUG
- 		fprintf(stderr, "run_vm86: cannot install callback\n");
- #endif
- 		return (0);
- 	}
-+	context.sh_installed = 1;
- 
- 	if (setjmp(context.env)) {
- #if defined(__NetBSD__)
--		(void) signal(SIGURG, context.old_sighandler);
--#elif defined(__FreeBSD__)
--		(void) signal(SIGBUS, context.old_sighandler);
-+		sigaction(SIGURG, &context.old_sighandler, 0);
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+		sigaction(SIGBUS, &context.old_sighandler, 0);
- #endif
--		context.old_sighandler = NULL;
-+		context.sh_installed = 0;
- 
- 		if (context.success)
- 			return (1);
-@@ -937,7 +978,7 @@ run_vm86(void)
- #if defined(__NetBSD__)
- 	if (i386_vm86(&context.vm) == -1)
- 		return (0);
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 	if (i386_vm86(VM86_INIT, &context.vm.init))
- 		return 0;
- 
diff --git a/emulators/lrmi/patches/patch-ab b/emulators/lrmi/patches/patch-ab
deleted file mode 100644
index 67e6e8fcf05..00000000000
--- a/emulators/lrmi/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/12/09 10:56:47 joerg Exp $
-
---- vbetest.c.orig	2005-12-09 10:46:56.000000000 +0000
-+++ vbetest.c
-@@ -17,7 +17,7 @@ This program is in the public domain.
- #include <time.h>
- #include <dev/wscons/wsconsio.h>
- #include <machine/sysarch.h>
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- #include <machine/console.h>
- #include <machine/sysarch.h>
- #endif
diff --git a/emulators/lrmi/patches/patch-ac b/emulators/lrmi/patches/patch-ac
deleted file mode 100644
index c329f25b3e0..00000000000
--- a/emulators/lrmi/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/12/09 10:56:47 joerg Exp $
-
---- lrmi.h.orig	2005-12-09 10:49:30.000000000 +0000
-+++ lrmi.h
-@@ -26,7 +26,7 @@ OTHER DEALINGS IN THE SOFTWARE.
- #ifndef LRMI_H
- #define LRMI_H
- 
--#if (defined(__linux__) || defined(__NetBSD__) || defined(__FreeBSD__)) && \
-+#if (defined(__linux__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)) && \
- 	defined(__i386__)
- 
- 
diff --git a/emulators/m1/DESCR b/emulators/m1/DESCR
deleted file mode 100644
index a44b7dbec98..00000000000
--- a/emulators/m1/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-M1 is an arcade video and pinball game sound emulator by R. Belmont.
-The emulator is available for both Windows and Linux and features
-full stereo sound at sample rates up to 48000 Hz. Over 1000 games
-are supported.
-
-This package contains the Linux binary.
diff --git a/emulators/m1/Makefile b/emulators/m1/Makefile
deleted file mode 100644
index 9758c7eca94..00000000000
--- a/emulators/m1/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2006/06/15 13:31:28 wiz Exp $
-#
-
-DISTNAME=	m1074b2-lnx
-PKGNAME=	m1-0.7.4c
-PKGREVISION=	2
-CATEGORIES=	emulators audio
-MASTER_SITES=	http://www.emuhype.com/files/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.emuhype.com/index.phtml?s=misc&ss=index
-COMMENT=	Arcade video and pinball game sound emulator (Linux binary)
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_compat>=6.4:../../emulators/${SUSE_DIR_PREFIX}_compat
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-WRKSRC=		${WRKDIR}/m1-0.7.4
-NO_BUILD=	yes
-
-INSTALLATION_DIRS=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/m1 ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/m1
-	${INSTALL_DATA} ${WRKSRC}/m1.txt ${PREFIX}/share/doc/m1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/m1
-	${INSTALL_DATA} ${WRKSRC}/m1.ini ${PREFIX}/share/examples/m1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/m1/PLIST b/emulators/m1/PLIST
deleted file mode 100644
index 06f6c1099e2..00000000000
--- a/emulators/m1/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/29 23:19:48 wiz Exp $
-bin/m1
-share/doc/m1/m1.txt
-share/examples/m1/m1.ini
-@dirrm share/examples/m1
-@dirrm share/doc/m1
diff --git a/emulators/m1/distinfo b/emulators/m1/distinfo
deleted file mode 100644
index 68cf53db700..00000000000
--- a/emulators/m1/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:19 agc Exp $
-
-SHA1 (m1074b2-lnx.tar.bz2) = 842ec3a3f5b56fe3352d06e169af58d2ab9b3690
-RMD160 (m1074b2-lnx.tar.bz2) = 4247a7f4db7eafb7331e82335502c2ab43b7742d
-Size (m1074b2-lnx.tar.bz2) = 705948 bytes
diff --git a/emulators/makeppf/DESCR b/emulators/makeppf/DESCR
deleted file mode 100644
index 7044a7e95ea..00000000000
--- a/emulators/makeppf/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-PPF (PlayStation Patch File) is a tool dedicated to all PlayStation
-coders and developers out there who are creating PAL/NTSC patches,
-trainer options and even cracks for your favourite console system.
-With the files in the PPF package you are in the position to make
-patchfiles similar to IPS on SuperNES.
-
-This package contains a tool to create PPF patches.
diff --git a/emulators/makeppf/Makefile b/emulators/makeppf/Makefile
deleted file mode 100644
index d96d2bc4879..00000000000
--- a/emulators/makeppf/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/18 20:01:28 wiz Exp $
-#
-
-DISTNAME=	makeppf3_src
-PKGNAME=	makeppf-3.0
-CATEGORIES=	emulators
-MASTER_SITES=	http://www.paradogs.com/download/
-EXTRACT_SUFX=	.zip
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.paradogs.com/download/
-COMMENT=	PPF (Playstation Patch File) v3.0 creation tool
-
-WRKSRC=	${WRKDIR}
-
-do-build:
-	cd ${BUILD_DIRS} && ${CC} ${CPPFLAGS} ${CFLAGS} \
-		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
-		-D_LARGEFILE64_SOURCE -o makeppf makeppf3_linux.c
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/makeppf ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/makeppf/PLIST b/emulators/makeppf/PLIST
deleted file mode 100644
index b7022188e5e..00000000000
--- a/emulators/makeppf/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/18 20:01:28 wiz Exp $
-bin/makeppf
diff --git a/emulators/makeppf/distinfo b/emulators/makeppf/distinfo
deleted file mode 100644
index f3240a9213e..00000000000
--- a/emulators/makeppf/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/18 20:01:28 wiz Exp $
-
-SHA1 (makeppf3_src.zip) = ae6abcd6a7973345f57f3fa8cfbd0ef651b24491
-RMD160 (makeppf3_src.zip) = 884c030c6f550c66836d0feb7f2573b73eaeb5e0
-Size (makeppf3_src.zip) = 7780 bytes
-SHA1 (patch-aa) = c5887ce56bbc17a9fb67548698a0827ae79a94f7
diff --git a/emulators/makeppf/patches/patch-aa b/emulators/makeppf/patches/patch-aa
deleted file mode 100644
index 439ab2b130f..00000000000
--- a/emulators/makeppf/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/03/18 20:01:28 wiz Exp $
-
---- makeppf3_linux.c.orig	2001-11-26 16:48:30.000000000 +0000
-+++ makeppf3_linux.c
-@@ -20,7 +20,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
--#if defined(__APPLE__) || defined (MACOSX)
-+#if !defined(__linux__)
- 
- //////////////////////////////////////////////////////////////////////
- // fseeko is already 64 bit for Darwin/MacOS X!
-@@ -40,7 +40,7 @@
- 
- typedef	off_t			__off64_t;
- 
--#endif /* __APPLE__ || MACOSX */
-+#endif /* __linux__ */
- 
- //////////////////////////////////////////////////////////////////////
- // Macros for little to big Endian conversion.
diff --git a/emulators/minivmac/DESCR b/emulators/minivmac/DESCR
deleted file mode 100644
index 3c33bc3d85e..00000000000
--- a/emulators/minivmac/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Mini vMac is a minor spin off of the program vMac.  Its goal is to
-provide the simplest usable emulation of a Macintosh, instead of the
-fastest or most usable emulation.  It can serve as a programmers
-introduction to vMac, having only about one tenth as much source code.
diff --git a/emulators/minivmac/Makefile b/emulators/minivmac/Makefile
deleted file mode 100644
index 21194a538c5..00000000000
--- a/emulators/minivmac/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/02/19 18:24:54 joerg Exp $
-
-DISTNAME=	minivmac-0.1.7.src
-PKGNAME=	minivmac-0.1.7
-PKGREVISION=	2
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=minivmac/}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	kei@NetBSD.org
-HOMEPAGE=	http://minivmac.sourceforge.net/
-COMMENT=	Miniature Macintosh emulator
-
-WRKSRC=		${WRKDIR}/minivmac
-
-SCRIPTS_ENV+=	CC="${CC}"
-
-DOCDIR=		${PREFIX}/share/doc/html/minivmac
-
-INSTALLATION_DIRS=	bin
-
-do-build:
-	cd ${WRKSRC}/tool/bash; ${SETENV} ${SCRIPTS_ENV} ${SH} build
-
-do-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/drv/minivmac ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCDIR}
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/minivmac/PLIST b/emulators/minivmac/PLIST
deleted file mode 100644
index 0fe37c9b2a4..00000000000
--- a/emulators/minivmac/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/05/18 13:55:28 jmc Exp $
-bin/minivmac
-share/doc/html/minivmac/about.html
-share/doc/html/minivmac/build.html
-share/doc/html/minivmac/credits.html
-share/doc/html/minivmac/license.html
-share/doc/html/minivmac/todo.html
-share/doc/html/minivmac/autoquit.html
-share/doc/html/minivmac/contents.html
-share/doc/html/minivmac/default.html
-share/doc/html/minivmac/manual.html
-@dirrm share/doc/html/minivmac
diff --git a/emulators/minivmac/distinfo b/emulators/minivmac/distinfo
deleted file mode 100644
index e149c478501..00000000000
--- a/emulators/minivmac/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:19 agc Exp $
-
-SHA1 (minivmac-0.1.7.src.tgz) = 761b56ec9d4dbc2a3b200dd40a9c44b93913e308
-RMD160 (minivmac-0.1.7.src.tgz) = 132ddc014d74f0c60be5357f69f4528f0c86db97
-Size (minivmac-0.1.7.src.tgz) = 93155 bytes
-SHA1 (patch-aa) = c1f992d7277edb53c88d6b973cfe1046c5633434
diff --git a/emulators/minivmac/patches/patch-aa b/emulators/minivmac/patches/patch-aa
deleted file mode 100644
index aa56bda2f8b..00000000000
--- a/emulators/minivmac/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/15 12:39:12 kei Exp $
-
---- tool/bash/build.orig	Thu Jul 18 03:09:52 2002
-+++ tool/bash/build	Mon Oct 14 03:49:09 2002
-@@ -32,17 +32,17 @@
- 
- # what compiler to use and what options
- 
--CallC="gcc -c"
-+CallC="${CC} -c -I${X11BASE}/include"
- CallC="${CallC} -Wall -Wmissing-prototypes -Wstrict-prototypes"
- CallC="${CallC} -O3"
- 
- # what linker to use and what options
- 
--LinkLine="gcc"
-+LinkLine="${CC}"
- 
- # what libraries to link with
- 
--LinkLibs="-L/usr/X11R6/lib -lXext -lX11"
-+LinkLibs="-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXext -lX11"
- 
- # set this to 1 for more speed if you have a PowerPC computer,
- # or other processor with big endian addressing that can
diff --git a/emulators/mmix/DESCR b/emulators/mmix/DESCR
deleted file mode 100644
index 0b2a9c4dcfc..00000000000
--- a/emulators/mmix/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Simulators for MMIX, a RISC machine designed by Professor Donald Knuth
-to replace MIX in the ultimate editions of his monumental opus
-``The Art of Computer Programming''.
-
-The programs are described in
-
-  MMIXware by Donald E. Knuth
-  Lecture Notes in Computer Science 1750 (Springer Verlag, Heidelberg, 1999).
diff --git a/emulators/mmix/Makefile b/emulators/mmix/Makefile
deleted file mode 100644
index 67ddb33ffe9..00000000000
--- a/emulators/mmix/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2007/03/15 05:00:13 dbj Exp $
-
-DISTNAME=	mmix-20060918
-CATEGORIES=	emulators devel lang
-MASTER_SITES=	http://www-cs-faculty.stanford.edu/~knuth/programs/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www-cs-faculty.stanford.edu/~knuth/mmix.html
-COMMENT=	Simulators for Knuth's MMIX RISC architecture
-
-TEX_DEPMETHOD=	build
-TEX_ACCEPTED=	teTeX3
-
-WRKSRC=		${WRKDIR}
-BUILD_TARGET=	all doc
-
-INSTALLATION_DIRS=	bin
-
-.include "../../mk/tex.buildlink3.mk"
-
-do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} abstime mmix mmixal 		\
-		mmmix mmotype ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mmix
-	cd ${WRKSRC} && ${INSTALL_DATA} README *.ps 			\
-		${PREFIX}/share/doc/mmix
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mmix
-	cd ${WRKSRC} && ${INSTALL_DATA} *.mms *.mmix *.mmconfig 	\
-		${PREFIX}/share/examples/mmix
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/mmix/PLIST b/emulators/mmix/PLIST
deleted file mode 100644
index 8dd1b0e200c..00000000000
--- a/emulators/mmix/PLIST
+++ /dev/null
@@ -1,70 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/03/15 05:00:14 dbj Exp $
-bin/abstime
-bin/mmix
-bin/mmixal
-bin/mmmix
-bin/mmotype
-share/doc/mmix/README
-share/doc/mmix/mmix-doc.ps
-share/doc/mmix/mmix-sim-intro.ps
-share/doc/mmix/mmixal-intro.ps
-share/examples/mmix/coolcomb.mms
-share/examples/mmix/copy.mms
-share/examples/mmix/cp.mms
-share/examples/mmix/crypto.mms
-share/examples/mmix/crypto1.mms
-share/examples/mmix/crypto2.mms
-share/examples/mmix/deluxe.mmconfig
-share/examples/mmix/echo.mms
-share/examples/mmix/fftswap.mms
-share/examples/mmix/fib.mms
-share/examples/mmix/fibgo.mms
-share/examples/mmix/fibsub.mms
-share/examples/mmix/halves.mmix
-share/examples/mmix/halves.mms
-share/examples/mmix/harm.mms
-share/examples/mmix/hello.mms
-share/examples/mmix/hptest.mms
-share/examples/mmix/inout.mms
-share/examples/mmix/iotest.mms
-share/examples/mmix/iotest1.mms
-share/examples/mmix/iotest2.mms
-share/examples/mmix/number1.mms
-share/examples/mmix/permu-heap.mms
-share/examples/mmix/permu-langdon.mms
-share/examples/mmix/permu-plain.mms
-share/examples/mmix/permu-st.mms
-share/examples/mmix/phi.mms
-share/examples/mmix/plain.mmconfig
-share/examples/mmix/popup.mms
-share/examples/mmix/primes.mmconfig
-share/examples/mmix/primes.mmix
-share/examples/mmix/primes.mms
-share/examples/mmix/primes6.mms
-share/examples/mmix/primesf.mms
-share/examples/mmix/primesfx.mms
-share/examples/mmix/primessf.mms
-share/examples/mmix/primesx.mmconfig
-share/examples/mmix/primesx.mms
-share/examples/mmix/pushtest.mms
-share/examples/mmix/saddle1.mms
-share/examples/mmix/saddle2.mms
-share/examples/mmix/silly.mms
-share/examples/mmix/sim.mms
-share/examples/mmix/sort.mms
-share/examples/mmix/sortx.mms
-share/examples/mmix/strcpy.mms
-share/examples/mmix/sub1.mms
-share/examples/mmix/sub2.mms
-share/examples/mmix/test.mmconfig
-share/examples/mmix/test.mmix
-share/examples/mmix/test.mms
-share/examples/mmix/test1.mmconfig
-share/examples/mmix/test1.mmix
-share/examples/mmix/test2.mmconfig
-share/examples/mmix/test2.mmix
-share/examples/mmix/traffic.mms
-share/examples/mmix/valid.mms
-share/examples/mmix/zero.mms
-@dirrm share/examples/mmix
-@dirrm share/doc/mmix
diff --git a/emulators/mmix/distinfo b/emulators/mmix/distinfo
deleted file mode 100644
index 655f8b8337c..00000000000
--- a/emulators/mmix/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.8 2007/03/15 05:00:14 dbj Exp $
-
-SHA1 (mmix-20060918.tar.gz) = 56fb5466e83da7f54ba3908a5907c19851ad33e2
-RMD160 (mmix-20060918.tar.gz) = c250dcadd7c811407f84d28f0544ad95089d4a06
-Size (mmix-20060918.tar.gz) = 305221 bytes
-SHA1 (patch-aa) = 927eabd1b0d1180fb909ca943b511fa325601c7e
-SHA1 (patch-ab) = 33753c745d8bfaae51f29ad059285d4573b2aa0d
diff --git a/emulators/mmix/patches/patch-aa b/emulators/mmix/patches/patch-aa
deleted file mode 100644
index e735d1b3719..00000000000
--- a/emulators/mmix/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/12 21:52:14 jtb Exp $
-
---- Makefile.orig	Sat Jul 29 17:59:18 2000
-+++ Makefile
-@@ -6,7 +6,7 @@
- #   In fact, CWEB 3.61 is recommended for making hardcopy or PDF documentation.
- 
- #   If you prefer optimization to debugging, change -g to something like -O:
--CFLAGS = -g
-+#CFLAGS = -g
- 
- #   Uncomment the second line if you use pdftex to bypass .dvi files:
- PDFTEX = dvipdfm
diff --git a/emulators/mmix/patches/patch-ab b/emulators/mmix/patches/patch-ab
deleted file mode 100644
index 50b01432b72..00000000000
--- a/emulators/mmix/patches/patch-ab
+++ /dev/null
@@ -1,884 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/02/06 16:10:14 tonio Exp $
-
---- mmix-pipe.w.orig	2003-06-16 00:18:12.000000000 +0200
-+++ mmix-pipe.w
-@@ -2355,9 +2355,9 @@ it says |goto done|. It will not be sche
- unless the |schedule| routine has been called since it began execution.
- The |wait| macro is a convenient way to say ``Please schedule me to resume
- again at the current |data->state|'' after a specified time; for example,
--|wait(1)| will restart a coroutine on the next clock tick.
-+|mmix_wait(1)| will restart a coroutine on the next clock tick.
- 
--@d wait(t)@+ {@+schedule(self,t,data->state);@+ goto done;@+}
-+@d mmix_wait(t)@+ {@+schedule(self,t,data->state);@+ goto done;@+}
- @d pass_after(t)  schedule(self+1,t,data->state)
- @d sleep@+ {@+self->next=self;@+ goto done;@+} /* wait forever */
- @d awaken(c,t)  schedule(c,t,c->ctl->state)
-@@ -2459,7 +2459,7 @@ if (data->ra.p) {
-   else if (data->need_ra) j+=10;
- }
- if (j<10) data->state=1;
--if (j) wait(1); /* otherwise we fall through to case 1 */
-+if (j) mmix_wait(1); /* otherwise we fall through to case 1 */
- 
- @ Simple register-to-register instructions like \.{ADD} are assumed to take
- just one cycle, but others like \.{FADD} almost certainly require more time.
-@@ -2500,7 +2500,7 @@ if (data->i<=max_pipe_op) {@+register un
-   j=s[0]+data->denin;
-   if (s[1]) data->state=2; /* more than one stage */
-   else j+=data->denout;
--  if (j>1) wait(j-1);
-+  if (j>1) mmix_wait(j-1);
- }
- goto switch1;
- 
-@@ -2509,7 +2509,7 @@ unit is |self+1|.
- 
- @<Pass |data| to the next stage of the pipeline@>=
- pass_data:@+
--if ((self+1)->next) wait(1); /* stall if the next stage is occupied */
-+if ((self+1)->next) mmix_wait(1); /* stall if the next stage is occupied */
- {@+register unsigned char *s=pipe_seq[data->i];
-   j=s[self->stage];
-   if (s[self->stage+1]==0) j+=data->denout,data->state=3;
-@@ -3766,7 +3766,7 @@ or~|Dcache|. The data to be written will
- @<Cases for control of special coroutines@>=
- case flush_to_mem: {@+register cache *c=(cache *)data->ptr_a;
-  switch (data->state) {
--  case 0:@+ if (mem_lock) wait(1);
-+  case 0:@+ if (mem_lock) mmix_wait(1);
-     data->state=1;
-   case 1: set_lock(self,mem_lock);
-     data->state=2;
-@@ -3796,7 +3796,7 @@ case flush_to_mem: {@+register cache *c=
-       i++;@+ off++;@+ addr.l+=8;
-     }
-   }
--  wait(mem_addr_time+count*mem_write_time);
-+  mmix_wait(mem_addr_time+count*mem_write_time);
- }
- 
- @* Cache transfers. We have seen that the |Dcache->flusher| sends
-@@ -3819,23 +3819,23 @@ case flush_to_S: {@+register cache *c=(c
-   register int block_diff=Scache->bb-c->bb;
-   p=(cacheblock*)data->ptr_b;
-  switch (data->state) {
--  case 0:@+ if (Scache->lock) wait(1);
-+  case 0:@+ if (Scache->lock) mmix_wait(1);
-     data->state=1;
-   case 1: set_lock(self,Scache->lock);
-     data->ptr_b=(void*)cache_search(Scache,c->outbuf.tag);
-     if (data->ptr_b) data->state=4;
-     else if (Scache->mode & WRITE_ALLOC) data->state=(block_diff? 2: 3);
-     else data->state=6;
--    wait(Scache->access_time);
-+    mmix_wait(Scache->access_time);
-   case 2: @<Fill |Scache->inbuf| with clean memory data@>;
-   case 3: @<Allocate a slot |p| in the S-cache@>;
-     if (block_diff) @<Copy |Scache->inbuf| to slot |p|@>;         
-   case 4: copy_block(c,&(c->outbuf),Scache,p);
-     hit_set=cache_addr(Scache,c->outbuf.tag);@+ use_and_fix(Scache,p);
-                    /* |p| not moved */
--    data->state=5;@+ wait(Scache->copy_in_time);
-+    data->state=5;@+ mmix_wait(Scache->copy_in_time);
-   case 5:@+ if ((Scache->mode&WRITE_BACK)==0) { /* write-through */
--      if (Scache->flusher.next) wait(1);
-+      if (Scache->flusher.next) mmix_wait(1);
-       flush_cache(Scache,p,true);
-     }
-     goto terminate;
-@@ -3844,9 +3844,9 @@ case flush_to_S: {@+register cache *c=(c
- }
- 
- @ @<Allocate a slot |p| in the S-cache@>=
--if (Scache->filler.next) wait(1); /* perhaps an unnecessary precaution? */
-+if (Scache->filler.next) mmix_wait(1); /* perhaps an unnecessary precaution? */
- p=alloc_slot(Scache,c->outbuf.tag);
--if (!p) wait(1);
-+if (!p) mmix_wait(1);
- data->ptr_b=(void*)p;
- p->tag=c->outbuf.tag;@+ p->tag.l=c->outbuf.tag.l&(-Scache->bb);
- 
-@@ -3857,7 +3857,7 @@ read them all and to charge only for rea
- {@+register int count=block_diff>>3;
-   register int off,delay;
-   octa addr;
--  if (mem_lock) wait(1);
-+  if (mem_lock) mmix_wait(1);
-   addr.h=c->outbuf.tag.h;@+ addr.l=c->outbuf.tag.l&-Scache->bb;
-   off=(addr.l&0xffff)>>3;
-   for (j=0;j<Scache->bb>>3;j++)
-@@ -3866,7 +3866,7 @@ read them all and to charge only for rea
-   set_lock(&mem_locker,mem_lock);
-   delay=mem_addr_time+(int)((count+bus_words-1)/(bus_words))*mem_read_time;
-   startup(&mem_locker,delay);
--  data->state=3;@+ wait(delay);
-+  data->state=3;@+ mmix_wait(delay);
- }  
- 
- @ @<Copy |Scache->inbuf| to slot |p|@>=
-@@ -3878,7 +3878,7 @@ read them all and to charge only for rea
- @ Here we assume that the granularity is~8.
- 
- @<Handle write-around when flushing to the S-cache@>=
--if (Scache->flusher.next) wait(1);
-+if (Scache->flusher.next) mmix_wait(1);
- Scache->outbuf.tag.h=c->outbuf.tag.h;
- Scache->outbuf.tag.l=c->outbuf.tag.l&(-Scache->bb);
- for (j=0;j<Scache->bb>>Scache->g;j++) Scache->outbuf.dirty[j]=false;
-@@ -3920,12 +3920,12 @@ case fill_from_mem: {@+register cache *c
-   case 1: release_lock(self,mem_lock);
-     data->state=2;
-   case 2:@+if (c!=Scache) {
--      if (c->lock) wait(1);
-+      if (c->lock) mmix_wait(1);
-       set_lock(self,c->lock);
-     }
-     if (cc) awaken(cc,c->copy_in_time); /* the second wakeup call */
-     load_cache(c,(cacheblock*)data->ptr_b);
--    data->state=3;@+ wait(c->copy_in_time);
-+    data->state=3;@+ mmix_wait(c->copy_in_time);
-   case 3: goto terminate;
-  }
- }
-@@ -3939,8 +3939,8 @@ cycle, so that there will be two wakeup 
-   c->inbuf.tag=data->z.o;@+ c->inbuf.tag.l &= -c->bb;
-   count=c->bb>>3, off=(c->inbuf.tag.l&0xffff)>>3;
-   for (i=0;i<count;i++,off++) c->inbuf.data[i]=mem_hash[last_h].chunk[off];
--  if (count<=bus_words) wait(1+mem_read_time)@;
--  else wait((int)(count/bus_words)*mem_read_time);
-+  if (count<=bus_words) mmix_wait(1+mem_read_time)@;
-+  else mmix_wait((int)(count/bus_words)*mem_read_time);
- }
- 
- @ The |fill_from_S| coroutine has the same conventions as |fill_from_mem|,
-@@ -3969,12 +3969,12 @@ case fill_from_S: {@+register cache *c=(
-       awaken(cc,Scache->access_time);
-     }
-   case 3: @<Copy data from |p| into |c->inbuf|@>;
--    data->state=4;@+wait(Scache->access_time);
--  case 4:@+ if (c->lock) wait(1);
-+    data->state=4;@+mmix_wait(Scache->access_time);
-+  case 4:@+ if (c->lock) mmix_wait(1);
-     set_lock(self,c->lock);
-     Scache->lock=NULL; /* we had been holding that lock */
-     load_cache(c,(cacheblock*)data->ptr_b);
--    data->state=5;@+ wait(c->copy_in_time);
-+    data->state=5;@+ mmix_wait(c->copy_in_time);
-   case 5:@+if (cc) awaken(cc,1); /* second wakeup call */
-     goto terminate;
-   }
-@@ -3987,9 +3987,9 @@ but we will point to |Scache->fill_lock|
- because the present coroutine is not abortable.
- 
- @<Start the S-cache filler@>=
--if (Scache->filler.next || mem_lock) wait(1);
-+if (Scache->filler.next || mem_lock) mmix_wait(1);
- p=alloc_slot(Scache,data->z.o);
--if (!p) wait(1);
-+if (!p) mmix_wait(1);
- set_lock(&Scache->filler,mem_lock);
- set_lock(self,Scache->fill_lock);
- data->ptr_c=Scache->filler_ctl.ptr_b=(void *)p;
-@@ -4079,7 +4079,7 @@ case 10: goto terminate;
- }
- 
- @ @<Cases 0 through 4, for the D-cache@>=
--case 0:@+ if (Dcache->lock || (j=get_reader(Dcache)<0)) wait(1);
-+case 0:@+ if (Dcache->lock || (j=get_reader(Dcache)<0)) mmix_wait(1);
-   startup(&Dcache->reader[j],Dcache->access_time);
-   set_lock(self,Dcache->lock);
-   i=j=0;
-@@ -4091,18 +4091,18 @@ Dclean_loop: p=(i<Dcache->cc? &(Dcache->
-   data->y.o.h=i, data->y.o.l=j;
- Dclean: data->state=1;@+
-   data->ptr_b=(void*)p;@+
--  wait(Dcache->access_time);
--case 1:@+if (Dcache->flusher.next) wait(1);
-+  mmix_wait(Dcache->access_time);
-+case 1:@+if (Dcache->flusher.next) mmix_wait(1);
-   flush_cache(Dcache,p,data->x.o.h==0);
-   p->tag.h|=data->x.o.h;
-   release_lock(self,Dcache->lock);
-   data->state=2;@+
--  wait(Dcache->copy_out_time);
-+  mmix_wait(Dcache->copy_out_time);
- case 2:@+ if (!clean_lock) goto done; /* premature termination */
--  if (Dcache->flusher.next) wait(1);
-+  if (Dcache->flusher.next) mmix_wait(1);
-   if (data->i!=sync) goto Sprep;
-   data->state=3;
--case 3:@+ if (Dcache->lock || (j=get_reader(Dcache)<0)) wait(1);
-+case 3:@+ if (Dcache->lock || (j=get_reader(Dcache)<0)) mmix_wait(1);
-   startup(&Dcache->reader[j],Dcache->access_time);
-   set_lock(self,Dcache->lock);
-   i=data->y.o.h, j=data->y.o.l;
-@@ -4110,10 +4110,10 @@ Dclean_inc: j++;
-   if (i<Dcache->cc && j==Dcache->aa) j=0, i++;
-   if (i==Dcache->cc && j==Dcache->vv) {
-     data->state=5;@+
--    wait(Dcache->access_time);
-+    mmix_wait(Dcache->access_time);
-   }
-   goto Dclean_loop;
--case 4:@+ if (Dcache->lock || (j=get_reader(Dcache)<0)) wait(1);
-+case 4:@+ if (Dcache->lock || (j=get_reader(Dcache)<0)) mmix_wait(1);
-   startup(&Dcache->reader[j],Dcache->access_time);
-   set_lock(self,Dcache->lock);
-   p=cache_search(Dcache,data->z.o);
-@@ -4122,12 +4122,12 @@ case 4:@+ if (Dcache->lock || (j=get_rea
-     if (is_dirty(Dcache,p)) goto Dclean;
-   }
-   data->state=9;@+
--  wait(Dcache->access_time);
-+  mmix_wait(Dcache->access_time);
- 
- @ @<Cases 5 through 9...@>=
- case 5:@+ if (self->lockloc) *(self->lockloc)=NULL, self->lockloc=NULL;
-   if (!Scache) goto done;
--  if (Scache->lock) wait(1);
-+  if (Scache->lock) mmix_wait(1);
-   set_lock(self,Scache->lock);
-   i=j=0;
- Sclean_loop: p=(i<Scache->cc? &(Scache->set[i][j]): &(Scache->victim[j]));
-@@ -4138,31 +4138,31 @@ Sclean_loop: p=(i<Scache->cc? &(Scache->
-   data->y.o.h=i, data->y.o.l=j;
- Sclean: data->state=6;@+
-   data->ptr_b=(void*)p;@+
--  wait(Scache->access_time);
--case 6:@+if (Scache->flusher.next) wait(1);
-+  mmix_wait(Scache->access_time);
-+case 6:@+if (Scache->flusher.next) mmix_wait(1);
-   flush_cache(Scache,p,data->x.o.h==0);
-   p->tag.h|=data->x.o.h;
-   release_lock(self,Scache->lock);
-   data->state=7;@+
--  wait(Scache->copy_out_time);
-+  mmix_wait(Scache->copy_out_time);
- case 7:@+ if (!clean_lock) goto done; /* premature termination */
--  if (Scache->flusher.next) wait(1);
-+  if (Scache->flusher.next) mmix_wait(1);
-   if (data->i!=sync) goto done;
-   data->state=8;
--case 8:@+ if (Scache->lock) wait(1);
-+case 8:@+ if (Scache->lock) mmix_wait(1);
-   set_lock(self,Scache->lock);
-   i=data->y.o.h, j=data->y.o.l;
- Sclean_inc: j++;
-   if (i<Scache->cc && j==Scache->aa) j=0, i++;
-   if (i==Scache->cc && j==Scache->vv) {
-     data->state=10;@+
--    wait(Scache->access_time);
-+    mmix_wait(Scache->access_time);
-   }
-   goto Sclean_loop;
- Sprep: data->state=9;
- case 9:@+if (self->lockloc) release_lock(self,Dcache->lock);
-   if (!Scache) goto done;
--  if (Scache->lock) wait(1);
-+  if (Scache->lock) mmix_wait(1);
-   set_lock(self,Scache->lock);
-   p=cache_search(Scache,data->z.o);
-   if (p) {
-@@ -4170,7 +4170,7 @@ case 9:@+if (self->lockloc) release_lock
-     if (is_dirty(Scache,p)) goto Sclean;
-   }
-   data->state=10;@+
--  wait(Scache->access_time);
-+  mmix_wait(Scache->access_time);
- 
- @* Virtual address translation. Special arrays of coroutines and control
- blocks come into play when we need to implement \MMIX's rather complicated
-@@ -4250,15 +4250,15 @@ case fill_from_virt: {@+register cache *
-     data->state=1;
-   case 1:@+if (data->b.p) {
-       if (data->b.p->known) data->b.o=data->b.p->o, data->b.p=NULL;
--      else wait(1);
-+      else mmix_wait(1);
-     }
-     @<Compute the new entry for |c->inbuf| and give the caller a sneak
-               preview@>;
-     data->state=2;
--  case 2:@+if (c->lock) wait(1);
-+  case 2:@+if (c->lock) mmix_wait(1);
-     set_lock(self,c->lock);
-     load_cache(c,(cacheblock*)data->ptr_b);
--    data->state=3;@+ wait(c->copy_in_time);
-+    data->state=3;@+ mmix_wait(c->copy_in_time);
-   case 3: data->b.o=zero_octa;@+goto terminate;
-  }
- }
-@@ -4545,18 +4545,18 @@ case write_from_wbuf:
-   case 5:@+if (write_head==wbuf_bot) write_head=wbuf_top;@+ else write_head--;
-  write_restart: data->state=0;
-   case 0:@+ if (self->lockloc) *(self->lockloc)=NULL,self->lockloc=NULL;
--    if (write_head==write_tail) wait(1); /* write buffer is empty */
-+    if (write_head==write_tail) mmix_wait(1); /* write buffer is empty */
-     if (write_head->i==sync) @<Ignore the item in |write_head|@>;
-     if (ticks.l-write_head->stamp<holding_time && !speed_lock)
--      wait(1); /* data too raw */
-+      mmix_wait(1); /* data too raw */
-     if (!Dcache || (write_head->addr.h&0xffff0000)) goto mem_direct;
-           /* not cached */
--    if (Dcache->lock || (j=get_reader(Dcache)<0)) wait(1); /* D-cache busy */
-+    if (Dcache->lock || (j=get_reader(Dcache)<0)) mmix_wait(1); /* D-cache busy */
-     startup(&Dcache->reader[j],Dcache->access_time);
-     @<Write the data into the D-cache and set |state=4|,
-                 if there's a cache hit@>;
-     data->state=((Dcache->mode&WRITE_ALLOC) && write_head->i!=stunc? 1: 3);
--    wait(Dcache->access_time);
-+    mmix_wait(Dcache->access_time);
-   case 1: @<Try to put the contents of location |write_head->addr|
-            into the D-cache@>;
-     data->state=2;@+sleep;
-@@ -4573,7 +4573,7 @@ register cacheblock *p,*q;
- D-cache (unless it hits in the D-cache), it will go into a secondary cache.
- 
- @<Handle write-around when writing to the D-cache@>=
--if (Dcache->flusher.next) wait(1);
-+if (Dcache->flusher.next) mmix_wait(1);
- Dcache->outbuf.tag.h=write_head->addr.h;
- Dcache->outbuf.tag.l=write_head->addr.l&(-Dcache->bb);
- for (j=0;j<Dcache->bb>>Dcache->g;j++) Dcache->outbuf.dirty[j]=false;
-@@ -4581,20 +4581,20 @@ Dcache->outbuf.data[(write_head->addr.l&
- Dcache->outbuf.dirty[(write_head->addr.l&(Dcache->bb-1))>>Dcache->g]=true;
- set_lock(self,wbuf_lock);
- startup(&Dcache->flusher,Dcache->copy_out_time);
--data->state=5;@+ wait(Dcache->copy_out_time);
-+data->state=5;@+ mmix_wait(Dcache->copy_out_time);
- 
- @ @<Write directly from |write_head| to memory@>=
--if (mem_lock) wait(1);
-+if (mem_lock) mmix_wait(1);
- set_lock(self,wbuf_lock);
- set_lock(&mem_locker,mem_lock); /* a coroutine of type |vanish| */
- startup(&mem_locker,mem_addr_time+mem_write_time);
- mem_write(write_head->addr,write_head->o);
--data->state=5;@+ wait(mem_addr_time+mem_write_time);
-+data->state=5;@+ mmix_wait(mem_addr_time+mem_write_time);
- 
- @ A subtlety needs to be mentioned here: While we're trying to
- update the D-cache, another instruction might be filling the
- same cache block (although not because of the same physical address).
--Therefore we |goto write_restart| here instead of saying |wait(1)|.
-+Therefore we |goto write_restart| here instead of saying |mmix_wait(1)|.
- 
- @<Try to put the contents of location |write_head->addr| into the D-cache@>=
- if (Dcache->filler.next) goto write_restart;
-@@ -4622,12 +4622,12 @@ if (p) {
-   data->ptr_b=(void *)p;
-   p->data[(write_head->addr.l&(Dcache->bb-1))>>3]=write_head->o;
-   p->dirty[(write_head->addr.l&(Dcache->bb-1))>>Dcache->g]=true;
--  data->state=4;@+ wait(Dcache->access_time);
-+  data->state=4;@+ mmix_wait(Dcache->access_time);
- }
- 
- @ @<Forward the new data past the D-cache if it is write-through@>=
- if ((Dcache->mode&WRITE_BACK)==0) { /* write-through */
--  if (Dcache->flusher.next) wait(1);
-+  if (Dcache->flusher.next) mmix_wait(1);
-   flush_cache(Dcache,p,true);
- }
- 
-@@ -4635,7 +4635,7 @@ if ((Dcache->mode&WRITE_BACK)==0) { /* w
- {
-   set_lock(self,wbuf_lock);
-   data->state=5;
--  wait(1);
-+  mmix_wait(1);
- }
- 
- @* Loading and storing. A RISC machine is often said to have a ``load/store
-@@ -4684,7 +4684,7 @@ case ldptp: case ldpte:@+if (data->y.o.h
- 
- @<Special cases for states in the first stage@>=
- case ld_st_launch:@+if ((self+1)->next)
--    wait(1); /* second stage must be clear */
-+    mmix_wait(1); /* second stage must be clear */
-   @<Handle special cases for operations like |prego| and |ldvts|@>;
-   if (data->y.o.h&sign_bit)
-     @<Do load/store stage~1 with known physical address@>;
-@@ -4693,7 +4693,7 @@ case ld_st_launch:@+if ((self+1)->next)
-        data->interrupt|=PRW_BITS;
-     goto fin_ex;
-   }
--  if (DTcache->lock || (j=get_reader(DTcache))<0) wait(1);
-+  if (DTcache->lock || (j=get_reader(DTcache))<0) mmix_wait(1);
-   startup(&DTcache->reader[j],DTcache->access_time);
-   @<Look up the address in the DT-cache, and also in the D-cache if possible@>;
-   pass_after(DTcache->access_time);@+ goto passit;
-@@ -4812,7 +4812,7 @@ if (((p->data[0].l<<PROT_OFFSET)&j)!=j) 
-     if (m==DUNNO) data->state=DT_hit;
-     else data->x.o=*m, data->state=ld_ready;
-   }@+ else if ((data->z.o.h&0xffff0000) || !Dcache) {
--    if (mem_lock) wait(1);
-+    if (mem_lock) mmix_wait(1);
-     set_lock(&mem_locker,mem_lock);
-     data->x.o=mem_read(data->z.o);
-     data->state=ld_ready;
-@@ -4848,7 +4848,7 @@ are rare.
- 
- @<Special cases for states in later stages@>=
- square_one: data->state=DT_retry;
-- case DT_retry:@+if (DTcache->lock || (j=get_reader(DTcache))<0) wait(1);
-+ case DT_retry:@+if (DTcache->lock || (j=get_reader(DTcache))<0) mmix_wait(1);
-    startup(&DTcache->reader[j],DTcache->access_time);
-    p=cache_search(DTcache,trans_key(data->y.o));
-    if (p) {
-@@ -4857,7 +4857,7 @@ square_one: data->state=DT_retry;
-      if (data->i>=st && data->i<=syncid) data->state=st_ready;
-      else data->state=DT_hit;
-    }@+ else data->state=DT_miss;
--   wait(DTcache->access_time);
-+   mmix_wait(DTcache->access_time);
-  case DT_miss:@+if (DTcache->filler.next)
-      if (data->i==preld || data->i==prest) goto fin_ex;@+ else goto square_one;
-    if (no_hardware_PT)
-@@ -4897,7 +4897,7 @@ ld_retry: data->state=DT_hit;
-   @<Check for a hit in pending writes@>;
-   if ((data->z.o.h&0xffff0000) || !Dcache)
-       @<Do load/store stage 2 without D-cache lookup@>;
--  if (Dcache->lock || (j=get_reader(Dcache))<0) wait(1);
-+  if (Dcache->lock || (j=get_reader(Dcache))<0) mmix_wait(1);
-   startup(&Dcache->reader[j],Dcache->access_time);
-   q=cache_search(Dcache,data->z.o);
-   if (q) {
-@@ -4906,7 +4906,7 @@ ld_retry: data->state=DT_hit;
-     data->x.o=q->data[(data->z.o.l&(Dcache->bb-1))>>3];
-     data->state=ld_ready;
-   }@+else data->state=hit_and_miss;
--  wait(Dcache->access_time);
-+  mmix_wait(Dcache->access_time);
-  case hit_and_miss:@+if (data->i==ldunc) goto avoid_D;
-     @<Try to get the contents of location |data->z.o| in the D-cache@>;
- 
-@@ -4941,7 +4941,7 @@ if (data->i==prest &&@|
- 
- @ @<Special cases for states in later stages@>=
- prest_span: data->state=prest_win;
--case prest_win:@+ if (data!=old_hot || Dlocker.next) wait(1);
-+case prest_win:@+ if (data!=old_hot || Dlocker.next) mmix_wait(1);
-   if (Dcache->lock) goto fin_ex;
-   q=alloc_slot(Dcache,data->z.o); /* OK if |Dcache->filler| is busy */
-   if (q) {
-@@ -4954,21 +4954,21 @@ case prest_win:@+ if (data!=old_hot || D
- 
- @ @<Do load/store stage 2 without D-cache lookup@>=
- {
--avoid_D:@+ if (mem_lock) wait(1);
-+avoid_D:@+ if (mem_lock) mmix_wait(1);
-   set_lock(&mem_locker,mem_lock);
-   startup(&mem_locker, mem_addr_time+mem_read_time);
-   data->x.o=mem_read(data->z.o);
--  data->state=ld_ready;@+ wait(mem_addr_time+mem_read_time);
-+  data->state=ld_ready;@+ mmix_wait(mem_addr_time+mem_read_time);
- }
- 
- @ @<Check for a hit in pending writes@>=
- {
-   octa *m=write_search(data,data->z.o);
--  if (m==DUNNO) wait(1);
-+  if (m==DUNNO) mmix_wait(1);
-   if (m) {
-     data->x.o=*m;
-     data->state=ld_ready;
--    wait(1);
-+    mmix_wait(1);
-   }
- }
- 
-@@ -4991,7 +4991,7 @@ case ld_ready:@+if (self->lockloc)
-     case LDSF>>1:@+if (data->z.o.l&4) data->x.o.h=data->x.o.l;
-       if ((data->x.o.h&0x7f800000)==0 && (data->x.o.h&0x7fffff)) {
-         data->x.o=load_sf(data->x.o.h);
--        data->state=3;@+wait(denin_penalty);
-+        data->state=3;@+mmix_wait(denin_penalty);
-       }
-       else data->x.o=load_sf(data->x.o.h);@+goto fin_ex;
-     case LDPTP>>1:@+
-@@ -5020,7 +5020,7 @@ to check for overflow.
- 
- @<Finish a store command@>=
- data->x.addr=data->z.o;
--if (data->b.p) wait(1);
-+if (data->b.p) mmix_wait(1);
- switch(data->op>>1) {
-  case STUNC>>1: data->i=stunc;
-  default: data->x.o=data->b.o;@+goto fin_ex;
-@@ -5029,7 +5029,7 @@ switch(data->op>>1) {
-     if ((data->b.o.h&0x7f800000)==0 && (data->b.o.h&0x7fffff)) {
-       if (data->z.o.l&4) data->x.o.l=data->b.o.h;
-       else data->x.o.h=data->b.o.h;
--      data->state=3;@+wait(denout_penalty);
-+      data->state=3;@+mmix_wait(denout_penalty);
-     }
-  case STHT>>1:@+if (data->z.o.l&4) data->x.o.l=data->b.o.h;
-   else data->x.o.h=data->b.o.h;
-@@ -5063,7 +5063,7 @@ of the control blocks in our pipeline, w
- the hot seat, thereby allowing us non-speculative access to~rP.
- 
- @<Finish a \.{CSWAP}@>=
--if (data!=old_hot) wait(1);
-+if (data!=old_hot) mmix_wait(1);
- if (data->x.o.h==g[rP].o.h && data->x.o.l==g[rP].o.l) {
-   data->a.o.l=1; /* |data->a.o.h| is zero */
-   data->x.o=data->b.o;
-@@ -5129,7 +5129,7 @@ startup(&fetch_co,1);
- first and second stages of a |prego| operation.
- 
- @d wait_or_pass(t) if (data->i==prego) {@+pass_after(t);@+goto passit;@+}
--                   else wait(t)
-+                   else mmix_wait(t)
- 
- @<Simulate an action of the fetch coroutine@>=
- switch0:@+ switch(data->state) {
-@@ -5140,7 +5140,7 @@ switch0:@+ switch(data->state) {
-  case 1: start_fetch:@+ if (data->y.o.h&sign_bit)
-     @<Begin fetch with known physical address@>;
-   if (page_bad) goto bad_fetch;
--  if (ITcache->lock || (j=get_reader(ITcache))<0) wait(1);
-+  if (ITcache->lock || (j=get_reader(ITcache))<0) mmix_wait(1);
-   startup(&ITcache->reader[j],ITcache->access_time);
-   @<Look up the address in the IT-cache, and also in the I-cache if possible@>;
-   wait_or_pass(ITcache->access_time);
-@@ -5154,7 +5154,7 @@ if (data->i==prego) goto start_fetch;
- if (inst_ptr.p) {
-   if (inst_ptr.p!=UNKNOWN_SPEC && inst_ptr.p->known)
-     inst_ptr.o=inst_ptr.p->o, inst_ptr.p=NULL;
--  wait(1);
-+  mmix_wait(1);
- }
- 
- @ @d got_IT 19   /* |state| when IT-cache entry has been computed */
-@@ -5242,7 +5242,7 @@ if (data->i!=prego) {
- @ @<Read from memory into |fetched|@>=
- {@+octa addr;
-   addr=data->z.o;
--  if (mem_lock) wait(1);
-+  if (mem_lock) mmix_wait(1);
-   set_lock(&mem_locker,mem_lock);
-   startup(&mem_locker,mem_addr_time+mem_read_time);
-   addr.l&=-(bus_words<<3);
-@@ -5251,12 +5251,12 @@ if (data->i!=prego) {
-     fetched[j]=mem_hash[last_h].chunk[((addr.l&0xffff)>>3)+j];
-   fetch_lo=(data->z.o.l>>3)&(bus_words-1);@+ fetch_hi=bus_words;
-   data->state=fetch_ready;
--  wait(mem_addr_time+mem_read_time);
-+  mmix_wait(mem_addr_time+mem_read_time);
- }
- 
- @ @<Other cases for the fetch coroutine@>=
-  case IT_miss:@+if (ITcache->filler.next)
--     if (data->i==prego) goto fin_ex;@+else wait(1);
-+     if (data->i==prego) goto fin_ex;@+else mmix_wait(1);
-    if (no_hardware_PT) @<Insert dummy instruction for page table emulation@>;
-    p=alloc_slot(ITcache,trans_key(data->y.o));
-    if (!p) /* hey, it was present after all */
-@@ -5320,7 +5320,7 @@ case fetch_ready:@+if (self->lockloc)
-     inst_ptr.o=incr(inst_ptr.o,4);
-     if (fetch_lo==fetch_hi) goto new_fetch;
-   }
--  wait(1);
-+  mmix_wait(1);
- 
- @ @<Insert dummy instruction for page table emulation@>=
- {
-@@ -5443,10 +5443,10 @@ lest we issue an instruction that uses
- @<Special cases for states in the first stage@>=
- emulate_virt: @<Prepare to emulate the page translation@>;
- state_4: data->state=4;
--case 4:@+if (dispatch_lock) wait(1);
-+case 4:@+if (dispatch_lock) mmix_wait(1);
-   set_lock(self,dispatch_lock);
- state_5: data->state=5;
--case 5:@+if (data!=old_hot) wait(1);
-+case 5:@+if (data!=old_hot) mmix_wait(1);
-   if ((data->interrupt&F_BIT) && data->i!=trap) {
-     inst_ptr.o=g[rT].o, inst_ptr.p=NULL;
-     if (is_load_store(data->i)) nullifying=true;
-@@ -5736,8 +5736,8 @@ case resume: case resum:@+if (data->xx!=
- 
- @ @<Special cases for states in the first stage@>=
- case do_resume_trans: resume_trans: {@+register cache*c=(cache*)data->ptr_a;
--   if (c->lock) wait(1);
--   if (c->filler.next) wait(1);
-+   if (c->lock) mmix_wait(1);
-+   if (c->filler.next) mmix_wait(1);
-    p=alloc_slot(c,trans_key(data->y.o));
-    if (p) {
-      c->filler_ctl.ptr_b=(void*)p;
-@@ -5773,7 +5773,7 @@ by emulated instructions.
- 
- @<Cases for stage 1...@>=
- case get:@+ if (data->zz>=21 || data->zz==rK) {
--   if (data!=old_hot) wait(1);
-+   if (data!=old_hot) mmix_wait(1);
-    data->z.o=g[data->zz].o;
-  }
-  data->x.o=data->z.o;@+goto fin_ex;
-@@ -5785,7 +5785,7 @@ drastic implications.
- 
- @<Cases for stage 1...@>=
- case put:@+if (data->xx>=15 && data->xx<=20) {
--   if (data!=old_hot) wait(1);
-+   if (data!=old_hot) mmix_wait(1);
-    switch (data->xx) {
-   case rV: @<Update the \\{page} variables@>;@+break;
-   case rQ: new_Q.h |= data->z.o.h &~ g[rQ].o.h;@+
-@@ -5817,7 +5817,7 @@ else if (data->z.o.l<g[rG].o.l) {
-       if (data->z.o.l==g[rG].o.l) break;
-     }
-     if (j==commit_max) {
--      if (!trying_to_interrupt) wait(1);
-+      if (!trying_to_interrupt) mmix_wait(1);
-     }@+else data->interim=false;
-   }
- 
-@@ -5964,7 +5964,7 @@ switch (cool->zz) {
- {
-   if (data->interim) data->x.o=data->b.o;
-   else {
--    if (data!=old_hot) wait(1); /* we need the hottest value of rA */
-+    if (data!=old_hot) mmix_wait(1); /* we need the hottest value of rA */
-     data->x.o.h=g[rG].o.l<<24;
-     data->x.o.l=g[rA].o.l;
-     data->a.o=data->y.o;
-@@ -6123,7 +6123,7 @@ case frem:@+if(is_trivial(data->y.o) || 
-     {
-       data->x.o=fremstep(data->y.o,data->z.o,2500);@+ goto fin_ex;
-     }
--  if ((self+1)->next) wait(1);
-+  if ((self+1)->next) mmix_wait(1);
-   data->interim=true;
-   j=1;
-   if (is_denormal(data->y.o)||is_denormal(data->z.o)) j+=denin_penalty;
-@@ -6144,7 +6144,7 @@ if (data->i==frem) {
-     data->interrupt |= exceptions;
-     if (is_denormal(data->x.o)) j+=denout_penalty;
-   }
--  wait(j);
-+  mmix_wait(j);
- }
- 
- @* System operations. Finally we need to implement some operations for the
-@@ -6165,8 +6165,8 @@ if (data->i==ldvts) @<Do stage 1 of \.{L
- 
- @ @<Do stage 1 of \.{LDVTS}@>=
- {
--  if (data!=old_hot) wait(1);
--  if (DTcache->lock || (j=get_reader(DTcache))<0) wait(1);
-+  if (data!=old_hot) mmix_wait(1);
-+  if (DTcache->lock || (j=get_reader(DTcache))<0) mmix_wait(1);
-   startup(&DTcache->reader[j],DTcache->access_time);
-   data->z.o.h=0, data->z.o.l=data->y.o.l&0x7;
-   p=cache_search(DTcache,data->y.o); /* N.B.: Not |trans_key(data->y.o)| */
-@@ -6184,7 +6184,7 @@ if (data->i==ldvts) @<Do stage 1 of \.{L
- }
- 
- @ @<Special cases for states in later stages@>=
--case ld_st_launch:@+ if (ITcache->lock || (j=get_reader(ITcache))<0) wait(1);
-+case ld_st_launch:@+ if (ITcache->lock || (j=get_reader(ITcache))<0) mmix_wait(1);
-   startup(&ITcache->reader[j],ITcache->access_time);
-   p=cache_search(ITcache,data->y.o); /* N.B.: Not |trans_key(data->y.o)| */
-   if (p) {
-@@ -6197,7 +6197,7 @@ case ld_st_launch:@+ if (ITcache->lock |
-       p->tag.h|=sign_bit; /* invalidate the tag */
-     }
-   }
--  data->state=3;@+wait(ITcache->access_time);
-+  data->state=3;@+mmix_wait(ITcache->access_time);
- 
- @ The \.{SYNC} operation interacts with the pipeline in interesting ways.
- \.{SYNC}~\.0 and \.{SYNC}~\.4 are the simplest; they just lock the
-@@ -6220,16 +6220,16 @@ case sync:@+ if (cool->zz>3) {
- 
- @ @<Cases for stage 1 execution@>=
- case sync:@+ switch (data->zz) {
-- case 0: case 4:@+ if (data!=old_hot) wait(1);
-+ case 0: case 4:@+ if (data!=old_hot) mmix_wait(1);
-   halted=(data->zz!=0);@+goto fin_ex;
-  case 2: case 3: @<Wait if there's an unfinished load ahead of us@>;
-   release_lock(self,dispatch_lock);
-  case 1: data->x.addr=zero_octa;@+goto fin_ex;
-- case 5:@+ if (data!=old_hot) wait(1);
-+ case 5:@+ if (data!=old_hot) mmix_wait(1);
-   @<Clean the data caches@>;
-- case 6:@+ if (data!=old_hot) wait(1);
-+ case 6:@+ if (data!=old_hot) mmix_wait(1);
-   @<Zap the translation caches@>;
-- case 7:@+ if (data!=old_hot) wait(1);
-+ case 7:@+ if (data!=old_hot) mmix_wait(1);
-   @<Zap the instruction and data caches@>;
- }
- 
-@@ -6238,58 +6238,58 @@ case sync:@+ switch (data->zz) {
-   register control *cc;
-   for (cc=data;cc!=hot;) {
-     cc=(cc==reorder_top? reorder_bot: cc+1);
--    if (cc->owner && (cc->i==ld || cc->i==ldunc || cc->i==pst)) wait(1);
-+    if (cc->owner && (cc->i==ld || cc->i==ldunc || cc->i==pst)) mmix_wait(1);
-   }
- }
- 
- @ Perhaps the delay should be longer here.
- 
- @<Zap the translation caches@>=
--if (DTcache->lock || (j=get_reader(DTcache))<0) wait(1);
-+if (DTcache->lock || (j=get_reader(DTcache))<0) mmix_wait(1);
- startup(&DTcache->reader[j],DTcache->access_time);
- set_lock(self,DTcache->lock);
- zap_cache(DTcache);
--data->state=10;@+wait(DTcache->access_time);
-+data->state=10;@+mmix_wait(DTcache->access_time);
- 
- @ @<Zap the instruction and data caches@>=
- if (!Icache) {
-   data->state=11;@+goto switch1;
- }
--if (Icache->lock || (j=get_reader(Icache))<0) wait(1);
-+if (Icache->lock || (j=get_reader(Icache))<0) mmix_wait(1);
- startup(&Icache->reader[j],Icache->access_time);
- set_lock(self,Icache->lock);
- zap_cache(Icache);
--data->state=11;@+wait(Icache->access_time);
-+data->state=11;@+mmix_wait(Icache->access_time);
- 
- @ @<Special cases for states in the first stage@>=
- case 10:@+ if (self->lockloc) *(self->lockloc)=NULL,self->lockloc=NULL;
-- if (ITcache->lock || (j=get_reader(ITcache))<0) wait(1);
-+ if (ITcache->lock || (j=get_reader(ITcache))<0) mmix_wait(1);
-  startup(&ITcache->reader[j],ITcache->access_time);
-  set_lock(self,ITcache->lock);
-  zap_cache(ITcache);
-- data->state=3;@+wait(ITcache->access_time);
-+ data->state=3;@+mmix_wait(ITcache->access_time);
- case 11:@+ if (self->lockloc) *(self->lockloc)=NULL,self->lockloc=NULL;
-- if (wbuf_lock) wait(1);
-+ if (wbuf_lock) mmix_wait(1);
-  write_head=write_tail, write_ctl.state=0; /* zap the write buffer */
-  if (!Dcache) {
-    data->state=12;@+ goto switch1;
-  }
-- if (Dcache->lock || (j=get_reader(Dcache))<0) wait(1);
-+ if (Dcache->lock || (j=get_reader(Dcache))<0) mmix_wait(1);
-  startup(&Dcache->reader[j],Dcache->access_time);
-  set_lock(self,Dcache->lock);
-  zap_cache(Dcache);
-- data->state=12;@+wait(Dcache->access_time);
-+ data->state=12;@+mmix_wait(Dcache->access_time);
- case 12:@+ if (self->lockloc) *(self->lockloc)=NULL,self->lockloc=NULL;
-  if (!Scache) goto fin_ex;
-- if (Scache->lock) wait(1);
-+ if (Scache->lock) mmix_wait(1);
-  set_lock(self,Scache->lock);
-  zap_cache(Scache);
-- data->state=3;@+wait(Scache->access_time);
-+ data->state=3;@+mmix_wait(Scache->access_time);
- 
- @ @<Clean the data caches@>=
- if (self->lockloc) *(self->lockloc)=NULL,self->lockloc=NULL;
- @<Wait till write buffer is empty@>;
--if (clean_co.next || clean_lock) wait(1);
-+if (clean_co.next || clean_lock) mmix_wait(1);
- set_lock(self,clean_lock);
- clean_ctl.i=sync;@+
- clean_ctl.state=0;@+
-@@ -6297,12 +6297,12 @@ clean_ctl.x.o.h=0;
- startup(&clean_co,1);
- data->state=13;
- data->interim=true;
--wait(1);
-+mmix_wait(1);
- 
- @ @<Wait till write buffer is empty@>=
- if (write_head!=write_tail) {
-   if (!speed_lock) set_lock(self,speed_lock);
--  wait(1);
-+  mmix_wait(1);
- }
- 
- @ The cleanup process might take a huge amount of time, so we must allow
-@@ -6314,7 +6314,7 @@ case 13:@+ if (!clean_co.next) {
-    data->interim=false;@+ goto fin_ex; /* it's done! */
-  }
-  if (trying_to_interrupt) goto fin_ex; /* accept an interruption */
-- wait(1);
-+ mmix_wait(1);
- 
- @ Now we consider \.{SYNCD} and \.{SYNCID}. When control comes to this
- part of the program, |data->y.o| is a virtual address and |data->z.o|
-@@ -6336,24 +6336,24 @@ brought the memory up to date.
- 
- @<Special cases for states in later stages@>=
- do_syncid: data->state=30;
--case 30:@+ if (data!=old_hot) wait(1);
-+case 30:@+ if (data!=old_hot) mmix_wait(1);
-  if (!Icache) {
-    data->state=(data->loc.h&sign_bit? 31:33);@+goto switch2;
-  }
-  @<Clean the I-cache block for |data->z.o|, if any@>;
-- data->state=(data->loc.h&sign_bit? 31: 33);@+wait(Icache->access_time);
-+ data->state=(data->loc.h&sign_bit? 31: 33);@+mmix_wait(Icache->access_time);
- case 31:@+ if (self->lockloc) *(self->lockloc)=NULL,self->lockloc=NULL;
-  @<Wait till write buffer is empty@>;
-  if (((data->b.o.l-1)&~data->y.o.l)<data->xx) data->interim=true;
-  if (!Dcache) goto next_sync;
-  @<Clean the D-cache block for |data->z.o|, if any@>;
-- data->state=32;@+wait(Dcache->access_time);
-+ data->state=32;@+mmix_wait(Dcache->access_time);
- case 32:@+ if (self->lockloc) *(self->lockloc)=NULL,self->lockloc=NULL;
-  if (!Scache) goto next_sync; 
-  @<Clean the S-cache block for |data->z.o|, if any@>;
-- data->state=35;@+wait(Scache->access_time);
-+ data->state=35;@+mmix_wait(Scache->access_time);
- do_syncd: data->state=33;
--case 33:@+ if (data!=old_hot) wait(1);
-+case 33:@+ if (data!=old_hot) mmix_wait(1);
-  if (self->lockloc) *(self->lockloc)=NULL,self->lockloc=NULL;
-  @<Wait till write buffer is empty@>;
-  if (((data->b.o.l-1)&~data->y.o.l)<data->xx) data->interim=true;
-@@ -6366,7 +6366,7 @@ case 34:@+if (!clean_co.next) goto next_
-    data->z.o=zero_octa; /* anticipate |RESUME_CONT| */
-    goto fin_ex; /* accept an interruption */
-  }
-- wait(1);
-+ mmix_wait(1);
- next_sync: data->state=35;
- case 35:@+ if (self->lockloc) *(self->lockloc)=NULL,self->lockloc=NULL;
-  if (data->interim) @<Continue this command on the next cache block@>;
-@@ -6374,7 +6374,7 @@ case 35:@+ if (self->lockloc) *(self->lo
-  goto fin_ex;
- 
- @ @<Clean the I-cache block for |data->z.o|, if any@>=
--if (Icache->lock || (j=get_reader(Icache))<0) wait(1);
-+if (Icache->lock || (j=get_reader(Icache))<0) mmix_wait(1);
- startup(&Icache->reader[j],Icache->access_time);
- set_lock(self,Icache->lock);
- p=cache_search(Icache,data->z.o);
-@@ -6384,7 +6384,7 @@ if (p) {
- }
- 
- @ @<Clean the D-cache block for |data->z.o|, if any@>=
--if (Dcache->lock || (j=get_reader(Dcache))<0) wait(1);
-+if (Dcache->lock || (j=get_reader(Dcache))<0) mmix_wait(1);
- startup(&Dcache->reader[j],Dcache->access_time);
- set_lock(self,Dcache->lock);
- p=cache_search(Dcache,data->z.o);
-@@ -6394,7 +6394,7 @@ if (p) {
- }
-  
- @ @<Clean the S-cache block for |data->z.o|, if any@>=
--if (Scache->lock) wait(1);
-+if (Scache->lock) mmix_wait(1);
- set_lock(self,Scache->lock);
- p=cache_search(Scache,data->z.o);
- if (p) {
-@@ -6403,7 +6403,7 @@ if (p) {
- }
- 
- @ @<Use |cleanup| on the cache blocks for |data->z.o|, if any@>=
--if (clean_co.next || clean_lock) wait(1);
-+if (clean_co.next || clean_lock) mmix_wait(1);
- set_lock(self,clean_lock);
- clean_ctl.i=syncd;
- clean_ctl.state=4;
diff --git a/emulators/netbsd32_compat14/DEINSTALL b/emulators/netbsd32_compat14/DEINSTALL
deleted file mode 100644
index 9e432e1c8c7..00000000000
--- a/emulators/netbsd32_compat14/DEINSTALL
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 19:07:10 jlam Exp $
-
-case ${STAGE} in
-POST-DEINSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	COMPAT_LIBDIR=@COMPAT_LIBDIR@
-	COMPAT_XLIBDIR=@COMPAT_XLIBDIR@
-
-	${RMDIR} -p ${PKG_PREFIX}/${COMPAT_LIBDIR} ${PKG_PREFIX}/${COMPAT_XLIBDIR} 2>/dev/null || ${TRUE}
-
-	# clean up the symlink
-	${RM} -f /emul/aout
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/netbsd32_compat14/DESCR b/emulators/netbsd32_compat14/DESCR
deleted file mode 100644
index 13b88772c16..00000000000
--- a/emulators/netbsd32_compat14/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This package supplies the user files necessary for full compatibility with
-dynamically linked executables compiled under NetBSD 1.4, on a 32-bit
-platform, running on a 64-bit host..  You still need the options COMPAT_14
-and COMPAT_NETBSD32 in your kernel configuration (and probably others; see
-options(4) for more information) to make use of NetBSD 1.4 binaries.
diff --git a/emulators/netbsd32_compat14/INSTALL b/emulators/netbsd32_compat14/INSTALL
deleted file mode 100644
index bba96f36602..00000000000
--- a/emulators/netbsd32_compat14/INSTALL
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: INSTALL,v 1.3 2005/01/11 05:12:56 hamajima Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	OBJECT_FMT=@OBJECT_FMT@
-
-	# Only create the symlink on certain platform/object combinations.  Note
-	# that sparc64 a.out compatibility lives in /emul/aout, not /emul/netbsd32.
-	#
-	create_emul_symlink=0
-	case ${MACHINE_ARCH} in
-		sparc64 | x86_64)
-			create_emul_symlink=1
-			;;
-	esac
-
-	if [ ${create_emul_symlink} = 1 ]
-	then
-		# Create a symlink from /emul/aout --> ${PKG_PREFIX}/emul/aout
-		# if it doesn't already exist.  Warn if we can't do this.
-		#
-		emul=aout
-		if [ "`cd /etc && cd ${PKG_PREFIX}/emul/$emul 2>/dev/null && pwd -P`" \
-		     != "`cd / && cd /emul/$emul 2>/dev/null && pwd -P`" ]
-		then
-			if [ -e /emul/$emul -o -L /emul/$emul ] || \
-			   [ \( -e /emul -o -L /emul \) -a ! -d /emul ]
-			then
-				${CAT} <<EOF
-==============================================================================
-	IMPORTANT:  You must create a symbolic link from /emul/$emul
-	to ${PKG_PREFIX}/emul/$emul in order for this package to work
-	properly.
-
-	(It seems there is something else located at /emul/$emul.)
-==============================================================================
-EOF
-			else
-				${MKDIR} -p /emul
-				${LN} -sf ${PKG_PREFIX}/emul/$emul /emul/$emul
-			fi
-		fi
-	fi
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/netbsd32_compat14/Makefile b/emulators/netbsd32_compat14/Makefile
deleted file mode 100644
index d9a687f732d..00000000000
--- a/emulators/netbsd32_compat14/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/10/19 19:39:04 wiz Exp $
-#
-
-DISTNAME=		compat14-${MACHINE32_ARCH}-${VERSION}
-PKGNAME=		netbsd32_compat14-${VERSION}
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.4/index.html
-COMMENT=		32-bit shared libraries for NetBSD 1.4 (and earlier) compatibility
-
-VERSION=		1.4.3.1
-PKGREVISION=		1
-
-.if ${MACHINE_ARCH} == "sparc64"
-MACHINE32_ARCH=	sparc
-DEPENDS+=		netbsd32_compat15>=1.0:../../emulators/netbsd32_compat15
-.elif ${MACHINE_ARCH} == "x86_64"
-MACHINE32_ARCH=	i386
-DEPENDS+=		netbsd32_compat16>=1.0:../../emulators/netbsd32_compat16
-.else
-MACHINE32_ARCH=	${MACHINE_ARCH}
-.endif
-
-ONLY_FOR_PLATFORM=	NetBSD-*-sparc64
-ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-x86_64
-NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
-
-NO_MTREE=		yes
-NO_BUILD=		yes
-CHECK_SHLIBS_SUPPORTED=	no
-
-FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
-FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT:Q}
-FILES_SUBST+=		LDCONFIG=${LDCONFIG:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-EMULSUBDIR=		emul/aout
-COMPAT_LIBDIR=		${EMULSUBDIR}/usr/lib
-COMPAT_XLIBDIR=		${EMULSUBDIR}/usr/X11R6/lib
-
-PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR}
-	${INSTALL_DATA} ${WRKDIR}/lib/lib*.so* ${PREFIX}/${COMPAT_LIBDIR}
-	if [ -d ${WRKDIR}/X11R6/lib ]; then \
-		${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_XLIBDIR}; \
-		${INSTALL_DATA} ${WRKDIR}/X11R6/lib/lib*.so* ${PREFIX}/${COMPAT_XLIBDIR}; \
-	fi
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/netbsd32_compat14/PLIST b/emulators/netbsd32_compat14/PLIST
deleted file mode 100644
index cb003ee56c3..00000000000
--- a/emulators/netbsd32_compat14/PLIST
+++ /dev/null
@@ -1,39 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:02 zuntum Exp $
-${COMPAT_LIBDIR}/libamu.so.1.1
-${COMPAT_LIBDIR}/libbfd.so.3.0
-${COMPAT_LIBDIR}/libbz2.so.0.0
-${COMPAT_LIBDIR}/libc.so.12.40.2
-${COMPAT_LIBDIR}/libcrypt.so.0.0
-${COMPAT_LIBDIR}/libcurses.so.2.2
-${COMPAT_LIBDIR}/libedit.so.2.2
-${COMPAT_LIBDIR}/libg2c.so.0.0
-${COMPAT_LIBDIR}/libgnumalloc.so.0.0
-${COMPAT_LIBDIR}/libkvm.so.5.0
-${COMPAT_LIBDIR}/libm.so.0.1
-${COMPAT_LIBDIR}/libntp.so.0.0
-${COMPAT_LIBDIR}/libobjc.so.0.0
-${COMPAT_LIBDIR}/libossaudio.so.0.0
-${COMPAT_LIBDIR}/libpcap.so.0.0
-${COMPAT_LIBDIR}/libposix.so.0.1
-${COMPAT_LIBDIR}/libresolv.so.1.0
-${COMPAT_LIBDIR}/libskey.so.0.0
-${COMPAT_LIBDIR}/libstdc++.so.2.0
-${COMPAT_LIBDIR}/libtelnet.so.1.0
-${COMPAT_LIBDIR}/libtermcap.so.0.0
-${COMPAT_LIBDIR}/libtermlib.so.0.0
-${COMPAT_LIBDIR}/libutil.so.5.0
-${COMPAT_LIBDIR}/libwrap.so.0.0
-${COMPAT_LIBDIR}/libz.so.0.1
-${COMPAT_XLIBDIR}/libICE.so.6.3
-${COMPAT_XLIBDIR}/libPEX5.so.6.0
-${COMPAT_XLIBDIR}/libSM.so.6.0
-${COMPAT_XLIBDIR}/libX11.so.6.1
-${COMPAT_XLIBDIR}/libXIE.so.6.0
-${COMPAT_XLIBDIR}/libXaw.so.6.1
-${COMPAT_XLIBDIR}/libXext.so.6.3
-${COMPAT_XLIBDIR}/libXi.so.6.0
-${COMPAT_XLIBDIR}/libXmu.so.6.0
-${COMPAT_XLIBDIR}/libXp.so.6.2
-${COMPAT_XLIBDIR}/libXt.so.6.0
-${COMPAT_XLIBDIR}/libXtst.so.6.1
-${COMPAT_XLIBDIR}/liboldX.so.6.0
diff --git a/emulators/netbsd32_compat14/PLIST.x86_64 b/emulators/netbsd32_compat14/PLIST.x86_64
deleted file mode 100644
index 39ea1bb8128..00000000000
--- a/emulators/netbsd32_compat14/PLIST.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.x86_64,v 1.1 2005/02/21 21:08:50 veego Exp $
-${COMPAT_LIBDIR}/libi386.so.0.2
-${COMPAT_LIBDIR}/libkeycap.so.0.0
diff --git a/emulators/netbsd32_compat14/distinfo b/emulators/netbsd32_compat14/distinfo
deleted file mode 100644
index 5601d4c24b4..00000000000
--- a/emulators/netbsd32_compat14/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.6 2006/05/11 19:02:08 veego Exp $
-
-SHA1 (compat14-i386-1.4.3.1.tar.gz) = 7c00ede3cf18bfc437e9262f0e583bde5f134004
-RMD160 (compat14-i386-1.4.3.1.tar.gz) = 7e1aba3308a3efec20384a1170f4b7b2d5e7ac72
-Size (compat14-i386-1.4.3.1.tar.gz) = 1646083 bytes
-SHA1 (compat14-sparc-1.4.3.1.tar.gz) = 9c0e46ced11f1f56fde79158edebb12898ea4ffa
-RMD160 (compat14-sparc-1.4.3.1.tar.gz) = 02a4eb94bb962889a74e9439fbb108b3b3d3e883
-Size (compat14-sparc-1.4.3.1.tar.gz) = 1831758 bytes
diff --git a/emulators/netbsd32_compat15/DEINSTALL b/emulators/netbsd32_compat15/DEINSTALL
deleted file mode 100644
index ce3a679ff7a..00000000000
--- a/emulators/netbsd32_compat15/DEINSTALL
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 19:09:38 jlam Exp $
-
-case ${STAGE} in
-POST-DEINSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	COMPAT_LIBDIR=@COMPAT_LIBDIR@
-	COMPAT_LIBEXECDIR=@COMPAT_LIBEXECDIR@
-	COMPAT_XLIBDIR=@COMPAT_XLIBDIR@
-
-	${RMDIR} -p ${PKG_PREFIX}/${COMPAT_LIBDIR} ${PKG_PREFIX}/${COMPAT_LIBEXECDIR} ${PKG_PREFIX}/${COMPAT_XLIBDIR} 2>/dev/null || ${TRUE}
-
-	# clean up the symlink
-	${RM} -f /emul/netbsd32
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/netbsd32_compat15/DESCR b/emulators/netbsd32_compat15/DESCR
deleted file mode 100644
index 6896be8f4a9..00000000000
--- a/emulators/netbsd32_compat15/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This package supplies the user files necessary for full compatibility with
-dynamically linked executables compiled under NetBSD 1.5, on a 32-bit
-platform, running on a 64-bit host..  You still need the options COMPAT_15
-and COMPAT_NETBSD32 in your kernel configuration (and probably others; see
-options(4) for more information) to make use of NetBSD 1.5 binaries.
diff --git a/emulators/netbsd32_compat15/INSTALL b/emulators/netbsd32_compat15/INSTALL
deleted file mode 100644
index aa33aa31b15..00000000000
--- a/emulators/netbsd32_compat15/INSTALL
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2003/08/30 19:09:38 jlam Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	OBJECT_FMT=@OBJECT_FMT@
-
-	# Only create the symlink on certain platform/object combinations.  Note
-	# that sparc64 a.out compatibility lives in /emul/aout, not /emul/netbsd32.
-	#
-	create_emul_symlink=0
-	if [ "${MACHINE_ARCH}" = "sparc64" ]
-	then
-		create_emul_symlink=1
-	fi
-
-	if [ ${create_emul_symlink} = 1 ]
-	then
-		# Create a symlink from /emul/aout --> ${PKG_PREFIX}/emul/aout
-		# if it doesn't already exist.  Warn if we can't do this.
-		#
-		emul=netbsd32
-		if [ "`cd /etc && cd ${PKG_PREFIX}/emul/$emul 2>/dev/null && pwd -P`" \
-		     != "`cd / && cd /emul/$emul 2>/dev/null && pwd -P`" ]
-		then
-			if [ -e /emul/$emul -o -L /emul/$emul ] || \
-			   [ \( -e /emul -o -L /emul \) -a ! -d /emul ]
-			then
-				${CAT} <<EOF
-==============================================================================
-	IMPORTANT:  You must create a symbolic link from /emul/$emul
-	to ${PKG_PREFIX}/emul/$emul in order for this package to work
-	properly.
-
-	(It seems there is something else located at /emul/$emul.)
-==============================================================================
-EOF
-			else
-				${MKDIR} -p /emul
-				${LN} -sf ${PKG_PREFIX}/emul/$emul /emul/$emul
-			fi
-		fi
-	fi
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/netbsd32_compat15/Makefile b/emulators/netbsd32_compat15/Makefile
deleted file mode 100644
index 89eaf1489e7..00000000000
--- a/emulators/netbsd32_compat15/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:27 wiz Exp $
-#
-
-.if ${MACHINE_ARCH} == "sparc64"
-MACHINE32_ARCH=	sparc
-.else
-MACHINE32_ARCH=	${MACHINE_ARCH}
-.endif
-
-DISTNAME=		compat15-${MACHINE32_ARCH}
-PKGNAME=		netbsd32_compat15-1.0
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.5/index.html
-COMMENT=		32-bit shared libraries for NetBSD 1.5 (and earlier) compatibility
-
-CONFLICTS=		netbsd32_compat16-[0-9]*
-
-ONLY_FOR_PLATFORM=	NetBSD-*-sparc64
-NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
-
-NO_MTREE=		yes
-NO_BUILD=		yes
-CHECK_SHLIBS_SUPPORTED=	no
-
-FILES_SUBST+=		COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR:Q}
-FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
-FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT:Q}
-FILES_SUBST+=		LDCONFIG=${LDCONFIG:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-EMULSUBDIR=		emul/netbsd32
-COMPAT_LIBDIR=		${EMULSUBDIR}/usr/lib
-COMPAT_LIBEXECDIR=	${EMULSUBDIR}/usr/libexec
-COMPAT_XLIBDIR=		${EMULSUBDIR}/usr/X11R6/lib
-
-PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR:Q} COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
-
-# XXX using pax to copy symlinks properly.
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR}
-	(cd ${WRKDIR}/lib; ${PAX} -rwv lib*.so* ${PREFIX}/${COMPAT_LIBDIR}; \
-	 ${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/${COMPAT_LIBDIR}/lib*.so*; \
-	 ${CHMOD} 555 ${PREFIX}/${COMPAT_LIBDIR}/lib*.so* )
-	if [ -d ${WRKDIR}/X11R6/lib ]; then \
-		${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_XLIBDIR}; \
-		(cd ${WRKDIR}/X11R6/lib; ${PAX} -rwv lib*.so* ${PREFIX}/${COMPAT_XLIBDIR}; \
-		 ${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/${COMPAT_XLIBDIR}/lib*.so*; \
-		 ${CHMOD} 555 ${PREFIX}/${COMPAT_XLIBDIR}/lib*.so* ) \
-	fi
-	if [ -d ${WRKDIR}/libexec ]; then \
-		${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBEXECDIR}; \
-		(cd ${WRKDIR}/libexec; ${PAX} -rwv ld.*so ${PREFIX}/${COMPAT_LIBEXECDIR}; \
-		 ${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/${COMPAT_LIBEXECDIR}/ld.*so; \
-		 ${CHMOD} 555 ${PREFIX}/${COMPAT_LIBEXECDIR}/ld.*so ) \
-	fi
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/netbsd32_compat15/PLIST b/emulators/netbsd32_compat15/PLIST
deleted file mode 100644
index ab9b057c1c1..00000000000
--- a/emulators/netbsd32_compat15/PLIST
+++ /dev/null
@@ -1,117 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:06 zuntum Exp $
-${COMPAT_LIBDIR}/libamu.so.1
-${COMPAT_LIBDIR}/libamu.so.1.1
-${COMPAT_LIBDIR}/libasn1.so.2
-${COMPAT_LIBDIR}/libasn1.so.2.0
-${COMPAT_LIBDIR}/libbz2.so.0
-${COMPAT_LIBDIR}/libbz2.so.0.0
-${COMPAT_LIBDIR}/libc.so.12
-${COMPAT_LIBDIR}/libc.so.12.62.1
-${COMPAT_LIBDIR}/libcom_err.so.3
-${COMPAT_LIBDIR}/libcom_err.so.3.0
-${COMPAT_LIBDIR}/libcrypt.so.0
-${COMPAT_LIBDIR}/libcrypt.so.0.0
-${COMPAT_LIBDIR}/libcrypto.so.0
-${COMPAT_LIBDIR}/libcrypto.so.0.2
-${COMPAT_LIBDIR}/libcurses.so.3
-${COMPAT_LIBDIR}/libcurses.so.3.6
-${COMPAT_LIBDIR}/libdes.so.5
-${COMPAT_LIBDIR}/libdes.so.5.1
-${COMPAT_LIBDIR}/libedit.so.2
-${COMPAT_LIBDIR}/libedit.so.2.3
-${COMPAT_LIBDIR}/libg2c.so.0
-${COMPAT_LIBDIR}/libg2c.so.0.0
-${COMPAT_LIBDIR}/libgnumalloc.so.0
-${COMPAT_LIBDIR}/libgnumalloc.so.0.0
-${COMPAT_LIBDIR}/libgssapi.so.0
-${COMPAT_LIBDIR}/libgssapi.so.0.4
-${COMPAT_LIBDIR}/libhdb.so.4
-${COMPAT_LIBDIR}/libhdb.so.4.1
-${COMPAT_LIBDIR}/libipsec.so.2
-${COMPAT_LIBDIR}/libipsec.so.2.0
-${COMPAT_LIBDIR}/libkadm.so.4
-${COMPAT_LIBDIR}/libkadm.so.4.0
-${COMPAT_LIBDIR}/libkadm5clnt.so.5
-${COMPAT_LIBDIR}/libkadm5clnt.so.5.1
-${COMPAT_LIBDIR}/libkadm5srv.so.6
-${COMPAT_LIBDIR}/libkadm5srv.so.6.0
-${COMPAT_LIBDIR}/libkafs.so.4
-${COMPAT_LIBDIR}/libkafs.so.4.0
-${COMPAT_LIBDIR}/libkdb.so.4
-${COMPAT_LIBDIR}/libkdb.so.4.0
-${COMPAT_LIBDIR}/libkrb.so.4
-${COMPAT_LIBDIR}/libkrb.so.4.0
-${COMPAT_LIBDIR}/libkrb5.so.11
-${COMPAT_LIBDIR}/libkrb5.so.11.1
-${COMPAT_LIBDIR}/libkstream.so.1
-${COMPAT_LIBDIR}/libkstream.so.1.0
-${COMPAT_LIBDIR}/libkvm.so.5
-${COMPAT_LIBDIR}/libkvm.so.5.1
-${COMPAT_LIBDIR}/libm.so.0
-${COMPAT_LIBDIR}/libm.so.0.1
-${COMPAT_LIBDIR}/libmenu.so.1
-${COMPAT_LIBDIR}/libmenu.so.1.0
-${COMPAT_LIBDIR}/libobjc.so.0
-${COMPAT_LIBDIR}/libobjc.so.0.0
-${COMPAT_LIBDIR}/libossaudio.so.0
-${COMPAT_LIBDIR}/libossaudio.so.0.0
-${COMPAT_LIBDIR}/libpcap.so.1
-${COMPAT_LIBDIR}/libpcap.so.1.1
-${COMPAT_LIBDIR}/libposix.so.0
-${COMPAT_LIBDIR}/libposix.so.0.1
-${COMPAT_LIBDIR}/libresolv.so.1
-${COMPAT_LIBDIR}/libresolv.so.1.0
-${COMPAT_LIBDIR}/libroken.so.8
-${COMPAT_LIBDIR}/libroken.so.8.1
-${COMPAT_LIBDIR}/libskey.so.1
-${COMPAT_LIBDIR}/libskey.so.1.0
-${COMPAT_LIBDIR}/libsl.so.1
-${COMPAT_LIBDIR}/libsl.so.1.0
-${COMPAT_LIBDIR}/libss.so.3
-${COMPAT_LIBDIR}/libss.so.3.0
-${COMPAT_LIBDIR}/libssl.so.1
-${COMPAT_LIBDIR}/libssl.so.1.0
-${COMPAT_LIBDIR}/libstdc++.so.2
-${COMPAT_LIBDIR}/libstdc++.so.2.0
-${COMPAT_LIBDIR}/libtelnet.so.3
-${COMPAT_LIBDIR}/libtelnet.so.3.0
-${COMPAT_LIBDIR}/libtermcap.so.0
-${COMPAT_LIBDIR}/libtermcap.so.0.4
-${COMPAT_LIBDIR}/libtermlib.so.0
-${COMPAT_LIBDIR}/libtermlib.so.0.4
-${COMPAT_LIBDIR}/libusb.so.0
-${COMPAT_LIBDIR}/libusb.so.0.0
-${COMPAT_LIBDIR}/libutil.so.5
-${COMPAT_LIBDIR}/libutil.so.5.2
-${COMPAT_LIBDIR}/libwrap.so.0
-${COMPAT_LIBDIR}/libwrap.so.0.2
-${COMPAT_LIBDIR}/libz.so.0
-${COMPAT_LIBDIR}/libz.so.0.2
-${COMPAT_XLIBDIR}/libICE.so.6
-${COMPAT_XLIBDIR}/libICE.so.6.3
-${COMPAT_XLIBDIR}/libPEX5.so.6
-${COMPAT_XLIBDIR}/libPEX5.so.6.0
-${COMPAT_XLIBDIR}/libSM.so.6
-${COMPAT_XLIBDIR}/libSM.so.6.0
-${COMPAT_XLIBDIR}/libX11.so.6
-${COMPAT_XLIBDIR}/libX11.so.6.1
-${COMPAT_XLIBDIR}/libXIE.so.6
-${COMPAT_XLIBDIR}/libXIE.so.6.0
-${COMPAT_XLIBDIR}/libXaw.so.6
-${COMPAT_XLIBDIR}/libXaw.so.6.1
-${COMPAT_XLIBDIR}/libXext.so.6
-${COMPAT_XLIBDIR}/libXext.so.6.3
-${COMPAT_XLIBDIR}/libXi.so.6
-${COMPAT_XLIBDIR}/libXi.so.6.0
-${COMPAT_XLIBDIR}/libXmu.so.6
-${COMPAT_XLIBDIR}/libXmu.so.6.0
-${COMPAT_XLIBDIR}/libXp.so.6
-${COMPAT_XLIBDIR}/libXp.so.6.2
-${COMPAT_XLIBDIR}/libXt.so.6
-${COMPAT_XLIBDIR}/libXt.so.6.0
-${COMPAT_XLIBDIR}/libXtst.so.6
-${COMPAT_XLIBDIR}/libXtst.so.6.1
-${COMPAT_XLIBDIR}/liboldX.so.6
-${COMPAT_XLIBDIR}/liboldX.so.6.0
-${COMPAT_LIBEXECDIR}/ld.so
-${COMPAT_LIBEXECDIR}/ld.elf_so
diff --git a/emulators/netbsd32_compat15/distinfo b/emulators/netbsd32_compat15/distinfo
deleted file mode 100644
index 909fecd70f1..00000000000
--- a/emulators/netbsd32_compat15/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/05/25 12:01:21 wiz Exp $
-
-SHA1 (compat15-sparc.tar.gz) = 1abd33e4de7127e27da0b64d915cb7ba53cff2a9
-RMD160 (compat15-sparc.tar.gz) = bfa676c116947596019d1cfa9a132502e8248193
-Size (compat15-sparc.tar.gz) = 2562164 bytes
diff --git a/emulators/netbsd32_compat16/DEINSTALL b/emulators/netbsd32_compat16/DEINSTALL
deleted file mode 100644
index bdf500b2920..00000000000
--- a/emulators/netbsd32_compat16/DEINSTALL
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 19:11:57 jlam Exp $
-
-case ${STAGE} in
-POST-DEINSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	COMPAT_EMULSUBDIR=@COMPAT_EMULSUBDIR@
-
-	${RMDIR} -p ${PKG_PREFIX}/${COMPAT_EMULSUBDIR} 2>/dev/null || ${TRUE}
-
-	# clean up the symlink
-	${RM} -f /emul/netbsd32
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/netbsd32_compat16/DESCR b/emulators/netbsd32_compat16/DESCR
deleted file mode 100644
index aa17c646fc6..00000000000
--- a/emulators/netbsd32_compat16/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This package supplies the user files necessary for full compatibility with
-dynamically linked executables compiled under NetBSD 1.6, on a 32-bit
-platform, running on a 64-bit host..  You still need the options COMPAT_15
-and COMPAT_NETBSD32 in your kernel configuration (and probably others; see
-options(4) for more information) to make use of NetBSD 1.6 binaries.
diff --git a/emulators/netbsd32_compat16/INSTALL b/emulators/netbsd32_compat16/INSTALL
deleted file mode 100644
index 5aff595eed5..00000000000
--- a/emulators/netbsd32_compat16/INSTALL
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: INSTALL,v 1.3 2005/01/11 05:12:56 hamajima Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	OBJECT_FMT=@OBJECT_FMT@
-
-	# Only create the symlink on certain platform/object combinations.  Note
-	# that sparc64 a.out compatibility lives in /emul/aout, not /emul/netbsd32.
-	#
-	create_emul_symlink=0
-	case ${MACHINE_ARCH} in
-		sparc64 | x86_64)
-			create_emul_symlink=1
-			;;
-	esac
-
-	if [ ${create_emul_symlink} = 1 ]
-	then
-		# Create a symlink from /emul/aout --> ${PKG_PREFIX}/emul/aout
-		# if it doesn't already exist.  Warn if we can't do this.
-		#
-		emul=netbsd32
-		if [ "`cd /etc && cd ${PKG_PREFIX}/emul/$emul 2>/dev/null && pwd -P`" \
-		     != "`cd / && cd /emul/$emul 2>/dev/null && pwd -P`" ]
-		then
-			if [ -e /emul/$emul -o -L /emul/$emul ] || \
-			   [ \( -e /emul -o -L /emul \) -a ! -d /emul ]
-			then
-				${CAT} <<EOF
-==============================================================================
-	IMPORTANT:  You must create a symbolic link from /emul/$emul
-	to ${PKG_PREFIX}/emul/$emul in order for this package to work
-	properly.
-
-	(It seems there is something else located at /emul/$emul.)
-==============================================================================
-EOF
-			else
-				${MKDIR} -p /emul
-				${LN} -sf ${PKG_PREFIX}/emul/$emul /emul/$emul
-			fi
-		fi
-	fi
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/netbsd32_compat16/Makefile b/emulators/netbsd32_compat16/Makefile
deleted file mode 100644
index 97fcffd3d87..00000000000
--- a/emulators/netbsd32_compat16/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2006/10/19 19:39:04 wiz Exp $
-#
-
-.if ${MACHINE_ARCH} == "sparc64"
-MACHINE32_ARCH=	sparc
-.elif ${MACHINE_ARCH} == "x86_64"
-MACHINE32_ARCH=	i386
-.else
-MACHINE32_ARCH=	${MACHINE_ARCH}
-.endif
-
-.if ${MACHINE32_ARCH} == "sparc"
-DISTNAME=		compat16-${MACHINE32_ARCH}
-.else
-DISTNAME=		compat16-${MACHINE32_ARCH}-1.6.0
-.endif
-PKGNAME=		netbsd32_compat16-1.0
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.6/index.html
-COMMENT=		32-bit shared libraries for NetBSD 1.6 (and earlier) compatibility
-
-CONFLICTS=		netbsd32_compat15-[0-9]*
-
-ONLY_FOR_PLATFORM=	NetBSD-[2-9]*-sparc64
-ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-x86_64
-NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
-
-NO_MTREE=		yes
-NO_BUILD=		yes
-CHECK_SHLIBS_SUPPORTED=	no
-
-FILES_SUBST+=		COMPAT_EMULSUBDIR=${COMPAT_EMULSUBDIR:Q}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT:Q}
-FILES_SUBST+=		LDCONFIG=${LDCONFIG:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-EMULSUBDIR=		emul/netbsd32
-COMPAT_LIBDIR=		${PREFIX}/${EMULSUBDIR}/usr/lib
-COMPAT_LIBEXECDIR=	${PREFIX}/${EMULSUBDIR}/usr/libexec
-COMPAT_XLIBDIR=		${PREFIX}/${EMULSUBDIR}/usr/X11R6/lib
-
-PLIST_SUBST+=		COMPAT_EMULSUBDIR=${EMULSUBDIR:Q}
-
-# XXX using pax to copy symlinks properly.
-do-install:
-	${INSTALL_DATA_DIR} ${COMPAT_LIBDIR}
-	${INSTALL_DATA_DIR} ${COMPAT_XLIBDIR}
-	${INSTALL_DATA_DIR} ${COMPAT_LIBEXECDIR}
-	(cd ${WRKDIR}/usr/lib; ${PAX} -rwv lib*.so* i18n/lib*.so* ${COMPAT_LIBDIR})
-	(cd ${WRKDIR}/usr/X11R6/lib; ${PAX} -rwv lib*.so* ${COMPAT_XLIBDIR})
-	(cd ${WRKDIR}/usr/libexec; ${PAX} -rwv ld.*so ${COMPAT_LIBEXECDIR})
-	${CHOWN} ${ROOT_USER}:${ROOT_GROUP} \
-		${COMPAT_LIBDIR}/lib*.so* ${COMPAT_LIBDIR}/i18n/lib*.so* \
-		${COMPAT_XLIBDIR}/lib*.so* ${COMPAT_LIBEXECDIR}/ld.*so
-	${CHMOD} 555 ${COMPAT_LIBDIR}/lib*.so* ${COMPAT_LIBDIR}/i18n/lib*.so* \
-		  ${COMPAT_XLIBDIR}/lib*.so* ${COMPAT_LIBEXECDIR}/ld.*so
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/netbsd32_compat16/PLIST b/emulators/netbsd32_compat16/PLIST
deleted file mode 100644
index 806a3d81870..00000000000
--- a/emulators/netbsd32_compat16/PLIST
+++ /dev/null
@@ -1,128 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/02/21 21:18:28 veego Exp $
-${COMPAT_EMULSUBDIR}/usr/lib/libamu.so.2
-${COMPAT_EMULSUBDIR}/usr/lib/libamu.so.2.1
-${COMPAT_EMULSUBDIR}/usr/lib/libasn1.so.6
-${COMPAT_EMULSUBDIR}/usr/lib/libasn1.so.6.0
-${COMPAT_EMULSUBDIR}/usr/lib/libbz2.so.1
-${COMPAT_EMULSUBDIR}/usr/lib/libbz2.so.1.0
-${COMPAT_EMULSUBDIR}/usr/lib/libc.so.12
-${COMPAT_EMULSUBDIR}/usr/lib/libc.so.12.83
-${COMPAT_EMULSUBDIR}/usr/lib/libcdk.so.1
-${COMPAT_EMULSUBDIR}/usr/lib/libcdk.so.1.0
-${COMPAT_EMULSUBDIR}/usr/lib/libcom_err.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/libcom_err.so.4.1
-${COMPAT_EMULSUBDIR}/usr/lib/libcrypt.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libcrypt.so.0.0
-${COMPAT_EMULSUBDIR}/usr/lib/libcrypto.so.1
-${COMPAT_EMULSUBDIR}/usr/lib/libcrypto.so.1.1
-${COMPAT_EMULSUBDIR}/usr/lib/libcurses.so.5
-${COMPAT_EMULSUBDIR}/usr/lib/libcurses.so.5.0
-${COMPAT_EMULSUBDIR}/usr/lib/libdes.so.6
-${COMPAT_EMULSUBDIR}/usr/lib/libdes.so.6.0
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libBIG5.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libBIG5.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libEUC.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libEUC.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libEUCTW.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libEUCTW.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libISO2022.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libISO2022.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libMSKanji.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libMSKanji.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libUTF8.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libUTF8.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/libedit.so.2
-${COMPAT_EMULSUBDIR}/usr/lib/libedit.so.2.6
-${COMPAT_EMULSUBDIR}/usr/lib/libform.so.3
-${COMPAT_EMULSUBDIR}/usr/lib/libform.so.3.0
-${COMPAT_EMULSUBDIR}/usr/lib/libgnumalloc.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libgnumalloc.so.0.0
-${COMPAT_EMULSUBDIR}/usr/lib/libgssapi.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/libgssapi.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/libhdb.so.8
-${COMPAT_EMULSUBDIR}/usr/lib/libhdb.so.8.0
-${COMPAT_EMULSUBDIR}/usr/lib/libintl.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libintl.so.0.0
-${COMPAT_EMULSUBDIR}/usr/lib/libipsec.so.2
-${COMPAT_EMULSUBDIR}/usr/lib/libipsec.so.2.0
-${COMPAT_EMULSUBDIR}/usr/lib/libkadm.so.5
-${COMPAT_EMULSUBDIR}/usr/lib/libkadm.so.5.0
-${COMPAT_EMULSUBDIR}/usr/lib/libkadm5clnt.so.7
-${COMPAT_EMULSUBDIR}/usr/lib/libkadm5clnt.so.7.0
-${COMPAT_EMULSUBDIR}/usr/lib/libkadm5srv.so.8
-${COMPAT_EMULSUBDIR}/usr/lib/libkadm5srv.so.8.0
-${COMPAT_EMULSUBDIR}/usr/lib/libkafs.so.5
-${COMPAT_EMULSUBDIR}/usr/lib/libkafs.so.5.1
-${COMPAT_EMULSUBDIR}/usr/lib/libkdb.so.5
-${COMPAT_EMULSUBDIR}/usr/lib/libkdb.so.5.0
-${COMPAT_EMULSUBDIR}/usr/lib/libkrb.so.5
-${COMPAT_EMULSUBDIR}/usr/lib/libkrb.so.5.1
-${COMPAT_EMULSUBDIR}/usr/lib/libkrb5.so.18
-${COMPAT_EMULSUBDIR}/usr/lib/libkrb5.so.18.0
-${COMPAT_EMULSUBDIR}/usr/lib/libkstream.so.2
-${COMPAT_EMULSUBDIR}/usr/lib/libkstream.so.2.0
-${COMPAT_EMULSUBDIR}/usr/lib/libkvm.so.5
-${COMPAT_EMULSUBDIR}/usr/lib/libkvm.so.5.1
-${COMPAT_EMULSUBDIR}/usr/lib/libm.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libm.so.0.1
-${COMPAT_EMULSUBDIR}/usr/lib/libmenu.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/libmenu.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/libobjc.so.1
-${COMPAT_EMULSUBDIR}/usr/lib/libobjc.so.1.0
-${COMPAT_EMULSUBDIR}/usr/lib/libossaudio.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libossaudio.so.0.0
-${COMPAT_EMULSUBDIR}/usr/lib/libpcap.so.1
-${COMPAT_EMULSUBDIR}/usr/lib/libpcap.so.1.2
-${COMPAT_EMULSUBDIR}/usr/lib/libpci.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libpci.so.0.0
-${COMPAT_EMULSUBDIR}/usr/lib/libposix.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libposix.so.0.1
-${COMPAT_EMULSUBDIR}/usr/lib/libresolv.so.1
-${COMPAT_EMULSUBDIR}/usr/lib/libresolv.so.1.0
-${COMPAT_EMULSUBDIR}/usr/lib/libroken.so.12
-${COMPAT_EMULSUBDIR}/usr/lib/libroken.so.12.2
-${COMPAT_EMULSUBDIR}/usr/lib/libskey.so.1
-${COMPAT_EMULSUBDIR}/usr/lib/libskey.so.1.0
-${COMPAT_EMULSUBDIR}/usr/lib/libsl.so.2
-${COMPAT_EMULSUBDIR}/usr/lib/libsl.so.2.0
-${COMPAT_EMULSUBDIR}/usr/lib/libss.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/libss.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/libssl.so.2
-${COMPAT_EMULSUBDIR}/usr/lib/libssl.so.2.1
-${COMPAT_EMULSUBDIR}/usr/lib/libstdc++.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/libstdc++.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/libtelnet.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/libtelnet.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/libtermcap.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libtermcap.so.0.5
-${COMPAT_EMULSUBDIR}/usr/lib/libtermlib.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libtermlib.so.0.5
-${COMPAT_EMULSUBDIR}/usr/lib/libusbhid.so.1
-${COMPAT_EMULSUBDIR}/usr/lib/libusbhid.so.1.0
-${COMPAT_EMULSUBDIR}/usr/lib/libutil.so.6
-${COMPAT_EMULSUBDIR}/usr/lib/libutil.so.6.0
-${COMPAT_EMULSUBDIR}/usr/lib/libwrap.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libwrap.so.0.2
-${COMPAT_EMULSUBDIR}/usr/lib/libz.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libz.so.0.2
-${COMPAT_EMULSUBDIR}/usr/libexec/ld.elf_so
-${COMPAT_EMULSUBDIR}/usr/libexec/ld.so
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6.3
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libSM.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libSM.so.6.0
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6.1
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXi.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXi.so.6.0
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXp.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXp.so.6.2
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXt.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXt.so.6.0
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6.1
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6.0
diff --git a/emulators/netbsd32_compat16/PLIST.sparc64 b/emulators/netbsd32_compat16/PLIST.sparc64
deleted file mode 100644
index 06f9c71c957..00000000000
--- a/emulators/netbsd32_compat16/PLIST.sparc64
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.sparc64,v 1.1 2005/02/21 21:18:28 veego Exp $
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libPEX5.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libPEX5.so.6.0
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6.1
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXIE.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXIE.so.6.0
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6.3
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6.0
diff --git a/emulators/netbsd32_compat16/PLIST.x86_64 b/emulators/netbsd32_compat16/PLIST.x86_64
deleted file mode 100644
index cf2e1c1f795..00000000000
--- a/emulators/netbsd32_compat16/PLIST.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.x86_64,v 1.1 2005/02/21 21:18:28 veego Exp $
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6.2
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6.4
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6.2
diff --git a/emulators/netbsd32_compat16/distinfo b/emulators/netbsd32_compat16/distinfo
deleted file mode 100644
index 9136ff9988e..00000000000
--- a/emulators/netbsd32_compat16/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 18:49:19 agc Exp $
-
-SHA1 (compat16-sparc.tar.bz2) = f5cb874b06e2664582bf06680a952cf7bb571aaa
-Size (compat16-sparc.tar.bz2) = 2550861 bytes
-SHA1 (compat16-i386-1.6.0.tar.bz2) = 04c2fc19591941bb4ae79a2a909e5871b37dc33a
-RMD160 (compat16-i386-1.6.0.tar.bz2) = 175e64b53435ae1c2af3a143f3001ba6df7dad20
-Size (compat16-i386-1.6.0.tar.bz2) = 2478593 bytes
diff --git a/emulators/openmsx/DESCR b/emulators/openmsx/DESCR
deleted file mode 100644
index 28d8cd721cc..00000000000
--- a/emulators/openmsx/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-openMSX, the open source MSX emulator that tries to achieve near-perfect
-emulation by using a novel emulation model.
-
-Hardware emulated:
-
-	o almost all MSX systems, except for some details.
-	o Different CPU clock speeds, including those for the Panasonic
-	  MSX2+ machines.
-	o Almost all known cartridge mapper types via autodetection or the
-          included ROM database.
-	o Many MSX storage (disk/SRAM) systems.
-	o kanji JIS ROM 1 and 2.
-	o Mouse and joystick (with option to use the keyboard as joystick).
-	o rensha turbo auto fire support.
-
-And more!
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
deleted file mode 100644
index 893cce8d1ed..00000000000
--- a/emulators/openmsx/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2006/09/09 02:41:59 obache Exp $
-#
-
-DISTNAME=		openmsx-0.5.2
-PKGREVISION=		4
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=openmsx/}
-
-MAINTAINER=		xtraeme@NetBSD.org
-HOMEPAGE=		http://openmsx.sourceforge.net/
-COMMENT=		MSX emulator that aims for perfection
-
-USE_TOOLS+=		gmake
-USE_LANGUAGES=		c c++
-HAS_CONFIGURE=		yes
-
-MAKE_FILE=		GNUmakefile
-CONFIGURE_ENV+=		OPENMSX_FLAVOUR=pkgsrc
-MAKE_ENV+=		OPENMSX_FLAVOUR=pkgsrc
-
-post-extract:
-	@${CP} ${FILESDIR}/platform-netbsd.mk ${WRKSRC}/build
-	@${LN} -s platform-netbsd.mk ${WRKSRC}/build/platform-dragonfly.mk
-	@${ECHO_MSG} "OPENMSX_STRIP:=true" > \
-		${WRKSRC}/build/flavour-pkgsrc.mk
-
-SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
-SUBST_FILES.prefix=	build/custom.mk
-SUBST_SED.prefix=	-e "s,/opt/openMSX,${PREFIX}/openmsx,"
-SUBST_MESSAGE.prefix=	Fixing installation directory.
-
-post-build:
-	@(							\
-	${ECHO} "#!${SH}";					\
-	${ECHO} 'exec ${PREFIX}/openmsx/bin/openmsx $$@'	\
-	) > ${WRKSRC}/openmsx.sh
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/openmsx.sh ${PREFIX}/bin/openmsx
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/SDL_image/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../lang/tcl/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/openmsx/PLIST b/emulators/openmsx/PLIST
deleted file mode 100644
index 75a3bc935f2..00000000000
--- a/emulators/openmsx/PLIST
+++ /dev/null
@@ -1,485 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/08/27 12:04:04 xtraeme Exp $
-bin/openmsx
-openmsx/bin/openmsx
-openmsx/doc/AUTHORS
-openmsx/doc/GPL
-openmsx/doc/README
-openmsx/doc/after-bussum-FAQ.txt
-openmsx/doc/cbios.txt
-openmsx/doc/commands.txt
-openmsx/doc/exampleconfigs.xml
-openmsx/doc/manual/cartnotfound.png
-openmsx/doc/manual/compile.html
-openmsx/doc/manual/faq.html
-openmsx/doc/manual/index.html
-openmsx/doc/manual/manual-minty.css
-openmsx/doc/manual/manual-purple.css
-openmsx/doc/manual/manual.css
-openmsx/doc/manual/nocartfound.png
-openmsx/doc/manual/setup.html
-openmsx/doc/manual/user.html
-openmsx/doc/release-history.txt
-openmsx/doc/release-notes.txt
-openmsx/doc/using-diskmanipulator.txt
-openmsx/share/extensions/Checkmark_FM_Stereo_PAK/hardwareconfig.xml
-openmsx/share/extensions/Checkmark_FM_Stereo_PAK/roms/SHA1SUMS
-openmsx/share/extensions/Konami_EC-702/hardwareconfig.xml
-openmsx/share/extensions/Konami_EC-702/roms/SHA1SUMS
-openmsx/share/extensions/Konami_SD-Snatcher_Sound_Cartridge/hardwareconfig.xml
-openmsx/share/extensions/Konami_Snatcher_Sound_Cartridge/hardwareconfig.xml
-openmsx/share/extensions/MegaRAM_Disk/hardwareconfig.xml
-openmsx/share/extensions/MegaRAM_Disk/roms/SHA1SUMS
-openmsx/share/extensions/Microsol_CDX-2/hardwareconfig.xml
-openmsx/share/extensions/Microsol_CDX-2/roms/SHA1SUMS
-openmsx/share/extensions/Panasonic_FS-CA1/hardwareconfig.xml
-openmsx/share/extensions/Panasonic_FS-CA1/roms/SHA1SUMS
-openmsx/share/extensions/Philips_NMS_1205/hardwareconfig.xml
-openmsx/share/extensions/Philips_NMS_1205/roms/SHA1SUMS
-openmsx/share/extensions/Sony_HBD-F1/hardwareconfig.xml
-openmsx/share/extensions/Sony_HBD-F1/roms/SHA1SUMS
-openmsx/share/extensions/Sony_HBI-55/hardwareconfig.xml
-openmsx/share/extensions/Sony_HBK-30/hardwareconfig.xml
-openmsx/share/extensions/Sony_HBK-30/roms/SHA1SUMS
-openmsx/share/extensions/Toshiba_HX-MU900/hardwareconfig.xml
-openmsx/share/extensions/Toshiba_HX-MU900/roms/SHA1SUMS
-openmsx/share/extensions/audio/hardwareconfig.xml
-openmsx/share/extensions/audio2/hardwareconfig.xml
-openmsx/share/extensions/debugdevice/hardwareconfig.xml
-openmsx/share/extensions/fmpac/hardwareconfig.xml
-openmsx/share/extensions/fmpac/roms/SHA1SUMS
-openmsx/share/extensions/gfx9000/hardwareconfig.xml
-openmsx/share/extensions/ide/hardwareconfig.xml
-openmsx/share/extensions/ide/roms/SHA1SUMS
-openmsx/share/extensions/mbstereo/hardwareconfig.xml
-openmsx/share/extensions/mbstereo/roms/SHA1SUMS
-openmsx/share/extensions/megaram/hardwareconfig.xml
-openmsx/share/extensions/moonsound/hardwareconfig.xml
-openmsx/share/extensions/moonsound/roms/SHA1SUMS
-openmsx/share/extensions/msxdos2/hardwareconfig.xml
-openmsx/share/extensions/msxdos2/roms/SHA1SUMS
-openmsx/share/extensions/pac/hardwareconfig.xml
-openmsx/share/extensions/ram1mb/hardwareconfig.xml
-openmsx/share/extensions/ram2mb/hardwareconfig.xml
-openmsx/share/extensions/ram4mb/hardwareconfig.xml
-openmsx/share/extensions/ram512k/hardwareconfig.xml
-openmsx/share/extensions/rs232/hardwareconfig.xml
-openmsx/share/extensions/rs232/roms/SHA1SUMS
-openmsx/share/extensions/scc+/hardwareconfig.xml
-openmsx/share/extensions/scc/hardwareconfig.xml
-openmsx/share/extensions/slotexpander/hardwareconfig.xml
-openmsx/share/init.tcl
-openmsx/share/keymaps/keymap.default
-openmsx/share/keymaps/keymap.rus2eng
-openmsx/share/machines/Boosted_MSX2_EN/README
-openmsx/share/machines/Boosted_MSX2_EN/hardwareconfig.xml
-openmsx/share/machines/Boosted_MSX2_EN/roms/README
-openmsx/share/machines/C-BIOS_MSX1/hardwareconfig.xml
-openmsx/share/machines/C-BIOS_MSX1/roms/cbios_main_msx1.rom
-openmsx/share/machines/C-BIOS_MSX2+/hardwareconfig.xml
-openmsx/share/machines/C-BIOS_MSX2+/roms/cbios_main_msx2+.rom
-openmsx/share/machines/C-BIOS_MSX2+/roms/cbios_music.rom
-openmsx/share/machines/C-BIOS_MSX2+/roms/cbios_sub.rom
-openmsx/share/machines/C-BIOS_MSX2/hardwareconfig.xml
-openmsx/share/machines/C-BIOS_MSX2/roms/cbios_main_msx2.rom
-openmsx/share/machines/C-BIOS_MSX2/roms/cbios_sub.rom
-openmsx/share/machines/Canon_V-20/hardwareconfig.xml
-openmsx/share/machines/Canon_V-20/roms/SHA1SUMS
-openmsx/share/machines/Daewoo_CPC-300/hardwareconfig.xml
-openmsx/share/machines/Daewoo_CPC-300/roms/SHA1SUMS
-openmsx/share/machines/Daewoo_CPC-400S/hardwareconfig.xml
-openmsx/share/machines/Daewoo_CPC-400S/roms/SHA1SUMS
-openmsx/share/machines/Daewoo_DPC-100/hardwareconfig.xml
-openmsx/share/machines/Daewoo_DPC-100/roms/SHA1SUMS
-openmsx/share/machines/Daewoo_DPC-180/hardwareconfig.xml
-openmsx/share/machines/Daewoo_DPC-180/roms/SHA1SUMS
-openmsx/share/machines/Daewoo_DPC-200/hardwareconfig.xml
-openmsx/share/machines/Daewoo_DPC-200/roms/SHA1SUMS
-openmsx/share/machines/Goldstar_FC-200/hardwareconfig.xml
-openmsx/share/machines/Goldstar_FC-200/roms/SHA1SUMS
-openmsx/share/machines/Gradiente_Expert_1.0/hardwareconfig.xml
-openmsx/share/machines/Gradiente_Expert_1.0/roms/SHA1SUMS
-openmsx/share/machines/Gradiente_Expert_1.1/hardwareconfig.xml
-openmsx/share/machines/Gradiente_Expert_1.1/roms/SHA1SUMS
-openmsx/share/machines/Gradiente_Expert_DDPlus/hardwareconfig.xml
-openmsx/share/machines/Gradiente_Expert_DDPlus/roms/SHA1SUMS
-openmsx/share/machines/Gradiente_Expert_Plus/hardwareconfig.xml
-openmsx/share/machines/Gradiente_Expert_Plus/roms/SHA1SUMS
-openmsx/share/machines/JVC_HC-7GB/hardwareconfig.xml
-openmsx/share/machines/JVC_HC-7GB/roms/SHA1SUMS
-openmsx/share/machines/Mitsubishi_ML-F80/hardwareconfig.xml
-openmsx/share/machines/Mitsubishi_ML-F80/roms/SHA1SUMS
-openmsx/share/machines/Mitsubishi_ML-FX1/hardwareconfig.xml
-openmsx/share/machines/Mitsubishi_ML-FX1/roms/SHA1SUMS
-openmsx/share/machines/National_CF-1200/hardwareconfig.xml
-openmsx/share/machines/National_CF-1200/roms/SHA1SUMS
-openmsx/share/machines/National_CF-2000/hardwareconfig.xml
-openmsx/share/machines/National_CF-2000/roms/SHA1SUMS
-openmsx/share/machines/National_CF-2700/hardwareconfig.xml
-openmsx/share/machines/National_CF-2700/roms/SHA1SUMS
-openmsx/share/machines/National_CF-3000/hardwareconfig.xml
-openmsx/share/machines/National_CF-3000/roms/SHA1SUMS
-openmsx/share/machines/National_CF-3300/hardwareconfig.xml
-openmsx/share/machines/National_CF-3300/roms/SHA1SUMS
-openmsx/share/machines/National_FS-1300/hardwareconfig.xml
-openmsx/share/machines/National_FS-1300/roms/SHA1SUMS
-openmsx/share/machines/National_FS-4000/hardwareconfig.xml
-openmsx/share/machines/National_FS-4000/roms/SHA1SUMS
-openmsx/share/machines/National_FS-4500/hardwareconfig.xml
-openmsx/share/machines/National_FS-4500/roms/SHA1SUMS
-openmsx/share/machines/National_FS-4600/hardwareconfig.xml
-openmsx/share/machines/National_FS-4600/roms/SHA1SUMS
-openmsx/share/machines/National_FS-4700/hardwareconfig.xml
-openmsx/share/machines/National_FS-4700/roms/SHA1SUMS
-openmsx/share/machines/National_FS-5000/hardwareconfig.xml
-openmsx/share/machines/National_FS-5000/roms/SHA1SUMS
-openmsx/share/machines/National_FS-5500F1/hardwareconfig.xml
-openmsx/share/machines/National_FS-5500F1/roms/SHA1SUMS
-openmsx/share/machines/National_FS-5500F2/hardwareconfig.xml
-openmsx/share/machines/National_FS-5500F2/roms/SHA1SUMS
-openmsx/share/machines/Panasonic_FS-A1/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1/roms/SHA1SUMS
-openmsx/share/machines/Panasonic_FS-A1F/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1F/roms/SHA1SUMS
-openmsx/share/machines/Panasonic_FS-A1FM/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1FM/roms/SHA1SUMS
-openmsx/share/machines/Panasonic_FS-A1FX/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1FX/roms/SHA1SUMS
-openmsx/share/machines/Panasonic_FS-A1GT/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1GT/roms/SHA1SUMS
-openmsx/share/machines/Panasonic_FS-A1MK2/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1MK2/roms/SHA1SUMS
-openmsx/share/machines/Panasonic_FS-A1ST/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1ST/roms/SHA1SUMS
-openmsx/share/machines/Panasonic_FS-A1WSX/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1WSX/roms/SHA1SUMS
-openmsx/share/machines/Panasonic_FS-A1WX/hardwareconfig.xml
-openmsx/share/machines/Panasonic_FS-A1WX/roms/SHA1SUMS
-openmsx/share/machines/Philips_NMS_8220/hardwareconfig.xml
-openmsx/share/machines/Philips_NMS_8220/roms/SHA1SUMS
-openmsx/share/machines/Philips_NMS_8245/hardwareconfig.xml
-openmsx/share/machines/Philips_NMS_8245/roms/SHA1SUMS
-openmsx/share/machines/Philips_NMS_8250/hardwareconfig.xml
-openmsx/share/machines/Philips_NMS_8250/roms/SHA1SUMS
-openmsx/share/machines/Philips_NMS_8255/hardwareconfig.xml
-openmsx/share/machines/Philips_NMS_8255/roms/SHA1SUMS
-openmsx/share/machines/Philips_VG_8020-20/hardwareconfig.xml
-openmsx/share/machines/Philips_VG_8020-20/roms/SHA1SUMS
-openmsx/share/machines/Philips_VG_8020/hardwareconfig.xml
-openmsx/share/machines/Philips_VG_8020/roms/SHA1SUMS
-openmsx/share/machines/Philips_VG_8230/hardwareconfig.xml
-openmsx/share/machines/Philips_VG_8230/roms/SHA1SUMS
-openmsx/share/machines/Philips_VG_8235/hardwareconfig.xml
-openmsx/share/machines/Philips_VG_8235/roms/SHA1SUMS
-openmsx/share/machines/SHA1SUMS
-openmsx/share/machines/Sanyo_MPC100/hardwareconfig.xml
-openmsx/share/machines/Sanyo_MPC100/roms/SHA1SUMS
-openmsx/share/machines/Sanyo_PHC-35J/hardwareconfig.xml
-openmsx/share/machines/Sanyo_PHC-35J/roms/SHA1SUMS
-openmsx/share/machines/Sanyo_PHC-70FD/hardwareconfig.xml
-openmsx/share/machines/Sanyo_PHC-70FD/roms/SHA1SUMS
-openmsx/share/machines/Sanyo_PHC-70FD2/hardwareconfig.xml
-openmsx/share/machines/Sanyo_PHC-70FD2/roms/SHA1SUMS
-openmsx/share/machines/Sharp_Epcom_HotBit_1.1/hardwareconfig.xml
-openmsx/share/machines/Sharp_Epcom_HotBit_1.1/roms/SHA1SUMS
-openmsx/share/machines/Sharp_Epcom_HotBit_1.2/hardwareconfig.xml
-openmsx/share/machines/Sharp_Epcom_HotBit_1.2/roms/SHA1SUMS
-openmsx/share/machines/Sony_HB-101P/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-201P/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-201P/roms/SHA1SUMS
-openmsx/share/machines/Sony_HB-501P/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-501P/roms/SHA1SUMS
-openmsx/share/machines/Sony_HB-75P/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-75P/roms/SHA1SUMS
-openmsx/share/machines/Sony_HB-F1/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-F1/roms/SHA1SUMS
-openmsx/share/machines/Sony_HB-F1II/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-F1II/roms/SHA1SUMS
-openmsx/share/machines/Sony_HB-F1XD/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-F1XD/roms/SHA1SUMS
-openmsx/share/machines/Sony_HB-F500P/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-F500P/roms/SHA1SUMS
-openmsx/share/machines/Sony_HB-F700D/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-F700D/roms/SHA1SUMS
-openmsx/share/machines/Sony_HB-F900/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-F900/roms/SHA1SUMS
-openmsx/share/machines/Sony_HB-F9P/hardwareconfig.xml
-openmsx/share/machines/Sony_HB-F9P/roms/SHA1SUMS
-openmsx/share/machines/Spectravideo_SVI-728/hardwareconfig.xml
-openmsx/share/machines/Spectravideo_SVI-728/roms/SHA1SUMS
-openmsx/share/machines/Toshiba_HX-10/hardwareconfig.xml
-openmsx/share/machines/Toshiba_HX-10/roms/SHA1SUMS
-openmsx/share/machines/msx1
-openmsx/share/machines/msx2
-openmsx/share/machines/msx2plus
-openmsx/share/machines/turbor
-openmsx/share/scripts/cheat.tcl
-openmsx/share/scripts/convert_hardwareconfig.py
-openmsx/share/scripts/convert_hardwareconfig2.py
-openmsx/share/scripts/cpuregs.tcl
-openmsx/share/scripts/cycle.tcl
-openmsx/share/scripts/disasm.tcl
-openmsx/share/scripts/load_icons.tcl
-openmsx/share/scripts/multi_screenshot.tcl
-openmsx/share/scripts/save_debuggable.tcl
-openmsx/share/scripts/showmem.tcl
-openmsx/share/scripts/stack.tcl
-openmsx/share/scripts/toggle_freq.tcl
-openmsx/share/scripts/trainers.tcl
-openmsx/share/settings.xml
-openmsx/share/skins/ConsoleBackground.png
-openmsx/share/skins/ConsoleBackground1.png
-openmsx/share/skins/ConsoleBackground2.png
-openmsx/share/skins/ConsoleBackground3.png
-openmsx/share/skins/ConsoleBackground4.png
-openmsx/share/skins/ConsoleBackground5.png
-openmsx/share/skins/ConsoleBackground6.png
-openmsx/share/skins/ConsoleBackgroundBlue.png
-openmsx/share/skins/ConsoleBackgroundGrey.png
-openmsx/share/skins/ConsoleFont.png
-openmsx/share/skins/ConsoleFont1.png
-openmsx/share/skins/ConsoleFontRave.png
-openmsx/share/skins/ConsoleFontRaveL.png
-openmsx/share/skins/ConsoleFontRaveLShaded.png
-openmsx/share/skins/ConsoleFontRaveShaded.png
-openmsx/share/skins/ConsoleFontShaded.png
-openmsx/share/skins/led-off.png
-openmsx/share/skins/led.png
-openmsx/share/skins/none/skin.tcl
-openmsx/share/skins/set1/caps-off.png
-openmsx/share/skins/set1/caps-on.png
-openmsx/share/skins/set1/code-off.png
-openmsx/share/skins/set1/code-on.png
-openmsx/share/skins/set1/fdd-off.png
-openmsx/share/skins/set1/fdd-on.png
-openmsx/share/skins/set1/kana-off.png
-openmsx/share/skins/set1/kana-on.png
-openmsx/share/skins/set1/pause-off.png
-openmsx/share/skins/set1/pause-on.png
-openmsx/share/skins/set1/power-off.png
-openmsx/share/skins/set1/power-on.png
-openmsx/share/skins/set1/skin.tcl
-openmsx/share/skins/set1/turbo-off.png
-openmsx/share/skins/set1/turbo-on.png
-openmsx/share/skins/set2/caps-off.png
-openmsx/share/skins/set2/caps-on.png
-openmsx/share/skins/set2/fdd-off.png
-openmsx/share/skins/set2/fdd-on.png
-openmsx/share/skins/set2/kana-off.png
-openmsx/share/skins/set2/kana-on.png
-openmsx/share/skins/set2/pause-off.png
-openmsx/share/skins/set2/pause-on.png
-openmsx/share/skins/set2/power-off.png
-openmsx/share/skins/set2/power-on.png
-openmsx/share/skins/set2/skin.tcl
-openmsx/share/skins/set2/turbo-off.png
-openmsx/share/skins/set2/turbo-on.png
-openmsx/share/skins/set4/caps-off.png
-openmsx/share/skins/set4/caps-on.png
-openmsx/share/skins/set4/fdd-off.png
-openmsx/share/skins/set4/fdd-on.png
-openmsx/share/skins/set4/kana-off.png
-openmsx/share/skins/set4/kana-on.png
-openmsx/share/skins/set4/pause-off.png
-openmsx/share/skins/set4/pause-on.png
-openmsx/share/skins/set4/power-off.png
-openmsx/share/skins/set4/power-on.png
-openmsx/share/skins/set4/skin.tcl
-openmsx/share/skins/set4/turbo-off.png
-openmsx/share/skins/set4/turbo-on.png
-openmsx/share/softwaredb.xml
-openmsx/share/systemroms/.cvsignore
-openmsx/share/systemroms/README
-@dirrm openmsx/share/systemroms
-@dirrm openmsx/share/skins/set4
-@dirrm openmsx/share/skins/set2
-@dirrm openmsx/share/skins/set1
-@dirrm openmsx/share/skins/none
-@dirrm openmsx/share/skins
-@dirrm openmsx/share/scripts
-@dirrm openmsx/share/machines/Toshiba_HX-10/roms
-@dirrm openmsx/share/machines/Toshiba_HX-10
-@dirrm openmsx/share/machines/Spectravideo_SVI-728/roms
-@dirrm openmsx/share/machines/Spectravideo_SVI-728
-@dirrm openmsx/share/machines/Sony_HB-F9P/roms
-@dirrm openmsx/share/machines/Sony_HB-F9P
-@dirrm openmsx/share/machines/Sony_HB-F900/roms
-@dirrm openmsx/share/machines/Sony_HB-F900
-@dirrm openmsx/share/machines/Sony_HB-F700D/roms
-@dirrm openmsx/share/machines/Sony_HB-F700D
-@dirrm openmsx/share/machines/Sony_HB-F500P/roms
-@dirrm openmsx/share/machines/Sony_HB-F500P
-@dirrm openmsx/share/machines/Sony_HB-F1XD/roms
-@dirrm openmsx/share/machines/Sony_HB-F1XD
-@dirrm openmsx/share/machines/Sony_HB-F1II/roms
-@dirrm openmsx/share/machines/Sony_HB-F1II
-@dirrm openmsx/share/machines/Sony_HB-F1/roms
-@dirrm openmsx/share/machines/Sony_HB-F1
-@dirrm openmsx/share/machines/Sony_HB-75P/roms
-@dirrm openmsx/share/machines/Sony_HB-75P
-@dirrm openmsx/share/machines/Sony_HB-501P/roms
-@dirrm openmsx/share/machines/Sony_HB-501P
-@dirrm openmsx/share/machines/Sony_HB-201P/roms
-@dirrm openmsx/share/machines/Sony_HB-201P
-@dirrm openmsx/share/machines/Sony_HB-101P
-@dirrm openmsx/share/machines/Sharp_Epcom_HotBit_1.2/roms
-@dirrm openmsx/share/machines/Sharp_Epcom_HotBit_1.2
-@dirrm openmsx/share/machines/Sharp_Epcom_HotBit_1.1/roms
-@dirrm openmsx/share/machines/Sharp_Epcom_HotBit_1.1
-@dirrm openmsx/share/machines/Sanyo_PHC-70FD2/roms
-@dirrm openmsx/share/machines/Sanyo_PHC-70FD2
-@dirrm openmsx/share/machines/Sanyo_PHC-70FD/roms
-@dirrm openmsx/share/machines/Sanyo_PHC-70FD
-@dirrm openmsx/share/machines/Sanyo_PHC-35J/roms
-@dirrm openmsx/share/machines/Sanyo_PHC-35J
-@dirrm openmsx/share/machines/Sanyo_MPC100/roms
-@dirrm openmsx/share/machines/Sanyo_MPC100
-@dirrm openmsx/share/machines/Philips_VG_8235/roms
-@dirrm openmsx/share/machines/Philips_VG_8235
-@dirrm openmsx/share/machines/Philips_VG_8230/roms
-@dirrm openmsx/share/machines/Philips_VG_8230
-@dirrm openmsx/share/machines/Philips_VG_8020/roms
-@dirrm openmsx/share/machines/Philips_VG_8020-20/roms
-@dirrm openmsx/share/machines/Philips_VG_8020-20
-@dirrm openmsx/share/machines/Philips_VG_8020
-@dirrm openmsx/share/machines/Philips_NMS_8255/roms
-@dirrm openmsx/share/machines/Philips_NMS_8255
-@dirrm openmsx/share/machines/Philips_NMS_8250/roms
-@dirrm openmsx/share/machines/Philips_NMS_8250
-@dirrm openmsx/share/machines/Philips_NMS_8245/roms
-@dirrm openmsx/share/machines/Philips_NMS_8245
-@dirrm openmsx/share/machines/Philips_NMS_8220/roms
-@dirrm openmsx/share/machines/Philips_NMS_8220
-@dirrm openmsx/share/machines/Panasonic_FS-A1WX/roms
-@dirrm openmsx/share/machines/Panasonic_FS-A1WX
-@dirrm openmsx/share/machines/Panasonic_FS-A1WSX/roms
-@dirrm openmsx/share/machines/Panasonic_FS-A1WSX
-@dirrm openmsx/share/machines/Panasonic_FS-A1ST/roms
-@dirrm openmsx/share/machines/Panasonic_FS-A1ST
-@dirrm openmsx/share/machines/Panasonic_FS-A1MK2/roms
-@dirrm openmsx/share/machines/Panasonic_FS-A1MK2
-@dirrm openmsx/share/machines/Panasonic_FS-A1GT/roms
-@dirrm openmsx/share/machines/Panasonic_FS-A1GT
-@dirrm openmsx/share/machines/Panasonic_FS-A1FX/roms
-@dirrm openmsx/share/machines/Panasonic_FS-A1FX
-@dirrm openmsx/share/machines/Panasonic_FS-A1FM/roms
-@dirrm openmsx/share/machines/Panasonic_FS-A1FM
-@dirrm openmsx/share/machines/Panasonic_FS-A1F/roms
-@dirrm openmsx/share/machines/Panasonic_FS-A1F
-@dirrm openmsx/share/machines/Panasonic_FS-A1/roms
-@dirrm openmsx/share/machines/Panasonic_FS-A1
-@dirrm openmsx/share/machines/National_FS-5500F2/roms
-@dirrm openmsx/share/machines/National_FS-5500F2
-@dirrm openmsx/share/machines/National_FS-5500F1/roms
-@dirrm openmsx/share/machines/National_FS-5500F1
-@dirrm openmsx/share/machines/National_FS-5000/roms
-@dirrm openmsx/share/machines/National_FS-5000
-@dirrm openmsx/share/machines/National_FS-4700/roms
-@dirrm openmsx/share/machines/National_FS-4700
-@dirrm openmsx/share/machines/National_FS-4600/roms
-@dirrm openmsx/share/machines/National_FS-4600
-@dirrm openmsx/share/machines/National_FS-4500/roms
-@dirrm openmsx/share/machines/National_FS-4500
-@dirrm openmsx/share/machines/National_FS-4000/roms
-@dirrm openmsx/share/machines/National_FS-4000
-@dirrm openmsx/share/machines/National_FS-1300/roms
-@dirrm openmsx/share/machines/National_FS-1300
-@dirrm openmsx/share/machines/National_CF-3300/roms
-@dirrm openmsx/share/machines/National_CF-3300
-@dirrm openmsx/share/machines/National_CF-3000/roms
-@dirrm openmsx/share/machines/National_CF-3000
-@dirrm openmsx/share/machines/National_CF-2700/roms
-@dirrm openmsx/share/machines/National_CF-2700
-@dirrm openmsx/share/machines/National_CF-2000/roms
-@dirrm openmsx/share/machines/National_CF-2000
-@dirrm openmsx/share/machines/National_CF-1200/roms
-@dirrm openmsx/share/machines/National_CF-1200
-@dirrm openmsx/share/machines/Mitsubishi_ML-FX1/roms
-@dirrm openmsx/share/machines/Mitsubishi_ML-FX1
-@dirrm openmsx/share/machines/Mitsubishi_ML-F80/roms
-@dirrm openmsx/share/machines/Mitsubishi_ML-F80
-@dirrm openmsx/share/machines/JVC_HC-7GB/roms
-@dirrm openmsx/share/machines/JVC_HC-7GB
-@dirrm openmsx/share/machines/Gradiente_Expert_Plus/roms
-@dirrm openmsx/share/machines/Gradiente_Expert_Plus
-@dirrm openmsx/share/machines/Gradiente_Expert_DDPlus/roms
-@dirrm openmsx/share/machines/Gradiente_Expert_DDPlus
-@dirrm openmsx/share/machines/Gradiente_Expert_1.1/roms
-@dirrm openmsx/share/machines/Gradiente_Expert_1.1
-@dirrm openmsx/share/machines/Gradiente_Expert_1.0/roms
-@dirrm openmsx/share/machines/Gradiente_Expert_1.0
-@dirrm openmsx/share/machines/Goldstar_FC-200/roms
-@dirrm openmsx/share/machines/Goldstar_FC-200
-@dirrm openmsx/share/machines/Daewoo_DPC-200/roms
-@dirrm openmsx/share/machines/Daewoo_DPC-200
-@dirrm openmsx/share/machines/Daewoo_DPC-180/roms
-@dirrm openmsx/share/machines/Daewoo_DPC-180
-@dirrm openmsx/share/machines/Daewoo_DPC-100/roms
-@dirrm openmsx/share/machines/Daewoo_DPC-100
-@dirrm openmsx/share/machines/Daewoo_CPC-400S/roms
-@dirrm openmsx/share/machines/Daewoo_CPC-400S
-@dirrm openmsx/share/machines/Daewoo_CPC-300/roms
-@dirrm openmsx/share/machines/Daewoo_CPC-300
-@dirrm openmsx/share/machines/Canon_V-20/roms
-@dirrm openmsx/share/machines/Canon_V-20
-@dirrm openmsx/share/machines/C-BIOS_MSX2/roms
-@dirrm openmsx/share/machines/C-BIOS_MSX2+/roms
-@dirrm openmsx/share/machines/C-BIOS_MSX2+
-@dirrm openmsx/share/machines/C-BIOS_MSX2
-@dirrm openmsx/share/machines/C-BIOS_MSX1/roms
-@dirrm openmsx/share/machines/C-BIOS_MSX1
-@dirrm openmsx/share/machines/Boosted_MSX2_EN/roms
-@dirrm openmsx/share/machines/Boosted_MSX2_EN
-@dirrm openmsx/share/machines
-@dirrm openmsx/share/keymaps
-@dirrm openmsx/share/extensions/slotexpander
-@dirrm openmsx/share/extensions/scc+
-@dirrm openmsx/share/extensions/scc
-@dirrm openmsx/share/extensions/rs232/roms
-@dirrm openmsx/share/extensions/rs232
-@dirrm openmsx/share/extensions/ram512k
-@dirrm openmsx/share/extensions/ram4mb
-@dirrm openmsx/share/extensions/ram2mb
-@dirrm openmsx/share/extensions/ram1mb
-@dirrm openmsx/share/extensions/pac
-@dirrm openmsx/share/extensions/msxdos2/roms
-@dirrm openmsx/share/extensions/msxdos2
-@dirrm openmsx/share/extensions/moonsound/roms
-@dirrm openmsx/share/extensions/moonsound
-@dirrm openmsx/share/extensions/megaram
-@dirrm openmsx/share/extensions/mbstereo/roms
-@dirrm openmsx/share/extensions/mbstereo
-@dirrm openmsx/share/extensions/ide/roms
-@dirrm openmsx/share/extensions/ide
-@dirrm openmsx/share/extensions/gfx9000
-@dirrm openmsx/share/extensions/fmpac/roms
-@dirrm openmsx/share/extensions/fmpac
-@dirrm openmsx/share/extensions/debugdevice
-@dirrm openmsx/share/extensions/audio2
-@dirrm openmsx/share/extensions/audio
-@dirrm openmsx/share/extensions/Toshiba_HX-MU900/roms
-@dirrm openmsx/share/extensions/Toshiba_HX-MU900
-@dirrm openmsx/share/extensions/Sony_HBK-30/roms
-@dirrm openmsx/share/extensions/Sony_HBK-30
-@dirrm openmsx/share/extensions/Sony_HBI-55
-@dirrm openmsx/share/extensions/Sony_HBD-F1/roms
-@dirrm openmsx/share/extensions/Sony_HBD-F1
-@dirrm openmsx/share/extensions/Philips_NMS_1205/roms
-@dirrm openmsx/share/extensions/Philips_NMS_1205
-@dirrm openmsx/share/extensions/Panasonic_FS-CA1/roms
-@dirrm openmsx/share/extensions/Panasonic_FS-CA1
-@dirrm openmsx/share/extensions/Microsol_CDX-2/roms
-@dirrm openmsx/share/extensions/Microsol_CDX-2
-@dirrm openmsx/share/extensions/MegaRAM_Disk/roms
-@dirrm openmsx/share/extensions/MegaRAM_Disk
-@dirrm openmsx/share/extensions/Konami_Snatcher_Sound_Cartridge
-@dirrm openmsx/share/extensions/Konami_SD-Snatcher_Sound_Cartridge
-@dirrm openmsx/share/extensions/Konami_EC-702/roms
-@dirrm openmsx/share/extensions/Konami_EC-702
-@dirrm openmsx/share/extensions/Checkmark_FM_Stereo_PAK/roms
-@dirrm openmsx/share/extensions/Checkmark_FM_Stereo_PAK
-@dirrm openmsx/share/extensions
-@dirrm openmsx/share
-@dirrm openmsx/doc/manual
-@dirrm openmsx/doc
-@dirrm openmsx/bin
-@dirrm openmsx
diff --git a/emulators/openmsx/distinfo b/emulators/openmsx/distinfo
deleted file mode 100644
index e3c63649e9e..00000000000
--- a/emulators/openmsx/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/04/28 13:49:15 joerg Exp $
-
-SHA1 (openmsx-0.5.2.tar.gz) = 558e4a10702d55880b3acbe723af3ee7fb24c201
-RMD160 (openmsx-0.5.2.tar.gz) = 6ebc541df38de8e3e414a561447149bc216d2efb
-Size (openmsx-0.5.2.tar.gz) = 1612903 bytes
-SHA1 (patch-aa) = 89639071a2a64b6cd651098f873ab093a16eb588
diff --git a/emulators/openmsx/files/platform-netbsd.mk b/emulators/openmsx/files/platform-netbsd.mk
deleted file mode 100644
index b39f282c0af..00000000000
--- a/emulators/openmsx/files/platform-netbsd.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Configuration file for NetBSD.
-
-# Does platform support symlinks?
-USE_SYMLINK:=true
-
-# Default compiler.
-OPENMSX_CXX?=$(CXX)
-
-# File name extension of executables.
-EXEEXT:=
-
-CXXFLAGS+=	-D_REENTRANT -D_THREAD_SAFE
-LINK_FLAGS+=	-pthread
-
-# Probe Overrides
-# ===============
-
-MMAP_PREHEADER:=<sys/types.h>
-SYS_MMAN_PREHEADER:=<sys/types.h>
-SYS_SOCKET_PREHEADER:=<sys/types.h>
-
-SDL_CFLAGS:=`sdl-config --cflags 2>> $(LOG)`
-
-SDL_LDFLAGS:=`sdl-config --libs 2>> $(LOG)`
-SDL_RESULT:=`sdl-config --version`
-
-PNG_CFLAGS:=
-
-PNG_LDFLAGS:=-lpng
-PNG_RESULT:=yes
diff --git a/emulators/openmsx/patches/patch-aa b/emulators/openmsx/patches/patch-aa
deleted file mode 100644
index 18d5c7d45b7..00000000000
--- a/emulators/openmsx/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/04/28 13:49:15 joerg Exp $
-
---- build/detectsys.sh.orig	2006-04-28 12:40:49.000000000 +0000
-+++ build/detectsys.sh
-@@ -71,6 +71,8 @@ case "$GUESSED_OS" in
- 		OPENMSX_TARGET_OS=freebsd5;;
- 	*netbsd*)
- 		OPENMSX_TARGET_OS=netbsd;;
-+	*dragonfly*)
-+		OPENMSX_TARGET_OS=dragonfly;;
- 	*openbsd*)
- 		OPENMSX_TARGET_OS=openbsd;;
- 	*mingw*)
diff --git a/emulators/or1ksim/DESCR b/emulators/or1ksim/DESCR
deleted file mode 100644
index 49fe2748a53..00000000000
--- a/emulators/or1ksim/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-Or1ksim is a generic OpenRISC 1000 architecture simulator capable of
-emulating OpenRISC based computer systems.  Or1ksim provides several
-unique features:
-
-    * Free, open source code
-    * High level, fast, architecture simulation that allows early code
-      analysis and system performance evaluation
-    * All major models of OpenCores peripheral and system controller
-      cores supported
-    * Easy addition of new peripheral models
-    * Remote debugging through a network socket with the GNU Debugger (GDB)
-    * Support for different environments (memory configurations and
-      sizes, OR1K processor model, configuration of peripheral
-      devices)
diff --git a/emulators/or1ksim/Makefile b/emulators/or1ksim/Makefile
deleted file mode 100644
index 1392ff2a5bb..00000000000
--- a/emulators/or1ksim/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/02/23 21:38:59 agc Exp $
-#
-
-DISTNAME=	or1ksim-0.2.0rc2
-CATEGORIES=	emulators
-MASTER_SITES=	http://www.opencores.org/projects.cgi/web/or1k/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.opencores.org/projects.cgi/web/or1k/architectural_simulator
-COMMENT=	OpenRISC emulator
-
-GNU_CONFIGURE=  yes
-CONFIGURE_ARGS+=	--target=or32
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/or1ksim/PLIST b/emulators/or1ksim/PLIST
deleted file mode 100644
index b95b36bb27c..00000000000
--- a/emulators/or1ksim/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/02/23 21:38:59 agc Exp $
-bin/or32-sim
diff --git a/emulators/or1ksim/distinfo b/emulators/or1ksim/distinfo
deleted file mode 100644
index e79ec918481..00000000000
--- a/emulators/or1ksim/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/02/23 21:38:59 agc Exp $
-
-SHA1 (or1ksim-0.2.0rc2.tar.gz) = 7db0dfcf60c072b4143f45a4214f5eb65f2fd5ff
-RMD160 (or1ksim-0.2.0rc2.tar.gz) = 4111113389484969827e20f8c61caf33176b5407
-Size (or1ksim-0.2.0rc2.tar.gz) = 624729 bytes
-SHA1 (patch-aa) = 5e348fc6e687bab8edb0e5abe545d829cb781792
diff --git a/emulators/or1ksim/patches/patch-aa b/emulators/or1ksim/patches/patch-aa
deleted file mode 100644
index 78304f44bbd..00000000000
--- a/emulators/or1ksim/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/02/23 21:38:59 agc Exp $
-
---- peripheral/ethernet_i.h	2007/02/23 13:37:52	1.1
-+++ peripheral/ethernet_i.h	2007/02/23 13:38:10
-@@ -55,9 +55,12 @@
-  *       so defining MSG_DONTWAIT is just (temporary) workaround !!!
-  */
- #define MSG_DONTWAIT  0x40
--#define ETH_HLEN      14
- #endif /* __CYGWIN__ */
- 
-+#ifndef ETH_HLEN
-+#define ETH_HLEN      14
-+#endif
-+
- #define ETH_ALEN    6
- 
- struct ether_addr
diff --git a/emulators/osf1_lib/DESCR b/emulators/osf1_lib/DESCR
deleted file mode 100644
index 8b8e53cbad6..00000000000
--- a/emulators/osf1_lib/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-DEC Tru64/OSF1 compatibility package based upon the Tru64/OSF1
-shared libraries provided by Compaq to support running Netscape on
-Linux/Alpha.
-
-This package supports running Tru64/OSF1 binaries that do not make use
-of MACH system calls.
-
-Note that this is not a complete set of Tru64/OSF1 shared libraries,
-but rather the minimal set required to run netscape.
diff --git a/emulators/osf1_lib/INSTALL b/emulators/osf1_lib/INSTALL
deleted file mode 100644
index 95d9437f6d1..00000000000
--- a/emulators/osf1_lib/INSTALL
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: INSTALL,v 1.3 2006/06/23 15:48:50 jlam Exp $
-
-case "${STAGE}" in
-POST-INSTALL)
-	emulsubdir=osf1
-
-	emuldir="/emul/$emulsubdir"
-	pkgemuldir="${PKG_PREFIX}/emul/$emulsubdir"
-
-	emuldir_pwd=`cd $emuldir 2>/dev/null && ${PWD_CMD}`
-	pkgemuldir_pwd=`cd $pkgemuldir 2>/dev/null && ${PWD_CMD}`
-
-	if ${TEST} "$emuldir_pwd" != "$pkgemuldir_pwd"; then
-		if ${TEST} -e $emuldir -o -L $emuldir ||
-	   	   ${TEST} \( -e /emul -o -L /emul \) -a ! -d /emul; then
-			${CAT} << EOF
-==============================================================================
-You must create a symbolic link for ${PKGNAME} to work properly:
-
-	$pkgemuldir  ->  $emuldir
-
-It seems there is something else located at $emuldir.
-==============================================================================
-EOF
-		else
-			${MKDIR} -p `${DIRNAME} $emuldir` && 
-			${LN} -fs $pkgemuldir $emuldir
-		fi
-	fi
-	;;
-esac
diff --git a/emulators/osf1_lib/MESSAGE b/emulators/osf1_lib/MESSAGE
deleted file mode 100644
index 6080dd99a59..00000000000
--- a/emulators/osf1_lib/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2006/07/02 10:06:43 rillig Exp $
-
-Do not forget to include COMPAT_OSF1 in your kernel configuration file.
-OSF/1 binaries require this option in order to work.
-===========================================================================
diff --git a/emulators/osf1_lib/Makefile b/emulators/osf1_lib/Makefile
deleted file mode 100644
index b2f78e5d074..00000000000
--- a/emulators/osf1_lib/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/07/02 10:06:43 rillig Exp $
-
-DISTNAME=	netscape-4.7-3.alpha
-PKGNAME=	osf1_lib-1.1
-PKGREVISION=	2
-CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.digital.com/pub/DEC/Linux-Alpha-Tools/netscape/
-EXTRACT_SUFX=	.rpm
-
-MAINTAINER=	eric@cirr.com
-HOMEPAGE=	http://www.support.compaq.com/alpha-tools/software/index.html
-COMMENT=	DEC/Compaq OSF-1/Tru64 compatibility package for netscape
-
-RPM2PKG=	${LOCALBASE}/sbin/rpm2pkg
-BUILD_DEPENDS+=	rpm2pkg>=1.2:../../pkgtools/rpm2pkg
-
-ONLY_FOR_PLATFORM=	NetBSD-*-alpha
-
-RESTRICTED=		COMPAQ Licensed Software
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-
-WRKSRC=			${WRKDIR}
-EMULSUBDIR=		emul/osf1
-EMULDIR=		${PREFIX}/${EMULSUBDIR}
-
-EXTRACT_ONLY=	# empty
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-
-RPMARGS=	-i usr/lib -i usr/bin ${DISTDIR}/${DISTFILES}
-
-CHECK_SHLIBS_SUPPORTED=	no
-
-.include "../../mk/x11.buildlink3.mk"
-
-do-install:
-	${RM} -f ${WRKDIR}/PLIST_DYNAMIC
-	${INSTALL_DATA_DIR} ${EMULDIR}
-	${RPM2PKG} -d ${PREFIX} -p ${EMULSUBDIR} ${RPMARGS}
-	${TOUCH} ${EMULDIR}/etc/hosts
-	cd ${EMULDIR} && ${MKDIR} usr/lib/X11
-	cd ${EMULDIR}/usr/lib/X11 && ${LN} -fs ${X11BASE}/lib/X11/locale .
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/osf1_lib/PLIST b/emulators/osf1_lib/PLIST
deleted file mode 100644
index a6a44eb5b6b..00000000000
--- a/emulators/osf1_lib/PLIST
+++ /dev/null
@@ -1,31 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/22 15:33:53 wiz Exp $
-emul/osf1/etc/hosts
-emul/osf1/etc/sia/OSFC2_matrix.conf
-emul/osf1/etc/sia/bsd_matrix.conf
-emul/osf1/etc/sia/matrix.conf
-emul/osf1/etc/sia/siainitgood
-emul/osf1/etc/svc.conf
-emul/osf1/sbin/loader
-emul/osf1/usr/lib/X11/locale
-emul/osf1/usr/shlib/LICENSE
-emul/osf1/usr/shlib/libICE.so
-emul/osf1/usr/shlib/libSM.so
-emul/osf1/usr/shlib/libX11.so
-emul/osf1/usr/shlib/libXext.so
-emul/osf1/usr/shlib/libXm.so
-emul/osf1/usr/shlib/libXmu.so
-emul/osf1/usr/shlib/libXt.so
-emul/osf1/usr/shlib/libc.so
-emul/osf1/usr/shlib/libcxx.so
-emul/osf1/usr/shlib/libdnet_stub.so
-emul/osf1/usr/shlib/libexc.so
-emul/osf1/usr/shlib/libm.so
-emul/osf1/usr/shlib/libots.so
-@dirrm emul/osf1/usr/lib/X11
-@dirrm emul/osf1/usr/lib
-@dirrm emul/osf1/usr/shlib
-@dirrm emul/osf1/usr
-@dirrm emul/osf1/sbin
-@dirrm emul/osf1/etc/sia
-@dirrm emul/osf1/etc
-@dirrm emul/osf1
diff --git a/emulators/osf1_lib/distinfo b/emulators/osf1_lib/distinfo
deleted file mode 100644
index 82371e78468..00000000000
--- a/emulators/osf1_lib/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/05/25 12:11:28 wiz Exp $
-
-SHA1 (netscape-4.7-3.alpha.rpm) = b337f3d714333cb911ddcbc0d4a1672429c52a8b
-RMD160 (netscape-4.7-3.alpha.rpm) = 356daa132b52b557b96d525abe4541ae433cd73a
-Size (netscape-4.7-3.alpha.rpm) = 16589970 bytes
diff --git a/emulators/p11/DESCR b/emulators/p11/DESCR
deleted file mode 100644
index a1c191d312e..00000000000
--- a/emulators/p11/DESCR
+++ /dev/null
@@ -1,21 +0,0 @@
-P11 is a PDP11 emulator, which currently emulates the following
-configuration:
-
-        - a KDJ11A processor (including fpp)
-        - one or more RL-controllers (RLV12) with up to 4 RL02 each
-        - one or more RHV?? controllers with up to 8 RP06 each
-        - an RK11-controller with 22-bit addressing (hey ever saw one?)
-        - a MRV12 option (boot-rom/maintenance and display register)
-        - one or more KL11A controllers with up to 4 serial lines each
-        - a standard printer interface
-        - a read only TM11 tape
-        - a DEQNA ethernet adapter
-        - a toy clock
-
-On a 900MHz Athlon under FreeBSD 5.0 a 'make build; make installsrc'
-of 2.11BSD takes around 2:24 hours - this is several times faster than
-a real KDJ11A (if /usr is mounted async,noaccesstime).  Floating point
-speed is in the order of 10 times the original.
-
-P11 successfully runs RSX11M-PLUS, UN*X Version 5/6/7, 2.11BSD, RT-4
-and XXDP.
diff --git a/emulators/p11/Makefile b/emulators/p11/Makefile
deleted file mode 100644
index 2092c731e9e..00000000000
--- a/emulators/p11/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/01/27 12:02:16 wiz Exp $
-#
-
-DISTNAME=	p11-2.10i
-CATEGORIES=	emulators
-MASTER_SITES=	http://people.freebsd.org/~harti/p11/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	packages@grumpf.hope-2000.org
-COMMENT=	PDP11 emulator
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-begemot=${PREFIX:Q}
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
-
-.include "../../mk/bsd.prefs.mk"
-
-# bfp, tap, and tun tests taken from p11 configure script
-.if exists(/dev/bpf0)
-PLIST_SUBST+=		BPF=
-.else
-PLIST_SUBST+=		BPF="@comment "
-.endif
-.if exists(/dev/tap0) || exists(/dev/net/tun)
-PLIST_SUBST+=		TAP=
-.elif ${OPSYS} == "DragonFly"
-PLIST_SUBST+=		TAP=		# DragonFly has TAP
-.else
-PLIST_SUBST+=		TAP="@comment "
-.endif
-.if exists(/dev/tun) || exists(/dev/tun0) || exists(/dev/net/tun) || ${OPSYS} == "DragonFly"
-PLIST_SUBST+=		TUN=
-.else
-PLIST_SUBST+=		TUN="@comment "
-.endif
-
-# Force the bpf, tun, and tap epp backends to be built on DragonFly.
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ENV+=		ac_cv_epp_bpf=yes ac_cv_epp_tun=yes ac_cv_epp_tap=yes
-.endif
-
-# override MAKEFLAGS in the build and install stages
-do-build:
-	cd ${WRKSRC} && ${GMAKE} ${BUILD_TARGET} MAKEFLAGS=
-
-do-install:
-	cd ${WRKSRC} && ${GMAKE} ${INSTALL_TARGET} MAKEFLAGS=
-
-.include "../../devel/libbegemot/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/p11/PLIST b/emulators/p11/PLIST
deleted file mode 100644
index 626502a0085..00000000000
--- a/emulators/p11/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/06/16 16:15:42 jlam Exp $
-bin/p11
-${BPF}libexec/p11/epp_bpf
-libexec/p11/epp_fifo
-${TAP}libexec/p11/epp_tap
-${TUN}libexec/p11/epp_tun
-libexec/p11/fmt
-libexec/p11/lp_file
-libexec/p11/tty_fifo
-libexec/p11/tty_file
-libexec/p11/tty_net
-libexec/p11/tty_pty
-libexec/p11/tty_tty
-libexec/p11/tty_xterm
-share/p11/COPYRIGHT
-share/p11/boot.rom
-share/p11/mon.help
-share/p11/p11conf
-@dirrm share/p11
-@dirrm libexec/p11
diff --git a/emulators/p11/distinfo b/emulators/p11/distinfo
deleted file mode 100644
index 7ff31f62853..00000000000
--- a/emulators/p11/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2007/01/27 12:02:16 wiz Exp $
-
-SHA1 (p11-2.10i.tar.bz2) = 7e485e4736f70ae907c22d37d57cfb5e1ae95b51
-RMD160 (p11-2.10i.tar.bz2) = c5038d908fabf37fe122c6616a13551b2a8265df
-Size (p11-2.10i.tar.bz2) = 372597 bytes
-SHA1 (patch-aa) = 6b71f678ec2e8ae3acbcbdbe61af0c4e77684c5f
-SHA1 (patch-ab) = 0c6956dbb47927ac15572ae66509384993a08278
-SHA1 (patch-ac) = 77a747358e0524f07ad86a388737d5c98390dd26
diff --git a/emulators/p11/patches/patch-aa b/emulators/p11/patches/patch-aa
deleted file mode 100644
index 1c2a9eaa311..00000000000
--- a/emulators/p11/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/01/27 12:02:16 wiz Exp $
-
---- instruct.c.orig	2000-12-04 18:03:41.000000000 +0100
-+++ instruct.c	2006-04-18 02:21:40.000000000 +0200
-@@ -107,7 +107,7 @@
- }
- void NEGB(void) {
- 	dst = -dst;
--	TestW(dst);
-+	TestB(dst);
- 	proc.c = (dst != 0);
- 	proc.v = (dst == 0200);
- }
diff --git a/emulators/p11/patches/patch-ab b/emulators/p11/patches/patch-ab
deleted file mode 100644
index 982bc488f7a..00000000000
--- a/emulators/p11/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/01/27 12:02:16 wiz Exp $
-
---- proc.h.orig	2001-03-15 15:36:15.000000000 +0100
-+++ proc.h	2006-04-23 14:10:40.000000000 +0200
-@@ -36,7 +36,7 @@
- /*
-  * tunable parameters
-  */
--# define PHYSMEM 	(2*1024*1024)
-+# define PHYSMEM 	(4*1024*1024)
- # define FD_DEVICES	64
- # define P11CONF	"p11conf"
- # define MAXTIMEOUT	13
diff --git a/emulators/p11/patches/patch-ac b/emulators/p11/patches/patch-ac
deleted file mode 100644
index 2b6abe5932b..00000000000
--- a/emulators/p11/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/01/27 12:02:16 wiz Exp $
-
---- float.h.orig	2000-12-04 18:03:41.000000000 +0100
-+++ float.h	2006-10-15 20:55:37.000000000 +0200
-@@ -13,8 +13,11 @@
-  * be interrupted (block all signals each time isn't a good idea, I think)
-  *
-  */
-+
-+const short initfpmem = 0xf37;
-+
- # define InitFp()	/* sigprocmask(block all signals) */ \
--			asm("fldcw %0" :: "m"(0xF37));
-+			asm("fldcw %0" :: "m" (initfpmem));
- # define EndFp()	/* sigprocmask(enable all signals) */
- 
- /* 
diff --git a/emulators/palmosemulator/DESCR b/emulators/palmosemulator/DESCR
deleted file mode 100644
index 682f720f7c1..00000000000
--- a/emulators/palmosemulator/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Palm OS Emulator is an emulator for hardware capable of running the Palm OS
-operating system, with an X based interface.
-
-To use the emulator you must obtain a ROM image of the Palm OS operating
-system.  If you have a Palm OS device, you can extract the ROM image directly.
-
-Read "UsingPalmOSEmulator.pdf" for details of how to extract ROM images and
-how to use the emulator.  Run "pose" to start the emulator.
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
deleted file mode 100644
index 98bfad36c0c..00000000000
--- a/emulators/palmosemulator/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:27 wiz Exp $
-#
-
-DISTNAME=	emulator_src_${POSE_VERSION}
-PKGNAME=	palmosemulator-${POSE_VERSION}
-PKGREVISION=	6
-CATEGORIES=	emulators x11
-MASTER_SITES=	http://www.palmos.com/dev/tools/emulator/sources/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		emulator-skins-19.tar.gz
-
-MAINTAINER=	dsainty@NetBSD.org
-HOMEPAGE=	http://www.palmos.com/dev/tools/emulator/
-COMMENT=	Palm OS Emulator
-
-POSE_VERSION=	3.5
-
-DIST_SUBDIR=	${PKGBASE}
-
-# Source is under sources/ directory, skins are not...
-SITES.emulator-skins-19.tar.gz=	http://www.palmos.com/dev/tools/emulator/
-
-#LICENSE=       GPL
-
-WRKSRC=		${WRKDIR}/Emulator_Src_${POSE_VERSION}
-POSE_BUILD_DIR=	${WRKSRC}/BuildUnix
-POSE_SHARE_DIR=	${PREFIX}/share/palmosemulator
-POSE_SKINS_DIR=	${POSE_SHARE_DIR}/skins
-WRKSRC_SKINS=	${WRKDIR}/Skins_v1.9
-CPPFLAGS+=	-DFLTK_1_0_COMPAT
-
-CONFIGURE_DIRS=	${POSE_BUILD_DIR}
-BUILD_DIRS=	${POSE_BUILD_DIR}
-
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake perl
-
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=	--with-fltk=${BUILDLINK_PREFIX.fltk}
-CONFIGURE_ENV+=		PACKAGE_SKINS_DIR=${POSE_SKINS_DIR:Q}
-
-# Assumes too much about how to build va_list's from scratch
-NOT_FOR_PLATFORM=	*-*-powerpc
-
-INSTALLATION_DIRS=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${POSE_BUILD_DIR}/pose ${PREFIX}/bin/pose
-	${INSTALL_DATA_DIR} ${POSE_SHARE_DIR}
-	${INSTALL_DATA_DIR} ${POSE_SHARE_DIR}/docs
-	${INSTALL_DATA_DIR} ${POSE_SHARE_DIR}/scripting
-	${FIND} ${WRKSRC}/Docs -type f -print | \
-		while read i; do \
-			${INSTALL_DATA} "$$i" ${POSE_SHARE_DIR}/docs; \
-		done
-	for lang in Python Perl; do \
-		ddir="${POSE_SHARE_DIR}/scripting/$$lang"; \
-		${INSTALL_SCRIPT_DIR} "$$ddir"; \
-		${FIND} "${WRKSRC}/Scripting/$$lang" -type f -print | \
-		while read i; do \
-			case "$$i" in \
-				*.pl) ${INSTALL_SCRIPT} "$$i" "$$ddir";; \
-				*) ${INSTALL_DATA} "$$i" "$$ddir";; \
-			esac; \
-		done; \
-	done
-	${INSTALL_DATA} ${WRKSRC_SKINS}/ReadMe.txt ${POSE_SHARE_DIR}/docs/ReadMe_skins.txt
-	${INSTALL_DATA_DIR} ${POSE_SHARE_DIR}/prc
-	${INSTALL_DATA} ${WRKSRC}/ROMTransfer/Source/ROM_Transfer.prc ${POSE_SHARE_DIR}/prc
-	${INSTALL_DATA_DIR} ${POSE_SKINS_DIR}
-	${FIND} ${WRKSRC_SKINS} \( -name "*.skin" -o -name "*.jpg" \) -print |\
-		while read i; do \
-			${INSTALL_DATA} "$$i" ${POSE_SKINS_DIR}; \
-		done
-
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../x11/fltk/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/palmosemulator/PLIST b/emulators/palmosemulator/PLIST
deleted file mode 100644
index 305fa970cbf..00000000000
--- a/emulators/palmosemulator/PLIST
+++ /dev/null
@@ -1,106 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/05 03:31:25 dsainty Exp $
-bin/pose
-share/palmosemulator/docs/12rollin.pdf
-share/palmosemulator/docs/13hewgil.pdf
-share/palmosemulator/docs/Debugger.html
-share/palmosemulator/docs/POSER Profiler.rtf
-share/palmosemulator/docs/ReadMe_skins.txt
-share/palmosemulator/docs/UsingPalmOSEmulator.pdf
-share/palmosemulator/docs/_Bugs.txt
-share/palmosemulator/docs/_Building.txt
-share/palmosemulator/docs/_Contributing.txt
-share/palmosemulator/docs/_Credits.txt
-share/palmosemulator/docs/_GPL.txt
-share/palmosemulator/docs/_News.txt
-share/palmosemulator/docs/_OldNews.txt
-share/palmosemulator/docs/_ReadMe.txt
-share/palmosemulator/docs/_ToDo.txt
-share/palmosemulator/prc/ROM_Transfer.prc
-share/palmosemulator/scripting/Perl/EmFunctions.pm
-share/palmosemulator/scripting/Perl/EmRPC.pm
-share/palmosemulator/scripting/Perl/EmSysTraps.pm
-share/palmosemulator/scripting/Perl/EmUtils.pm
-share/palmosemulator/scripting/Perl/FormSpy.pl
-share/palmosemulator/scripting/Perl/HostControl.pm
-share/palmosemulator/scripting/Perl/HostControlTest.pl
-share/palmosemulator/scripting/Perl/ListDatabases.pl
-share/palmosemulator/scripting/Perl/ListOpenDatabases.pl
-share/palmosemulator/scripting/Perl/MakeSysTraps.pl
-share/palmosemulator/scripting/Perl/PoserRPC.pl
-share/palmosemulator/scripting/Perl/SkipStartup.pl
-share/palmosemulator/scripting/Python/Poser.py
-share/palmosemulator/scripting/Python/SysTraps.py
-share/palmosemulator/scripting/Python/Test.py
-share/palmosemulator/skins/HandEra330.skin
-share/palmosemulator/skins/HandEra330Cards.skin
-share/palmosemulator/skins/HandEra330Cards_16.jpg
-share/palmosemulator/skins/HandEra330Cards_32.jpg
-share/palmosemulator/skins/HandEra330_16.jpg
-share/palmosemulator/skins/HandEra330_32.jpg
-share/palmosemulator/skins/Palm_III.skin
-share/palmosemulator/skins/Palm_III_16.jpg
-share/palmosemulator/skins/Palm_III_32.jpg
-share/palmosemulator/skins/Palm_IIIc.skin
-share/palmosemulator/skins/Palm_IIIc_16.jpg
-share/palmosemulator/skins/Palm_IIIc_32.jpg
-share/palmosemulator/skins/Palm_IIIe.skin
-share/palmosemulator/skins/Palm_IIIe_16.jpg
-share/palmosemulator/skins/Palm_IIIe_32.jpg
-share/palmosemulator/skins/Palm_IIIx.skin
-share/palmosemulator/skins/Palm_IIIx_16.jpg
-share/palmosemulator/skins/Palm_IIIx_32.jpg
-share/palmosemulator/skins/Palm_Pilot.skin
-share/palmosemulator/skins/Palm_Pilot_16.jpg
-share/palmosemulator/skins/Palm_Pilot_32.jpg
-share/palmosemulator/skins/Palm_V.skin
-share/palmosemulator/skins/Palm_VII.skin
-share/palmosemulator/skins/Palm_VII_16.jpg
-share/palmosemulator/skins/Palm_VII_32.jpg
-share/palmosemulator/skins/Palm_VIIx.skin
-share/palmosemulator/skins/Palm_VIIx_16.jpg
-share/palmosemulator/skins/Palm_VIIx_32.jpg
-share/palmosemulator/skins/Palm_V_16.jpg
-share/palmosemulator/skins/Palm_V_32.jpg
-share/palmosemulator/skins/Palm_i705.skin
-share/palmosemulator/skins/Palm_i705_16.jpg
-share/palmosemulator/skins/Palm_i705_32.jpg
-share/palmosemulator/skins/Palm_m100.skin
-share/palmosemulator/skins/Palm_m100_16.jpg
-share/palmosemulator/skins/Palm_m100_32.jpg
-share/palmosemulator/skins/Palm_m130.skin
-share/palmosemulator/skins/Palm_m130_16.jpg
-share/palmosemulator/skins/Palm_m130_32.jpg
-share/palmosemulator/skins/Palm_m500.skin
-share/palmosemulator/skins/Palm_m500_16.jpg
-share/palmosemulator/skins/Palm_m500_32.jpg
-share/palmosemulator/skins/Palm_m505.skin
-share/palmosemulator/skins/Palm_m505_16.jpg
-share/palmosemulator/skins/Palm_m505_32.jpg
-share/palmosemulator/skins/Palm_m515.skin
-share/palmosemulator/skins/Palm_m515_16.jpg
-share/palmosemulator/skins/Palm_m515_32.jpg
-share/palmosemulator/skins/Pilot.skin
-share/palmosemulator/skins/Pilot_16.jpg
-share/palmosemulator/skins/Pilot_32.jpg
-share/palmosemulator/skins/Symbol_1500.skin
-share/palmosemulator/skins/Symbol_1500_16.jpg
-share/palmosemulator/skins/Symbol_1500_32.jpg
-share/palmosemulator/skins/Symbol_1700.skin
-share/palmosemulator/skins/Symbol_1700_16.jpg
-share/palmosemulator/skins/Symbol_1700_32.jpg
-share/palmosemulator/skins/TRGpro.skin
-share/palmosemulator/skins/TRGpro_16.jpg
-share/palmosemulator/skins/TRGpro_32.jpg
-share/palmosemulator/skins/Workpad.skin
-share/palmosemulator/skins/Workpad_16.jpg
-share/palmosemulator/skins/Workpad_32.jpg
-share/palmosemulator/skins/Workpad_c3.skin
-share/palmosemulator/skins/Workpad_c3_16.jpg
-share/palmosemulator/skins/Workpad_c3_32.jpg
-@dirrm share/palmosemulator/skins
-@dirrm share/palmosemulator/scripting/Python
-@dirrm share/palmosemulator/scripting/Perl
-@dirrm share/palmosemulator/scripting
-@dirrm share/palmosemulator/prc
-@dirrm share/palmosemulator/docs
-@dirrm share/palmosemulator
diff --git a/emulators/palmosemulator/distinfo b/emulators/palmosemulator/distinfo
deleted file mode 100644
index 010f16e5446..00000000000
--- a/emulators/palmosemulator/distinfo
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: distinfo,v 1.7 2006/06/28 15:56:10 joerg Exp $
-
-SHA1 (palmosemulator/emulator_src_3.5.tar.gz) = 2debd7690736397d0af41f7b2d482df65391fc65
-RMD160 (palmosemulator/emulator_src_3.5.tar.gz) = fbb6761e4c43ecc9fb20d90d2ae0ec6ccf1c3f27
-Size (palmosemulator/emulator_src_3.5.tar.gz) = 3162363 bytes
-SHA1 (palmosemulator/emulator-skins-19.tar.gz) = 70b0497061d6877a4e3c6a378fa647c64fe3e019
-RMD160 (palmosemulator/emulator-skins-19.tar.gz) = 9b4e16f50b1d2b9ad9b17e3a104c34a983d0a4ba
-Size (palmosemulator/emulator-skins-19.tar.gz) = 2443913 bytes
-SHA1 (patch-aa) = eef35ce5c3d91bf56903bb48c0c78bd333591fcc
-SHA1 (patch-ab) = 061379a827d338e411e8ea53dc071cb668a6c524
-SHA1 (patch-ac) = c00a821d390ab92b28a01a47e7934eed4261fe6f
-SHA1 (patch-ad) = 6ad0beceb03bed0f51383331715a160b16c04ffd
-SHA1 (patch-ae) = eff843f8603b14791d3363a13634fb482e996ee5
-SHA1 (patch-af) = 746c83222cd847d6383fe9484ac81366b083ad22
-SHA1 (patch-ag) = 9d4fba5f8bef808b8a00b71484c308da613d8140
-SHA1 (patch-ah) = e3a79fa2c376711ea6479907cca923d1e872683e
-SHA1 (patch-ai) = 0cbff6b3080ee9aa7e366ba4ba368d93f0560e04
-SHA1 (patch-aj) = 958f070f7bc19f6a4c2f12a9d0ba280ed64136cb
-SHA1 (patch-ak) = d693bd15c982c95663f9f595fdcad6f80d5c2477
-SHA1 (patch-al) = 50342df4bb9d020f0b72be608d0656351dae4463
-SHA1 (patch-am) = 2790c8b567a94d86bced52d59cf62b4448b62731
-SHA1 (patch-an) = 93e326e3ab9f532d5bab1cc987c179e8337a823d
-SHA1 (patch-ao) = 9ace708f71d33802059db53c9242f0d89a77e4da
-SHA1 (patch-ap) = 7cb159b84f8ad0638c49285ea5140aae93623f96
-SHA1 (patch-aq) = f3d3a6bf278f71573fb7d45021305561c3dcc114
diff --git a/emulators/palmosemulator/patches/patch-aa b/emulators/palmosemulator/patches/patch-aa
deleted file mode 100644
index b06e7edc9ca..00000000000
--- a/emulators/palmosemulator/patches/patch-aa
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/31 06:59:54 dsainty Exp $
-
---- SrcShared/omnithread/omnithread.h.orig	Sat Mar 30 01:11:07 2002
-+++ SrcShared/omnithread/omnithread.h	Sat Nov 23 23:43:30 2002
-@@ -64,102 +64,8 @@
- //
- 
- 
--#if defined(__arm__) && defined(__atmos__)
- #include <omnithread/posix.h>
- 
--#elif defined(__alpha__) && defined(__osf1__)
--#include <omnithread/posix.h>
--
--#elif defined(__powerpc__) && defined(__aix__)
--#include <omnithread/posix.h>
--
--#elif defined(__hpux__)
--#include <omnithread/posix.h>
--
--#elif defined(__WIN32__)
--#include <omnithread/nt.h>
--
--#ifdef _MSC_VER
--
--// Using MSVC++ to compile. If compiling library as a DLL,
--// define _OMNITHREAD_DLL. If compiling as a statuc library, define
--// _WINSTATIC
--// If compiling an application that is to be statically linked to omnithread,
--// define _WINSTATIC (if the application is  to be dynamically linked, 
--// there is no need to define any of these macros).
--
--#if defined (_OMNITHREAD_DLL) && defined(_WINSTATIC)
--#error "Both _OMNITHREAD_DLL and _WINSTATIC are defined."
--#elif defined(_OMNITHREAD_DLL)
--#define _OMNITHREAD_NTDLL_ __declspec(dllexport)
--#elif !defined(_WINSTATIC)
--#define _OMNITHREAD_NTDLL_ __declspec(dllimport)
--#elif defined(_WINSTATIC)
--#define _OMNITHREAD_NTDLL_
--#endif
-- // _OMNITHREAD_DLL && _WINSTATIC
--
--#else
--
--// Not using MSVC++ to compile
--#define _OMNITHREAD_NTDLL_
--
--#endif
-- // _MSC_VER
--
--#elif defined(__sun__)
--#include <omnithread/solaris.h>
-- 
--#elif defined(__sunos__)
--#if __OSVERSION__ != 5
--// XXX Workaround for SUN C++ compiler (seen on 4.2) Template.DB code
--//     regeneration bug. See omniORB2/CORBA_sysdep.h for details.
--#if !defined(__SUNPRO_CC) || __OSVERSION__ != '5'
--#error "Only SunOS 5.x or later is supported."
--#endif
--#endif
--#ifdef UsePthread
--#include <omnithread/posix.h>
--#else
--#include <omnithread/solaris.h>
--#endif
--
--#elif defined(__linux__)
--#include <omnithread/posix.h>
--
--#elif defined(__nextstep__)
--#include <omnithread/mach.h>
--
--#elif defined(__VMS)
--#include <omnithread/posix.h>
--
--#elif defined(__SINIX__)
--#include <omnithread/posix.h>
--
--#elif defined(__osr5__)
--#include <omnithread/posix.h>
--
--#elif defined(__irix__)
--#include <omnithread/posix.h>
--
--#elif defined(macintosh)
--#include <null_thread.h>
--
--#elif defined(__QNXNTO__)
--#include <omnithread/posix.h>
--
--#elif defined(__svr4__)
--#include <omnithread/posix.h>
--
--#elif defined(__FreeBSD__)
--#include <omnithread/posix.h>
--
--#elif defined(__bsdi__)
--#include <omnithread/posix.h>
--
--#else
--#error "No implementation header file"
--#endif
- 
- #if !defined(__WIN32__)
- #define _OMNITHREAD_NTDLL_
diff --git a/emulators/palmosemulator/patches/patch-ab b/emulators/palmosemulator/patches/patch-ab
deleted file mode 100644
index f35495af59b..00000000000
--- a/emulators/palmosemulator/patches/patch-ab
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/06/28 15:56:10 joerg Exp $
-
-Use the libjpeg package, instead of a local copy, and pass through the skins
-directory.
-
---- BuildUnix/configure.orig	Sat Nov 23 23:54:59 2002
-+++ BuildUnix/configure	Sun Nov 24 00:57:08 2002
-@@ -3180,6 +3180,11 @@ case "$target" in
- 	THREAD_LIBS="-lpthread"
- 	;;
- 
-+*-netbsd*)
-+	THREAD_FLAGS="-D_REENTRANT -DPthreadDraftVersion=10"
-+	THREAD_LIBS="-lpthread"
-+	;;
-+
- *-nto*) 
- 	THREAD_FLAGS="-D_REENTRANT -DPthreadDraftVersion=10"
- 	THREAD_LIBS=""
-@@ -3214,7 +3219,7 @@ case "$target" in
- 	USE_SOLARIS_CPP="true"
- 	;;
- 
--*-freebsd*)
-+*-freebsd*|*-dragonfly*)
- 	THREAD_FLAGS="-pthread -D_THREAD_SAFE -D_REENTRANT -DPthreadDraftVersion=10"
- 	THREAD_LIBS=
- 	;;
-@@ -3598,7 +3603,7 @@ rm -f confcache
- 
- 
- save_LIBS="$LIBS"
--LIBS="-lfltk ${GLLIB} -L${ac_x_libraries} -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS"
-+LIBS="-ljpeg -lfltk ${GLLIB} -L${ac_x_libraries} -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS"
- 
- ac_ext=C
- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -3853,6 +3860,7 @@ s%@ALLOCA@%$ALLOCA%g
- s%@CXXCPP@%$CXXCPP%g
- s%@GLLIB@%$GLLIB%g
- s%@AR@%$AR%g
-+s%@PACKAGE_SKINS_DIR@%$PACKAGE_SKINS_DIR%g
- s%@POSER_CFLAGS@%$POSER_CFLAGS%g
- s%@POSER_CXXFLAGS@%$POSER_CXXFLAGS%g
- s%@THREAD_FLAGS@%$THREAD_FLAGS%g
diff --git a/emulators/palmosemulator/patches/patch-ac b/emulators/palmosemulator/patches/patch-ac
deleted file mode 100644
index 02299d92502..00000000000
--- a/emulators/palmosemulator/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/12/31 06:59:54 dsainty Exp $
-
---- SrcShared/Skins.cpp.orig	Sat Mar 30 01:11:17 2002
-+++ SrcShared/Skins.cpp	Sun Nov 24 02:01:04 2002
-@@ -1163,6 +1163,11 @@
- 	if (!scanDir.Exists ())
- 		scanDir = EmDirRef (EmDirRef::GetEmulatorDirectory (), "skins");
- 
-+#ifdef PACKAGE_SKINS_DIR
-+	if (!scanDir.Exists ())
-+		scanDir = EmDirRef (PACKAGE_SKINS_DIR);
-+#endif
-+
- #if PLATFORM_UNIX
- 	// On Unix, also look in the /usr/local/share/pose and /usr/share/pose directories.
- 
diff --git a/emulators/palmosemulator/patches/patch-ad b/emulators/palmosemulator/patches/patch-ad
deleted file mode 100644
index 615e209a33d..00000000000
--- a/emulators/palmosemulator/patches/patch-ad
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/01/05 03:31:25 dsainty Exp $
-
-Use the libjpeg package, instead of a local copy, and pass through the skins
-directory.
-
---- BuildUnix/Makefile.in.orig	Sat Mar 30 01:11:21 2002
-+++ BuildUnix/Makefile.in	Sun Nov 24 02:24:49 2002
-@@ -70,6 +70,7 @@
- GLLIB = @GLLIB@
- MAKEINFO = @MAKEINFO@
- PACKAGE = @PACKAGE@
-+PACKAGE_SKINS_FLAGS = -DPACKAGE_SKINS_DIR="\"@PACKAGE_SKINS_DIR@\""
- POSER_CFLAGS = @POSER_CFLAGS@
- POSER_CXXFLAGS = @POSER_CXXFLAGS@
- RANLIB = @RANLIB@
-@@ -78,16 +79,16 @@
- THREAD_SRC = @THREAD_SRC@
- VERSION = @VERSION@
- 
--SUBDIRS = Gzip jpeg espws-2.0
-+SUBDIRS = Gzip espws-2.0
- 
- SUFFIXES = .cpp
- 
- VPATH = $(srcdir)/../SrcUnix:										$(srcdir)/../SrcShared:										$(srcdir)/../SrcShared/Hardware:							$(srcdir)/../SrcShared/Hardware/TRG:						$(srcdir)/../SrcShared/omnithread:							$(srcdir)/../SrcShared/Palm/Platform/Core/System/Src:						$(srcdir)/../SrcShared/Patches:								$(srcdir)/../SrcShared/UAE:
- 
- 
--CFLAGS = $(POSER_CFLAGS) $(LOCAL_CFLAGS) $(FLAGS) $(THREAD_FLAGS) $(X_CFLAGS)
--CXXFLAGS = $(POSER_CXXFLAGS) $(LOCAL_CFLAGS) $(FLAGS) $(THREAD_FLAGS) $(X_CFLAGS)
--INCLUDES = -I$(srcdir)/../SrcShared -I$(srcdir)/../SrcShared/Hardware -I$(srcdir)/../SrcShared/Hardware/TRG -I$(srcdir)/../SrcShared/Palm/Device -I$(srcdir)/../SrcShared/Palm/Platform -I$(srcdir)/../SrcShared/Palm/Platform/Core/Hardware/IncsPrv -I$(srcdir)/../SrcShared/Palm/Platform/Core/System/IncsPrv -I$(srcdir)/../SrcShared/Palm/Platform/Incs -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core/Hardware -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core/System -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core/UI -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Libraries -I$(srcdir)/../SrcShared/Gzip -I$(srcdir)/../SrcShared/jpeg -I$(srcdir)/../SrcShared/omnithread -I$(srcdir)/../SrcShared/Patches -I$(srcdir)/../SrcShared/UAE -I$(srcdir)/../SrcUnix -I$(srcdir)/../SrcUnix/espws-2.0
-+CFLAGS = $(POSER_CFLAGS) $(LOCAL_CFLAGS) $(FLAGS) $(THREAD_FLAGS) $(PACKAGE_SKINS_FLAGS) $(X_CFLAGS)
-+CXXFLAGS = $(POSER_CXXFLAGS) $(LOCAL_CFLAGS) $(FLAGS) $(THREAD_FLAGS) $(PACKAGE_SKINS_FLAGS) $(X_CFLAGS)
-+INCLUDES = -I$(srcdir)/../SrcShared -I$(srcdir)/../SrcShared/Hardware -I$(srcdir)/../SrcShared/Hardware/TRG -I$(srcdir)/../SrcShared/Palm/Device -I$(srcdir)/../SrcShared/Palm/Platform -I$(srcdir)/../SrcShared/Palm/Platform/Core/Hardware/IncsPrv -I$(srcdir)/../SrcShared/Palm/Platform/Core/System/IncsPrv -I$(srcdir)/../SrcShared/Palm/Platform/Incs -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core/Hardware -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core/System -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core/UI -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Libraries -I$(srcdir)/../SrcShared/Gzip -I$(srcdir)/../SrcShared/omnithread -I$(srcdir)/../SrcShared/Patches -I$(srcdir)/../SrcShared/UAE -I$(srcdir)/../SrcUnix -I$(srcdir)/../SrcUnix/espws-2.0
- 
- SRC_UNIX = EmApplicationFltk.cpp								EmApplicationFltk.h									EmCommonUnix.h										EmDirRefUnix.cpp									EmDirRefUnix.h										EmDlgFltk.cpp										EmDlgFltk.h											EmDocumentUnix.cpp									EmDocumentUnix.h									EmFileRefUnix.cpp									EmFileRefUnix.h										EmMenusFltk.cpp										EmMenusFltk.h										EmPixMapUnix.cpp									EmPixMapUnix.h										EmTransportSerialUnix.cpp							EmTransportSerialUnix.h								EmTransportUSBUnix.cpp								EmTransportUSBUnix.h								EmWindowFltk.cpp									EmWindowFltk.h										Platform_Unix.cpp									jconfig.h
- 
-@@ -115,7 +116,7 @@
- @SOLARIS_FALSE@SRC_THREAD = posix.cpp
- 
- bin_PROGRAMS = pose
--pose_LDADD = $(srcdir)/Gzip/libposergzip.a $(srcdir)/jpeg/libposerjpeg.a $(srcdir)/espws-2.0/libposerespws.a -lfltk -L/usr/local/lib $(X_LIBS) -lXext -lX11 $(THREAD_LIBS) $(GLLIB) -lm
-+pose_LDADD = $(srcdir)/Gzip/libposergzip.a $(srcdir)/espws-2.0/libposerespws.a -lfltk -ljpeg $(X_LIBS) -lXext -lX11 $(THREAD_LIBS) $(GLLIB) -lm
- pose_SOURCES = $(SRC_UNIX) $(SRC_UNIX_GEN) $(SRC_SHARED) $(SRC_SHARED_HARDWARE) $(SRC_PATCHES) $(SRC_TRG) $(SRC_UAE) $(SRC_PALM) $(SRC_THREAD)
- CLEANFILES = ResStrings.cpp EmDlgFltkFactory.h EmDlgFltkFactory.cpp config.cache config.log
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -222,7 +223,7 @@
- @SOLARIS_FALSE@EmTRGSD.o cpudefs.o cpuemu.o cpustbl.o readcpu.o Crc.o \
- @SOLARIS_FALSE@posix.o
- pose_DEPENDENCIES =  $(srcdir)/Gzip/libposergzip.a \
--$(srcdir)/jpeg/libposerjpeg.a $(srcdir)/espws-2.0/libposerespws.a
-+$(srcdir)/espws-2.0/libposerespws.a
- pose_LDFLAGS = 
- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
diff --git a/emulators/palmosemulator/patches/patch-ae b/emulators/palmosemulator/patches/patch-ae
deleted file mode 100644
index cfea6fd87c2..00000000000
--- a/emulators/palmosemulator/patches/patch-ae
+++ /dev/null
@@ -1,167 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2003/01/05 03:31:25 dsainty Exp $
-
-Without the first hunk of this patch, ROM transfers tend to not get very far
-due to consistently lost characters.
-
-The remainder corrects an assumption in the code that 0 is an invalid file
-handle, and registers NetBSD-style tty device names.
-
---- SrcUnix/EmTransportSerialUnix.cpp.orig	Sat Mar 30 01:11:19 2002
-+++ SrcUnix/EmTransportSerialUnix.cpp	Sun Nov 24 05:42:39 2002
-@@ -220,7 +220,7 @@
- 	// Programming Mini-Howto") says to turn off these for "raw" (as opposed to
- 	// "canonical") mode.
- 
--	io.c_lflag &= ~(ICANON | ECHO | ISIG);
-+	io.c_lflag &= ~(ICANON | ECHO | ISIG | IEXTEN);
- 
- 	// The UNIX Programming FAQ (<www://www.faqs.org/faqs/unix-faq/programmer/faq/>)
- 	// recommends just setting all the c_iflags and c_oflags to zero.
-@@ -541,6 +541,20 @@
- #ifdef __QNXNTO__
- 	results.push_back ("/dev/ser1");
- 	results.push_back ("/dev/ser2");
-+#elif __FreeBSD__
-+	results.push_back ("/dev/pilot");
-+	results.push_back ("/dev/cuaa0");
-+	results.push_back ("/dev/cuaa1");
-+	results.push_back ("/dev/cuaa2");
-+	results.push_back ("/dev/cuaa3");
-+#elif __NetBSD__
-+	results.push_back ("/dev/pilot");
-+	results.push_back ("/dev/tty00");
-+	results.push_back ("/dev/tty01");
-+	results.push_back ("/dev/tty02");
-+	results.push_back ("/dev/tty03");
-+	results.push_back ("/dev/ttyU0");
-+	results.push_back ("/dev/ttyU1");
- #else
- 	results.push_back ("/dev/ttyS0");
- 	results.push_back ("/dev/ttyS1");
-@@ -596,9 +610,9 @@
- EmHostTransportSerial::EmHostTransportSerial (void) :
- 	fReadThread (NULL),
- 	fWriteThread (NULL),
--	fCommHandle (0),
--	fCommSignalPipeA (0),
--	fCommSignalPipeB (0),
-+	fCommHandle (-1),
-+	fCommSignalPipeA (-1),
-+	fCommSignalPipeB (-1),
- 	fTimeToQuit (false),
- 	fDataMutex (),
- 	fDataCondition (&fDataMutex),
-@@ -626,9 +640,9 @@
- {
- 	EmAssert (fReadThread == NULL);
- 	EmAssert (fWriteThread == NULL);
--	EmAssert (fCommHandle == 0);
--	EmAssert (fCommSignalPipeA == 0);
--	EmAssert (fCommSignalPipeB == 0);
-+	EmAssert (fCommHandle == -1);
-+	EmAssert (fCommSignalPipeA == -1);
-+	EmAssert (fCommSignalPipeB == -1);
- }
- 
- 
-@@ -662,9 +676,9 @@
- 
- 		fCommHandle = open(portName.c_str (), O_RDWR | O_NOCTTY | O_NDELAY);
- 
--		if (fCommHandle <= 0)
-+		if (fCommHandle < 0)
- 		{
--			fCommHandle = 0;
-+			fCommHandle = -1;
- 
- 			return errno;
- 		}
-@@ -694,7 +708,7 @@
- 
- ErrCode EmHostTransportSerial::CreateCommThreads (const EmTransportSerial::ConfigSerial& /*config*/)
- {
--	if (fCommHandle)
-+	if (fCommHandle != -1)
- 	{
- 		PRINTF ("EmTransportSerial::HostOpen: Creating serial port handler threads...");
- 
-@@ -734,40 +748,41 @@
- {
- 	// If never created, nothing to destroy.
- 
--	if (!fCommSignalPipeA)
-+	if (fCommSignalPipeA == -1)
- 		return errNone;
- 
- 	// Signal the threads to quit.
- 
--	fDataMutex.lock ();
--
--	fTimeToQuit = true;
--
--	int dummy = 0;
--	write (fCommSignalPipeB, &dummy, sizeof (dummy));		// Signals CommRead.
--
--	fDataCondition.broadcast ();	// Signals CommWrite.
--	fDataMutex.unlock ();
-+	if((fCommSignalPipeA != -1) && (fCommSignalPipeB != -1))
-+	{
-+		fDataMutex.lock();
- 
--	// Wait for the threads to quit.
-+		fTimeToQuit = true;
- 
--	if (fReadThread)
--	{
--		fReadThread->join (NULL);
--		fWriteThread->join (NULL);
--	}
-+		int dummy = 0;
-+		write(fCommSignalPipeB, &dummy, sizeof (dummy)); // Signals CommRead.
- 
--	// Thread objects delete themselves, so set our references to NULL.
-+		fDataCondition.broadcast();  // Signals CommWrite.
-+		fDataMutex.unlock();
- 
--	fReadThread = NULL;
--	fWriteThread = NULL;
-+		// Wait for the threads to quit.
- 
--	// Close the signal pipe.
-+		if (fReadThread)
-+		{
-+			fReadThread->join (NULL);
-+			fWriteThread->join (NULL);
-+		}
- 
--	close (fCommSignalPipeA);
--	close (fCommSignalPipeB);
-+		// Thread objects delete themselves, so set our references to NULL.
-+		fReadThread = NULL;
-+		fWriteThread = NULL;
-+
-+		// Close the signal pipe.
-+		close (fCommSignalPipeA);
-+		close (fCommSignalPipeB);
- 
--	fCommSignalPipeA = fCommSignalPipeB = 0;
-+		fCommSignalPipeA = fCommSignalPipeB = -1;
-+	}
- 
- 	return errNone;
- }
-@@ -787,9 +802,11 @@
- 
- ErrCode EmHostTransportSerial::CloseCommPort (void)
- {
--	(void) close (fCommHandle);
--
--	fCommHandle = 0;
-+	if(fCommHandle != -1)
-+	{
-+		int result = close(fCommHandle);
-+		fCommHandle = -1;
-+	}
- 
- 	return errNone;
- }
diff --git a/emulators/palmosemulator/patches/patch-af b/emulators/palmosemulator/patches/patch-af
deleted file mode 100644
index 3432e0cf510..00000000000
--- a/emulators/palmosemulator/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/12/31 06:59:57 dsainty Exp $
-
-Without this patch and with non-preemptive threads, the emulator hangs on the
-first stylus event (mouse click).  Even worse, it hangs with the mouse
-grabbed.  Strategies for reducing the number of calls to yield() may improve
-emulation performance.
-
---- SrcShared/Hardware/EmCPU68K.cpp.orig	Sun Nov 24 17:47:03 2002
-+++ SrcShared/Hardware/EmCPU68K.cpp	Sun Nov 24 17:34:23 2002
-@@ -136,6 +136,7 @@
- 		if (sleeping || ((++counter & 0x7FFF) == 0))							\
- 		{																		\
- 			this->CycleSlowly (sleeping);										\
-+			omni_thread::yield();												\
- 		}																		\
- 	}																			\
- }
diff --git a/emulators/palmosemulator/patches/patch-ag b/emulators/palmosemulator/patches/patch-ag
deleted file mode 100644
index 9de2d9f3462..00000000000
--- a/emulators/palmosemulator/patches/patch-ag
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/12/31 06:59:57 dsainty Exp $
-
-This patch prevents the emulator from grabbing the mouse.  It isn't clear why
-the emulator does grab the mouse, a fairly bad-mannered thing for an
-application to do.
-
-There doesn't appear to be any actual reason for doing so, and if the emulator
-hangs for any reason with the mouse grab in-force, it tends to disable the
-entire X session.
-
---- SrcShared/EmWindow.cpp.orig	Sun Dec  1 16:05:17 2002
-+++ SrcShared/EmWindow.cpp	Sun Dec  1 16:05:00 2002
-@@ -229,11 +229,6 @@
- 	if (down && (fCurrentButton == kElement_None))
- 	{
- 		what = ::SkinTestPoint (where);
--
--		if ((what != kElement_Frame) && (what != kElement_None))
--		{
--			this->HostMouseCapture ();
--		}
- 	}
- 
- 	// If the pen is up, or if we were already in the progress of tracking
-@@ -288,11 +283,6 @@
- 		fCurrentButton = what;
- 	else
- 		fCurrentButton = kElement_None;
--
--	if (fCurrentButton == kElement_None)
--	{
--		this->HostMouseRelease ();
--	}
- }
- 
- 
diff --git a/emulators/palmosemulator/patches/patch-ah b/emulators/palmosemulator/patches/patch-ah
deleted file mode 100644
index 5d3d2c095b9..00000000000
--- a/emulators/palmosemulator/patches/patch-ah
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2003/01/05 03:31:25 dsainty Exp $
-
-Use the libjpeg package, instead of a local copy.
-
---- BuildUnix/Makefile.am.orig	Sat Mar 30 01:11:19 2002
-+++ BuildUnix/Makefile.am	Wed Jan  1 17:27:26 2003
-@@ -4,7 +4,7 @@
- ##	All rights reserved.
- ## ======================================================================================
- 
--SUBDIRS			=	Gzip jpeg espws-2.0
-+SUBDIRS			=	Gzip espws-2.0
- 
- SUFFIXES		=	.cpp
- 
-@@ -37,7 +37,6 @@
- INCLUDES		+=	-I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core/UI
- INCLUDES		+=	-I$(srcdir)/../SrcShared/Palm/Platform/Incs/Libraries
- INCLUDES		+=	-I$(srcdir)/../SrcShared/Gzip
--INCLUDES		+=	-I$(srcdir)/../SrcShared/jpeg
- INCLUDES		+=	-I$(srcdir)/../SrcShared/omnithread
- INCLUDES		+=	-I$(srcdir)/../SrcShared/Patches
- INCLUDES		+=	-I$(srcdir)/../SrcShared/UAE
-@@ -403,10 +402,10 @@
- bin_PROGRAMS	=	pose
- 
- pose_LDADD		=	$(srcdir)/Gzip/libposergzip.a
--pose_LDADD		+=	$(srcdir)/jpeg/libposerjpeg.a
- pose_LDADD		+=	$(srcdir)/espws-2.0/libposerespws.a
-+pose_LDADD		+=	-ljpeg
- pose_LDADD		+=	-lfltk
--pose_LDADD		+=	-L/usr/local/lib $(X_LIBS) -lXext -lX11 $(THREAD_LIBS) $(GLLIB) -lm
-+pose_LDADD		+=	$(X_LIBS) -lXext -lX11 $(THREAD_LIBS) $(GLLIB) -lm
- 
- pose_SOURCES	=	$(SRC_UNIX) $(SRC_UNIX_GEN) $(SRC_SHARED) $(SRC_SHARED_HARDWARE)
- pose_SOURCES	+=	$(SRC_PATCHES) $(SRC_TRG) $(SRC_UAE) $(SRC_PALM) $(SRC_THREAD)
diff --git a/emulators/palmosemulator/patches/patch-ai b/emulators/palmosemulator/patches/patch-ai
deleted file mode 100644
index 1dd028779cb..00000000000
--- a/emulators/palmosemulator/patches/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2003/01/05 03:31:25 dsainty Exp $
-
-jinclude.h is not part of the libjpeg interface, and isn't available from the
-pkgsrc libjpeg installation.  But we need to include <stdio.h> ourselves for
-the benefit of "jpeglib.h".
-
---- SrcShared/EmJPEG.h.orig	Sat Mar 30 01:11:14 2002
-+++ SrcShared/EmJPEG.h	Wed Jan  1 18:05:36 2003
-@@ -30,7 +30,7 @@
- 
- extern "C"
- {
--	#include "jinclude.h"
-+	#include <stdio.h>
- 	#include "jpeglib.h"
- 	#include "jerror.h"
- }
diff --git a/emulators/palmosemulator/patches/patch-aj b/emulators/palmosemulator/patches/patch-aj
deleted file mode 100644
index 0baa7606953..00000000000
--- a/emulators/palmosemulator/patches/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/01/05 03:31:26 dsainty Exp $
-
-This patch changes the idle CPU wait time from 10ms to 100ms.  For some reason
-the former saturates the CPU (on a Celeron 700 system), but with the latter
-the program idles at near 0%.  This patch is probably not required for native
-threads.
-
---- SrcUnix/Platform_Unix.cpp.orig	Sat Mar 30 01:11:19 2002
-+++ SrcUnix/Platform_Unix.cpp	Sun Jan  5 15:01:21 2003
-@@ -598,7 +598,8 @@
- 	// Wait on an event instead of just calling Sleep(10) so that another
- 	// thread can wake us up before our time.
- 
--	omni_thread::sleep( 0, 10000 ); // 10k nanoseconds = 1/100 sec
-+	// pkgsrc: updated 10k to 100k, makes a huge difference to CPU usage
-+	omni_thread::sleep( 0, 100000 ); // 10k nanoseconds = 1/100 sec
- }
- 
- 
diff --git a/emulators/palmosemulator/patches/patch-ak b/emulators/palmosemulator/patches/patch-ak
deleted file mode 100644
index b4821a504b1..00000000000
--- a/emulators/palmosemulator/patches/patch-ak
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/03/20 20:21:22 kristerw Exp $
-
---- SrcShared/Hardware/EmRegs328.cpp.orig	Sat Mar 20 17:48:57 2004
-+++ SrcShared/Hardware/EmRegs328.cpp	Sat Mar 20 18:11:46 2004
-@@ -141,13 +141,13 @@
- 	0x2400,		//	Word		pllControl;					// $200: PLL Control Register
- 	0x0123,		//	Word		pllFreqSel;					// $202: PLL Frequency Select Register
- 	0x0000,		//	Word		pllTest;					// $204: PLL Test Register
--	{ 0 },		//	Byte										__filler44;
-+	0,		//	Byte										__filler44;
- 	0x1F,		//	Byte		pwrControl;					// $207: Power Control Register
- 
- 	{ 0 },		//	Byte										___filler3[0x300-0x208];
- 
- 	0x00,		//	Byte		intVector;					// $300: Interrupt Vector Register
--	{ 0 },		//	Byte										___filler4;
-+	0,		//	Byte										___filler4;
- 	0x0000,		//	Word		intControl;					// $302: Interrupt Control Register
- 	0x00FF,		//	Word		intMaskHi;					// $304: Interrupt Mask Register/HIGH word
- 	0xFFFF,		//	Word		intMaskLo;					// $306: Interrupt Mask Register/LOW word
-@@ -162,21 +162,21 @@
- 
- 	0x00,		//	Byte		portADir;					// $400: Port A Direction Register
- 	0x00,		//	Byte		portAData;					// $401: Port A Data Register
--	{ 0 },		//	Byte										___filler5;
-+	0,		//	Byte										___filler5;
- 	0x00,		//	Byte		portASelect;				// $403: Port A Select Register
- 
- 	{ 0 },		//	Byte										___filler6[4];
- 
- 	0x00,		//	Byte		portBDir;					// $408: Port B Direction Register
- 	0x00,		//	Byte		portBData;					// $409: Port B Data Register
--	{ 0 },		//	Byte										___filler7;
-+	0,		//	Byte										___filler7;
- 	0x00,		//	Byte		portBSelect;				// $40B: Port B Select Register
- 
- 	{ 0 },		//	Byte										___filler8[4];
- 
- 	0x00,		//	Byte		portCDir;					// $410: Port C Direction Register
- 	0x00,		//	Byte		portCData;					// $411: Port C Data Register
--	{ 0 },		//	Byte										___filler9;
-+	0,		//	Byte										___filler9;
- 	0x00,		//	Byte		portCSelect;				// $413: Port C Select Register
- 
- 	{ 0 },		//	Byte										___filler10[4];
-@@ -184,10 +184,10 @@
- 	0x00,		//	Byte		portDDir;					// $418: Port D Direction Register
- 	0x00,		//	Byte		portDData;					// $419: Port D Data Register
- 	0xFF,		//	Byte		portDPullupEn;				// $41A: Port D Pull-up Enable
--	{ 0 },		//	Byte										___filler11;
-+	0,		//	Byte										___filler11;
- 	0x00,		//	Byte		portDPolarity;				// $41C: Port D Polarity Register
- 	0x00,		//	Byte		portDIntReqEn;				// $41D: Port D Interrupt Request Enable
--	{ 0 },		//	Byte										___filler12;
-+	0,		//	Byte										___filler12;
- 	0x00,		//	Byte		portDIntEdge;				// $41F: Port D IRQ Edge Register
- 
- 	0x00,		//	Byte		portEDir;					// $420: Port E Direction Register
-@@ -213,7 +213,7 @@
- 
- 	0x00,		//	Byte		portJDir;					// $438: Port J Direction Register
- 	0x00,		//	Byte		portJData;					// $439: Port J Data Register
--	{ 0 },		//	Byte										___filler19;
-+	0,		//	Byte										___filler19;
- 	0x00,		//	Byte		portJSelect;				// $43B: Port J Select Register
- 
- 	{ 0 },		//	Byte										___filler19a[4];
-@@ -279,7 +279,7 @@
- 	{ 0 },		//	Byte										___filler28[0xA00-0x90A];
- 
- 	0x00000000,	//	DWord		lcdStartAddr;				// $A00: Screen Starting Address Register
--	{ 0 },		//	Byte										___filler29;
-+	0,		//	Byte										___filler29;
- 	0xFF,		//	Byte		lcdPageWidth;				// $A05: Virtual Page Width Register
- 	{ 0 },		//	Byte										___filler30[2];
- 	0x03FF,		//	Word		lcdScreenWidth;				// $A08: Screen Width Register
-@@ -288,7 +288,7 @@
- 	0x0000,		//	Word		lcdCursorXPos;				// $A18: Cursor X Position
- 	0x0000,		//	Word		lcdCursorYPos;				// $A1A:	Cursor Y Position
- 	0x0101,		//	Word		lcdCursorWidthHeight;		// $A1C: Cursor Width and Height
--	{ 0 },		//	Byte										___filler32;
-+	0,		//	Byte										___filler32;
- 	0x7F,		//	Byte		lcdBlinkControl;			// $A1F: Blink Control Register
- 	0x00,		//	Byte		lcdPanelControl;			// $A20: Panel Interface Control Register
- 	0x00,		//	Byte		lcdPolarity;				// $A21: Polarity Config Register
diff --git a/emulators/palmosemulator/patches/patch-al b/emulators/palmosemulator/patches/patch-al
deleted file mode 100644
index 2e11fd04678..00000000000
--- a/emulators/palmosemulator/patches/patch-al
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-al,v 1.1 2004/03/20 20:21:22 kristerw Exp $
-
---- SrcShared/Hardware/EmRegsEZ.cpp.orig	Sat Mar 20 20:22:20 2004
-+++ SrcShared/Hardware/EmRegsEZ.cpp	Sat Mar 20 20:24:11 2004
-@@ -84,13 +84,13 @@
- 	0x2430,		// Word		pllControl;						// $200: PLL Control Register
- 	0x0123,		// Word		pllFreqSel;						// $202: PLL Frequency Select Register
- 	0,		// !!! ---> Marked as reserved in 1.4 Word		pllTest;						// $204: PLL Test Register (do not access)
--	{ 0 },		// Byte											___filler44;
-+	0,		// Byte											___filler44;
- 	0x1F,		// Byte		pwrControl;						// $207: Power Control Register
- 
- 	{ 0 },		// Byte											___filler3[0x300-0x208];
- 
- 	0x00,		// Byte		intVector;						// $300: Interrupt Vector Register
--	{ 0 },		// Byte											___filler4;
-+	0,		// Byte											___filler4;
- 	0x0000,		// Word		intControl;						// $302: Interrupt Control Register
- 	0x00FF,		// Word		intMaskHi;						// $304: Interrupt Mask Register/HIGH word
- 	0xFFFF,		// Word		intMaskLo;						// $306: Interrupt Mask Register/LOW word
-@@ -183,7 +183,7 @@
- 	{ 0 },		// Byte											___filler28[0xA00-0x90C];
- 
- 	0x00000000,	// DWord	lcdStartAddr;					// $A00: Screen Starting Address Register
--	{ 0 },		// Byte											___filler29;
-+	0,		// Byte											___filler29;
- 	0xFF,		// Byte		lcdPageWidth;					// $A05: Virtual Page Width Register
- 	{ 0 },		// Byte											___filler30[2];
- 	0x03FF,		// Word		lcdScreenWidth;					// $A08: Screen Width Register
-@@ -192,17 +192,17 @@
- 	0x0000,		// Word		lcdCursorXPos;					// $A18: Cursor X Position
- 	0x0000,		// Word		lcdCursorYPos;					// $A1A:	Cursor Y Position
- 	0x0101,		// Word		lcdCursorWidthHeight;			// $A1C: Cursor Width and Height
--	{ 0 },		// Byte											___filler32;
-+	0,		// Byte											___filler32;
- 	0x7F,		// Byte		lcdBlinkControl;				// $A1F: Blink Control Register
- 	0x00,		// Byte		lcdPanelControl;				// $A20: Panel Interface Control Register
- 	0x00,		// Byte		lcdPolarity;					// $A21: Polarity Config Register
--	{ 0 },		// Byte											___filler33;						
-+	0,		// Byte											___filler33;						
- 	0x00,		// Byte		lcdACDRate;						// $A23: ACD (M) Rate Control Register
--	{ 0 },		// Byte											___filler34;
-+	0,		// Byte											___filler34;
- 	0x00,		// Byte		lcdPixelClock;					// $A25: Pixel Clock Divider Register
--	{ 0 },		// Byte											___filler35;
-+	0,		// Byte											___filler35;
- 	0x40,		// Byte		lcdClockControl;				// $A27: Clocking Control Register
--	{ 0 },		// Byte											___filler36;
-+	0,		// Byte											___filler36;
- 	0xFF,		// Byte		lcdRefreshRateAdj;				// $A29: Refresh Rate Adjustment Register
- 	{ 0 },		// Byte											___filler2003[0xA2D-0xA2A];
- 	0x00,		// Byte		lcdPanningOffset;				// $A2D: Panning Offset Register
-@@ -210,10 +210,10 @@
- 	{ 0 },		// Byte											___filler37[0xA31-0xA2E];
- 
- 	0xB9,		// Byte		lcdFrameRate;					// $A31: Frame Rate Control Modulation Register
--	{ 0 },		// Byte											___filler2004;
-+	0,		// Byte											___filler2004;
- 	0x84,		// Byte		lcdGrayPalette;					// $A33: Gray Palette Mapping Register
- 	0x00,		// Byte		lcdReserved;					// $A34: Reserved
--	{ 0 },		// Byte											___filler2005;
-+	0,		// Byte											___filler2005;
- 	0x0000,		// Word		lcdContrastControlPWM;			// $A36: Contrast Control
- 
- 	{ 0 },		// Byte											___filler40[0xB00-0xA38];
diff --git a/emulators/palmosemulator/patches/patch-am b/emulators/palmosemulator/patches/patch-am
deleted file mode 100644
index 6e974b9091f..00000000000
--- a/emulators/palmosemulator/patches/patch-am
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-am,v 1.1 2004/03/20 20:21:22 kristerw Exp $
-
---- SrcShared/Hardware/EmRegsVZ.cpp.orig	Sat Mar 20 20:28:32 2004
-+++ SrcShared/Hardware/EmRegsVZ.cpp	Sat Mar 20 20:30:42 2004
-@@ -270,7 +270,7 @@
- 	{ 0 },		// UInt8									___filler28a[0xA00-0x91E];
- 
- 	0x00000000,	// UInt32	lcdStartAddr;				// $A00: Screen Starting Address Register
--	{ 0 },		// UInt8									___filler29;
-+	0,		// UInt8									___filler29;
- 	0xFF,		// UInt8	lcdPageWidth;				// $A05: Virtual Page Width Register
- 	{ 0 },		// UInt8									___filler30[2];
- 	0x03F0,		// UInt16	lcdScreenWidth;				// $A08: Screen Width Register
-@@ -279,29 +279,29 @@
- 	0x0000,		// UInt16	lcdCursorXPos;				// $A18: Cursor X Position
- 	0x0000,		// UInt16	lcdCursorYPos;				// $A1A: Cursor Y Position
- 	0x0101,		// UInt16	lcdCursorWidthHeight;		// $A1C: Cursor Width and Height
--	{ 0 },		// UInt8									___filler32;
-+	0,		// UInt8									___filler32;
- 	0x7F,		// UInt8	lcdBlinkControl;			// $A1F: Blink Control Register
- 	0x00,		// UInt8	lcdPanelControl;			// $A20: Panel Interface Configuration Register
- 	0x00,		// UInt8	lcdPolarity;				// $A21: Polarity Config Register
--	{ 0 },		// UInt8									___filler33;						
-+	0,		// UInt8									___filler33;						
- 	0x00,		// UInt8	lcdACDRate;					// $A23: ACD (M) Rate Control Register
--	{ 0 },		// UInt8									___filler34;
-+	0,		// UInt8									___filler34;
- 	0x00,		// UInt8	lcdPixelClock;				// $A25: Pixel Clock Divider Register
--	{ 0 },		// UInt8									___filler35;
-+	0,		// UInt8									___filler35;
- 	0x00,		// UInt8	lcdClockControl;			// $A27: Clocking Control Register
- 	0x00FF,		// UInt16	lcdRefreshRateAdj;			// $A28: Refresh Rate Adjustment Register
--	{ 0 },		// UInt8									___filler37;
-+	0,		// UInt8									___filler37;
- 	0x00,		// UInt8	lcdReserved1;				// $A2B: Reserved
--	{ 0 },		// UInt8									___filler38;
-+	0,		// UInt8									___filler38;
- 	0x00,		// UInt8    lcdPanningOffset;			// $A2D: Panning Offset Register
- 
- 	{ 0 },		// UInt8									___filler39[0xA31-0xA2E];
- 
- 	0x00,		// UInt8	lcdFrameRate;				// $A31: Frame Rate Control Modulation Register
--	{ 0 },		// UInt8									___filler2004;
-+	0,		// UInt8									___filler2004;
- 	0x84,		// UInt8	lcdGrayPalette;				// $A33: Gray Palette Mapping Register
- 	0x00,		// UInt8	lcdReserved2;				// $A34: Reserved
--	{ 0 },		// UInt8									___filler2005;
-+	0,		// UInt8									___filler2005;
- 	0x0000,		// UInt16	lcdContrastControlPWM;		// $A36: Contrast Control
- 	0x00,		// UInt8	lcdRefreshModeControl;		// $A38: Refresh Mode Control Register
- 	0x62,		// UInt8	lcdDMAControl;				// $A39: DMA Control Register
diff --git a/emulators/palmosemulator/patches/patch-an b/emulators/palmosemulator/patches/patch-an
deleted file mode 100644
index a12161fb9a8..00000000000
--- a/emulators/palmosemulator/patches/patch-an
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/08/16 12:36:38 dsainty Exp $
-
-Building POSE under gcc 3.3.3 with optimisation as default (g++ -O2) leads to
-a malfunction where POSE will go into an apparent infinite loop after the
-first pen operation.
-
-This appears to be due to pointer coordinate corruption, fixed by the patch
-below.
-
-The only user of the patched type coercion is
-SrcShared/Patches/EmPatchMgr.cpp, which says:
-
-PointType palmPen = pen;
-
-I haven't entirely traced this through, but I suspect that the palmPen
-coordinates are corrupted on the "pen up" event, leading the hosted Palm OS to
-believe the stylus is being perpetually dragged around the screen.
-
-The issue appears to be resolved by the below patch, which is a somewhat less
-dodgy (but only just!) implementation, and appears to be enough to convince
-the compiler to keep the target class uncorrupted.
-
-Another option is: EmPatchMgr.cpp: PointType palmPen = { pen.fX, pen.fY };
-
---- SrcShared/EmPoint.cpp.orig	2002-03-30 01:11:14.000000000 +1200
-+++ SrcShared/EmPoint.cpp	2004-08-16 00:11:31.000000000 +1200
-@@ -233,7 +233,7 @@
- 	#undef FOR_POINT
- 	#define FOR_POINT(cls, size, x, y)		\
- 		EmPoint::operator cls() const		\
--			{ size pt[2]; pt[x] = fX; pt[y] = fY; return *(cls*) pt; }
-+			{ union { size pt[2]; cls bar; } foo; foo.pt[x] = fX; foo.pt[y] = fY; return foo.bar; }
- 
- 	POINT_LIST_XY_LONG
- 	POINT_LIST_YX_LONG
diff --git a/emulators/palmosemulator/patches/patch-ao b/emulators/palmosemulator/patches/patch-ao
deleted file mode 100644
index 7c15497a9c4..00000000000
--- a/emulators/palmosemulator/patches/patch-ao
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2006/04/28 13:52:06 joerg Exp $
-
---- SrcShared/EmStream.h.orig	2006-04-28 12:41:47.000000000 +0000
-+++ SrcShared/EmStream.h
-@@ -90,7 +90,7 @@ class EmStream
- 
- 									container.resize (numElements);
- 
--									deque<T>::iterator	iter = container.begin ();
-+									typename deque<T>::iterator	iter = container.begin ();
- 									while (iter != container.end ())
- 									{
- 										*this >> *iter;
-@@ -108,7 +108,7 @@ class EmStream
- 
- 									container.resize (numElements);
- 
--									list<T>::iterator	iter = container.begin ();
-+									typename list<T>::iterator	iter = container.begin ();
- 									while (iter != container.end ())
- 									{
- 										*this >> *iter;
-@@ -126,7 +126,7 @@ class EmStream
- 
- 									container.resize (numElements);
- 
--									vector<T>::iterator	iter = container.begin ();
-+									typename vector<T>::iterator	iter = container.begin ();
- 									while (iter != container.end ())
- 									{
- 										*this >> *iter;
-@@ -143,7 +143,7 @@ class EmStream
- 
- 									*this << numElements;
- 
--									deque<T>::const_iterator	iter = container.begin ();
-+									typename deque<T>::const_iterator	iter = container.begin ();
- 									while (iter != container.end ())
- 									{
- 										*this << *iter;
-@@ -160,7 +160,7 @@ class EmStream
- 
- 									*this << numElements;
- 
--									list<T>::const_iterator	iter = container.begin ();
-+									typename list<T>::const_iterator	iter = container.begin ();
- 									while (iter != container.end ())
- 									{
- 										*this << *iter;
-@@ -177,7 +177,7 @@ class EmStream
- 
- 									*this << numElements;
- 
--									vector<T>::const_iterator	iter = container.begin ();
-+									typename vector<T>::const_iterator	iter = container.begin ();
- 									while (iter != container.end ())
- 									{
- 										*this << *iter;
diff --git a/emulators/palmosemulator/patches/patch-ap b/emulators/palmosemulator/patches/patch-ap
deleted file mode 100644
index a6077279dd8..00000000000
--- a/emulators/palmosemulator/patches/patch-ap
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/04/28 13:52:06 joerg Exp $
-
---- SrcShared/Miscellaneous.cpp.orig	2006-04-28 13:19:44.000000000 +0000
-+++ SrcShared/Miscellaneous.cpp
-@@ -2687,7 +2687,7 @@ void FormatInteger (char* dest, uint32 i
- 	// Get the thousands separator character(s).
- 
- 	struct lconv*	locale_data = localeconv ();
--	char*			thousands_sep = locale_data->thousands_sep;
-+	const char*	thousands_sep = locale_data->thousands_sep;
- 
- 	if (strlen (thousands_sep) == 0)
- 	{
-@@ -2747,7 +2747,7 @@ string FormatInteger (uint32 integer)
- 	// Get the thousands separator character(s).
- 
- 	struct lconv*	locale_data = localeconv ();
--	char*			thousands_sep = locale_data->thousands_sep;
-+	const char*	thousands_sep = locale_data->thousands_sep;
- 
- 	if (strlen (thousands_sep) == 0)
- 	{
diff --git a/emulators/palmosemulator/patches/patch-aq b/emulators/palmosemulator/patches/patch-aq
deleted file mode 100644
index c1aeb8d5ec6..00000000000
--- a/emulators/palmosemulator/patches/patch-aq
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2006/06/28 15:56:10 joerg Exp $
-
---- SrcShared/Hardware/EmRegs.h.orig	2006-06-28 14:35:52.000000000 +0000
-+++ SrcShared/Hardware/EmRegs.h
-@@ -54,12 +54,17 @@ class EmRegs
- 														 uint32 start, int count);
- 
- 		uint32					UnsupportedRead			(emuptr address, int size);
-+	public:
- 		uint32					StdRead					(emuptr address, int size);
-+
-+	protected:
- 		uint32					StdReadBE				(emuptr address, int size);
- 		uint32					ZeroRead				(emuptr address, int size);
- 
- 		void					UnsupportedWrite		(emuptr address, int size, uint32 value);
-+	public:
- 		void					StdWrite				(emuptr address, int size, uint32 value);
-+	protected:
- 		void					StdWriteBE				(emuptr address, int size, uint32 value);
- 		void					NullWrite				(emuptr address, int size, uint32 value);
- 
diff --git a/emulators/pcemu/DESCR b/emulators/pcemu/DESCR
deleted file mode 100644
index 02232e98497..00000000000
--- a/emulators/pcemu/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-PC Emulator for Unix and X Windows
-
-As the title suggests, this is a Unix/X windows program which is
-designed to emulate a standard 8086 based PC.
-
-The emulator runs at about 8-10MHz 80286 speed on a Sun SparcStation
-10/40 (without the -mviking flag) and at about 6MHz 8088 speed on a
-33MHz 80486 box running Linux.
-
-I have included a Postscript representation of my project report. It's
-a bit out of date now, but it's the closest thing I've got to
-documentation!  I'll do some kind of latex thing for the next
-release....
-
-The program rather hogs the cpu but unmapping the window (iconifying
-it) will put it to sleep.
-
-The author is:
-David Hedley, hedley@cs.bris.ac.uk
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
deleted file mode 100644
index 6a0f7f91269..00000000000
--- a/emulators/pcemu/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2007/02/19 17:52:53 joerg Exp $
-
-DISTNAME=	pcemu1.01alpha
-PKGNAME=	pcemu-1.01a
-PKGREVISION=	2
-CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/ \
-		ftp://ftp.interface-business.de/pub/outgoing/ \
-		ftp://ftp.cs.bris.ac.uk/pub/users/hedley/
-
-MAINTAINER=	eric@fox.phoenix.az.us
-COMMENT=	8086 PC emulator, by David Hedley
-
-USE_TOOLS+=	bdftopcf mkfontdir
-
-MAKE_ENV+=	FILESDIR=${FILESDIR:Q}
-
-FONTS_DIRS.x11=	${PREFIX}/lib/pcemu/font
-REQD_DIRS=	${PREFIX}/lib/pcemu/font
-REQD_DIRS+=	${PREFIX}/lib/pcemu
-
-do-configure:
-	cd ${WRKSRC};							\
-		${MKDIR} ${WRKSRC}/bootstrap;				\
-		${SH} < ${FILESDIR}/bootstrap.shar
-
-post-configure:
-	${SED} -e 's|/usr/local|${PREFIX}|g' < ${WRKSRC}/bootstrap/help.txt > \
-		${WRKSRC}/foo
-	${MV} ${WRKSRC}/foo ${WRKSRC}/bootstrap/help.txt
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/pcemu/PLIST b/emulators/pcemu/PLIST
deleted file mode 100644
index 00358bdd32b..00000000000
--- a/emulators/pcemu/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:23:54 wiz Exp $
-bin/pcemu
-lib/pcemu/doc/BUGS
-lib/pcemu/doc/CHANGES
-lib/pcemu/doc/README
-lib/pcemu/doc/TODO
-lib/pcemu/doc/README.BSD
-lib/pcemu/doc/lredir.readme
-lib/pcemu/doc/report.ps.gz
-lib/pcemu/font/vga.pcf.Z
-lib/pcemu/C/vga50.com
-lib/pcemu/C/config.sys
-lib/pcemu/C/dumpdisk.exe
-lib/pcemu/C/lredir.exe
-lib/pcemu/C/emufs.sys
-lib/pcemu/DriveA
-@dirrm lib/pcemu/doc
-@comment in REQ_DIRS: @dirrm lib/pcemu/font
-@dirrm lib/pcemu/C
-@comment in REQ_DIRS: @dirrm lib/pcemu
diff --git a/emulators/pcemu/distinfo b/emulators/pcemu/distinfo
deleted file mode 100644
index 501c085fc1d..00000000000
--- a/emulators/pcemu/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.9 2006/10/22 00:59:45 rillig Exp $
-
-SHA1 (pcemu1.01alpha.tar.gz) = 4c0cf9b3b197e890fbc85dc85ca0d7c75eb145b3
-RMD160 (pcemu1.01alpha.tar.gz) = 2eb3ba91138d08946728a6dc1dee6482416c3a01
-Size (pcemu1.01alpha.tar.gz) = 316257 bytes
-SHA1 (patch-aa) = 44a677c1cd283817c0a8cd5373b601f41699f40e
-SHA1 (patch-ab) = 6636736f76b956a2beb6490785b63f4a131c9c25
-SHA1 (patch-ac) = c2d7971e269305db2e2a9a487cb3169ecb259173
-SHA1 (patch-ad) = 5b4c50d591eb5060276015e8b178475de38293fd
-SHA1 (patch-ae) = c641955b80afabb688739fca411f3c31c2aa16a7
-SHA1 (patch-af) = d36be5e25896ebc66bb2cc11135d61053a7e57ff
-SHA1 (patch-ag) = 95ee8354783af38e43eb966a991c7a87823b7ce7
-SHA1 (patch-ah) = 37e8e4af38a4a66e4c5f3e57e682ca793b735732
-SHA1 (patch-ai) = 80a0467b181e2850ebf44a84462130b6542ae78d
-SHA1 (patch-aj) = 6df6fb6fc9b8f9a9c551f5152325fde7aab986c6
-SHA1 (patch-ak) = e04ac57d8a51016bd1e449141a33a7c793b6aab0
diff --git a/emulators/pcemu/files/README.BSD b/emulators/pcemu/files/README.BSD
deleted file mode 100644
index 1fb4d2477d4..00000000000
--- a/emulators/pcemu/files/README.BSD
+++ /dev/null
@@ -1,158 +0,0 @@
-$NetBSD: README.BSD,v 1.2 2004/07/09 12:46:37 wiz Exp $
-This is an excerpt of what you can see with the standalone "system".
- -- Jörg
-
-1. This looks like PC, but where is DOS? How to get pcemu really running
-
-Pcemu is an emulator that emulates an 8086 CPU as well as a bunch of
-PC BIOS services, so it basically provides the functionality like an
-old PC/XT.  Anyway, as with the XT too, the emulator requires something
-like an operating system to run with.  Since we cannot ship MS-DOS or
-one of its variants along with this distribution (for legal reasons),
-you're now actually looking at a (sort of) "standalone operating system",
-just to get pcemu booted and running.  All this system does is showing
-you this introduction.
-
-You will have to replace this mini-system by a physical image of a
-DOS boot floppy.  The "system" currently running is booted from the
-file
-
-	@@@PREFIX@@@/lib/pcemu/DriveA.
-
-It pretends to be the image of a 720 KB diskette, which has been
-chosen as the default bootfile size.
-
-In order to obtain the image of a bootable DOS floppy, do the following:
-
-	Prepare a 720 KB floppy with a DOS system as you'd like
-	to run it later.  Include all the good stuff you don't want
-	to miss there.  Don't forget to put a simple text editor
-	there, so you can modify your configuration files later.
-
-	Put a copy of the file
-
-		@@@PREFIX@@@/lib/pcemu/C/emufs.sys
-
-	onto this diskette, and include a line like
-
-		device = a:\emufs.sys @@@PREFIX@@@/lib/pcemu/C
-
-	into the config.sys file on this diskette.  This will
-	provide you with an interface to the BSD file system from
-	within your DOS session.  (It actually pretends to be a
-	network drive.)  According to David Hedley, you are also
-	advised to include the line
-
-		stacks = 9, 512
-
-	there to avoid stack overflow problems with the emulator.
-
-	If you want to retain a copy of the standalone "system" you
-	are currently looking at, move it away:
-
-		# cd @@@PREFIX@@@/lib/pcemu; mv DriveA StandaloneA
-
-	Now, make a copy of your disk by either:
-
-	- under BSD, perform a
-
-		# cp /dev/fd0.720 @@@PREFIX@@@/lib/pcemu/DriveA
-
-	  (the number after the fd may vary for drives other than
-	  the primary one), or
-
-	- under DOS, copy the file
-
-		@@@PREFIX@@@/lib/pcemu/C/dumpdisk.exe
-
-	  to your DOS system and execute it.  This will dump the
-	  physical copy of either drive A or B to the file drivea
-	  in your current (DOS) working directory.  You can then move
-	  this file to
-
-		@@@PREFIX@@@/lib/pcemu/DriveA
-
-	  in your BSD system.
-
-Since pcemu needs to display the standard VGA font, you further need
-to tell your X server about the location of the font file.  It has
-been put under
-
-	@@@PREFIX@@@/lib/pcemu/font/
-
-along with the necessary information for the X server.  All you need
-to do is to tell your X server about it.  This can either be done
-as a server default by including the directory into the FontPath
-section of your XF86Config file (this is for XFree86, refer to
-the documentation if you're using another X server).  Alternatively,
-you can run the command
-
-	$ xset fp+ @@@PREFIX@@@/lib/pcemu/font
-
-when X11 is running to instruct your X server to append this directory
-to the font path.  Should you wish to run pcemu across the network,
-remember that the fonts must be physically available at the server
-side, or you need to provide an X11 font server (xfs).  Refer to
-the X11 documentation on how to setup this.
-
-
-That's all, now you should be able to run pcemu.  Add required
-device = a:\emufs.sys /... lines to your config.sys as you
-need them.  It's not wise to make the whole BSD hierarchy available
-since DOS does not provide multiuser protection.
-
-Should you wish to override some of the emulator defaults like
-size and location of the bootfile, you can do this by settig up a
-$HOME/.pcemurc file.  Refer to sections 2. and 3. below.
-
-
-
-2. Information about this BSD port
-
-
-This `port' of pcemu, originally to FreeBSD, has been prepared by Jörg
-Wunsch. It is an only slightly modified version of David's code, a few
-problems have been fixed for the BSD compilation environment, and the
-location of the default boot file has been moved in order to get you
-started with just what you are reading now.
-
-The PostScript document David is mentioning under 3. below has
-been compressed and stored under
-
-	@@@PREFIX@@@/lib/pcemu/doc/report.ps.gz.
-
-It is huge however, so if you don't care much for it you might wish
-to remove it later.
-
-Since i'm living in Germany with a German keyboard, i found the
-original X11 KeySym to PC scancode translation unacceptable.  Several
-scancodes have been unreachable for me.  Hence i decided to add another
-section to the .pcemurc file allowing to instruct pcemu of specific
-keyboard layout semantics.  They consist of the keyword keymap,
-followed by the desired PC scancode, an equal sign, and the character
-that is generated for this key under X11 without any shift keys.  (Note
-that no space is allowed on either side of the equal sign.)  This way
-i won't get a German key mapping under DOS, but at least a valid keyboard
-layout where all the scan codes can actually be generated at all.
-
-The appropriate section of my .pcemurc file looks like:
-
-keymap 12=ß
-keymap 13='
-keymap 21=z
-keymap 26=]
-keymap 27=+
-keymap 39=\
-keymap 40=[
-keymap 41=^
-keymap 43=#
-keymap 44=y
-keymap 53=-
-keymap 86=<
-
-
-Once :-) i will have filed all my modifications back to David, and
-perhaps they will be included into the regular distribution as well.
-
-Should you wish to contact me regarding the FreeBSD port, you can
-reach me as joerg_wunsch@uriah.heep.sax.de.
diff --git a/emulators/pcemu/files/bootstrap.shar b/emulators/pcemu/files/bootstrap.shar
deleted file mode 100644
index 20a40e4e376..00000000000
--- a/emulators/pcemu/files/bootstrap.shar
+++ /dev/null
@@ -1,1087 +0,0 @@
-# $NetBSD: bootstrap.shar,v 1.1.1.1 1999/03/31 06:34:07 garbled Exp $
-# This is a shell archive.  Save it in a file, remove anything before
-# this line, and then unpack it by entering "sh file".  Note, it may
-# create directories; files and directories will be owned by you and
-# have default permissions.
-#
-# This archive contains:
-#
-#	bootstrap/Makefile
-#	bootstrap/crt0.S
-#	bootstrap/display.c
-#	bootstrap/help.txt
-#	bootstrap/lcrt0.S
-#	bootstrap/txt2asm.perl
-#	bootstrap/xcrt0.S
-#
-echo x - bootstrap/Makefile
-sed 's/^X//' >bootstrap/Makefile << 'END-of-bootstrap/Makefile'
-XAS = as86
-XLD = ld86
-XCC = bcc
-XCFLAGS = -0
-XLDFLAGS = -0 ##-M
-X
-X
-X.SUFFIXES: .S .o
-X
-X.S.o:
-X	$(AS) -o $@ $<
-X
-Xall: display.bin README.BSD
-X
-X# The .com file is only to shortcut the development cycles when
-X# modifying something, you won't have to reboot pcemu with the
-X# new image over and over again.
-X#
-X#all: display.com
-X
-Xdisplay.com: display.o text.o crt0.o
-X	$(LD) $(LDFLAGS) -T 0x100 -o display.tmp crt0.o display.o text.o
-X	dd if=display.tmp of=$@ ibs=32 skip=1
-X	rm -f display.tmp
-X
-Xdisplay.bin: display.o text.o lcrt0.o xcrt0.o
-X	$(LD) $(LDFLAGS) -T 0x7c00 -o display.tmp \
-X		lcrt0.o display.o text.o xcrt0.o
-X	dd if=display.tmp of=$@ ibs=32 skip=1 obs=720k conv=osync
-X	rm -f display.tmp
-X
-X# o expand the tabs
-X# o translate german ISO characters into IBM437
-X# o finally convert all this into assembler .ascii/.byte pseudoinstr's
-X#
-Xtext.S: help.txt txt2asm.perl
-X	expand < help.txt |\
-X	tr '\344\366\374\304\326\334\337' '\204\224\201\216\231\232\341' |\
-X	perl txt2asm.perl > $@
-X
-X# maintain the README.BSD from the help.txt
-X# looks magic, 'eh? :^)
-X# The readme consists of everything from section 1 up to before the
-X# headline of section 3.  The highlighting characters will be removed.
-X#
-X# If you've never been using Perl before, don't worry.  Let the lines
-X# below stand as they do. :-)
-XREADME.BSD: help.txt Makefile
-X	perl -e 'print "This is an excerpt of what you can see with";\
-X		print " the standalone \"system\".\n -- J\366rg\n\n\n";\
-X		while(<>) {last if /^[\001-\010\013-\037]1\./;}\
-X		do {tr[\001-\010\013-\037]//d; print;}\
-X		while(($$_=<>) && !m/^[\001-\010\013-\037]3\./);' \
-X	< help.txt > $@
-X
-Xreallyclean: clean
-X	rm -f display.bin README.BSD
-X
-Xclean:
-X	rm -f *.tmp *~ *.core *.o *.s display.com text.S
-X
-Xpack: all clean
-X	rm -f ../../../files/bootstrapper.uu ../../../files/README.BSD
-X	gzip --best --force display.bin
-X	uuencode display.bin.gz display.bin.gz > ../../../files/bootstrapper.uu
-X	cp -p README.BSD ../../../files/README.BSD
-X	rm -f display.bin.gz README.BSD
-X
-X
-Xunpack:
-X	rm -f display.bin README.BSD
-X	uudecode ${FILESDIR}/bootstrapper.uu
-X	gunzip --force display.bin.gz
-X	sed -e 's|@@@PREFIX@@@|${PREFIX}|g' <${FILESDIR}/README.BSD> README.BSD
-END-of-bootstrap/Makefile
-echo x - bootstrap/crt0.S
-sed 's/^X//' >bootstrap/crt0.S << 'END-of-bootstrap/crt0.S'
-X	;; Hey Emacs, this is an -*- asm -*- file.
-X	;;
-X	;; crt0 -- prologue for simple DOS .com file
-X	;;
-X	;; also implements exit(), by calling the DOS exit service
-X	
-X	use16
-X
-X	entry	_begin
-X_begin:	jmp	.start
-X
-X	extern	_main
-X
-X	public	_exit
-X_exit:
-X_exit.code	set	4
-X
-X	push	bp
-X	mov	bp, sp
-X	mov	al, _exit.code[bp]
-X	mov	ah, 0x4c	; dos service, exit w/ status
-X	int	0x21
-X
-X_exit.1:			; not reached (hopefully)
-X	jmp	_exit.1
-X
-X
-X.start:
-X	call	_main
-X	call	_exit
-X
-END-of-bootstrap/crt0.S
-echo x - bootstrap/display.c
-sed 's/^X//' >bootstrap/display.c << 'END-of-bootstrap/display.c'
-X/*
-X * display -- a simple program to display static text in a more(1)-like
-X * manner.  Designed to run with simple BIOS services on a i*86-PC.
-X *
-X * Purpose of the program: provide a simple method for pcemu to display
-X * a text when there is no DOS boot image installed.  This program will
-X * run as the bootfile then.
-X *
-X * Author: Joerg Wunsch, 95/03/10
-X * Placed in the public domain.  Neither kind of warranty applies.
-X *
-X * Thanks to Bruce Evans for his bcc compiler.  Made my work much
-X * easier.
-X */
-X
-X#define MAXROW 23
-X#define MAXCOL 79
-X#asm
-Xmaxrow:	set 23
-Xmaxcol:	set 79
-Xnl:	set 10
-X#endasm
-X
-X#define WHITE	7
-X#define BROWN	6
-X#define MAGENTA	5
-X#define RED	4
-X#define CYAN	3
-X#define GREEN	2
-X#define BLUE	1
-X#define BLACK	0
-X#define HIGH	8
-X/* convenience: */
-X#define	YELLOW	(BROWN|HIGH)	/* foreground color */
-X#define	GRAY	WHITE		/* background color */
-X
-X#define NOCHANGE (-1)		/* do not change color; for setattrib() */
-X
-X/*
-X * We use a special highlighting scheme: embedded control characters
-X * in the text toggle the attribute selection.
-X *
-X * Define attributes used for highlighting.
-X * NB: do not parenthise the macro expansions below, they are used as
-X * complete parameter lists for setattrib()!
-X */
-X
-X#define REGULAR	BLACK, GRAY		/* ^R */
-X#define	BOLD	WHITE|HIGH, RED|HIGH	/* ^B */
-X#define	EMPHS	BLUE, GRAY		/* ^E */
-X#define	DOUBLE	YELLOW, BLACK		/* ^D */
-X
-X#define	C_REGULAR	('R' & 0x1f)
-X#define	C_BOLD		('B' & 0x1f)
-X#define	C_EMPHS		('E' & 0x1f)
-X#define	C_DOUBLE	('D' & 0x1f)
-X
-X#define	K_CUP	((0x48 << 8) + 0) /* extended ASCII, cursor up */
-X#define	K_CDN	((0x50 << 8) + 0) /* extended ASCII, cursor down */
-X#define	K_PREV	((0x49 << 8) + 0) /* extended ASCII, page up */
-X#define	K_NEXT	((0x51 << 8) + 0) /* extended ASCII, page down */
-X
-X/*
-X * Glue to link to the BIOS services.
-X */
-X
-Xchar attrib;
-Xchar row, col;
-X
-X
-Xvoid scroll(nlines)
-Xint nlines;			/* if nlines == 0, clear entire region */
-X{
-X#asm
-X	push	bp
-X	mov	bp, sp
-X
-X	xor	bh, bh		; page 0
-X	mov	dx, *(maxcol + (maxrow << 8)); bottom/right corner
-X	xor	cx, cx		; top/left corner
-X	mov	al, 4[bp]	; nlines
-X	mov	bh, _attrib
-X	mov	ah, *6		; video bios, scroll (clear) region
-X	test	al, al		; scroll back?
-X	jns	_scroll.1	; positive value -> forward
-X	inc	ah		; scroll backwards
-X	neg	al
-X_scroll.1:
-X	int	0x10
-X
-X	pop	bp
-X#endasm
-X}
-X
-Xvoid gotoxy(x, y)
-Xint x;
-Xint y;
-X{
-X#asm
-X	push	bp
-X	mov	bp, sp
-X
-X	mov	dl, 4[bp]	; x
-X	mov	_col, dl
-X	mov	dh, 6[bp]	; y
-X	mov	_row, dh
-X	xor	bh, bh		; page 0
-X	mov	ah, *2		; video bios, set cursor
-X	int	0x10
-X
-X	pop	bp
-X#endasm
-X}
-X
-Xvoid putchar(c)
-Xint c;
-X{
-X#asm
-X	push	bp
-X	mov	bp, sp
-X
-X	mov	al, 4[bp]	; c
-X	mov	bl, _attrib
-X	xor	bh, bh		; always page 0
-X	mov	cx, *1		; just one char
-X	mov	ah, *9		; video bios, write char
-X	int	0x10
-X
-X	pop	bp
-X#endasm
-X	if(col < MAXCOL)
-X	  gotoxy(col + 1, row);
-X}
-X
-X
-Xvoid cls()
-X{
-X  scroll(0);
-X}
-X
-X
-Xint getchar()
-X{
-X#asm
-X	xor	ah, ah		; kbd bios, get keystroke
-X	int	0x16
-X#endasm
-X}
-X
-Xvoid setattrib(foreground, background)
-Xint foreground;
-Xint background;
-X{
-X  int i;
-X  if(foreground == -1)
-X    i = attrib & 0xf;
-X  else
-X    i = foreground & 0xf;
-X  if(background == -1)
-X    i |= (attrib & 0xf0);
-X  else
-X    i |= ((background & 0xf) << 4);
-X  attrib = i;
-X}
-X
-X
-X/*
-X * Some auxiliary functions
-X */
-X
-X/*
-X * print one line of text up to a newline or a null character
-X */
-X
-Xchar *printline(s)
-Xchar *s;
-X{
-X  register char c;
-X
-X  while((c = *s++) && c != '\n')
-X    switch(c)
-X      {
-X      case C_REGULAR:
-X	setattrib(REGULAR);
-X	break;
-X
-X      case C_BOLD:
-X	setattrib(BOLD);
-X	break;
-X
-X      case C_EMPHS:
-X	setattrib(EMPHS);
-X	break;
-X
-X      case C_DOUBLE:
-X	setattrib(DOUBLE);
-X	break;
-X	
-X      default:
-X	putchar(c);
-X      }
-X	
-X  if(c == 0) s--;
-X  return s;
-X}
-X
-X
-X/*
-X * display a message on the bottom line; if msg == 0, clear bottom line
-X */
-X
-Xvoid more(msg)
-Xchar *msg;
-X{
-X  int i;
-X  
-X  gotoxy(0, MAXROW + 1);
-X  if(msg) {
-X    setattrib(YELLOW, BLUE);
-X    (void)printline(msg);
-X    setattrib(REGULAR);
-X  } else {
-X    setattrib(WHITE, BLACK);
-X    for(i = 0; i < MAXCOL; i++) putchar(' ');
-X    setattrib(REGULAR);
-X  }
-X}
-X
-X
-X/*
-X * go back for numlines newline chars, starting at current, but not before
-X * initial
-X */
-X
-Xchar *goback(initial, current, numlines)
-Xchar *initial;
-Xchar *current;
-Xint numlines;
-X{
-X  current--;
-X  
-X  while(numlines && current > initial)
-X    if(*--current == '\n')
-X      numlines--;
-X  if(*current == '\n')
-X    current++;
-X  return current;
-X}
-X
-X
-X/*
-X * the static text is maintained separately in an (automatically generated)
-X * .S file
-X */
-X
-Xextern char textstr[];		/* do not declare this "char *" - bcc breaks */
-X
-X
-Xint main()
-X{
-X  char *cp, *cp1;
-X  int c;
-X  int lineno;
-X  
-X  lineno = 0;
-X  cp = textstr;
-X  setattrib(REGULAR);
-X  cls();
-X  for(;;) {
-X    gotoxy(0, lineno);
-X    cp = printline(cp);
-X    if(*cp == 0) break;
-X    lineno++;
-X    if(lineno == MAXROW + 1) {
-X      for(;;) {
-X	more("--More--");
-X	c = getchar();
-X	more(0);
-X
-X	if(c & 0xff)		/* regular ASCII */
-X	  c &= 0xff;		/* strip scancode */
-X				
-X	switch(c) {
-X	case ' ':		/* page forward */
-X	case K_NEXT:
-X	  lineno = 0;	
-X	  cls();
-X	  goto out;
-X					
-X	case 'd':		/* half page forward */
-X	  scroll((MAXROW + 1) / 2);
-X	  lineno -= (MAXROW + 1) / 2;
-X	  goto out;
-X
-X	case 'b':		/* page backward */
-X	case K_PREV:
-X	  cp = goback(textstr, cp, 2 * (MAXROW + 1));
-X	  lineno = 0;
-X	  cls();
-X	  goto out;
-X
-X	case '\r':		/* one more line */
-X	case '\n':
-X	case K_CDN:
-X	  lineno--;
-X	  scroll(1);
-X	  goto out;
-X	  
-X	case K_CUP:		/* one line less */
-X	  cp1 = goback(textstr, cp, 2);
-X	  cp = goback(textstr, cp1, MAXROW);
-X	  if(cp == textstr)	/* start of text, redisplay all */
-X	    {
-X	      lineno = 0;
-X	      cls();
-X	    }
-X	  else
-X	    {
-X	      scroll(-1);
-X	      gotoxy(0, 0);
-X	      (void)printline(cp);
-X	      cp = cp1;
-X	      lineno--;
-X	    }
-X	  goto out;
-X
-X	case '?':
-X	case 'h':
-X	  more(
-X"space: next page, d: half page, b: back page, CR, DWN: nxt line, UP: prv line"
-X	      );
-X	  (void)getchar();
-X	  more(0);
-X	  break;
-X
-X	case 'q':		/* quit the game */
-X	  goto done;
-X	}
-X      }
-X    }
-X    out:;
-X  }
-X  done:
-X  more("Hit any key to quit.");
-X  (void)getchar();
-X  more(0);
-X  
-X  return 0;
-X}
-X
-END-of-bootstrap/display.c
-echo x - bootstrap/help.txt
-sed 's/^X//' >bootstrap/help.txt << 'END-of-bootstrap/help.txt'
-XPC Emulator v1.01alpha (C) 1994 University of Bristol
-XPlease report comments, bugs etc to hedley@cs.bris.ac.uk
-X
-X
-XThis is David Hedley's PC Emulator.
-X
-X
-X0. Table of contents
-X
-X	0. Table of contents
-X	1. How to get pcemu really running
-X	2. Information about this BSD port
-X	3. David's original README
-X	4. Copyright notice
-X
-X
-X
-X1. This looks like PC, but where is DOS? How to get pcemu really running
-X
-XPcemu is an emulator that emulates an 8086 CPU as well as a bunch of
-XPC BIOS services, so it basically provides the functionality like an
-Xold PC/XT.  Anyway, as with the XT too, the emulator requires something
-Xlike an operating system to run with.  Since we cannot ship MS-DOS or
-Xone of its variants along with this distribution (for legal reasons),
-Xyou're now actually looking at a (sort of) "standalone operating system",
-Xjust to get pcemu booted and running.  All this system does is show
-Xyou this introduction.
-X
-XYou will have to replace this mini-system by a physical image of a
-XDOS boot floppy.  The "system" currently running is booted from the
-Xfile
-X
-X	/usr/local/lib/pcemu/DriveA.
-X
-XIt pretends to be the image of a 720 KB diskette, which has been
-Xchosen as the default bootfile size.
-X
-XIn order to obtain the image of a bootable DOS floppy, do the following:
-X
-X	Prepare a 720 KB floppy with a DOS system as you'd like
-X	to run it later.  Include all the good stuff you don't want
-X	to miss there.  Don't forget to put a simple text editor
-X	there, so you can modify your configuration files later.
-X
-X	Put a copy of the file
-X
-X		/usr/local/lib/pcemu/C/emufs.sys
-X
-X	onto this diskette, and include a line like
-X
-X		device = a:\emufs.sys /usr/local/lib/pcemu/C
-X
-X	into the config.sys file on this diskette.  This will
-X	provide you with an interface to the BSD file system from
-X	within your DOS session.  (It actually pretends to be a
-X	network drive.)  According to David Hedley, you are also
-X	advised to include the line
-X
-X		stacks = 9, 512
-X
-X	there to avoid stack overflow problems with the emulator.
-X
-X	If you want to retain a copy of the standalone "system" you
-X	are currently looking at, move it away:
-X
-X		# cd /usr/local/lib/pcemu; mv DriveA StandaloneA
-X
-X	Now, make a copy of your disk by either:
-X
-X	- under BSD, perform a
-X
-X		# cp /dev/fd0.720 /usr/local/lib/pcemu/DriveA
-X
-X	  (the number after the fd may vary for drives other than
-X	  the primary one), or
-X
-X	- under DOS, copy the file
-X
-X		/usr/local/lib/pcemu/C/dumpdisk.exe
-X
-X	  to your DOS system and execute it.  This will dump the
-X	  physical copy of either drive A or B to the file drivea
-X	  in your current (DOS) working directory.  You can then move
-X	  this file to
-X
-X		/usr/local/lib/pcemu/DriveA
-X
-X	  in your BSD system.
-X
-XSince pcemu needs to display the standard VGA font, you further need
-Xto tell your X server about the location of the font file.  It has
-Xbeen put under
-X
-X	/usr/local/lib/pcemu/font/
-X
-Xalong with the necessary information for the X server.  All you need
-Xto do is to tell your X server about it.  This can either be done
-Xas a server default by including the directory into the FontPath
-Xsection of your XF86Config file (this is for XFree86, refer to
-Xthe documentation if you're using another X server).  Alternatively,
-Xyou can run the command
-X
-X	$ xset fp+ /usr/local/lib/pcemu/font
-X
-Xwhen X11 is running to instruct your X server to append this directory
-Xto the font path.  Should you wish to run pcemu across the network,
-Xremember that the fonts must be physically available at the server
-Xside, or you need to provide an X11 font server (xfs).  Refer to
-Xthe X11 documentation on how to setup this.
-X
-X
-XThat's all, now you should be able to run pcemu.  Add required
-Xdevice = a:\emufs.sys /... lines to your config.sys as you
-Xneed them.  It's not wise to make the whole BSD hierarchy available
-Xsince DOS does not provide multiuser protection.
-X
-XShould you wish to override some of the emulator defaults like
-Xsize and location of the bootfile, you can do this by settig up a
-X$HOME/.pcemurc file.  Refer to sections 2. and 3. below.
-X
-X
-X
-X2. Information about this BSD port
-X
-X
-XThis `port' of pcemu, originally to FreeBSD, has been prepared by Jörg
-XWunsch. It is an only slightly modified version of David's code, a few
-Xproblems have been fixed for the BSD compilation environment, and
-Xthe location of the default boot file has been moved in order to
-Xget you started with just what you are reading now.
-X
-XThe PostScript document David is mentioning under 3. below has
-Xbeen compressed and stored under
-X
-X	/usr/local/lib/pcemu/doc/report.ps.gz.
-X
-XIt is huge however, so if you don't care much for it you might wish
-Xto remove it later.
-X
-XSince i'm living in Germany with a German keyboard, i found the
-Xoriginal X11 KeySym to PC scancode translation unacceptable.  Several
-Xscancodes have been unreachable for me.  Hence i decided to add another
-Xsection to the .pcemurc file allowing to instruct pcemu of specific
-Xkeyboard layout semantics.  They consist of the keyword keymap,
-Xfollowed by the desired PC scancode, an equal sign, and the character
-Xthat is generated for this key under X11 without any shift keys.  (Note
-Xthat no space is allowed on either side of the equal sign.)  This way
-Xi won't get a German key mapping under DOS, but at least a valid keyboard
-Xlayout where all the scan codes can actually be generated at all.
-X
-XThe appropriate section of my .pcemurc file looks like:
-X
-Xkeymap 12=ß
-Xkeymap 13='
-Xkeymap 21=z
-Xkeymap 26=]
-Xkeymap 27=+
-Xkeymap 39=\
-Xkeymap 40=[
-Xkeymap 41=^
-Xkeymap 43=#
-Xkeymap 44=y
-Xkeymap 53=-
-Xkeymap 86=<
-X
-X
-XOnce :-) i will have filed all my modifications back to David, and
-Xperhaps they will be included into the regular distribution as well.
-X
-XShould you wish to contact me regarding the FreeBSD port, you can
-Xreach me as joerg_wunsch@uriah.heep.sax.de.
-X
-X
-X
-X
-X3. Here's David's original README file:
-X
-X
-X		       PC Emulator for Unix and X Windows
-X
-XAs the title suggests, this is a Unix/X windows program which is
-Xdesigned to emulate a standard 8086 based PC.
-X
-XIn its current form it runs most text based programs. The programs I have
-Xtried and found to work are as follows:
-X
-XMSDOS 5.0			  MSDOS 6.2
-XWordPerfect 5.1			  Borland C++ 2.0
-XTurbo Debugger 2.51		  Turbo Assembler 2.51
-XBBCBasic 4.61			  MSDOS QBasic
-XMSDOS GWBASIC			  Virtually all program that came with MSDOS 5
-XHitchhiker's Guide to the Galaxy  PC Magazine's ANSI.COM
-XSemWare's QEdit 2.1		  Norton Utils 4.50 Advanced Edition
-XNorton Utils 6.0		  Xtree Professional 1.1
-XPowerMeter Utils		  Autoroute (ancient version)
-XMinitab 8.0			  Microsoft Diagnostics
-X
-XThis is all the programs I could lay my hands on which were text based
-Xand could run on an 8086
-X
-XThe emulator runs at about 8-10MHz 80286 speed on a Sun SparcStation
-X10/40 (without the -mviking flag) and at about 6MHz 8088 speed on a
-X33MHz 80486 box running Linux.
-X
-XI have included a Postscript representation of my project report. It's
-Xa bit out of date now, but it's the closest thing I've got to
-Xdocumentation!	I'll do some kind of latex thing for the next
-Xrelease....
-X
-XThe program rather hogs the cpu but unmapping the window (iconifying
-Xit) will put it to sleep.
-X
-XThe most recent version of this program will always be in ftp.cs.bris.ac.uk
-Xcurrently in the directory /users/hedley
-X
-XINSTALLING THE EMULATOR
-X
-XEdit the Makefile to change the OPTIONS, CFLAGS and XROOT to be
-Xappropriate for your system (I am assuming you are using GNU GCC,
-Xalthough any ANSI C compiler should work just as well). Ensure you are
-Xusing the best (speed) optimisations possible (e.g. -O2 -fomit-frame-poiner)
-X
-XEdit the file mytypes.h and ensure that the types for INT8, UINT8,
-XINT16, UINT16 etc are correct. Hopefully nothing need be changed in
-Xthis file, but you never can tell... I have assumed that 'char's are 8
-Xbit bytes, 'short's are 16 bit words and 'long's are 32 bit words. If
-Xyour compiler treats these differently to the above then you will have
-Xto edit this header file.
-X
-XType 'make' and go away and have a cup of tea! Compiling 'cpu.c' takes
-Xa while (and quite a bit of memory!).
-X
-XGet a floppy disk of the same size/type as you specified in the Makefile
-X(i.e. if you chose -DBOOT720, then you'll need a 3.5" 720k disk). Install
-XMSDOS on it. Copy the files 'config.sys', 'emufs.sys' and 'lredir.exe' from
-Xthe 'programs' directory onto this floppy disk. Shove it in your Unix box
-Xand type cp /dev/fd0 DriveA This should create a 720k (or whatever) file
-Xwhich the emulator can boot from.  If you do not have access to a Unix box
-Xwith a floppy disk on it, then you can use the supplied 'dumpdisk' program
-Xto create a disk image. All you need is access to a PC. Simply put in a
-Xbootable MSDOS disk into the drive and type dumpdisk A (or dumpdisk B if in
-Xdrive B). The program will copy the entire disk to a file called
-X'drivea'. You must then transfer it to your Unix box...
-X
-XYou then need to convert the vga font (vga.bdf) into a font format
-Xyour X server can understand (either SNF or PCF) using either
-X'bdftosnf' or 'bdftopcf' and install the resulting font file somewhere
-Xwhere your X server can find it. Then type 'mkfontdir' to rebuild the
-Xfonts.dir file and then type 'xset fp rehash' to tell your X server
-Xabout the new font. If you type 'xlsfonts' you should see 'vga' as one
-Xof the fonts listed. If not, then something has gone wrong. I may or
-Xmay not be able to help - it depends on your local setup. The emulator
-Xwill run without the font as it uses the standard 8x16 X11 font -
-Xalthough most programs which use the extended character set will look
-Xpretty terrible. A warning will be displayed if the correct VGA font
-Xcannot be found. If you are using openwindows, you will have to type
-X'convertfont' and then 'bldfamily'
-X
-XYou should now be in a position to run the emulator
-X
-XBy default, the emulator requires the disk image called 'DriveA' to be in
-Xthe current directory or else it will complain. If you don't like this,
-Xthen you can change the file the emulator boots from by altering your
-X.pcemurc file (see below) or by changing the default at compile time (by
-Xmodifying the Makefile)
-X
-XOnce run, the emulator should come up with the usual MSDOS banner and
-Xrequest the current date and time (which should already be
-Xcorrect). You can now run PC programs, mount Unix directories as
-Xdrives etc. You will already have one drive redirection - drive C: is
-Xthe Unix root directory. To mount further directories as drives, you
-Xmust use the program 'lredir'. Consult the file 'lredir.readme' for
-Xinstructions...
-X
-X			The .pcemurc file
-X
-XAt present this file allows a few things to be changed at run time. If this
-Xfile is found (either in the current directory or in your home directory),
-Xthen it is read and parsed and the values overwriting the equivalent
-Xcompile time options. Currently the only options supported at present are:
-X
-Xbootfile diskfile
-X
-Xwhere diskfile is the disk image you want to boot from (no quotes or
-Xanything are needed and the filename must not contain white spaces).
-X
-Xboottype type
-X
-Xwhere type is either 360, 720, 144 or 12. This tells the emulator the type
-Xof disk the disk image file represents (360k, 720k, 1.44MB, 1.2MB
-Xrespectively).
-X
-Xupdatespeed n
-X
-Xwhere n is an integer > 0
-XThis is the rate at which the screen memory gets checked for changes (and
-Xhence the update speed at which the screen gets updated for non-BIOS
-Xwrites). n is measured in internal interrupt ticks of which there are ~72.8
-Xper second (depends on the resolution of the system timer).
-X
-Xcursorspeed n
-X
-Xwhere n is an integer
-XThis specifies how fast the cursor should flash. Flashing the cursor can
-Xtake a fair amount of bandwidth and so on slow/heavily loaded networks it
-Xmay be best to slow down the cursor flashing. Setting n to 0 or less will
-Xdisable cursor flashing - the cursor will be permanently on.
-X
-XAn example .pcemurc file can be found in this directory.
-X
-XIf you have problems compiling or running the emulator, then please contact
-Xme giving details of what went wrong (along with your computer type
-Xetc).
-X
-XArchitectures tested:
-X
-XComputer	OS		Comments
-X-----------------------------------------------------------------------------
-XPC 486/33	Linux 0.99.14w	Runs quite well. A bit pointless though :)
-XSun 3/60	SunOS 4.1.x	Takes an age to compile and not really worth
-X				the effort...
-XSparcStation 10 SunOS 4.1.3	Runs well. Takes > 20MB RAM to compile though
-XHP 755/99	HPUX		Runs OK (>25MB RAM to compile...)
-XSun 4		Solaris 2.3	Runs OK
-XRS6000		???		Had a few problems getting it to compile.
-X				Getting there slowly though.
-XSGI Indigo	IRIX 4.?.?	Doesn't work if compiled with optimisation
-X				using the standard compiler. Haven't tried
-X				it using gcc yet...
-X
-XAs you can see this list is quite small. The main limiting factor is the range 
-Xof machines I have access to. If anyone else can get it running on other
-Xarchitectures then please contact me!
-X
-XWarning: This program is not secure! Do not make is suid or sgid anything
-Xunless you wish to compromise the security of your system!
-X
-XEMULATOR LIMITATIONS etc
-X
-XSome parts of the PC architecture are emulated better than others. The
-XBIOS has been partly implemented - enough to get MSDOS to boot and to
-Xallow most programs to run. Anyhow, most decent programs bypass the
-XBIOS for screen access. BIOS Disk calls for drive A have been mostly
-Xemulated, although formatting doesn't work.
-X
-XSome of the hardware has been emulated but not much. Timer interrupts
-Xare generated by the system but there is now way (at present) to
-Xreprogram the timer. The Programmable Interrupt Controller has been
-Xemulated in part to respond to the End Of Interrupt command and reads
-Xfrom and writes to the mask register should work OK.
-X
-XNone of the VGA hardware has been emulated at present (apart from
-Xscreen updating) although this will change in the near future. Mode
-Xchanges must therefore be done through the BIOS.
-X
-XThe keyboard has been mostly emulated. The program converts X11
-Xkeysyms to raw PC scan codes and then generates an interrupt 9 as per
-Xusual. There is a BIOS routine which takes these scan codes and
-Xgenerates the correct BIOS ASCII/scan code pair. The keysyms used can
-Xbe found in the module 'xstuff.c'. In the future these keysyms will be
-Xread in from a file at run time.
-X
-XTHANKS
-X
-XThanks go to the following:
-X
-XAndy Norman at HPLabs, Bristol (ange@hpl.hewlett-packard.co.uk) for the HP
-Xport.
-XDieter Becker (becker@med-in.uni-sb.de) for help with the Solaris port
-XKlaas Esselink (esselin1@ksla.nl) for help with the RS6000 port
-X
-XPlease report bugs/comments etc to me (hedley@cs.bris.ac.uk) and I'll
-Xdo my best to sort them out (no guarantees though). After June 25th I
-Xwill be leaving University and will not be able to check email very
-Xfrequently - please be patient if you want a response - I will reply
-Xeventually.
-X
-XHave fun...
-X
-XDavid
-X
-X
-X
-X
-X4. And finally, the Copyright notice:
-X
-X
-XAll files, documentation etc with the exception of 'mfs.c',
-X'emufs.sys', 'emufs.S', 'lredir.exe', 'lredir.c' and 'lredir.readme'
-Xare Copyright (C) 1994 University of Bristol, England
-X
-XPermission is granted to use, copy, modify, and distribute this
-Xsoftware and its documentation for any non-commercial purpose,
-Xprovided that the above copyright notice appear in all copies and that
-Xboth that copyright notice and this permission notice appear in the
-Xsupporting documentation.
-X
-XBECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-XFOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT
-XWHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER
-XPARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
-XEITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-XIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-XPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-XPROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME
-XTHE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-X
-XIN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-XWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-XREDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
-XDAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
-XDAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
-X(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
-XINACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
-XTHE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
-XOR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-X
-X---------------------------------------------------------------------
-X
-X'mfs.c', 'emufs.sys' and 'emufs.S' are covered by the following
-Xnotice:
-X
-X Mach Operating System
-X Copyright (c) 1993,1992,1991,1990 Carnegie Mellon University
-X Copyright (c) 1991 IBM Corporation 
-X All Rights Reserved.
-X 
-X Permission to use, copy, modify and distribute this software and its
-X documentation is hereby granted, provided that both the copyright
-X notice and this permission notice appear in all copies of the
-X software, derivative works or modified versions, and any portions
-X thereof, and that both notices appear in supporting documentation,
-X and that the nema IBM not be used in advertising or publicity 
-X pertaining to distribution of the software without specific, written
-X prior permission.
-X 
-X CARNEGIE MELLON AND IBM ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-X CONDITION.  CARNEGIE MELLON AND IBM DISCLAIM ANY LIABILITY OF ANY KIND FOR
-X ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-X 
-X Carnegie Mellon requests users of this software to return to
-X 
-X  Software Distribution Coordinator  or	 Software.Distribution@CS.CMU.EDU
-X  School of Computer Science
-X  Carnegie Mellon University
-X  Pittsburgh PA 15213-3890
-X 
-X any improvements or extensions that they make and grant Carnegie Mellon
-X the rights to redistribute these changes.
-X
-X--------------------------------------------------------------------
-X
-X'lredir' was written by Tim Bird (Tim_R_Bird@Novell.COM)
-X
-END-of-bootstrap/help.txt
-echo x - bootstrap/lcrt0.S
-sed 's/^X//' >bootstrap/lcrt0.S << 'END-of-bootstrap/lcrt0.S'
-X	;; Hey Emacs, this is an -*- asm -*- file
-X	;;
-X	;; lcrt0 -- C prologue for simple boot-loaded module
-X	;;
-X	;; Bootstraps a simple .com-style area 512 bytes off its
-X	;; own start address, by loading it via the BIOS int 0x13
-X	;; interface.
-X	;; Needs an epilogue counterpart to know about the end
-X	;; address.
-X
-XSECSPERTRACK:	set	9	; bump this for boot disk size != 720 KB
-X	
-X	use16
-X
-X	.text
-X	extern	_main
-X	
-X	.data
-X	extern	.endfile
-X
-X	.text
-X		
-X	entry	.begin
-X.begin:	
-X	
-X	mov	ax, .endfile
-X	mov	bx, .startfile	; from epilogue
-X	sub	ax, bx		; # bytes to load
-X	add	ax, 511		; round to full sectors
-X	mov	cl, 9
-X	shr	ax, cl		; make # sectors
-X
-X	push	cs
-X	push	cs
-X	pop	es
-X	pop	ds
-X
-X	mov	bx, .startfile	; load here
-X
-X	mov	si, ax		; sector count
-X	mov	cx, 2		; starting cylinder/sector
-X	mov	dx, 0		; starting head/drive A
-X.begin.loop:	
-X	mov	ax, 1 + (2 << 8); read one sector
-X	int	0x13		; just do it
-X
-X	add	bx, 512
-X	dec	si
-X	jz	.begin.done
-X	inc	cl
-X	cmp	cl, SECSPERTRACK + 1
-X	jne	.begin.loop
-X	mov	cl, 1
-X	inc	dh
-X	cmp	dh, 1 + 1
-X	jne	.begin.loop
-X	mov	dh, 0
-X	inc	ch
-X	jmp	.begin.loop
-X
-X.begin.done:
-X	call	_main
-X	int	0x19		; reboot -> this will quit pcemu
-X
-X
-X	;; .blkb	(.begin - $ + 512) ; cannot be done in as86
-X	;; XXX  IF ANYTHING IS BEING CHANGED IN THIS FILE, ADJUST THE
-X	;; NUMBER BELOW!  Link with -M and adjust the number so that,
-X	;; when linked to address 0x7c00, the symbol .startfile will
-X	;; be equal 0x7e00.
-X	.blkb	443
-X
-X	export .startfile
-X.startfile:
-X
-END-of-bootstrap/lcrt0.S
-echo x - bootstrap/txt2asm.perl
-sed 's/^X//' >bootstrap/txt2asm.perl << 'END-of-bootstrap/txt2asm.perl'
-X#!/usr/bin/perl
-X#
-X# Convert an input text into a sequence of .ascii or .byte assembler
-X# instructions.  Cares to express any non-printable ASCII character
-X# as well as the double quote and backslashes as a hexadecimal .byte
-X# instruction.
-X#
-X
-X# print one line of input text
-Xsub pline
-X{
-X    local($s) = @_;
-X    local($i, $k, $ele, $c);
-X
-X    # delete any null char to avoid confusion (we use null as the string
-X    # delimiter)
-X    $s =~ tr/\000//d;
-X
-X    $i = 0;
-X    #
-X    # split the string into substrings of printable characters (where
-X    # we can write a singe .ascii instruction for each of them)
-X    #
-X    foreach $ele (split(/[\001-\037\"\\\177-\377]/, $s)) {
-X	next if length($ele) == 0; # split returns a null string for
-X				# succeeding delimiters which dont wann see
-X
-X	$k = index($s, $ele, $i); # see if there are any non-pritables
-X				# just before the current substring
-X	while($i < $k) {	# if so, write a .byte for each
-X	    $c = substr($s, $i++, 1);
-X	    printf "\t.byte\t0x%02x\n", ord($c);
-X	}
-X	print "\t.ascii\t\"$ele\"\n"; # this substring
-X	$i += length($ele);
-X    }
-X    while($i < length($s)) {	# are there any non-printables left at end?
-X	$c = substr($s, $i++, 1);
-X	printf "\t.byte\t0x%02x\n", ord($c);
-X    }
-X    print "\t.byte\tnl\n";	# dont forget the final newline
-X}
-X
-X
-X#
-X# the asm file prologue:
-X#
-X# declare a synonym for newline, and define the entry symbol "_textstr"
-X#
-Xprint ".data\nnl:\tset\t0x0a\n.globl	_textstr\n\n_textstr:\n";
-X
-X# process all lines now
-Xwhile($_ = <>) {
-X	chop;
-X	&pline($_);
-X}
-X
-X# the epilogue: terminate with a null byte
-Xprint "\t.byte\t0\n";
-END-of-bootstrap/txt2asm.perl
-echo x - bootstrap/xcrt0.S
-sed 's/^X//' >bootstrap/xcrt0.S << 'END-of-bootstrap/xcrt0.S'
-X	;; Hey Emacs, this is -*- asm -*- code
-X	use16
-X	.data			; ld86 places .data after .text
-X	export .endfile
-X.endfile:
-END-of-bootstrap/xcrt0.S
-exit
-
diff --git a/emulators/pcemu/files/bootstrapper.uu b/emulators/pcemu/files/bootstrapper.uu
deleted file mode 100644
index 6c2b4a8d2c9..00000000000
--- a/emulators/pcemu/files/bootstrapper.uu
+++ /dev/null
@@ -1,250 +0,0 @@
-begin 644 display.bin.gz
-M'XL("/^,D2\"`V1I<W!L87DN8FEN`.W<;VP<Z7W8\3U9NK.G29PJA9,@13UV
-M4I"LR14IZ63=V;)O22[%S?&?N>1)0I-3AKNSW+&6.YN=65(TKHX3)T'N+D#Z
-M(FV!O@J*]FV1`$:KQ"_J($[0XNHWS8L&11,TP065*Q3HBX/C7&RIO]_O>69V
-M5]+9#F`4*/#]P"?NGYEGGGG^_YGUO?RM+U<^/_<GYQX]\SL?^./[/_1#SWU8
-MWK_^1[][IO)[E<J]9\Y\[4=^\0\J9[;R#SW\_2_\=3#ZW[_SS,,_^L+#,Z.W
-M_UWEX1\^^+/[WWK?UWZ\@O]?[;_^EXN/?F_[1Y?^TQMK9]_XU&MO?>G97_[*
-MZ=F'7_W&GWSMAW_V#^3K-UXY^VL?RM]ZX_C97[MR]ZW%1U\Z4WPA)_R#U^23
-MWWVF\J4/R(?RV8U7?BM_ZY/;V8_\EASZ]HZ\67S[I9W[__[1%[]Z]M7;=MJ-
-M5Y:^LG/_5Q^MKNH'BV]_[4/NTXV--]?.7GOT:/0#O_7:6S_UP<6W7U][]T$@
-M%_&OWUQ[5K_]H'[[?Q;?_CMK[^H!?_>-M6?U@-\Y^\?_PWWTQMJ[_^JUMUSH
-M/N`'!V^L_<V#E^\]5]G1:_^&QN;!UKT?J.S<^V!EY_XOV/M/Z=?WGI'WJ;VO
-MRJ'W?DC>_IR]_;`$(7=T_YQ$_,'Y^3/Y5^2__S[_3/X?YW\P_S</_OS-5\^N
-MO/[JV3>N/_JUM;_YY:_DS\GQGPQ&O_J&OAL])U^_+%_++4[%[-Z/N2C]\X=R
-M#?GR5[Z2_T.-@UWX?^J'CX[/WO^X7+.(_'_1#Q^\H)&33^[_@;Y=^HHFQ0_?
-M"^6#^.'JZIMK[[YD*?;NM>W*:_>+4_^%'CMQ^3=??5;B].R#O^=?O/&<1/BY
-M-]?>O_[ZVOOECT3F_?+5)UX]>_*G;Y9?O_JLW.>SDAME.%_\ZC<U!N]\^3=_
-MZ?57WRVN-J=7N_^##Q\=OZ-OO_1MNYEW[W]6(JB1>_7=-YZ3E'G?UW_EF3?7
-MWI'XOB-_KOU8)7_?UP?/?/G-7VK>_V]RY/T__?;K:]_0`/ZSO'MC[1N2M.^7
-M/UHDOO'FVC>^_K\J=NW[__K;O_C52N7KSS^CV7I_YMN:"N^<>^>1?&=?_/UG
-M[BU6=B0"$LOF_8<2N6<E%N[<KCOWKRMRBMS[.U8*WO[6ZJI]_!>5>V?&9W[5
-MG?G->S^JGWW3/OMM'YJ\^<2K[XX"%^KY;S_X1_<>/=JY_R\E)+D#O8E_^RV?
-M"FV-X*O?E/3RU]1+/;C[Y6L2W%_(=_?_\EMZ_'^5EP]NVW>W']Q8""J27K<>
-M+;Q/_W[FT<*/Z-^'#Q<^7,G_<.$G]<V//UHXHW^_^7#A;"7_[84/5/+?7_B-
-MZ_+)"X\6*L_(W[]ZN%!Y3OZ>]^__P\.O_].'7[_Y\,NS<NE#O?1G[=(_\VV-
-M]1>_^G[-Y\IZDH=1_S2\$Y^&>1K^_"C)JY5L$+7B%\-^?#</!]%A/!^V7PR[
-M4:_CWQV\&!Y$K3O^W<KN?+AZ8TN.E\-[25\^VM]Y,1P,C^U=96%A,QW&"PN5
-M,SLK8?UHU(OR=!@>+U47EZ+>H!N%LRMSX=(++UP.]_O)<3S,DOPT3#OA\C#)
-M\K1W/CBSTXNC+`Z'\2`=YF$K/3J*^WDF\1@=9F&<MS3FW;C=BT]?:F75`SFO
-M&K6JHSOG@R#8ZR99*/];C8Z3=KAN1\UDX414JG+4F<5JN!<=]&*]<"OMYWH!
-M.3WTGO9U^>52-5Q/3S02A[$D6"L^&DE<HU[O-!R.^OVD?U@>>K$:-OJ=='@4
-MY4G:#Z.#=)2'N49Q;1C'R\W54&^Q//Q2U<5;(IP.D\.D'_7"W7IM=;->'G*Y
-M&JZD@U/YMIN'_31/6G&@-[14/1_:O??2]([\F]R)Y:8US?+PI!L/8TN4[>:G
-MPS/?)?*2##OVL9P0]<.XR,&\&^7^76S?7%V\>B5<V=D/HRP\B7L]_1O)!?NM
-MKJ1;($F^W-ANAED\/)982OYE:2C%[R#*DI9=<#!,Y68EL+P;AQTY3Q,IZFEY
-ML/A'_2#MM>4V+MS<JX9AK7]Z$IW.V^62O&MGW=R36TGG[749TV$LY7HHX6;I
-M42RI+1GBPPO303R4O.@?AMEIEL='FA!RWQ:@7**9]%NQW$S8BOJ2N&'630;A
-M9G-!$DYR)$C[5B*2/`N/HV$22:D(HUXJH?D(29*UI10/$TEVS?!9R?NP%Q]*
-M/DHB9VD_FYL/3M/1C.1'7[(A:N4C2PK--8V5)+%4D$S+?=J9"S^:Y5&_K9>(
-MGXCZ1^>#SXZR?#HK#](TC]MRI^TB.S7A)&\L;OZ>VVEL=23KIB>:.!(A]WW2
-MSX=I>V3Y(-7DEGQ^DLC)W>@XMI2*!SUI*MS!1TD_6?`A'IQ*M`?=4\O9,#F2
-MAD(3*@HTX31.8:>7#@:G$ID]R:F/^CL(6Z/A4.K6N/!IM/P]=(;ID>9KT$EZ
-M\;AJGKLPRH87>JE<Z$(O.;A@]WUA=2A-2>V\1+HA23&,I<:V,XWR06QE8QRE
-M\.,7%\.7ES6?[L1Y+JW723>1$MN58G40Q_V@U4VSN*^E3$]LQYUHU,LM4AJ1
-M,$L^%^MEI"P-V_%0KY$>Y%'2?_PZ>H:U(9H&[O:E84U=84][/4O[%\<WMB.I
-M&TFY*&/HSG%%*[)0?&I+U+0,M:V6E.?[DBPU3&OH4)*ZT6_U1FT)T?(_#@_3
-MM!UF^:C3T?,E+OT9:1RD%$^&<91D=N?#6$)8M4.D$&L)DR\'(RV?67(TD/O*
-MM;^(VXE4N7$`>J+5=+V"U*+P*&TGG5-].]2FM),<CH:N-=3DS'QD)Y+!+M&2
-M-DZ3T1)K*O^_<SE8N2#_=K*JI-1$<RXM>%K63I_K6D62(H&LYW+)^>2%VK&V
-M7^&U,'KQ9\K0PZ=??N*BB;MH')YSMVUQLIN1^$S'QJI%DEEE*\_WK:,EI"L#
-M?0TS'G:L"KJPM0MQQ=(5#:TT90AZEI1+2WHK/G&6:<T.PUFI)67;\UAUB<KS
-M^W%^D@[OA&VM7-4Y:4A:+2GT6DWET,D>=MYB::6WEZ5E`%'[.,FD*LO115)K
-MI#6QGY+.TM:UI.NZ%KXP'SZ_='$B*:U4:2C1<9IH$=;12"IC!ZDB)YI04LV.
-M)GJ%>-S5%T$T7)G7TNY:,JNRTP5MHK$M6R@Y:7P[$HEQBS5NLN>ED$L#J4,K
-MZ:!>?/+6?E+*0/NI)>83X=%QZ!JOL%E>OC9Q[UOIB80?:?=51M9R5`N/-KQQ
-MHLDS<=6%<-37EDG*QGPHG8:./R17GQJK07A!BO>%3GNQJJW.=VI;)P.8U>3J
-MCXX.Y#)1)]=F4`MZIWU>HGJJG>.IMAJNY,A@1F.H`XC^1!AZQF`H#:8<*_<\
-M-Z\][!,W(>5VWMWWW[XI:(^.!II*U?AN/!7]/)VH%+Y-E>9`#FN-<LW(R0H9
-M:C#6$8T#*+NZ(D=<)KC[#6MR)^%R446M>IZS;Z+S$V$4-=.7J'!68C,7:H73
-M4M66`4Q+BK!VF;=\4RJA]:VH3:6B1-,ND:??:\H\)4.+R&A[XE)$ZHX;#;F!
-M13^.70LA"2J#@-.)"C-LAZ]<KTE^]W/7#G1&0TL-/2?05-#!H05_TT:#6FC\
-M2%@:`XF<=0=%:R_!V`UI!Y9KMQQHMVQ=CQ6)[S84T``NR,U-#<RDM,8R!LVT
-ML"43(_).ZHIN$3$_6M*[*&(O779B=_Z>MS$N+YI+OBA(2RH=;!S8H-@?7@XF
-M3GU[:$VICC**W)[H-=;D/G:BO'L^R.)6D4)V^7,WUZY>6;%.Q7<HL[F?]NC]
-MW-2YQ=4K\]+(=6R`$M@ETM9(YU'NOA,+2H>AH\P:L;ZKH\6=S5E"2,7NR_''
-M<>_4AJUV?SK(T`!U7B;9/\Z.GPK/W<UDG-`9?"Q\SYR1C#G18GQS:4GC6PS[
-MK(>0@;.,/1]+8FWU!P/IGXHNTZ=44%0O+2^#R`W?N^E()@RNQ\RZQ9#(E>"H
-M-4S=T*;HV.:#87P46R-FDYLB.!G;ZL!:<K"HY]+<1\=1TK/QG#_2Q2_(I(_6
-MIJLL,S9.\GUWY&[4XNCO9_;<W4YV7M-W=S)[]+#I+)+_==U,31)U-+#;K]H,
-M-\IG=-[1F[<YA%XW<S>NO?=!+YZZ;\W(=KN8$[6#]QK.5*LR@]2>.2N;QZF!
-MBQMT!NX.N](^:/64>.@T21+;+FK=E-[-23?MN<%)-Y%9R[#5G4A`23)M5[3Q
-MM9F(AE`DF'3<>3*2I-)/\KB8B3PE8[7['^HI.LDK&H]R"NAKFIL(!SIFMQ;^
-M\<:F&-7/E\/5MA\H2A659,^3PU"2/@K._=3Z]F;]0M62=-@Z7[1011Z&OHYF
-MX9F+DHYZK3.7Y,5!+".4JLW0]?,SW\-J0+F*\7/Z;D:CZ@JP7*4XKIBLZ-A-
-M)PUMC>]/_^;P,+PQZF>M;E6G06[^GO:E\&8]72^0%S8:3^1X6WAQ"5$L.;12
-M+<E1V(E/@G),95,_NU0GN:NS,M]@:BRD!1A(EMK-Q/WC9)CVM?C:V#IX6ML^
-M.9ER#5=Y(]JMZ8"\G%4%.N6PLIU'0YT/6DMN,]X3K:S%@%/FU=:,]BV==7:Y
-MDV9YLS5,!GE9H_Q@56>M\DYBI&>X`<8XF\9]C=[84'H+/Y/.I$3)R^^I]Y$K
-M7G`+5]5!5CW\G)^2RI6[(YD92HV.)>G=6LCD-*RE]W(TDHFHIG#B[N_(5GFT
-MQ`<V9BV&F<6<R770R<R1%/-CFSWWP^NQE*]^.6UT;W6][R"5GGH^3.0"(VM-
-MXZ!<9-+6Y^7XM'EJ"R([*V$F=4'+0Y@/HW[F\WC4CUJM>&"S6FUM]4ZB7E`<
-M.UE81GW)EU;76B.]H2,]83VVZ$HQ:$G%M88R:K>+OJ?LYHH.<+JR:8-G4^:I
-MOL+5#"E>V4`"[22MH+A32:13K5]9+/>?)ZW,K3V<ZB0T2[*\*)-RO/0%[?"<
-MO#B*!N?G`S<Y=W7*E=I,6\[)9)FWE;&?E_F33(8/^VXV:9UB-QK*Q$KNQGH4
-MR?;#N*_K-F75D8]T\=45/DUWS2B-J&9:UDTZN7ZOL9W=DA;0A=.7!D87::U.
-M^]BEY5!#NZ"R!2PCI1,V-XB-3H-$!I9:S+12318*:;('@W%EL-&V+AG*-741
-M5@\^CGI2=8ID#7RRNC7%8F5!TR5T94!?E5-+Z9#&]Z]K6[V>KZ1RV6$JPW_Y
-M)IP8WQR=/I'OXP5-F>.X3`J7+E[[\_+UI6LSQ>N+2]<^5[Z^<NUGR]<?O_:Q
-MXO6E%Z[]3/'Z\N*U?UR^7KKV:OGZTK6?+%]?OG9:O'[^TK6%XO75*]<^*4WU
-MMI;I%Q?FI%R/U\HTXFU+G:.BS74M8>96THOILVLJ98[6C08V-#EU@4BZ^0ES
-M>SPB',:'TKL-IU<8_=KKT_M(7;J6O)#:IR='?NK^>(=3=GZ!U5D]6D(]^]DT
-M'A[>/K'^Y*61Y%2WVHWC036+[E;;\7GKU`)K/=>E*$C_<>8]UJY=/DKF/3$]
-M\<Y.;A1H+=GO)W>M2MT,;R3]=GJBBSDU-W;+DUR7.T:'AW&FFP+%R#>RLR[<
-ME)NW,W0`<3B,COSR7I(%6H\/^Z[=\>O8.C0OYC"VG'T095;3W0J?+O06TS.;
-M14O;*P,KZ45277C5]2]W@K^6U-H]F]6Z=V'#2D,@N>5[$M_TIC;-<^LEF5\,
-MS"2!-ILZ*'J^NAB^%W?$E>K%X(8T6CLRN9>Z(V<L/>78Y738TXNN?.QCX<7J
-M8K`W&AY(N8L/-.V&\M'SCY_ECJA)QW<D#;<[)%A>7EG6)?OP<O7*TG>(U&?L
-M*'\/UV\LUYJ-E:<>_DHR],V#5I`BFZR=:T52^*SG\DD1K"=YJ]N5RC^4@G5]
-MI"V=KP[7HUYT]S349GDS.HP^)T-7.:2VU6Q45[8W@V9\=".R<OF9>EOR[>(3
-M:;0E95]JT'Z>]#*YN><79:!\+.V[Y)6>(;4KF#KDRM/RY68N-2G<&:8=M[@F
-MI7ZINA3L2!,]W(QU9<2=_(3:2$I[JLL-LW+-1(N8'Y/-!9M)/Y%>-KSZGB5A
-M,]'93"J=Q6H2'?:E.$H/-][]*MKEB9+8LM9!9^[2)'4C7>^3.W.5X\26U\KB
-M'&BI<<?K-$);&;?;XYKN\3Z+5@5MU6T@>W5A:7%S_7-RX$6I2-(?NSXJ"IL2
-M1E-&J:VFF]D$2XL7+B^&LT7'IQ%=.#I.;-VCTXL.YZRNE`%?<:%>O3H1:'#I
-MDOOTLE;:]&XYD=Q(^J.[6GM=0URVHI$-"S,W+)0!F@SOQC,MZW<DK3ZKE<F/
-MWFQV$T3A@90=C84<U-86HZ_K<0<VZY]Q+5*KEV9Q9B-YB4!CYEA7VG65,9B:
-MT'U$)DPSNIR4NBF+W&Y;0]5VZ*X_N1A=ZU:LM,:V#RH3,]]G%E5%NE/M]KOI
-MH8_`8&0Q&O6+WMSF8-8.AK.)]`))YU0W>I)\SO4O`XN_S5MZVJ:[\*U5D^GU
-M1%ETPXIDHC75TZ.>C"DRUTN%G7Q0G=J&#<9KI'Y79+R\<4'G=MD%MWL;!&<;
-M6\V]VL9&8^MZN+=>#^N;^QNUO>U=:>ZMTNK)FS*I]`M<.KSJ'[HIYO;.7F-[
-M2X8K*VL;M>M-UUWL;F_ON67L8'*`T7'3\V&QV#?;""/=1LE&1YI:Q53"+85<
-MW]H/KZ^LS`=13\OG8==&9MJNA"M^RJ-C+M?;6CMNDQ+?$<O$OM[/1L.X"#5P
-MH=IL4TO)K!7BN3`=Y,E1DOE1P2"5UD,'R[-Q];`:+FQ?#!<ZZ5&2+W0DU>.%
-M02K-VW!N(EDL28Y.\]-!G%6[;OW27;A<R[#O[.8;6WM7Y\-]^Q/(OTM7W+NE
-M*[:?;@O;Z5`S2?>V!W%GI,VSCLMM:J6U[B#VJ:\CDJ!<=G1UP:U]Z/*&K5/J
-M@*1:]=V?2V=;-9!XS>@(69<OY))7`ZU<!Z>Y;@[/2(H.<_^-Q$N_TH%Y9K<V
-MHXMY_LM+%\=?RD4Z@=];\CDC#7*46\7(M.1U9(+N"J/O-Z11.8[=6NKIY`:G
-M3K%BE[HZ6Y-II01FTWRI'9*2X8PN;\Q8=`Y36^JWU^X>99PPL,H21Q\)5RPN
-MFG0S4C>KK9DPEU.U-9'VMF<M?MN>O=`3K8&1%DAF=\/3C\S)U:[;(-UO_]DR
-M?[%!H=VC+F9<T*SU2S+%U,=-GR=K3#";5&7>Y>>9MJ\9+JPN2QWY^,7%^3()
-MM%&R+(["2]7G/ZK;CW?LLG/Z](*,CWH]WZOKPF'N'D`HRV`F]U@N$\U(/I9K
-M2C,^YV3NE`QU#7[&;4_IF3-%SS0ST3B,M^DF[KVJJWINVELL4MOP4!I]ZZ<L
-M)2;V,8K=%.L*?2UM:9'P.ZMWPEFI$+J$H.5USFTIN&YP:@5)"[);IY`X5\L-
-M)&F]=;W*97I+EY1M&CN.DY]W3^6>)MLXO2WH4>::L6PT&/0T[V:*W8J9HJW5
-M`EG&W`*RW>7JU`JU]?83\9"A:]C4_=E3U\AK7UGN1+M<=$$5LPJW95&F9!&+
-ML&;I5+Y=UF(D%=\=OCPW-=)UE:C<I=$EEF'LKF.1LK9*EU%E;#'C=D)FJK:M
-M80NMEC"VT*"+::Y?FLIHZP%OV5,*<F2QR"K%3G+0-77'AY%;99V55]6#=F?.
-MW:'_U"VZ!=,KRY8-.NVU*8"TO&XVW=Q:T^7<G96U.=\CN"^"&0DV3[-^9T:_
-M=^\&K<Z,WTJVBN(G:IDN8UI_[C<SK,NW.7/@9LY/1J6CXP&M7GN6'*[%N:,A
-M2`V9<9N6!Z.DYY9N;)VZ*M_XQ1&W_E"<Y]?AY8QNE'5GGKY[$8PW8?KQB<6U
-M6A1S'TPOL^O,3"XR9S+>G9%4GM'V1W<X)C9N=)XN/6S;PI%ZX@M]^1R.K?<=
-MZ@;KR3#59U,:ME^8#@/]HQ5K8@F[&_<&X8*6AW8\B/V`U>[`%MW<LK@KAT6M
-M#:P@%@_T%'=GN2`7EI"DVF736U=7[TIG4R[2+XQ[?1L-E0-HUT(4M5:&9Q(A
-M*8;E>H_&QE4#7:\(=$\]E]J@:]2V6E8+3Z*AC5"+";[?2-,JW/$;*M8#EYMI
-M@7\(Z2!V\\8R<\9C%>FJ^WZ^.S_=FUF62R8&,[Z::(@SXW(R<]!K=Z*CI'<Z
-MXZJ6SUW=47#CND@')4FQ(E?L^I0I'2R?%NNY[_7XE1OZ%>V6;P#"&==`S_C'
-M#6PP4>ZK3_8&PS#N9=;P^^9%6K4HZ5?'3;&N:-F37=IIS`=3#>S$4-&-'B>C
-MJ"UBYIXPTD>7=*/+#P2'0;'\Y'?6M+C;\O"<QDB.MH#+C3N_HAWEQ0`DE&&=
-MG'9P&K@G7XHCBTYYSB\928(^EFY%9Z63`QE,E#N7HTR7]%S;?2!%0O<=^^U`
-MD]E-.R92SSH+S6.+A"NT/MRHITOENB87^)(V5RVWEC7;-8ME,ET4>7VJ821A
-M6B-<9$NBC_YE@=_7E[&C"\+/"MP%K/AI'7=]A77_?H5OP7^V\J(NR&C,+?2A
-M]K,3.]Y[J;]VL9,\?7G_6(&5^,!ZD*)>%OV1'W3,Z%BEKXWQN!P4XQ&-ZY$.
-M2:0L%\O).A2WON:]EE_.:F,S54!T8<J>.-/IY,1NO*W29FXWQ4WNBN=KBE%T
-ME+M*E>C:>,--L^Q9-[>/.YKHDORX[JEUI!@4=;78E-_,^=J0V!JTWJL5"YF%
-M%YL:UFM&O9$^GB'MP\DPR8NBJO57OHJU"9HLU#IET10*5\H)GAYN.TS^.QO/
-MI$._W%LDBS18+P;!N?(9.FT4?.*YWK#XP';:IUN-R:=VRO%8.-O7AY=3?1)5
-M\D\F:*Y[T991AP<3]ZC!]G7<;`5%VU-;%4UL[4,7GW5=/=-AM\7/.C[]IXR;
-M?2+Q\GEQZ8H,G6W\O'3YLF;`TL6J&VQJ#YM-5^EB%J9]I!L.3=^<W7.Y&I&%
-MLQ+Z'0M>_EVJ7KZ\N:Q_+VXN2W77<;[;C+?8C@9:V]V22+^,;=]O^^F38KK*
-M]ZEPL5P5LK&)M1!Y.![Q9C+&U`TXFW_H!D$F131NW?$[%JZX9C9G";JV@V.-
-MDEW=K\@\+3P+R!WE`NJG_05](#C0HJ8I[N)Z%$<Z:[7)BSW>IDMH]F(X&DBN
-M)_I,F"1?>0%=-)7_/O_QB]6KNG2NVP>I5I:)48(?A:6]T>3V8_'(KY3EH26A
-M5*@L'7Z7)'3)5TRR,MN4[T3CAC<;-]V=GHRVJN&:_BDJDS]"E]=S]Q17)Y)1
-M6^0:.(F9-.GMDZ2=NSE\EFK\,VD\+L@4]#BQ!\TB+=#^H04=QMAHZ<`O*-@B
-MCL1)!@']R2MV?"QD/J`;V3J/UV,70WLD.?-/&TIAM/'68R=)2ST15#%D&=B^
-MD:OYMB]?Z\M0*+*G0:>[39L]^7&+:[XFG]W0]3G7AUM?46XVM\IYLUM=[)<M
-MDJ]0?CPY<#\0\-L;@53N0[?_V=;'^GJ^O&BIU-;'AII2?L?/`Y4+!B-[=$TK
-MJ'1E6B1JPY:V"JU\9`.86`>STG2M%,=ZTA-/6?&_40@6OI_T$?K+5Z]<N'3)
-M7\86-\/%Z@LO5)<NGX3AKB[`NG4$VP224::N)NAB46Y9[(>R+\X%N@A[Z<*5
-M<CU9WLM-7*XN5>^ZI7]=H-!2K\V23:Y<PZ]E4AM-_QL!*8%Y]SV[Q\E'^^).
-M1Y=1I3>=7/L-EQ8G+NWNR^["Q=_%XE/AQ<7-Y7"WMCD9$W<OP?I.^/'GG[_P
-MP@O^6NL[^S<GKVVA;;\<SG[JXO-/!"+1<4EQ>>*,9MJ+AE(\+T[&9_OE8+=Y
-M97%Q8@'^TY_^]-1=KFNG:OU[68`/?4US<]CBHM\UO:[[TUSKIK79NE:]7TF^
-MZXVPT6\GAZE_DG6W<5-2[]-5'YO5-,[L06Y=BDPZQ57]`Q.3RXS?-1[CI<IR
-M>E0LJU7E=H]CO8[M9GW7H&RNI:$=MEKA:6P%0;?PBN&Y#JNM4=`)HS:XKAAG
-M1Y&5`UV-UCZZ)Y%W,^E(6XYQ+Z9C>^U5CR*IL/K04N.Q-1D;4\G`0`>B-H_0
-MJ^KVM]O#LZ9%NP:;VD?3U?[)-D:ZJ8\$P0TWA7O1]??%8#-QCS!)-R1G?T3R
-MP][:LU#:<8R2MC9GV6&B@Q(W4`E&?:N?TYNU1Q+B45(L#&EP_J=1$VO7$HNS
-MQ2IYN-'8;.S5;!U<Q^+2@S5U%"CU+<^*3D_:D,F[L[[3[W[JHFZ>^R=S74JX
-M'<S`?K@S?LA(PM/%?&WGM9F3$Q?"N&]-B__UB9N=%$,T&WNE@8V!'YM'NZED
-M57_,T[4GF_7;MMMS*`\Z.!U$[E$]%Q,=/OAAA<O?JOMIT:J.I'1:F8V?-I8V
-M</P8BH;>.PV*^YT/R]F]6Q&RHM6>J$!5GX0^\61VWS[1%"O38IQT(S>:U&=V
-M)-%T3#$>MF2!GC1^],$_25+\6L:M2[C?9.G,2Y>29\?CY3E-/!T5%CNC;OP]
-M=/5BQWU\9-UVHQPHR40G'Z8]70$O?\I21C9QF>@6D;)!ZC:A->"ZO-SN3(3C
-M'^MT/R&2>8/,273`K6_=P*TX\RB2Q!_&A[K@,[T?LOVR)..6_[&4'JHK&M\A
-M*2=F"K.1Q=/6B7V.VQA2\FENG'EY^6RVG^7["5(_CF0(,])R7@TWT[;,=/WH
-MM5AG',:2\7'Q<*Y\,O0!QE:B_$98^0S1Q.-I6I#**$^O?OH5EDR7D?3ID.S4
-M%_3HI'AHR#\<4RZ_%$6C'&BZQ']!9[<RR@ILSF]7<:4D<@5>-XSUERI^,&R]
-MI=OHF+Y(,`Y_<F7)PJ@U5QJ-"^7Q4C`27[**J(]TCJ@#UND1G&X0MD<]6U[4
-M'Q%56S.Z0>!_O9>[K2>-2Q&.'S8&-OW4G4(K2'Y^/#'[E29M;[VV]7+SO#W=
-MVK^C:X3EX_,3/Y6J]=NGNFVO#R])`.L[&]%!-E_\<E2G*(?Q2]U!K]J-3WK2
-MM"W(W.Z.Y&.UE59'=^;*[=7UG<#V>(/5Q+;HEW6Z,PQG#^SO2T=Q>R'I5T?Z
-M^[:#:CMV)]IR9+DH4PP:[/>;+_<BR;=ZEL4R>+TCTW;W:NFE.UDOJO9[3PO`
-MCR[L_&#Z%Z_Z.]<+Q<]>BQ^\ZGK.TW[TZC;+=6<Y:*>ZCUU."E*W-GYDV]<Z
-M83X<1=)QYG%<#`QE#E:S7V_\]$@*U<7G)6J-H!CL]W3Z(<WCQ*]TK1'0KQ];
-MJ;7YHE0.&7OKQO&I-!FZ.&7SA(6B)]7Y@U1DK>7)Q(]Q(M\BZ=Z4=.)N`3<>
-M:*LMXPWWH(B4D'5[K$IZ#AU'V(-&[OFCR]7STI>T=?5<CW1+:F<>_XGL>7WZ
-M2+=-;,=J_K$GK36%Q[\=NJN/./I9X\Q1)Y-B/A],[&J56UQ-?3FQNS5^UYK>
-M^O)+3=8GC&/VG7\&/2\M\V'/GJ_?D5E78@^7V/.$EH76?DL]=;^-F?>_LG//
-M(9;/A[D15J"/B5C+:_L44J*F[UZ+INYPZ_S<"MVPE43ZB,!PD,H%`O]H=GN\
-MK^QV4%N/I;$]IA_9@E3D=H.2LL6+\N`@M02VA=+'3RP>[A^,[_2),'4PX!>7
-M7*<]<0]2));K*[7]9MV>(MC9W;ZNX_Y&4T9(*_6M9GTU7-NMU\/MM7!EO;9[
-MO3ZOQ^W6]8BM[?!&;7>WMK5W*UB3,=5$`'+4MGLLX>9>?6LOW*GORGAK3T);
-MOA76=G8D\-KR1CW<J-VHAG+02GUG+[BQ7M\*MS7X&PV)3U/&9W)"8RN\L=O8
-M*YYS6-G>N;7;N+Z^%ZYO;ZS6=Z55WEJ](%>W$X.=VNY>H][4>+S26)V^J8_6
-MFA+MCX8W&GOKV_M[9>3UYFI;M\*7&UNK\T&]H0%)G'9VZTV]?PF[L2DQKJ_.
-M2V16-O97)2[2=$H(6]M[;B0IA^UM6]($_M@B=(V,A+]9WY7TV]JK+3<V&G))
-MB72XUMC;DDN$FG:UT&*^(L-3N8G]W9WM9ET?N]4DE$`DP7<;S9>E!RH2]C/[
-MM3(@25T)8[.VM6(9I;&8R$B]W?#6]KX^=RSWO;$ZE2B:4/5PM;Y67]EKO"+9
-M*T?*99K[F_7`I7=SSQ)H8R/<JJ](?&N[M\)F??>5QHJEPVY]I];8U51:V=[=
-MU5"VMW258DO+1_T5S?W]K0V]S]WZ9_;E3IY2!O3LVG4I9YJ,$SD>W&C(935O
-M'L_V>3M%OK!LM\2[%=Y8WPXW:[?"S>W5QMHM7S`"N6*CN;?;D`R;+@^2F.-R
-M65O>UKM?EO@T+%H2$4T*2=A@M;99NUYO3F2_7?IZ?:N^6]N8#YL[]96&OI#O
-MI=!)+F^X])#Z\YE]S;_:1A%(6).,U!"T!+K,"K7V:2G;*DJ'7/NQ&AG,CJ_]
-M9,D+-[:;5LQ6:WLU#<K^+M?UZ-WZEJ17?55RI+:RLK\KE4J/T#,D-LU]J6:-
-M+9<I>K]6CQN[JV%1DZQPKM4:&_N[6KJ"R124*V]+$FJ05LHF,L0=T9R;MS(0
-M-M;D4BOK/O>"HK[ZC%N7K%BNRV&UU5<:5N=<PD@M:#9\FFS[$'PZ2A'[_JP4
-M!45/]>3S%T5GY9_RD:YF/"$I!U>!:V_U5Z2;^@SP=OE_-M"T.4LPV7&UK..Z
-M-"__7-1_EO2?Q7!%9L<R'8C#S5A"[4_T:T\Y>REL+&_*Q]+)^)^#!_9<PZX>
-ME(6[L>U1MZN!?#[1`3ZMUWM:IQ<^WND%C_\`3A_Q&<:2#KY#G0^G.SK?7TWT
-M<\'?JK^:Z`/=+"@HXR3CCUBFJO;+NM"MZ>I/)![[:4[F>G/MFJW3DT\"-X5)
-M._-EO^KBZ:Z>35S^O;K*^6!\JILR'466%7Y(9V-_C7Y;IS1)YA=C!Z.#7M+2
-M(4J@=ZW[)_ZG&%-/HQ<+[47B%[OPQ:\SYFT.F<O45'_ZJ^&6*6@YO5+;W:I?
-M;]2EI]G8V-ZR?D$C)^WV]@W7AULSHQ5+.H7F]MJ>]%!U;6P;>\VB;PRTT5IM
-M6!L>OF>8TIZN;-0:FU;?M;DL:VC1C5JS:>^*9N_&>FVON2UMP:ZT2,W]#>O0
-MUW:W-\<MX&-1<[?U6,WP6[<VTQIFY3.69;*Y'ZB/AEK>]7R9;?AO5B=3>R6U
-M7^/;3I-F4GE8=?*PEU::U97-_6I]=5]#:G53F2K))<LU[:8^?=S2'Q5_IQH<
-M[DC&90>CH4R7=VKATO,7ERXM7+KZPJ)&4`MIHLM7Q[&;M.CFO3XC806Y+&VG
-M_H?L^@2=UKK'+QBXQ3W7!%@B3%5KG5OZ"?WWJ>&4=M/O%,MD)"L*I[:.>\E1
-MN)P,V^&LO+J]>UM?O[0E]]?KZ>/E<T%0.5NI5,[I__G:YRN5#Q:O7ZM4/N1?
-MI_+Y3_C7G_Y"I?(1__K#\OF<_/V`_)>_5:E4_>N[\OK21)B?\*__ZA<JE17_
-M^JI\ON%??T%>[\M?C<=/R.O;_O-?D=>?]:__3%Z/?/BO2?C_Q']^5\+\HOQ]
-M3O[[S5^J5'[=O];X_#/Y6[5?W>ELJ5(]D!SJ5VZW>EGEMB[*5FX?IGEZ]U0^
-M2GN5V\/TI'([:^G:DWZCOV^IW):2I8_&R`>Q?^&.J"[)JUB:(LU5.6RH.Q7Z
-M_QIUN_CH*!W*.WT877*^4HW[;8L%````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-G````````````````````````````````````_I_ZORB<'5@`0`L`
-`
-end
diff --git a/emulators/pcemu/patches/patch-aa b/emulators/pcemu/patches/patch-aa
deleted file mode 100644
index 4285570fa35..00000000000
--- a/emulators/pcemu/patches/patch-aa
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/10/22 00:59:45 rillig Exp $
-
---- Makefile.orig	Wed Jun 22 10:29:06 1994
-+++ Makefile
-@@ -49,16 +49,21 @@
- # been known to crash the emulator when running on certain machines (80x86
- # based PCs under Linux, and HPs running HPUX). 
- 
-+.include "Makefile.inc"
-+
- CC      = gcc
--OPTIONS = -DBOOT720 -DBIG_ENDIAN -DALIGNED_ACCESS -DBIGCASE -DINLINE_FUNCTIONS 
--XROOT   = /usr/local/X11R5
--CFLAGS  = -I$(XROOT)/include -O2 #-fomit-frame-pointer
-+#OPTIONS = -DBOOT720 -DBIG_ENDIAN -DALIGNED_ACCESS -DBIGCASE -DINLINE_FUNCTIONS
-+OPTIONS = -DBOOT720 -DBIGCASE -DINLINE_FUNCTIONS \
-+	-DBOOTFILE=\"${PREFIX}/lib/pcemu/DriveA\"
-+#XROOT   = /usr/local/X11R5
-+XROOT   = ${X11BASE}
-+CFLAGS  = -I$(XROOT)/include -O2 -pipe #-fomit-frame-pointer
- 
- # You may need to add -N to the LFLAGS if you get sporadic segmentation
- # faults. So far I have only needed to do this when compiling under Linux
- # as Xlib seems to be mysteriously writing to its text segment
- 
--LFLAGS  = -L$(XROOT)/lib
-+LFLAGS  = -Wl,-R${XROOT}/lib -L$(XROOT)/lib
- LIBRARIES = -lXext -lX11
- OFILES  = main.o cpu.o bios.o vga.o vgahard.o debugger.o xstuff.o \
-           hardware.o mfs.o
-@@ -86,3 +91,28 @@
- 
- clean:
- 	rm $(PROGNAME) *.o
-+
-+bootstrapper:
-+	(cd bootstrap; make unpack)
-+
-+#mode 0666 is required for DriveA, alas
-+install: pcemu bootstrapper
-+	-mkdir -p ${LOCALPREFIX}/lib/pcemu \
-+		${LOCALPREFIX}/lib/pcemu/doc \
-+		${LOCALPREFIX}/lib/pcemu/font \
-+		${LOCALPREFIX}/lib/pcemu/C \
-+		${LOCALPREFIX}/bin
-+	install -c -s pcemu ${LOCALPREFIX}/bin/
-+	install -c -m 666 bootstrap/display.bin \
-+		${LOCALPREFIX}/lib/pcemu/DriveA
-+	install -c -m 644 BUGS CHANGES README TODO  bootstrap/README.BSD     \
-+		programs/lredir.readme \
-+		${LOCALPREFIX}/lib/pcemu/doc/
-+	rm -f ${LOCALPREFIX}/lib/pcemu/doc/report.ps.gz
-+	gzip --best < report.ps > ${LOCALPREFIX}/lib/pcemu/doc/report.ps.gz
-+	rm -f ${LOCALPREFIX}/lib/pcemu/font/vga.pcf.Z
-+	bdftopcf vga.bdf | compress > ${LOCALPREFIX}/lib/pcemu/font/vga.pcf.Z
-+	mkfontdir ${LOCALPREFIX}/lib/pcemu/font
-+	install -c -m 644 programs/vga50.com programs/config.sys \
-+		programs/dumpdisk.exe programs/lredir.exe programs/emufs.sys \
-+		${LOCALPREFIX}/lib/pcemu/C
diff --git a/emulators/pcemu/patches/patch-ab b/emulators/pcemu/patches/patch-ab
deleted file mode 100644
index 63ca983d882..00000000000
--- a/emulators/pcemu/patches/patch-ab
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/07/09 12:45:23 wiz Exp $
-
---- cpu.c.orig	1994-06-22 16:24:50.000000000 +0200
-+++ cpu.c
-@@ -253,7 +253,7 @@ static INLINE2 void i_ ## name ## _axd16
- 
- 
- #define JumpCond(name, cond) \
--static INLINE2 void i_j ## name ## (void) \
-+static INLINE2 void i_j ## name (void) \
- { \
-       register int tmp = (int)((INT8)GetMemInc(c_cs,ip)); \
-       if (cond) ip = (WORD)(ip+tmp); \
-@@ -1127,6 +1127,7 @@ static INLINE2 void i_es(void)
- 
- static INLINE2 void i_daa(void)
- {
-+    /* Opcode 0x27 */
-     if (AF || ((*bregs[AL] & 0xf) > 9))
-     {
-         *bregs[AL] += 6;
-@@ -1300,6 +1301,30 @@ static INLINE2 void i_cs(void)
-     c_ss = SegToMemPtr(SS);
- }
- 
-+static INLINE2 void i_das(void)
-+{
-+    /* Opcode 0x2f */
-+    if (AF || ((*bregs[AL] & 0xf) > 9))
-+    {
-+        *bregs[AL] -= 6;
-+        AF = 1;
-+    }
-+    else
-+        AF = 0;
-+
-+    if (CF || (*bregs[AL] > 0x9f))
-+    {
-+        *bregs[AL] -= 0x60;
-+        CF = 1;
-+    }
-+    else
-+        CF = 0;
-+
-+    SetPF(*bregs[AL]);
-+    SetSFB(*bregs[AL]);
-+    SetZFB(*bregs[AL]);
-+}
-+
- 
-     /* most XOR instructions go here */
- 
-@@ -4140,7 +4165,7 @@ static INLINE2 void i_notdone(void)
- {
-     fprintf(stderr,"Error: Unimplemented opcode %02X at cs:ip = %04X:%04X\n",
- 		    c_cs[ip-1],sregs[CS],ip-1);
--    exit(1);
-+/*    exit(1); */
- }
- 
- 
-@@ -4218,7 +4243,7 @@ void execute(void)
-         case 0x2c:    i_sub_ald8(); break;
-         case 0x2d:    i_sub_axd16(); break;
-         case 0x2e:    i_cs(); break;
--        case 0x2f:    i_notdone(); break;
-+        case 0x2f:    i_das(); break;
-         case 0x30:    i_xor_br8(); break;
-         case 0x31:    i_xor_wr16(); break;
-         case 0x32:    i_xor_r8b(); break;
diff --git a/emulators/pcemu/patches/patch-ac b/emulators/pcemu/patches/patch-ac
deleted file mode 100644
index 8d4d83f366a..00000000000
--- a/emulators/pcemu/patches/patch-ac
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2006/01/12 19:48:02 joerg Exp $
-
---- mfs.c.orig	1994-06-22 14:24:51.000000000 +0000
-+++ mfs.c
-@@ -319,17 +319,24 @@ TODO:
- #include <errno.h>
- #include <sys/param.h>
- #include <stdlib.h>
-+#if !__STDC__
- #include <malloc.h>
-+#endif
- 
--#ifdef SOLARIS
-+#if defined(SOLARIS) || (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900)
- #include <fcntl.h>
- #include <sys/statvfs.h>
- #endif
- 
- #if defined(SGI) || defined(RS6000)
--#include <sys/statfs.h>
-+# include <sys/statfs.h>
- #else
--#include <sys/vfs.h>
-+# include <sys/param.h>
-+# if BSD >= 199103
-+#  include <sys/mount.h>
-+# else
-+#  include <sys/vfs.h>
-+# endif /* new BSD */
- #endif
- 
- 
-@@ -768,7 +775,7 @@ get_unix_attr(int mode, int attr)
- int
- get_disk_space(char *cwd, int *free, int *total)
- {
--#ifdef SOLARIS
-+#if defined(SOLARIS) || (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900)
-     struct statvfs fsbuf;
-     if (statvfs(cwd, &fsbuf) >= 0)
- #else
-@@ -1182,8 +1189,6 @@ _get_dir(char *name, char *mname, char *
-   (void) find_file(name, &sbuf);
- 
-   if ((cur_dir = opendir(name)) == NULL) {
--    extern int errno;
--
-     Debug0((dbg_fd, "get_dir(): couldn't open '%s' errno = %s\n", name, strerror(errno)));
-     return (NULL);
-   }
diff --git a/emulators/pcemu/patches/patch-ad b/emulators/pcemu/patches/patch-ad
deleted file mode 100644
index c254e2390af..00000000000
--- a/emulators/pcemu/patches/patch-ad
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2004/07/09 12:45:03 wiz Exp $
-
---- main.c.orig	1994-06-22 16:24:50.000000000 +0200
-+++ main.c
-@@ -39,6 +39,18 @@ void exit_emu(void)
-     exit(0);
- }
- 
-+static char *set_keymap(char *buf)
-+{
-+	char c;
-+	int code;
-+	
-+	if(sscanf(buf, " %*s %i=%c", &code, &c) != 2)
-+		return "usage: keymap code=char";
-+	if(put_scan_table(code, (unsigned char)c))
-+		return "bad value for keymap";
-+	return 0;
-+}
-+
- 
- void check_error(char *msg, int line)
- {
-@@ -89,6 +101,8 @@ void read_pcemurc(void)
-             check_error(set_update_rate(strtol(value, NULL,10)), line);
-         else if (strcasecmp(keyword,"cursorspeed") == 0)
-             check_error(set_cursor_rate(strtol(value, NULL,10)), line);
-+	else if (strcasecmp(keyword,"keymap") == 0)
-+		check_error(set_keymap(buffer), line);
-         else
-             check_error("Syntax error in .pcemu file", line);
-     }
diff --git a/emulators/pcemu/patches/patch-ae b/emulators/pcemu/patches/patch-ae
deleted file mode 100644
index 595dfe19be2..00000000000
--- a/emulators/pcemu/patches/patch-ae
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/07/09 12:45:03 wiz Exp $
-
---- programs/config.sys.orig	1994-06-22 16:29:25.000000000 +0200
-+++ programs/config.sys
-@@ -1,2 +1,3 @@
--device=emufs.sys /
-+device=\emufs.sys /usr/local/lib/pcemu/C
- stacks 9,512
-+
diff --git a/emulators/pcemu/patches/patch-af b/emulators/pcemu/patches/patch-af
deleted file mode 100644
index 7448d862e1e..00000000000
--- a/emulators/pcemu/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.3 2004/07/09 12:45:03 wiz Exp $
-
---- cpu.h.orig	1994-06-22 16:24:50.000000000 +0200
-+++ cpu.h
-@@ -113,13 +113,13 @@
-     format and back again. Obviously there is nothing to do for little-endian
-     machines... */
- 
--#if defined(LITTLE_ENDIAN)
-+#if BYTE_ORDER == LITTLE_ENDIAN
- #   define ChangeE(x) (WORD)(x)
- #else
- #   define ChangeE(x) (WORD)(((x) << 8) | ((BYTE)((x) >> 8)))
- #endif
- 
--#if defined(LITTLE_ENDIAN) && !defined(ALIGNED_ACCESS)
-+#if BYTE_ORDER == LITTLE_ENDIAN && !defined(ALIGNED_ACCESS)
- #   define ReadWord(x) (*(x))
- #   define WriteWord(x,y) (*(x) = (y))
- #   define CopyWord(x,y) (*x = *y)
diff --git a/emulators/pcemu/patches/patch-ag b/emulators/pcemu/patches/patch-ag
deleted file mode 100644
index c69a5436e40..00000000000
--- a/emulators/pcemu/patches/patch-ag
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/10/25 20:50:39 agc Exp $
-
---- /dev/null	Thu Oct 25 21:39:38 2001
-+++ Makefile.inc	Thu Oct 25 21:42:36 2001
-@@ -0,0 +1,5 @@
-+#
-+# Makefile.inc
-+#
-+
-+LOCALPREFIX = ${PREFIX}
diff --git a/emulators/pcemu/patches/patch-ah b/emulators/pcemu/patches/patch-ah
deleted file mode 100644
index 8da1b630ccc..00000000000
--- a/emulators/pcemu/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/07/09 12:45:23 wiz Exp $
-
---- mfs_link.h.orig	1994-06-22 16:24:51.000000000 +0200
-+++ mfs_link.h
-@@ -41,7 +41,7 @@ extern unsigned char *memory;
- 
- 
- #define REGS  vm86s.regs
--#define REG(reg) (REGS.##reg)
-+#define REG(reg) (REGS.reg)
- 
- #define CF     (1 << 0)
- #define TF     (1 <<  8)
diff --git a/emulators/pcemu/patches/patch-ai b/emulators/pcemu/patches/patch-ai
deleted file mode 100644
index 4abc4abd1af..00000000000
--- a/emulators/pcemu/patches/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2006/01/12 19:48:02 joerg Exp $
-
---- mfs.h.orig	1994-06-22 14:24:51.000000000 +0000
-+++ mfs.h
-@@ -45,9 +45,11 @@ typedef unsigned char boolean_t;
- 
- #include "mfs_link.h"
- 
-+#if BSD < 199306		/* newer BSDs have it in <stdio.h> */
- extern char *sys_errlist[];
-+#endif
- 
--#if !defined(__hpux) && !defined(SOLARIS) && !defined(SGI) && !defined(RS6000)
-+#if !defined(__hpux) && !defined(SOLARIS) && !defined(SGI) && !defined(RS6000) && !defined(BSD)
- #define strerror(x) sys_errlist[x]
- #endif
- 
diff --git a/emulators/pcemu/patches/patch-aj b/emulators/pcemu/patches/patch-aj
deleted file mode 100644
index cf3b8241247..00000000000
--- a/emulators/pcemu/patches/patch-aj
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2004/07/09 12:45:03 wiz Exp $
-
---- xstuff.c.orig	1994-06-22 16:24:51.000000000 +0200
-+++ xstuff.c
-@@ -316,7 +316,7 @@ void flush_X(void)
- }
- 
- 
--static BYTE scan_table1[] =
-+static BYTE scan_table1[256 - 0x20] =
- {
-     0x39, 0x02, 
- #ifdef KBUK             /* double quotes, hash symbol */
-@@ -360,6 +360,7 @@ static BYTE scan_table1[] =
- #else
-     0x29,
- #endif
-+    0
- };
- 
- 
-@@ -461,6 +462,16 @@ static unsigned translate(KeySym key)
- }
- 
- 
-+int put_scan_table(BYTE code, unsigned char c)
-+{
-+	/* interface to overload scan_table1 from .pcemurc */
-+	if(c < ' ' || c >= ' ' + sizeof scan_table1)
-+		return 1;
-+	scan_table1[c - ' '] = code;
-+	return 0;
-+}
-+
-+
- void process_Xevents(void)
- {    
- #define KEY_BUFFER_SIZE 100
diff --git a/emulators/pcemu/patches/patch-ak b/emulators/pcemu/patches/patch-ak
deleted file mode 100644
index 8046d4ce982..00000000000
--- a/emulators/pcemu/patches/patch-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/07/09 12:45:03 wiz Exp $
-
---- xstuff.h.orig	1994-06-22 16:24:51.000000000 +0200
-+++ xstuff.h
-@@ -17,6 +17,7 @@
- 
- void start_X(void);
- void end_X(void);
-+int put_scan_table(BYTE, unsigned char);
- void process_Xevents(void);
- void flush_X(void);
- 
diff --git a/emulators/peace/DESCR b/emulators/peace/DESCR
deleted file mode 100644
index 1f69eb1ac60..00000000000
--- a/emulators/peace/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-PEACE is a set of programs to run Win32 executables on NetBSD.
diff --git a/emulators/peace/MESSAGE b/emulators/peace/MESSAGE
deleted file mode 100644
index f7a2542e896..00000000000
--- a/emulators/peace/MESSAGE
+++ /dev/null
@@ -1,18 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2006/02/26 17:27:22 wiz Exp $
-
-To enable the kernel part of PEACE, run the following:
-	# modload /usr/lkm/compat_pecoff.o
-	# modload /usr/lkm/exec_pecoff.o
-or enable COMPAT_PECOFF in your kernel configuration.
-Then, run (as root) ${LOCALBASE}/emul/pecoff/usr/bin/peace-setup to
-initialize PEACE runtime.
-
-This version of PEACE requires TrueType fonts for GUI
-applications, and supports only TrueColor X server.
-
-You have to set the following environment variables:
-	$DLLPATH $PEACE_FONTPATH $PEACE_LOCALE
-See http://chiharu.hauN.org/peace/install.html `Settings'
-
-===========================================================================
diff --git a/emulators/peace/Makefile b/emulators/peace/Makefile
deleted file mode 100644
index 404a8688607..00000000000
--- a/emulators/peace/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:27 wiz Exp $
-#
-PEACE_VERSION=	0.0.20060701
-DISTNAME=	peace-${PEACE_VERSION}
-SITES.peace-0.0.20060701.tar.gz=http://chiharu.hauN.org/peace/dist/
-CATEGORIES=	emulators
-
-MAINTAINER=	kent@NetBSD.org
-HOMEPAGE=	http://chiharu.hauN.org/peace/
-COMMENT=	Support running Win32 executables
-
-DISTFILES+=	peace-${PEACE_VERSION}.tar.gz
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=peace/}
-ONLY_FOR_PLATFORM=	NetBSD-[2-9]*-i386
-DEPENDS+=	icu>=2.4nb1:../../textproc/icu
-DEPENDS+=	freetype2>=2.2.1:../../graphics/freetype2
-# bin/showstack requires perl5 and cross-i386-netbsdpe
-# DEPENDS+=	perl5:../../lang/perl5
-# DEPENDS+=	cross-i386-netbsdpe>=3.3:../../cross/i386-netbsdpe
-
-BUILD_DEPENDS+=	cross-i386-netbsdpe>=3.3:../../cross/i386-netbsdpe
-BUILD_DEPENDS+=	x11-links>=0.30:../../pkgtools/x11-links
-
-# Don't use "+=" here to avoid unexpected link with ELF libraries
-LDFLAGS=	-L${WRKSRC}/lib
-PECOFFDIR=	${PREFIX}/emul/pecoff
-MAKE_FLAGS+=	PECOFFDIR=${PECOFFDIR:Q} \
-		LOCALBASE=${LOCALBASE:Q} \
-		CROSSBASE=${CROSSBASE:Q} \
-		X11BASE=${X11BASE:Q} \
-		CHECK_DEPENDENTS=NO
-
-INSTALL_DIRS=	libexec/ld.pe_so dll bin
-
-pre-install:
-	${INSTALL_PROGRAM_DIR} ${PECOFFDIR}/usr/libexec
-	${INSTALL_DATA_DIR} ${PECOFFDIR}/usr/lib
-
-post-install:
-	${RMDIR} ${PREFIX}/emul/pecoff/usr/share/man/cat1
-	${RMDIR} ${PREFIX}/emul/pecoff/usr/share/man/man1
-	${RMDIR} ${PREFIX}/emul/pecoff/usr/share/man
-	${RMDIR} ${PREFIX}/emul/pecoff/usr/share
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/peace/PLIST b/emulators/peace/PLIST
deleted file mode 100644
index 0445247942a..00000000000
--- a/emulators/peace/PLIST
+++ /dev/null
@@ -1,34 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2006/02/26 17:26:32 wiz Exp $
-emul/pecoff/usr/bin/peace-setup
-emul/pecoff/usr/bin/regcomserver
-emul/pecoff/usr/bin/regimport
-emul/pecoff/usr/bin/regutil
-emul/pecoff/usr/bin/showstack
-emul/pecoff/usr/lib/advapi32.dll
-emul/pecoff/usr/lib/avifil32.dll
-emul/pecoff/usr/lib/comctl32.dll
-emul/pecoff/usr/lib/comdlg32.dll
-emul/pecoff/usr/lib/ddraw.dll
-emul/pecoff/usr/lib/dinput.dll
-emul/pecoff/usr/lib/dsound.dll
-emul/pecoff/usr/lib/gdi32.dll
-emul/pecoff/usr/lib/imm32.dll
-emul/pecoff/usr/lib/kernel32.dll
-emul/pecoff/usr/lib/lz32.dll
-emul/pecoff/usr/lib/mpr.dll
-emul/pecoff/usr/lib/msacm32.dll
-emul/pecoff/usr/lib/msvfw32.dll
-emul/pecoff/usr/lib/ole32.dll
-emul/pecoff/usr/lib/shell32.dll
-emul/pecoff/usr/lib/ui.so.dll
-emul/pecoff/usr/lib/user32.dll
-emul/pecoff/usr/lib/version.dll
-emul/pecoff/usr/lib/winmm.dll
-emul/pecoff/usr/lib/winspool.drv
-emul/pecoff/usr/lib/wsock32.dll
-emul/pecoff/usr/libexec/ld.so.dll
-@dirrm emul/pecoff/usr/libexec
-@dirrm emul/pecoff/usr/lib
-@dirrm emul/pecoff/usr/bin
-@dirrm emul/pecoff/usr
-@dirrm emul/pecoff
diff --git a/emulators/peace/distinfo b/emulators/peace/distinfo
deleted file mode 100644
index 0dea70a9aef..00000000000
--- a/emulators/peace/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.14 2006/07/03 04:38:43 kent Exp $
-
-SHA1 (peace-0.0.20060701.tar.gz) = 0307592fc773dec131d75408cf31898f91952f81
-RMD160 (peace-0.0.20060701.tar.gz) = 3a0de978b3979b21fe3813e1267f4edd75802f54
-Size (peace-0.0.20060701.tar.gz) = 1685054 bytes
diff --git a/emulators/pearpc/DESCR b/emulators/pearpc/DESCR
deleted file mode 100644
index ff7b5da7038..00000000000
--- a/emulators/pearpc/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-PearPC is an architecture independent PowerPC platform emulator capable of
-running most PowerPC operating systems.
diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile
deleted file mode 100644
index 5f3eeb4f5f9..00000000000
--- a/emulators/pearpc/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2007/02/19 18:44:10 joerg Exp $
-
-DISTNAME=		pearpc-0.4
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=pearpc/}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		ghen@NetBSD.org
-HOMEPAGE=		http://pearpc.sourceforge.net/
-COMMENT=		PowerPC emulator
-
-GNU_CONFIGURE=		yes
-USE_LANGUAGES=		c c++
-
-EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES=		${EGDIR}/ppccfg.example ${PKG_SYSCONFDIR}/ppccfg.conf
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(MACHINE_ARCH:Mi386)
-BUILD_DEPENDS+=		nasm-[0-9]*:../../devel/nasm
-CONFIGURE_ARGS+=	--enable-cpu=jitc_x86
-.endif
-
-CONFIGURE_ARGS+=	--disable-debug
-
-INSTALLATION_DIRS=	share/${PKGBASE} bin
-
-do-install:
-	${SED}	-e "s,@PREFIX@,${PREFIX}," \
-		-e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR}," \
-		${FILESDIR}/pearpc.sh > ${WRKSRC}/pearpc.sh
-	${INSTALL_SCRIPT} ${WRKSRC}/pearpc.sh ${PREFIX}/bin/pearpc
-	${INSTALL_PROGRAM} ${WRKSRC}/src/ppc ${PREFIX}/share/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/video.x ${PREFIX}/share/${PKGBASE}
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/ppccfg.example ${EGDIR}
-
-SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
-SUBST_FILES.conf=	ppccfg.example
-SUBST_SED.conf=		-e "s|\"nvram\"|\"/tmp/nvram\"|"
-SUBST_MESSAGE.conf=	Fixing configuration file.
-
-.include "options.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/pearpc/PLIST b/emulators/pearpc/PLIST
deleted file mode 100644
index ccdd27a5ea1..00000000000
--- a/emulators/pearpc/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/12/22 19:27:36 ghen Exp $
-bin/pearpc
-share/examples/pearpc/ppccfg.example
-share/pearpc/ppc
-share/pearpc/video.x
-@dirrm share/pearpc
-@dirrm share/examples/pearpc
diff --git a/emulators/pearpc/distinfo b/emulators/pearpc/distinfo
deleted file mode 100644
index 046388bff51..00000000000
--- a/emulators/pearpc/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.6 2006/01/12 20:57:25 joerg Exp $
-
-SHA1 (pearpc-0.4.tar.bz2) = 1cfa4f19f9a1de73c209a38d8fda174c0ebe6ad5
-RMD160 (pearpc-0.4.tar.bz2) = 84c831b3ede69721d0fa48d71a30ee0e7ec512fc
-Size (pearpc-0.4.tar.bz2) = 687776 bytes
-SHA1 (patch-aa) = 104fce78006613853c15573971cdb691a08c6401
-SHA1 (patch-ab) = c8724e43d99476d5ccae8d8782dc8bf9705743ae
-SHA1 (patch-ac) = e6b52cf368391fe6d09722a6ba99e5b3933c5b03
-SHA1 (patch-ad) = 5932a40320c7783c8379d2af7f6d98a42707ff1b
-SHA1 (patch-ae) = 53dfb9a705296085bc1cdf707b9c491b0a2a4030
-SHA1 (patch-af) = dd2b1c23ab00313be04ca144fbceb3416b1d7d8f
-SHA1 (patch-ag) = 8ec459446fd666b99345d4a8963bcf47e35b0435
diff --git a/emulators/pearpc/files/pearpc.sh b/emulators/pearpc/files/pearpc.sh
deleted file mode 100644
index a5022cb9d5d..00000000000
--- a/emulators/pearpc/files/pearpc.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: pearpc.sh,v 1.1.1.1 2004/06/20 19:33:20 xtraeme Exp $
-
-cd @PREFIX@/share/pearpc && exec ./ppc "$@" @PKG_SYSCONFDIR@/ppccfg.conf
-exit 0
diff --git a/emulators/pearpc/options.mk b/emulators/pearpc/options.mk
deleted file mode 100644
index 8ef0eee8127..00000000000
--- a/emulators/pearpc/options.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2007/02/19 18:44:11 joerg Exp $
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.pearpc
-PKG_OPTIONS_REQUIRED_GROUPS=	ui
-PKG_OPTIONS_GROUP.ui=		x11 sdl
-PKG_SUGGESTED_OPTIONS=		x11
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mx11)
-CONFIGURE_ARGS+=		--enable-ui=x11
-.include "../../x11/libX11/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Msdl)
-CONFIGURE_ARGS+=		--enable-ui=sdl
-.include "../../devel/SDL/buildlink3.mk"
-.endif
diff --git a/emulators/pearpc/patches/patch-aa b/emulators/pearpc/patches/patch-aa
deleted file mode 100644
index 815cdd2b968..00000000000
--- a/emulators/pearpc/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/12/22 19:27:36 ghen Exp $
-
---- src/system/osapi/posix/systimer.cc.orig	2005-12-21 14:43:21.000000000 +0100
-+++ src/system/osapi/posix/systimer.cc
-@@ -31,7 +31,11 @@
- static const int kTimerSignal = SYSTIMER_SIGNAL;
- #ifdef USE_POSIX_REALTIME_CLOCK
- static void signal_handler(int signo, siginfo_t *extra, void *junk);
-+#  ifdef __NetBSD__
-+static const int kClockRT = CLOCK_PROF;
-+#  else
- static const int kClockRT = CLOCK_PROCESS_CPUTIME_ID;
-+#  endif
- static const int kClock = CLOCK_REALTIME;
- #elif USE_POSIX_SETITIMER
- static void signal_handler(int signo);
-@@ -70,7 +74,11 @@ struct sys_timer_struct
- #ifdef USE_POSIX_REALTIME_CLOCK
- static void signal_handler(int signo, siginfo_t *extra, void *junk)
- {
-+#  ifndef __NetBSD__
- 	sys_timer_struct *timer = reinterpret_cast<sys_timer_struct *>(extra->si_value.sival_ptr);
-+#  else
-+	sys_timer_struct *timer = reinterpret_cast<sys_timer_struct *>(extra->si_sigval.sival_ptr);
-+#  endif
- 	timer->callback(reinterpret_cast<sys_timer>(timer));
- }
- #else
diff --git a/emulators/pearpc/patches/patch-ab b/emulators/pearpc/patches/patch-ab
deleted file mode 100644
index 430de336463..00000000000
--- a/emulators/pearpc/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/12/22 19:27:36 ghen Exp $
-
---- src/cpu/cpu_jitc_x86/ppc_vec.cc.orig	2005-12-21 15:02:51.000000000 +0100
-+++ src/cpu/cpu_jitc_x86/ppc_vec.cc
-@@ -6621,7 +6621,7 @@ void ppc_opc_vrfiz()
- 	PPC_OPC_ASSERT(vrA==0);
- 
- 	for (int i=0; i<4; i++) { //FIXME: This might not comply with Java FP
--		gCPU.vr[vrD].f[i] = truncf(gCPU.vr[vrD].f[i]);
-+		gCPU.vr[vrD].f[i] = rint(gCPU.vr[vrD].f[i]);
- 	}
- }
- JITCFlow ppc_opc_gen_vrfiz()
-@@ -6963,7 +6963,7 @@ void ppc_opc_vctsxs()
- 
- 	for (int i=0; i<4; i++) { //FIXME: This might not comply with Java FP
- 		ftmp = gCPU.vr[vrB].f[i] * (float)(1 << uimm);
--		ftmp = truncf(ftmp);
-+		ftmp = rint(ftmp);
- 
- 		tmp = (sint32)ftmp;
- 
-@@ -7061,7 +7061,7 @@ void ppc_opc_vctuxs()
- 
- 	for (int i=0; i<4; i++) { //FIXME: This might not comply with Java FP
- 		ftmp = gCPU.vr[vrB].f[i] * (float)(1 << uimm);
--		ftmp = truncf(ftmp);
-+		ftmp = rint(ftmp);
- 
- 		tmp = (uint32)ftmp;
- 
diff --git a/emulators/pearpc/patches/patch-ac b/emulators/pearpc/patches/patch-ac
deleted file mode 100644
index e98b337cea9..00000000000
--- a/emulators/pearpc/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/12/22 19:27:36 ghen Exp $
-
---- src/cpu/cpu_generic/ppc_vec.cc.orig	2005-12-21 15:41:47.000000000 +0100
-+++ src/cpu/cpu_generic/ppc_vec.cc
-@@ -2594,7 +2594,7 @@ void ppc_opc_vrfiz()
- 	PPC_OPC_ASSERT(vrA==0);
- 
- 	for (int i=0; i<4; i++) { //FIXME: This might not comply with Java FP
--		gCPU.vr[vrD].f[i] = truncf(gCPU.vr[vrD].f[i]);
-+		gCPU.vr[vrD].f[i] = rint(gCPU.vr[vrD].f[i]);
- 	}
- }
- 
-@@ -2726,7 +2726,7 @@ void ppc_opc_vctsxs()
- 
- 	for (int i=0; i<4; i++) { //FIXME: This might not comply with Java FP
- 		ftmp = gCPU.vr[vrB].f[i] * (float)(1 << uimm);
--		ftmp = truncf(ftmp);
-+		ftmp = rint(ftmp);
- 
- 		tmp = (sint32)ftmp;
- 
-@@ -2755,7 +2755,7 @@ void ppc_opc_vctuxs()
- 
- 	for (int i=0; i<4; i++) { //FIXME: This might not comply with Java FP
- 		ftmp = gCPU.vr[vrB].f[i] * (float)(1 << uimm);
--		ftmp = truncf(ftmp);
-+		ftmp = rint(ftmp);
- 
- 		tmp = (uint32)ftmp;
- 
diff --git a/emulators/pearpc/patches/patch-ad b/emulators/pearpc/patches/patch-ad
deleted file mode 100644
index 4fb5e0cd148..00000000000
--- a/emulators/pearpc/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/12/22 19:27:36 ghen Exp $
-
---- src/system/osapi/posix/sysethtun.cc.orig	2005-12-21 15:01:35.000000000 +0100
-+++ src/system/osapi/posix/sysethtun.cc
-@@ -33,6 +33,7 @@
- #include <cstring>
- #include <unistd.h>
- #include <sys/wait.h>
-+#include <sys/select.h>
- 
- #include "system/sysethtun.h"
- #include "tools/snprintf.h"
diff --git a/emulators/pearpc/patches/patch-ae b/emulators/pearpc/patches/patch-ae
deleted file mode 100644
index b40ae7896be..00000000000
--- a/emulators/pearpc/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/01/12 20:57:25 joerg Exp $
-
---- src/io/prom/fs/hfs/libhfs.h.orig	2006-01-12 20:20:19.000000000 +0000
-+++ src/io/prom/fs/hfs/libhfs.h
-@@ -18,11 +18,11 @@
-  *
-  */
- 
-+#include <errno.h>
-+
- # include "hfs.h"
- # include "apple.h"
- 
--extern int errno;
--
- # define ERROR(code, str)  \
-     do { hfs_error = (str), errno = (code); goto fail; } while (0)
- 
diff --git a/emulators/pearpc/patches/patch-af b/emulators/pearpc/patches/patch-af
deleted file mode 100644
index 4d73beee78b..00000000000
--- a/emulators/pearpc/patches/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/01/12 20:57:25 joerg Exp $
-
---- src/io/prom/fs/hfsplus/libhfsp.h.orig	2006-01-12 20:29:55.000000000 +0000
-+++ src/io/prom/fs/hfsplus/libhfsp.h
-@@ -23,6 +23,8 @@
-  *
-  */
- 
-+#include <errno.h>
-+
- #ifndef APPLE_H
- # include "apple.h"
- #endif
-@@ -30,7 +32,6 @@
- # include "hfs.h"
- # include "hfsp.h"
- 
--extern int errno;
- /* Last error is eventually found here */
- extern const char *hfsp_error; 
- 
diff --git a/emulators/pearpc/patches/patch-ag b/emulators/pearpc/patches/patch-ag
deleted file mode 100644
index 034ab04c0a8..00000000000
--- a/emulators/pearpc/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/01/12 20:57:25 joerg Exp $
-
---- configure.orig	2006-01-12 20:37:05.000000000 +0000
-+++ configure
-@@ -1934,7 +1934,7 @@ linux* | gnu* | k*bsd*-gnu)
- echo "${ECHO_T}*** GNU, building POSIX version. we need pthread and rt." >&6
- 	PPC_LDADD="$PPC_LDADD -lpthread -lrt"
- ;;
--freebsd*)
-+freebsd* | dragonfly*)
- 	OSAPI_DIR=posix
- 	if test "x$enable_ui" = "xno"; then
- 		enable_ui="x11"
diff --git a/emulators/qemu/DESCR b/emulators/qemu/DESCR
deleted file mode 100644
index d939711a261..00000000000
--- a/emulators/qemu/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-QEMU is a FAST! processor emulator using dynamic translation to achieve
-good emulation speed, QEMU has two operating modes:
-
-    * Full system emulation. In this mode, QEMU emulates a full system
-      (for example a PC), including a processor and various peripherals.
-      It can be used to launch different Operating Systems without rebooting
-      the PC or to debug system code.
-    * User mode emulation (Linux host only). In this mode, QEMU can launch
-      Linux processes compiled for one CPU on another CPU. It can be used
-      to launch the Wine Windows API emulator or to ease cross-compilation
-      and cross-debugging.
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
deleted file mode 100644
index c364b13fa3b..00000000000
--- a/emulators/qemu/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# $NetBSD: Makefile,v 1.44 2007/02/22 19:26:27 wiz Exp $
-#
-
-DISTNAME=		qemu-0.8.2
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		http://fabrice.bellard.free.fr/qemu/
-
-MAINTAINER=		xtraeme@NetBSD.org
-HOMEPAGE=		http://www.qemu.org/
-COMMENT=		CPU emulator using dynamic translation
-
-CONFLICTS+=		qemu-bin-[0-9]*
-NOT_FOR_PLATFORM=	NetBSD-1.[0-6]*-*
-
-USE_TOOLS+=		gmake perl:build
-HAS_CONFIGURE=		yes
-
-BUILD_DEPENDS+=		texi2html-[0-9]*:../../textproc/texi2html
-
-.include "../../mk/bsd.prefs.mk"
-
-GCC_REQD+=		3.0
-
-.if !empty(MACHINE_PLATFORM:MNetBSD-4*)
-USE_PKGSRC_GCC=	yes
-.endif
-
-CONFIGURE_ENV+=		PKGMANDIR=${PKGMANDIR}
-CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=	--interp-prefix=${PREFIX:Q}/share/qemu
-
-SUBST_CLASSES+=		snd
-SUBST_STAGE.snd=	post-patch
-SUBST_FILES.snd=	audio/ossaudio.c
-SUBST_SED.snd=		-e s,/dev/dsp,${DEVOSSAUDIO:Q},g
-SUBST_MESSAGE.snd=	Fixing hardcoded audio device.
-
-SUBST_CLASSES+=		smbd
-SUBST_STAGE.smbd=	post-patch
-SUBST_FILES.smbd=	vl.c
-SUBST_SED.smbd=		-e s,/usr/sbin/smbd,${PREFIX:Q}/sbin/smbd,g
-SUBST_MESSAGE.smbd=	Fixing hardcoded paths.
-
-REPLACE_PERL+=		texi2pod.pl
-
-# Remove -march/-mcpu from CFLAGS, otherwise it will fail
-# to build in the SSE code.
-BUILDLINK_TRANSFORM+=	rm-optarg:-march rm-optarg:-mcpu
-
-# Does not build with the stack protector
-.if ${OPSYS} == "DragonFly"
-CFLAGS+=		-fno-stack-protector
-.endif
-
-.include "../../mk/compiler.mk"
-
-.if !empty(CC_VERSION:Mgcc-4*)
-CONFIGURE_ARGS+=	--disable-gcc-check
-.endif
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/qemu
-	${INSTALL_DATA} ${FILESDIR:Q}/Makefile.multinode-NetBSD \
-		${PREFIX:Q}/share/doc/qemu/
-
-	${INSTALL_MAN} ${WRKSRC}/qemu.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/qemu-img.1 ${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
deleted file mode 100644
index 85386143343..00000000000
--- a/emulators/qemu/PLIST
+++ /dev/null
@@ -1,59 +0,0 @@
-@comment $NetBSD: PLIST,v 1.14 2006/09/17 07:51:56 xtraeme Exp $
-bin/qemu
-bin/qemu-img
-bin/qemu-system-arm
-bin/qemu-system-mips
-bin/qemu-system-mipsel
-bin/qemu-system-ppc
-bin/qemu-system-sparc
-bin/qemu-system-x86_64
-man/man1/qemu-img.1
-man/man1/qemu.1
-share/doc/qemu/Makefile.multinode-NetBSD
-share/doc/qemu/qemu-doc.html
-share/doc/qemu/qemu-tech.html
-share/qemu/bios.bin
-share/qemu/keymaps/ar
-share/qemu/keymaps/common
-share/qemu/keymaps/da
-share/qemu/keymaps/de
-share/qemu/keymaps/de-ch
-share/qemu/keymaps/en-gb
-share/qemu/keymaps/en-us
-share/qemu/keymaps/es
-share/qemu/keymaps/et
-share/qemu/keymaps/fi
-share/qemu/keymaps/fo
-share/qemu/keymaps/fr
-share/qemu/keymaps/fr-be
-share/qemu/keymaps/fr-ca
-share/qemu/keymaps/fr-ch
-share/qemu/keymaps/hr
-share/qemu/keymaps/hu
-share/qemu/keymaps/is
-share/qemu/keymaps/it
-share/qemu/keymaps/ja
-share/qemu/keymaps/lt
-share/qemu/keymaps/lv
-share/qemu/keymaps/mk
-share/qemu/keymaps/modifiers
-share/qemu/keymaps/nl
-share/qemu/keymaps/nl-be
-share/qemu/keymaps/no
-share/qemu/keymaps/pl
-share/qemu/keymaps/pt
-share/qemu/keymaps/pt-br
-share/qemu/keymaps/ru
-share/qemu/keymaps/sl
-share/qemu/keymaps/sv
-share/qemu/keymaps/th
-share/qemu/keymaps/tr
-share/qemu/linux_boot.bin
-share/qemu/openbios-sparc32
-share/qemu/ppc_rom.bin
-share/qemu/vgabios-cirrus.bin
-share/qemu/vgabios.bin
-share/qemu/video.x
-@dirrm share/qemu/keymaps
-@dirrm share/qemu
-@dirrm share/doc/qemu
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
deleted file mode 100644
index b7476d7d603..00000000000
--- a/emulators/qemu/distinfo
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: distinfo,v 1.31 2007/01/06 21:21:35 xtraeme Exp $
-
-SHA1 (qemu-0.8.2.tar.gz) = d775239a545e7d0c5b677660a2122df590afde6d
-RMD160 (qemu-0.8.2.tar.gz) = 715c24997330352aa675cd7279731cec251f833a
-Size (qemu-0.8.2.tar.gz) = 1810909 bytes
-SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
-SHA1 (patch-ab) = 12838d78eed85c575214f4ce632a4b6694c6f97f
-SHA1 (patch-ac) = f1231bcfde687ebe7a7ea4898593cd3818f03142
-SHA1 (patch-af) = c139e919da430c0118dc774587e1e6dd718d7926
-SHA1 (patch-ag) = 91f10c4556a45ca3ec19efe67dcaa6625902c120
-SHA1 (patch-ah) = 134f47583dbed94e83671ca6197106805b13f759
-SHA1 (patch-ai) = 480cc80a451488a1376f99ed152a917116759cbf
-SHA1 (patch-aj) = 4972ee341782419114972b91fb6354ee9881b60f
-SHA1 (patch-ak) = 4715a464554469e8dac9cde93db83a90885b8a7e
-SHA1 (patch-al) = d61bce6a4cebae4ba1f87ce9def277c0ffc5843d
-SHA1 (patch-am) = a22a3b23284c377afa8113768d68c8ef40c514f9
-SHA1 (patch-ao) = e92d56f991cf29f83e39464f9e695caa86fe5fe0
-SHA1 (patch-ap) = 6cd565b9a3b06aea12fbedb1199e16dd0f3577ae
-SHA1 (patch-as) = 0df64b325b758a88fe61590e129bab2b3f99ce63
-SHA1 (patch-at) = c6f0129eccf7574e3832aff746d2f0bd442de7c1
-SHA1 (patch-au) = 29d05fb5f4717fb572491d9d0653ec74ba46ae7e
-SHA1 (patch-aw) = 3b1472a95a2312f9e49ea1a6aa517ad81328324c
-SHA1 (patch-ax) = 66b060005ecbf9fd0451f7960e81eccbabf959ca
-SHA1 (patch-ay) = 45fa8b5720185b5bfe2d1c00f599565f286ea4f5
diff --git a/emulators/qemu/files/Makefile.multinode-NetBSD b/emulators/qemu/files/Makefile.multinode-NetBSD
deleted file mode 100644
index d438c33b7ef..00000000000
--- a/emulators/qemu/files/Makefile.multinode-NetBSD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: Makefile.multinode-NetBSD,v 1.3 2006/07/06 21:14:19 jlam Exp $
-# Source: http://mail-index.NetBSD.org/netbsd-help/2005/03/25/0005.html
-#
-# Starts up two qemu instances and networks bridges them to the local
-# ethernet (ETHER_IF}.  Works best with NetBSD configured to use serial
-# consoles in DISK[12]
-#
-# Usage:
-#	sudo make netbsd1
-#	sudo make netbsd2
-#
-#  - Hubert Feyrer <hubert@feyrer.de>
-#
-
-#NETBSD_NOGFX=
-NETBSD_NOGFX=		-nographic
-
-ETHER_IF=	tlp0
-QEMU_RAM=	20
-DISK1=		harddisk.netbsd1
-DISK2=		harddisk.netbsd2
-
-
-all: netbsd1 netbsd2
-
-netbsd1: bridge 
-	ifconfig tap1 create up	     || echo tap1: already there
-	brconfig bridge0 add tap1 up || echo tap1: already on bridge0
-	brconfig bridge0 -learn tap1 # real hub mode, step 1b
-	brconfig bridge0 flush	# real hub more, step 2
-	qemu \	
-		-m ${QEMU_RAM} \
-		${NETBSD_NOGFX} \
-		-boot c \
-		-net tap,fd=3,ifname=tap1 3<>/dev/tap1 \
-		-net nic,macaddr=de:ad:be:ef:00:01 \
-		${DISK1}
-	brconfig bridge0 delete tap1 
-	ifconfig tap1 destroy
-
-netbsd2: bridge
-	ifconfig tap2 create up	     || echo tap2: already there
-	brconfig bridge0 add tap2 up || echo tap2: already on bridge0
-	brconfig bridge0 -learn tap2 # real hub mode, step 1c
-	brconfig bridge0 flush	     # real hub mode, step 2
-	qemu \
-		-m ${QEMU_RAM} \
-		${NETBSD_NOGFX} \
-		-boot c \
-		-net tap,fd=3,ifname=tap2 3<>/dev/tap2 \
-		-net nic,macaddr=de:ad:be:ef:00:02 \
-		${DISK2}
-	brconfig bridge0 delete tap2
-	ifconfig tap2 destroy
-	
-bridge:
-	ifconfig bridge0 create	  || echo bridge0: already there
-	brconfig bridge0 add ${ETHER_IF} || echo bridge0: ${ETHER_IF} already there
-	brconfig bridge0 -learn ${ETHER_IF} # real hub mode, step 1a
diff --git a/emulators/qemu/patches/patch-aa b/emulators/qemu/patches/patch-aa
deleted file mode 100644
index 108f238991c..00000000000
--- a/emulators/qemu/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/12/14 01:02:19 dbj Exp $
-
---- bswap.h.orig	Sun Nov 14 15:51:33 2004
-+++ bswap.h
-@@ -5,6 +5,12 @@
- 
- #include <inttypes.h>
- 
-+#ifdef HAVE_MACHINE_BSWAP_H
-+#include <sys/endian.h>
-+#include <sys/types.h>
-+#include <machine/bswap.h>
-+#else
-+
- #ifdef HAVE_BYTESWAP_H
- #include <byteswap.h>
- #else
-@@ -57,6 +63,8 @@ static inline uint64_t bswap64(uint64_t 
- {
-     return bswap_64(x);
- }
-+
-+#endif /* ! HAVE_MACHINE_BSWAP_H */
- 
- static inline void bswap16s(uint16_t *s)
- {
diff --git a/emulators/qemu/patches/patch-ab b/emulators/qemu/patches/patch-ab
deleted file mode 100644
index f31c1f2193c..00000000000
--- a/emulators/qemu/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2006/05/06 18:41:49 xtraeme Exp $
-
---- target-arm/cpu.h.orig	2005-12-19 23:51:53.000000000 +0100
-+++ target-arm/cpu.h
-@@ -122,9 +122,15 @@ void switch_mode(CPUARMState *, int);
- /* you can call this signal handler from your SIGBUS and SIGSEGV
-    signal handlers to inform the virtual CPU of exceptions. non zero
-    is returned if the signal was handled by the virtual CPU.  */
-+#ifdef __NetBSD__
-+union siginfo;
-+int cpu_arm_signal_handler(int host_signum, union siginfo *info,
-+                           void *puc);
-+#else
- struct siginfo;
- int cpu_arm_signal_handler(int host_signum, struct siginfo *info, 
-                            void *puc);
-+#endif
- 
- #define CPSR_M (0x1f)
- #define CPSR_T (1 << 5)
diff --git a/emulators/qemu/patches/patch-ac b/emulators/qemu/patches/patch-ac
deleted file mode 100644
index 4f6e49c91d9..00000000000
--- a/emulators/qemu/patches/patch-ac
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2006/08/21 17:23:52 dbj Exp $
-
---- vl.c.orig	2006-05-06 19:22:32.000000000 +0200
-+++ vl.c	2006-05-06 19:28:25.000000000 +0200
-@@ -43,7 +47,7 @@
- #include <netdb.h>
- #ifdef _BSD
- #include <sys/stat.h>
--#ifndef __APPLE__
-+#ifndef _BSD
- #include <libutil.h>
- #endif
- #else
-@@ -1506,7 +1510,7 @@
-     return chr;
- }
- 
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__NetBSD__)
- CharDriverState *qemu_chr_open_pty(void)
- {
-     struct termios tty;
-@@ -1663,6 +1667,9 @@
- 
- static int pp_ioctl(CharDriverState *chr, int cmd, void *arg)
- {
-+#ifdef __NetBSD__
-+    return ENOTSUP;
-+#else
-     int fd = (int)chr->opaque;
-     uint8_t b;
- 
-@@ -1696,10 +1703,14 @@
-         return -ENOTSUP;
-     }
-     return 0;
-+#endif
- }
- 
- CharDriverState *qemu_chr_open_pp(const char *filename)
- {
-+#ifdef __NetBSD__
-+    return NULL;
-+#else
-     CharDriverState *chr;
-     int fd;
- 
-@@ -1722,6 +1733,7 @@
-     chr->chr_add_read_handler = null_chr_add_read_handler;
-     chr->chr_ioctl = pp_ioctl;
-     return chr;
-+#endif
- }
- 
- #else
diff --git a/emulators/qemu/patches/patch-af b/emulators/qemu/patches/patch-af
deleted file mode 100644
index 678e2ef2627..00000000000
--- a/emulators/qemu/patches/patch-af
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-af,v 1.5 2006/09/16 15:29:35 hira Exp $
-
---- dyngen-exec.h.orig	2006-09-05 01:19:38.000000000 +0200
-+++ dyngen-exec.h	2006-09-05 01:21:00.000000000 +0200
-@@ -30,7 +30,9 @@
- /* NOTE: standard headers should be used with special care at this
-    point because host CPU registers are used as global variables. Some
-    host headers do not allow that. */
-+#ifndef __APPLE__
- #include <stddef.h>
-+#endif
- 
- typedef unsigned char uint8_t;
- typedef unsigned short uint16_t;
-@@ -62,6 +64,7 @@
- #endif
- #endif
- 
-+#if 0
- #define INT8_MIN		(-128)
- #define INT16_MIN		(-32767-1)
- #define INT32_MIN		(-2147483647-1)
-@@ -74,12 +77,17 @@
- #define UINT16_MAX		(65535)
- #define UINT32_MAX		(4294967295U)
- #define UINT64_MAX		((uint64_t)(18446744073709551615))
-+#endif
- 
-+#ifdef __NetBSD__
-+typedef struct __sFILE FILE;
-+#else
- typedef struct FILE FILE;
- extern int fprintf(FILE *, const char *, ...);
- extern int printf(const char *, ...);
- #undef NULL
- #define NULL 0
-+#endif
- 
- #ifdef __i386__
- #define AREG0 "ebp"
diff --git a/emulators/qemu/patches/patch-ag b/emulators/qemu/patches/patch-ag
deleted file mode 100644
index 7aea34e0c94..00000000000
--- a/emulators/qemu/patches/patch-ag
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ag,v 1.8 2007/01/06 21:21:35 xtraeme Exp $
-
---- configure.orig	2006-12-07 16:59:57.000000000 +0100
-+++ configure	2006-12-07 17:02:12.000000000 +0100
-@@ -27,7 +27,7 @@
- make="make"
- install="install"
- strip="strip"
--cpu=`uname -m`
-+cpu=`uname -p`
- target_list=""
- case "$cpu" in
-   i386|i486|i586|i686|i86pc|BePC)
-@@ -42,7 +42,7 @@
-   alpha)
-     cpu="alpha"
-   ;;
--  "Power Macintosh"|ppc|ppc64)
-+  "Power Macintosh"|ppc|ppc64|powerpc)
-     cpu="powerpc"
-   ;;
-   mips)
-@@ -115,6 +115,12 @@
-     kqemu="yes"
- fi
- ;;
-+DragonFly)
-+bsd="yes"
-+oss="yes"
-+dragonfly="yes"
-+;;
-+
- NetBSD)
- bsd="yes"
- oss="yes"
-@@ -509,7 +515,7 @@
- if test -z "$prefix" ; then
-     prefix="/usr/local"
- fi
--mandir="$prefix/share/man"
-+mandir="$prefix/$PKGMANDIR"
- datadir="$prefix/share/qemu"
- docdir="$prefix/share/doc/qemu"
- bindir="$prefix/bin"
-@@ -646,6 +652,11 @@
-   echo "#define CONFIG_WIN32 1" >> $config_h
- elif test -f "/usr/include/byteswap.h" ; then
-   echo "#define HAVE_BYTESWAP_H 1" >> $config_h
-+elif test -f "/usr/include/machine/bswap.h" ; then
-+  echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h
-+fi
-+if test "$dragonfly" = "yes" ; then
-+  echo "CONFIG_DRAGONFLY=yes" >> $config_mak
- fi
- if test "$darwin" = "yes" ; then
-   echo "CONFIG_DARWIN=yes" >> $config_mak
diff --git a/emulators/qemu/patches/patch-ah b/emulators/qemu/patches/patch-ah
deleted file mode 100644
index 2f82d82e86e..00000000000
--- a/emulators/qemu/patches/patch-ah
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2004/11/09 13:05:34 xtraeme Exp $
-
---- target-i386/cpu.h.orig	2004-07-10 21:20:09.000000000 +0300
-+++ target-i386/cpu.h
-@@ -441,9 +441,15 @@ void cpu_x86_frstor(CPUX86State *s, uint
- /* you can call this signal handler from your SIGBUS and SIGSEGV
-    signal handlers to inform the virtual CPU of exceptions. non zero
-    is returned if the signal was handled by the virtual CPU.  */
-+#ifdef __NetBSD__
-+union siginfo;
-+int cpu_x86_signal_handler(int host_signum, union siginfo *info, 
-+                           void *puc);
-+#else
- struct siginfo;
- int cpu_x86_signal_handler(int host_signum, struct siginfo *info, 
-                            void *puc);
-+#endif
- void cpu_x86_set_a20(CPUX86State *env, int a20_state);
- 
- uint64_t cpu_get_tsc(CPUX86State *env);
diff --git a/emulators/qemu/patches/patch-ai b/emulators/qemu/patches/patch-ai
deleted file mode 100644
index 242d5610a4e..00000000000
--- a/emulators/qemu/patches/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/11/09 13:05:34 xtraeme Exp $
-
---- target-ppc/cpu.h.orig	2004-07-10 21:20:09.000000000 +0300
-+++ target-ppc/cpu.h
-@@ -182,9 +182,15 @@ void cpu_ppc_close(CPUPPCState *s);
- /* you can call this signal handler from your SIGBUS and SIGSEGV
-    signal handlers to inform the virtual CPU of exceptions. non zero
-    is returned if the signal was handled by the virtual CPU.  */
-+#ifdef __NetBSD__
-+union siginfo;
-+int cpu_ppc_signal_handler(int host_signum, union siginfo *info, 
-+                           void *puc);
-+#else
- struct siginfo;
- int cpu_ppc_signal_handler(int host_signum, struct siginfo *info, 
-                            void *puc);
-+#endif
- 
- void do_interrupt (CPUPPCState *env);
- void cpu_loop_exit(void);
diff --git a/emulators/qemu/patches/patch-aj b/emulators/qemu/patches/patch-aj
deleted file mode 100644
index 94745cabc4b..00000000000
--- a/emulators/qemu/patches/patch-aj
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-aj,v 1.7 2006/12/07 16:06:39 xtraeme Exp $
-
---- Makefile.target.orig	2006-12-07 17:03:50.000000000 +0100
-+++ Makefile.target	2006-12-07 17:05:31.000000000 +0100
-@@ -17,9 +17,9 @@
- VPATH+=:$(SRC_PATH)/linux-user
- DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
- endif
--CFLAGS=-Wall -O2 -g -fno-strict-aliasing
-+#CFLAGS=-Wall -O2 -g -fno-strict-aliasing
- #CFLAGS+=-Werror
--LDFLAGS=-g
-+#LDFLAGS=-g
- LIBS=
- HELPER_CFLAGS=$(CFLAGS)
- DYNGEN=../dyngen$(EXESUF)
-@@ -400,6 +400,7 @@
- ifndef CONFIG_SOFTMMU
- VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386-vl.ld 
- endif
-+ifndef CONFIG_DRAGONFLY
- ifndef CONFIG_DARWIN
- ifndef CONFIG_WIN32
- ifndef CONFIG_SOLARIS
-@@ -407,6 +408,7 @@
- endif
- endif
- endif
-+endif
- ifdef TARGET_GPROF
- vl.o: CFLAGS+=-p
- VL_LDFLAGS+=-p
-@@ -440,6 +442,9 @@
- sdlaudio.o: sdlaudio.c
- 	$(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<
- 
-+vl.o: vl.c
-+	$(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<
-+
- depend: $(SRCS)
- 	$(CC) -MM $(CFLAGS) $(DEFINES) $^ 1>.depend
- 
-@@ -530,7 +535,7 @@
- 
- install: all 
- ifneq ($(PROGS),)
--	$(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
-+	$(BSD_INSTALL_PROGRAM) $(PROGS) "$(bindir)"
- endif
- 
- ifneq ($(wildcard .depend),)
diff --git a/emulators/qemu/patches/patch-ak b/emulators/qemu/patches/patch-ak
deleted file mode 100644
index 5dabd7e51b8..00000000000
--- a/emulators/qemu/patches/patch-ak
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ak,v 1.9 2006/09/17 07:51:56 xtraeme Exp $
-
---- Makefile.orig	2006-07-22 19:23:34.000000000 +0200
-+++ Makefile	2006-09-17 09:43:56.000000000 +0200
-@@ -5,15 +5,15 @@
- .PHONY: all clean distclean dvi info install install-doc tar tarbin \
- 	speed test test2 html dvi info
- 
--CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
-+CFLAGS+=-Wall -O2 -fno-strict-aliasing -I.
- ifdef CONFIG_DARWIN
- CFLAGS+= -mdynamic-no-pic
- endif
- ifeq ($(ARCH),sparc)
- CFLAGS+=-mcpu=ultrasparc
- endif
--LDFLAGS=-g
--LIBS=
-+#LDFLAGS=-g
-+#LIBS=
- DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- TOOLS=qemu-img$(EXESUF)
- ifdef CONFIG_STATIC
-@@ -59,20 +59,20 @@
- common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr
- 
- install-doc: $(DOCS)
--	mkdir -p "$(DESTDIR)$(docdir)"
--	$(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
-+	$(BSD_INSTALL_MAN_DIR) "$(DESTDIR)$(docdir)"
-+	$(BSD_INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
- ifndef CONFIG_WIN32
- 	mkdir -p "$(DESTDIR)$(mandir)/man1"
- 	$(INSTALL) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
- endif
- 
- install: all $(if $(BUILD_DOCS),install-doc)
--	mkdir -p "$(DESTDIR)$(bindir)"
--	$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
--	mkdir -p "$(DESTDIR)$(datadir)"
-+	$(BSD_INSTALL_PROGRAM_DIR) $(bindir)
-+	$(BSD_INSTALL_PROGRAM) $(TOOLS) $(bindir)
-+	$(BSD_INSTALL_DATA_DIR) $(datadir)
- 	for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
- 			video.x openbios-sparc32 linux_boot.bin; do \
--		$(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
-+		$(BSD_INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
- 	done
- ifndef CONFIG_WIN32
- 	mkdir -p "$(DESTDIR)$(datadir)/keymaps"
diff --git a/emulators/qemu/patches/patch-al b/emulators/qemu/patches/patch-al
deleted file mode 100644
index 71f86322db5..00000000000
--- a/emulators/qemu/patches/patch-al
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-al,v 1.3 2006/09/05 00:44:38 xtraeme Exp $
-
---- osdep.h.orig	2006-07-22 19:23:34.000000000 +0200
-+++ osdep.h	2006-09-05 01:25:58.000000000 +0200
-@@ -2,6 +2,8 @@
- #define QEMU_OSDEP_H
- 
- #include <stdarg.h>
-+#include <sys/types.h>
-+#include <sys/signal.h>
- 
- int qemu_vsnprintf(char *buf, int buflen, const char *fmt, va_list args);
- void qemu_vprintf(const char *fmt, va_list ap);
-@@ -27,13 +29,19 @@
- 
- #include <signal.h>
- 
-+#ifndef __NetBSD__
- struct siginfo;
-+#endif
- 
- /* NOTE: it works only because the glibc sigset_t is >= kernel sigset_t */
- struct qemu_sigaction {
-     union {
-         void (*_sa_handler)(int);
-+#ifdef __NetBSD__
-+        void (*_sa_sigaction)(int, siginfo_t *, void *);
-+#else
-         void (*_sa_sigaction)(int, struct siginfo *, void *);
-+#endif
-     } _u;
-     unsigned long sa_flags;
-     void (*sa_restorer)(void);
diff --git a/emulators/qemu/patches/patch-am b/emulators/qemu/patches/patch-am
deleted file mode 100644
index af730b64475..00000000000
--- a/emulators/qemu/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 2006/01/01 13:48:45 xtraeme Exp $
-
---- audio/ossaudio.c.orig	2005-12-19 17:51:53.000000000 -0500
-+++ audio/ossaudio.c
-@@ -229,7 +229,7 @@ static int oss_open (int in, struct oss_
-         goto err;
-     }
- 
--    if (ioctl (fd, SNDCTL_DSP_NONBLOCK)) {
-+    if (ioctl (fd, SNDCTL_DSP_NONBLOCK, NULL)) {
-         oss_logerr2 (errno, typ, "Failed to set non-blocking mode\n");
-         goto err;
-     }
diff --git a/emulators/qemu/patches/patch-ao b/emulators/qemu/patches/patch-ao
deleted file mode 100644
index 84f12298f17..00000000000
--- a/emulators/qemu/patches/patch-ao
+++ /dev/null
@@ -1,138 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2006/01/01 13:48:45 xtraeme Exp $
-
---- audio/mixeng.c.orig	2005-12-19 17:51:53.000000000 -0500
-+++ audio/mixeng.c
-@@ -101,48 +101,56 @@
- #undef IN_T
- #undef SHIFT
- 
-+/*
-+ * Work around ugly XX_t #defines in NetBSD 2.x,
-+ * fixed as typedefs in NetBSD 3.x. Two macros needed to
-+ * get CPP defines expanded properly. - HF
-+ */
-+#define _NBglue(x,y,z) x ## y ## z
-+#define NBglue(x,y,z) _NBglue(x,y,z)
-+
- t_sample *mixeng_conv[2][2][2][2] = {
-     {
-         {
-             {
--                conv_natural_uint8_t_to_mono,
--                conv_natural_uint16_t_to_mono
-+		NBglue(conv_natural_, uint8_t, _to_mono), 
-+                NBglue(conv_natural_, uint16_t, _to_mono)
-             },
-             {
--                conv_natural_uint8_t_to_mono,
--                conv_swap_uint16_t_to_mono
-+                NBglue(conv_natural_, uint8_t, _to_mono),
-+                NBglue(conv_swap_, uint16_t, _to_mono)
-             }
-         },
-         {
-             {
--                conv_natural_int8_t_to_mono,
--                conv_natural_int16_t_to_mono
-+                NBglue(conv_natural_, int8_t, _to_mono),
-+                NBglue(conv_natural_, int16_t, _to_mono)
-             },
-             {
--                conv_natural_int8_t_to_mono,
--                conv_swap_int16_t_to_mono
-+                NBglue(conv_natural_, int8_t, _to_mono),
-+                NBglue(conv_swap_, int16_t, _to_mono)
-             }
-         }
-     },
-     {
-         {
-             {
--                conv_natural_uint8_t_to_stereo,
--                conv_natural_uint16_t_to_stereo
-+                NBglue(conv_natural_, uint8_t, _to_stereo),
-+                NBglue(conv_natural_, uint16_t, _to_stereo)
-             },
-             {
--                conv_natural_uint8_t_to_stereo,
--                conv_swap_uint16_t_to_stereo
-+                NBglue(conv_natural_, uint8_t, _to_stereo),
-+                NBglue(conv_swap_, uint16_t, _to_stereo)
-             }
-         },
-         {
-             {
--                conv_natural_int8_t_to_stereo,
--                conv_natural_int16_t_to_stereo
-+                NBglue(conv_natural_, int8_t, _to_stereo),
-+                NBglue(conv_natural_, int16_t, _to_stereo)
-             },
-             {
--                conv_natural_int8_t_to_stereo,
--                conv_swap_int16_t_to_stereo
-+                NBglue(conv_natural_, int8_t, _to_stereo),
-+                NBglue(conv_swap_, int16_t, _to_stereo)
-             }
-         }
-     }
-@@ -152,44 +160,44 @@ f_sample *mixeng_clip[2][2][2][2] = {
-     {
-         {
-             {
--                clip_natural_uint8_t_from_mono,
--                clip_natural_uint16_t_from_mono
-+                NBglue(clip_natural_, uint8_t, _from_mono),
-+                NBglue(clip_natural_, uint16_t, _from_mono)
-             },
-             {
--                clip_natural_uint8_t_from_mono,
--                clip_swap_uint16_t_from_mono
-+                NBglue(clip_natural_, uint8_t, _from_mono),
-+                NBglue(clip_swap_, uint16_t, _from_mono)
-             }
-         },
-         {
-             {
--                clip_natural_int8_t_from_mono,
--                clip_natural_int16_t_from_mono
-+                NBglue(clip_natural_, int8_t, _from_mono),
-+                NBglue(clip_natural_, int16_t, _from_mono)
-             },
-             {
--                clip_natural_int8_t_from_mono,
--                clip_swap_int16_t_from_mono
-+                NBglue(clip_natural_, int8_t, _from_mono),
-+                NBglue(clip_swap_, int16_t, _from_mono)
-             }
-         }
-     },
-     {
-         {
-             {
--                clip_natural_uint8_t_from_stereo,
--                clip_natural_uint16_t_from_stereo
-+                NBglue(clip_natural_, uint8_t, _from_stereo),
-+                NBglue(clip_natural_, uint16_t, _from_stereo)
-             },
-             {
--                clip_natural_uint8_t_from_stereo,
--                clip_swap_uint16_t_from_stereo
-+                NBglue(clip_natural_, uint8_t, _from_stereo),
-+                NBglue(clip_swap_, uint16_t, _from_stereo)
-             }
-         },
-         {
-             {
--                clip_natural_int8_t_from_stereo,
--                clip_natural_int16_t_from_stereo
-+                NBglue(clip_natural_, int8_t, _from_stereo),
-+                NBglue(clip_natural_, int16_t, _from_stereo)
-             },
-             {
--                clip_natural_int8_t_from_stereo,
--                clip_swap_int16_t_from_stereo
-+                NBglue(clip_natural_, int8_t, _from_stereo),
-+                NBglue(clip_swap_, int16_t, _from_stereo)
-             }
-         }
-     }
diff --git a/emulators/qemu/patches/patch-ap b/emulators/qemu/patches/patch-ap
deleted file mode 100644
index 24c6b899427..00000000000
--- a/emulators/qemu/patches/patch-ap
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ap,v 1.5 2006/01/01 19:12:54 hubertf Exp $
-
---- target-sparc/cpu.h.orig	2005-12-19 23:51:53.000000000 +0100
-+++ target-sparc/cpu.h
-@@ -269,8 +269,13 @@ void cpu_set_cwp(CPUSPARCState *env1, in
-     } while (0)
- #endif
- 
-+#ifdef __NetBSD__
-+union siginfo;
-+int cpu_sparc_signal_handler(int hostsignum, union siginfo *info, void *puc);
-+#else
- struct siginfo;
- int cpu_sparc_signal_handler(int hostsignum, struct siginfo *info, void *puc);
-+#endif
- 
- #include "cpu-all.h"
- 
diff --git a/emulators/qemu/patches/patch-as b/emulators/qemu/patches/patch-as
deleted file mode 100644
index ddb9dd2ae3a..00000000000
--- a/emulators/qemu/patches/patch-as
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-as,v 1.1 2004/11/15 15:38:15 soren Exp $
-
---- hw/ide.c	9 Nov 2004 22:04:05 -0000	1.29
-+++ hw/ide.c	15 Nov 2004 15:34:50 -0000
-@@ -1895,7 +1895,9 @@
-                     s->heads = 16;
-                     s->sectors = 63;
-                 }
-+#if 0
-                 bdrv_set_geometry_hint(s->bs, s->cylinders, s->heads, s->sectors);
-+#endif
-             }
-             if (bdrv_get_type_hint(s->bs) == BDRV_TYPE_CDROM) {
-                 s->is_cdrom = 1;
diff --git a/emulators/qemu/patches/patch-at b/emulators/qemu/patches/patch-at
deleted file mode 100644
index 244709232e3..00000000000
--- a/emulators/qemu/patches/patch-at
+++ /dev/null
@@ -1,17 +0,0 @@
---- target-sparc/op_helper.c.orig	2006-07-22 17:23:34.000000000 +0000
-+++ target-sparc/op_helper.c	2007-01-05 21:51:15.000000000 +0000
-@@ -12,12 +12,12 @@
- #ifdef USE_INT_TO_FLOAT_HELPERS
- void do_fitos(void)
- {
--    FT0 = int32_to_float32(*((int32_t *)&FT1));
-+    FT0 = int32_to_float32(*((int32_t *)&FT1), &env->fp_status);
- }
- 
- void do_fitod(void)
- {
--    DT0 = int32_to_float64(*((int32_t *)&FT1));
-+    DT0 = int32_to_float64(*((int32_t *)&FT1), &env->fp_status);
- }
- #endif
- 
diff --git a/emulators/qemu/patches/patch-au b/emulators/qemu/patches/patch-au
deleted file mode 100644
index 6d025e96bdc..00000000000
--- a/emulators/qemu/patches/patch-au
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-au,v 1.2 2006/05/06 18:09:53 xtraeme Exp $
-
---- fpu/softfloat-native.h.orig	2006-05-03 22:32:58.000000000 +0200
-+++ fpu/softfloat-native.h	2006-05-06 19:49:25.000000000 +0200
-@@ -33,6 +33,14 @@
- #define isunordered(x,y)        unordered(x, y)
- #endif
- 
-+#ifdef __NetBSD__
-+#define isgreater(x, y)	__builtin_isgreater(x, y)
-+#define isgreaterequal(x, y)	__builtin_isgreaterequal(x, y)
-+#define isless(x, y)		__builtin_isless(x, y)
-+#define islessequal(x, y)	__builtin_islessequal(x, y)
-+#define isunordered(x, y)	__builtin_isunordered(x, y)
-+#endif
-+
- typedef float float32;
- typedef double float64;
- #ifdef FLOATX80
diff --git a/emulators/qemu/patches/patch-aw b/emulators/qemu/patches/patch-aw
deleted file mode 100644
index 82ec52ee810..00000000000
--- a/emulators/qemu/patches/patch-aw
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aw,v 1.2 2007/01/06 21:21:35 xtraeme Exp $
-
-Workaround for x86_64 target, patch from Hubert Feyrer.
-
-Index: dyngen.c
-===================================================================
-RCS file: /cvsroot/qemu/qemu/dyngen.c,v
-retrieving revision 1.40
-diff -u -r1.40 dyngen.c
---- dyngen.c.orig	2007-01-05 20:32:17.000000000 +0000
-+++ dyngen.c	2007-01-05 20:36:45.000000000 +0000
-@@ -1624,6 +1624,7 @@
-                 if(!sym_name)
-                     continue;
-                 if (*sym_name && 
-+                    !strstart(sym_name, "bswap64", NULL) && /* HF hack */
-                     !strstart(sym_name, "__op_param", NULL) &&
-                     !strstart(sym_name, "__op_jmp", NULL) &&
-                     !strstart(sym_name, "__op_gen_label", NULL)) {
-@@ -1647,6 +1648,9 @@
- 				 */
- 				fprintf(outfile, "    extern char %s;\n",
- 					sym_name);
-+#elif defined(HOST_PPC)
-+                    if(strcmp("bswap32", sym_name))
-+                        fprintf(outfile, "extern char %s;\n", sym_name);
- #else
-                     fprintf(outfile, "extern char %s;\n", sym_name);
- #endif
diff --git a/emulators/qemu/patches/patch-ax b/emulators/qemu/patches/patch-ax
deleted file mode 100644
index 37a30212fae..00000000000
--- a/emulators/qemu/patches/patch-ax
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ax,v 1.3 2006/01/06 09:17:03 xtraeme Exp $
-
---- target-i386/op.c.orig	2006-01-06 05:10:30.000000000 +0100
-+++ target-i386/op.c
-@@ -2099,14 +2099,17 @@ void OPPROTO op_fdivr_STN_ST0(void)
- }
- 
- /* misc FPU operations */
-+
-+void fchs_dummy() {ST0 = floatx_chs(ST0);}
- void OPPROTO op_fchs_ST0(void)
- {
--    ST0 = floatx_chs(ST0);
-+    fchs_dummy();
- }
- 
-+void fabs_dummy() {ST0 = floatx_abs(ST0);}
- void OPPROTO op_fabs_ST0(void)
- {
--    ST0 = floatx_abs(ST0);
-+    fabs_dummy();
- }
- 
- void OPPROTO op_fxam_ST0(void)
diff --git a/emulators/qemu/patches/patch-ay b/emulators/qemu/patches/patch-ay
deleted file mode 100644
index 4636f8023a5..00000000000
--- a/emulators/qemu/patches/patch-ay
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ay,v 1.6 2006/12/07 16:06:39 xtraeme Exp $
-
---- block.c.orig	2006-12-06 21:23:19.000000000 +0100
-+++ block.c	2006-12-06 21:24:04.000000000 +0100
-@@ -29,8 +29,10 @@
- #include <sys/stat.h>
- #include <sys/ioctl.h>
- #include <sys/queue.h>
-+#ifndef __DragonFly__
- #include <sys/disk.h>
- #endif
-+#endif
- 
- #ifdef CONFIG_COCOA
- #include <paths.h>
diff --git a/emulators/raine/DESCR b/emulators/raine/DESCR
deleted file mode 100644
index 30fc5d7282f..00000000000
--- a/emulators/raine/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Raine is an emulator, it emulates some M68000 and M68020 arcade games and is
-mainly focused on Taito and Jaleco games hardware. It started as an experiment
-with the Rainbow Islands romset, dumped by Aracorn/Romlist. Raine can emulate
-many nice games now, including new additions from Cave and other companies.
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
deleted file mode 100644
index 321f00d5f44..00000000000
--- a/emulators/raine/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/02/19 19:14:59 joerg Exp $
-#
-
-DISTNAME=	raines-0.43.3
-PKGNAME=	${DISTNAME:S/raines/raine/}
-CATEGORIES=	emulators
-MASTER_SITES=	http://www.rainemu.com/html/archive/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.rainemu.com/
-COMMENT=	680x0 Arcade Emulator
-
-BUILD_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
-
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-USE_TOOLS+=	gmake perl:run pkg-config
-MAKE_FILE=	makefile
-MAKE_ENV+=	OSTYPE=linux
-REPLACE_PERL=	makedep
-PTHREAD_OPTS+=	require
-
-USE_DIRS+=	xdg-1.1
-
-# XXX Really?
-ONLY_FOR_PLATFORM=  *-*-i386
-
-post-build:
-	(${ECHO} "#!${SH}";					\
-	 ${ECHO} "cd ${PREFIX}/share/raine && ./raine $$@")	\
-		> ${WRKSRC}/raine.sh
-
-post-install:
-	${MV} ${PREFIX}/bin/raine ${PREFIX}/share/raine
-	${INSTALL_SCRIPT} ${WRKSRC}/raine.sh ${PREFIX}/bin/raine
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/allegro/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/raine/PLIST b/emulators/raine/PLIST
deleted file mode 100644
index 81defa4cf25..00000000000
--- a/emulators/raine/PLIST
+++ /dev/null
@@ -1,38 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/07/17 20:21:35 wiz Exp $
-bin/raine
-share/applications/raine.desktop
-share/pixmaps/raine.png
-share/raine/cheats.cfg
-share/raine/hiscore.dat
-share/raine/languages/brasil.cfg
-share/raine/languages/catala.cfg
-share/raine/languages/czech.cfg
-share/raine/languages/dansk.cfg
-share/raine/languages/dutch.cfg
-share/raine/languages/english.cfg
-share/raine/languages/espanol.cfg
-share/raine/languages/euskera.cfg
-share/raine/languages/finnish.cfg
-share/raine/languages/french.cfg
-share/raine/languages/french2.cfg
-share/raine/languages/galego.cfg
-share/raine/languages/german.cfg
-share/raine/languages/german2.cfg
-share/raine/languages/italian.cfg
-share/raine/languages/japanese.cfg
-share/raine/languages/polish.cfg
-share/raine/languages/portugal.cfg
-share/raine/languages/spanish.cfg
-share/raine/languages/svenska.cfg
-share/raine/languages/template.cfg
-share/raine/languages/turkish.cfg
-share/raine/raine
-share/raine/raine.dat
-@exec ${MKDIR} %D/share/raine/roms
-@dirrm share/raine/roms
-@dirrm share/raine/languages
-@exec ${MKDIR} %D/share/raine/emudx
-@dirrm share/raine/emudx
-@exec ${MKDIR} %D/share/raine/artwork
-@dirrm share/raine/artwork
-@dirrm share/raine
diff --git a/emulators/raine/distinfo b/emulators/raine/distinfo
deleted file mode 100644
index 2254ebc1b69..00000000000
--- a/emulators/raine/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.6 2006/07/17 20:21:35 wiz Exp $
-
-SHA1 (raines-0.43.3.tar.bz2) = a6c9fa7b63aadca8f5a76ba71532c0502854188b
-RMD160 (raines-0.43.3.tar.bz2) = c245930880cada5f965caf7a9f2d4d9301912b82
-Size (raines-0.43.3.tar.bz2) = 1740971 bytes
-SHA1 (patch-aa) = ee9d56cfc6b157b3b4a8d77547cf093688b6079e
-SHA1 (patch-ab) = 9143d9f43150ec033d7a72d288256d0c759665d6
-SHA1 (patch-ac) = 82f0bc91dc840b250ec45899306c19b56f98a7ed
diff --git a/emulators/raine/patches/patch-aa b/emulators/raine/patches/patch-aa
deleted file mode 100644
index f12dc307efc..00000000000
--- a/emulators/raine/patches/patch-aa
+++ /dev/null
@@ -1,144 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/07/17 20:21:35 wiz Exp $
-
---- makefile.orig	2006-05-26 12:12:22.000000000 +0000
-+++ makefile
-@@ -25,35 +25,6 @@ VERSION = "0.43.3"
- # Use asm video core ? (comment to use C core)
- ASM_VIDEO_CORE = 1
- 
--# Try to detect mingw... If you want to build the dos and the mingw
--# version on the same system you should unset djdir before making
--# the mingw version.
--ifeq ("$(shell uname)","Linux")
--OSTYPE=linux-gnu
--endif
--
--ifeq ("$(shell uname)","FreeBSD")
--OSTYPE=linux-gnu
--endif
--
--ifeq ("$(OSTYPE)","msys")
--MINGDIR=1
--OSTYPE=mingw32
--ifeq (`nasm -r`,)
--ifdef VERBOSE
--ASM=nasmw
--else
--ASM=@nasmw
--endif
--else
--ifdef VERBOSE
--ASM=nasm
--else
--ASM=@nasm
--endif
--endif
--endif
--
- ifdef mingdir
- MINGDIR=1
- endif
-@@ -123,8 +94,8 @@ RAINE32 = 1
- DEFINE = -D__RAINE__ \
- 	   -DRAINE_WIN32 \
- 
--   PNG_LFLAGS = "$(shell libpng-config --ldflags)"
--   PNG_STATIC_LFLAGS = "$(shell libpng-config --static --ldflags)"
-+   PNG_LFLAGS = "$(shell pkg-config --libs libpng12)"
-+   PNG_STATIC_LFLAGS = "$(shell pkg-config --libs --static libpng12)"
-    LIBS = -lz -lalleg $(PNG_LFAGS)
-    LIBS_STATIC = -lz -lalleg_s -lkernel32 -luser32 -lgdi32 -lcomdlg32 \
-    -lole32 -ldinput -lddraw -ldxguid -lwinmm -ldsound \
-@@ -153,9 +124,9 @@ endif
- 
-    AFLAGS = -f coff
- 
--   PNG_CFLAGS = "$(shell libpng-config --cflags)"
--   PNG_LFAGS = "$(shell libpng-config --ldflags)"
--   PNG_STATIC_LFLAGS = "$(shell libpng-config --static --ldflags)"
-+   PNG_CFLAGS = "$(shell pkg-config --cflags libpng12)"
-+   PNG_LFAGS = "$(shell pkg-config --cflags libpng12)"
-+   PNG_STATIC_LFLAGS = "$(shell pkg-config --cflags --static libpng12)"
-    INCDIR += $(PNG_CFLAGS)
-    DEFINE = -D__RAINE__ \
- 	   -DRAINE_WIN32 \
-@@ -214,7 +185,7 @@ else
- 
-    AFLAGS = -f elf
- 
--   PNG_CFLAGS = "$(shell libpng-config --cflags)"
-+   PNG_CFLAGS = "$(shell pkg-config --cflags libpng12)"
- ifndef SDL
- ALLEGRO_CFLAGS = "$(shell allegro-config --cflags)"
- endif
-@@ -226,9 +197,9 @@ endif
-    DEFINE = -D__RAINE__ \
- 	   -DRAINE_UNIX \
- 
--   LIBS = -lz `allegro-config --libs` `libpng-config --ldflags`
--   LIBS_DEBUG = -lz `allegro-config --libs ` `libpng-config --ldflags` # -lefence
--   LIBS_STATIC = -lz `allegro-config --static` `libpng-config --static --ldflags`
-+   LIBS = -lz `allegro-config --libs` `pkg-config --libs libpng12`
-+   LIBS_DEBUG = -lz `allegro-config --libs ` `pkg-config --libs libpng12` # -lefence
-+   LIBS_STATIC = -lz `allegro-config --static` `pkg-config --static --libs libpng12`
- 
- ifeq ("$(shell if [ -e /usr/include/vga.h ] || [ -e /usr/local/include/vga.h ]; then echo yes; fi)","yes")
- GFX_SVGALIB=1
-@@ -838,13 +809,13 @@ LIBS += `sdl-config --libs`
- endif
- endif
- 
--all:	cpuinfo message maketree depend $(RAINE_EXE)
-+all:	message maketree depend $(RAINE_EXE)
- 
- depend:
- 	@echo dependencies : if you get an error here, install the required dev package
- ifndef RAINE_DOS
- 	@echo -n libpng:
--	@libpng-config --version
-+	@pkg-config --version libpng12
- 	@echo -n sdl:
- 	@sdl-config --version
- endif
-@@ -1048,11 +1019,7 @@ dep: make.dep
- make.dep:
- 	./makedep $(OBJDIR) $(OBJS) > make.dep
- 
--cpuinfo:
--	@sh ./detect-cpu
--
- include make.dep
--include cpuinfo
- 
- # create directories
- 
-@@ -1090,18 +1057,22 @@ vclean:
- install: install_dirs $(RAINE_LNG) $(RAINE_EXE)
- ifdef RAINE_UNIX
- 
--	$(INSTALL_BIN) $(RAINE_EXE) $(bindir)
--	$(INSTALL_DATA) $(RAINE_DAT) $(rainedata)
-+	$(BSD_INSTALL_PROGRAM) $(RAINE_EXE) $(bindir)
-+	$(BSD_INSTALL_DATA) $(RAINE_DAT) $(rainedata)
- 	sh -c "if [ -f hiscore.dat ]; then $(INSTALL_DATA) hiscore.dat $(rainedata); fi"
--	$(INSTALL_DATA) config/cheats.cfg $(rainedata)
--	$(INSTALL_DATA) raine.desktop $(prefix)/usr/share/applications
--	$(INSTALL_DATA) raine.png $(prefix)/usr/share/pixmaps
-+	$(BSD_INSTALL_DATA) config/cheats.cfg $(rainedata)
-+	$(BSD_INSTALL_DATA) raine.desktop $(PREFIX)/share/applications
-+	$(BSD_INSTALL_DATA) raine.png $(PREFIX)/share/pixmaps
- 
- install_dirs:
--	$(MD) -pv $(bindir) $(rainedata) $(langdir) $(romdir) $(artdir) $(emudxdir) $(prefix)/usr/share/applications $(prefix)/usr/share/pixmaps
-+	$(BSD_INSTALL_DATA_DIR) $(rainedata)
-+	$(BSD_INSTALL_DATA_DIR) $(langdir)
-+	$(BSD_INSTALL_DATA_DIR) $(romdir)
-+	$(BSD_INSTALL_DATA_DIR) $(artdir)
-+	$(BSD_INSTALL_DATA_DIR) $(emudxdir)
- 
- $(RAINE_LNG):
--	$(INSTALL_DATA) config/language/$@ $(langdir)
-+	$(BSD_INSTALL_DATA) config/language/$@ $(langdir)
- 
- else
- 	@echo There is no needs to install for a win32/dos system
diff --git a/emulators/raine/patches/patch-ab b/emulators/raine/patches/patch-ab
deleted file mode 100644
index fc7f218e2e6..00000000000
--- a/emulators/raine/patches/patch-ab
+++ /dev/null
@@ -1,150 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/07/17 20:21:35 wiz Exp $
-
---- source/unzip.h.orig	2004-08-17 16:44:40.000000000 +0200
-+++ source/unzip.h
-@@ -142,9 +142,9 @@ typedef struct unz_file_info_s
-     tm_unz tmu_date;
- } unz_file_info;
- 
--extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
-+extern int ZEXPORT unzStringFileNameCompare (const char* fileName1,
- 												 const char* fileName2,
--												 int iCaseSensitivity));
-+ int iCaseSensitivity);
- /*
-    Compare two filename (fileName1,fileName2).
-    If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-@@ -155,7 +155,7 @@ extern int ZEXPORT unzStringFileNameComp
- */
- 
- 
--extern unzFile ZEXPORT unzOpen OF((const char *path));
-+extern unzFile ZEXPORT unzOpen (const char *path);
- /*
-   Open a Zip file. path contain the full pathname (by example,
-      on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer
-@@ -166,24 +166,24 @@ extern unzFile ZEXPORT unzOpen OF((const
- 	   of this unzip package.
- */
- 
--extern int ZEXPORT unzClose OF((unzFile file));
-+extern int ZEXPORT unzClose (unzFile file);
- /*
-   Close a ZipFile opened with unzipOpen.
-   If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-     these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-   return UNZ_OK if there is no problem. */
- 
--extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
--					unz_global_info *pglobal_info));
-+extern int ZEXPORT unzGetGlobalInfo (unzFile file,
-+					unz_global_info *pglobal_info);
- /*
-   Write info about the ZipFile in the *pglobal_info structure.
-   No preparation of the structure is needed
-   return UNZ_OK if there is no problem. */
- 
- 
--extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
-+extern int ZEXPORT unzGetGlobalComment (unzFile file,
- 										   char *szComment,
--					   uLong uSizeBuf));
-+					   uLong uSizeBuf);
- /*
-   Get the global comment string of the ZipFile, in the szComment buffer.
-   uSizeBuf is the size of the szComment buffer.
-@@ -194,22 +194,22 @@ extern int ZEXPORT unzGetGlobalComment O
- /***************************************************************************/
- /* Unzip package allow you browse the directory of the zipfile */
- 
--extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
-+extern int ZEXPORT unzGoToFirstFile (unzFile file);
- /*
-   Set the current file of the zipfile to the first file.
-   return UNZ_OK if there is no problem
- */
- 
--extern int ZEXPORT unzGoToNextFile OF((unzFile file));
-+extern int ZEXPORT unzGoToNextFile (unzFile file);
- /*
-   Set the current file of the zipfile to the next file.
-   return UNZ_OK if there is no problem
-   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
- */
- 
--extern int ZEXPORT unzLocateFile OF((unzFile file, 
-+extern int ZEXPORT unzLocateFile (unzFile file, 
- 				     const char *szFileName,
--				     int iCaseSensitivity));
-+				     int iCaseSensitivity);
- /*
-   Try locate the file szFileName in the zipfile.
-   For the iCaseSensitivity signification, see unzStringFileNameCompare
-@@ -220,14 +220,14 @@ extern int ZEXPORT unzLocateFile OF((unz
- */
- 
- 
--extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
-+extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
- 					     unz_file_info *pfile_info,
- 					     char *szFileName,
- 					     uLong fileNameBufferSize,
- 					     void *extraField,
- 					     uLong extraFieldBufferSize,
- 					     char *szComment,
--					     uLong commentBufferSize));
-+					     uLong commentBufferSize);
- /*
-   Get Info about the current file
-   if pfile_info!=NULL, the *pfile_info structure will contain somes info about
-@@ -246,22 +246,22 @@ extern int ZEXPORT unzGetCurrentFileInfo
-    from it, and close it (you can close it before reading all the file)
-    */
- 
--extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
-+extern int ZEXPORT unzOpenCurrentFile (unzFile file);
- /*
-   Open for reading data the current file in the zipfile.
-   If there is no error, the return value is UNZ_OK.
- */
- 
--extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
-+extern int ZEXPORT unzCloseCurrentFile (unzFile file);
- /*
-   Close the file in zip opened with unzOpenCurrentFile
-   Return UNZ_CRCERROR if all the file was read but the CRC is not good
- */
- 
- 												
--extern int ZEXPORT unzReadCurrentFile OF((unzFile file, 
-+extern int ZEXPORT unzReadCurrentFile (unzFile file, 
- 					  voidp buf,
--					  unsigned len));
-+					  unsigned len);
- /*
-   Read bytes from the current file (opened by unzOpenCurrentFile)
-   buf contain buffer where data must be copied
-@@ -273,19 +273,19 @@ extern int ZEXPORT unzReadCurrentFile OF
-     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
- */
- 
--extern z_off_t ZEXPORT unztell OF((unzFile file));
-+extern z_off_t ZEXPORT unztell (unzFile file);
- /*
-   Give the current position in uncompressed data
- */
- 
--extern int ZEXPORT unzeof OF((unzFile file));
-+extern int ZEXPORT unzeof (unzFile file);
- /*
-   return 1 if the end of file was reached, 0 elsewhere 
- */
- 
--extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
-+extern int ZEXPORT unzGetLocalExtrafield (unzFile file,
- 											 voidp buf,
--											 unsigned len));
-+					 unsigned len);
- /*
-   Read extra field from the current file (opened by unzOpenCurrentFile)
-   This is the local-header version of the extra field (sometimes, there is
diff --git a/emulators/raine/patches/patch-ac b/emulators/raine/patches/patch-ac
deleted file mode 100644
index c0a9279487f..00000000000
--- a/emulators/raine/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2006/07/17 20:21:35 wiz Exp $
-
---- source/unzip.c.orig	2004-08-17 16:44:40.000000000 +0200
-+++ source/unzip.c
-@@ -493,7 +493,7 @@ local void unzlocal_DosDateToTmuDate (ul
- /*
-   Get Info about the current file in the zipfile, with internal only info
- */
--local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
-+local int unzlocal_GetCurrentFileInfoInternal (unzFile file,
-                                                   unz_file_info *pfile_info,
-                                                   unz_file_info_internal 
-                                                   *pfile_info_internal,
-@@ -502,7 +502,7 @@ local int unzlocal_GetCurrentFileInfoInt
-                                                   void *extraField,
- 												  uLong extraFieldBufferSize,
-                                                   char *szComment,
--												  uLong commentBufferSize));
-+												  uLong commentBufferSize);
- 
- local int unzlocal_GetCurrentFileInfoInternal (file,
-                                               pfile_info,
diff --git a/emulators/simh/DESCR b/emulators/simh/DESCR
deleted file mode 100644
index b0054bc752a..00000000000
--- a/emulators/simh/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Bob Supnik's historical computer simulator, including:
-
-	altair altairz80 eclipse gri h316 hp2100 i1401 i1620 ibm1130 id16 id32
-	nova pdp1 pdp10 pdp11 pdp15 pdp4 pdp7 pdp8 pdp9 s3 sds vax
-
-See http://www.netbsd.org/Ports/vax/emulator-howto.html on how to install
-NetBSD/vax on simh!
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
deleted file mode 100644
index 72084fd5261..00000000000
--- a/emulators/simh/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2006/04/06 06:21:59 reed Exp $
-#
-
-DISTNAME=	simhv33-0
-PKGNAME=	simh-3.3.0
-PKGREVISION=	1
-CATEGORIES=	emulators
-MASTER_SITES=	http://simh.trailing-edge.com/sources/
-EXTRACT_SUFX=	.zip
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://simh.trailing-edge.com/
-COMMENT=	Bob Supnik's historical computer simulator
-
-BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.6
-
-EXTRACT_OPTS_ZIP=	-aoq
-WRKSRC=			${WRKDIR}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${MACHINE_ARCH} == "arm")
-.if (${CFLAGS:M-O2} == "-O2")
-CFLAGS:=	${CFLAGS:S/-O2//}
-.endif
-.endif
-
-INSTALLATION_DIRS=	bin
-
-post-extract:
-	${MKDIR} ${WRKSRC}/BIN
-	${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
-
-do-install:
-	(cd ${WRKSRC}/BIN && for BIN in *; do				\
-		${INSTALL_PROGRAM} $$BIN ${PREFIX}/bin/simh-$$BIN;	\
-	done)
-	${INSTALL_DATA_DIR} ${PREFIX}/share/simh
-	${INSTALL_DATA} ${WRKSRC}/VAX/ka655.bin ${PREFIX}/share/simh
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/simh
-	(cd ${WRKSRC} && for TXT in *.txt */*.txt; do			\
-		${INSTALL_DATA} $$TXT ${PREFIX}/share/doc/simh;		\
-	done)
-
-.include "../../net/libpcap/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/simh/PLIST b/emulators/simh/PLIST
deleted file mode 100644
index 37d68c46102..00000000000
--- a/emulators/simh/PLIST
+++ /dev/null
@@ -1,62 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2004/12/22 21:07:01 skrll Exp $
-bin/simh-altair
-bin/simh-altairz80
-bin/simh-eclipse
-bin/simh-gri
-bin/simh-h316
-bin/simh-hp2100
-bin/simh-i1401
-bin/simh-i1620
-bin/simh-ibm1130
-bin/simh-id16
-bin/simh-id32
-bin/simh-lgp
-bin/simh-nova
-bin/simh-pdp1
-bin/simh-pdp10
-bin/simh-pdp11
-bin/simh-pdp15
-bin/simh-pdp4
-bin/simh-pdp7
-bin/simh-pdp8
-bin/simh-pdp9
-bin/simh-s3
-bin/simh-sds
-bin/simh-vax
-share/doc/simh/0readme_33.txt
-share/doc/simh/0readme_ethernet.txt
-share/doc/simh/altair.txt
-share/doc/simh/altairz80_doc.txt
-share/doc/simh/eclipse.txt
-share/doc/simh/gri_doc.txt
-share/doc/simh/h316_doc.txt
-share/doc/simh/haltguide.txt
-share/doc/simh/hp2100_diag.txt
-share/doc/simh/hp2100_doc.txt
-share/doc/simh/i1401_doc.txt
-share/doc/simh/i1620_doc.txt
-share/doc/simh/id_diag.txt
-share/doc/simh/id_doc.txt
-share/doc/simh/lgp_doc.txt
-share/doc/simh/nova_doc.txt
-share/doc/simh/pdp10_diag.txt
-share/doc/simh/pdp10_doc.txt
-share/doc/simh/pdp11_doc.txt
-share/doc/simh/pdp18b_diag.txt
-share/doc/simh/pdp18b_doc.txt
-share/doc/simh/pdp1_doc.txt
-share/doc/simh/pdp8_doc.txt
-share/doc/simh/readme1130.txt
-share/doc/simh/readme_s3.txt
-share/doc/simh/readme_update.txt
-share/doc/simh/sds_diag.txt
-share/doc/simh/sds_doc.txt
-share/doc/simh/simh_doc.txt
-share/doc/simh/simh_faq.txt
-share/doc/simh/simh_swre.txt
-share/doc/simh/system3.txt
-share/doc/simh/vax780_doc.txt
-share/doc/simh/vax_doc.txt
-share/simh/ka655.bin
-@dirrm share/simh
-@dirrm share/doc/simh
diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
deleted file mode 100644
index 8a20309c868..00000000000
--- a/emulators/simh/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.12 2005/02/23 18:49:20 agc Exp $
-
-SHA1 (simhv33-0.zip) = 99a021afe2fd8dfb32bb479e383347e2b883e0f9
-RMD160 (simhv33-0.zip) = 778cc7836b4558b57f1b9ca54427f3d2e8da94a4
-Size (simhv33-0.zip) = 2153444 bytes
-SHA1 (patch-aa) = a1c1e10f81b5883c5388084d1b9f31d3560353fe
-SHA1 (patch-ab) = aff84028d4184b773b2bd4ebf2ee166357f18924
-SHA1 (patch-ac) = 0f1ddee6f69c0337c8ea02cf24ed6fdecc0ca1f4
diff --git a/emulators/simh/patches/patch-aa b/emulators/simh/patches/patch-aa
deleted file mode 100644
index 402c4d444a9..00000000000
--- a/emulators/simh/patches/patch-aa
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2004/12/22 21:07:01 skrll Exp $
-
---- Makefile.orig	2004-10-30 18:32:50.000000000 +0100
-+++ Makefile
-@@ -3,28 +3,30 @@
- # Note: -O2 is sometimes broken in GCC when setjump/longjump is being
- # used. Try -O2 only with released simulators.
- #
--ifeq ($(WIN32),)
-+#ifeq ($(WIN32),)
- #Unix Environments
--ifeq ($(OSTYPE),solaris)
--OS_CCDEFS = -lsocket -lnsl -lpthread -D_GNU_SOURCE
--else
--OS_CCDEFS = -D_GNU_SOURCE
--endif
--CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I .
--ifeq ($(USE_NETWORK),)
--else
--NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
--endif
--else
-+#ifeq ($(OSTYPE),solaris)
-+#OS_CCDEFS = -lsocket -lnsl -lpthread -D_GNU_SOURCE
-+#else
-+#OS_CCDEFS = -D_GNU_SOURCE
-+#endif
-+#CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I .
-+CC = gcc -O2 -g -lm -I . -DDONT_USE_PCAP_FINDALLDEVS -DNEED_PCAP_SENDPACKET
-+#ifeq ($(USE_NETWORK),)
-+#else
-+#NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
-+NETWORK_OPT = -DUSE_NETWORK -lpcap
-+#endif
-+#else
- #Win32 Environments
--LDFLAGS = -lm -lwsock32
--CC = gcc -std=c99 -U__STRICT_ANSI__ -O0 -I.
--EXE = .exe
--ifeq ($(USE_NETWORK),)
--else
--NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
--endif
--endif
-+#LDFLAGS = -lm -lwsock32
-+#CC = gcc -std=c99 -U__STRICT_ANSI__ -O0 -I.
-+#EXE = .exe
-+#ifeq ($(USE_NETWORK),)
-+#else
-+#NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
-+#endif
-+#endif
- 
- 
- #
-@@ -252,11 +254,11 @@ ALL = ${BIN}pdp1${EXE} ${BIN}pdp4${EXE} 
- all : ${ALL}
- 
- clean :
--ifeq ($(WIN32),)
-+#ifeq ($(WIN32),)
- 	${RM} ${ALL}
--else
--	if exist BIN\*.exe del /q BIN\*.exe
--endif
-+#else
-+#	if exist BIN\*.exe del /q BIN\*.exe
-+#endif
- #
- # Individual builds
- #
diff --git a/emulators/simh/patches/patch-ab b/emulators/simh/patches/patch-ab
deleted file mode 100644
index 11179bfc0b0..00000000000
--- a/emulators/simh/patches/patch-ab
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2004/12/22 21:07:01 skrll Exp $
-
---- sim_ether.c.orig	2004-03-31 13:38:58.000000000 +0100
-+++ sim_ether.c
-@@ -830,6 +830,15 @@ void eth_callback(u_char* info, const st
-     tmp_packet.len = header->len;
-     memcpy(tmp_packet.msg, data, header->len);
- 
-+    /*
-+     * Pad packet to minimum ethernet len, in case it comes from the local
-+     * host.
-+     */
-+    if (header->len < 60) {
-+        tmp_packet.len = 60;
-+        memset(dev->read_packet->msg + header->len, 0, 60 - header->len);
-+    }
-+
-     eth_packet_trace (dev, tmp_packet.msg, tmp_packet.len, "rcvqd");
- 
-     pthread_mutex_lock (&dev->lock);
-@@ -840,6 +849,15 @@ void eth_callback(u_char* info, const st
-     dev->read_packet->len = header->len;
-     memcpy(dev->read_packet->msg, data, header->len);
- 
-+    /*
-+     * Pad packet to minimum ethernet len, in case it comes from the local
-+     * host.
-+     */
-+    if (header->len <60) {
-+        dev->read_packet->len = 60;
-+        memset(dev->read_packet->msg + header->len, 0, 60 - header->len);
-+    }
-+
-     eth_packet_trace (dev, dev->read_packet->msg, dev->read_packet->len, "reading");
- 
-     /* call optional read callback function */
-@@ -1080,8 +1098,10 @@ int eth_host_devices(int used, int max, 
- 
- int eth_devices(int max, ETH_LIST* list)
- {
-+#ifndef DONT_USE_PCAP_FINDALLDEVS
-   pcap_if_t* alldevs;
-   pcap_if_t* dev;
-+#endif
-   int i = 0;
-   char errbuf[PCAP_ERRBUF_SIZE];
- 
diff --git a/emulators/simh/patches/patch-ac b/emulators/simh/patches/patch-ac
deleted file mode 100644
index 02ef9cec68d..00000000000
--- a/emulators/simh/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2004/12/22 21:07:01 skrll Exp $
-
---- sim_console.c.orig	2004-11-05 19:39:24.000000000 +0000
-+++ sim_console.c
-@@ -347,13 +347,13 @@ for (i = 0; i < sec; i++) {				/* loop *
- 	if (tmxr_poll_conn (&sim_con_tmxr) >= 0) {	/* poll connect */
- 	    sim_con_ldsc.rcve = 1;			/* rcv enabled */
- 	    if (i) {					/* if delayed */
--		printf ("Running\n");			/* print transition */
-+		printf ("Running\r\n");			/* print transition */
- 		fflush (stdout);  }
- 	    return SCPE_OK;  }				/* ready to proceed */
- 	c = sim_os_poll_kbd ();				/* check for stop char */
- 	if ((c == SCPE_STOP) || stop_cpu) return SCPE_STOP;
- 	if ((i % 10) == 0) {				/* Status every 10 sec */
--	    printf ("Waiting for console Telnet connection\n");
-+	    printf ("Waiting for console Telnet connection\r\n");
- 	    fflush (stdout);  }
- 	sim_os_sleep (1);				/* wait 1 second */
- 	}
diff --git a/emulators/simulavr/DESCR b/emulators/simulavr/DESCR
deleted file mode 100644
index fb4f0c8c17b..00000000000
--- a/emulators/simulavr/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-The Simulavr program is a simulator for the Atmel AVR family of
-microcontrollers. Simulavr can be used either standalone or as a
-remote target for gdb. When used in gdbserver mode, the simulator
-is used as a backend so that gdb can be used as a source level
-debugger for AVR programs.
-
-Simulavr was written by Theodore A. Roth
diff --git a/emulators/simulavr/Makefile b/emulators/simulavr/Makefile
deleted file mode 100644
index 0fd9486aea3..00000000000
--- a/emulators/simulavr/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2007/03/07 17:31:22 joerg Exp $
-#
-
-DISTNAME=		simulavr-0.1.2.1
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		http://download.savannah.nongnu.org/releases/simulavr/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.nongnu.org/simulavr/
-COMMENT=		Simulator for Atmel AVR microcontrollers
-
-BUILD_DEPENDS+=		avr-binutils-[0-9]*:../../cross/avr-binutils
-BUILD_DEPENDS+=		avr-gcc-[0-9]*:../../cross/avr-gcc
-BUILD_DEPENDS+=		doxygen-[0-9]*:../../devel/doxygen
-
-BROKEN_IN=		pkgsrc-2006Q4
-
-CONFIGURE_ARGS+=	--disable-tests
-CONFIGURE_ENV+=		ac_cv_prog_has_texi2dvi=yes ac_cv_prog_has_texi2html=yes
-USE_TOOLS+=		makeinfo
-
-USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
-INFO_FILES=		yes
-
-# gcc 2.95 gives warnings that it cannot inline all functions.
-BUILDLINK_TRANSFORM+=	rm:-Werror
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/simulavr/PLIST b/emulators/simulavr/PLIST
deleted file mode 100644
index 61c4181a2ba..00000000000
--- a/emulators/simulavr/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/03/02 19:51:34 wiz Exp $
-bin/simulavr
-bin/simulavr-disp
-bin/simulavr-vcd
-info/simulavr.info
-man/man1/simulavr-disp.1
-man/man1/simulavr.1
-share/doc/${PKGNAME}/AUTHORS
-share/doc/${PKGNAME}/COPYING
-share/doc/${PKGNAME}/ChangeLog
-share/doc/${PKGNAME}/ChangeLog-2001
-share/doc/${PKGNAME}/ChangeLog-2002
-share/doc/${PKGNAME}/ChangeLog-2003
-share/doc/${PKGNAME}/INSTALL
-share/doc/${PKGNAME}/ProjSummary
-share/doc/${PKGNAME}/README
-share/doc/${PKGNAME}/README.gdb
-share/doc/${PKGNAME}/README.opcodes
-share/doc/${PKGNAME}/TODO
-@dirrm share/doc/${PKGNAME}
diff --git a/emulators/simulavr/distinfo b/emulators/simulavr/distinfo
deleted file mode 100644
index e183b130e2b..00000000000
--- a/emulators/simulavr/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2007/03/07 17:31:22 joerg Exp $
-
-SHA1 (simulavr-0.1.2.1.tar.bz2) = 276580f05ae57523684f6a61528cd3170858a3a4
-RMD160 (simulavr-0.1.2.1.tar.bz2) = 0728f35617629c382157f6657b2cf0f7418bd071
-Size (simulavr-0.1.2.1.tar.bz2) = 359233 bytes
-SHA1 (patch-aa) = 4989d86dd551eccaac1fab0769d53feea90cc1e7
diff --git a/emulators/simulavr/patches/patch-aa b/emulators/simulavr/patches/patch-aa
deleted file mode 100644
index 96441ffde04..00000000000
--- a/emulators/simulavr/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/03/07 17:31:23 joerg Exp $
-
---- doc/Makefile.in.orig	2004-01-18 23:58:29.000000000 +0000
-+++ doc/Makefile.in
-@@ -459,7 +459,7 @@ uninstall-am: uninstall-info-am uninstal
- 	uninstall uninstall-am uninstall-info-am uninstall-local
- 
- 
--all-local: html $(TARGET_PS) $(TARGET_PDF)
-+all-local:
- 
- # Rule for generating postscript output.
- ps: simulavr.ps $(TARGET_DOX_PS)
-@@ -490,7 +490,7 @@ install-html: html $(INSTALL_DOX_HTML)
- 	done
- 
- # General rule for installing documentation
--install-data-local: install-html install-ps $(INSTALL_PDF)
-+install-data-local:
- 
- uninstall-local:
- 	rm -rf $(DOC_INST_DIR)
diff --git a/emulators/ski/DESCR b/emulators/ski/DESCR
deleted file mode 100644
index 9668c250e7a..00000000000
--- a/emulators/ski/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-The Hewlett-Packard IA-64 instruction set simulator for Linux/x86
-
-To get the ski to run on NetBSD/i386, you need the following:
-
-compat_linux support in the kernel:
-	http://www.netbsd.org/guide/en/chap-linux.html
-procfs support in the kernel:
-	http://www.netbsd.org/guide/en/chap-linux.html#chap-linux-emulating-procfs
-mount /dev/pts:
-	http://mail-index.netbsd.org/tech-kern/2004/11/08/0016.html
-
-Tip: You can run the ski emulator with qemu usermode emulation on
-non-i386 platforms.
-
-Run the ski binary from within an xterm window.
-
-BUGS: the xserver version xski doesn't currently work.
diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile
deleted file mode 100644
index 98957bfc71a..00000000000
--- a/emulators/ski/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#	$NetBSD: Makefile,v 1.7 2007/01/07 09:13:53 rillig Exp $
-
-DISTNAME=		ski-0.9.81-l6-i686
-PKGNAME=		ski-0.9.81.6
-CATEGORIES=		emulators
-MASTER_SITES=		# empty
-
-MAINTAINER=		skrll@NetBSD.org
-HOMEPAGE=		http://www.hpl.hp.com/research/linux/ski/
-COMMENT=		The Hewlett-Packard IA-64 instruction set simulator for Linux/x86
-
-RESTRICTED=		Modification or Redistribution not permitted
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
-
-WRKSRC=			${WRKDIR}
-INTERACTIVE_STAGE=	fetch extract
-NO_BUILD=		YES
-
-DOWNLOAD=		http://www.hpl.hp.com/research/linux/ski/download.php
-
-FETCH_MESSAGE=								\
-	"Due to licensing restrictions, the HP Ski IA-64 emulator for"	\
-	"Linux 2.x (i686) must be fetched into:"			\
-	"    ${DISTDIR}"						\
-	"from:"								\
-	"    ${DOWNLOAD}"
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/nue/usr/bin/*ski* ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDIR}/nue/usr/man/man1/*ski*.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKDIR}/nue/usr/X11R6/lib/X11/app-defaults/XSki ${PREFIX}/lib/X11/app-defaults/XSki
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/ski/PLIST b/emulators/ski/PLIST
deleted file mode 100644
index db5fff67b08..00000000000
--- a/emulators/ski/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/05 11:58:50 skrll Exp $
-bin/ski
-bin/xski
-bin/bski
-bin/bskinc
-man/man1/ski.1
-man/man1/xski.1
-man/man1/bskinc.1
-lib/X11/app-defaults/XSki
diff --git a/emulators/ski/distinfo b/emulators/ski/distinfo
deleted file mode 100644
index d6bcfafebd4..00000000000
--- a/emulators/ski/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/05 11:58:50 skrll Exp $
-
-SHA1 (ski-0.9.81-l6-i686.tar.gz) = 6a4d330805922b553abcccc259828f589bcf5de1
-RMD160 (ski-0.9.81-l6-i686.tar.gz) = 79905fb94c9a3436ee7b644988afb47fd11b7a42
-Size (ski-0.9.81-l6-i686.tar.gz) = 1696144 bytes
diff --git a/emulators/sms_sdl/DESCR b/emulators/sms_sdl/DESCR
deleted file mode 100644
index cb2da05b31c..00000000000
--- a/emulators/sms_sdl/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-SMS Plus is Sega Master System and Game Gear emulator. Originally,
-it was written to run under DOS. Since Charles Mac Donald released
-his emulator under the GPL terms, this emulator has been ported to
-different platforms.
diff --git a/emulators/sms_sdl/Makefile b/emulators/sms_sdl/Makefile
deleted file mode 100644
index 7c49c6a32a4..00000000000
--- a/emulators/sms_sdl/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/06/12 16:28:07 wiz Exp $
-#
-
-DISTNAME=		sms_sdl-0.9.4a-r7.1-src
-PKGNAME=		sms_sdl-0.9.4a.7.1
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		http://membres.lycos.fr/cyxdown/smssdl/
-EXTRACT_SUFX=		.zip
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://membres.lycos.fr/cyxdown/smssdl/
-COMMENT=		SMS Plus emulator port to SDL
-
-WRKSRC=			${WRKDIR}/sms_sdl-0.9.4a-r7.1
-BUILD_DIRS=		sdl
-EXTRACT_OPTS_ZIP=	-aqo
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sdl/sms_sdl ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sms_sdl
-	${INSTALL_DATA} ${WRKSRC}/sdl/README.TXT ${PREFIX}/share/doc/sms_sdl
-	${INSTALL_DATA} ${WRKSRC}/license ${PREFIX}/share/doc/sms_sdl
-	${INSTALL_DATA} ${WRKSRC}/README.TXT \
-		${PREFIX}/share/doc/sms_sdl/README-CORE.TXT
-	${INSTALL_DATA} ${WRKSRC}/SOURCE.TXT ${PREFIX}/share/doc/sms_sdl
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/sms_sdl/PLIST b/emulators/sms_sdl/PLIST
deleted file mode 100644
index 0757783e092..00000000000
--- a/emulators/sms_sdl/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/07/24 14:01:02 wiz Exp $
-bin/sms_sdl
-share/doc/sms_sdl/README-CORE.TXT
-share/doc/sms_sdl/README.TXT
-share/doc/sms_sdl/SOURCE.TXT
-share/doc/sms_sdl/license
-@dirrm share/doc/sms_sdl
diff --git a/emulators/sms_sdl/distinfo b/emulators/sms_sdl/distinfo
deleted file mode 100644
index 8f0322ebe44..00000000000
--- a/emulators/sms_sdl/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/07/24 14:01:02 wiz Exp $
-
-SHA1 (sms_sdl-0.9.4a-r7.1-src.zip) = 66147e5b9d69eca64924093ca26c580acf20c493
-RMD160 (sms_sdl-0.9.4a-r7.1-src.zip) = 98a7b6101a496f80b5c5b54231816d39a69e40f5
-Size (sms_sdl-0.9.4a-r7.1-src.zip) = 113154 bytes
diff --git a/emulators/snes9x/DESCR b/emulators/snes9x/DESCR
deleted file mode 100644
index a877db8e59c..00000000000
--- a/emulators/snes9x/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES)
-emulator. It basically allows you to play most games designed for the SNES
-and Super Famicom Nintendo game systems on your PC or Workstation; which
-includes some real gems that were only ever released in Japan.
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
deleted file mode 100644
index 3afb3b32daa..00000000000
--- a/emulators/snes9x/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-# $NetBSD: Makefile,v 1.41 2007/02/15 22:53:09 joerg Exp $
-
-SNESVER=		1.43
-DISTNAME=		snes9x-${SNESVER}-src
-PKGNAME=		snes9x-${SNESVER}
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.lysator.liu.se/snes9x/${SNESVER}/ \
-			http://files.ipherswipsite.com/snes9x/ \
-			http://vincent.grigorieff.free.fr/snes9x/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.snes9x.com/
-COMMENT=		Super Nintendo Entertainment System (SNES) emulator
-
-WRKSRC=			${WRKDIR}/${DISTNAME}/snes9x
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake
-PTHREAD_OPTS+=		require
-INSTALLATION_DIRS=	bin
-GNU_CONFIGURE=		YES
-
-SUBST_CLASSES+=		nodos
-SUBST_STAGE.nodos=	pre-patch
-SUBST_FILES.nodos=	../language.h
-SUBST_FILES.nodos+=	../readme.txt dsp1.h dsp3emu.cpp dsp4emu.cpp
-SUBST_FILTER_CMD.nodos=	tr -d '\r'
-
-SUBST_CLASSES+=		paircpp
-SUBST_STAGE.paircpp=	pre-patch
-SUBST_FILES.paircpp=	65c816.h sa1.h
-SUBST_SED.paircpp=	-e 's|pair|snes9x_pair|g'
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/snes9x ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/offsets ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snes9x
-	${INSTALL_MAN} ${WRKSRC}/doc/porting.txt ${PREFIX}/share/doc/snes9x
-	${INSTALL_MAN} ${WRKSRC}/changes.txt ${PREFIX}/share/doc/snes9x
-	${INSTALL_MAN} ${WRKSRC}/hardware.txt ${PREFIX}/share/doc/snes9x
-	${INSTALL_MAN} ${WRKSRC}/problems.txt ${PREFIX}/share/doc/snes9x
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/readme.txt ${PREFIX}/share/doc/snes9x
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/readme.unix \
-		${PREFIX}/share/doc/snes9x
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.snes9x
-.if ${MACHINE_ARCH} == "i386"
-BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
-PKG_SUPPORTED_OPTIONS=	mmx
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=	--with-assembler
-.  if !empty(PKG_OPTIONS:Mmmx)
-CONFIGURE_ARGS+=	--with-mmx
-.  endif
-.  if ${OBJECT_FMT} == "a.out"
-MAKE_ENV+=	FILEFORMAT=aoutb
-MAKE_ENV+=	_ASM_UNDERBARS=1
-.  else
-MAKE_ENV+=	FILEFORMAT=elf
-.  endif
-.endif
-
-.if exists(${X11BASE}/lib/libXxf86dga.a)
-CONFIGURE_ARGS+=	--with-extensions
-.endif
-
-.if exists(/usr/include/usb.h) || exists(/usr/include/usbhid.h)
-MAKE_ENV+=	USBJOY=1
-.  if exists(/usr/include/usbhid.h)
-MAKE_ENV+=	USBHID_H=1
-.  endif
-.elif ${OPSYS} == "DragonFly" && exists(/usr/include/libusbhid.h)
-MAKE_ENV+=	USBJOY=1
-MAKE_ENV+=	USBHID_H=1
-.endif
-
-BUILDLINK_DEPMETHOD.libXt?=	build
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXxf86dga/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/snes9x/PLIST b/emulators/snes9x/PLIST
deleted file mode 100644
index 00696ebcfe1..00000000000
--- a/emulators/snes9x/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/03/18 15:56:00 ben Exp $
-bin/snes9x
-bin/offsets
-share/doc/snes9x/changes.txt
-share/doc/snes9x/hardware.txt
-share/doc/snes9x/porting.txt
-share/doc/snes9x/problems.txt
-share/doc/snes9x/readme.txt
-share/doc/snes9x/readme.unix
-@dirrm share/doc/snes9x
diff --git a/emulators/snes9x/distinfo b/emulators/snes9x/distinfo
deleted file mode 100644
index 1018fceb4d4..00000000000
--- a/emulators/snes9x/distinfo
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: distinfo,v 1.17 2007/02/15 22:53:09 joerg Exp $
-
-SHA1 (snes9x-1.43-src.tar.gz) = c6883c451aeb442030862ec19a8dca25ee02d82c
-RMD160 (snes9x-1.43-src.tar.gz) = d2003f7afb208109405b41f4eec586b93518f9b2
-Size (snes9x-1.43-src.tar.gz) = 1016251 bytes
-SHA1 (patch-aa) = 3eee1abe554f9ef4e81b22a4c75a04c8c109acd3
-SHA1 (patch-ab) = 7dfd2d7a92caceed82549fed3f175746871b3985
-SHA1 (patch-ac) = c1e35daa7e53536d05c1633b78c00d511ae7feb5
-SHA1 (patch-ad) = c5febcdd6b5bf0f3b4b5d8b0bc19c4716434a23e
-SHA1 (patch-ae) = c4258835925ee3a6e3606ad895ff697f379cb22f
-SHA1 (patch-af) = 19d86d23e3af2c0cef09b8eeff1303d6f100c2f8
-SHA1 (patch-ag) = 2d934957496d230ce2ec7cf88820254c2ccec36f
-SHA1 (patch-ah) = eb5ff0fed972644f9c8599ec5eb6a3cd3ce160cb
-SHA1 (patch-ai) = 06bd00790d1a84ee31114de4205bba22b48cd547
-SHA1 (patch-aj) = f5cdf8e917f787d7e9fc657ed7197a2c28460375
-SHA1 (patch-ak) = a15a54d7b0585ce84bf9d04f200c2d1f3e1c615c
-SHA1 (patch-al) = 71043b1ec2ee66399ef7a10f6258f15b12dab980
-SHA1 (patch-am) = 31d0ccf2e6124126929d9064ef2212d2a8bb963e
-SHA1 (patch-an) = 3ae10526aa66ef235c223e891c67b4aed6fc48df
-SHA1 (patch-ao) = b5b721563aee09909b7d6143bd699ec86ccaed3b
-SHA1 (patch-ap) = 1c1b7f1b45d75688870a94dadadb6da055e99cd0
-SHA1 (patch-aq) = f4d859bc0f569142e2a50bca1c895d133ed26920
-SHA1 (patch-ar) = 72a158e69b885b9ecf47245b9b83f8b50d48f96d
-SHA1 (patch-as) = 64a9fb042f40a4a699bd4128d538fae1cb9cb810
-SHA1 (patch-ba) = 73dccd2fdab90760644af5bf7885c8d87d253a47
-SHA1 (patch-bc) = d43cdb435692b925347c192acb7c4ff5d8c1454d
diff --git a/emulators/snes9x/patches/patch-aa b/emulators/snes9x/patches/patch-aa
deleted file mode 100644
index 06d4e68f324..00000000000
--- a/emulators/snes9x/patches/patch-aa
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2006/04/16 01:21:08 ben Exp $
-
---- Makefile.in.orig	2004-12-30 14:15:44.000000000 -0800
-+++ Makefile.in
-@@ -113,6 +113,20 @@ SPC7110OBJ=spc7110.o
- OBC1OBJ=obc1.o
- SETAOBJ=seta.o seta010.o seta011.o seta018.o
- 
-+ifdef USBJOY
-+ifdef USBHID_H
-+USBJOYDEFINES=-DHAVE_USBHID_H
-+EXTRALIBS+=-lusbhid
-+else
-+USBJOYDEFINES=
-+EXTRALIBS+=-lusb
-+endif
-+endif
-+
-+ifdef _ASM_UNDERBARS
-+EXTRADEFINES+=-D_ASM_UNDERBARS
-+endif
-+
- OBJECTS=$(CPUOBJ) $(SOUNDOBJ) apudebug.o $(FXOBJ) $(C4OBJ) \
- 	cpu.o sa1.o debug.o sdd1.o tile.o srtc.o gfx.o memmap.o clip.o \
- 	dsp1.o ppu.o dma.o snes9x.o data.o globals.o \
-@@ -136,9 +150,10 @@ OBJECTS += jma/s9x-jma.o jma/7zlzma.o jm
- JMADEFINES=-DJMA_SUPPORT -fexceptions
- endif
- 
-+EXTRALIBS += ${LIBOSSAUDIO}
- ifdef THREAD_SOUND
--CPUDEFINES += -DUSE_THREADS
--EXTRALIBS += -lpthread
-+CPUDEFINES += -DUSE_THREADS -I${BUILDLINK_DIR}/include
-+EXTRALIBS += -Wl,-R${LOCALBASE}/lib -L${BUILDLINK_DIR}/lib ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- endif
- 
- ifdef GLIDE
-@@ -186,7 +201,7 @@ ifdef DREAMCAST
- OPTIMISE=-O4 -ffreestanding -ffast-math -fschedule-insns2 -fomit-frame-pointer -fno-inline-functions -fno-defer-pop -fforce-addr -fstrict-aliasing -funroll-loops -fdelete-null-pointer-checks -fno-exceptions
- CPUFLAGS=-ml  -m4-single-only
- else
--OPTIMISE = @OPTIMIZE@
-+OPTIMISE=
- endif
- 
- DEFS += \
-@@ -206,6 +221,8 @@ $(AIDODEFINES) \
- $(KREEDDEFINES) \
- $(SDD1DEFINES) \
- $(JOYDEFINES) \
-+$(USBJOYDEFINES) \
-+$(EXTRADEFINES) \
- -DNO_INLINE_SET_GET @SYSDEFINES@
- 
- #-DOLD_COLOUR_BLENDING
-@@ -302,7 +319,7 @@ s9xserver: $(SERVER_OBJECTS)
- 	sh-elf-as -little $(srcdir)/$*.s -o $@
- 
- .asm.o:
--	$(NASM) -f elf $(FXDEFINES) -I$(srcdir)/ -I$(srcdir)/$(CPU)/ -o $@ $(srcdir)/$*.asm
-+	$(NASM) -f ${FILEFORMAT} $(FXDEFINES) $(EXTRADEFINES) -I$(srcdir)/ -I$(srcdir)/$(CPU)/ -o $@ $(srcdir)/$*.asm
- 
- .obj.o:
- 	cp $*.obj $*.o
diff --git a/emulators/snes9x/patches/patch-ab b/emulators/snes9x/patches/patch-ab
deleted file mode 100644
index 0ca9d5c2919..00000000000
--- a/emulators/snes9x/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/03/18 15:56:00 ben Exp $
-
---- i386/asmstruc.h.orig	2004-12-30 14:15:44.000000000 -0800
-+++ i386/asmstruc.h
-@@ -86,7 +86,7 @@
-   Super NES and Super Nintendo Entertainment System are trademarks of
-   Nintendo Co., Limited and its subsidiary companies.
- *******************************************************************************/
--#if defined(__DJGCC) || defined(MICROSOFT_C) || defined(_WINDOWS)
-+#if defined(__DJGCC) || defined(MICROSOFT_C) || defined(_WINDOWS) || defined(_ASM_UNDERBARS)
- #define S9xTraceMessage _S9xTraceMessage
- #define S9xGetPPU _S9xGetPPU
- #define S9xSetPPU _S9xSetPPU
diff --git a/emulators/snes9x/patches/patch-ac b/emulators/snes9x/patches/patch-ac
deleted file mode 100644
index e7781f11426..00000000000
--- a/emulators/snes9x/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2006/03/18 15:56:00 ben Exp $
-
---- 2xsai.cpp.orig	2004-12-30 14:15:47.000000000 -0800
-+++ 2xsai.cpp
-@@ -95,13 +95,6 @@
- #include "port.h"
- #include "gfx.h"
- 
--#if (defined(USE_X86_ASM) && (defined (__i386__) || defined (__i486__) || \
--               defined (__i586__) || defined (__WIN32__) || defined (__DJGPP)))
--#  ifndef MMX
--#    define MMX
--#  endif
--#endif
--
- extern "C"
- {
- 
diff --git a/emulators/snes9x/patches/patch-ad b/emulators/snes9x/patches/patch-ad
deleted file mode 100644
index 13af1ec02d3..00000000000
--- a/emulators/snes9x/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/03/18 15:56:00 ben Exp $
-
---- netplay.cpp.orig	2004-12-30 14:15:45.000000000 -0800
-+++ netplay.cpp
-@@ -126,9 +126,13 @@
- 
- #ifdef USE_THREADS
- #include <pthread.h>
-+#ifdef __NetBSD__
-+#include <sys/sched.h>
-+#else
- #include <sched.h>
- #include <semaphore.h>
- #endif
-+#endif
- 
- #include "snes9x.h"
- #include "cpuexec.h"
diff --git a/emulators/snes9x/patches/patch-ae b/emulators/snes9x/patches/patch-ae
deleted file mode 100644
index cdfd467b212..00000000000
--- a/emulators/snes9x/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2006/03/18 15:56:00 ben Exp $
-
---- port.h.orig	2004-12-30 14:15:47.000000000 -0800
-+++ port.h
-@@ -281,6 +281,10 @@ EXTERN_C void MixSound(void);
- #define TITLE "Snes9X: Linux"
- #endif
- 
-+#ifdef __NetBSD__
-+#define TITLE "Snes9X: NetBSD"
-+#endif
-+
- #ifndef TITLE
- #define TITLE "Snes9x"
- #endif
diff --git a/emulators/snes9x/patches/patch-af b/emulators/snes9x/patches/patch-af
deleted file mode 100644
index 1a40eab5972..00000000000
--- a/emulators/snes9x/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.4 2006/03/18 15:56:00 ben Exp $
-
---- soundux.h.orig	2004-12-30 14:15:47.000000000 -0800
-+++ soundux.h
-@@ -127,7 +127,7 @@ typedef struct {
-     int stereo;
-     bool8 sixteen_bit;
-     bool8 encoded;
--#ifdef __sun
-+#if defined(__sun) || defined(__NetBSD__)
-     int last_eof;
- #endif
- #ifdef __sgi
diff --git a/emulators/snes9x/patches/patch-ag b/emulators/snes9x/patches/patch-ag
deleted file mode 100644
index 852a056a540..00000000000
--- a/emulators/snes9x/patches/patch-ag
+++ /dev/null
@@ -1,399 +0,0 @@
-$NetBSD: patch-ag,v 1.10 2006/10/18 13:11:59 rillig Exp $
-
---- unix/unix.cpp.orig	2004-12-30 23:15:47.000000000 +0100
-+++ unix/unix.cpp	2006-10-18 14:03:16.729013960 +0200
-@@ -117,15 +117,25 @@
- 
- #ifdef USE_THREADS
- #include <pthread.h>
-+#ifdef __NetBSD__
-+#include <sys/sched.h>
-+#else
- #include <sched.h>
-+#endif
- 
- pthread_t thread;
- pthread_mutex_t mutex;
- #endif
- 
--#if !defined(NOSOUND) && defined(__linux)
-+#if !defined(NOSOUND)
-+#if defined(__linux)
- #include <sys/soundcard.h>
- #include <sys/mman.h>
-+#elif defined(__NetBSD__)
-+#include <soundcard.h>
-+#elif defined(__DragonFly__)
-+#include <sys/soundcard.h>
-+#endif
- #endif
- 
- #if !defined(NOSOUND) && defined(__sun)
-@@ -140,6 +150,9 @@ pthread_mutex_t mutex;
- //#if defined(__sun) && defined(__GNUC__)
- //typedef void (*SIG_PF)();
- //#endif
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-+typedef void (*SIG_PF)(int);
-+#endif
- 
- #include "snes9x.h"
- #include "memmap.h"
-@@ -168,6 +181,62 @@ uint32 joypads [5] = {0};
- int NumControllers = 5;
- 
- #ifdef JOYSTICK_SUPPORT
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-+#if defined(__DragonFly__)
-+extern "C" {
-+#include <libusbhid.h>
-+}
-+#elif defined(HAVE_USBHID_H)
-+START_EXTERN_C
-+#include <usbhid.h>
-+END_EXTERN_C
-+#else
-+#include <usb.h>
-+#endif
-+#define class Class
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#include <bus/usb/usbhid.h>
-+#else
-+#include <dev/usb/usb.h>
-+#include <dev/usb/usbhid.h>
-+#endif
-+
-+struct priv_joydata_struct
-+{
-+    struct hid_item *hids;
-+    int dlen;
-+    int offset;
-+    char *data_buf;
-+} priv_joy_data[4];
-+
-+int js_fd [4] = {-1, -1, -1, -1};
-+int js_map_button [4][16] = {
-+    {
-+       SNES_A_MASK, SNES_B_MASK, SNES_X_MASK, SNES_Y_MASK,
-+       SNES_TL_MASK, SNES_TR_MASK, SNES_START_MASK, SNES_SELECT_MASK,
-+       0, 0, 0, 0, 0, 0, 0, 0
-+    },
-+    {
-+       SNES_A_MASK, SNES_B_MASK, SNES_X_MASK, SNES_Y_MASK,
-+       SNES_TL_MASK, SNES_TR_MASK, SNES_START_MASK, SNES_SELECT_MASK,
-+       0, 0, 0, 0, 0, 0, 0, 0
-+    },
-+    {
-+       SNES_A_MASK, SNES_B_MASK, SNES_X_MASK, SNES_Y_MASK,
-+       SNES_TL_MASK, SNES_TR_MASK, SNES_START_MASK, SNES_SELECT_MASK,
-+       0, 0, 0, 0, 0, 0, 0, 0
-+    },
-+    {
-+       SNES_A_MASK, SNES_B_MASK, SNES_X_MASK, SNES_Y_MASK,
-+       SNES_TL_MASK, SNES_TR_MASK, SNES_START_MASK, SNES_SELECT_MASK,
-+       0, 0, 0, 0, 0, 0, 0, 0
-+    }
-+};
-+
-+char *js_device [4] = {"/dev/uhid0", "/dev/uhid1", "/dev/uhid2", "/dev/uhid3"};
-+
-+#endif
- #if defined(__linux)
- #include <linux/joystick.h>
- int js_fd [4] = {-1, -1, -1, -1};
-@@ -227,7 +296,7 @@ char *snapshot_filename = NULL;
- char *SDD1_pack = NULL;
- 
- //FIXME: I see no reason not to configureenable this for all Unixen
--#if defined(DEBUGGER) && (defined(__linux) || defined(__sun))
-+#if defined(DEBUGGER) && (defined(__linux) || defined(__sun) || defined(__NetBSD__) || defined(__DragonFly__))
- static void sigbrkhandler(int)
- {
-     CPU.Flags |= DEBUG_MODE_FLAG;
-@@ -700,6 +769,110 @@ void S9xInitInputDevices ()
- #ifdef JOYSTICK_SUPPORT
- void InitJoysticks ()
- {
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-+    int i, size, is_joystick, report_id = 0;
-+    struct hid_data *d;
-+    struct hid_item h;
-+    report_desc_t rd;
-+
-+    printf("USB joystick interface initialization...\n");
-+
-+    for (i = 0; i < 4; i++)
-+    {
-+       if ((js_fd [i] = open (js_device [i], O_RDONLY | O_NONBLOCK)) != -1)
-+       {
-+           if ((rd = hid_get_report_desc(js_fd [i])) == 0)
-+           {
-+               perror (js_device [i]);
-+               close (js_fd [i]);
-+           }
-+
-+           priv_joy_data[i].hids = NULL;
-+
-+#if defined(HAVE_USBHID_H)
-+           if (ioctl(js_fd [i], USB_GET_REPORT_ID, &report_id) < 0)
-+           {
-+               perror (js_device [i]);
-+               close (js_fd [i]);
-+           }
-+
-+#if defined(__DragonFly__)
-+           size = hid_report_size(rd, report_id, hid_input);
-+#else
-+           size = hid_report_size(rd, hid_input, report_id);
-+#endif
-+           priv_joy_data[i].offset = 0;
-+#else
-+           size = hid_report_size(rd, hid_input, &report_id);
-+           priv_joy_data[i].offset = (report_id != 0);
-+#endif
-+           if ((priv_joy_data[i].data_buf = (char*)malloc(size)) == NULL)
-+           {
-+               printf("error: couldn't malloc %d bytes\n", size);
-+               hid_dispose_report_desc(rd);
-+           }
-+           priv_joy_data[i].dlen = size;
-+
-+           is_joystick = 0;
-+#if defined(HAVE_USBHID_H) && !defined(__DragonFly__)
-+           for (d = hid_start_parse(rd, 1 << hid_input, report_id); hid_get_item(d, &h); )
-+#else
-+           for (d = hid_start_parse(rd, 1 << hid_input); hid_get_item(d, &h); )
-+#endif
-+           {
-+               int axes = 0, buttons = 0, usage, page, interesting_hid;
-+
-+               page = HID_PAGE(h.usage);
-+               usage = HID_USAGE(h.usage);
-+
-+               is_joystick = is_joystick ||
-+                   (h.kind == hid_collection &&
-+                    page == HUP_GENERIC_DESKTOP &&
-+                    (usage == HUG_JOYSTICK || usage == HUG_GAME_PAD));
-+
-+               if (h.kind != hid_input)
-+                   continue;
-+
-+               if (!is_joystick)
-+                   continue;
-+
-+               interesting_hid = TRUE;
-+               if (page == HUP_GENERIC_DESKTOP)
-+               {
-+                   if (usage == HUG_X || usage == HUG_RX)
-+                       axes = 1;
-+                   else if (usage == HUG_Y || usage == HUG_RY)
-+                       axes = 2;
-+                   else if (usage == HUG_Z || usage == HUG_RZ)
-+                       axes = 3;
-+                   else
-+                       interesting_hid = FALSE;
-+               }
-+               else if (page == HUP_BUTTON)
-+               {
-+                   if (usage > 0)
-+                       buttons = usage;
-+                   else
-+                       interesting_hid = FALSE;
-+
-+               }
-+
-+               if (interesting_hid)
-+               {
-+                   h.next = priv_joy_data[i].hids;
-+                   priv_joy_data[i].hids = (struct hid_item *)malloc(sizeof *(priv_joy_data[i].hids));
-+                   if (priv_joy_data[i].hids == NULL)
-+                   {
-+                       printf("error: Not enough memory for joystick.\n");
-+                       break;
-+                   }
-+                   *(priv_joy_data[i].hids) = h;
-+               }
-+           }
-+           hid_end_parse(d);
-+       }
-+    }
-+#endif
- #ifdef JSIOCGVERSION
-     int version;
-     unsigned char axes, buttons;
-@@ -756,6 +929,77 @@ void InitJoysticks ()
- 
- void ReadJoysticks ()
- {
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-+    int i, usage, page, d;
-+    struct hid_item *h;
-+
-+    for (i = 0; i < 4 && js_fd [i] >= 0; i++)
-+    {
-+       int len;
-+
-+       len = read(js_fd [i], priv_joy_data[i].data_buf, priv_joy_data[i].dlen);
-+       if (len < priv_joy_data[i].dlen)
-+           continue;
-+
-+       for (h = priv_joy_data[i].hids; h; h = h->next)
-+       {
-+           d = hid_get_data(priv_joy_data[i].data_buf + priv_joy_data[i].offset, h);
-+
-+           page = HID_PAGE(h->usage);
-+           usage = HID_USAGE(h->usage);
-+
-+           if (page == HUP_GENERIC_DESKTOP)
-+           {
-+               int center, trigger_point;
-+
-+              center = (h->logical_maximum + h->logical_minimum) / 2;
-+              trigger_point = (h->logical_maximum - h->logical_minimum) / 4;
-+
-+               if (usage == HUG_X || usage == HUG_RX)
-+               {
-+                   if (d < (center - trigger_point))
-+                   {
-+                       joypads [i] |= SNES_LEFT_MASK;
-+                       joypads [i] &= ~SNES_RIGHT_MASK;
-+                       continue;
-+                   }
-+                   if (d > (center + trigger_point))
-+                   {
-+                       joypads [i] &= ~SNES_LEFT_MASK;
-+                       joypads [i] |= SNES_RIGHT_MASK;
-+                       continue;
-+                   }
-+                   joypads [i] &= ~SNES_LEFT_MASK;
-+                   joypads [i] &= ~SNES_RIGHT_MASK;
-+               }
-+               if (usage == HUG_Y || usage == HUG_RY)
-+               {
-+                   if (d < (center - trigger_point))
-+                   {
-+                       joypads [i] |= SNES_UP_MASK;
-+                       joypads [i] &= ~SNES_DOWN_MASK;
-+                       continue;
-+                   }
-+                   if (d > (center + trigger_point))
-+                   {
-+                       joypads [i] &= ~SNES_UP_MASK;
-+                       joypads [i] |= SNES_DOWN_MASK;
-+                       continue;
-+                   }
-+                   joypads [i] &= ~SNES_UP_MASK;
-+                   joypads [i] &= ~SNES_DOWN_MASK;
-+               }
-+           }
-+           else if (page == HUP_BUTTON)
-+           {
-+               if (d == h->logical_maximum)
-+                   joypads [i] |= js_map_button [i][usage - 1];
-+               else
-+                   joypads [i] &= ~js_map_button [i][usage - 1];
-+           }
-+       }
-+    }
-+#endif
- #ifdef JSIOCGVERSION
-     struct js_event js_ev;
-     int i;
-@@ -1129,11 +1373,11 @@ void _splitpath (const char *path, char 
- {
-     *drive = 0;
- 
--    char *slash = strrchr (path, '/');
-+    const char *slash = strrchr (path, '/');
-     if (!slash)
- 	slash = strrchr (path, '\\');
- 
--    char *dot = strrchr (path, '.');
-+    const char *dot = strrchr (path, '.');
- 
-     if (dot && slash && dot < slash)
- 	dot = NULL;
-@@ -1646,7 +1890,7 @@ bool8 S9xOpenSoundDevice (int mode, bool
- }
- #endif
- 
--#if !defined(NOSOUND) && defined(__linux)
-+#if !defined(NOSOUND) && (defined(__linux) || defined(__NetBSD__) || defined(__DragonFly__))
- static int Rates[8] =
- {
-     0, 8000, 11025, 16000, 22050, 32000, 44100, 48000
-@@ -1662,12 +1906,19 @@ bool8 S9xOpenSoundDevice (int mode, bool
-     /* Linux version (OSS) */
-     int J, K;
- 
-+#if defined(__NetBSD__)
-+    if ((so.sound_fd = open ("/dev/audio", O_WRONLY)) < 0)
-+    {
-+       perror ("/dev/audio");
-+       return (FALSE);
-+    }
-+#else
-     if ((so.sound_fd = open ("/dev/dsp", O_WRONLY)) < 0)
-     {
- 	perror ("/dev/dsp");
- 	return (FALSE);
-     }
--
-+#endif
- #ifdef MMAP_SOUND 
-    if (ioctl (so.sound_fd, SNDCTL_DSP_GETCAPS, &J) < 0)
-     {
-@@ -1711,14 +1962,14 @@ bool8 S9xOpenSoundDevice (int mode, bool
- 	so.sixteen_bit = TRUE;
- 
-     so.stereo = stereo;
--    if (ioctl (so.sound_fd, SNDCTL_DSP_STEREO, &so.stereo) < 0)
-+    if (ioctl (so.sound_fd, SNDCTL_DSP_STEREO, (void *)&so.stereo) < 0)
-     {
- 	perror ("ioctl SNDCTL_DSP_STEREO");
- 	return (FALSE);
-     }
-     
-     so.playback_rate = Rates[mode & 0x07];
--    if (ioctl (so.sound_fd, SNDCTL_DSP_SPEED, &so.playback_rate) < 0)
-+    if (ioctl (so.sound_fd, SNDCTL_DSP_SPEED, (void *)&so.playback_rate) < 0)
-     {
- 	perror ("ioctl SNDCTL_DSP_SPEED");
- 	return (FALSE);
-@@ -1743,7 +1994,7 @@ bool8 S9xOpenSoundDevice (int mode, bool
- 	perror ("ioctl SNDCTL_DSP_SETFRAGMENT");
- 	return (FALSE);
-     }
--    ioctl (so.sound_fd, SNDCTL_DSP_GETBLKSIZE, &so.buffer_size);
-+    ioctl (so.sound_fd, SNDCTL_DSP_GETBLKSIZE, (void *)&so.buffer_size);
-     
- #ifdef MMAP_SOUND
-     J = PCM_ENABLE_OUTPUT;
-@@ -1768,7 +2019,7 @@ bool8 S9xOpenSoundDevice (int mode, bool
- #endif
- 
- 
--#if !defined(NOSOUND) && (defined (__linux) || defined (__sun))
-+#if !defined(NOSOUND) && (defined (__linux) || defined (__sun) || defined(__NetBSD__) || defined(__DragonFly__))
- void S9xUnixProcessSound (void)
- {
- }
-@@ -1810,7 +2061,7 @@ void *S9xProcessSound (void *)
- }
- #endif
- 
--#if !defined(NOSOUND) && (defined (__linux) || defined (__sun))
-+#if !defined(NOSOUND) && (defined (__linux) || defined (__sun) || defined(__NetBSD__) || defined(__DragonFly__))
- void S9xGenerateSound ()
- {
-     /* Linux and Sun versions */
-@@ -1902,7 +2153,7 @@ void *S9xProcessSound (void *)
-     /* If threads in use, this is to loop indefinitely */
-     /* If not, this will be called by timer */
-     
--#ifdef __linux
-+#if defined(__linux) || defined(__NetBSD__) || defined(__DragonFly__)
-     audio_buf_info info;
- 
-     if (!Settings.ThreadSound &&
diff --git a/emulators/snes9x/patches/patch-ah b/emulators/snes9x/patches/patch-ah
deleted file mode 100644
index 91501893738..00000000000
--- a/emulators/snes9x/patches/patch-ah
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2006/03/18 15:56:00 ben Exp $
-
---- unzip/unz.h.orig	2004-12-30 14:15:45.000000000 -0800
-+++ unzip/unz.h
-@@ -11,6 +11,14 @@
-   ---------------------------------------------------------------------------*/
- 
- #include "zlib.h"
-+/* removed in NetBSD around 2001/01/18 */
-+#ifndef OF
-+#  ifdef STDC
-+#    define OF(args)  args
-+#  else
-+#    define OF(args)  ()
-+#  endif
-+#endif
- 
- /*****************************************/
- /*  Predefined, Machine-specific Macros  */
diff --git a/emulators/snes9x/patches/patch-ai b/emulators/snes9x/patches/patch-ai
deleted file mode 100644
index ed2302eeae0..00000000000
--- a/emulators/snes9x/patches/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2006/03/18 15:56:00 ben Exp $
-
---- unzip/unzip.h.orig	2004-12-30 14:15:45.000000000 -0800
-+++ unzip/unzip.h
-@@ -49,6 +49,15 @@ extern "C" {
- #include "zlib.h"
- #endif
- 
-+/* removed in NetBSD around 2001/01/18 */
-+#ifndef OF
-+#  ifdef STDC
-+#    define OF(args)  args
-+#  else
-+#    define OF(args)  ()
-+#  endif
-+#endif
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
-     from (void*) without cast */
diff --git a/emulators/snes9x/patches/patch-aj b/emulators/snes9x/patches/patch-aj
deleted file mode 100644
index 86be2e7be1e..00000000000
--- a/emulators/snes9x/patches/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2006/03/18 15:56:00 ben Exp $
-
---- snes9x.cpp.orig	2004-12-30 14:15:47.000000000 -0800
-+++ snes9x.cpp
-@@ -200,6 +200,9 @@ void S9xUsage ()
- -joydevX /dev/jsY         Use joystick device /dev/jsY for emulation of gamepad X\n");
-     S9xMessage (S9X_INFO, S9X_USAGE, "\
- -joymapX 0 1 2 3 4 5 6 7  Joystick buttons which should be assigned to gamepad X - A B X Y TL TR Start and Select\n");
-+#elif defined(__NetBSD__) || defined(__DragonFly__)
-+    S9xMessage (S9X_INFO, S9X_USAGE, "\
-+-joymapX 0 1 2 3 4 5 6 7  Joystick buttons which should be assigned to gamepad X - A B X Y TL TR Start and Select\n");
- #else
-     S9xMessage (S9X_INFO, S9X_USAGE, "\
- -four or -4               Single standard PC joystick has four buttons\n");
diff --git a/emulators/snes9x/patches/patch-ak b/emulators/snes9x/patches/patch-ak
deleted file mode 100644
index 5a9f5b2460d..00000000000
--- a/emulators/snes9x/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2006/03/18 15:56:00 ben Exp $
-
---- i386/zsnesc4.asm.orig	2004-12-30 14:15:44.000000000 -0800
-+++ i386/zsnesc4.asm
-@@ -51,7 +51,7 @@ NEWSYM oamram, times 544 db 0	   ; Sprit
- 
- SECTION .data
- 
--%ifdef __DJGPP__
-+%ifdef _ASM_UNDERBARS
- %define ROM _ROM
- %define RegRAM _RegRAM
- %define S9xInitC4 _S9xInitC4
diff --git a/emulators/snes9x/patches/patch-al b/emulators/snes9x/patches/patch-al
deleted file mode 100644
index d002faef5c6..00000000000
--- a/emulators/snes9x/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.2 2006/03/18 15:56:00 ben Exp $
-
---- i386/ZSNES.ASM.orig	2004-12-30 14:15:44.000000000 -0800
-+++ i386/ZSNES.ASM
-@@ -92,7 +92,7 @@ NEWSYM SfxAC, dd 0
- 
- SECTION .data
- 
--%ifdef __DJGPP__
-+%ifdef _ASM_UNDERBARS
- %define SRAM _SRAM
- %define ROM _ROM
- %define RegRAM _RegRAM
diff --git a/emulators/snes9x/patches/patch-am b/emulators/snes9x/patches/patch-am
deleted file mode 100644
index 7cbd18f377c..00000000000
--- a/emulators/snes9x/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 2006/03/18 15:56:00 ben Exp $
-
---- i386/SPC.ASM.orig	2004-12-30 14:15:44.000000000 -0800
-+++ i386/SPC.ASM
-@@ -18,7 +18,7 @@
- ;Destroys:
- ;   EAX
- 
--%ifdef __DJGPP__
-+%ifdef _ASM_UNDERBARS
- %define DecodeBlockAsm _DecodeBlockAsm
- %define DecodeBlockAsm2 _DecodeBlockAsm2
- %endif
diff --git a/emulators/snes9x/patches/patch-an b/emulators/snes9x/patches/patch-an
deleted file mode 100644
index 212cb3ea6b7..00000000000
--- a/emulators/snes9x/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.2 2006/03/18 15:56:00 ben Exp $
-
---- i386/C4.ASM.orig	2004-12-30 14:15:44.000000000 -0800
-+++ i386/C4.ASM
-@@ -5,7 +5,7 @@
- ; enter : BL = bank number, CX = address location
- ; leave : AL = value read
- 
--%ifdef __DJGPP__
-+%ifdef _ASM_UNDERBARS
- %define C4WFXVal _C4WFXVal
- %define C4WFYVal _C4WFYVal
- %define C4WFX2Val _C4WFX2Val
diff --git a/emulators/snes9x/patches/patch-ao b/emulators/snes9x/patches/patch-ao
deleted file mode 100644
index ea25ec81bbd..00000000000
--- a/emulators/snes9x/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2006/03/18 15:56:00 ben Exp $
-
---- i386/sa1struc.h.orig	2004-12-30 14:15:44.000000000 -0800
-+++ i386/sa1struc.h
-@@ -86,7 +86,7 @@
-   Super NES and Super Nintendo Entertainment System are trademarks of
-   Nintendo Co., Limited and its subsidiary companies.
- *******************************************************************************/
--#if defined(__DJGCC) || defined(MICROSOFT_C) || defined(_WINDOWS)
-+#if defined(__DJGCC) || defined(MICROSOFT_C) || defined(_WINDOWS) || defined(_ASM_UNDERBARS)
- #define S9xTraceMessage _S9xTraceMessage
- #define S9xGetPPU _S9xGetPPU
- #define S9xSetPPU _S9xSetPPU
diff --git a/emulators/snes9x/patches/patch-ap b/emulators/snes9x/patches/patch-ap
deleted file mode 100644
index f2456bf4c27..00000000000
--- a/emulators/snes9x/patches/patch-ap
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/03/18 15:56:00 ben Exp $
-
---- configure.in.orig	2004-12-30 14:15:45.000000000 -0800
-+++ configure.in
-@@ -309,6 +309,28 @@ AC_CACHE_VAL(snes9x_cv_linux_os, [
-   ], [], snes9x_cv_linux_os=yes, snes9x_cv_linux_os=no)])
- AC_MSG_RESULT($snes9x_cv_linux_os)
- 
-+AC_MSG_CHECKING(if the OS is NetBSD)
-+AC_CACHE_VAL(snes9x_cv_netbsd_os, [
-+  AC_TRY_COMPILE([
-+#ifdef __NetBSD__
-+/* */
-+#else
-+#error Not NetBSD.
-+#endif
-+  ], [], snes9x_cv_netbsd_os=yes, snes9x_cv_netbsd_os=no)])
-+AC_MSG_RESULT($snes9x_cv_netbsd_os)
-+
-+AC_MSG_CHECKING(if the OS is DragonFly)
-+AC_CACHE_VAL(snes9x_cv_dragonfly_os, [
-+  AC_TRY_COMPILE([
-+#ifdef __DragonFly__
-+/* */
-+#else
-+#error Not DragonFly.
-+#endif
-+  ], [], snes9x_cv_dragonfly_os=yes, snes9x_cv_dragonfly_os=no)])
-+AC_MSG_RESULT($snes9x_cv_dragonfly_os)
-+
- AC_MSG_CHECKING(if the OS is HP-UX)
- AC_CACHE_VAL(snes9x_cv_hpux_os, [
-   AC_TRY_COMPILE([
-@@ -333,7 +355,7 @@ AC_MSG_RESULT($snes9x_cv_win32_os)
- 
- 
- dnl Enable assembler optimizations if CPU is x86
--AC_ARG_WITH(assembler,[  --with(out)-assembler   Use assembler cores if available (default: with)],[],[with_assembler=yes])
-+AC_ARG_WITH(assembler,[  --with(out)-assembler   Use assembler cores if available (default: without)],[],[with_assembler=no])
- 
- if test yes = "$with_assembler"; then
-   dnl Set assembler to !nasm on Windows
-@@ -359,7 +381,6 @@ if test $NASM != "not_found"; then
-   ZSNESFX='ZSNESFX=1'
-   ZSNESC4='ZSNESC4=1'
-   ASMCPU='ASMCPU=1'
--  ASMKREED='ASMKREED=1'
- #  SPC700ASM='SPC700ASM=1'
-   I386SPC='i386/SPC.O'
-   CPUINC='-Ii386'
-@@ -373,10 +394,18 @@ else
-   fi; fi
- fi
- 
-+dnl Enable MMX optimizations if CPU is x86
-+AC_ARG_WITH(mmx,[  --with(out)-mmx   Use MMX if available (default: without)],[],[with_mmx=no])
-+if test yes = "$with_mmx"; then
-+  if test $NASM != "not_found"; then
-+    ASMKREED='ASMKREED=1'
-+  fi
-+fi
-+
- dnl Enable joystick support on Linux
- AC_ARG_WITH(joystick, [  --with(out)-joystick    Enable joystick support if available (default: with)],[],[with_joystick=yes])
- 
--if test yes = "$snes9x_cv_linux_os" -a yes = "$with_joystick"; then
-+if test \( yes = "$snes9x_cv_linux_os" -o yes = "$snes9x_cv_netbsd_os" -o yes = "$snes9x_cv_dragonfly_os" \) -a yes = "$with_joystick"; then
-    JOYDEFINES=' -DJOYSTICK_SUPPORT'
- else
-    with_joystick="no"
-@@ -527,7 +556,7 @@ if test xyes = x$no_x ; then
-   dnl Maybe AC_MSG_ERROR?
-   AC_MSG_WARN([X is normally required to build on Unix.])
- else
--  X_LDFLAGS="-L$x_libraries"
-+  X_LDFLAGS="-L$x_libraries -Wl,-R$x_libraries"
-   X_LIBS="-lX11 -lXext"
-   LIBS="$LIBS $X_LIBS"
-   SYSLIBS="$SYSLIBS $X_LDFLAGS $X_LIBS"
-@@ -540,7 +569,7 @@ AC_ADD_XFLAGS
- 
- 
- dnl See if X has the DGA and vidmode extensions.
--AC_ARG_WITH(extensions,[  --with(out)-extensions  Use DGA- and vidmode-extensions for X11 if avilable (default: with)],[],[with_extensions=yes])
-+AC_ARG_WITH(extensions,[  --with(out)-extensions  Use DGA- and vidmode-extensions for X11 if avilable (default: without)],[],[with_extensions=no])
- 
- if test yes = $with_extensions ; then
-   AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension, [
-@@ -759,7 +788,7 @@ if test yes = "$with_sound" ; then
-   AC_MSG_CHECKING(if sound is supported on this platform)
-   AC_CACHE_VAL(snes9x_cv_sound, [
-   AC_TRY_COMPILE([
--#if defined(__linux) || defined(__sun) || defined(__sgi)
-+#if defined(__linux) || defined(__sun) || defined(__sgi) || defined(__NetBSD__) || defined(__DragonFly__)
- /* */
- #else
- #error No sound for this platform
diff --git a/emulators/snes9x/patches/patch-aq b/emulators/snes9x/patches/patch-aq
deleted file mode 100644
index 4ca14b5b920..00000000000
--- a/emulators/snes9x/patches/patch-aq
+++ /dev/null
@@ -1,186 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2007/02/15 22:53:09 joerg Exp $
-
---- configure.orig	2004-12-30 22:15:48.000000000 +0000
-+++ configure
-@@ -23,7 +23,9 @@ ac_help="$ac_help
- ac_help="$ac_help
-   --with(out)-aido        Use a shared memory area for output (default: without)"
- ac_help="$ac_help
--  --with(out)-assembler   Use assembler cores if available (default: with)"
-+  --with(out)-assembler   Use assembler cores if available (default: without)"
-+ac_help="$ac_help
-+  --with(out)-mmx         Use MMX if available (default: without)"
- ac_help="$ac_help
-   --with(out)-joystick    Enable joystick support if available (default: with)"
- ac_help="$ac_help
-@@ -45,7 +47,7 @@ ac_help="$ac_help
- ac_help="$ac_help
-   --with-x                use the X Window System"
- ac_help="$ac_help
--  --with(out)-extensions  Use DGA- and vidmode-extensions for X11 if avilable (default: with)"
-+  --with(out)-extensions  Use DGA- and vidmode-extensions for X11 if avilable (default: without)"
- ac_help="$ac_help
-   --with(out)-sound       Enable sound if available (default: with)"
- 
-@@ -2995,6 +2997,74 @@ fi
- 
- echo "$ac_t""$snes9x_cv_linux_os" 1>&6
- 
-+echo $ac_n "checking if the OS is NetBSD""... $ac_c" 1>&6
-+echo "configure:2966: checking if the OS is NetBSD" >&5
-+if eval "test \"`echo '$''{'snes9x_cv_netbsd_os'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+  cat > conftest.$ac_ext <<EOF
-+#line 2972 "configure"
-+#include "confdefs.h"
-+
-+#ifdef __NetBSD__
-+/* */
-+#else
-+#error Not NetBSD.
-+#endif
-+  
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  snes9x_cv_netbsd_os=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  snes9x_cv_netbsd_os=no
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$snes9x_cv_netbsd_os" 1>&6
-+
-+echo $ac_n "checking if the OS is DragonFly""... $ac_c" 1>&6
-+echo "configure:2966: checking if the OS is DragonFly" >&5
-+if eval "test \"`echo '$''{'snes9x_cv_dragonfly_os'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+  cat > conftest.$ac_ext <<EOF
-+#line 2972 "configure"
-+#include "confdefs.h"
-+
-+#ifdef __DragonFly__
-+/* */
-+#else
-+#error Not DragonFly.
-+#endif
-+  
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  snes9x_cv_dragonfly_os=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  snes9x_cv_dragonfly_os=no
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$snes9x_cv_dragonfly_os" 1>&6
-+
- echo $ac_n "checking if the OS is HP-UX""... $ac_c" 1>&6
- echo "configure:3000: checking if the OS is HP-UX" >&5
- if eval "test \"`echo '$''{'snes9x_cv_hpux_os'+set}'`\" = set"; then
-@@ -3069,7 +3139,7 @@ if test "${with_assembler+set}" = set; t
-   withval="$with_assembler"
-   :
- else
--  with_assembler=yes
-+  with_assembler=no
- fi
- 
- 
-@@ -3141,7 +3211,6 @@ if test $NASM != "not_found"; then
-   ZSNESFX='ZSNESFX=1'
-   ZSNESC4='ZSNESC4=1'
-   ASMCPU='ASMCPU=1'
--  ASMKREED='ASMKREED=1'
- #  SPC700ASM='SPC700ASM=1'
-   I386SPC='i386/SPC.O'
-   CPUINC='-Ii386'
-@@ -3172,6 +3241,21 @@ EOF
-   fi; fi
- fi
- 
-+# Check whether --with-mmx or --without-mmx was given.
-+if test "${with_mmx+set}" = set; then
-+  withval="$with_mmx"
-+  :
-+else
-+  with_mmx=no
-+fi
-+
-+
-+if test yes = "$with_mmx"; then
-+  if test $NASM != "not_found"; then
-+    ASMKREED='ASMKREED=1'
-+  fi
-+fi
-+
- # Check whether --with-joystick or --without-joystick was given.
- if test "${with_joystick+set}" = set; then
-   withval="$with_joystick"
-@@ -3181,7 +3265,7 @@ else
- fi
- 
- 
--if test yes = "$snes9x_cv_linux_os" -a yes = "$with_joystick"; then
-+if test \( yes = "$snes9x_cv_linux_os" -o yes = "$snes9x_cv_netbsd_os" -o yes = "$snes9x_cv_dragonfly_os" \) -a yes = "$with_joystick"; then
-    JOYDEFINES=' -DJOYSTICK_SUPPORT'
- else
-    with_joystick="no"
-@@ -4000,8 +4084,10 @@ cat > conftest.$ac_ext <<EOF
- #line 4001 "configure"
- #include "confdefs.h"
- 
-+#include <X11/Intrinsic.h>
-+
- int main() {
--${x_direct_test_function}()
-+${x_direct_test_function}(0)
- ; return 0; }
- EOF
- if { (eval echo configure:4008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -4093,7 +4179,7 @@ fi
- if test xyes = x$no_x ; then
-     echo "configure: warning: X is normally required to build on Unix." 1>&2
- else
--  X_LDFLAGS="-L$x_libraries"
-+  X_LDFLAGS="-L$x_libraries -Wl,-R$x_libraries"
-   X_LIBS="-lX11 -lXext"
-   LIBS="$LIBS $X_LIBS"
-   SYSLIBS="$SYSLIBS $X_LDFLAGS $X_LIBS"
-@@ -4113,7 +4199,7 @@ if test "${with_extensions+set}" = set; 
-   withval="$with_extensions"
-   :
- else
--  with_extensions=yes
-+  with_extensions=no
- fi
- 
- 
-@@ -4648,7 +4734,7 @@ else
- #line 4649 "configure"
- #include "confdefs.h"
- 
--#if defined(__linux) || defined(__sun) || defined(__sgi)
-+#if defined(__linux) || defined(__sun) || defined(__sgi) || defined(__NetBSD__) || defined(__DragonFly__)
- /* */
- #else
- #error No sound for this platform
diff --git a/emulators/snes9x/patches/patch-ar b/emulators/snes9x/patches/patch-ar
deleted file mode 100644
index e366840c434..00000000000
--- a/emulators/snes9x/patches/patch-ar
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2006/07/05 21:21:37 wiz Exp $
-
---- dsp1.h.orig	2006-07-05 21:11:31.000000000 +0000
-+++ dsp1.h
-@@ -123,8 +123,8 @@ START_EXTERN_C
- void S9xResetDSP1 ();
- uint8 S9xGetDSP (uint16 Address);
- void S9xSetDSP (uint8 Byte, uint16 Address);
--END_EXTERN_C
- 
- extern struct SDSP1 DSP1;
-+END_EXTERN_C
- 
- #endif
diff --git a/emulators/snes9x/patches/patch-as b/emulators/snes9x/patches/patch-as
deleted file mode 100644
index 4aa344f2a76..00000000000
--- a/emulators/snes9x/patches/patch-as
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-as,v 1.1 2006/07/05 21:21:37 wiz Exp $
-
---- ppu.h.orig	2004-12-30 22:15:47.000000000 +0000
-+++ ppu.h
-@@ -332,9 +332,11 @@ typedef struct{
- 	uint8 _5A22;
- } SnesModel;
- 
-+START_EXTERN_C
- extern SnesModel* Model;
- extern SnesModel M1SNES;
- extern SnesModel M2SNES;
-+END_EXTERN_C
- 
- #define MAX_5C77_VERSION 0x01
- #define MAX_5C78_VERSION 0x03
diff --git a/emulators/snes9x/patches/patch-ba b/emulators/snes9x/patches/patch-ba
deleted file mode 100644
index cfbb4837e2b..00000000000
--- a/emulators/snes9x/patches/patch-ba
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2006/10/18 13:11:59 rillig Exp $
-
-SunPro interprets the original code as "extern C" pointer to "extern C"
-functions, which conflicts with the definition of the functions.
-
---- apu.h.orig	2004-12-30 23:15:47.000000000 +0100
-+++ apu.h	2006-10-18 13:50:59.265817188 +0200
-@@ -150,6 +150,9 @@ STATIC inline void S9xAPUPackStatus()
- 		      (IAPU._Zero & 0x80) | (IAPU._Overflow << 6);
- }
- 
-+/* Note: This must be outside the "extern" block. */
-+typedef void (*S9xApuOpcodeFunction)(void);
-+
- START_EXTERN_C
- void S9xResetAPU (void);
- bool8 S9xInitAPU ();
-@@ -167,7 +170,7 @@ void S9xOpenCloseSoundTracingFile (bool8
- void S9xPrintAPUState ();
- extern int32 S9xAPUCycles [256];	// Scaled cycle lengths
- extern int32 S9xAPUCycleLengths [256];	// Raw data.
--extern void (*S9xApuOpcodes [256]) (void);
-+extern S9xApuOpcodeFunction S9xApuOpcodes[256];
- END_EXTERN_C
- 
- 
diff --git a/emulators/snes9x/patches/patch-bc b/emulators/snes9x/patches/patch-bc
deleted file mode 100644
index 6ddc0cb8f9c..00000000000
--- a/emulators/snes9x/patches/patch-bc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2006/10/18 13:11:59 rillig Exp $
-
-Type mismatch, caused by not using header files for function
-declarations.
-
---- unix/x11.cpp.orig	2004-12-30 23:15:47.000000000 +0100
-+++ unix/x11.cpp	2006-10-18 14:18:18.126928644 +0200
-@@ -209,7 +209,7 @@ int ErrorHandler (Display *, XErrorEvent
- void TVMode (int width, int height);
- void S9xDisplayStateChange (const char *str, bool8 on);
- 
--void Init_2xSaI (uint32);
-+int Init_2xSaI (uint32);
- void Super2xSaI (uint8 *srcPtr, uint32 srcPitch,
- 		 uint8 *deltaPtr, uint8 *dstPtr, uint32 dstPitch,
- 		 int width, int height);
diff --git a/emulators/spim/DESCR b/emulators/spim/DESCR
deleted file mode 100644
index 7345e277543..00000000000
--- a/emulators/spim/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-MIPS R2000 Simulator -- "1/25th the performance at none of the cost"
-
-Spim/Xspim simulates MIPS R2000 assembly code, providing a gdb and xgdb
-like interface to the classical MIPS RISC CPU.  The virtual machine
-it provides can be either the one presented by the MIPS assembler or the
-one of the bare hardware.  The simulator can also be built to simulate the
-pipeline architecture of the MIPS machine (both the control and floating
-point pipelines).  When built for this, it also simulates and displays
-an instruction and data cache.
-
-This simulator is useful in CS and EE classes, including providing a
-target machine for compilers courses, lower division assembly language
-programming, microprocessor design courses, etc...
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
deleted file mode 100644
index 93c2b1da48c..00000000000
--- a/emulators/spim/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.32 2006/12/27 13:37:36 joerg Exp $
-
-DISTNAME=	spim-7.1
-PKGREVISION=	3
-CATEGORIES=	emulators
-MASTER_SITES=	http://www.cs.wisc.edu/~larus/SPIM/ \
-		ftp://ftp.cs.wisc.edu/pub/spim/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.cs.wisc.edu/~larus/spim.html
-COMMENT=	MIPS R2000 Simulator
-
-RESTRICTED=		selling is not allowed
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-#DIST_SUBDIR=		${PKGNAME}
-
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	./Configure
-USE_IMAKE=		yes
-USE_TOOLS+=		gzip lex
-XMKMF=			${X11BASE}/bin/xmkmf # don't specify -a option
-
-BUILD_TARGET=		y.tab.c depend all
-
-pre-configure:
-	@${RM} -f ${WRKSRC}/y.tab.*
-
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/spim
-	${CHMOD} a+rx ${PREFIX}/share/spim
-
-post-install:
-	@${ECHO} "Installing spim/xspim documentation"
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/spim \
-		&& ${CHMOD} a+rx ${PREFIX}/share/doc/spim
-	${INSTALL_DATA} ${WRKSRC}/Documentation/spim.tex \
-		${PREFIX}/share/doc/spim
-	${INSTALL_DATA} ${WRKSRC}/Documentation/*.id \
-		${PREFIX}/share/doc/spim
-	${INSTALL_DATA} ${WRKSRC}/Documentation/cycle.ps \
-		${PREFIX}/share/doc/spim
-
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/spim/PLIST b/emulators/spim/PLIST
deleted file mode 100644
index 4cb8d2b3b96..00000000000
--- a/emulators/spim/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/12 19:27:22 joerg Exp $
-bin/spim
-bin/xspim
-${IMAKE_MAN_DIR}/spim.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xspim.${IMAKE_MAN_SUFFIX}
-share/doc/spim/cause_reg.id
-share/doc/spim/cycle.ps
-share/doc/spim/io_reg.id
-share/doc/spim/mem.id
-share/doc/spim/mips.id
-share/doc/spim/spim.tex
-share/doc/spim/stack-frame.id
-share/doc/spim/status_reg.id
-share/doc/spim/xinterface.id
-share/spim/exceptions.s
-@dirrm share/spim
-@dirrm share/doc/spim
diff --git a/emulators/spim/distinfo b/emulators/spim/distinfo
deleted file mode 100644
index 0f0f7157a90..00000000000
--- a/emulators/spim/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.10 2006/10/17 08:42:03 markd Exp $
-
-SHA1 (spim-7.1.tar.gz) = 3e0399e4c2e007aecbd2532b9d8f3f63b7035ff9
-RMD160 (spim-7.1.tar.gz) = 175f63d95011a20087ab135de54b03fccc98286d
-Size (spim-7.1.tar.gz) = 307599 bytes
-SHA1 (patch-aa) = ad07b8a31f95c27596dc56e7ba687df62794b404
-SHA1 (patch-ab) = 5e1cf699e926f434d6f6aba8f55df7ad7da44fdb
-SHA1 (patch-ac) = f3785adfdedf5744b0ce7b0bae5f39436bd4ac88
-SHA1 (patch-ad) = cf4e94736a0f5f5d036d362dfc6ca09e4e62bb9e
diff --git a/emulators/spim/patches/patch-aa b/emulators/spim/patches/patch-aa
deleted file mode 100644
index bfb4fdff4df..00000000000
--- a/emulators/spim/patches/patch-aa
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/04/24 22:22:55 markd Exp $
-
---- Imakefile.orig	2005-01-03 13:03:48.000000000 +1300
-+++ Imakefile
-@@ -44,13 +44,13 @@
- #
- 
- # Full path for directory that will hold the exception handler file:
--EXCEPTION_DIR = .
-+EXCEPTION_DIR = $(PREFIX)/share/spim
- 
- # Full path for the directory that will hold the executable files:
--BIN_DIR = /usr/unsup/bin
-+# BIN_DIR =  $(PREFIX)/bin
- 
- # Full path for the directory that will hold the man files:
--MAN_DIR = /var/unsup/man
-+# MAN_DIR = $(PREFIX)/man/man1
- 
- 
- # If you have flex, use it instead of lex.  If you use flex, define this
-@@ -111,7 +111,7 @@ CSH = csh
- #  Program dependencies:
- #
- 
--AllTarget(spim)
-+AllTarget(spim xspim)
- 
- spim:	force
- 	@touch .spim-made
-@@ -131,10 +131,10 @@ configuration:
- NormalProgramTarget(spim_sub,$(OBJS),,,)
- NormalProgramTarget(xspim_sub,$(XOBJS),$(DEPLIBS),$(LOCALLIBS),$(SYSLIBS))
- 
--InstallProgram(spim,$(BIN_DIR))
--InstallProgram(xspim,$(BIN_DIR))
--InstallManPage(spim,$(MAN_DIR))
--InstallManPage(xspim,$(MAN_DIR))
-+InstallProgram(spim,$(BINDIR))
-+InstallProgram(xspim,$(BINDIR))
-+InstallManPage(spim,$(MANDIR))
-+InstallManPage(xspim,$(MANDIR))
- InstallNonExec(exceptions.s,$(EXCEPTION_DIR))
- 
- 
-@@ -250,7 +250,7 @@ shar:
- 	mv -f lex.yy.c.xx lex.yy.c
- 
- depend::
--	makedepend -w10 *.c
-+	makedepend -w10 -I$(X11BASE)/include *.c
- 
- #
- # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/emulators/spim/patches/patch-ab b/emulators/spim/patches/patch-ab
deleted file mode 100644
index 62f7274167e..00000000000
--- a/emulators/spim/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/07/17 21:38:45 kristerw Exp $
-
---- Configure.orig	2005-07-17 23:11:53.000000000 +0200
-+++ Configure	2005-07-17 23:13:20.000000000 +0200
-@@ -150,14 +150,15 @@
- 
- 
- echo
--echo Checking for /usr/include/termios.h
--if [ -f /usr/include/termios.h ]; then
--  echo "-DUSE_TERMIOS" >> configuration
--  echo "Yes, it is there"
--else
--  # No termios
--  echo "No, it is not there"
--fi;
-+# The pkg uses unportable termios.h stuff, so disable it.
-+#echo Checking for /usr/include/termios.h
-+#if [ -f /usr/include/termios.h ]; then
-+#  echo "-DUSE_TERMIOS" >> configuration
-+#  echo "Yes, it is there"
-+#else
-+#  # No termios
-+#  echo "No, it is not there"
-+#fi;
- 
- 
- if [ -f /usr/lib/libc.dylib ]; then
diff --git a/emulators/spim/patches/patch-ac b/emulators/spim/patches/patch-ac
deleted file mode 100644
index ebd9e9b4355..00000000000
--- a/emulators/spim/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/01/12 21:02:10 joerg Exp $
-
---- run.c.orig	2006-01-12 20:43:59.000000000 +0000
-+++ run.c
-@@ -33,6 +33,7 @@
- #endif
- 
- #include <math.h>
-+#include <stdlib.h>
- #include <stdio.h>
- 
- #ifdef WIN32
-@@ -58,10 +59,6 @@
- 
- int force_break = 0;	/* For the execution env. to force an execution break */
- 
--#ifndef _MSC_VER
--extern int errno;
--long atol (const char *);
--#endif
- 
- 
- 
diff --git a/emulators/spim/patches/patch-ad b/emulators/spim/patches/patch-ad
deleted file mode 100644
index 4a87a1ccab0..00000000000
--- a/emulators/spim/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/10/17 08:42:03 markd Exp $
-
---- spim.c.orig	2006-10-17 21:33:10.000000000 +1300
-+++ spim.c
-@@ -111,7 +111,7 @@ int spim_return_value;		/* Value returne
- 
- /* Non-zero => load standard exception handler */
- static int load_exception_handler = 1;
--static char *exception_file_name = DEFAULT_EXCEPTION_HANDLER;
-+char *exception_file_name = DEFAULT_EXCEPTION_HANDLER;
- static int console_state_saved;
- #ifdef USE_TERMIOS
- static struct termios saved_console_state;
diff --git a/emulators/stella/DESCR b/emulators/stella/DESCR
deleted file mode 100644
index f964907a60c..00000000000
--- a/emulators/stella/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Stella is a freely distributed multi-platform Atari 2600 VCS emulator;
-originally developed for Linux by Bradford W. Mott. Stella allows you to
-enjoy all of your favorite 2600 games once again by emulating the 2600's
-hardware with software. Stella is written in C++, which allows it to be
-ported to other operating systems and architectures. Since its original
-release Stella has been ported to AcornOS, AmigaOS, DOS, FreeBSD, IRIX,
-Linux, MacOS, OpenStep, OS/2, Unix, and Windows.
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
deleted file mode 100644
index 63dd1cd8241..00000000000
--- a/emulators/stella/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.31 2006/06/12 16:28:07 wiz Exp $
-
-STELLA_VERSION=	2.1
-DISTNAME=	stella-${STELLA_VERSION}-src
-PKGNAME=	stella-${STELLA_VERSION}
-PKGREVISION=	2
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=stella/}
-
-MAINTAINER=	dillo@NetBSD.org
-HOMEPAGE=	http://stella.sourceforge.net/
-COMMENT=	Multi-platform Atari 2600 VCS emulator
-
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake
-USE_DIRS+=		xdg-1.1
-UNLIMIT_RESOURCES=	datasize
-
-HAS_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=	3.0
-.endif
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/stella/PLIST b/emulators/stella/PLIST
deleted file mode 100644
index 3e7f49ada16..00000000000
--- a/emulators/stella/PLIST
+++ /dev/null
@@ -1,36 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/07 06:28:44 dillo Exp $
-bin/stella
-share/doc/stella/Announce.txt
-share/doc/stella/Changes.txt
-share/doc/stella/Copyright.txt
-share/doc/stella/License.txt
-share/doc/stella/README-PSP.txt
-share/doc/stella/README-SDL.txt
-share/doc/stella/Readme.txt
-share/doc/stella/Todo.txt
-share/doc/stella/debugger.html
-share/doc/stella/graphics/chucky_cheese.png
-share/doc/stella/graphics/circuit.png
-share/doc/stella/graphics/console.png
-share/doc/stella/graphics/eventmapping.png
-share/doc/stella/graphics/eventmapping_remap.png
-share/doc/stella/graphics/jr_pacman.png
-share/doc/stella/graphics/launcher.png
-share/doc/stella/graphics/launcher_options_rom.png
-share/doc/stella/graphics/launcher_options_snap.png
-share/doc/stella/graphics/options_about.png
-share/doc/stella/graphics/options_audio.png
-share/doc/stella/graphics/options_gameinfo.png
-share/doc/stella/graphics/options_help.png
-share/doc/stella/graphics/options_video.png
-share/doc/stella/graphics/pacman.png
-share/doc/stella/graphics/rom_browser.png
-share/doc/stella/graphics/secret_quest.png
-share/doc/stella/graphics/space_invaders.png
-share/doc/stella/stella.html
-share/icons/stella.xpm
-share/stella/stella.pro
-@dirrm share/stella
-@comment in xdg-dirs: @dirrm share/icons
-@dirrm share/doc/stella/graphics
-@dirrm share/doc/stella
diff --git a/emulators/stella/distinfo b/emulators/stella/distinfo
deleted file mode 100644
index 90108981c9b..00000000000
--- a/emulators/stella/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.8 2006/04/28 14:11:25 joerg Exp $
-
-SHA1 (stella-2.1-src.tar.gz) = 2ab0163a24ad877d81dc8f9ee77cfd1482194e14
-RMD160 (stella-2.1-src.tar.gz) = 7ddecbcc78bf0ddd3a0aedf924f00b69e2ec6013
-Size (stella-2.1-src.tar.gz) = 1062215 bytes
-SHA1 (patch-aa) = 76545aaaf3fa320b8b83396c0a90588cd7b404af
-SHA1 (patch-ab) = 84cd725e239a305ab6ff2eb5f4f4a7aa68536562
diff --git a/emulators/stella/patches/patch-aa b/emulators/stella/patches/patch-aa
deleted file mode 100644
index b397b461210..00000000000
--- a/emulators/stella/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/04/07 06:28:44 dillo Exp $
-
---- src/emucore/unzip.h.orig	2005-05-18 18:02:53.000000000 +0200
-+++ src/emucore/unzip.h
-@@ -58,6 +58,9 @@ typedef unzFile__ *unzFile;
- typedef voidp unzFile;
- #endif
- 
-+#ifndef OF
-+#define OF(X)	X
-+#endif
- 
- #define UNZ_OK                                  (0)
- #define UNZ_END_OF_LIST_OF_FILE (-100)
diff --git a/emulators/stella/patches/patch-ab b/emulators/stella/patches/patch-ab
deleted file mode 100644
index 88cfbc4fd00..00000000000
--- a/emulators/stella/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2006/04/28 14:11:25 joerg Exp $
-
---- configure.orig	2006-04-28 13:37:47.000000000 +0000
-+++ configure
-@@ -563,7 +563,7 @@ else
- 	echo_n "Checking hosttype... "
- 	echo $_host_os
- 	case $_host_os in
--		linux* | openbsd* | freebsd* | netbsd* | bsd* | sunos* | hpux* | beos*)
-+		linux* | openbsd* | freebsd* | netbsd* | bsd* | sunos* | hpux* | beos* | dragonfly*)
- 			DEFINES="$DEFINES -DUNIX"
- 			_host_os=unix
- 			;;
diff --git a/emulators/suse100_aspell/DESCR b/emulators/suse100_aspell/DESCR
deleted file mode 100644
index 32264c795f3..00000000000
--- a/emulators/suse100_aspell/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with glibc2 which require
-aspell libraries.
diff --git a/emulators/suse100_aspell/Makefile b/emulators/suse100_aspell/Makefile
deleted file mode 100644
index e9754c61ff2..00000000000
--- a/emulators/suse100_aspell/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/06/30 16:20:23 salo Exp $
-
-DISTNAME=		suse_aspell-${SUSE_VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for Aspell library
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-.endif
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_aspell/Makefile.i386 b/emulators/suse100_aspell/Makefile.i386
deleted file mode 100644
index 15174f4f040..00000000000
--- a/emulators/suse100_aspell/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/04/18 14:08:33 salo Exp $
-
-RPMFILES=		aspell-0.60.3-2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_aspell/Makefile.powerpc b/emulators/suse100_aspell/Makefile.powerpc
deleted file mode 100644
index a63b54a46b2..00000000000
--- a/emulators/suse100_aspell/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/04/18 14:08:33 salo Exp $
-
-RPMFILES=		aspell-0.60.3-2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_aspell/Makefile.x86_64 b/emulators/suse100_aspell/Makefile.x86_64
deleted file mode 100644
index eb67615315a..00000000000
--- a/emulators/suse100_aspell/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/04/18 14:08:33 salo Exp $
-
-RPMFILES=		aspell-0.60.3-2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_aspell/distinfo b/emulators/suse100_aspell/distinfo
deleted file mode 100644
index fd35b9800b2..00000000000
--- a/emulators/suse100_aspell/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/04/18 14:08:33 salo Exp $
-
-SHA1 (suse100/i586/aspell-0.60.3-2.i586.rpm) = f56d241c02fc3cb2186768ea57357d61a1afc067
-RMD160 (suse100/i586/aspell-0.60.3-2.i586.rpm) = 79f3417f3ac27281195da685efa7e77fbe511a65
-Size (suse100/i586/aspell-0.60.3-2.i586.rpm) = 787678 bytes
-SHA1 (suse100/ppc/aspell-0.60.3-2.ppc.rpm) = dbdd1f4f5cabe7adc33ffa69b7d08400bf4056d6
-RMD160 (suse100/ppc/aspell-0.60.3-2.ppc.rpm) = d50736c47ed8bdf2ab420bd8a52f784335da34ea
-Size (suse100/ppc/aspell-0.60.3-2.ppc.rpm) = 882754 bytes
-SHA1 (suse100/x86_64/aspell-0.60.3-2.x86_64.rpm) = 25b85cfb27a00de3fd5c44d9c8c473b82d40f02f
-RMD160 (suse100/x86_64/aspell-0.60.3-2.x86_64.rpm) = 71d3a2c5b1a02a4aff61b338ee5cf0070f0d85fb
-Size (suse100/x86_64/aspell-0.60.3-2.x86_64.rpm) = 823974 bytes
diff --git a/emulators/suse100_base/DESCR b/emulators/suse100_base/DESCR
deleted file mode 100644
index 62e5a3f87e9..00000000000
--- a/emulators/suse100_base/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with glibc2 which don't
-require X11 shared libraries.
diff --git a/emulators/suse100_base/INSTALL b/emulators/suse100_base/INSTALL
deleted file mode 100644
index 928f5a6e057..00000000000
--- a/emulators/suse100_base/INSTALL
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: INSTALL,v 1.3 2006/06/23 15:48:50 jlam Exp $
-
-case "${STAGE}" in
-POST-INSTALL)
-	emulsubdir=linux
-
-	emuldir="@OPSYS_EMULDIR@"
-	pkgemuldir="${PKG_PREFIX}/emul/$emulsubdir"
-
-	emuldir_pwd=`cd $emuldir 2>/dev/null && ${PWD_CMD}`
-	pkgemuldir_pwd=`cd $pkgemuldir 2>/dev/null && ${PWD_CMD}`
-
-	if ${TEST} "$emuldir_pwd" != "$pkgemuldir_pwd"; then
-		if ${TEST} -e $emuldir -o -L $emuldir; then
-			${CAT} << EOF
-==============================================================================
-You must create a symbolic link for ${PKGNAME} to work properly:
-
-	$pkgemuldir  ->  $emuldir
-
-It seems there is something else located at $emuldir.
-==============================================================================
-EOF
-		else
-			${MKDIR} -p `${DIRNAME} $emuldir` && 
-			${LN} -fs $pkgemuldir $emuldir
-		fi
-	fi
-	;;
-esac
diff --git a/emulators/suse100_base/MESSAGE.DragonFly b/emulators/suse100_base/MESSAGE.DragonFly
deleted file mode 100644
index ad7982f820c..00000000000
--- a/emulators/suse100_base/MESSAGE.DragonFly
+++ /dev/null
@@ -1,7 +0,0 @@
-==============================================================================
-$NetBSD: MESSAGE.DragonFly,v 1.1 2006/06/19 23:24:21 jlam Exp $
-
-Do not forget to include COMPAT_LINUX in your kernel configuration file.
-You will also need to load the "linux.ko" kernel module (using kldload(8)
-or by setting linux_enable=yes in /etc/rc.conf.
-==============================================================================
diff --git a/emulators/suse100_base/MESSAGE.FreeBSD b/emulators/suse100_base/MESSAGE.FreeBSD
deleted file mode 100644
index d31f10c9a2e..00000000000
--- a/emulators/suse100_base/MESSAGE.FreeBSD
+++ /dev/null
@@ -1,7 +0,0 @@
-==============================================================================
-$NetBSD: MESSAGE.FreeBSD,v 1.1 2006/06/19 23:24:21 jlam Exp $
-
-Do not forget to include COMPAT_LINUX in your kernel configuration file.
-You will also need to load the "linux.ko" kernel module (using kldload(8)
-or by setting linux_enable=yes in /etc/rc.conf.
-==============================================================================
diff --git a/emulators/suse100_base/MESSAGE.NetBSD b/emulators/suse100_base/MESSAGE.NetBSD
deleted file mode 100644
index 2019ec634e5..00000000000
--- a/emulators/suse100_base/MESSAGE.NetBSD
+++ /dev/null
@@ -1,6 +0,0 @@
-==============================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1 2006/06/19 23:24:21 jlam Exp $
-
-Do not forget to include COMPAT_LINUX in your kernel configuration file.
-Linux binaries require this option in order to work.
-==============================================================================
diff --git a/emulators/suse100_base/Makefile b/emulators/suse100_base/Makefile
deleted file mode 100644
index 2a8182c4f91..00000000000
--- a/emulators/suse100_base/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2007/03/02 10:35:04 sketch Exp $
-
-DISTNAME=		suse_base-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package
-
-CONFLICTS=		linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
-
-# these files are handled by manually during de-/installation/pkg_add
-CHECK_FILES_SKIP+=	${PREFIX}/${EMULSUBDIR}/dev/.*
-CHECK_FILES_SKIP+=	${PREFIX}/${EMULSUBDIR}/etc/ld.so.cache
-
-EXTRACT_ONLY=		# empty
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q} LINUX_LIB=${LINUX_LIB:Q}
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-RPMIGNOREPATH=		./etc/bash.bashrc ./etc/bash_completion.d \
-			./etc/cron.daily ./etc/csh.cshrc ./etc/csh.login \
-			./etc/inittab ./etc/hushlogins ./etc/java \
-			./etc/mailcap ./etc/mime.types ./etc/nsswitch.conf \
-			./etc/pam.d ./etc/profile ./etc/profile.dos \
-			./etc/rc.d.README ./etc/rpc ./etc/shells ./etc/ttytype
-
-LINUX_LDD=		${PREFIX}/${EMULSUBDIR}/usr/bin/ldd
-LINUX_LIB?=		lib
-
-.include "../../mk/bsd.prefs.mk"
-
-INSTALLATION_DIRS=	sbin
-
-do-build:
-	@for FILE in ${FILESDIR}/SuSE-release ${FILESDIR}/*.sh; do \
-	  ${SED} -e 's#@@EMULDIR@@#${EMULDIR}#g' \
-	         -e 's#@@EMULSUBDIR@@#${EMULSUBDIR}#g' \
-	         -e 's#@@LINUX_LIB@@#${LINUX_LIB}#g' \
-	         -e 's#@@VERSION@@#${SUSE_VERSION}#g' \
-	         -e 's#@@ARCH@@#${SUSE_ARCH}#g' \
-	    $$FILE >${WRKDIR}/`basename $$FILE`; \
-	done
-
-do-install:
-	for FILE in ${WRKDIR}/*.sh; do \
-	  ${INSTALL_SCRIPT} $$FILE ${PREFIX}/sbin/`basename $$FILE .sh`; \
-	done
-	${INSTALL_DATA_DIR} ${EMULDIR}/dev
-	${INSTALL_DATA} /dev/MAKEDEV ${EMULDIR}/dev
-	if [ -f /dev/MAKEDEV.subr ]; then \
-	  ${INSTALL_DATA} /dev/MAKEDEV.subr ${EMULDIR}/dev; \
-	fi
-	cd ${EMULDIR}/dev && ${SH} ./MAKEDEV  std audio
-	cd ${EMULDIR}/dev && ${LN} -fs sound dsp
-	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	${RPM2PKG} ${RPM2PKGARGS}
-	${ECHO} "@dirrm ${EMULSUBDIR}" >>${PLIST_SRC}
-	${INSTALL_DATA} ${WRKDIR}/SuSE-release ${EMULDIR}/etc
-	${INSTALL_DATA_DIR} ${EMULDIR}/proc
-	${LN} -fs ${EMULDIR}/proc/mounts ${EMULDIR}/etc/mtab
-.if ${OPSYS} == "FreeBSD"
-	${BRANDELF} -t Linux ${EMULDIR}/sbin/ldconfig
-.endif
-	${EMULDIR}/sbin/ldconfig -r ${EMULDIR}
-	${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" \
-	  >>${PLIST_SRC}
-	${ECHO} "@unexec ${RMDIR} %D/${EMULSUBDIR}/etc 2>/dev/null || ${TRUE}" \
-	  >>${PLIST_SRC}
-	${SED}	-e 's:#! :#! ${EMULDIR}:' \
-		-e 's:^RTLD=:RTLD=/${EMULSUBDIR}:' \
-		< ${LINUX_LDD} > ${LINUX_LDD}.new
-	${MV} ${LINUX_LDD}.new ${LINUX_LDD}
-	${CHMOD} +x ${LINUX_LDD}
-	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} - POST-INSTALL
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_base/Makefile.i386 b/emulators/suse100_base/Makefile.i386
deleted file mode 100644
index d5ab050b105..00000000000
--- a/emulators/suse100_base/Makefile.i386
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		aaa_base-10.0-28.${SUSE_ARCH}.rpm \
-			bash-3.0-17.${SUSE_ARCH}.rpm \
-			coreutils-5.3.0-20.2.${SUSE_ARCH}.rpm \
-			glibc-2.3.5-40.${SUSE_ARCH}.rpm \
-			libgcc-4.0.2_20050901-3.${SUSE_ARCH}.rpm \
-			libacl-2.2.31-3.${SUSE_ARCH}.rpm \
-			libattr-2.4.24-2.${SUSE_ARCH}.rpm \
-			libselinux-1.23.11-3.${SUSE_ARCH}.rpm \
-			libstdc++-4.0.2_20050901-3.${SUSE_ARCH}.rpm \
-			ncurses-5.4-71.${SUSE_ARCH}.rpm \
-			readline-5.0-9.${SUSE_ARCH}.rpm \
-			zlib-1.2.3-3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_base/Makefile.powerpc b/emulators/suse100_base/Makefile.powerpc
deleted file mode 100644
index 2d3601c5ae6..00000000000
--- a/emulators/suse100_base/Makefile.powerpc
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		aaa_base-10.0-28.${SUSE_ARCH}.rpm \
-			bash-3.0-17.${SUSE_ARCH}.rpm \
-			coreutils-5.3.0-20.2.${SUSE_ARCH}.rpm \
-			glibc-2.3.5-40.${SUSE_ARCH}.rpm \
-			libgcc-4.0.2_20050901-3.${SUSE_ARCH}.rpm \
-			libacl-2.2.31-3.${SUSE_ARCH}.rpm \
-			libattr-2.4.24-2.${SUSE_ARCH}.rpm \
-			libselinux-1.23.11-3.${SUSE_ARCH}.rpm \
-			libstdc++-4.0.2_20050901-3.${SUSE_ARCH}.rpm \
-			ncurses-5.4-71.${SUSE_ARCH}.rpm \
-			readline-5.0-9.${SUSE_ARCH}.rpm \
-			zlib-1.2.3-3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_base/Makefile.x86_64 b/emulators/suse100_base/Makefile.x86_64
deleted file mode 100644
index fd5652311d5..00000000000
--- a/emulators/suse100_base/Makefile.x86_64
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		aaa_base-10.0-28.${SUSE_ARCH}.rpm \
-			bash-3.0-17.${SUSE_ARCH}.rpm \
-			coreutils-5.3.0-20.2.${SUSE_ARCH}.rpm \
-			glibc-2.3.5-40.${SUSE_ARCH}.rpm \
-			libgcc-4.0.2_20050901-3.${SUSE_ARCH}.rpm \
-			libacl-2.2.31-3.${SUSE_ARCH}.rpm \
-			libattr-2.4.24-2.${SUSE_ARCH}.rpm \
-			libselinux-1.23.11-3.${SUSE_ARCH}.rpm \
-			libstdc++-4.0.2_20050901-3.${SUSE_ARCH}.rpm \
-			ncurses-5.4-71.${SUSE_ARCH}.rpm \
-			readline-5.0-9.${SUSE_ARCH}.rpm \
-			zlib-1.2.3-3.${SUSE_ARCH}.rpm
-
-LINUX_LIB=		lib64
diff --git a/emulators/suse100_base/PLIST b/emulators/suse100_base/PLIST
deleted file mode 100644
index 232a2a70acb..00000000000
--- a/emulators/suse100_base/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/09 20:34:10 tonio Exp $
-sbin/linux-mkpwd
-@unexec ${RM} -f %D/${EMULSUBDIR}/etc/ld.so.cache
-${EMULSUBDIR}/etc/SuSE-release
-${EMULSUBDIR}/etc/mtab
-${EMULSUBDIR}/usr/${LINUX_LIB}/libz.so.1
-@exec ${MKDIR} %D/${EMULSUBDIR}/proc
-@dirrm ${EMULSUBDIR}/proc
-@unexec cd %D/${EMULSUBDIR}/etc && ${RM} -f group gshadow passwd shadow
-@exec ${MKDIR} %D/${EMULSUBDIR}/dev
-@exec cp -p /dev/MAKEDEV  %D/${EMULSUBDIR}/dev
-@exec cd %D/${EMULSUBDIR}/dev && sh ./MAKEDEV std audio
-@exec cd %D/${EMULSUBDIR}/dev && ln -s sound dsp
-@unexec ${RM} -f %D/${EMULSUBDIR}/dev/*
-@dirrm ${EMULSUBDIR}/dev
diff --git a/emulators/suse100_base/distinfo b/emulators/suse100_base/distinfo
deleted file mode 100644
index 6d99d30abb3..00000000000
--- a/emulators/suse100_base/distinfo
+++ /dev/null
@@ -1,110 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-SHA1 (suse100/i586/aaa_base-10.0-28.i586.rpm) = 5581a95f8026ea96d112945fae6011e251687043
-RMD160 (suse100/i586/aaa_base-10.0-28.i586.rpm) = d6b4fb4675c7ccfb8eabc7ab55b703926f31c82b
-Size (suse100/i586/aaa_base-10.0-28.i586.rpm) = 305412 bytes
-SHA1 (suse100/i586/bash-3.0-17.i586.rpm) = da1c7dadd994ec05517e244fa6d146efa532c280
-RMD160 (suse100/i586/bash-3.0-17.i586.rpm) = 13a8711d7dead670c937e78ba131ea4f208537f3
-Size (suse100/i586/bash-3.0-17.i586.rpm) = 723927 bytes
-SHA1 (suse100/i586/coreutils-5.3.0-20.2.i586.rpm) = d75698247495ea4efd3e803fabe28eb346c9c2d2
-RMD160 (suse100/i586/coreutils-5.3.0-20.2.i586.rpm) = 0ad0fe0695446a23fe1226a64288289c51007bed
-Size (suse100/i586/coreutils-5.3.0-20.2.i586.rpm) = 1839309 bytes
-SHA1 (suse100/i586/glibc-2.3.5-40.i586.rpm) = f640f4e2b1c8743b0c07368450ad25493a681cbe
-RMD160 (suse100/i586/glibc-2.3.5-40.i586.rpm) = e5ec89f76b3275790f9185af582f14e39ea58ede
-Size (suse100/i586/glibc-2.3.5-40.i586.rpm) = 2477929 bytes
-SHA1 (suse100/i586/libgcc-4.0.2_20050901-3.i586.rpm) = 89fade3a892f0a08e0a26c5ece036e964a15288d
-RMD160 (suse100/i586/libgcc-4.0.2_20050901-3.i586.rpm) = 7d95f23930e0e6fe23862d6aaf242f7a81c2ff4d
-Size (suse100/i586/libgcc-4.0.2_20050901-3.i586.rpm) = 33950 bytes
-SHA1 (suse100/i586/libacl-2.2.31-3.i586.rpm) = b627beb8726055ac4e3d84ce18aaa578f0122df2
-RMD160 (suse100/i586/libacl-2.2.31-3.i586.rpm) = e794971f62a43bbf453b3348f658241a5ab89e08
-Size (suse100/i586/libacl-2.2.31-3.i586.rpm) = 47601 bytes
-SHA1 (suse100/i586/libattr-2.4.24-2.i586.rpm) = f7b231d242de063d7773a9e2e66c2071fdadb9c8
-RMD160 (suse100/i586/libattr-2.4.24-2.i586.rpm) = 499a3350ea9f5213dc5e0fc1a5ab03d414a55fdd
-Size (suse100/i586/libattr-2.4.24-2.i586.rpm) = 12032 bytes
-SHA1 (suse100/i586/libselinux-1.23.11-3.i586.rpm) = ccededbee7740d2a50722329d1686ac6be88ec0d
-RMD160 (suse100/i586/libselinux-1.23.11-3.i586.rpm) = aafaccec07de8f4076e5a025215ed0f106dec11d
-Size (suse100/i586/libselinux-1.23.11-3.i586.rpm) = 53025 bytes
-SHA1 (suse100/i586/libstdc++-4.0.2_20050901-3.i586.rpm) = d8289887b7dd516f24969541eccb69968ce4caa0
-RMD160 (suse100/i586/libstdc++-4.0.2_20050901-3.i586.rpm) = 9e29faa5c0b2dce5847edb8a3f3f8314506ff2c4
-Size (suse100/i586/libstdc++-4.0.2_20050901-3.i586.rpm) = 296625 bytes
-SHA1 (suse100/i586/ncurses-5.4-71.i586.rpm) = f16eb374cbf81a84cb2075bc9b8621881116bdf4
-RMD160 (suse100/i586/ncurses-5.4-71.i586.rpm) = 7cbd438a5ddd7038debd44304b639c3e165b1798
-Size (suse100/i586/ncurses-5.4-71.i586.rpm) = 835298 bytes
-SHA1 (suse100/i586/readline-5.0-9.i586.rpm) = 3f5499f7c172cd839ff3d6d00ff405837944190d
-RMD160 (suse100/i586/readline-5.0-9.i586.rpm) = 652c5f826d5e53da1483153c21d94643b8f9f1df
-Size (suse100/i586/readline-5.0-9.i586.rpm) = 176245 bytes
-SHA1 (suse100/i586/zlib-1.2.3-3.i586.rpm) = 2c459f788462ce67cc2497518ce5c1992b29128a
-RMD160 (suse100/i586/zlib-1.2.3-3.i586.rpm) = cb6a14354425e7517435253e3e7b1f9a8ec6b16e
-Size (suse100/i586/zlib-1.2.3-3.i586.rpm) = 68589 bytes
-SHA1 (suse100/ppc/aaa_base-10.0-28.ppc.rpm) = 3a3409f69bf7e33087a72e0596fe0ab809b23ec6
-RMD160 (suse100/ppc/aaa_base-10.0-28.ppc.rpm) = 1e285d4cb74576dd86e6dc146f07f39fc490f54c
-Size (suse100/ppc/aaa_base-10.0-28.ppc.rpm) = 305698 bytes
-SHA1 (suse100/ppc/bash-3.0-17.ppc.rpm) = 8bd1b97f51812ad66e91e254267b943eddd8ccf1
-RMD160 (suse100/ppc/bash-3.0-17.ppc.rpm) = c72f9c7a750a0f4866c83deef0b3b12446f2d3ad
-Size (suse100/ppc/bash-3.0-17.ppc.rpm) = 762907 bytes
-SHA1 (suse100/ppc/coreutils-5.3.0-20.2.ppc.rpm) = fc4c4d8e86490052ba0fc184eb47fc4690fc5784
-RMD160 (suse100/ppc/coreutils-5.3.0-20.2.ppc.rpm) = 47653cdab713e2ae320cdeb8db1cef655eeb8a4b
-Size (suse100/ppc/coreutils-5.3.0-20.2.ppc.rpm) = 2077205 bytes
-SHA1 (suse100/ppc/glibc-2.3.5-40.ppc.rpm) = 95d25c9eb893f764b7acb3ec3b536a94f5637c1d
-RMD160 (suse100/ppc/glibc-2.3.5-40.ppc.rpm) = 08dad873481db095160cdc6839145dab0bad5e47
-Size (suse100/ppc/glibc-2.3.5-40.ppc.rpm) = 2940751 bytes
-SHA1 (suse100/ppc/libgcc-4.0.2_20050901-3.ppc.rpm) = 374e5107029ca305c7aafaddd5d3fc5db8181e26
-RMD160 (suse100/ppc/libgcc-4.0.2_20050901-3.ppc.rpm) = 9c1f5488fe4eabe9900f73608a86cd8c4eb38060
-Size (suse100/ppc/libgcc-4.0.2_20050901-3.ppc.rpm) = 47140 bytes
-SHA1 (suse100/ppc/libacl-2.2.31-3.ppc.rpm) = 7ef0ab8f409e3dde6d4926cb09f4fc50d6458cbd
-RMD160 (suse100/ppc/libacl-2.2.31-3.ppc.rpm) = 52e9c96a76f79fef96f0a5d73c92793da7188e9b
-Size (suse100/ppc/libacl-2.2.31-3.ppc.rpm) = 22610 bytes
-SHA1 (suse100/ppc/libattr-2.4.24-2.ppc.rpm) = 4df934ae0eccc8f2acbb1151e4600cba4190a37e
-RMD160 (suse100/ppc/libattr-2.4.24-2.ppc.rpm) = 9e3e7d40b27a310e367ca109fb3d16528f6dbc61
-Size (suse100/ppc/libattr-2.4.24-2.ppc.rpm) = 14503 bytes
-SHA1 (suse100/ppc/libselinux-1.23.11-3.ppc.rpm) = d083391efe6e8ada440ddf5745f6b8dee3183410
-RMD160 (suse100/ppc/libselinux-1.23.11-3.ppc.rpm) = fe81f4ea5881bb3664ae2086333e710d4b10baf5
-Size (suse100/ppc/libselinux-1.23.11-3.ppc.rpm) = 74536 bytes
-SHA1 (suse100/ppc/libstdc++-4.0.2_20050901-3.ppc.rpm) = 5f2e15b1fdb0550759191eae9f2834ecb72892ea
-RMD160 (suse100/ppc/libstdc++-4.0.2_20050901-3.ppc.rpm) = de6487dc285531f9a9f794c5de5d1fb2644d1c5b
-Size (suse100/ppc/libstdc++-4.0.2_20050901-3.ppc.rpm) = 339830 bytes
-SHA1 (suse100/ppc/ncurses-5.4-71.ppc.rpm) = b3837e01c224e8dab67ce2d4b291fc4acd10047c
-RMD160 (suse100/ppc/ncurses-5.4-71.ppc.rpm) = be4ae8ad89ec5fc817a9b23dbec3b06a10bbc970
-Size (suse100/ppc/ncurses-5.4-71.ppc.rpm) = 907518 bytes
-SHA1 (suse100/ppc/readline-5.0-9.ppc.rpm) = f82a30b259aa0971c7c1621bd202f95af153b586
-RMD160 (suse100/ppc/readline-5.0-9.ppc.rpm) = 6274ad54aee3384a70f3590587ac432d49ffc61b
-Size (suse100/ppc/readline-5.0-9.ppc.rpm) = 190420 bytes
-SHA1 (suse100/ppc/zlib-1.2.3-3.ppc.rpm) = 732af9e98ab2f3fc7bb85b47bc3bee0de327eaa5
-RMD160 (suse100/ppc/zlib-1.2.3-3.ppc.rpm) = 953f30a35992480771d2d17d9f694a5b5c606f7f
-Size (suse100/ppc/zlib-1.2.3-3.ppc.rpm) = 72735 bytes
-SHA1 (suse100/x86_64/aaa_base-10.0-28.x86_64.rpm) = 4f39b8fb16ed2dc2bd9d787863af83430b5ddb97
-RMD160 (suse100/x86_64/aaa_base-10.0-28.x86_64.rpm) = f81ba10742038775b3f2d526bbb9f5f15ad2c4bc
-Size (suse100/x86_64/aaa_base-10.0-28.x86_64.rpm) = 305666 bytes
-SHA1 (suse100/x86_64/bash-3.0-17.x86_64.rpm) = a66b8f27af5adbac37c25e099d8932835ea23414
-RMD160 (suse100/x86_64/bash-3.0-17.x86_64.rpm) = 7244e533f36965e09b29745e5a33ba5a4bfdd33b
-Size (suse100/x86_64/bash-3.0-17.x86_64.rpm) = 752807 bytes
-SHA1 (suse100/x86_64/coreutils-5.3.0-20.2.x86_64.rpm) = 5c158fa3bf842f69a6873be3e92200667f2120f4
-RMD160 (suse100/x86_64/coreutils-5.3.0-20.2.x86_64.rpm) = 95638f5e4c03b829c286ed8ee0a6dcc29ec7798c
-Size (suse100/x86_64/coreutils-5.3.0-20.2.x86_64.rpm) = 1871264 bytes
-SHA1 (suse100/x86_64/glibc-2.3.5-40.x86_64.rpm) = a52b969a6307fd3d2d25204675687ff319aa05dd
-RMD160 (suse100/x86_64/glibc-2.3.5-40.x86_64.rpm) = bb0ab8fb0d1d7e438d44ccb5df5873c359155919
-Size (suse100/x86_64/glibc-2.3.5-40.x86_64.rpm) = 2749726 bytes
-SHA1 (suse100/x86_64/libgcc-4.0.2_20050901-3.x86_64.rpm) = 992bf59f5c55b2556bdfd31710a865b98e13fc7a
-RMD160 (suse100/x86_64/libgcc-4.0.2_20050901-3.x86_64.rpm) = bb19c7c563b53c4517db70b9e774fb3999879012
-Size (suse100/x86_64/libgcc-4.0.2_20050901-3.x86_64.rpm) = 58420 bytes
-SHA1 (suse100/x86_64/libacl-2.2.31-3.x86_64.rpm) = 947631b2941a29e47031d2e20c146658e587f936
-RMD160 (suse100/x86_64/libacl-2.2.31-3.x86_64.rpm) = 9d750cd7b93f784284e90597c9dcab0903016925
-Size (suse100/x86_64/libacl-2.2.31-3.x86_64.rpm) = 50431 bytes
-SHA1 (suse100/x86_64/libattr-2.4.24-2.x86_64.rpm) = 9b9bd2b66cbe240d69568653758ac4dc154fd9e5
-RMD160 (suse100/x86_64/libattr-2.4.24-2.x86_64.rpm) = 352442957a9d67233d48593dba586d638a93dbf3
-Size (suse100/x86_64/libattr-2.4.24-2.x86_64.rpm) = 12937 bytes
-SHA1 (suse100/x86_64/libselinux-1.23.11-3.x86_64.rpm) = 11dddb5e7b9b52389967e6e3ce3d2647e678ad60
-RMD160 (suse100/x86_64/libselinux-1.23.11-3.x86_64.rpm) = 1491b35edf961a2e9c5595655c4c97f8c1da89a7
-Size (suse100/x86_64/libselinux-1.23.11-3.x86_64.rpm) = 56840 bytes
-SHA1 (suse100/x86_64/libstdc++-4.0.2_20050901-3.x86_64.rpm) = 86dab6c33b796337e664f36bcca652221b18d374
-RMD160 (suse100/x86_64/libstdc++-4.0.2_20050901-3.x86_64.rpm) = d0b1fb371abc37cac6a6e1c3e38c6c92db090c19
-Size (suse100/x86_64/libstdc++-4.0.2_20050901-3.x86_64.rpm) = 574902 bytes
-SHA1 (suse100/x86_64/ncurses-5.4-71.x86_64.rpm) = 72357b8109c4679a7495b497fa50a5764e1b01ae
-RMD160 (suse100/x86_64/ncurses-5.4-71.x86_64.rpm) = c213f61f5068d5c977be3649c6fe504e40bdbae9
-Size (suse100/x86_64/ncurses-5.4-71.x86_64.rpm) = 891746 bytes
-SHA1 (suse100/x86_64/readline-5.0-9.x86_64.rpm) = dd474b0e0a976bc1b71edef721beffd97815c2da
-RMD160 (suse100/x86_64/readline-5.0-9.x86_64.rpm) = a8071dfef66349617a552fbc512ea4019b7e4188
-Size (suse100/x86_64/readline-5.0-9.x86_64.rpm) = 188330 bytes
-SHA1 (suse100/x86_64/zlib-1.2.3-3.x86_64.rpm) = 31ec71357faa048a9803d0be202cc4adc7639888
-RMD160 (suse100/x86_64/zlib-1.2.3-3.x86_64.rpm) = f2d6270b84a4b05f135544f4c01118f85898fd92
-Size (suse100/x86_64/zlib-1.2.3-3.x86_64.rpm) = 70998 bytes
diff --git a/emulators/suse100_base/files/SuSE-release b/emulators/suse100_base/files/SuSE-release
deleted file mode 100644
index 247032986b2..00000000000
--- a/emulators/suse100_base/files/SuSE-release
+++ /dev/null
@@ -1,2 +0,0 @@
-SuSE Linux @@VERSION@@ (@@ARCH@@)
-VERSION = @@VERSION@@
diff --git a/emulators/suse100_base/files/linux-mkpwd.sh b/emulators/suse100_base/files/linux-mkpwd.sh
deleted file mode 100644
index d751a771b8d..00000000000
--- a/emulators/suse100_base/files/linux-mkpwd.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: linux-mkpwd.sh,v 1.1.1.1 2006/03/09 20:34:10 tonio Exp $
-
-SRCDIR=/etc
-DESTDIR=@@EMULDIR@@/etc
-
-umask 22
-cd $DESTDIR
-cp $SRCDIR/passwd .
-sed s/^wheel:/root:/ <$SRCDIR/group >group
-
-umask 77
-awk -F: '{print($1":"$2":0:0:10000::::")}' <$SRCDIR/master.passwd >shadow
-sed s/^wheel:/root:/ <$SRCDIR/group |
-awk -F: '{print($1":*:root:root")}' >gshadow
-
-exit 0
diff --git a/emulators/suse100_compat/DESCR b/emulators/suse100_compat/DESCR
deleted file mode 100644
index addf8028f9b..00000000000
--- a/emulators/suse100_compat/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package contains some old shared libraries required for backwards
-compatibility.
diff --git a/emulators/suse100_compat/Makefile b/emulators/suse100_compat/Makefile
deleted file mode 100644
index e865f3bf754..00000000000
--- a/emulators/suse100_compat/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2006/06/30 16:20:23 salo Exp $
-
-DISTNAME=		suse_compat-${SUSE_VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package with old shared libraries
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_compat/Makefile.i386 b/emulators/suse100_compat/Makefile.i386
deleted file mode 100644
index 9f91efedf85..00000000000
--- a/emulators/suse100_compat/Makefile.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/03/09 20:34:38 tonio Exp $
-
-RPMFILES=		compat-2004.11.13-4.${SUSE_ARCH}.rpm \
-			compat-libstdc++-5.0.7-6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_compat/Makefile.powerpc b/emulators/suse100_compat/Makefile.powerpc
deleted file mode 100644
index d31233a48a9..00000000000
--- a/emulators/suse100_compat/Makefile.powerpc
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/03/09 20:34:38 tonio Exp $
-
-RPMFILES=		compat-2004.11.13-4.${SUSE_ARCH}.rpm \
-			compat-libstdc++-5.0.7-6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_compat/Makefile.x86_64 b/emulators/suse100_compat/Makefile.x86_64
deleted file mode 100644
index 8853bcae8ed..00000000000
--- a/emulators/suse100_compat/Makefile.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/03/09 20:34:38 tonio Exp $
-
-RPMFILES=		compat-2004.11.13-4.${SUSE_ARCH}.rpm \
-			compat-libstdc++-5.0.7-6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_compat/distinfo b/emulators/suse100_compat/distinfo
deleted file mode 100644
index e8202f6e72e..00000000000
--- a/emulators/suse100_compat/distinfo
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: distinfo,v 1.1 2006/04/03 18:17:54 ghen Exp $
-
-SHA1 (suse100/i586/compat-2004.11.13-4.i586.rpm) = 20a4574823be5b2a8a82a4b0988702baa1b618a5
-RMD160 (suse100/i586/compat-2004.11.13-4.i586.rpm) = 681d3a00970e232f7f37201dd1a8d842c3738043
-Size (suse100/i586/compat-2004.11.13-4.i586.rpm) = 1363979 bytes
-SHA1 (suse100/i586/compat-libstdc++-5.0.7-6.i586.rpm) = 5bf42bac9c07f49d92861034eb06c05d31968116
-RMD160 (suse100/i586/compat-libstdc++-5.0.7-6.i586.rpm) = f4935251c3ef4aa67fd3d656248ab0185bc57636
-Size (suse100/i586/compat-libstdc++-5.0.7-6.i586.rpm) = 233040 bytes
-SHA1 (suse100/ppc/compat-2004.11.13-4.ppc.rpm) = d56387052cd865d0325e00dbba03f8086500a2cd
-RMD160 (suse100/ppc/compat-2004.11.13-4.ppc.rpm) = 732dde7d78d1fb0a09f437aab47bda6cdeeda702
-Size (suse100/ppc/compat-2004.11.13-4.ppc.rpm) = 853476 bytes
-SHA1 (suse100/ppc/compat-libstdc++-5.0.7-6.ppc.rpm) = 32d0566212edb261d12a396992ea82c08614fe11
-RMD160 (suse100/ppc/compat-libstdc++-5.0.7-6.ppc.rpm) = 43d526649a0d14861caf941321abbe1f7c6f39c5
-Size (suse100/ppc/compat-libstdc++-5.0.7-6.ppc.rpm) = 267312 bytes
-SHA1 (suse100/x86_64/compat-2004.11.13-4.x86_64.rpm) = 5dcbd5f5c18630cce3be6770bf235ca6cd4ec248
-RMD160 (suse100/x86_64/compat-2004.11.13-4.x86_64.rpm) = cd4274f17e45a69909afe4e6315fa2d5a3d95c09
-Size (suse100/x86_64/compat-2004.11.13-4.x86_64.rpm) = 120440 bytes
-SHA1 (suse100/x86_64/compat-libstdc++-5.0.7-6.x86_64.rpm) = 95ba61ed1d7c998c4f1177044a6047814a9671d8
-RMD160 (suse100/x86_64/compat-libstdc++-5.0.7-6.x86_64.rpm) = 98c43e40940efd442ff6c8a47cc47f711af69c1b
-Size (suse100/x86_64/compat-libstdc++-5.0.7-6.x86_64.rpm) = 453853 bytes
diff --git a/emulators/suse100_expat/DESCR b/emulators/suse100_expat/DESCR
deleted file mode 100644
index 9f2f36c8801..00000000000
--- a/emulators/suse100_expat/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with glibc2 which require
-expat shared libraries.
diff --git a/emulators/suse100_expat/Makefile b/emulators/suse100_expat/Makefile
deleted file mode 100644
index 0305f68cb93..00000000000
--- a/emulators/suse100_expat/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
-
-DISTNAME=		suse_expat-${SUSE_VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for expat binaries
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-LIBTOOLIZE_PLIST=	NO
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_expat/Makefile.i386 b/emulators/suse100_expat/Makefile.i386
deleted file mode 100644
index ccb141d14e5..00000000000
--- a/emulators/suse100_expat/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/03/09 20:35:09 tonio Exp $
-
-RPMFILES=		expat-1.95.8-5.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_expat/Makefile.powerpc b/emulators/suse100_expat/Makefile.powerpc
deleted file mode 100644
index 0038cf086b6..00000000000
--- a/emulators/suse100_expat/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/03/09 20:35:09 tonio Exp $
-
-RPMFILES=		expat-1.95.8-5.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_expat/Makefile.x86_64 b/emulators/suse100_expat/Makefile.x86_64
deleted file mode 100644
index e852bacc46e..00000000000
--- a/emulators/suse100_expat/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/03/09 20:35:09 tonio Exp $
-
-RPMFILES=		expat-1.95.8-5.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_expat/distinfo b/emulators/suse100_expat/distinfo
deleted file mode 100644
index 4f6b81717fe..00000000000
--- a/emulators/suse100_expat/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.1 2006/04/03 18:17:54 ghen Exp $
-
-SHA1 (suse100/i586/expat-1.95.8-5.i586.rpm) = 530fed5152b62a434ad7fd188286894330e35171
-RMD160 (suse100/i586/expat-1.95.8-5.i586.rpm) = f0176be8227ad9e7ca3a7c881aa254510611e370
-Size (suse100/i586/expat-1.95.8-5.i586.rpm) = 174716 bytes
-SHA1 (suse100/ppc/expat-1.95.8-5.ppc.rpm) = f67841b0ae35d4bca589f502533911e19e1c4bc5
-RMD160 (suse100/ppc/expat-1.95.8-5.ppc.rpm) = 8542f175d1d65a0db1baa0fcc387c463e62711b4
-Size (suse100/ppc/expat-1.95.8-5.ppc.rpm) = 194025 bytes
-SHA1 (suse100/x86_64/expat-1.95.8-5.x86_64.rpm) = 00d012cecfc4cd51aa11f98b19444d3fc3330b14
-RMD160 (suse100/x86_64/expat-1.95.8-5.x86_64.rpm) = 5c2112713535d1fce2ac6f69908662310055f8ec
-Size (suse100/x86_64/expat-1.95.8-5.x86_64.rpm) = 168529 bytes
diff --git a/emulators/suse100_fontconfig/DESCR b/emulators/suse100_fontconfig/DESCR
deleted file mode 100644
index fffa11f3d2e..00000000000
--- a/emulators/suse100_fontconfig/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with glibc2 which require
-fontconfig shared libraries.
diff --git a/emulators/suse100_fontconfig/Makefile b/emulators/suse100_fontconfig/Makefile
deleted file mode 100644
index 18b96144a5c..00000000000
--- a/emulators/suse100_fontconfig/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2006/06/30 16:20:23 salo Exp $
-
-DISTNAME=		suse_fontconfig-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for fontconfig binaries
-
-DEPENDS+=		suse_expat-${SUSE_VERSION}{,nb*}:../../emulators/suse100_expat
-DEPENDS+=		suse_freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse100_freetype2
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_fontconfig/Makefile.i386 b/emulators/suse100_fontconfig/Makefile.i386
deleted file mode 100644
index 119ba720d93..00000000000
--- a/emulators/suse100_fontconfig/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		fontconfig-2.3.2.20050721-10.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_fontconfig/Makefile.powerpc b/emulators/suse100_fontconfig/Makefile.powerpc
deleted file mode 100644
index b23c6d57fe3..00000000000
--- a/emulators/suse100_fontconfig/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		fontconfig-2.3.2.20050721-10.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_fontconfig/Makefile.x86_64 b/emulators/suse100_fontconfig/Makefile.x86_64
deleted file mode 100644
index dc81f87695d..00000000000
--- a/emulators/suse100_fontconfig/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		fontconfig-2.3.2.20050721-10.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_fontconfig/distinfo b/emulators/suse100_fontconfig/distinfo
deleted file mode 100644
index afe2697bdf2..00000000000
--- a/emulators/suse100_fontconfig/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-SHA1 (suse100/i586/fontconfig-2.3.2.20050721-10.2.i586.rpm) = ac30bcb7b46e52d6c8ef973d3c122ef39b4e6367
-RMD160 (suse100/i586/fontconfig-2.3.2.20050721-10.2.i586.rpm) = c30fcdeb1dca430f3e2cdfb3849a719cac4e5f16
-Size (suse100/i586/fontconfig-2.3.2.20050721-10.2.i586.rpm) = 182183 bytes
-SHA1 (suse100/ppc/fontconfig-2.3.2.20050721-10.2.ppc.rpm) = 2ed1a2fdcd62d2505c13231edd5852a5313f1470
-RMD160 (suse100/ppc/fontconfig-2.3.2.20050721-10.2.ppc.rpm) = 3ac4ffde0cd136419daf4cb94a60f772e359494d
-Size (suse100/ppc/fontconfig-2.3.2.20050721-10.2.ppc.rpm) = 204018 bytes
-SHA1 (suse100/x86_64/fontconfig-2.3.2.20050721-10.2.x86_64.rpm) = d29e6828a51c637d1e67834617ea3bbe8468875f
-RMD160 (suse100/x86_64/fontconfig-2.3.2.20050721-10.2.x86_64.rpm) = 8559de45f740da334dc0df8eedb54f44c5dc5b87
-Size (suse100/x86_64/fontconfig-2.3.2.20050721-10.2.x86_64.rpm) = 191908 bytes
diff --git a/emulators/suse100_freetype2/DESCR b/emulators/suse100_freetype2/DESCR
deleted file mode 100644
index b54860cc766..00000000000
--- a/emulators/suse100_freetype2/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with freetype2 shared
-libraries.
diff --git a/emulators/suse100_freetype2/Makefile b/emulators/suse100_freetype2/Makefile
deleted file mode 100644
index 79cdc229e04..00000000000
--- a/emulators/suse100_freetype2/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2006/08/02 14:26:13 salo Exp $
-
-DISTNAME=		suse_freetype2-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for FreeType2 library
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_freetype2/Makefile.i386 b/emulators/suse100_freetype2/Makefile.i386
deleted file mode 100644
index e2f44be9044..00000000000
--- a/emulators/suse100_freetype2/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.3 2006/08/02 14:26:13 salo Exp $
-
-RPMFILES=		freetype2-2.1.10-4.4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_freetype2/Makefile.powerpc b/emulators/suse100_freetype2/Makefile.powerpc
deleted file mode 100644
index 5b5d86939b2..00000000000
--- a/emulators/suse100_freetype2/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.3 2006/08/02 14:26:13 salo Exp $
-
-RPMFILES=		freetype2-2.1.10-4.4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_freetype2/Makefile.x86_64 b/emulators/suse100_freetype2/Makefile.x86_64
deleted file mode 100644
index 1cfd6f98838..00000000000
--- a/emulators/suse100_freetype2/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.3 2006/08/02 14:26:13 salo Exp $
-
-RPMFILES=		freetype2-2.1.10-4.4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_freetype2/distinfo b/emulators/suse100_freetype2/distinfo
deleted file mode 100644
index 98a1facf02f..00000000000
--- a/emulators/suse100_freetype2/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/08/02 14:26:13 salo Exp $
-
-SHA1 (suse100/i586/freetype2-2.1.10-4.4.i586.rpm) = cff22fb3c07c583c39eefaa627f2309e0ae7ff54
-RMD160 (suse100/i586/freetype2-2.1.10-4.4.i586.rpm) = 570824f1beab968b34dc60883c9cf6cb32c24355
-Size (suse100/i586/freetype2-2.1.10-4.4.i586.rpm) = 563709 bytes
-SHA1 (suse100/ppc/freetype2-2.1.10-4.4.ppc.rpm) = 1cd8b4576b8e528e48051b723e6858c198505e80
-RMD160 (suse100/ppc/freetype2-2.1.10-4.4.ppc.rpm) = 13d8989f9c23d078ff7de591f5d77b26fe305959
-Size (suse100/ppc/freetype2-2.1.10-4.4.ppc.rpm) = 579915 bytes
-SHA1 (suse100/x86_64/freetype2-2.1.10-4.4.x86_64.rpm) = a4710ed4062a96cbaad625cdb0e6772def79f880
-RMD160 (suse100/x86_64/freetype2-2.1.10-4.4.x86_64.rpm) = 9583fd004574549acbf1e38aa5303a68ab3db06f
-Size (suse100/x86_64/freetype2-2.1.10-4.4.x86_64.rpm) = 581398 bytes
diff --git a/emulators/suse100_gdk-pixbuf/DESCR b/emulators/suse100_gdk-pixbuf/DESCR
deleted file mode 100644
index b898081b301..00000000000
--- a/emulators/suse100_gdk-pixbuf/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries that use gdk-pixbuf shared libraries.
diff --git a/emulators/suse100_gdk-pixbuf/Makefile b/emulators/suse100_gdk-pixbuf/Makefile
deleted file mode 100644
index 81d8acc4245..00000000000
--- a/emulators/suse100_gdk-pixbuf/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
-
-DISTNAME=		suse_gdk-pixbuf-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for gdk-pixbuf binaries
-
-DEPENDS+=		suse_gtk-${SUSE_VERSION}{,nb*}:../../emulators/suse100_gtk
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_gdk-pixbuf/Makefile.i386 b/emulators/suse100_gdk-pixbuf/Makefile.i386
deleted file mode 100644
index 25d8922a5ff..00000000000
--- a/emulators/suse100_gdk-pixbuf/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		gdk-pixbuf-0.22.0-72.3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_gdk-pixbuf/Makefile.powerpc b/emulators/suse100_gdk-pixbuf/Makefile.powerpc
deleted file mode 100644
index 6d03f7a23af..00000000000
--- a/emulators/suse100_gdk-pixbuf/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		gdk-pixbuf-0.22.0-72.3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_gdk-pixbuf/Makefile.x86_64 b/emulators/suse100_gdk-pixbuf/Makefile.x86_64
deleted file mode 100644
index 1c5b5906a36..00000000000
--- a/emulators/suse100_gdk-pixbuf/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		gdk-pixbuf-0.22.0-72.3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_gdk-pixbuf/distinfo b/emulators/suse100_gdk-pixbuf/distinfo
deleted file mode 100644
index f9bcff50a98..00000000000
--- a/emulators/suse100_gdk-pixbuf/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-SHA1 (suse100/i586/gdk-pixbuf-0.22.0-72.3.i586.rpm) = 2a19277535849c43f262aa3d92ff9ab562c8c192
-RMD160 (suse100/i586/gdk-pixbuf-0.22.0-72.3.i586.rpm) = 6de2bc6c4c28dbb19c8bcb548acbadf7a33afba6
-Size (suse100/i586/gdk-pixbuf-0.22.0-72.3.i586.rpm) = 171225 bytes
-SHA1 (suse100/ppc/gdk-pixbuf-0.22.0-72.3.ppc.rpm) = b7aa7a4720e09cff42f925154a102c4c073868ac
-RMD160 (suse100/ppc/gdk-pixbuf-0.22.0-72.3.ppc.rpm) = 1f7076d8f220aec308a7fd6c5a1822e3e333d3bb
-Size (suse100/ppc/gdk-pixbuf-0.22.0-72.3.ppc.rpm) = 199734 bytes
-SHA1 (suse100/x86_64/gdk-pixbuf-0.22.0-72.3.x86_64.rpm) = 83ac8116f04864749b21031b1c45aeff9db9c878
-RMD160 (suse100/x86_64/gdk-pixbuf-0.22.0-72.3.x86_64.rpm) = 0835ee12577465eebba06e24fe494f000c79ae60
-Size (suse100/x86_64/gdk-pixbuf-0.22.0-72.3.x86_64.rpm) = 181471 bytes
diff --git a/emulators/suse100_glx/DESCR b/emulators/suse100_glx/DESCR
deleted file mode 100644
index 64e8143cf19..00000000000
--- a/emulators/suse100_glx/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries which require GL shared libraries.
diff --git a/emulators/suse100_glx/Makefile b/emulators/suse100_glx/Makefile
deleted file mode 100644
index 7d31ec5d4f8..00000000000
--- a/emulators/suse100_glx/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
-
-DISTNAME=		suse_glx-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the GL library
-
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-LIBTOOLIZE_PLIST=	NO
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_glx/Makefile.i386 b/emulators/suse100_glx/Makefile.i386
deleted file mode 100644
index 4dbf9e56d05..00000000000
--- a/emulators/suse100_glx/Makefile.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/04/18 15:18:39 salo Exp $
-
-# the -devel version is necessary for libGL.so et.al. symlinks only
-RPMFILES=		xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm \
-			xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_glx/Makefile.powerpc b/emulators/suse100_glx/Makefile.powerpc
deleted file mode 100644
index 67d465aaae1..00000000000
--- a/emulators/suse100_glx/Makefile.powerpc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/04/18 15:18:39 salo Exp $
-
-# the -devel version is necessary for libGL.so et.al. symlinks only
-RPMFILES=		xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm \
-			xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_glx/Makefile.x86_64 b/emulators/suse100_glx/Makefile.x86_64
deleted file mode 100644
index 06d303bec4b..00000000000
--- a/emulators/suse100_glx/Makefile.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/04/18 15:18:39 salo Exp $
-
-# the -devel version is necessary for libGL.so et.al. symlinks only
-RPMFILES=		xorg-x11-Mesa-6.8.2-100.${SUSE_ARCH}.rpm \
-			xorg-x11-Mesa-devel-6.8.2-100.${SUSE_ARCH}.rpm \
-			xorg-x11-Mesa-32bit-6.8.2-100.${SUSE_ARCH}.rpm \
-			xorg-x11-Mesa-devel-32bit-6.8.2-100.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_glx/PLIST_rpmfix.i386 b/emulators/suse100_glx/PLIST_rpmfix.i386
deleted file mode 100644
index 84378627263..00000000000
--- a/emulators/suse100_glx/PLIST_rpmfix.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST_rpmfix.i386,v 1.1 2006/04/28 14:15:06 joerg Exp $
-/usr/lib/libglide3.so.3
diff --git a/emulators/suse100_glx/distinfo b/emulators/suse100_glx/distinfo
deleted file mode 100644
index 67f703863af..00000000000
--- a/emulators/suse100_glx/distinfo
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/04/18 15:18:39 salo Exp $
-
-SHA1 (suse100/i586/xorg-x11-Mesa-6.8.2-100.i586.rpm) = ba5db456a35ea226eab8768ef4417a325b283960
-RMD160 (suse100/i586/xorg-x11-Mesa-6.8.2-100.i586.rpm) = 7389750e1b2cd32eea730676baa7085a93bc43db
-Size (suse100/i586/xorg-x11-Mesa-6.8.2-100.i586.rpm) = 7902110 bytes
-SHA1 (suse100/i586/xorg-x11-Mesa-devel-6.8.2-100.i586.rpm) = deb22ba0964b7d400ca622e7f45d112b7031a840
-RMD160 (suse100/i586/xorg-x11-Mesa-devel-6.8.2-100.i586.rpm) = 9c2db1ff3777546f05266583560f210940257d0a
-Size (suse100/i586/xorg-x11-Mesa-devel-6.8.2-100.i586.rpm) = 1102248 bytes
-SHA1 (suse100/ppc/xorg-x11-Mesa-6.8.2-100.ppc.rpm) = aa5ff4ac9fa4a24d3305246f8f64acba1875c6b9
-RMD160 (suse100/ppc/xorg-x11-Mesa-6.8.2-100.ppc.rpm) = d3064a993d87df4f13b7ca6fd262130bece26db9
-Size (suse100/ppc/xorg-x11-Mesa-6.8.2-100.ppc.rpm) = 4314149 bytes
-SHA1 (suse100/ppc/xorg-x11-Mesa-devel-6.8.2-100.ppc.rpm) = 58b169a3dc729db2fbfffba9d081ca685227f34b
-RMD160 (suse100/ppc/xorg-x11-Mesa-devel-6.8.2-100.ppc.rpm) = 3d64678b9b7be9594130800e2baae3c37c7e4d9d
-Size (suse100/ppc/xorg-x11-Mesa-devel-6.8.2-100.ppc.rpm) = 1233965 bytes
-SHA1 (suse100/x86_64/xorg-x11-Mesa-6.8.2-100.x86_64.rpm) = 565323080d589f2fb665311d4fa51d630745a3fc
-RMD160 (suse100/x86_64/xorg-x11-Mesa-6.8.2-100.x86_64.rpm) = 96bc71ab0f0a1d29fad37d842b7b63e72f34e4d1
-Size (suse100/x86_64/xorg-x11-Mesa-6.8.2-100.x86_64.rpm) = 4838499 bytes
-SHA1 (suse100/x86_64/xorg-x11-Mesa-devel-6.8.2-100.x86_64.rpm) = 799ef1e0cb2d9b4814fe818aff0f09d526e07705
-RMD160 (suse100/x86_64/xorg-x11-Mesa-devel-6.8.2-100.x86_64.rpm) = 455f66c3b6b60e048ab8c3220ec8dd1f6ab337ca
-Size (suse100/x86_64/xorg-x11-Mesa-devel-6.8.2-100.x86_64.rpm) = 1147561 bytes
-SHA1 (suse100/x86_64/xorg-x11-Mesa-32bit-6.8.2-100.x86_64.rpm) = 00ce370c52097f3091f7ecd5ef97f9e159e49d22
-RMD160 (suse100/x86_64/xorg-x11-Mesa-32bit-6.8.2-100.x86_64.rpm) = 20b4c777dbd80112f852ffc39d0b9f62e6de3538
-Size (suse100/x86_64/xorg-x11-Mesa-32bit-6.8.2-100.x86_64.rpm) = 7901672 bytes
-SHA1 (suse100/x86_64/xorg-x11-Mesa-devel-32bit-6.8.2-100.x86_64.rpm) = fd80e703f7d71f05a987f84a019a4b65a7d0de84
-RMD160 (suse100/x86_64/xorg-x11-Mesa-devel-32bit-6.8.2-100.x86_64.rpm) = 0fff472da590e23f316507287bc25527727dddbf
-Size (suse100/x86_64/xorg-x11-Mesa-devel-32bit-6.8.2-100.x86_64.rpm) = 1027506 bytes
diff --git a/emulators/suse100_gtk/DESCR b/emulators/suse100_gtk/DESCR
deleted file mode 100644
index d404f886f92..00000000000
--- a/emulators/suse100_gtk/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with glibc2 which require
-GTK shared libraries.
diff --git a/emulators/suse100_gtk/Makefile b/emulators/suse100_gtk/Makefile
deleted file mode 100644
index 56284e82035..00000000000
--- a/emulators/suse100_gtk/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/06/30 16:20:23 salo Exp $
-
-DISTNAME=		suse_gtk-${SUSE_VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tron@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for GTK binaries
-
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_gtk/Makefile.i386 b/emulators/suse100_gtk/Makefile.i386
deleted file mode 100644
index 1916b3414d5..00000000000
--- a/emulators/suse100_gtk/Makefile.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.2 2006/04/18 13:58:47 tron Exp $
-
-RPMFILES=		glib-1.2.10-595.${SUSE_ARCH}.rpm \
-			gtk-1.2.10-888.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_gtk/Makefile.powerpc b/emulators/suse100_gtk/Makefile.powerpc
deleted file mode 100644
index c3d4ca5f0e9..00000000000
--- a/emulators/suse100_gtk/Makefile.powerpc
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/04/18 13:49:58 salo Exp $
-
-RPMFILES=		glib-1.2.10-595.${SUSE_ARCH}.rpm \
-			gtk-1.2.10-888.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_gtk/Makefile.x86_64 b/emulators/suse100_gtk/Makefile.x86_64
deleted file mode 100644
index 862f85e2557..00000000000
--- a/emulators/suse100_gtk/Makefile.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/04/18 13:49:58 salo Exp $
-
-RPMFILES=		glib-1.2.10-595.${SUSE_ARCH}.rpm \
-			gtk-1.2.10-888.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_gtk/distinfo b/emulators/suse100_gtk/distinfo
deleted file mode 100644
index 8bf1e69d2d5..00000000000
--- a/emulators/suse100_gtk/distinfo
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/04/18 14:02:07 tron Exp $
-
-SHA1 (suse100/i586/glib-1.2.10-595.i586.rpm) = 11e5ee642ccd90428fa010a056bbe59886f330ff
-RMD160 (suse100/i586/glib-1.2.10-595.i586.rpm) = 1bbd780b9acef3561f2da4c271671968090f32d7
-Size (suse100/i586/glib-1.2.10-595.i586.rpm) = 118007 bytes
-SHA1 (suse100/i586/gtk-1.2.10-888.i586.rpm) = 7f55bb1df76f5bc89adbc21af40f77af94658eb2
-RMD160 (suse100/i586/gtk-1.2.10-888.i586.rpm) = 505880707817835fdde0071c8dcf4136dfa3f67b
-Size (suse100/i586/gtk-1.2.10-888.i586.rpm) = 814624 bytes
-SHA1 (suse100/ppc/glib-1.2.10-595.ppc.rpm) = d96428d46a8eec9a850a2b7f64df6cf45231befb
-RMD160 (suse100/ppc/glib-1.2.10-595.ppc.rpm) = 032f1bf87d5f54605c46716adc29ac87caa658ea
-Size (suse100/ppc/glib-1.2.10-595.ppc.rpm) = 136932 bytes
-SHA1 (suse100/ppc/gtk-1.2.10-888.ppc.rpm) = 8164b5299580f9bd351602d8f80719a62e95d987
-RMD160 (suse100/ppc/gtk-1.2.10-888.ppc.rpm) = c403c77a53436824ddff813a3f248b14abf4e9c6
-Size (suse100/ppc/gtk-1.2.10-888.ppc.rpm) = 895058 bytes
-SHA1 (suse100/x86_64/glib-1.2.10-595.x86_64.rpm) = c9525d3a2412f7130485878d984c9bd4f83c8c23
-RMD160 (suse100/x86_64/glib-1.2.10-595.x86_64.rpm) = 30810ee4694a94564667cd12631372204280a12c
-Size (suse100/x86_64/glib-1.2.10-595.x86_64.rpm) = 134046 bytes
-SHA1 (suse100/x86_64/gtk-1.2.10-888.x86_64.rpm) = 9fb52de9b3539a2b16e56acf6422423f14d53fc4
-RMD160 (suse100/x86_64/gtk-1.2.10-888.x86_64.rpm) = 3e49dc59b7be2b75ceb4c843ce7b023d2adc3b17
-Size (suse100/x86_64/gtk-1.2.10-888.x86_64.rpm) = 900131 bytes
diff --git a/emulators/suse100_gtk2/DESCR b/emulators/suse100_gtk2/DESCR
deleted file mode 100644
index 962f8891e8f..00000000000
--- a/emulators/suse100_gtk2/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with glibc2 which require
-GTK2 shared libraries.
diff --git a/emulators/suse100_gtk2/INSTALL b/emulators/suse100_gtk2/INSTALL
deleted file mode 100644
index ad34cc92f13..00000000000
--- a/emulators/suse100_gtk2/INSTALL
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2007/02/18 12:34:19 tonio Exp $
-#
-# Initialize gtk/pango module configuration.
-#
-case ${STAGE} in
-    POST-INSTALL)
-        @EMULDIR@/opt/gnome/bin/gtk-query-immodules-2.0@BINSUFFIX@ > @EMULDIR@/etc/opt/gnome/gtk-2.0/gtk.immodules
-
-        @EMULDIR@/opt/gnome/bin/gdk-pixbuf-query-loaders@BINSUFFIX@ > @EMULDIR@/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders
-
-        @EMULDIR@/opt/gnome/bin/pango-querymodules@BINSUFFIX@ > @EMULDIR@/etc/opt/gnome/pango/pango.modules                
-	;;
-    *)
-	;;
-esac
diff --git a/emulators/suse100_gtk2/Makefile b/emulators/suse100_gtk2/Makefile
deleted file mode 100644
index 4d72cffe424..00000000000
--- a/emulators/suse100_gtk2/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2007/02/18 12:34:20 tonio Exp $
-
-DISTNAME=		suse_gtk2-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for GTK2 binaries
-
-DEPENDS+=		suse_fontconfig-${SUSE_VERSION}{,nb*}:../../emulators/suse100_fontconfig
-DEPENDS+=		suse_freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse100_freetype2
-DEPENDS+=		suse_libjpeg-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libjpeg
-DEPENDS+=		suse_libpng-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libpng
-DEPENDS+=		suse_libtiff-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libtiff
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-# Initialize gtk/pango modules.
-FILES_SUBST+=		EMULDIR=${EMULDIR:Q}
-FILES_SUBST+=		BINSUFFIX=${BINSUFFIX:Q}
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_gtk2/Makefile.i386 b/emulators/suse100_gtk2/Makefile.i386
deleted file mode 100644
index 98d51b9ea6e..00000000000
--- a/emulators/suse100_gtk2/Makefile.i386
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.3 2007/02/18 12:34:20 tonio Exp $
-
-RPMFILES=		atk-1.10.3-2.${SUSE_ARCH}.rpm \
-			glib2-2.8.1-3.${SUSE_ARCH}.rpm \
-			gtk2-2.8.3-4.3.${SUSE_ARCH}.rpm \
-			cairo-1.0.0-7.4.${SUSE_ARCH}.rpm \
-			glitz-0.4.4-4.${SUSE_ARCH}.rpm \
-			pango-1.10.0-3.${SUSE_ARCH}.rpm
-
-BINSUFFIX=
diff --git a/emulators/suse100_gtk2/Makefile.powerpc b/emulators/suse100_gtk2/Makefile.powerpc
deleted file mode 100644
index 6c718d8a3ab..00000000000
--- a/emulators/suse100_gtk2/Makefile.powerpc
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.3 2007/02/18 12:34:20 tonio Exp $
-
-RPMFILES=		atk-1.10.3-2.${SUSE_ARCH}.rpm \
-			glib2-2.8.1-3.${SUSE_ARCH}.rpm \
-			gtk2-2.8.3-4.3.${SUSE_ARCH}.rpm \
-			cairo-1.0.0-7.4.${SUSE_ARCH}.rpm \
-			glitz-0.4.4-4.${SUSE_ARCH}.rpm \
-			pango-1.10.0-3.${SUSE_ARCH}.rpm
-
-BINSUFFIX=
diff --git a/emulators/suse100_gtk2/Makefile.x86_64 b/emulators/suse100_gtk2/Makefile.x86_64
deleted file mode 100644
index fa263f315fe..00000000000
--- a/emulators/suse100_gtk2/Makefile.x86_64
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.3 2007/02/18 12:34:20 tonio Exp $
-
-RPMFILES=		atk-1.10.3-2.${SUSE_ARCH}.rpm \
-			glib2-2.8.1-3.${SUSE_ARCH}.rpm \
-			gtk2-2.8.3-4.3.${SUSE_ARCH}.rpm \
-			cairo-1.0.0-7.4.${SUSE_ARCH}.rpm \
-			glitz-0.4.4-4.${SUSE_ARCH}.rpm \
-			pango-1.10.0-3.${SUSE_ARCH}.rpm
-
-BINSUFFIX=	-64
diff --git a/emulators/suse100_gtk2/PLIST b/emulators/suse100_gtk2/PLIST
deleted file mode 100644
index 72158d5fc79..00000000000
--- a/emulators/suse100_gtk2/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/09 20:38:51 tonio Exp $
-${EMULSUBDIR}/etc/opt/gnome/gtk-2.0/gtk.immodules
-${EMULSUBDIR}/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders
-${EMULSUBDIR}/etc/opt/gnome/pango/pango.modules
diff --git a/emulators/suse100_gtk2/distinfo b/emulators/suse100_gtk2/distinfo
deleted file mode 100644
index a4bd96a4578..00000000000
--- a/emulators/suse100_gtk2/distinfo
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-SHA1 (suse100/i586/atk-1.10.3-2.i586.rpm) = c1969029b70e91f49f3362e3aa385ccf9f520579
-RMD160 (suse100/i586/atk-1.10.3-2.i586.rpm) = 10a1609d6a1fdc1f5697db125a069ae0934c3a72
-Size (suse100/i586/atk-1.10.3-2.i586.rpm) = 182979 bytes
-SHA1 (suse100/i586/glib2-2.8.1-3.i586.rpm) = 82e97fbbf57d336092288b85d878fc3aaf047a4e
-RMD160 (suse100/i586/glib2-2.8.1-3.i586.rpm) = 155a23eb416591ccd2dc7878de8a224332532065
-Size (suse100/i586/glib2-2.8.1-3.i586.rpm) = 563199 bytes
-SHA1 (suse100/i586/gtk2-2.8.3-4.3.i586.rpm) = 443885a6ee35ad36fe7294007297b2db0e2c5584
-RMD160 (suse100/i586/gtk2-2.8.3-4.3.i586.rpm) = 9fda42b7c59346706376497d3b69105ead40c471
-Size (suse100/i586/gtk2-2.8.3-4.3.i586.rpm) = 3656439 bytes
-SHA1 (suse100/i586/cairo-1.0.0-7.4.i586.rpm) = 6de0cc8c53687537b84ce33fa8b13f17786fb94d
-RMD160 (suse100/i586/cairo-1.0.0-7.4.i586.rpm) = 3480ac0afa4731ee5fef42e70f2c3196d2f4f711
-Size (suse100/i586/cairo-1.0.0-7.4.i586.rpm) = 249462 bytes
-SHA1 (suse100/i586/glitz-0.4.4-4.i586.rpm) = 27ffca0347c5940af2a42fb33c795fc606ab7bf4
-RMD160 (suse100/i586/glitz-0.4.4-4.i586.rpm) = 54a95f704cbfd07d388bcc4bb1bcd54aa86fca46
-Size (suse100/i586/glitz-0.4.4-4.i586.rpm) = 76101 bytes
-SHA1 (suse100/i586/pango-1.10.0-3.i586.rpm) = 03520a04603bc8b90c15ae9a63ca2a9feb7970e3
-RMD160 (suse100/i586/pango-1.10.0-3.i586.rpm) = 309607551b8c814a93b7d79e6236da2737539ce7
-Size (suse100/i586/pango-1.10.0-3.i586.rpm) = 272552 bytes
-SHA1 (suse100/ppc/atk-1.10.3-2.ppc.rpm) = f583040453c2f4615934026eb1dd1b29ecca1966
-RMD160 (suse100/ppc/atk-1.10.3-2.ppc.rpm) = 5ddf561d899880ce52a04a78a2a2e0db8bf9ca27
-Size (suse100/ppc/atk-1.10.3-2.ppc.rpm) = 193979 bytes
-SHA1 (suse100/ppc/glib2-2.8.1-3.ppc.rpm) = 06b21b579f9f5fbd697e402d8d150e5dbf65bb9d
-RMD160 (suse100/ppc/glib2-2.8.1-3.ppc.rpm) = ed70be3ec4074a17b18e5a02d5a72d815b5a7abe
-Size (suse100/ppc/glib2-2.8.1-3.ppc.rpm) = 624140 bytes
-SHA1 (suse100/ppc/gtk2-2.8.3-4.3.ppc.rpm) = 85590d88ddb5b5986d94cf95707e3f28b1df6b73
-RMD160 (suse100/ppc/gtk2-2.8.3-4.3.ppc.rpm) = 8c5b781ac9fdd0c1babd11819a5785720517f536
-Size (suse100/ppc/gtk2-2.8.3-4.3.ppc.rpm) = 3896505 bytes
-SHA1 (suse100/ppc/cairo-1.0.0-7.4.ppc.rpm) = 73b2eaa6c5be6131ef5284703d31254d936dbedd
-RMD160 (suse100/ppc/cairo-1.0.0-7.4.ppc.rpm) = 646a2118062a8f8c4031a8ed4fc356c1fb7d0efd
-Size (suse100/ppc/cairo-1.0.0-7.4.ppc.rpm) = 258500 bytes
-SHA1 (suse100/ppc/glitz-0.4.4-4.ppc.rpm) = eb681c824e99342cbbc7dcf8c3d0fb9038545655
-RMD160 (suse100/ppc/glitz-0.4.4-4.ppc.rpm) = fe43ca7ebbbecce9851b207f776debfa6d59782a
-Size (suse100/ppc/glitz-0.4.4-4.ppc.rpm) = 87494 bytes
-SHA1 (suse100/ppc/pango-1.10.0-3.ppc.rpm) = 5b6bd355a34cb908cefe98bf8474aed75bd27635
-RMD160 (suse100/ppc/pango-1.10.0-3.ppc.rpm) = e4fb855ddf12effb80528e71835909881dbe819e
-Size (suse100/ppc/pango-1.10.0-3.ppc.rpm) = 315684 bytes
-SHA1 (suse100/x86_64/atk-1.10.3-2.x86_64.rpm) = 97257906dedffa12a03f5986a39ed18091c15ea1
-RMD160 (suse100/x86_64/atk-1.10.3-2.x86_64.rpm) = ad67d77c67c246e26674a52ec4be4fa5440f506b
-Size (suse100/x86_64/atk-1.10.3-2.x86_64.rpm) = 188249 bytes
-SHA1 (suse100/x86_64/glib2-2.8.1-3.x86_64.rpm) = 15ea9709b5b18f2495b13de75fad1527e70c8850
-RMD160 (suse100/x86_64/glib2-2.8.1-3.x86_64.rpm) = be9b2b1ffa62e4c12290f509c9ad1621ae8bd9d1
-Size (suse100/x86_64/glib2-2.8.1-3.x86_64.rpm) = 609991 bytes
-SHA1 (suse100/x86_64/gtk2-2.8.3-4.3.x86_64.rpm) = 34b26d446ab111b5ad231393b782720a850cd7c1
-RMD160 (suse100/x86_64/gtk2-2.8.3-4.3.x86_64.rpm) = e88aacdc83ff97acebac84d27487e6b795d0c8c2
-Size (suse100/x86_64/gtk2-2.8.3-4.3.x86_64.rpm) = 3829499 bytes
-SHA1 (suse100/x86_64/cairo-1.0.0-7.4.x86_64.rpm) = ebc8341b5013c769cbf8945cff6cb77910af61b7
-RMD160 (suse100/x86_64/cairo-1.0.0-7.4.x86_64.rpm) = e40562993bb9f93bf0436214a84527aacecc659f
-Size (suse100/x86_64/cairo-1.0.0-7.4.x86_64.rpm) = 262693 bytes
-SHA1 (suse100/x86_64/glitz-0.4.4-4.x86_64.rpm) = 1a71fb5da673006546fcf492820c2926e7501dd5
-RMD160 (suse100/x86_64/glitz-0.4.4-4.x86_64.rpm) = 837da9e0d8f0b42d49fafe1db3299e8ac28f1df0
-Size (suse100/x86_64/glitz-0.4.4-4.x86_64.rpm) = 80965 bytes
-SHA1 (suse100/x86_64/pango-1.10.0-3.x86_64.rpm) = 21597f12a195cfb1d018cc3c82db9a786036f979
-RMD160 (suse100/x86_64/pango-1.10.0-3.x86_64.rpm) = a2b5728987ba8d8b181b1e8be8585be1566f43ab
-Size (suse100/x86_64/pango-1.10.0-3.x86_64.rpm) = 294276 bytes
diff --git a/emulators/suse100_libcups/DESCR b/emulators/suse100_libcups/DESCR
deleted file mode 100644
index 63bc28d4eca..00000000000
--- a/emulators/suse100_libcups/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with cups shared libraries.
diff --git a/emulators/suse100_libcups/Makefile b/emulators/suse100_libcups/Makefile
deleted file mode 100644
index 9fd2092d5c4..00000000000
--- a/emulators/suse100_libcups/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/06/30 16:20:23 salo Exp $
-
-DISTNAME=		suse_libcups-${SUSE_VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		markd@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the Cups library
-
-DEPENDS+=		suse_openssl-${SUSE_VERSION}{,nb*}:../../emulators/suse100_openssl
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_libcups/Makefile.i386 b/emulators/suse100_libcups/Makefile.i386
deleted file mode 100644
index 6ea038d9293..00000000000
--- a/emulators/suse100_libcups/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/06/11 13:29:09 markd Exp $
-
-RPMFILES=		cups-libs-1.1.23-21.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libcups/Makefile.powerpc b/emulators/suse100_libcups/Makefile.powerpc
deleted file mode 100644
index b5f87f4d231..00000000000
--- a/emulators/suse100_libcups/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/06/11 13:29:09 markd Exp $
-
-RPMFILES=		cups-libs-1.1.23-21.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libcups/Makefile.x86_64 b/emulators/suse100_libcups/Makefile.x86_64
deleted file mode 100644
index 0797a68d908..00000000000
--- a/emulators/suse100_libcups/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/06/11 13:29:09 markd Exp $
-
-RPMFILES=		cups-libs-1.1.23-21.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libcups/distinfo b/emulators/suse100_libcups/distinfo
deleted file mode 100644
index 2ae99f6ac5d..00000000000
--- a/emulators/suse100_libcups/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/06/11 13:29:09 markd Exp $
-
-SHA1 (suse100/i586/cups-libs-1.1.23-21.i586.rpm) = 2fc812522721a96e7d665890012e48b794a13643
-RMD160 (suse100/i586/cups-libs-1.1.23-21.i586.rpm) = 78d5f07ec4783fcb02baa7dcf5d1bba41ca6ea38
-Size (suse100/i586/cups-libs-1.1.23-21.i586.rpm) = 111605 bytes
-SHA1 (suse100/ppc/cups-libs-1.1.23-21.ppc.rpm) = 26827386e7e805c5931c20bacc5aea6a4e536470
-RMD160 (suse100/ppc/cups-libs-1.1.23-21.ppc.rpm) = 01db010694d6fe3abaa9ddf0665798c42e46dd79
-Size (suse100/ppc/cups-libs-1.1.23-21.ppc.rpm) = 118248 bytes
-SHA1 (suse100/x86_64/cups-libs-1.1.23-21.x86_64.rpm) = a63fb335184c27f99f784bc8e5f2cd5c6db82a9a
-RMD160 (suse100/x86_64/cups-libs-1.1.23-21.x86_64.rpm) = 91075073671288e376e3ad934ccb0c1c43777fe2
-Size (suse100/x86_64/cups-libs-1.1.23-21.x86_64.rpm) = 113878 bytes
diff --git a/emulators/suse100_libjpeg/DESCR b/emulators/suse100_libjpeg/DESCR
deleted file mode 100644
index 3fe7a54d422..00000000000
--- a/emulators/suse100_libjpeg/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with jpeg shared libraries.
diff --git a/emulators/suse100_libjpeg/Makefile b/emulators/suse100_libjpeg/Makefile
deleted file mode 100644
index 4c4d8a51146..00000000000
--- a/emulators/suse100_libjpeg/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
-
-DISTNAME=		suse_libjpeg-${SUSE_VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the JPEG library
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-LIBTOOLIZE_PLIST=	NO
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_libjpeg/Makefile.i386 b/emulators/suse100_libjpeg/Makefile.i386
deleted file mode 100644
index 2e514eecb30..00000000000
--- a/emulators/suse100_libjpeg/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/03/09 20:37:33 tonio Exp $
-
-RPMFILES=		libjpeg-6.2.0-739.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libjpeg/Makefile.powerpc b/emulators/suse100_libjpeg/Makefile.powerpc
deleted file mode 100644
index e997f59f99e..00000000000
--- a/emulators/suse100_libjpeg/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/03/09 20:37:33 tonio Exp $
-
-RPMFILES=		libjpeg-6.2.0-739.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libjpeg/Makefile.x86_64 b/emulators/suse100_libjpeg/Makefile.x86_64
deleted file mode 100644
index bffc9b5ac1a..00000000000
--- a/emulators/suse100_libjpeg/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/03/09 20:37:33 tonio Exp $
-
-RPMFILES=		libjpeg-6.2.0-739.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libjpeg/distinfo b/emulators/suse100_libjpeg/distinfo
deleted file mode 100644
index ee5366d18c0..00000000000
--- a/emulators/suse100_libjpeg/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.1 2006/04/03 18:17:55 ghen Exp $
-
-SHA1 (suse100/i586/libjpeg-6.2.0-739.i586.rpm) = 8a1a1907c5333dd1a4391ce4f1f0dda14d557ac6
-RMD160 (suse100/i586/libjpeg-6.2.0-739.i586.rpm) = 54c97e7f09ed4b2aaa78dd5cb8e333bcf194ff3f
-Size (suse100/i586/libjpeg-6.2.0-739.i586.rpm) = 67238 bytes
-SHA1 (suse100/ppc/libjpeg-6.2.0-739.ppc.rpm) = c1ff9baa3abbe739d0aa07d55bc8327cdd2edae8
-RMD160 (suse100/ppc/libjpeg-6.2.0-739.ppc.rpm) = d1d8f0903804f465e9a942ba9fdd3d80f4f63b5b
-Size (suse100/ppc/libjpeg-6.2.0-739.ppc.rpm) = 73677 bytes
-SHA1 (suse100/x86_64/libjpeg-6.2.0-739.x86_64.rpm) = 6dc54163c9119c74d45f248c63515ac4b78a9e38
-RMD160 (suse100/x86_64/libjpeg-6.2.0-739.x86_64.rpm) = 2e70e92fffd825214bc40220ace5324d99ff1b84
-Size (suse100/x86_64/libjpeg-6.2.0-739.x86_64.rpm) = 70061 bytes
diff --git a/emulators/suse100_libpng/DESCR b/emulators/suse100_libpng/DESCR
deleted file mode 100644
index f330608b9fc..00000000000
--- a/emulators/suse100_libpng/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with png shared libraries.
diff --git a/emulators/suse100_libpng/Makefile b/emulators/suse100_libpng/Makefile
deleted file mode 100644
index aa917679d3e..00000000000
--- a/emulators/suse100_libpng/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2006/12/06 10:35:58 wiz Exp $
-
-DISTNAME=		suse_libpng-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the PNG library
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_libpng/Makefile.i386 b/emulators/suse100_libpng/Makefile.i386
deleted file mode 100644
index a1b3b6a771b..00000000000
--- a/emulators/suse100_libpng/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.2 2006/12/06 10:35:58 wiz Exp $
-
-RPMFILES=		libpng-1.2.8-5.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libpng/Makefile.powerpc b/emulators/suse100_libpng/Makefile.powerpc
deleted file mode 100644
index be131b36f60..00000000000
--- a/emulators/suse100_libpng/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.2 2006/12/06 10:35:58 wiz Exp $
-
-RPMFILES=		libpng-1.2.8-5.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libpng/Makefile.x86_64 b/emulators/suse100_libpng/Makefile.x86_64
deleted file mode 100644
index b47853e883a..00000000000
--- a/emulators/suse100_libpng/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.2 2006/12/06 10:35:58 wiz Exp $
-
-RPMFILES=		libpng-1.2.8-5.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libpng/distinfo b/emulators/suse100_libpng/distinfo
deleted file mode 100644
index 850c8937c5d..00000000000
--- a/emulators/suse100_libpng/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/12/06 10:35:58 wiz Exp $
-
-SHA1 (suse100/i586/libpng-1.2.8-5.2.i586.rpm) = 60a3268fa9f0f3fe6c7ca89b9983f20d6b221b28
-RMD160 (suse100/i586/libpng-1.2.8-5.2.i586.rpm) = ecf710d86f18e62dc11afe4bede78e0193f76c84
-Size (suse100/i586/libpng-1.2.8-5.2.i586.rpm) = 189013 bytes
-SHA1 (suse100/ppc/libpng-1.2.8-5.2.ppc.rpm) = 66a2de20037acb111421dfc2a210bad1b13e8f12
-RMD160 (suse100/ppc/libpng-1.2.8-5.2.ppc.rpm) = 2f18c07b35263c1286531dc62f19e329dbfa5806
-Size (suse100/ppc/libpng-1.2.8-5.2.ppc.rpm) = 181701 bytes
-SHA1 (suse100/x86_64/libpng-1.2.8-5.2.x86_64.rpm) = c7755c8f984f14d81ed7d212309fdad1ee9acda3
-RMD160 (suse100/x86_64/libpng-1.2.8-5.2.x86_64.rpm) = 25677555570873da38502094f611d636d5286b00
-Size (suse100/x86_64/libpng-1.2.8-5.2.x86_64.rpm) = 193089 bytes
diff --git a/emulators/suse100_libtiff/DESCR b/emulators/suse100_libtiff/DESCR
deleted file mode 100644
index 6eb5ded69a7..00000000000
--- a/emulators/suse100_libtiff/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with tiff shared libraries.
diff --git a/emulators/suse100_libtiff/Makefile b/emulators/suse100_libtiff/Makefile
deleted file mode 100644
index eedd5fbfff3..00000000000
--- a/emulators/suse100_libtiff/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2006/08/02 14:26:13 salo Exp $
-
-DISTNAME=		suse_libtiff-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the TIFF library
-
-DEPENDS+=		suse_libjpeg-${SUSE_VERSION}{,nb*}:../../emulators/suse100_libjpeg
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_libtiff/Makefile.i386 b/emulators/suse100_libtiff/Makefile.i386
deleted file mode 100644
index 31b6a755fc0..00000000000
--- a/emulators/suse100_libtiff/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.3 2006/08/02 14:26:13 salo Exp $
-
-RPMFILES=		libtiff-3.7.3-2.6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libtiff/Makefile.powerpc b/emulators/suse100_libtiff/Makefile.powerpc
deleted file mode 100644
index 1d19558fda9..00000000000
--- a/emulators/suse100_libtiff/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.3 2006/08/02 14:26:13 salo Exp $
-
-RPMFILES=		libtiff-3.7.3-2.6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libtiff/Makefile.x86_64 b/emulators/suse100_libtiff/Makefile.x86_64
deleted file mode 100644
index abe1444fc35..00000000000
--- a/emulators/suse100_libtiff/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.3 2006/08/02 14:26:13 salo Exp $
-
-RPMFILES=		libtiff-3.7.3-2.6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libtiff/distinfo b/emulators/suse100_libtiff/distinfo
deleted file mode 100644
index 8fef9c120d8..00000000000
--- a/emulators/suse100_libtiff/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/08/02 14:26:13 salo Exp $
-
-SHA1 (suse100/i586/libtiff-3.7.3-2.6.i586.rpm) = c724c294d99c0ca0065f4a518bc61591cdde3a92
-RMD160 (suse100/i586/libtiff-3.7.3-2.6.i586.rpm) = 29e70299da50f6e5476e48aac16190fa8596e6ff
-Size (suse100/i586/libtiff-3.7.3-2.6.i586.rpm) = 120938 bytes
-SHA1 (suse100/ppc/libtiff-3.7.3-2.6.ppc.rpm) = e8ef51b9d9bf15f32246db38fb73c0c26a1c24de
-RMD160 (suse100/ppc/libtiff-3.7.3-2.6.ppc.rpm) = dde4042ef1087d601956727e88de5af243995f53
-Size (suse100/ppc/libtiff-3.7.3-2.6.ppc.rpm) = 139456 bytes
-SHA1 (suse100/x86_64/libtiff-3.7.3-2.6.x86_64.rpm) = e7e93ee05e6836092e1020e01254e5cffd806d0f
-RMD160 (suse100/x86_64/libtiff-3.7.3-2.6.x86_64.rpm) = b0aced1d4026048f40590b62aaeb8d4ceb92e738
-Size (suse100/x86_64/libtiff-3.7.3-2.6.x86_64.rpm) = 129923 bytes
diff --git a/emulators/suse100_libxml2/DESCR b/emulators/suse100_libxml2/DESCR
deleted file mode 100644
index 5748383626e..00000000000
--- a/emulators/suse100_libxml2/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take
-a look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with libxml2 shared
-libraries.
diff --git a/emulators/suse100_libxml2/Makefile b/emulators/suse100_libxml2/Makefile
deleted file mode 100644
index 53afa86de2d..00000000000
--- a/emulators/suse100_libxml2/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/06/30 16:20:23 salo Exp $
-
-DISTNAME=	suse_libxml2-${SUSE_VERSION}
-PKGREVISION=	1
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SUSE100}
-DISTFILES=	${RPMFILES}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.suse.com/
-COMMENT=	Linux compatibility package for the libxml2 library
-
-DEPENDS+=	suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-
-EXTRACT_ONLY=	# empty
-NO_BUILD=	YES
-PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_libxml2/Makefile.i386 b/emulators/suse100_libxml2/Makefile.i386
deleted file mode 100644
index 8117679d2da..00000000000
--- a/emulators/suse100_libxml2/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/06/13 11:30:48 salo Exp $
-
-RPMFILES=		libxml2-2.6.20-4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libxml2/Makefile.powerpc b/emulators/suse100_libxml2/Makefile.powerpc
deleted file mode 100644
index d93a64cd8a5..00000000000
--- a/emulators/suse100_libxml2/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/06/13 11:30:48 salo Exp $
-
-RPMFILES=		libxml2-2.6.20-4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libxml2/Makefile.x86_64 b/emulators/suse100_libxml2/Makefile.x86_64
deleted file mode 100644
index 725a04f0822..00000000000
--- a/emulators/suse100_libxml2/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/06/13 11:30:48 salo Exp $
-
-RPMFILES=		libxml2-2.6.20-4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_libxml2/distinfo b/emulators/suse100_libxml2/distinfo
deleted file mode 100644
index 9bc1419c7b5..00000000000
--- a/emulators/suse100_libxml2/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/06/13 11:30:48 salo Exp $
-
-SHA1 (suse100/i586/libxml2-2.6.20-4.i586.rpm) = 7d0ce988dd1acd562e9458cd534f825545091080
-RMD160 (suse100/i586/libxml2-2.6.20-4.i586.rpm) = 1e61d863274344ce428882c94cdf1e4511f2c808
-Size (suse100/i586/libxml2-2.6.20-4.i586.rpm) = 597776 bytes
-SHA1 (suse100/ppc/libxml2-2.6.20-4.ppc.rpm) = 7980734e88366f7ab5179457d766c529f20e8a2d
-RMD160 (suse100/ppc/libxml2-2.6.20-4.ppc.rpm) = d48a2e0a80d3a8e0c42a38d35c63469b8706d9c7
-Size (suse100/ppc/libxml2-2.6.20-4.ppc.rpm) = 643318 bytes
-SHA1 (suse100/x86_64/libxml2-2.6.20-4.x86_64.rpm) = 131f9e577a541508d0cdd4c2e30fa0ea93947bf9
-RMD160 (suse100/x86_64/libxml2-2.6.20-4.x86_64.rpm) = f1a42c1c22b4bfbcaaff780c7d12b9ede6a70c30
-Size (suse100/x86_64/libxml2-2.6.20-4.x86_64.rpm) = 607167 bytes
diff --git a/emulators/suse100_linux/Makefile.common b/emulators/suse100_linux/Makefile.common
deleted file mode 100644
index 736ddc529d2..00000000000
--- a/emulators/suse100_linux/Makefile.common
+++ /dev/null
@@ -1,106 +0,0 @@
-# $NetBSD: Makefile.common,v 1.12 2006/10/02 16:00:38 rillig Exp $
-
-.include "../../emulators/suse100_linux/vars.mk"
-.include "../../emulators/suse100_linux/arch.mk"
-
-ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-i386 NetBSD-3.99*-x86_64 \
-			NetBSD-[2-9]*-powerpc \
-			NetBSD-[4-9]*-x86_64 FreeBSD-*-i386 \
-			DragonFly-*-i386
-
-_SUSE_FTP_SUBDIR=	distribution/SL-${SUSE_VERSION}-OSS/inst-source/suse/${SUSE_ARCH}/
-_SUSE_FTP_SUBDIR_UPD=	suse/${SUSE_ARCH_DIR}/update/${SUSE_VERSION}/rpm/${SUSE_ARCH}/
-
-MASTER_SITE_SUSE100?= \
-	ftp://suse.inode.at/opensuse/${_SUSE_FTP_SUBDIR} \
-	http://suse.inode.at/opensuse/${_SUSE_FTP_SUBDIR} \
-	ftp://suse.inode.at/pub/update/${SUSE_VERSION}/rpm/${SUSE_ARCH}/ \
-	http://suse.inode.at/pub/update/${SUSE_VERSION}/rpm/${SUSE_ARCH}/ \
-	ftp://ftp.gwdg.de/pub/opensuse/${_SUSE_FTP_SUBDIR} \
-	ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/${_SUSE_FTP_SUBDIR_UPD} \
-	ftp://gd.tuwien.ac.at/linux/opensuse/${_SUSE_FTP_SUBDIR} \
-	http://gd.tuwien.ac.at/linux/suse.com/${_SUSE_FTP_SUBDIR_UPD} \
-	ftp://gd.tuwien.ac.at/linux/suse.com/${_SUSE_FTP_SUBDIR_UPD} \
-	ftp://mirror.karneval.cz/pub/opensuse/${_SUSE_FTP_SUBDIR:S,distribution/,,} \
-	ftp://ftp.suse.com/pub/${_SUSE_FTP_SUBDIR_UPD}
-
-DIST_SUBDIR?=		suse${SUSE_VERSION:S/.//}/${SUSE_ARCH}
-
-WRKSRC?=		${WRKDIR}
-MANCOMPRESSED?=		yes
-
-# Don't check any script interpreter, as long as nobody complains.
-CHECK_INTERPRETER_SKIP=	*
-
-EMULSUBDIR=		emul/linux
-EMULDIR=		${PREFIX}/${EMULSUBDIR}
-
-# Set location of OPSYS-specific emulation directory
-.if ${OPSYS} == "NetBSD"
-OPSYS_EMULDIR=		/${EMULSUBDIR}
-.elif (${OPSYS} == "FreeBSD") || (${OPSYS} == "DragonFly")
-OPSYS_EMULDIR=		/compat/${EMULSUBDIR:T}
-.else
-OPSYS_EMULDIR=		/${EMULSUBDIR}
-.endif
-FILES_SUBST+=		OPSYS_EMULDIR=${OPSYS_EMULDIR:Q}
-
-RPM2PKG=		${PREFIX}/sbin/rpm2pkg
-BUILD_DEPENDS+=		rpm2pkg>=2.1:../../pkgtools/rpm2pkg
-
-BUILD_DEFS+=		RPMFILES
-.if defined(RPMIGNOREPATH)
-BUILD_DEFS+=		RPMIGNOREPATH
-.endif
-
-# The SuSE Linux packages have circular dependencies.
-LDD?=			${TRUE}
-
-RPM2PKGSTRIP?=		1
-RPM2PKGARGS?=		-d ${PREFIX} -f ${PLIST_SRC} -p ${EMULSUBDIR}
-.if empty(RPM2PKGSTRIP:M0)
-RPM2PKGARGS+=		-s ${RPM2PKGSTRIP}
-.endif
-.for TEMP in ${RPMIGNOREPATH}
-RPM2PKGARGS+=		-i ${TEMP}
-.endfor
-.for TEMP in ${RPMFILES}
-RPM2PKGARGS+=		${DISTDIR}/${DIST_SUBDIR}/${TEMP}
-.endfor
-
-# regenerate distinfo for all platforms supported by the suse100_* packages
-suse100-distinfo:
-	( ${ECHO} '$$'NetBSD'$$';			\
-	${ECHO} '';					\
-	MACHINE_ARCH=i386 ${MAKE} distinfo 1>&2;	\
-		${GREP} rpm distinfo;			\
-	MACHINE_ARCH=powerpc ${MAKE} distinfo 1>&2;	\
-		${GREP} rpm distinfo;			\
-	MACHINE_ARCH=x86_64 ${MAKE} distinfo 1>&2;	\
-		${GREP} rpm distinfo;			\
-	) > distinfo.new
-	${MV} -f distinfo.new distinfo
-
-.if !target(do-install)
-do-install:
-	@if [ -f ${PKGDIR}/PLIST ]; then \
-	  ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}; \
-	else \
-	  ${RM} -f ${PLIST_SRC}; \
-	  ${CP} ${PKGSRCDIR}/emulators/suse_linux/PLIST_dynamic ${PLIST_SRC} ; \
-	fi
-	@if [ -f ${PKGDIR}/PLIST_rpmfix.${MACHINE_ARCH} ]; then \
-	    ${SED} -e 's,^/,${EMULSUBDIR}/,' ${PKGDIR}/PLIST_rpmfix.${MACHINE_ARCH} >> ${PLIST_SRC}; \
-	fi
-	${RPM2PKG} ${RPM2PKGARGS}
-	@if ${GREP} -q 'lib.*\.so' ${PLIST_SRC}; then \
-	  ${ECHO_MSG} "===> [Automatic Linux shared object handling]"; \
-	  ${EMULDIR}/sbin/ldconfig -r ${EMULDIR}; \
-	  ${MV} -f ${PLIST_SRC} ${PLIST_SRC}.old; \
-	  ${GREP} -v '^@dirrm' ${PLIST_SRC}.old >${PLIST_SRC} || ${TRUE}; \
-	  ${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}; \
-	  ${ECHO} "@unexec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR} 2>/dev/null" >>${PLIST_SRC}; \
-	  ${GREP} '^@dirrm' ${PLIST_SRC}.old >>${PLIST_SRC} || ${TRUE}; \
-	  ${RM} -f ${PLIST_SRC}.old; \
-	fi
-.endif
diff --git a/emulators/suse100_linux/arch.mk b/emulators/suse100_linux/arch.mk
deleted file mode 100644
index a81df844cef..00000000000
--- a/emulators/suse100_linux/arch.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: arch.mk,v 1.1.1.1 2006/03/09 20:33:46 tonio Exp $
-
-.ifndef SUSE_ARCH_MK
-SUSE_ARCH_MK=1
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-SUSE_ARCH?=	i586
-SUSE_ARCH_DIR?=	${MACHINE_ARCH}
-.elif ${MACHINE_ARCH} == "powerpc"
-SUSE_ARCH?=	ppc
-.else
-SUSE_ARCH?=	${MACHINE_ARCH}
-.endif
-
-SUSE_ARCH_DIR?=	${SUSE_ARCH}
-
-.endif # SUSE_ARCH_MK
diff --git a/emulators/suse100_linux/vars.mk b/emulators/suse100_linux/vars.mk
deleted file mode 100644
index 7f78258bdaf..00000000000
--- a/emulators/suse100_linux/vars.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: vars.mk,v 1.1.1.1 2006/03/09 20:33:46 tonio Exp $
-
-.ifndef SUSE_VARS_MK
-SUSE_VARS_MK=1
-
-SUSE_DIR_PREFIX=	suse100
-SUSE_VERSION=		10.0
-
-.endif # SUSE_VARS_MK
diff --git a/emulators/suse100_locale/DESCR b/emulators/suse100_locale/DESCR
deleted file mode 100644
index 25484919ed3..00000000000
--- a/emulators/suse100_locale/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package includes the glibc locale files.
diff --git a/emulators/suse100_locale/Makefile b/emulators/suse100_locale/Makefile
deleted file mode 100644
index f290433e09d..00000000000
--- a/emulators/suse100_locale/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:23 salo Exp $
-
-DISTNAME=		suse_locale-${SUSE_VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Locale files for the Linux compatibility package
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-
-CONFLICTS=		linux-locale-[0-9]*
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_locale/Makefile.i386 b/emulators/suse100_locale/Makefile.i386
deleted file mode 100644
index 90b6fccd962..00000000000
--- a/emulators/suse100_locale/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/03/13 10:25:35 tonio Exp $
-
-RPMFILES=		glibc-locale-2.3.5-40.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_locale/Makefile.powerpc b/emulators/suse100_locale/Makefile.powerpc
deleted file mode 100644
index 6355c572d00..00000000000
--- a/emulators/suse100_locale/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/03/13 10:25:35 tonio Exp $
-
-RPMFILES=		glibc-locale-2.3.5-40.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_locale/Makefile.x86_64 b/emulators/suse100_locale/Makefile.x86_64
deleted file mode 100644
index 270741ff188..00000000000
--- a/emulators/suse100_locale/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/03/13 10:25:35 tonio Exp $
-
-RPMFILES=		glibc-locale-2.3.5-40.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_locale/distinfo b/emulators/suse100_locale/distinfo
deleted file mode 100644
index 8d961ee6cc7..00000000000
--- a/emulators/suse100_locale/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.1 2006/04/03 18:17:55 ghen Exp $
-
-SHA1 (suse100/i586/glibc-locale-2.3.5-40.i586.rpm) = 7c54c225651d3dd5af7ad19a9cc5a924bfd0bbe3
-RMD160 (suse100/i586/glibc-locale-2.3.5-40.i586.rpm) = b13bd9e9daeb5253b1f81a374d722c2c18e90297
-Size (suse100/i586/glibc-locale-2.3.5-40.i586.rpm) = 12273740 bytes
-SHA1 (suse100/ppc/glibc-locale-2.3.5-40.ppc.rpm) = 8106f6a1ebc3bcd2ddbbf202edbb15ef2c5b5d2d
-RMD160 (suse100/ppc/glibc-locale-2.3.5-40.ppc.rpm) = 5849a3cb3e31daec6f9f0ea78a6022d9170c8be5
-Size (suse100/ppc/glibc-locale-2.3.5-40.ppc.rpm) = 12144947 bytes
-SHA1 (suse100/x86_64/glibc-locale-2.3.5-40.x86_64.rpm) = c17884ca8e8836b6b710ea4ee030cb5236b92472
-RMD160 (suse100/x86_64/glibc-locale-2.3.5-40.x86_64.rpm) = a0b4493eeaa3f477782e7c63def328dafcd5b205
-Size (suse100/x86_64/glibc-locale-2.3.5-40.x86_64.rpm) = 12321930 bytes
diff --git a/emulators/suse100_openmotif/DESCR b/emulators/suse100_openmotif/DESCR
deleted file mode 100644
index f67dbf54135..00000000000
--- a/emulators/suse100_openmotif/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with OpenMotif shared
-libraries.
diff --git a/emulators/suse100_openmotif/Makefile b/emulators/suse100_openmotif/Makefile
deleted file mode 100644
index f500e5b7835..00000000000
--- a/emulators/suse100_openmotif/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/06/30 16:20:23 salo Exp $
-
-DISTNAME=		suse_openmotif-${SUSE_VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tron@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the Motif library
-
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_openmotif/Makefile.i386 b/emulators/suse100_openmotif/Makefile.i386
deleted file mode 100644
index 878ef2f0470..00000000000
--- a/emulators/suse100_openmotif/Makefile.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/04/18 09:01:36 tron Exp $
-
-RPMFILES=		openmotif-libs-2.2.3-13.${SUSE_ARCH}.rpm \
-			openmotif21-libs-2.1.30MLI4-128.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_openmotif/Makefile.powerpc b/emulators/suse100_openmotif/Makefile.powerpc
deleted file mode 100644
index 63b92bcbceb..00000000000
--- a/emulators/suse100_openmotif/Makefile.powerpc
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1 2006/04/18 09:29:47 salo Exp $
-
-RPMFILES=		openmotif-libs-2.2.3-13.${SUSE_ARCH}.rpm \
-			openmotif21-libs-2.1.30MLI4-128.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_openmotif/Makefile.x86_64 b/emulators/suse100_openmotif/Makefile.x86_64
deleted file mode 100644
index 7829ea9b7ad..00000000000
--- a/emulators/suse100_openmotif/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/04/18 09:29:47 salo Exp $
-
-RPMFILES=		openmotif-libs-2.2.3-13.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_openmotif/distinfo b/emulators/suse100_openmotif/distinfo
deleted file mode 100644
index 512df1b1e7e..00000000000
--- a/emulators/suse100_openmotif/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/04/18 09:29:47 salo Exp $
-
-SHA1 (suse100/i586/openmotif-libs-2.2.3-13.i586.rpm) = 71ec720ac1de51eb68dae69df3e54bd638400433
-RMD160 (suse100/i586/openmotif-libs-2.2.3-13.i586.rpm) = 4524548dcdeaa5120ae86db29a41ed8b4bd8e807
-Size (suse100/i586/openmotif-libs-2.2.3-13.i586.rpm) = 1205363 bytes
-SHA1 (suse100/i586/openmotif21-libs-2.1.30MLI4-128.i586.rpm) = 255e97dbb6be316031cf2b9a70b1198727e56988
-RMD160 (suse100/i586/openmotif21-libs-2.1.30MLI4-128.i586.rpm) = d83b128a8b94069496c704e36cefcf234ea53520
-Size (suse100/i586/openmotif21-libs-2.1.30MLI4-128.i586.rpm) = 1010343 bytes
-SHA1 (suse100/ppc/openmotif-libs-2.2.3-13.ppc.rpm) = 0a9a7e67e0806ad37906e6c6e9819a8d1fdfcc6b
-RMD160 (suse100/ppc/openmotif-libs-2.2.3-13.ppc.rpm) = fcd0c7b2045b530ab2a37e9733174adb66cd2be3
-Size (suse100/ppc/openmotif-libs-2.2.3-13.ppc.rpm) = 1259557 bytes
-SHA1 (suse100/ppc/openmotif21-libs-2.1.30MLI4-128.ppc.rpm) = fd597ea108853930051a2322ce6f38b147ddec2c
-RMD160 (suse100/ppc/openmotif21-libs-2.1.30MLI4-128.ppc.rpm) = 8617ea976fefd2b24a270e5a6ca5d6cc592c79db
-Size (suse100/ppc/openmotif21-libs-2.1.30MLI4-128.ppc.rpm) = 1050960 bytes
-SHA1 (suse100/x86_64/openmotif-libs-2.2.3-13.x86_64.rpm) = 9114d68bfaefce72b0fca9e601a8f7af5c553445
-RMD160 (suse100/x86_64/openmotif-libs-2.2.3-13.x86_64.rpm) = f42feff5a55f4760960ca9584e5e344389571f67
-Size (suse100/x86_64/openmotif-libs-2.2.3-13.x86_64.rpm) = 1285311 bytes
diff --git a/emulators/suse100_openssl/DESCR b/emulators/suse100_openssl/DESCR
deleted file mode 100644
index 2f0601735d1..00000000000
--- a/emulators/suse100_openssl/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with openssl shared
-libraries.
diff --git a/emulators/suse100_openssl/Makefile b/emulators/suse100_openssl/Makefile
deleted file mode 100644
index 8f8456c846e..00000000000
--- a/emulators/suse100_openssl/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/09/28 01:05:33 salo Exp $
-
-DISTNAME=		suse_openssl-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		markd@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the OpenSSL library
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_openssl/Makefile.i386 b/emulators/suse100_openssl/Makefile.i386
deleted file mode 100644
index 7918e72620d..00000000000
--- a/emulators/suse100_openssl/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.2 2006/09/28 01:05:33 salo Exp $
-
-RPMFILES=		openssl-0.9.7g-2.8.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_openssl/Makefile.powerpc b/emulators/suse100_openssl/Makefile.powerpc
deleted file mode 100644
index 9ec3213c96d..00000000000
--- a/emulators/suse100_openssl/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.2 2006/09/28 01:05:33 salo Exp $
-
-RPMFILES=		openssl-0.9.7g-2.8.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_openssl/Makefile.x86_64 b/emulators/suse100_openssl/Makefile.x86_64
deleted file mode 100644
index 626fde5e298..00000000000
--- a/emulators/suse100_openssl/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.2 2006/09/28 01:05:33 salo Exp $
-
-RPMFILES=		openssl-0.9.7g-2.8.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_openssl/distinfo b/emulators/suse100_openssl/distinfo
deleted file mode 100644
index ea9a96e0ed5..00000000000
--- a/emulators/suse100_openssl/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/09/28 01:05:33 salo Exp $
-
-SHA1 (suse100/i586/openssl-0.9.7g-2.8.i586.rpm) = 0f91d714ecbbac62d5ffc539828e4d35bf1a5030
-RMD160 (suse100/i586/openssl-0.9.7g-2.8.i586.rpm) = 26dca02bf0aa6999a4b7bb8f6398609ed4c55e3a
-Size (suse100/i586/openssl-0.9.7g-2.8.i586.rpm) = 1002098 bytes
-SHA1 (suse100/ppc/openssl-0.9.7g-2.8.ppc.rpm) = 942a6ac9bfdafb06a686270c7652502b7f21854b
-RMD160 (suse100/ppc/openssl-0.9.7g-2.8.ppc.rpm) = 640d5734a2d0872b73d80ac0e9765e95d91ae51a
-Size (suse100/ppc/openssl-0.9.7g-2.8.ppc.rpm) = 1123132 bytes
-SHA1 (suse100/x86_64/openssl-0.9.7g-2.8.x86_64.rpm) = d62f56804400cbdca61cc54aa08cb8cb9dd3cd74
-RMD160 (suse100/x86_64/openssl-0.9.7g-2.8.x86_64.rpm) = 1a0b5ef53e7dddaa6c3c178788c50c68a57fa23d
-Size (suse100/x86_64/openssl-0.9.7g-2.8.x86_64.rpm) = 1069246 bytes
diff --git a/emulators/suse100_slang/DESCR b/emulators/suse100_slang/DESCR
deleted file mode 100644
index f9f21396127..00000000000
--- a/emulators/suse100_slang/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with glibc2 which require
-the "slang" library.
diff --git a/emulators/suse100_slang/Makefile b/emulators/suse100_slang/Makefile
deleted file mode 100644
index 84597bbe3a3..00000000000
--- a/emulators/suse100_slang/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 16:20:24 salo Exp $
-
-DISTNAME=		suse_slang-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for slang library
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-post-install:
-	cd ${PREFIX}/${EMULSUBDIR}/usr/lib/ &&  \
-		${LN} -sf libslang-utf8.so.1 libslang.so.1
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_slang/Makefile.i386 b/emulators/suse100_slang/Makefile.i386
deleted file mode 100644
index 919a4929a5c..00000000000
--- a/emulators/suse100_slang/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1.1.1 2006/04/18 14:43:27 salo Exp $
-
-RPMFILES=		slang-1.4.9-127.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_slang/Makefile.powerpc b/emulators/suse100_slang/Makefile.powerpc
deleted file mode 100644
index ad5d557c2f3..00000000000
--- a/emulators/suse100_slang/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.1.1.1 2006/04/18 14:43:27 salo Exp $
-
-RPMFILES=		slang-1.4.9-127.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_slang/Makefile.x86_64 b/emulators/suse100_slang/Makefile.x86_64
deleted file mode 100644
index 448940cc2e0..00000000000
--- a/emulators/suse100_slang/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1.1.1 2006/04/18 14:43:27 salo Exp $
-
-RPMFILES=		slang-1.4.9-127.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_slang/PLIST b/emulators/suse100_slang/PLIST
deleted file mode 100644
index 4451b4a5386..00000000000
--- a/emulators/suse100_slang/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/06/30 16:20:24 salo Exp $
-@exec ${LN} -sf %D/${EMULSUBDIR}/usr/lib/libslang-utf8.so.1 %D/${EMULSUBDIR}/usr/lib/libslang.so.1
diff --git a/emulators/suse100_slang/PLIST_rpmfix.i386 b/emulators/suse100_slang/PLIST_rpmfix.i386
deleted file mode 100644
index ba94212ba3d..00000000000
--- a/emulators/suse100_slang/PLIST_rpmfix.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST_rpmfix.i386,v 1.1 2006/04/28 14:15:06 joerg Exp $
-/usr/lib/libslang.so.1
diff --git a/emulators/suse100_slang/distinfo b/emulators/suse100_slang/distinfo
deleted file mode 100644
index a7461f00241..00000000000
--- a/emulators/suse100_slang/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/04/18 14:43:27 salo Exp $
-
-SHA1 (suse100/i586/slang-1.4.9-127.i586.rpm) = cfdf9786ad1493a8f99d00ded990ec767d4e75ad
-RMD160 (suse100/i586/slang-1.4.9-127.i586.rpm) = a56da5638b1fe209780dff99724814426e8038cb
-Size (suse100/i586/slang-1.4.9-127.i586.rpm) = 520160 bytes
-SHA1 (suse100/ppc/slang-1.4.9-127.ppc.rpm) = 873e20415783e079f52c4a6e15e7e8946197f25f
-RMD160 (suse100/ppc/slang-1.4.9-127.ppc.rpm) = c101bc80a0fb402ad913a741d71bd02931efd264
-Size (suse100/ppc/slang-1.4.9-127.ppc.rpm) = 233623 bytes
-SHA1 (suse100/x86_64/slang-1.4.9-127.x86_64.rpm) = c33894cc5a0f6bc5cdd2d2a6523fca70916b24c3
-RMD160 (suse100/x86_64/slang-1.4.9-127.x86_64.rpm) = 20abbf8e268640909cf0044d6b91f49617f71220
-Size (suse100/x86_64/slang-1.4.9-127.x86_64.rpm) = 604247 bytes
diff --git a/emulators/suse100_vmware/DESCR b/emulators/suse100_vmware/DESCR
deleted file mode 100644
index 9777e703fdd..00000000000
--- a/emulators/suse100_vmware/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package is supposed to help running VMware under NetBSD.
diff --git a/emulators/suse100_vmware/Makefile b/emulators/suse100_vmware/Makefile
deleted file mode 100644
index bc8b623fd91..00000000000
--- a/emulators/suse100_vmware/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/21 16:10:13 tron Exp $
-
-DISTNAME=	suse_vmware-${SUSE_VERSION}
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SUSE100}
-DISTFILES=	${RPMFILES}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.suse.com/
-COMMENT=	Linux compatibility package to support running VMware
-
-DEPENDS+=	suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-DEPENDS+=	suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse100_x11
-
-EXTRACT_ONLY=	# empty
-NO_BUILD=	YES
-PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST+=	EMULSUBDIR=${EMULSUBDIR:Q}
-
-RPMFILES=	grep-2.5.1a-5.i586.rpm
-RPMIGNOREPATH=	usr
-
-post-install:
-	${GREP} -v '^#' ${FILESDIR}/device-links | \
-	${AWK} '{print("${LN} -fs "$$1" ${EMULDIR}/dev/"$$2)}' | \
-	${SH} -
-	${GREP} -v '^#' ${FILESDIR}/device-links | \
-	${AWK} '{print("@exec ${LN} -fs "$$1" %D/${EMULSUBDIR}/dev/"$$2)}' \
-	  >>${PLIST_SRC}
-	${GREP} -v '^#' ${FILESDIR}/device-links | \
-	${AWK} '{print("@unexec ${RM} -f %D/${EMULSUBDIR}/dev/"$$2)}' \
-	  >>${PLIST_SRC}
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_vmware/PLIST b/emulators/suse100_vmware/PLIST
deleted file mode 100644
index c2dda48050e..00000000000
--- a/emulators/suse100_vmware/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/21 16:10:13 tron Exp $
-@comment this plist intentionally left empty
diff --git a/emulators/suse100_vmware/distinfo b/emulators/suse100_vmware/distinfo
deleted file mode 100644
index 8c544fcff27..00000000000
--- a/emulators/suse100_vmware/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/21 16:10:13 tron Exp $
-
-SHA1 (suse100/i586/grep-2.5.1a-5.i586.rpm) = 728aab187b21e2e3ca8157a04e6bfec289c0fe43
-RMD160 (suse100/i586/grep-2.5.1a-5.i586.rpm) = 884f721b66cf236d7baccf83711495ed67529e52
-Size (suse100/i586/grep-2.5.1a-5.i586.rpm) = 179908 bytes
diff --git a/emulators/suse100_vmware/files/device-links b/emulators/suse100_vmware/files/device-links
deleted file mode 100644
index fb13c5500f6..00000000000
--- a/emulators/suse100_vmware/files/device-links
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: device-links,v 1.1.1.1 2007/03/21 16:10:13 tron Exp $
-/dev/rcd0a cdrom
-/dev/rfd0a fd0
-/dev/wd0d hda
-/dev/wd1d hdb
-/dev/wd2d hdc
-/dev/wd3d hdd
-/dev/sd0d hde
-/dev/sd1d hdf
-/dev/sd2d hdg
-/dev/sd3d hdh
-/dev/sd4d hdi
-/dev/ttyE0 tty1
-/dev/ttyE1 tty2
-/dev/ttyE2 tty3
-/dev/ttyE3 tty4
-/dev/ttyE4 tty5
-/dev/ttyE5 tty6
-/dev/ttyE6 tty7
-/dev/ttyE7 tty8
-tty1 tty0
diff --git a/emulators/suse100_x11/DESCR b/emulators/suse100_x11/DESCR
deleted file mode 100644
index 023c56f39b1..00000000000
--- a/emulators/suse100_x11/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with glibc2 which require
-X11 shared libraries.
diff --git a/emulators/suse100_x11/Makefile b/emulators/suse100_x11/Makefile
deleted file mode 100644
index 923f0b1742b..00000000000
--- a/emulators/suse100_x11/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2006/06/30 16:20:24 salo Exp $
-
-DISTNAME=		suse_x11-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE100}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tonio@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for X11 binaries
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse100_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../mk/bsd.prefs.mk"
-
-.include "../../emulators/suse100_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse100_x11/Makefile.i386 b/emulators/suse100_x11/Makefile.i386
deleted file mode 100644
index 1c9d6e474cc..00000000000
--- a/emulators/suse100_x11/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		xorg-x11-libs-6.8.2-100.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_x11/Makefile.powerpc b/emulators/suse100_x11/Makefile.powerpc
deleted file mode 100644
index 00a4b715d3e..00000000000
--- a/emulators/suse100_x11/Makefile.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.powerpc,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		xorg-x11-libs-6.8.2-100.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_x11/Makefile.x86_64 b/emulators/suse100_x11/Makefile.x86_64
deleted file mode 100644
index 318058b0546..00000000000
--- a/emulators/suse100_x11/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-RPMFILES=		xorg-x11-libs-6.8.2-100.2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse100_x11/distinfo b/emulators/suse100_x11/distinfo
deleted file mode 100644
index 341715b92ad..00000000000
--- a/emulators/suse100_x11/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/06/06 14:53:06 salo Exp $
-
-SHA1 (suse100/i586/xorg-x11-libs-6.8.2-100.2.i586.rpm) = 3791e5ab9ad28724ccbc96270c77f70c2d5525fb
-RMD160 (suse100/i586/xorg-x11-libs-6.8.2-100.2.i586.rpm) = 12b43970d44c2a94e8a80f4d76a0a87b55af6d73
-Size (suse100/i586/xorg-x11-libs-6.8.2-100.2.i586.rpm) = 2927295 bytes
-SHA1 (suse100/ppc/xorg-x11-libs-6.8.2-100.2.ppc.rpm) = c44a00dba51836c7ee0cd35c6465812f6a7a9e8c
-RMD160 (suse100/ppc/xorg-x11-libs-6.8.2-100.2.ppc.rpm) = a36c890931621e0de38df35e1bd006915e4327e4
-Size (suse100/ppc/xorg-x11-libs-6.8.2-100.2.ppc.rpm) = 2835670 bytes
-SHA1 (suse100/x86_64/xorg-x11-libs-6.8.2-100.2.x86_64.rpm) = 343a4cbeac14c837305823b2b9dbd771d2e2a13a
-RMD160 (suse100/x86_64/xorg-x11-libs-6.8.2-100.2.x86_64.rpm) = 878e7e0106cb75137ddcada2a66ecce253b51fc8
-Size (suse100/x86_64/xorg-x11-libs-6.8.2-100.2.x86_64.rpm) = 3130959 bytes
diff --git a/emulators/suse91_aspell/DESCR b/emulators/suse91_aspell/DESCR
deleted file mode 100644
index 62e5a3f87e9..00000000000
--- a/emulators/suse91_aspell/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with glibc2 which don't
-require X11 shared libraries.
diff --git a/emulators/suse91_aspell/Makefile b/emulators/suse91_aspell/Makefile
deleted file mode 100644
index 698f08429df..00000000000
--- a/emulators/suse91_aspell/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/06/30 15:37:22 salo Exp $
-
-DISTNAME=		suse_aspell-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		jdolecek@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for Aspell library
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_aspell/Makefile.i386 b/emulators/suse91_aspell/Makefile.i386
deleted file mode 100644
index b4dd2849563..00000000000
--- a/emulators/suse91_aspell/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		aspell-0.50.5-38.4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_aspell/Makefile.x86_64 b/emulators/suse91_aspell/Makefile.x86_64
deleted file mode 100644
index 523d98c7265..00000000000
--- a/emulators/suse91_aspell/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		aspell-0.50.5-38.4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_aspell/distinfo b/emulators/suse91_aspell/distinfo
deleted file mode 100644
index d055a803b42..00000000000
--- a/emulators/suse91_aspell/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/01/08 16:53:21 salo Exp $
-
-SHA1 (suse91/i586/aspell-0.50.5-38.4.i586.rpm) = cffd30f8176afb8f3ad51fb50c09fbd34413d74e
-RMD160 (suse91/i586/aspell-0.50.5-38.4.i586.rpm) = 5244e5a391a01373ded4b866a0eb2f8e133dde96
-Size (suse91/i586/aspell-0.50.5-38.4.i586.rpm) = 566009 bytes
-SHA1 (suse91/x86_64/aspell-0.50.5-38.4.x86_64.rpm) = 1547b1d379b1fa8bbeac998004dcfcba99002c2f
-RMD160 (suse91/x86_64/aspell-0.50.5-38.4.x86_64.rpm) = 43ae8d83b0a89261b8ad53ce80671fe7b399bcce
-Size (suse91/x86_64/aspell-0.50.5-38.4.x86_64.rpm) = 575917 bytes
diff --git a/emulators/suse91_base/DESCR b/emulators/suse91_base/DESCR
deleted file mode 100644
index 62e5a3f87e9..00000000000
--- a/emulators/suse91_base/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with glibc2 which don't
-require X11 shared libraries.
diff --git a/emulators/suse91_base/INSTALL b/emulators/suse91_base/INSTALL
deleted file mode 100644
index b4da446a9b9..00000000000
--- a/emulators/suse91_base/INSTALL
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: INSTALL,v 1.3 2006/06/23 15:48:50 jlam Exp $
-
-case "${STAGE}" in
-POST-INSTALL)
-	emulsubdir=linux
-
-	emuldir="@OPSYS_EMULDIR@"
-	pkgemuldir="${PKG_PREFIX}/emul/$emulsubdir"
-
-	emuldir_pwd=`cd $emuldir 2>/dev/null && ${PWD_CMD}`
-	pkgemuldir_pwd=`cd $pkgemuldir 2>/dev/null && ${PWD_CMD}`
-
-	if ${TEST} "$emuldir_pwd" != "$pkgemuldir_pwd"; then
-		if ${TEST} -e $emuldir -o -L $emuldir; then
-			${CAT} << EOF
-==============================================================================
-You must create a symbolic link for ${PKGNAME} to work properly:
-
-	$pkgemuldir  ->  $emuldir
-
-It seems there is something else located at $emuldir.
-==============================================================================
-EOF
-		else
-			${MKDIR} -p /emul && ${LN} -fs $pkgemuldir $emuldir
-		fi
-	fi
-	;;
-esac
diff --git a/emulators/suse91_base/MESSAGE.DragonFly b/emulators/suse91_base/MESSAGE.DragonFly
deleted file mode 100644
index 0b27df3566b..00000000000
--- a/emulators/suse91_base/MESSAGE.DragonFly
+++ /dev/null
@@ -1,7 +0,0 @@
-==============================================================================
-$NetBSD: MESSAGE.DragonFly,v 1.1 2006/06/19 23:25:48 jlam Exp $
-
-Do not forget to include COMPAT_LINUX in your kernel configuration file.
-You will also need to load the "linux.ko" kernel module (using kldload(8)
-or by setting linux_enable=yes in /etc/rc.conf.
-==============================================================================
diff --git a/emulators/suse91_base/MESSAGE.FreeBSD b/emulators/suse91_base/MESSAGE.FreeBSD
deleted file mode 100644
index 6e22b0979f1..00000000000
--- a/emulators/suse91_base/MESSAGE.FreeBSD
+++ /dev/null
@@ -1,7 +0,0 @@
-==============================================================================
-$NetBSD: MESSAGE.FreeBSD,v 1.1 2006/06/19 23:25:48 jlam Exp $
-
-Do not forget to include COMPAT_LINUX in your kernel configuration file.
-You will also need to load the "linux.ko" kernel module (using kldload(8)
-or by setting linux_enable=yes in /etc/rc.conf.
-==============================================================================
diff --git a/emulators/suse91_base/MESSAGE.NetBSD b/emulators/suse91_base/MESSAGE.NetBSD
deleted file mode 100644
index 3323551a423..00000000000
--- a/emulators/suse91_base/MESSAGE.NetBSD
+++ /dev/null
@@ -1,6 +0,0 @@
-==============================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1 2006/06/19 23:25:48 jlam Exp $
-
-Do not forget to include COMPAT_LINUX in your kernel configuration file.
-Linux binaries require this option in order to work.
-==============================================================================
diff --git a/emulators/suse91_base/Makefile b/emulators/suse91_base/Makefile
deleted file mode 100644
index 7efa78acf65..00000000000
--- a/emulators/suse91_base/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:28 wiz Exp $
-
-DISTNAME=		suse_base-${SUSE_VERSION}
-PKGREVISION=		12
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tron@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package
-
-CONFLICTS=		linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
-
-# these files are handled by manually during de-/installation/pkg_add
-CHECK_FILES_SKIP+=	${PREFIX}/${EMULSUBDIR}/dev/.*
-CHECK_FILES_SKIP+=	${PREFIX}/${EMULSUBDIR}/etc/ld.so.cache
-CHECK_INTERPRETER_SKIP+=	${PREFIX}/${EMULSUBDIR}/*
-
-EXTRACT_ONLY=		# empty
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q} LINUX_LIB=${LINUX_LIB:Q}
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-RPMIGNOREPATH=		./etc/bash.bashrc ./etc/bash_completion.d \
-			./etc/cron.daily ./etc/csh.cshrc ./etc/csh.login \
-			./etc/inittab ./etc/hushlogins ./etc/java \
-			./etc/mailcap ./etc/mime.types ./etc/nsswitch.conf \
-			./etc/pam.d ./etc/profile ./etc/profile.dos \
-			./etc/rc.d.README ./etc/rpc ./etc/shells ./etc/ttytype
-
-LINUX_LDD=		${PREFIX}/${EMULSUBDIR}/usr/bin/ldd
-LINUX_LIB?=		lib
-
-.include "../../mk/bsd.prefs.mk"
-
-INSTALLATION_DIRS=	sbin
-
-do-build:
-	@for FILE in ${FILESDIR}/SuSE-release ${FILESDIR}/*.sh; do \
-	  ${SED} -e 's#@@EMULDIR@@#${EMULDIR}#g' \
-	         -e 's#@@EMULSUBDIR@@#${EMULSUBDIR}#g' \
-	         -e 's#@@LINUX_LIB@@#${LINUX_LIB}#g' \
-	         -e 's#@@VERSION@@#${SUSE_VERSION}#g' \
-	         -e 's#@@ARCH@@#${SUSE_ARCH}#g' \
-	    $$FILE >${WRKDIR}/`basename $$FILE`; \
-	done
-
-do-install:
-	for FILE in ${WRKDIR}/*.sh; do \
-	  ${INSTALL_SCRIPT} $$FILE ${PREFIX}/sbin/`basename $$FILE .sh`; \
-	done
-	${INSTALL_DATA_DIR} ${EMULDIR}/dev
-	${INSTALL_DATA} /dev/MAKEDEV ${EMULDIR}/dev
-	cd ${EMULDIR}/dev && ${SH} ./MAKEDEV  std audio
-	cd ${EMULDIR}/dev && ${LN} -fs sound dsp
-	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	${RPM2PKG} ${RPM2PKGARGS}
-	${ECHO} "@dirrm ${EMULSUBDIR}" >>${PLIST_SRC}
-	${INSTALL_DATA} ${WRKDIR}/SuSE-release ${EMULDIR}/etc
-	${INSTALL_DATA_DIR} ${EMULDIR}/proc
-	${LN} -fs ${EMULDIR}/proc/mounts ${EMULDIR}/etc/mtab
-.if ${OPSYS} == "FreeBSD"
-	${BRANDELF} -t Linux ${EMULDIR}/sbin/ldconfig
-.endif
-	${EMULDIR}/sbin/ldconfig -r ${EMULDIR}
-	${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" \
-	  >>${PLIST_SRC}
-	${ECHO} "@unexec ${RMDIR} %D/${EMULSUBDIR}/etc 2>/dev/null || ${TRUE}" \
-	  >>${PLIST_SRC}
-	${SED}	-e 's:#! :#! ${EMULDIR}:' \
-		-e 's:^RTLD=:RTLD=/${EMULSUBDIR}:' \
-		< ${LINUX_LDD} > ${LINUX_LDD}.new
-	${MV} ${LINUX_LDD}.new ${LINUX_LDD}
-	${CHMOD} +x ${LINUX_LDD}
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_base/Makefile.i386 b/emulators/suse91_base/Makefile.i386
deleted file mode 100644
index 39285912de1..00000000000
--- a/emulators/suse91_base/Makefile.i386
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.3 2005/11/06 14:52:43 salo Exp $
-
-RPMFILES=		aaa_base-9.1-0.29.${SUSE_ARCH}.rpm \
-			bash-2.05b-305.1.${SUSE_ARCH}.rpm \
-			coreutils-5.2.1-23.8.${SUSE_ARCH}.rpm \
-			glibc-2.3.3-98.${SUSE_ARCH}.rpm \
-			libgcc-3.3.3-41.${SUSE_ARCH}.rpm \
-			libacl-2.2.21-54.4.${SUSE_ARCH}.rpm \
-			libattr-2.4.12-56.${SUSE_ARCH}.rpm \
-			libselinux-1.8-16.${SUSE_ARCH}.rpm \
-			libstdc++-3.3.3-41.${SUSE_ARCH}.rpm \
-			ncurses-5.4-61.3.${SUSE_ARCH}.rpm \
-			readline-4.3-306.${SUSE_ARCH}.rpm \
-			zlib-1.2.1-70.12.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_base/Makefile.x86_64 b/emulators/suse91_base/Makefile.x86_64
deleted file mode 100644
index ae359fb2ce8..00000000000
--- a/emulators/suse91_base/Makefile.x86_64
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.4 2007/02/22 19:26:28 wiz Exp $
-
-RPMFILES=		aaa_base-9.1-0.29.${SUSE_ARCH}.rpm \
-                        bash-2.05b-305.1.${SUSE_ARCH}.rpm \
-                        coreutils-5.2.1-23.8.${SUSE_ARCH}.rpm \
-                        glibc-2.3.3-63.${SUSE_ARCH}.rpm \
-                        libgcc-3.3.3-33.${SUSE_ARCH}.rpm \
-                        libacl-2.2.21-54.4.${SUSE_ARCH}.rpm \
-                        libattr-2.4.12-44.${SUSE_ARCH}.rpm \
-                        libselinux-1.8-15.${SUSE_ARCH}.rpm \
-                        libstdc++-3.3.3-33.${SUSE_ARCH}.rpm \
-                        ncurses-5.4-61.3.${SUSE_ARCH}.rpm \
-                        readline-4.3-301.${SUSE_ARCH}.rpm \
-                        zlib-1.2.1-70.12.${SUSE_ARCH}.rpm
-
-LINUX_LIB=		lib64
diff --git a/emulators/suse91_base/PLIST b/emulators/suse91_base/PLIST
deleted file mode 100644
index 645527486fc..00000000000
--- a/emulators/suse91_base/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2005/08/16 00:30:41 dmcmahill Exp $
-sbin/linux-mkpwd
-@unexec ${RM} -f %D/${EMULSUBDIR}/etc/ld.so.cache
-${EMULSUBDIR}/etc/SuSE-release
-${EMULSUBDIR}/etc/mtab
-${EMULSUBDIR}/usr/${LINUX_LIB}/libz.so.1
-@exec ${MKDIR} %D/${EMULSUBDIR}/proc
-@dirrm ${EMULSUBDIR}/proc
-@unexec cd %D/${EMULSUBDIR}/etc && ${RM} -f group gshadow passwd shadow
-@exec ${MKDIR} %D/${EMULSUBDIR}/dev
-@exec cp -p /dev/MAKEDEV  %D/${EMULSUBDIR}/dev
-@exec cd %D/${EMULSUBDIR}/dev && sh ./MAKEDEV std audio
-@exec cd %D/${EMULSUBDIR}/dev && ln -s sound dsp
-@unexec ${RM} -f %D/${EMULSUBDIR}/dev/*
-@dirrm ${EMULSUBDIR}/dev
diff --git a/emulators/suse91_base/distinfo b/emulators/suse91_base/distinfo
deleted file mode 100644
index 8d8f6c3af2f..00000000000
--- a/emulators/suse91_base/distinfo
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/11/06 14:52:43 salo Exp $
-
-SHA1 (suse91/i586/aaa_base-9.1-0.29.i586.rpm) = da8763cab06352e3a50bd5fd0f92be989b67c39b
-RMD160 (suse91/i586/aaa_base-9.1-0.29.i586.rpm) = 4b45a7aa29c0987d5632c4a40a43b8b113a529de
-Size (suse91/i586/aaa_base-9.1-0.29.i586.rpm) = 294812 bytes
-SHA1 (suse91/i586/bash-2.05b-305.1.i586.rpm) = 2c5a820ca6f9aa1fe92825b95e98ba140dacf66c
-RMD160 (suse91/i586/bash-2.05b-305.1.i586.rpm) = 3dfc4baa8846597fc688bf69c06ed595824703d7
-Size (suse91/i586/bash-2.05b-305.1.i586.rpm) = 637832 bytes
-SHA1 (suse91/i586/coreutils-5.2.1-23.8.i586.rpm) = deea5f6fc6cae8b6893a634002db155cd4a91518
-RMD160 (suse91/i586/coreutils-5.2.1-23.8.i586.rpm) = 9c1ae9db5bcf5a31c9b2e22dd2dbd1b35b2f8982
-Size (suse91/i586/coreutils-5.2.1-23.8.i586.rpm) = 1984282 bytes
-SHA1 (suse91/i586/glibc-2.3.3-98.i586.rpm) = bd12daad569a071dd8989d92b5e278aa168b0ab3
-RMD160 (suse91/i586/glibc-2.3.3-98.i586.rpm) = 4633ccc71cd5bb8dfa3bd7338d39406d702fda14
-Size (suse91/i586/glibc-2.3.3-98.i586.rpm) = 1455673 bytes
-SHA1 (suse91/i586/libgcc-3.3.3-41.i586.rpm) = 1fc7169f9e2730ffd8e7dc28d00f0f9b90dbd0eb
-RMD160 (suse91/i586/libgcc-3.3.3-41.i586.rpm) = 95ed4e7c50be207a3c5bdb563e569c78c9f9acb1
-Size (suse91/i586/libgcc-3.3.3-41.i586.rpm) = 51314 bytes
-SHA1 (suse91/i586/libacl-2.2.21-54.4.i586.rpm) = 8740723443df7938ce0df6c321bff1aa54e90d68
-RMD160 (suse91/i586/libacl-2.2.21-54.4.i586.rpm) = 14198484b060db51a1dbd87dde2ee05c1cc7d982
-Size (suse91/i586/libacl-2.2.21-54.4.i586.rpm) = 18916 bytes
-SHA1 (suse91/i586/libattr-2.4.12-56.i586.rpm) = 82d248de4b15ffed49a758eef1701b94b1d57415
-RMD160 (suse91/i586/libattr-2.4.12-56.i586.rpm) = d082ec704e5537ff133c29a14dfe63268f3a492b
-Size (suse91/i586/libattr-2.4.12-56.i586.rpm) = 11086 bytes
-SHA1 (suse91/i586/libselinux-1.8-16.i586.rpm) = 302a59b8ac41ffb6d61add6deac3aa0c10990ef5
-RMD160 (suse91/i586/libselinux-1.8-16.i586.rpm) = 887e03f24a29d30e6842790bd499708aaa6307b9
-Size (suse91/i586/libselinux-1.8-16.i586.rpm) = 47298 bytes
-SHA1 (suse91/i586/libstdc++-3.3.3-41.i586.rpm) = 77341589e297e66fc793961d96a7b24df5893101
-RMD160 (suse91/i586/libstdc++-3.3.3-41.i586.rpm) = c038490eb1126db93f08e057448f8ffc0614304c
-Size (suse91/i586/libstdc++-3.3.3-41.i586.rpm) = 301785 bytes
-SHA1 (suse91/i586/ncurses-5.4-61.3.i586.rpm) = 47c0fc938ec437515224476157e26fb52624a7ec
-RMD160 (suse91/i586/ncurses-5.4-61.3.i586.rpm) = 9e9a8ebdeb7353d2ab2a5e3e68f998b6a1be7942
-Size (suse91/i586/ncurses-5.4-61.3.i586.rpm) = 790958 bytes
-SHA1 (suse91/i586/readline-4.3-306.i586.rpm) = 500c6665e66d0052a5d922d7db3f88f029c91853
-RMD160 (suse91/i586/readline-4.3-306.i586.rpm) = 740f13777dbfaf579fc4be2c1df735c29695ac0f
-Size (suse91/i586/readline-4.3-306.i586.rpm) = 151357 bytes
-SHA1 (suse91/i586/zlib-1.2.1-70.12.i586.rpm) = e4b0763ff5c1b2aa7a3aa259a0df3a9ee801b8cf
-RMD160 (suse91/i586/zlib-1.2.1-70.12.i586.rpm) = 7b5fb33af91f77784a82702c6ccff570e4cb4f01
-Size (suse91/i586/zlib-1.2.1-70.12.i586.rpm) = 63887 bytes
-SHA1 (suse91/x86_64/aaa_base-9.1-0.29.x86_64.rpm) = f60e43f6be2f3aae786227dc3617e373e7296baf
-RMD160 (suse91/x86_64/aaa_base-9.1-0.29.x86_64.rpm) = deb351dfdbb2a3435143ceeef97969755e1ae2dc
-Size (suse91/x86_64/aaa_base-9.1-0.29.x86_64.rpm) = 295329 bytes
-SHA1 (suse91/x86_64/bash-2.05b-305.1.x86_64.rpm) = 768917ed763f1a4c911cf54b8b2dd2cf28e826ff
-RMD160 (suse91/x86_64/bash-2.05b-305.1.x86_64.rpm) = 15b67a9ecb525f07d4642f9df0708c8451193489
-Size (suse91/x86_64/bash-2.05b-305.1.x86_64.rpm) = 660602 bytes
-SHA1 (suse91/x86_64/coreutils-5.2.1-23.8.x86_64.rpm) = 1f89b1e3ed5ddf82413232b14517fa60dd19efb3
-RMD160 (suse91/x86_64/coreutils-5.2.1-23.8.x86_64.rpm) = c2bf33fcbb3c20a8b47d50161e4e1f75744a5468
-Size (suse91/x86_64/coreutils-5.2.1-23.8.x86_64.rpm) = 2045663 bytes
-SHA1 (suse91/x86_64/glibc-2.3.3-63.x86_64.rpm) = 76333c7308334c49ad3cc4479282138d604373a9
-RMD160 (suse91/x86_64/glibc-2.3.3-63.x86_64.rpm) = 5153fdfa1b373a921ff175cd220b42887ff57a61
-Size (suse91/x86_64/glibc-2.3.3-63.x86_64.rpm) = 2422978 bytes
-SHA1 (suse91/x86_64/libgcc-3.3.3-33.x86_64.rpm) = bdf7233e869b50f89c0066648a7f8cee221a6ec1
-RMD160 (suse91/x86_64/libgcc-3.3.3-33.x86_64.rpm) = 993edf19958968cc2708c61656f84b2c4dafde5b
-Size (suse91/x86_64/libgcc-3.3.3-33.x86_64.rpm) = 71138 bytes
-SHA1 (suse91/x86_64/libacl-2.2.21-54.4.x86_64.rpm) = d808bc049a2e286032d2f8996fad6bf78d946fe8
-RMD160 (suse91/x86_64/libacl-2.2.21-54.4.x86_64.rpm) = 6952f95e1d0736e03f9a99f3183fbc86f898ca7b
-Size (suse91/x86_64/libacl-2.2.21-54.4.x86_64.rpm) = 20472 bytes
-SHA1 (suse91/x86_64/libattr-2.4.12-44.x86_64.rpm) = f83b27f98d53c2ca1350e3d304b9f67fb2c93653
-RMD160 (suse91/x86_64/libattr-2.4.12-44.x86_64.rpm) = 63efd2968f54a8c574c830d6d68721dc0c64274c
-Size (suse91/x86_64/libattr-2.4.12-44.x86_64.rpm) = 12014 bytes
-SHA1 (suse91/x86_64/libselinux-1.8-15.x86_64.rpm) = f898349c259c98e4f3e2ce6e166c5cc542cb5517
-RMD160 (suse91/x86_64/libselinux-1.8-15.x86_64.rpm) = f1ec0e456bdb2ec3dc7074652e7a0b9303ed06d9
-Size (suse91/x86_64/libselinux-1.8-15.x86_64.rpm) = 50409 bytes
-SHA1 (suse91/x86_64/libstdc++-3.3.3-33.x86_64.rpm) = f72a13be6a00ea7c2799411628d3aec020e89cb7
-RMD160 (suse91/x86_64/libstdc++-3.3.3-33.x86_64.rpm) = a715a11e16633f739350ba360656a65e77e22643
-Size (suse91/x86_64/libstdc++-3.3.3-33.x86_64.rpm) = 562762 bytes
-SHA1 (suse91/x86_64/ncurses-5.4-61.3.x86_64.rpm) = e968dd8de435c0bff3489e07c8b5c9af4a9f3fc6
-RMD160 (suse91/x86_64/ncurses-5.4-61.3.x86_64.rpm) = a8111d794f3e87ff79b1349aec5115ba623c7c51
-Size (suse91/x86_64/ncurses-5.4-61.3.x86_64.rpm) = 866973 bytes
-SHA1 (suse91/x86_64/readline-4.3-301.x86_64.rpm) = 55b4750bf47d3432882454c054d08b40ad7fc44e
-RMD160 (suse91/x86_64/readline-4.3-301.x86_64.rpm) = ace2cacf4ce4ea28ab74f68f2a763f22a137aaa4
-Size (suse91/x86_64/readline-4.3-301.x86_64.rpm) = 163217 bytes
-SHA1 (suse91/x86_64/zlib-1.2.1-70.12.x86_64.rpm) = e1b80b30295cc485e30df8cbbc8c2baf83e6a8d0
-RMD160 (suse91/x86_64/zlib-1.2.1-70.12.x86_64.rpm) = cc09de42b71f3908c9bc3ce7fd3c7cbbd13a4880
-Size (suse91/x86_64/zlib-1.2.1-70.12.x86_64.rpm) = 66201 bytes
diff --git a/emulators/suse91_base/files/SuSE-release b/emulators/suse91_base/files/SuSE-release
deleted file mode 100644
index 247032986b2..00000000000
--- a/emulators/suse91_base/files/SuSE-release
+++ /dev/null
@@ -1,2 +0,0 @@
-SuSE Linux @@VERSION@@ (@@ARCH@@)
-VERSION = @@VERSION@@
diff --git a/emulators/suse91_base/files/linux-mkpwd.sh b/emulators/suse91_base/files/linux-mkpwd.sh
deleted file mode 100644
index 1fd4c3626bf..00000000000
--- a/emulators/suse91_base/files/linux-mkpwd.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: linux-mkpwd.sh,v 1.1.1.1 2004/07/13 10:31:14 tron Exp $
-
-SRCDIR=/etc
-DESTDIR=@@EMULDIR@@/etc
-
-umask 22
-cd $DESTDIR
-cp $SRCDIR/passwd .
-sed s/^wheel:/root:/ <$SRCDIR/group >group
-
-umask 77
-awk -F: '{print($1":"$2":0:0:10000::::")}' <$SRCDIR/master.passwd >shadow
-sed s/^wheel:/root:/ <$SRCDIR/group |
-awk -F: '{print($1":*:root:root")}' >gshadow
-
-exit 0
diff --git a/emulators/suse91_compat/DESCR b/emulators/suse91_compat/DESCR
deleted file mode 100644
index addf8028f9b..00000000000
--- a/emulators/suse91_compat/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package contains some old shared libraries required for backwards
-compatibility.
diff --git a/emulators/suse91_compat/Makefile b/emulators/suse91_compat/Makefile
deleted file mode 100644
index 6eb8164602c..00000000000
--- a/emulators/suse91_compat/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/06/30 15:37:22 salo Exp $
-
-DISTNAME=		suse_compat-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tron@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package with old shared libraries
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_compat/Makefile.i386 b/emulators/suse91_compat/Makefile.i386
deleted file mode 100644
index c91f756b2ad..00000000000
--- a/emulators/suse91_compat/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		compat-2004.4.2-3.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_compat/Makefile.x86_64 b/emulators/suse91_compat/Makefile.x86_64
deleted file mode 100644
index 1c784525b32..00000000000
--- a/emulators/suse91_compat/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		compat-2004.4.2-2.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_compat/distinfo b/emulators/suse91_compat/distinfo
deleted file mode 100644
index 646f4416f94..00000000000
--- a/emulators/suse91_compat/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/01/08 16:53:21 salo Exp $
-
-SHA1 (suse91/i586/compat-2004.4.2-3.i586.rpm) = 837f2272da26f8efe242e33724370d45cc2c5a74
-RMD160 (suse91/i586/compat-2004.4.2-3.i586.rpm) = a18f61b6fd3c3eb63600b37d8324a3f2fe0b4043
-Size (suse91/i586/compat-2004.4.2-3.i586.rpm) = 1806417 bytes
-SHA1 (suse91/x86_64/compat-2004.4.2-2.x86_64.rpm) = 27d7075068b73ee2c915510c1f74a60d140af494
-RMD160 (suse91/x86_64/compat-2004.4.2-2.x86_64.rpm) = ddbe20362065fc0385a17a9148b80c1458a5ab0a
-Size (suse91/x86_64/compat-2004.4.2-2.x86_64.rpm) = 139427 bytes
diff --git a/emulators/suse91_expat/DESCR b/emulators/suse91_expat/DESCR
deleted file mode 100644
index 9f2f36c8801..00000000000
--- a/emulators/suse91_expat/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with glibc2 which require
-expat shared libraries.
diff --git a/emulators/suse91_expat/Makefile b/emulators/suse91_expat/Makefile
deleted file mode 100644
index 2dfa1483d29..00000000000
--- a/emulators/suse91_expat/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2006/06/30 15:37:22 salo Exp $
-
-DISTNAME=		suse_expat-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for expat binaries
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-LIBTOOLIZE_PLIST=	NO
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_expat/Makefile.i386 b/emulators/suse91_expat/Makefile.i386
deleted file mode 100644
index 385044ba27f..00000000000
--- a/emulators/suse91_expat/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		expat-1.95.7-37.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_expat/Makefile.x86_64 b/emulators/suse91_expat/Makefile.x86_64
deleted file mode 100644
index b29da228bdc..00000000000
--- a/emulators/suse91_expat/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		expat-1.95.7-31.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_expat/distinfo b/emulators/suse91_expat/distinfo
deleted file mode 100644
index 7d6ac8c3544..00000000000
--- a/emulators/suse91_expat/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/01/08 16:53:21 salo Exp $
-
-SHA1 (suse91/i586/expat-1.95.7-37.i586.rpm) = 2f32f41ef922591f053dfac51d356b52a17c2fa4
-RMD160 (suse91/i586/expat-1.95.7-37.i586.rpm) = 158276d4653092129342a47e78785c5f55f8cccd
-Size (suse91/i586/expat-1.95.7-37.i586.rpm) = 176293 bytes
-SHA1 (suse91/x86_64/expat-1.95.7-31.x86_64.rpm) = 128de07016acd1d00d64cd6ed30287a9eb4535c5
-RMD160 (suse91/x86_64/expat-1.95.7-31.x86_64.rpm) = f9494e49ff07da6ae7ee333f63699d9ba29af705
-Size (suse91/x86_64/expat-1.95.7-31.x86_64.rpm) = 162352 bytes
diff --git a/emulators/suse91_fontconfig/DESCR b/emulators/suse91_fontconfig/DESCR
deleted file mode 100644
index fffa11f3d2e..00000000000
--- a/emulators/suse91_fontconfig/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with glibc2 which require
-fontconfig shared libraries.
diff --git a/emulators/suse91_fontconfig/Makefile b/emulators/suse91_fontconfig/Makefile
deleted file mode 100644
index fd6f9996d92..00000000000
--- a/emulators/suse91_fontconfig/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/06/30 15:37:22 salo Exp $
-
-DISTNAME=		suse_fontconfig-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for fontconfig binaries
-
-DEPENDS+=		suse_expat-${SUSE_VERSION}{,nb*}:../../emulators/suse91_expat
-DEPENDS+=		suse_freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse91_freetype2
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_fontconfig/Makefile.i386 b/emulators/suse91_fontconfig/Makefile.i386
deleted file mode 100644
index 430ee8a916d..00000000000
--- a/emulators/suse91_fontconfig/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		fontconfig-2.2.92.20040221-28.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_fontconfig/Makefile.x86_64 b/emulators/suse91_fontconfig/Makefile.x86_64
deleted file mode 100644
index d8374752a9c..00000000000
--- a/emulators/suse91_fontconfig/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		fontconfig-2.2.92.20040221-24.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_fontconfig/distinfo b/emulators/suse91_fontconfig/distinfo
deleted file mode 100644
index bc26d93fc16..00000000000
--- a/emulators/suse91_fontconfig/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/01/08 16:53:21 salo Exp $
-
-SHA1 (suse91/i586/fontconfig-2.2.92.20040221-28.i586.rpm) = d96b6cf2291861fb23475e33ff7bcfb6f59e4fc5
-RMD160 (suse91/i586/fontconfig-2.2.92.20040221-28.i586.rpm) = 672beecb32b100aa2d5a9b4f47f5e2c4bbd64a71
-Size (suse91/i586/fontconfig-2.2.92.20040221-28.i586.rpm) = 164006 bytes
-SHA1 (suse91/x86_64/fontconfig-2.2.92.20040221-24.x86_64.rpm) = 5bc77a8ad127922b3a7cb5e11342712b0c8bd2f4
-RMD160 (suse91/x86_64/fontconfig-2.2.92.20040221-24.x86_64.rpm) = 1885233e427d2b9721dcd4d9e9d85ff050090ad4
-Size (suse91/x86_64/fontconfig-2.2.92.20040221-24.x86_64.rpm) = 170930 bytes
diff --git a/emulators/suse91_freetype2/DESCR b/emulators/suse91_freetype2/DESCR
deleted file mode 100644
index b54860cc766..00000000000
--- a/emulators/suse91_freetype2/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with freetype2 shared
-libraries.
diff --git a/emulators/suse91_freetype2/Makefile b/emulators/suse91_freetype2/Makefile
deleted file mode 100644
index d8744d8d29b..00000000000
--- a/emulators/suse91_freetype2/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/06/30 15:37:22 salo Exp $
-
-DISTNAME=		suse_freetype2-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		jdolecek@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for FreeType2 library
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_freetype2/Makefile.i386 b/emulators/suse91_freetype2/Makefile.i386
deleted file mode 100644
index f1c2ac608af..00000000000
--- a/emulators/suse91_freetype2/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		freetype2-2.1.7-53.6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_freetype2/Makefile.x86_64 b/emulators/suse91_freetype2/Makefile.x86_64
deleted file mode 100644
index d56fe5b8d74..00000000000
--- a/emulators/suse91_freetype2/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		freetype2-2.1.7-53.6.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_freetype2/distinfo b/emulators/suse91_freetype2/distinfo
deleted file mode 100644
index c8183a03370..00000000000
--- a/emulators/suse91_freetype2/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/01/08 16:53:21 salo Exp $
-
-SHA1 (suse91/i586/freetype2-2.1.7-53.6.i586.rpm) = 89bb87089050637ef80bf093cff624f3dff5f6cc
-RMD160 (suse91/i586/freetype2-2.1.7-53.6.i586.rpm) = b362b26f8034142b2e3603891a26537227229622
-Size (suse91/i586/freetype2-2.1.7-53.6.i586.rpm) = 506026 bytes
-SHA1 (suse91/x86_64/freetype2-2.1.7-53.6.x86_64.rpm) = 49fadf651739a5e0efac36c4fda7226d4b776ba0
-RMD160 (suse91/x86_64/freetype2-2.1.7-53.6.x86_64.rpm) = a41b4708da1169c3781bc02003ca5a6951f486f5
-Size (suse91/x86_64/freetype2-2.1.7-53.6.x86_64.rpm) = 529067 bytes
diff --git a/emulators/suse91_gdk-pixbuf/DESCR b/emulators/suse91_gdk-pixbuf/DESCR
deleted file mode 100644
index b898081b301..00000000000
--- a/emulators/suse91_gdk-pixbuf/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries that use gdk-pixbuf shared libraries.
diff --git a/emulators/suse91_gdk-pixbuf/Makefile b/emulators/suse91_gdk-pixbuf/Makefile
deleted file mode 100644
index e85b3403e58..00000000000
--- a/emulators/suse91_gdk-pixbuf/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/06/30 15:37:22 salo Exp $
-
-DISTNAME=		suse_gdk-pixbuf-${SUSE_VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tron@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for gdk-pixbuf binaries
-
-DEPENDS+=		suse_gtk-${SUSE_VERSION}{,nb*}:../../emulators/suse91_gtk
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_gdk-pixbuf/Makefile.i386 b/emulators/suse91_gdk-pixbuf/Makefile.i386
deleted file mode 100644
index 60245f8ddd3..00000000000
--- a/emulators/suse91_gdk-pixbuf/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/03/06 09:10:54 toddpw Exp $
-
-RPMFILES=		gdk-pixbuf-0.22.0-62.13.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_gdk-pixbuf/Makefile.x86_64 b/emulators/suse91_gdk-pixbuf/Makefile.x86_64
deleted file mode 100644
index a514ad2fa53..00000000000
--- a/emulators/suse91_gdk-pixbuf/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/06/26 19:41:05 salo Exp $
-
-RPMFILES=		gdk-pixbuf-0.22.0-62.13.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_gdk-pixbuf/distinfo b/emulators/suse91_gdk-pixbuf/distinfo
deleted file mode 100644
index e35d3a5791c..00000000000
--- a/emulators/suse91_gdk-pixbuf/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/06/26 19:41:05 salo Exp $
-
-SHA1 (suse91/i586/gdk-pixbuf-0.22.0-62.13.i586.rpm) = 2ec1025130503b19f95e4a7348ce957edaea390f
-RMD160 (suse91/i586/gdk-pixbuf-0.22.0-62.13.i586.rpm) = a3a37bceed6f287bdf0ad66b709fa5fc8acafbac
-Size (suse91/i586/gdk-pixbuf-0.22.0-62.13.i586.rpm) = 179623 bytes
-SHA1 (suse91/x86_64/gdk-pixbuf-0.22.0-62.13.x86_64.rpm) = c18c86818db1c0931d7bd880d79bc6d4d5a58d84
-RMD160 (suse91/x86_64/gdk-pixbuf-0.22.0-62.13.x86_64.rpm) = 4f3cde3489cfbd43764b46c656f055dcb1b8647a
-Size (suse91/x86_64/gdk-pixbuf-0.22.0-62.13.x86_64.rpm) = 188372 bytes
diff --git a/emulators/suse91_glx/DESCR b/emulators/suse91_glx/DESCR
deleted file mode 100644
index 64e8143cf19..00000000000
--- a/emulators/suse91_glx/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries which require GL shared libraries.
diff --git a/emulators/suse91_glx/Makefile b/emulators/suse91_glx/Makefile
deleted file mode 100644
index 89dce049d69..00000000000
--- a/emulators/suse91_glx/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/06/30 15:37:22 salo Exp $
-
-DISTNAME=		suse_glx-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		jdolecek@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the GL library
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse91_x11
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-LIBTOOLIZE_PLIST=	NO
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_glx/Makefile.i386 b/emulators/suse91_glx/Makefile.i386
deleted file mode 100644
index 1d62be013d2..00000000000
--- a/emulators/suse91_glx/Makefile.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-# the -devel version is necessary for libGL.so et.al. symlinks only
-RPMFILES=		XFree86-Mesa-4.3.99.902-40.${SUSE_ARCH}.rpm \
-			XFree86-Mesa-devel-4.3.99.902-40.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_glx/Makefile.x86_64 b/emulators/suse91_glx/Makefile.x86_64
deleted file mode 100644
index 8995bac4a7c..00000000000
--- a/emulators/suse91_glx/Makefile.x86_64
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-# the -devel version is necessary for libGL.so et.al. symlinks only
-RPMFILES=		XFree86-Mesa-4.3.99.902-30.${SUSE_ARCH}.rpm \
-			XFree86-Mesa-devel-4.3.99.902-30.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_glx/PLIST_rpmfix.i386 b/emulators/suse91_glx/PLIST_rpmfix.i386
deleted file mode 100644
index dd21e4f6b71..00000000000
--- a/emulators/suse91_glx/PLIST_rpmfix.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST_rpmfix.i386,v 1.1 2006/05/08 20:39:30 joerg Exp $
-/usr/lib/libglide3.so.3
diff --git a/emulators/suse91_glx/distinfo b/emulators/suse91_glx/distinfo
deleted file mode 100644
index 9a8e4c92d17..00000000000
--- a/emulators/suse91_glx/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/01/08 16:53:21 salo Exp $
-
-SHA1 (suse91/i586/XFree86-Mesa-4.3.99.902-40.i586.rpm) = 560f39d2a96a1f5df7f0b5001821adf0105e6325
-RMD160 (suse91/i586/XFree86-Mesa-4.3.99.902-40.i586.rpm) = 94615f439cadb85db5c8fc7d94201f2a52ac9895
-Size (suse91/i586/XFree86-Mesa-4.3.99.902-40.i586.rpm) = 6152698 bytes
-SHA1 (suse91/i586/XFree86-Mesa-devel-4.3.99.902-40.i586.rpm) = a9172864b4bb019548d0158e06afb675ccb6a327
-RMD160 (suse91/i586/XFree86-Mesa-devel-4.3.99.902-40.i586.rpm) = 5f47dd63595c2a780059d719b89789c1a14b2845
-Size (suse91/i586/XFree86-Mesa-devel-4.3.99.902-40.i586.rpm) = 1073151 bytes
-SHA1 (suse91/x86_64/XFree86-Mesa-4.3.99.902-30.x86_64.rpm) = 866500404365d455bbbe49ea744073d7d00facb1
-RMD160 (suse91/x86_64/XFree86-Mesa-4.3.99.902-30.x86_64.rpm) = 9861e38f466e7f57f368722e3893a2b844af9fc3
-Size (suse91/x86_64/XFree86-Mesa-4.3.99.902-30.x86_64.rpm) = 4533698 bytes
-SHA1 (suse91/x86_64/XFree86-Mesa-devel-4.3.99.902-30.x86_64.rpm) = 7760b3617f52d0486a181a8a12278c422f60e8e0
-RMD160 (suse91/x86_64/XFree86-Mesa-devel-4.3.99.902-30.x86_64.rpm) = 0c51bcf27da23854eb710e950f7fe3cbfcca2e9a
-Size (suse91/x86_64/XFree86-Mesa-devel-4.3.99.902-30.x86_64.rpm) = 1173322 bytes
diff --git a/emulators/suse91_gtk/DESCR b/emulators/suse91_gtk/DESCR
deleted file mode 100644
index d404f886f92..00000000000
--- a/emulators/suse91_gtk/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with glibc2 which require
-GTK shared libraries.
diff --git a/emulators/suse91_gtk/Makefile b/emulators/suse91_gtk/Makefile
deleted file mode 100644
index 2a187566fef..00000000000
--- a/emulators/suse91_gtk/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/06/30 15:37:22 salo Exp $
-
-DISTNAME=		suse_gtk-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tron@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for GTK binaries
-
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse91_x11
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_gtk/Makefile.i386 b/emulators/suse91_gtk/Makefile.i386
deleted file mode 100644
index 883b9470196..00000000000
--- a/emulators/suse91_gtk/Makefile.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		glib-1.2.10-586.${SUSE_ARCH}.rpm \
-			gtk-1.2.10-877.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_gtk/Makefile.x86_64 b/emulators/suse91_gtk/Makefile.x86_64
deleted file mode 100644
index ba01c9328f2..00000000000
--- a/emulators/suse91_gtk/Makefile.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		glib-1.2.10-337.${SUSE_ARCH}.rpm \
-			gtk-1.2.10-488.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_gtk/distinfo b/emulators/suse91_gtk/distinfo
deleted file mode 100644
index d79873d851d..00000000000
--- a/emulators/suse91_gtk/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/01/08 16:53:21 salo Exp $
-
-SHA1 (suse91/i586/glib-1.2.10-586.i586.rpm) = 0b6a69b48a1c49dd635f0568b758e018fb007eea
-RMD160 (suse91/i586/glib-1.2.10-586.i586.rpm) = 0bbb0c06e0d11df3fa51307980277c40eda04975
-Size (suse91/i586/glib-1.2.10-586.i586.rpm) = 124852 bytes
-SHA1 (suse91/i586/gtk-1.2.10-877.i586.rpm) = 395f33db3ea0aec1d7f8ef23ac8d83efdf4243fb
-RMD160 (suse91/i586/gtk-1.2.10-877.i586.rpm) = a5b84ad4420b233217777bf96ca1a43782076c3e
-Size (suse91/i586/gtk-1.2.10-877.i586.rpm) = 860574 bytes
-SHA1 (suse91/x86_64/glib-1.2.10-337.x86_64.rpm) = bb90533ea908f16066de913972f60ffd0b6599a2
-RMD160 (suse91/x86_64/glib-1.2.10-337.x86_64.rpm) = 61ae253f0fd8b94a8f8a1558b10f2d3ab15c7eb4
-Size (suse91/x86_64/glib-1.2.10-337.x86_64.rpm) = 139342 bytes
-SHA1 (suse91/x86_64/gtk-1.2.10-488.x86_64.rpm) = d5ebcf118e7ab46faf4df6734aea438484232798
-RMD160 (suse91/x86_64/gtk-1.2.10-488.x86_64.rpm) = 5fce54df90902955e77da8ed613e78ad0f243176
-Size (suse91/x86_64/gtk-1.2.10-488.x86_64.rpm) = 934389 bytes
diff --git a/emulators/suse91_gtk2/DESCR b/emulators/suse91_gtk2/DESCR
deleted file mode 100644
index 962f8891e8f..00000000000
--- a/emulators/suse91_gtk2/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with glibc2 which require
-GTK2 shared libraries.
diff --git a/emulators/suse91_gtk2/INSTALL b/emulators/suse91_gtk2/INSTALL
deleted file mode 100644
index 57074111b3b..00000000000
--- a/emulators/suse91_gtk2/INSTALL
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: INSTALL,v 1.3 2005/01/22 12:35:26 jdolecek Exp $
-#
-# Initialize gtk/pango module configuration.
-#
-case ${STAGE} in
-    POST-INSTALL)
-        @EMULDIR@/opt/gnome/bin/gtk-query-immodules-2.0 > @EMULDIR@/etc/opt/gnome/gtk-2.0/gtk.immodules
-
-        @EMULDIR@/opt/gnome/bin/gdk-pixbuf-query-loaders > @EMULDIR@/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders
-
-        @EMULDIR@/opt/gnome/bin/pango-querymodules > @EMULDIR@/etc/opt/gnome/pango/pango.modules                
-	;;
-    *)
-	;;
-esac
diff --git a/emulators/suse91_gtk2/Makefile b/emulators/suse91_gtk2/Makefile
deleted file mode 100644
index 4fd11bc002c..00000000000
--- a/emulators/suse91_gtk2/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2006/06/30 15:37:22 salo Exp $
-
-DISTNAME=		suse_gtk2-${SUSE_VERSION}
-PKGREVISION=		6
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for GTK2 binaries
-
-DEPENDS+=		suse_fontconfig-${SUSE_VERSION}{,nb*}:../../emulators/suse91_fontconfig
-DEPENDS+=		suse_freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse91_freetype2
-DEPENDS+=		suse_libjpeg-${SUSE_VERSION}{,nb*}:../../emulators/suse91_libjpeg
-DEPENDS+=		suse_libpng-${SUSE_VERSION}{,nb*}:../../emulators/suse91_libpng
-DEPENDS+=		suse_libtiff-${SUSE_VERSION}{,nb*}:../../emulators/suse91_libtiff
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse91_x11
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-# Initialize gtk/pango modules.
-FILES_SUBST+=		EMULDIR=${EMULDIR:Q}
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_gtk2/Makefile.i386 b/emulators/suse91_gtk2/Makefile.i386
deleted file mode 100644
index 4cbf5d93abf..00000000000
--- a/emulators/suse91_gtk2/Makefile.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		atk-1.4.1-124.${SUSE_ARCH}.rpm \
-			glib2-2.2.3-117.${SUSE_ARCH}.rpm \
-			gtk2-2.2.4-125.10.${SUSE_ARCH}.rpm \
-			pango-1.2.5-170.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_gtk2/Makefile.x86_64 b/emulators/suse91_gtk2/Makefile.x86_64
deleted file mode 100644
index 8af27512fae..00000000000
--- a/emulators/suse91_gtk2/Makefile.x86_64
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		atk-1.4.1-104.${SUSE_ARCH}.rpm \
-			glib2-2.2.3-106.${SUSE_ARCH}.rpm \
-			gtk2-2.2.4-125.10.${SUSE_ARCH}.rpm \
-			pango-1.2.5-148.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_gtk2/PLIST b/emulators/suse91_gtk2/PLIST
deleted file mode 100644
index 92b8a7ab074..00000000000
--- a/emulators/suse91_gtk2/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2005/01/22 12:35:26 jdolecek Exp $
-${EMULSUBDIR}/etc/opt/gnome/gtk-2.0/gtk.immodules
-${EMULSUBDIR}/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders
-${EMULSUBDIR}/etc/opt/gnome/pango/pango.modules
diff --git a/emulators/suse91_gtk2/distinfo b/emulators/suse91_gtk2/distinfo
deleted file mode 100644
index 913b6c50cac..00000000000
--- a/emulators/suse91_gtk2/distinfo
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/01/08 16:53:21 salo Exp $
-
-SHA1 (suse91/i586/atk-1.4.1-124.i586.rpm) = 4c0ccbd8a54960c792de95b85f1d006d289aa8c6
-RMD160 (suse91/i586/atk-1.4.1-124.i586.rpm) = fde8091cdaaea8a1160c801ec79cc876ea51ea05
-Size (suse91/i586/atk-1.4.1-124.i586.rpm) = 130678 bytes
-SHA1 (suse91/i586/glib2-2.2.3-117.i586.rpm) = 72f7472c7cd95bc4e183dc81fce409cce03593e9
-RMD160 (suse91/i586/glib2-2.2.3-117.i586.rpm) = 9b5c9d5f7bd48b239eccdd9a6956b7a73457f70d
-Size (suse91/i586/glib2-2.2.3-117.i586.rpm) = 434726 bytes
-SHA1 (suse91/i586/gtk2-2.2.4-125.10.i586.rpm) = a8e4cb37aff4c57e73e7b0cd0ac58dab6348e6e5
-RMD160 (suse91/i586/gtk2-2.2.4-125.10.i586.rpm) = 976c50faa176bbdc146439f794d5ab4c2ab2e639
-Size (suse91/i586/gtk2-2.2.4-125.10.i586.rpm) = 2404171 bytes
-SHA1 (suse91/i586/pango-1.2.5-170.i586.rpm) = 085b6640bf649cd905b69799485e421a7d7fc995
-RMD160 (suse91/i586/pango-1.2.5-170.i586.rpm) = 7a591674c531812b3563bb7a63670600f5e13a21
-Size (suse91/i586/pango-1.2.5-170.i586.rpm) = 327533 bytes
-SHA1 (suse91/x86_64/atk-1.4.1-104.x86_64.rpm) = 1392a2623f2dfce4ecad3cfd297363729994712b
-RMD160 (suse91/x86_64/atk-1.4.1-104.x86_64.rpm) = 1c2b04710c76738c590569e13cc618928774ae4d
-Size (suse91/x86_64/atk-1.4.1-104.x86_64.rpm) = 134559 bytes
-SHA1 (suse91/x86_64/glib2-2.2.3-106.x86_64.rpm) = e1f45169453c8fe668881fc5732f63d33f324f67
-RMD160 (suse91/x86_64/glib2-2.2.3-106.x86_64.rpm) = 11873bccc89d5e999b097f27a6d1ac736419b71f
-Size (suse91/x86_64/glib2-2.2.3-106.x86_64.rpm) = 475869 bytes
-SHA1 (suse91/x86_64/gtk2-2.2.4-125.10.x86_64.rpm) = 6bcdf133ff3f44da500a04534cd60e602242b4ba
-RMD160 (suse91/x86_64/gtk2-2.2.4-125.10.x86_64.rpm) = 79f678649da0be9577e2f86e9433b2d259782613
-Size (suse91/x86_64/gtk2-2.2.4-125.10.x86_64.rpm) = 2537524 bytes
-SHA1 (suse91/x86_64/pango-1.2.5-148.x86_64.rpm) = cbc7b8a2d609cff54c3012e4bb2274d491d9ed5e
-RMD160 (suse91/x86_64/pango-1.2.5-148.x86_64.rpm) = 9cc80c226744e62d96fbc8c7c3976987b834f0ad
-Size (suse91/x86_64/pango-1.2.5-148.x86_64.rpm) = 347991 bytes
diff --git a/emulators/suse91_libjpeg/DESCR b/emulators/suse91_libjpeg/DESCR
deleted file mode 100644
index 3fe7a54d422..00000000000
--- a/emulators/suse91_libjpeg/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with jpeg shared libraries.
diff --git a/emulators/suse91_libjpeg/Makefile b/emulators/suse91_libjpeg/Makefile
deleted file mode 100644
index 787de19eb01..00000000000
--- a/emulators/suse91_libjpeg/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2006/06/30 15:37:22 salo Exp $
-
-DISTNAME=		suse_libjpeg-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		jdolecek@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the JPEG library
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-LIBTOOLIZE_PLIST=	NO
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_libjpeg/Makefile.i386 b/emulators/suse91_libjpeg/Makefile.i386
deleted file mode 100644
index bebaf49e1d0..00000000000
--- a/emulators/suse91_libjpeg/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		libjpeg-6.2.0-731.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_libjpeg/Makefile.x86_64 b/emulators/suse91_libjpeg/Makefile.x86_64
deleted file mode 100644
index 13d221541f1..00000000000
--- a/emulators/suse91_libjpeg/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		libjpeg-6.2.0-320.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_libjpeg/distinfo b/emulators/suse91_libjpeg/distinfo
deleted file mode 100644
index 5e02d0503ee..00000000000
--- a/emulators/suse91_libjpeg/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/01/08 16:53:21 salo Exp $
-
-SHA1 (suse91/i586/libjpeg-6.2.0-731.i586.rpm) = d7a77de29f2cab10df98fef2259cac6b5a96a607
-RMD160 (suse91/i586/libjpeg-6.2.0-731.i586.rpm) = ee7004d36fc5f56419ccd4f4a4dfbcb0e9a8f4f7
-Size (suse91/i586/libjpeg-6.2.0-731.i586.rpm) = 134966 bytes
-SHA1 (suse91/x86_64/libjpeg-6.2.0-320.x86_64.rpm) = 4a3d4d5c11e9e9fbdb1d0309e070ae0dff8f2336
-RMD160 (suse91/x86_64/libjpeg-6.2.0-320.x86_64.rpm) = 6333cedd354b315fe7a937c3c7bb7a27a334727e
-Size (suse91/x86_64/libjpeg-6.2.0-320.x86_64.rpm) = 121861 bytes
diff --git a/emulators/suse91_libpng/DESCR b/emulators/suse91_libpng/DESCR
deleted file mode 100644
index f330608b9fc..00000000000
--- a/emulators/suse91_libpng/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with png shared libraries.
diff --git a/emulators/suse91_libpng/Makefile b/emulators/suse91_libpng/Makefile
deleted file mode 100644
index 35a359d5979..00000000000
--- a/emulators/suse91_libpng/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/06/30 15:37:22 salo Exp $
-
-DISTNAME=		suse_libpng-${SUSE_VERSION}
-PKGREVISION=		5
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		jdolecek@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the PNG library
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_libpng/Makefile.i386 b/emulators/suse91_libpng/Makefile.i386
deleted file mode 100644
index 0e3b3e5c8e3..00000000000
--- a/emulators/suse91_libpng/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		libpng-1.2.5-182.10.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_libpng/Makefile.x86_64 b/emulators/suse91_libpng/Makefile.x86_64
deleted file mode 100644
index 0ee1a4dab46..00000000000
--- a/emulators/suse91_libpng/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		libpng-1.2.5-182.10.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_libpng/distinfo b/emulators/suse91_libpng/distinfo
deleted file mode 100644
index 45e63b86c1d..00000000000
--- a/emulators/suse91_libpng/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/01/08 16:53:21 salo Exp $
-
-SHA1 (suse91/i586/libpng-1.2.5-182.10.i586.rpm) = e3665c086446997a3d4cb127c3f7d924d3d5c5e6
-RMD160 (suse91/i586/libpng-1.2.5-182.10.i586.rpm) = c8cdc177fc67de66b09928e49b8c9ef4464e81d1
-Size (suse91/i586/libpng-1.2.5-182.10.i586.rpm) = 179045 bytes
-SHA1 (suse91/x86_64/libpng-1.2.5-182.10.x86_64.rpm) = ec47c216de1b0ee53712fb81719c946ce45eee7f
-RMD160 (suse91/x86_64/libpng-1.2.5-182.10.x86_64.rpm) = 377edb3ccb9db6a39faed0932ad3b4f9e4ee675e
-Size (suse91/x86_64/libpng-1.2.5-182.10.x86_64.rpm) = 171663 bytes
diff --git a/emulators/suse91_libtiff/DESCR b/emulators/suse91_libtiff/DESCR
deleted file mode 100644
index 6eb5ded69a7..00000000000
--- a/emulators/suse91_libtiff/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with tiff shared libraries.
diff --git a/emulators/suse91_libtiff/Makefile b/emulators/suse91_libtiff/Makefile
deleted file mode 100644
index 9f041b349f0..00000000000
--- a/emulators/suse91_libtiff/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/06/30 15:37:22 salo Exp $
-
-DISTNAME=		suse_libtiff-${SUSE_VERSION}
-PKGREVISION=		5
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the TIFF library
-
-DEPENDS+=		suse_libjpeg-${SUSE_VERSION}{,nb*}:../../emulators/suse91_libjpeg
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_libtiff/Makefile.i386 b/emulators/suse91_libtiff/Makefile.i386
deleted file mode 100644
index 2922a4cd03a..00000000000
--- a/emulators/suse91_libtiff/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.2 2006/06/26 19:42:26 salo Exp $
-
-RPMFILES=		libtiff-3.6.1-38.26.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_libtiff/Makefile.x86_64 b/emulators/suse91_libtiff/Makefile.x86_64
deleted file mode 100644
index 46042d91c9c..00000000000
--- a/emulators/suse91_libtiff/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.2 2006/06/26 19:42:26 salo Exp $
-
-RPMFILES=		libtiff-3.6.1-38.26.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_libtiff/distinfo b/emulators/suse91_libtiff/distinfo
deleted file mode 100644
index f67bf990a7c..00000000000
--- a/emulators/suse91_libtiff/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.6 2006/06/26 19:42:26 salo Exp $
-
-SHA1 (suse91/i586/libtiff-3.6.1-38.26.i586.rpm) = 3d9ff5195a9d0f7193dc467f9b8f63c75073f8f7
-RMD160 (suse91/i586/libtiff-3.6.1-38.26.i586.rpm) = 11b84d6fa22ff6862dd33abf9458ad54fb111cd0
-Size (suse91/i586/libtiff-3.6.1-38.26.i586.rpm) = 189080 bytes
-SHA1 (suse91/x86_64/libtiff-3.6.1-38.26.x86_64.rpm) = ef3bf272bab40a332e328ccac1f861900373cc15
-RMD160 (suse91/x86_64/libtiff-3.6.1-38.26.x86_64.rpm) = f380f35180c36421d55f68ef78b9ce68981b2437
-Size (suse91/x86_64/libtiff-3.6.1-38.26.x86_64.rpm) = 194127 bytes
diff --git a/emulators/suse91_linux/Makefile.common b/emulators/suse91_linux/Makefile.common
deleted file mode 100644
index d5b873ae048..00000000000
--- a/emulators/suse91_linux/Makefile.common
+++ /dev/null
@@ -1,87 +0,0 @@
-# $NetBSD: Makefile.common,v 1.16 2007/01/23 16:54:59 joerg Exp $
-
-.include "../../emulators/suse91_linux/vars.mk"
-.include "../../emulators/suse91_linux/arch.mk"
-
-ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-i386 NetBSD-3.99*-x86_64 \
-			NetBSD-[4-9]*-x86_64 FreeBSD-*-i386 \
-			DragonFly-*-i386
-
-_SUSE_FTP_SUBDIR=	suse/discontinued/${SUSE_ARCH_DIR}/9.1/suse/${SUSE_ARCH}/
-_SUSE_FTP_SUBDIR_UPD=	suse/discontinued/${SUSE_ARCH_DIR}/update/9.1/rpm/${SUSE_ARCH}/
-
-MASTER_SITE_SUSE91?=	ftp://ftp.suse.com/pub/${_SUSE_FTP_SUBDIR} \
-			ftp://ftp.suse.com/pub/${_SUSE_FTP_SUBDIR_UPD} \
-			ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/${_SUSE_FTP_SUBDIR} \
-			ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/${_SUSE_FTP_SUBDIR_UPD} \
-			ftp://gd.tuwien.ac.at/linux/suse.com/${_SUSE_FTP_SUBDIR} \
-			ftp://gd.tuwien.ac.at/linux/suse.com/${_SUSE_FTP_SUBDIR_UPD} \
-			ftp://mirror.mcs.anl.gov/pub/${_SUSE_FTP_SUBDIR} \
-			ftp://mirror.mcs.anl.gov/pub/${_SUSE_FTP_SUBDIR_UPD} \
-			ftp://ftp.sh.cvut.cz/MIRRORS/${_SUSE_FTP_SUBDIR:C/^suse/suse\/pub/} \
-			ftp://ftp.sh.cvut.cz/MIRRORS/${_SUSE_FTP_SUBDIR_UPD:C/^suse/suse\/pub/}
-
-DIST_SUBDIR?=		suse${SUSE_VERSION:S/.//}/${SUSE_ARCH}
-
-WRKSRC?=		${WRKDIR}
-MANCOMPRESSED?=		yes
-
-EMULSUBDIR=		emul/linux
-EMULDIR=		${PREFIX}/${EMULSUBDIR}
-
-# Set location of OPSYS-specific emulation directory
-.if ${OPSYS} == "NetBSD"
-OPSYS_EMULDIR=		/${EMULSUBDIR}
-.elif (${OPSYS} == "FreeBSD") || (${OPSYS} == "DragonFly")
-OPSYS_EMULDIR=		/compat/${EMULSUBDIR:T}
-.else
-OPSYS_EMULDIR=		/${EMULSUBDIR}
-.endif
-FILES_SUBST+=		OPSYS_EMULDIR=${OPSYS_EMULDIR:Q}
-
-RPM2PKG=		${PREFIX}/sbin/rpm2pkg
-BUILD_DEPENDS+=		rpm2pkg>=2.1:../../pkgtools/rpm2pkg
-
-BUILD_DEFS+=		RPMFILES
-.if defined(RPMIGNOREPATH)
-BUILD_DEFS+=		RPMIGNOREPATH
-.endif
-
-# The SuSE Linux packages have circular dependencies.
-LDD?=			${TRUE}
-
-RPM2PKGSTRIP?=		1
-RPM2PKGARGS?=		-d ${PREFIX} -f ${PLIST_SRC} -p ${EMULSUBDIR}
-.if empty(RPM2PKGSTRIP:M0)
-RPM2PKGARGS+=		-s ${RPM2PKGSTRIP}
-.endif
-.for TEMP in ${RPMIGNOREPATH}
-RPM2PKGARGS+=		-i ${TEMP}
-.endfor
-.for TEMP in ${RPMFILES}
-RPM2PKGARGS+=		${DISTDIR}/${DIST_SUBDIR}/${TEMP}
-.endfor
-
-.if !target(do-install)
-do-install:
-	@if [ -f ${PKGDIR}/PLIST ]; then \
-	  ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}; \
-	else \
-	  ${RM} -f ${PLIST_SRC}; \
-	  ${CP} ${PKGSRCDIR}/emulators/suse_linux/PLIST_dynamic ${PLIST_SRC} ; \
-	fi
-	@if [ -f ${PKGDIR}/PLIST_rpmfix.${MACHINE_ARCH} ]; then \
-	    ${SED} -e 's,^/,${EMULSUBDIR}/,' ${PKGDIR}/PLIST_rpmfix.${MACHINE_ARCH} >> ${PLIST_SRC}; \
-	fi
-	${RPM2PKG} ${RPM2PKGARGS}
-	@if ${GREP} -q 'lib.*\.so' ${PLIST_SRC}; then \
-	  ${ECHO_MSG} "===> [Automatic Linux shared object handling]"; \
-	  ${EMULDIR}/sbin/ldconfig -r ${EMULDIR}; \
-	  ${MV} -f ${PLIST_SRC} ${PLIST_SRC}.old; \
-	  ${GREP} -v '^@dirrm' ${PLIST_SRC}.old >${PLIST_SRC} || ${TRUE}; \
-	  ${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}; \
-	  ${ECHO} "@unexec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR} 2>/dev/null" >>${PLIST_SRC}; \
-	  ${GREP} '^@dirrm' ${PLIST_SRC}.old >>${PLIST_SRC} || ${TRUE}; \
-	  ${RM} -f ${PLIST_SRC}.old; \
-	fi
-.endif
diff --git a/emulators/suse91_linux/arch.mk b/emulators/suse91_linux/arch.mk
deleted file mode 100644
index c4db621bfeb..00000000000
--- a/emulators/suse91_linux/arch.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: arch.mk,v 1.1.1.1 2004/07/13 10:31:15 tron Exp $
-
-.ifndef SUSE_ARCH_MK
-SUSE_ARCH_MK=1
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-SUSE_ARCH?=	i586
-SUSE_ARCH_DIR?=	${MACHINE_ARCH}
-.elif ${MACHINE_ARCH} == "powerpc"
-SUSE_ARCH?=	ppc
-.else
-SUSE_ARCH?=	${MACHINE_ARCH}
-.endif
-
-SUSE_ARCH_DIR?=	${SUSE_ARCH}
-
-.endif # SUSE_ARCH_MK
diff --git a/emulators/suse91_linux/vars.mk b/emulators/suse91_linux/vars.mk
deleted file mode 100644
index ffe221743bb..00000000000
--- a/emulators/suse91_linux/vars.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: vars.mk,v 1.1 2005/04/03 21:23:15 jdolecek Exp $
-
-.ifndef SUSE_VARS_MK
-SUSE_VARS_MK=1
-
-SUSE_DIR_PREFIX=	suse91
-SUSE_VERSION=		9.1
-
-.endif # SUSE_VARS_MK
diff --git a/emulators/suse91_locale/DESCR b/emulators/suse91_locale/DESCR
deleted file mode 100644
index 25484919ed3..00000000000
--- a/emulators/suse91_locale/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package includes the glibc locale files.
diff --git a/emulators/suse91_locale/Makefile b/emulators/suse91_locale/Makefile
deleted file mode 100644
index b4eec1d142b..00000000000
--- a/emulators/suse91_locale/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/06/30 15:37:22 salo Exp $
-
-DISTNAME=		suse_locale-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Locale files for the Linux compatibility package
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-
-CONFLICTS=		linux-locale-[0-9]*
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_locale/Makefile.i386 b/emulators/suse91_locale/Makefile.i386
deleted file mode 100644
index a67e5c40860..00000000000
--- a/emulators/suse91_locale/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		glibc-locale-2.3.3-98.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_locale/Makefile.x86_64 b/emulators/suse91_locale/Makefile.x86_64
deleted file mode 100644
index 74b54bd7525..00000000000
--- a/emulators/suse91_locale/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		glibc-locale-2.3.3-63.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_locale/distinfo b/emulators/suse91_locale/distinfo
deleted file mode 100644
index 1c86a96d54c..00000000000
--- a/emulators/suse91_locale/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/01/08 16:53:21 salo Exp $
-
-SHA1 (suse91/i586/glibc-locale-2.3.3-98.i586.rpm) = 329ab066b6d21f95e0329731416806015ff2eda6
-RMD160 (suse91/i586/glibc-locale-2.3.3-98.i586.rpm) = 3591c7c7c0f0d3f7ae49e627c45ce1f425bda2d3
-Size (suse91/i586/glibc-locale-2.3.3-98.i586.rpm) = 10393732 bytes
-SHA1 (suse91/x86_64/glibc-locale-2.3.3-63.x86_64.rpm) = c0a43efd7b29585ad3de03e92c71397708061758
-RMD160 (suse91/x86_64/glibc-locale-2.3.3-63.x86_64.rpm) = a563550ba2df6a656d6b83747cc4c5905905a331
-Size (suse91/x86_64/glibc-locale-2.3.3-63.x86_64.rpm) = 10264418 bytes
diff --git a/emulators/suse91_openmotif/DESCR b/emulators/suse91_openmotif/DESCR
deleted file mode 100644
index f67dbf54135..00000000000
--- a/emulators/suse91_openmotif/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with OpenMotif shared
-libraries.
diff --git a/emulators/suse91_openmotif/Makefile b/emulators/suse91_openmotif/Makefile
deleted file mode 100644
index a0a47fdcee8..00000000000
--- a/emulators/suse91_openmotif/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/06/30 15:37:22 salo Exp $
-
-DISTNAME=		suse_openmotif-${SUSE_VERSION}
-PKGREVISION=		4
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		jdolecek@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for the Motif library
-
-DEPENDS+=		suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse91_x11
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_openmotif/Makefile.i386 b/emulators/suse91_openmotif/Makefile.i386
deleted file mode 100644
index d12fe8a9ac3..00000000000
--- a/emulators/suse91_openmotif/Makefile.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:22 salo Exp $
-
-RPMFILES=		openmotif-libs-2.2.2-519.4.${SUSE_ARCH}.rpm \
-			openmotif21-libs-2.1.30MLI4-119.4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_openmotif/Makefile.x86_64 b/emulators/suse91_openmotif/Makefile.x86_64
deleted file mode 100644
index 9f2c4ec85f0..00000000000
--- a/emulators/suse91_openmotif/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:22 salo Exp $
-
-RPMFILES=		openmotif-libs-2.2.2-519.4.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_openmotif/distinfo b/emulators/suse91_openmotif/distinfo
deleted file mode 100644
index 3edb50d6fe0..00000000000
--- a/emulators/suse91_openmotif/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/01/08 16:53:22 salo Exp $
-
-SHA1 (suse91/i586/openmotif-libs-2.2.2-519.4.i586.rpm) = 18885f5c5f8d361202df216b3d724b1668f1d9d9
-RMD160 (suse91/i586/openmotif-libs-2.2.2-519.4.i586.rpm) = c58fcceb1fa4a1e7a66469de2302c2930ce7ea94
-Size (suse91/i586/openmotif-libs-2.2.2-519.4.i586.rpm) = 1185317 bytes
-SHA1 (suse91/i586/openmotif21-libs-2.1.30MLI4-119.4.i586.rpm) = 0590401f7420f7d12379cfff34dfbad86ee83d7a
-RMD160 (suse91/i586/openmotif21-libs-2.1.30MLI4-119.4.i586.rpm) = 893b1552c4166cd8e582ff0348e2638d16f5628d
-Size (suse91/i586/openmotif21-libs-2.1.30MLI4-119.4.i586.rpm) = 1070080 bytes
-SHA1 (suse91/x86_64/openmotif-libs-2.2.2-519.4.x86_64.rpm) = 8a1ab545f11a4566ab1dc2b9e636c5442727d717
-RMD160 (suse91/x86_64/openmotif-libs-2.2.2-519.4.x86_64.rpm) = 9d64b44955c43596083dfb6e243da6a04d4e76c6
-Size (suse91/x86_64/openmotif-libs-2.2.2-519.4.x86_64.rpm) = 1259732 bytes
diff --git a/emulators/suse91_slang/DESCR b/emulators/suse91_slang/DESCR
deleted file mode 100644
index f9f21396127..00000000000
--- a/emulators/suse91_slang/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with glibc2 which require
-the "slang" library.
diff --git a/emulators/suse91_slang/Makefile b/emulators/suse91_slang/Makefile
deleted file mode 100644
index 0201d77154d..00000000000
--- a/emulators/suse91_slang/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/06/30 15:37:22 salo Exp $
-
-DISTNAME=		suse_slang-${SUSE_VERSION}
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for slang library
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-post-install:
-	${LN} -sf ${PREFIX}/${EMULSUBDIR}/usr/lib/libslang-utf8.so.1 \
-		${PREFIX}/${EMULSUBDIR}/usr/lib/libslang.so.1
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_slang/Makefile.i386 b/emulators/suse91_slang/Makefile.i386
deleted file mode 100644
index 4713c3d2436..00000000000
--- a/emulators/suse91_slang/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:22 salo Exp $
-
-RPMFILES=		slang-1.4.9-121.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_slang/Makefile.x86_64 b/emulators/suse91_slang/Makefile.x86_64
deleted file mode 100644
index e30fe9b0301..00000000000
--- a/emulators/suse91_slang/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:22 salo Exp $
-
-RPMFILES=		slang-1.4.9-112.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_slang/PLIST_rpmfix.i386 b/emulators/suse91_slang/PLIST_rpmfix.i386
deleted file mode 100644
index 4baff0be128..00000000000
--- a/emulators/suse91_slang/PLIST_rpmfix.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST_rpmfix.i386,v 1.2 2006/05/28 17:41:18 rillig Exp $
-/usr/lib/libslang.so.1
diff --git a/emulators/suse91_slang/distinfo b/emulators/suse91_slang/distinfo
deleted file mode 100644
index 7224536d1fb..00000000000
--- a/emulators/suse91_slang/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/01/08 16:53:22 salo Exp $
-
-SHA1 (suse91/i586/slang-1.4.9-121.i586.rpm) = 3a8e5e4a0e7177c378b414e879e162833d521a67
-RMD160 (suse91/i586/slang-1.4.9-121.i586.rpm) = 759cdb055ebf67b00cbb78d0e79528a34e58a4d1
-Size (suse91/i586/slang-1.4.9-121.i586.rpm) = 233659 bytes
-SHA1 (suse91/x86_64/slang-1.4.9-112.x86_64.rpm) = ce0601d63196287c1cc471e69fefd5c02fb3e393
-RMD160 (suse91/x86_64/slang-1.4.9-112.x86_64.rpm) = 32f3a4630d1205481e7af187ec4582b88f54cdc4
-Size (suse91/x86_64/slang-1.4.9-112.x86_64.rpm) = 252704 bytes
diff --git a/emulators/suse91_vmware/DESCR b/emulators/suse91_vmware/DESCR
deleted file mode 100644
index 9777e703fdd..00000000000
--- a/emulators/suse91_vmware/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package is supposed to help running VMware under NetBSD.
diff --git a/emulators/suse91_vmware/Makefile b/emulators/suse91_vmware/Makefile
deleted file mode 100644
index 3eec3dcfcf9..00000000000
--- a/emulators/suse91_vmware/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:28 wiz Exp $
-
-DISTNAME=		suse_vmware-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package to support running VMware
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-DEPENDS+=	suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse91_x11
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
-
-RPMFILES=		grep-2.5.1-416.i586.rpm
-RPMIGNOREPATH=		usr
-
-post-install:
-	@${GREP} -v '^#' ${FILESDIR}/device-links | \
-	${AWK} '{print("${LN} -fs "$$1" ${EMULDIR}/dev/"$$2)}' | \
-	${SH} -
-	@${GREP} -v '^#' ${FILESDIR}/device-links | \
-	${AWK} '{print("@exec ${LN} -fs "$$1" %D/${EMULSUBDIR}/dev/"$$2)}' \
-	  >>${PLIST_SRC}
-	@${GREP} -v '^#' ${FILESDIR}/device-links | \
-	${AWK} '{print("@unexec ${RM} -f %D/${EMULSUBDIR}/dev/"$$2)}' \
-	  >>${PLIST_SRC}
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_vmware/PLIST b/emulators/suse91_vmware/PLIST
deleted file mode 100644
index c5d7a7e8c18..00000000000
--- a/emulators/suse91_vmware/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/04/02 17:10:19 jdolecek Exp $
-@comment this plist intentionally left empty
diff --git a/emulators/suse91_vmware/distinfo b/emulators/suse91_vmware/distinfo
deleted file mode 100644
index c6c7820446d..00000000000
--- a/emulators/suse91_vmware/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/04/02 17:02:29 jdolecek Exp $
-
-SHA1 (suse91/i586/grep-2.5.1-416.i586.rpm) = 5a33d107d2ac859207fc585703c96a32f235e4be
-RMD160 (suse91/i586/grep-2.5.1-416.i586.rpm) = 7ffa46ee7473a1364e7d1ccce0b13b11bbe72bd0
-Size (suse91/i586/grep-2.5.1-416.i586.rpm) = 169601 bytes
diff --git a/emulators/suse91_vmware/files/device-links b/emulators/suse91_vmware/files/device-links
deleted file mode 100644
index 50b0788efdc..00000000000
--- a/emulators/suse91_vmware/files/device-links
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: device-links,v 1.1.1.1 2005/04/02 16:59:44 jdolecek Exp $
-/dev/rcd0a cdrom
-/dev/rfd0a fd0
-/dev/wd0d hda
-/dev/wd1d hdb
-/dev/wd2d hdc
-/dev/wd3d hdd
-/dev/sd0d hde
-/dev/sd1d hdf
-/dev/sd2d hdg
-/dev/sd3d hdh
-/dev/sd4d hdi
-/dev/ttyE0 tty1
-/dev/ttyE1 tty2
-/dev/ttyE2 tty3
-/dev/ttyE3 tty4
-/dev/ttyE4 tty5
-/dev/ttyE5 tty6
-/dev/ttyE6 tty7
-/dev/ttyE7 tty8
-tty1 tty0
diff --git a/emulators/suse91_x11/DESCR b/emulators/suse91_x11/DESCR
deleted file mode 100644
index 023c56f39b1..00000000000
--- a/emulators/suse91_x11/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
-
-This package supports running ELF binaries linked with glibc2 which require
-X11 shared libraries.
diff --git a/emulators/suse91_x11/Makefile b/emulators/suse91_x11/Makefile
deleted file mode 100644
index 711ace7a801..00000000000
--- a/emulators/suse91_x11/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/06/30 15:37:22 salo Exp $
-
-DISTNAME=		suse_x11-${SUSE_VERSION}
-PKGREVISION=		6
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
-
-MAINTAINER=		tron@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for X11 binaries
-
-DEPENDS+=		suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
-
-.include "../../mk/bsd.prefs.mk"
-
-.include "../../emulators/suse91_linux/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_x11/Makefile.i386 b/emulators/suse91_x11/Makefile.i386
deleted file mode 100644
index f9176057571..00000000000
--- a/emulators/suse91_x11/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:22 salo Exp $
-
-RPMFILES=		XFree86-libs-4.3.99.902-43.42.5.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_x11/Makefile.x86_64 b/emulators/suse91_x11/Makefile.x86_64
deleted file mode 100644
index ec0ecd79c36..00000000000
--- a/emulators/suse91_x11/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:22 salo Exp $
-
-RPMFILES=		XFree86-libs-4.3.99.902-43.42.5.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_x11/PLIST_rpmfix.i386 b/emulators/suse91_x11/PLIST_rpmfix.i386
deleted file mode 100644
index 0aa20170dda..00000000000
--- a/emulators/suse91_x11/PLIST_rpmfix.i386
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST_rpmfix.i386,v 1.1 2006/04/28 09:08:32 joerg Exp $
-/usr/X11R6/lib/libFS.so.6
-/usr/X11R6/lib/libGLw.so.1
-/usr/X11R6/lib/libI810XvMC.so.1
-/usr/X11R6/lib/libVncExt.so.2
-/usr/X11R6/lib/libXRes.so.1
-/usr/X11R6/lib/libXfontcache.so.1
-/usr/X11R6/lib/libXinerama.so.1
-/usr/X11R6/lib/libXss.so.1
-/usr/X11R6/lib/libXvMC.so.1
-/usr/X11R6/lib/libXxf86rush.so.1
-/usr/X11R6/lib/libfontenc.so.1
-/usr/X11R6/lib/libxkbfile.so.1
-/usr/X11R6/lib/libxkbui.so.1
diff --git a/emulators/suse91_x11/distinfo b/emulators/suse91_x11/distinfo
deleted file mode 100644
index 35b95cf2c9d..00000000000
--- a/emulators/suse91_x11/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/11/06 14:52:44 salo Exp $
-
-SHA1 (suse91/i586/XFree86-libs-4.3.99.902-43.42.5.i586.rpm) = 49f0132b77de5f95f79b13d83eb78428e4132068
-RMD160 (suse91/i586/XFree86-libs-4.3.99.902-43.42.5.i586.rpm) = aeac575e06a2e52d78f1c5c5c4a225049d5eeb47
-Size (suse91/i586/XFree86-libs-4.3.99.902-43.42.5.i586.rpm) = 2405156 bytes
-SHA1 (suse91/x86_64/XFree86-libs-4.3.99.902-43.42.5.x86_64.rpm) = 8faa339e0357c8518df5d68e9b932ca8d11cdc24
-RMD160 (suse91/x86_64/XFree86-libs-4.3.99.902-43.42.5.x86_64.rpm) = 1b4435d284d5e0d7c2ab54941c8415ae6ca930f8
-Size (suse91/x86_64/XFree86-libs-4.3.99.902-43.42.5.x86_64.rpm) = 2518483 bytes
diff --git a/emulators/suse_linux/Makefile.application b/emulators/suse_linux/Makefile.application
deleted file mode 100644
index 5da1a4e1957..00000000000
--- a/emulators/suse_linux/Makefile.application
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile.application,v 1.23 2006/06/26 19:24:05 salo Exp $
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == "NetBSD" ||	\
-     ${OPSYS} == "FreeBSD" ||	\
-     ${OPSYS} == "DragonFly")	\
- && (${MACHINE_ARCH} == "i386" || 	\
-     ${MACHINE_ARCH} == "powerpc" ||	\
-     ${MACHINE_ARCH} == "x86_64")
-
-.  if !empty(SUSE_PREFER:M10.0)
-.    include "../../emulators/suse100_linux/vars.mk"
-.  elif !empty(SUSE_PREFER:M9.1) && (${MACHINE_ARCH} != "powerpc")
-.    include "../../emulators/suse91_linux/vars.mk"
-.  else
-.    include "../../emulators/suse_linux/unavailable.mk"
-.  endif
-
-.  if defined(RPMFILES)
-.    include "../../emulators/${SUSE_DIR_PREFIX}_linux/Makefile.common"
-.  endif
-
-EMULSUBDIR?=	emul/linux
-EMULDIR?=	${PREFIX}/${EMULSUBDIR}
-LDD=		${EMULDIR}/usr/bin/ldd
-.elif ${OPSYS} == "Linux"
-# No Linux emulation is needed
-USE_NATIVE_LINUX=		# empty
-.else
-.  include "../../emulators/suse_linux/unavailable.mk"
-.endif
diff --git a/emulators/suse_linux/PLIST_dynamic b/emulators/suse_linux/PLIST_dynamic
deleted file mode 100644
index 596e633957a..00000000000
--- a/emulators/suse_linux/PLIST_dynamic
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST_dynamic,v 1.2 2006/06/26 17:54:20 salo Exp $
-@comment PLIST created dynamically
diff --git a/emulators/suse_linux/unavailable.mk b/emulators/suse_linux/unavailable.mk
deleted file mode 100644
index 3bf272f3610..00000000000
--- a/emulators/suse_linux/unavailable.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: unavailable.mk,v 1.2 2006/07/28 22:57:38 kristerw Exp $
-
-.ifndef SUSE_UNAVAILABLE_MK
-SUSE_UNAVAILABLE_MK=1
-
-# We put a value here so that the creation of the bulk build cache files
-# works correctly on all machines.  This speeds up the marking of all
-# COMPAT_LINUX packages as not available.
-#
-SUSE_DIR_PREFIX=	suse100
-SUSE_VERSION=		0
-PKG_SKIP_REASON+=	"${PKGNAME} is not available for ${MACHINE_PLATFORM}"
-
-# By default, we can't check for missing shared libraries nor note which
-# shared libraries are provided and/or required by the package since the
-# library support is via syscall emulation.
-#
-CHECK_SHLIBS_SUPPORTED?=	no
-
-.endif # SUSE_UNAVAILABLE_MK
diff --git a/emulators/swarm/DESCR b/emulators/swarm/DESCR
deleted file mode 100644
index b2640bfc5ca..00000000000
--- a/emulators/swarm/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-This is SWARM - SoftWare ARM.
-
-The initial stage in this process is implement a plain software model
-of the basic ARM.  There are, of course, already software models of
-the ARM available, so why do another one?  Well, this one will need to
-allow the instruction set to be modified at run time, and provide not
-just an execution environment, but also a way of monitoring things
-like cache hits.
-
-To this end a hierarchical model of an ARM CPU has been implemented in
-C++.  It currently supports:
-
-+ Arm 6 based core.  Currently able to handle data processing
-instructions, word/byte load and stores, load/store multiple,
-branches, 32 bit multiplication, and SWIs.
-+ Support for plugging in different caches - be they unified or
-separate I & D caches.  Currently only a direct mapped cache is
-implemented.
-+ Compile for SWARM using ARM targeted gcc.
diff --git a/emulators/swarm/Makefile b/emulators/swarm/Makefile
deleted file mode 100644
index 3eb9eadde9f..00000000000
--- a/emulators/swarm/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2006/06/01 21:02:01 joerg Exp $
-#
-
-DISTNAME=	swarm-0.61
-CATEGORIES=	emulators
-MASTER_SITES=	http://www.cl.cam.ac.uk/~mwd24/phd/bin/
-
-MAINTAINER=	agc@NetBSD.org
-HOMEPAGE=	http://www.cl.cam.ac.uk/~mwd24/phd/swarm.html
-COMMENT=	Software arm7M core emulator
-
-WRKSRC=		${WRKDIR}/swarm
-BUILD_DIRS=	src
-
-USE_LANGUAGES=	c++
-
-INSTALLATION_DIRS=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/swarm ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/swarm
-	${INSTALL_DATA} ${WRKSRC}/doc/swarm.pdf ${PREFIX}/share/doc/swarm
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/swarm/PLIST b/emulators/swarm/PLIST
deleted file mode 100644
index e7269ecb10a..00000000000
--- a/emulators/swarm/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:55 zuntum Exp $
-bin/swarm
-share/doc/swarm/swarm.pdf
-@dirrm share/doc/swarm
diff --git a/emulators/swarm/distinfo b/emulators/swarm/distinfo
deleted file mode 100644
index f8afc40ab1d..00000000000
--- a/emulators/swarm/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.9 2005/12/09 12:10:09 joerg Exp $
-
-SHA1 (swarm-0.61.tar.gz) = 36ed52671f8be2cf8e799efd94a48b2919979d2c
-RMD160 (swarm-0.61.tar.gz) = d8e15da178236a46761a65cd52809276df5f3511
-Size (swarm-0.61.tar.gz) = 395061 bytes
-SHA1 (patch-aa) = 65da2134c0d99930412e60fbb3e0f299d3982113
-SHA1 (patch-ab) = 5a71a670297e4d8db2dd3c7c96d9528f878d13cb
-SHA1 (patch-ac) = 20b0603e24178a6086531bd2f7eb0eb5fc0e99c3
-SHA1 (patch-ad) = 4e660fcb3dae67d4519ad3df40e342707e983e96
-SHA1 (patch-ae) = 08b8819ad53bb0a91c3ab7a56479b2f36faab754
-SHA1 (patch-af) = 8228c591fd22ee8984d1f434940ad2cbbba41a22
-SHA1 (patch-ag) = 4d3ca9cd45edc081b85019ec88135504b3e7b0a1
-SHA1 (patch-ah) = 94d58bdd8d48e73f49ef06ac90eb0a9b0e1af6db
-SHA1 (patch-ai) = 51b43a6b560566447d588623b19d3da6ab7b4ade
-SHA1 (patch-aj) = 227b459e8201320679d3484daa163a5a5c579b17
-SHA1 (patch-ak) = b5fe118ed1da57ba528c3f3e86790ff33b7a2533
diff --git a/emulators/swarm/patches/patch-aa b/emulators/swarm/patches/patch-aa
deleted file mode 100644
index 3eea0de9b7e..00000000000
--- a/emulators/swarm/patches/patch-aa
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2005/11/03 21:51:57 rillig Exp $
-
-fix tests for endianness and use our own header files to get
-int64_t and uint64_t
-
---- src/swarm_types.h.orig	Tue Apr 10 09:46:10 2001
-+++ src/swarm_types.h
-@@ -26,9 +26,10 @@
- #ifndef __SWARM_TYPES_H__
- #define __SWARM_TYPES_H__
- 
--#ifdef sun4
-+#include <sys/endian.h>
-+#if BYTE_ORDER == BIG_ENDIAN
- #define __BIG_ENDIAN__
--#else /* ix86 / alpha / arm32 */
-+#else
- #define __LITTLE_ENDIAN__
- #endif
- 
-@@ -60,6 +61,10 @@
- typedef unsigned short            uint16_t;
- typedef unsigned int              uint32_t;
- 
-+#ifdef __NetBSD__
-+#include <sys/types.h>
-+#include <sys/inttypes.h>
-+#else
- #ifndef WIN32
- #ifndef __int8_t_defined 
- typedef long long int             int64_t;
-@@ -69,6 +74,7 @@
- typedef INT64			  int64_t;
- typedef UINT64                    uint64_t;
- #endif // !WIN32
-+#endif // __NetBSD__
- #endif
- 
- typedef int                       bool_t;
diff --git a/emulators/swarm/patches/patch-ab b/emulators/swarm/patches/patch-ab
deleted file mode 100644
index a206c2798b0..00000000000
--- a/emulators/swarm/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/11/03 21:51:57 rillig Exp $
-
---- src/Makefile.orig	Wed Apr 11 17:43:07 2001
-+++ src/Makefile
-@@ -22,10 +22,10 @@
- #
- ###############################################################################
- 
--GCC    = gcc
-+GCC    = ${CC}
- ROOT   = ..
- ARCH   = `$(ROOT)/bin/scripts/arch`
--CFLAGS = -D$(ARCH) -DSHARED_CACHE -DQUIET -DSWARM_SWI_HANDLER #-DDEBUG_MEM
-+CFLAGS+= -D$(ARCH) -DSHARED_CACHE -DQUIET -DSWARM_SWI_HANDLER #-DDEBUG_MEM
- OPTS   = -g -DEBUG
- 
- OBJS = core.o main.o alu.o cache.o direct.o swarm.o swi.o armproc.o \
diff --git a/emulators/swarm/patches/patch-ac b/emulators/swarm/patches/patch-ac
deleted file mode 100644
index e15561b05a1..00000000000
--- a/emulators/swarm/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/11/03 21:51:57 rillig Exp $
-
---- src/isa_be.h.orig	Mon Nov  6 12:38:08 2000
-+++ src/isa_be.h	Mon Apr  1 00:43:50 2002
-@@ -190,5 +190,5 @@
-   uint32_t p     : 1;
-   uint32_t u     : 1;
--  uint32_t psr   : 1;
-+  uint32_t s     : 1;
-   uint32_t wb    : 1;
-   uint32_t ls    : 1;
diff --git a/emulators/swarm/patches/patch-ad b/emulators/swarm/patches/patch-ad
deleted file mode 100644
index 88aaaf2559b..00000000000
--- a/emulators/swarm/patches/patch-ad
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/12/09 12:10:09 joerg Exp $
-
---- src/uartctrl.cpp	2003/08/14 08:54:51	1.1
-+++ src/uartctrl.cpp	2003/08/14 09:15:14
-@@ -40,6 +40,29 @@
- //
- int CUARTCtrl::GetPty()
- {
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-+#include <sys/param.h>
-+	// masterpty = fd of master pty
-+	const char	*letters = "pqrstuvwxyzPQRST";
-+	const char	*numbers = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-+	const char	*let;
-+	const char	*num;
-+	char		 ptyname[MAXPATHLEN];
-+	int		 cc;
-+
-+	cc = strlcpy(ptyname, "/dev/pty", sizeof(ptyname));
-+	ptyname[cc + 2] = 0x0;
-+	for (let = letters ; *let ; let++) {
-+		ptyname[cc] = *let;
-+		for (num = numbers ; *num ; num++) {
-+			ptyname[cc + 1] = *num;
-+		}
-+		if ((masterpty = open(ptyname, O_RDWR | O_NONBLOCK, 0666)) >= 0) {
-+			return 0;
-+		}
-+	}
-+	return -1;
-+#else
- 	char *namepty;
- 	struct termios tiopty;
- 	int curFlags;
-@@ -102,6 +125,7 @@
- 		getchar();
- 	}
- 	return 0;
-+#endif
- }
- 
- ///////////////////////////////////////////////////////////////////////////////
diff --git a/emulators/swarm/patches/patch-ae b/emulators/swarm/patches/patch-ae
deleted file mode 100644
index a96cf175c1c..00000000000
--- a/emulators/swarm/patches/patch-ae
+++ /dev/null
@@ -1,126 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2005/11/03 21:51:57 rillig Exp $
-
---- src/core.cpp	2004/08/12 17:16:45	1.1
-+++ src/core.cpp	2004/08/12 17:17:18
-@@ -26,7 +26,7 @@
- #include "core.h"
- #include "isa.h"
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- #include "disarm.h"
- #ifndef ARM6
- #include "booth.h"
-@@ -34,6 +34,8 @@
- 
- #include "memory.cpp"
- 
-+using namespace std;
-+
- static const char* mode_str[16] = {"reset", "fiq", "irq", "svc", 
- 				   NULL, NULL, NULL, "abort", 
- 				   NULL, NULL, NULL, "undef", 
-@@ -4031,22 +4033,29 @@
- {
-   char str[80];
- 
--  cout.form("-------------------------------------------------------------------------------\n");
--  cout.form("SWARM Core debug dump\n\n");
-+  cout << "-------------------------------------------------------------------------------\n";
-+  cout << "SWARM Core debug dump\n\n";
- 
--  cout.form("Registers:");
-+  cout << "Registers:";
-   for (int j = 0; j < 4; j++)
-     {
--      for (int i = 0; i < 4; i++)
--	cout.form("   0x%08X", m_regsWorking[i + (j * 4)]);
--      cout.form("\n\t  ");
-+      for (int i = 0; i < 4; i++) {
-+	cout << "   ";
-+	cout << hex << m_regsWorking[i + (j * 4)];
-+      }
-+      cout << "\n\t  ";
-     }
--  cout.form("   0x%08X", m_regsWorking[16]);
-+  cout << "   ";
-+  cout << hex << m_regsWorking[16];
- 
--  if (m_mode == M_FIQ)
--    cout.form("\tSPSR_%s[0x%08x]\n\n", mode_str[m_mode & 0xF], m_regsFiq[7]);
--  else if ((m_mode == M_USER) || (m_mode == M_SYSTEM))
--    cout.form("\n\n");
-+  if (m_mode == M_FIQ) {
-+    cout << "\tSPSR_";
-+    cout << mode_str[m_mode & 0xF];
-+    cout << "[";
-+    cout << hex << m_regsFiq[7];
-+    cout << "]\n\n";
-+  } else if ((m_mode == M_USER) || (m_mode == M_SYSTEM))
-+    cout << "\n\n";
-   else
-     {
-       uint32_t* temp;
-@@ -4060,31 +4069,50 @@
- 	  temp = NULL; break; // ???
- 	}
-            
--      if (temp != NULL)
--	cout.form("\tSPSR_%s[0x%08x]\n\n", mode_str[m_mode & 0xF], temp[2]);
-+      if (temp != NULL) {
-+	cout << "\tSPSR_";
-+	cout << mode_str[m_mode & 0xF]; 
-+	cout << "[";
-+	cout << hex << temp[2];
-+	cout << "]\n\n";
-+      }
-     }
- 
--  cout.form("Instruction Pipe (top is current instruction):\n");
-+  cout << "Instruction Pipe (top is current instruction):\n";
-   for (int i = 2; i > 0; i--)
-     {
--      cout.form("\t0x%08X - ", m_iPipe[i]);
-+      cout << "\t0x";
-+      cout << hex << m_iPipe[i];
-+      cout << " - ";
-       memset(str, 0, 80);
-       CDisarm::Decode(m_iPipe[i], str);
--      cout.form("%s\n", str);
-+      cout << str;
-+      cout << "\n";
-     }
-   if (m_busCurrent != NULL)
-     {
--      cout.form("\t0x%08X - ", m_busCurrent->Din);
-+      cout << "\t0x";
-+      cout << hex << m_busCurrent->Din;
-+      cout << " - ";
-       memset(str, 0, 80);
-       CDisarm::Decode(m_busCurrent->Din, str);
--      cout.form("%s (suspect if bad address error)\n", str);
-+      cout << str;
-+      cout << " (suspect if bad address error)\n";
-     }
--  cout.form("Instruction Stage last executed - %d\n\n", m_nCtrlCur);
--  
--  cout.form("DIn reg = 0x%08X    DOut reg = 0x%08X   Addr reg = 0x%08X\n",
--	    m_regDataIn, m_regDataOut, m_regAddr);
-+  cout << "Instruction Stage last executed - ";
-+  cout << dec << m_nCtrlCur;
-+  cout << "\n\n";
-+  
-+  cout << "DIn reg = 0x";
-+  cout << hex << m_regDataIn;
-+  cout << "    DOut reg = 0x";
-+  cout << hex << m_regDataOut;
-+  cout << "   Addr reg = 0x";
-+  cout << hex << m_regAddr;
-+  cout << "\n";
-+  cout << dec;
- 
--  cout.form("-------------------------------------------------------------------------------\n");
-+  cout << "-------------------------------------------------------------------------------\n";
- }
- 
- 
diff --git a/emulators/swarm/patches/patch-af b/emulators/swarm/patches/patch-af
deleted file mode 100644
index 51513e7266e..00000000000
--- a/emulators/swarm/patches/patch-af
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-af,v 1.2 2005/11/03 21:51:57 rillig Exp $
-
---- src/main.cpp	2004/08/12 18:28:49	1.1
-+++ src/main.cpp	2004/08/12 18:29:57
-@@ -34,11 +34,13 @@
- #endif
- #include "cache.h"
- #include "direct.h"
--#include <iostream.h>
-+#include <iostream>
- #include <sys/stat.h>
- #include "libc.h"
- #include "syscopro.h"
- 
-+using namespace std;
-+
- #define FAST_CYCLE 1
- #define SLOW_CYCLE 4
- 
-@@ -491,15 +493,18 @@
- 	  }
- 	  DebuggerRepeatCount--;
- 	}
--#endif DEBUGGER
-+#endif /* DEBUGGER */
-       // Do we need to do anything with the bus?
-       if (pinout.benable == 1)
- 	{
- 	  // Quick sanity check
- 	  if (pinout.address >= MEMORY_SIZE)
- 	    {
--	      cerr.form("SWARM failing: Bad address - 0x%08X\n", 
--			pinout.address);
-+	      cerr << "SWARM failing: Bad address - 0x";
-+	      cerr << hex << pinout.address;
-+	      cerr << "\n";
-+
-+	      cerr << dec;
- 
- 	      pArm->DebugDump();
- 	      
diff --git a/emulators/swarm/patches/patch-ag b/emulators/swarm/patches/patch-ag
deleted file mode 100644
index f0a46bbef7b..00000000000
--- a/emulators/swarm/patches/patch-ag
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2005/11/03 21:51:57 rillig Exp $
-
---- src/syscopro.cpp	2004/08/12 18:34:07	1.1
-+++ src/syscopro.cpp	2004/08/12 18:37:39
-@@ -26,10 +26,12 @@
- #include "syscopro.h"
- #include <string.h>
- #include "isa.h"
--#include <iostream.h>
-+#include <iostream>
- 
- #include "memory.cpp"
- 
-+using namespace std;
-+
- // Defines a dull ARM7 type processor ID. Make = ARM, Arch = 3, rest NULL
- #define SWARM_ID 0x41007000
- 
-@@ -486,22 +488,28 @@
- {
-   char str[80];
- 
--  cout.form("-------------------------------------------------------------------------------\n");
--  cout.form("System coprocessor debug dump\n\n");
-+  cout << "-------------------------------------------------------------------------------\n";
-+  cout << "System coprocessor debug dump\n\n";
- 
--  cout.form("Registers:");
-+  cout << "Registers:";
-   for (int j = 0; j < 4; j++)
-     {
--      for (int i = 0; i < 4; i++)
--	cout.form("   0x%08X", m_regsWorking[i + (j * 4)]);
--      cout.form("\n\t  ");
-+      for (int i = 0; i < 4; i++) {
-+	cout << "   0x";
-+	cout << hex << m_regsWorking[i + (j * 4)];
-+      }
-+      cout << "\n\t  ";
-     }
--  cout.form("\n");
-+  cout << "\n";
-   
--  cout.form("DIn reg = 0x%08X    DOut reg = 0x%08X\n",
--	    m_regDataIn, m_regDataOut);
-+  cout << "DIn reg = 0x";
-+  cout << hex << m_regDataIn;
-+  cout << "    DOut reg = 0x",
-+  cout << hex << m_regDataOut;
-+  cout << "\n";
-+  cout << dec;
- 
--  cout.form("-------------------------------------------------------------------------------\n");
-+  cout << "-------------------------------------------------------------------------------\n";
- }
- 
- 
diff --git a/emulators/swarm/patches/patch-ah b/emulators/swarm/patches/patch-ah
deleted file mode 100644
index 36a8add64a5..00000000000
--- a/emulators/swarm/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2005/11/03 21:51:57 rillig Exp $
-
---- src/armproc.h	2004/08/12 18:45:56	1.1
-+++ src/armproc.h	2004/08/12 18:46:08
-@@ -29,7 +29,7 @@
- #include "core.h"
- #include "cache.h"
- #include "swi.h"
--#include <iostream.h>
-+#include <iostream>
- #include "copro.h"
- 
- #include "ostimer.h"
-@@ -37,6 +37,8 @@
- #include "lcdctrl.h"
- #include "uartctrl.h"
- 
-+using namespace std;
-+
- enum PPROC {P_NORMAL, P_READING1, P_READING, P_WRITING1, P_INTWRITE};
- 
- typedef struct POTAG
diff --git a/emulators/swarm/patches/patch-ai b/emulators/swarm/patches/patch-ai
deleted file mode 100644
index 3c52ea6f61f..00000000000
--- a/emulators/swarm/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2005/11/03 21:51:57 rillig Exp $
-
---- src/alu.cpp	2004/08/12 18:49:18	1.1
-+++ src/alu.cpp	2004/08/12 18:49:37
-@@ -24,7 +24,9 @@
- 
- #include "swarm.h"
- #include "alu.h"
--#include <iostream.h>
-+#include <iostream>
-+
-+using namespace std;
- 
- #define CARRY_FROM(_a,_b,_r) ((_a >> 31) ? ((_b >> 31) | ((~_r) >> 31)) : ((_b >> 31) * ((~_r) >> 31)))
- 
diff --git a/emulators/swarm/patches/patch-aj b/emulators/swarm/patches/patch-aj
deleted file mode 100644
index b719fe18469..00000000000
--- a/emulators/swarm/patches/patch-aj
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2005/11/03 21:51:57 rillig Exp $
-
---- src/libc.cpp	2004/08/12 18:49:18	1.1
-+++ src/libc.cpp	2004/08/12 18:50:21
-@@ -31,12 +31,14 @@
- #endif
- #include <fcntl.h>
- 
--#include <iostream.h>
-+#include <iostream>
- #include <errno.h>
- #include <string.h>
- 
- #include "swi.h"
- 
-+using namespace std;
-+
- ///////////////////////////////////////////////////////////////////////////////
- // The gnuarm struct stat is in a different format to ours, so we need to 
- // get the data and then copy it field by field.
diff --git a/emulators/swarm/patches/patch-ak b/emulators/swarm/patches/patch-ak
deleted file mode 100644
index ed63f82cb9f..00000000000
--- a/emulators/swarm/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2005/12/09 12:10:09 joerg Exp $
-
---- bin/scripts/arch.orig	2005-12-09 11:57:36.000000000 +0000
-+++ bin/scripts/arch
-@@ -183,7 +183,7 @@ Linux)		case "$machine" in
- 		kbin=$bin
- 		k_version=$version;;
- 
--FreeBSD)	case "$machine" in
-+FreeBSD|DragonFly)	case "$machine" in
- 		i[3456]86)	arch=ix86; machine=$arch; bin=${machine}_freebsd;;
- 		*)		echo 1>&2 "Unknown $system machine $machine"; exit 3;;
- 		esac
diff --git a/emulators/tme/DESCR b/emulators/tme/DESCR
deleted file mode 100644
index a9ef0b235b8..00000000000
--- a/emulators/tme/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-The Machine Emulator, or tme, is a program that provides a general-
-purpose framework for computer emulation. The first machine that tme
-could emulate was the Sun 2/120, one of the first widely available Sun
-workstations.
diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile
deleted file mode 100644
index 482c850ed58..00000000000
--- a/emulators/tme/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2007/03/17 13:44:17 tsutsui Exp $
-#
-
-DISTNAME=		tme-0.4
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		http://theory.lcs.mit.edu/~fredette/tme/
-
-MAINTAINER=		skrll@NetBSD.org
-# Please do not assign PR's for this package to skrll.
-# Instead, assign them to the package author, fredette.
-
-HOMEPAGE=		http://theory.lcs.mit.edu/~fredette/tme/
-COMMENT=		The Machine Emulator
-
-USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake perl:run
-
-CONFIGURE_ARGS+=	--disable-debug
-CONFIGURE_ARGS+=	ac_cv_shiftmax_int8_t=8
-CONFIGURE_ARGS+=	ac_cv_shiftmax_int16_t=16
-CONFIGURE_ARGS+=	ac_cv_shiftmax_int32_t=32
-
-BUILDLINK_DEPMETHOD.libXt?=	build
-
-.include "../../devel/libltdl/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/tme/PLIST b/emulators/tme/PLIST
deleted file mode 100644
index 07e65e0f9b3..00000000000
--- a/emulators/tme/PLIST
+++ /dev/null
@@ -1,77 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/07/27 07:29:26 skrll Exp $
-bin/tme-sun-eeprom
-bin/tme-sun-idprom
-bin/tmesh
-include/tme/atomics.h
-include/tme/common.h
-include/tme/connection.h
-include/tme/element.h
-include/tme/generic/bus-device.h
-include/tme/generic/bus.h
-include/tme/generic/disk.h
-include/tme/generic/ethernet.h
-include/tme/generic/fb.h
-include/tme/generic/float.h
-include/tme/generic/ic.h
-include/tme/generic/keyboard.h
-include/tme/generic/mouse.h
-include/tme/generic/scsi.h
-include/tme/generic/serial.h
-include/tme/generic/tape.h
-include/tme/hash.h
-include/tme/ic/am9513.h
-include/tme/ic/i825x6.h
-include/tme/ic/ieee754-auto.h
-include/tme/ic/ieee754-ops-auto.h
-include/tme/ic/ieee754.h
-include/tme/ic/isil7170.h
-include/tme/ic/m68k.h
-include/tme/ic/mm58167.h
-include/tme/ic/z8530.h
-include/tme/log.h
-include/tme/machine/sun.h
-include/tme/misc.h
-include/tme/module.h
-include/tme/scsi/scsi-cdb.h
-include/tme/scsi/scsi-device.h
-include/tme/scsi/scsi-disk.h
-include/tme/scsi/scsi-msg.h
-include/tme/scsi/scsi-tape.h
-include/tme/threads.h
-include/tme/tme.h
-include/tme/tmesh.h
-lib/libtme-generic.la
-lib/libtme-ieee754.la
-lib/libtme.la
-lib/libtmesh.la
-lib/tme/libtme-machine-sun.la
-lib/tme/tme-plugins.txt
-lib/tme/tme_bus_multibus.la
-lib/tme/tme_generic.la
-lib/tme/tme_host_bsd.la
-lib/tme/tme_host_gtk.la
-lib/tme/tme_host_posix.la
-lib/tme/tme_ic_am9513.la
-lib/tme/tme_ic_i825x6.la
-lib/tme/tme_ic_isil7170.la
-lib/tme/tme_ic_m68k.la
-lib/tme/tme_ic_mm58167.la
-lib/tme/tme_ic_ncr5380.la
-lib/tme/tme_ic_z8530.la
-lib/tme/tme_machine_sun2.la
-lib/tme/tme_machine_sun3.la
-lib/tme/tme_scsi.la
-lib/tme/tme_serial_kb.la
-lib/tme/tmeconfig.h
-share/examples/tme/SUN2-MULTIBUS
-share/examples/tme/SUN3-CARRERA
-share/examples/tme/my-sun-macros.txt
-share/examples/tme/sun-keyboards.txt
-share/examples/tme/sun3-carrera-eeprom.txt
-@dirrm share/examples/tme
-@dirrm lib/tme
-@dirrm include/tme/scsi
-@dirrm include/tme/machine
-@dirrm include/tme/ic
-@dirrm include/tme/generic
-@dirrm include/tme
diff --git a/emulators/tme/distinfo b/emulators/tme/distinfo
deleted file mode 100644
index 86bc961502d..00000000000
--- a/emulators/tme/distinfo
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: distinfo,v 1.8 2007/03/17 14:36:42 tsutsui Exp $
-
-SHA1 (tme-0.4.tar.gz) = 7a1a2c6aa05527b11f81925e4931e7250f5be308
-RMD160 (tme-0.4.tar.gz) = a5b5ac56c8247f94cd96c92a04a6cb132ba92931
-Size (tme-0.4.tar.gz) = 1448981 bytes
-SHA1 (patch-aa) = 0fe6c37472caa876c253b9e8bb4e09cd278e5def
-SHA1 (patch-ab) = ffadbe0a97737fb8c04913781c78b09f6ddc649b
-SHA1 (patch-ac) = 94940e5f0a99c4c1e4e718ffc35fbb2117bceb21
-SHA1 (patch-ad) = 3f5adbaa94e5b97ded14e9a05cce912ed01f406f
-SHA1 (patch-ae) = 2f472a55f5afd1c0079349ce49bd3eb251ea9d76
-SHA1 (patch-af) = 17bf5f0a52036b50533fdfb9f2b6d74ea9494186
-SHA1 (patch-ag) = 9b88bc76c34320e63f7aa4fda6804b7b2c432c5c
-SHA1 (patch-ah) = c33a0dd4353aac9d7c01a0c9d5d54e5813e8382d
-SHA1 (patch-ai) = 6f6be39f73542ef128824aaa969fa9e793c478a5
-SHA1 (patch-aj) = 63c804457fae8a3527532e5d6b1ab09a377d41e4
-SHA1 (patch-ak) = 29ededa7be17a570be7d5f38b9536ff725ece5dc
-SHA1 (patch-al) = b36aecb7f3a89d80be4631bebaa3f3230ce7c8e7
-SHA1 (patch-am) = 2c216b3549ad02a81ba829e43dfa46dcd0525e24
-SHA1 (patch-an) = c6317d655348bb679f1ea6eef79e8743f3eb0158
-SHA1 (patch-ap) = 91d7b00791f90666728f85ebb940cbc2a75da2af
-SHA1 (patch-aq) = c426d9576b2d6f460a7b290e9f3be69c98e1dfef
-SHA1 (patch-ar) = 5d01194d1b3516ae387e21e54c861f6b5ec9e28e
-SHA1 (patch-aw) = fed1d90d936eac53dbe5be9a505bd7171768cc37
-SHA1 (patch-ax) = b8f16847326e3599df4d73d1108f6815a9c46164
-SHA1 (patch-az) = ab4a4164b880ed1716e7fed0e269b40c85515973
-SHA1 (patch-ba) = 22a47dfbf0c494916e4e8f15aa1fc11b687feaa8
-SHA1 (patch-bb) = 6f98e9456581676e380c2724937a7fbcbf660c2b
-SHA1 (patch-bc) = 52253ad742a4f1dd4c437cd7f8df3c9815483390
-SHA1 (patch-bd) = 69d00319ef82c1b274f56a61b5aa23a3770f5012
-SHA1 (patch-be) = b22f599b6c156f404f0d011cb692bb14bf8363e7
diff --git a/emulators/tme/patches/patch-aa b/emulators/tme/patches/patch-aa
deleted file mode 100644
index f1523dd5c06..00000000000
--- a/emulators/tme/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/12/05 20:50:12 rillig Exp $
-
---- tme/threads.h.orig	2003-06-27 21:09:10.000000000 +0000
-+++ tme/threads.h
-@@ -41,6 +41,7 @@
- 
- /* includes: */
- #include <errno.h>
-+#include <sys/time.h>
- 
- /* note that our locking model never allows recursive locking. */
- 
diff --git a/emulators/tme/patches/patch-ab b/emulators/tme/patches/patch-ab
deleted file mode 100644
index 67e58c2a15d..00000000000
--- a/emulators/tme/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2007/03/17 13:44:18 tsutsui Exp $
-
---- ic/i825x6.c.orig	2007-01-24 12:56:18.000000000 +0000
-+++ ic/i825x6.c
-@@ -122,11 +122,19 @@ do {					\
- /* an rx buffer: */
- struct tme_i825x6_rx_buffer {
- 
--  /* the generic ethernet frame chunk.  this must be first, since we
--     abuse its tme_ethernet_frame_chunk_next for our own next pointer: */
--  struct tme_ethernet_frame_chunk tme_i825x6_rx_buffer_frame_chunk;
-+  union {
-+     struct tme_i825x6_rx_buffer *rx_buffer_next;
-+
-+    /* the generic ethernet frame chunk.  this must be first, since we
-+       abuse its tme_ethernet_frame_chunk_next for our own next pointer: */
-+     struct tme_ethernet_frame_chunk buffer_frame_chunk;
-+  } rx_un;
-+
-+#define tme_i825x6_rx_buffer_next rx_un.rx_buffer_next
-+#define tme_i825x6_rx_buffer_frame_chunk rx_un.buffer_frame_chunk
-+
- #define TME_I825X6_RX_BUFFER_NEXT(rx_buffer) \
--  (*((struct tme_i825x6_rx_buffer **) &(rx_buffer)->tme_i825x6_rx_buffer_frame_chunk.tme_ethernet_frame_chunk_next))
-+  (rx_buffer->tme_i825x6_rx_buffer_next)
- 
-   /* when this is TME_I825X6_RU_ADDRESS_UNDEF, this rx buffer was made
-      from a fast-write TLB entry, and the generic ethernet frame chunk
diff --git a/emulators/tme/patches/patch-ac b/emulators/tme/patches/patch-ac
deleted file mode 100644
index f4a887b21d2..00000000000
--- a/emulators/tme/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2007/03/17 13:44:18 tsutsui Exp $
-
---- libtme/module.c.orig	2005-01-26 21:59:24.000000000 +0900
-+++ libtme/module.c	2006-07-29 14:41:36.000000000 +0900
-@@ -214,7 +214,7 @@
-   char *modules_dir;
-   char line_buffer[1024];
-   char **tokens;
--  unsigned int tokens_count;
-+  int tokens_count;
-   char *module_basename;
-   char *module_pathname;
-   lt_dlhandle handle;
-@@ -230,7 +230,7 @@
-   for (p1 = module_raw_name;
-        (c = *p1) != '\0';
-        p1++) {
--    if (!isalnum(c)) {
-+    if (!isalnum((unsigned char)c)) {
-       *p1 = '_';
-       if (c == '/'
- 	  && first_slash == NULL) {
diff --git a/emulators/tme/patches/patch-ad b/emulators/tme/patches/patch-ad
deleted file mode 100644
index 48837131cff..00000000000
--- a/emulators/tme/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/07/27 07:29:26 skrll Exp $
-
---- libtme/misc.c.orig	2004-05-11 12:03:47.000000000 +0000
-+++ libtme/misc.c
-@@ -83,7 +83,7 @@ tme_misc_tokenize(const char *string,
- 
-     /* if this is a token delimiter: */
-     if (c == '\0'
--	|| isspace(c)
-+	|| isspace((unsigned char)c)
- 	|| c == comment) {
- 
-       /* if we had been collecting a token, it's finished: */
-@@ -184,7 +184,7 @@ _tme_misc_number_parse(const char *strin
-   /* XXX parts of this might be ASCII-centric: */
- 
-   /* skip leading whitespace: */
--  for (; (c = *string) != '\0' && isspace(c); string++);
-+  for (; (c = *string) != '\0' && isspace((unsigned char)c); string++);
- 
-   /* check for a leading '-' or '+' character: */
-   if ((negative = (c == '-'))
diff --git a/emulators/tme/patches/patch-ae b/emulators/tme/patches/patch-ae
deleted file mode 100644
index f9e97abd07d..00000000000
--- a/emulators/tme/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/12/05 07:32:17 skrll Exp $
-
---- serial/serial-kb.c.orig	2003-10-16 03:48:25.000000000 +0100
-+++ serial/serial-kb.c
-@@ -966,7 +966,7 @@ TME_ELEMENT_X_NEW_DECL(tme_serial_,kb,ke
-       }
-       for (p1 = line_buffer;
- 	   ((c = *(p1++)) != '\0'
--	    && isspace(c)););
-+	    && isspace((unsigned char)c)););
-       if (c == '\0'
- 	  || c == '#') {
- 	continue;
-@@ -1049,7 +1049,7 @@ TME_ELEMENT_X_NEW_DECL(tme_serial_,kb,ke
-     }
-     for (p1 = line_buffer;
- 	 ((c = *(p1++)) != '\0'
--	  && isspace(c)););
-+	  && isspace((unsigned char)c)););
-     if (c == '\0'
- 	|| c == '#') {
-       continue;
diff --git a/emulators/tme/patches/patch-af b/emulators/tme/patches/patch-af
deleted file mode 100644
index 494c1169e81..00000000000
--- a/emulators/tme/patches/patch-af
+++ /dev/null
@@ -1,101 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/09/24 15:20:28 joerg Exp $
-
---- libltdl/configure.orig	2006-09-24 16:19:12.000000000 +0000
-+++ libltdl/configure
-@@ -3518,13 +3518,13 @@ darwin* | rhapsody*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (DragonFly|FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-@@ -7289,7 +7289,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
-+    freebsd* | dragonfly*)
-       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-@@ -7922,7 +7922,7 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -10086,7 +10086,7 @@ if test -z "$aix_libpath"; then aix_libp
-   freebsd-elf*)
-     archive_cmds_need_lc_CXX=no
-     ;;
--  freebsd*)
-+  freebsd* | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     ld_shlibs_CXX=yes
-@@ -10793,7 +10793,7 @@ echo $ECHO_N "checking for $compiler opt
- 	    ;;
- 	esac
- 	;;
--      freebsd*)
-+      freebsd* | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
-@@ -11462,7 +11462,7 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -13806,7 +13806,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
-+    freebsd* | dragonfly*)
-       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_F77='-R$libdir'
-       hardcode_direct_F77=yes
-@@ -14439,7 +14439,7 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -16067,7 +16067,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
-+    freebsd* | dragonfly*)
-       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_GCJ='-R$libdir'
-       hardcode_direct_GCJ=yes
-@@ -16700,7 +16700,7 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
diff --git a/emulators/tme/patches/patch-ag b/emulators/tme/patches/patch-ag
deleted file mode 100644
index 784164624dc..00000000000
--- a/emulators/tme/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/09/24 15:20:28 joerg Exp $
-
---- ic/ieee754/ieee754-misc-auto.sh.orig	2005-05-11 00:13:33.000000000 +0000
-+++ ic/ieee754/ieee754-misc-auto.sh
-@@ -473,7 +473,10 @@ tme_ieee754_${precision}_value_from_buil
-   tme_uint32_t chunk;
- 
-   /* x must not be a NaN or an infinity: */
--#if (TME_FLOAT_FORMAT_IEEE754_${capprecision}_BUILTIN == TME_FLOAT_FORMAT_FLOAT)
-+#if defined(isnan) && defined(__DragonFly__)
-+  assert (!isnan(x_builtin));
-+  assert (!isinf(x_builtin));
-+#elif (TME_FLOAT_FORMAT_IEEE754_${capprecision}_BUILTIN == TME_FLOAT_FORMAT_FLOAT)
-   assert (!isnanf(x_builtin));
-   assert (!isinff(x_builtin));
- #elif (TME_FLOAT_FORMAT_IEEE754_${capprecision}_BUILTIN == TME_FLOAT_FORMAT_DOUBLE)
diff --git a/emulators/tme/patches/patch-ah b/emulators/tme/patches/patch-ah
deleted file mode 100644
index 99b66ad34b9..00000000000
--- a/emulators/tme/patches/patch-ah
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/09/24 15:20:28 joerg Exp $
-
---- tme/generic/float.h.orig	2006-09-24 16:50:59.000000000 +0000
-+++ tme/generic/float.h
-@@ -334,6 +334,27 @@ tme_float_assert_formats(_tme_const stru
-    | (x)->tme_float_value_ieee754_quad.tme_float_ieee754_quad_lo.tme_value64_uint32_lo)
- 
- /* this evaluates to nonzero if the float is a NaN: */
-+#if defined(isnan) && defined(__DragonFly__)
-+#define tme_float_is_nan(x, formats) \
-+  (tme_float_assert_formats(x, formats) \
-+   && (tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_SINGLE) \
-+       ? (tme_float_value_ieee754_exponent_single(x) == 0xff \
-+	  && tme_float_value_ieee754_fracor_single(x) != 0) \
-+       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_DOUBLE) \
-+       ? (tme_float_value_ieee754_exponent_double(x) == 0x7ff \
-+	  && tme_float_value_ieee754_fracor_double(x) != 0) \
-+       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_EXTENDED80) \
-+       ? (tme_float_value_ieee754_exponent_extended80(x) == 0x7fff \
-+	  && tme_float_value_ieee754_fracor_extended80(x) != 0) \
-+       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_QUAD) \
-+       ? (tme_float_value_ieee754_exponent_quad(x) == 0x7fff \
-+	  && tme_float_value_ieee754_fracor_quad(x) != 0) \
-+       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_FLOAT) \
-+       ? isnan((x)->tme_float_value_float) \
-+       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_DOUBLE) \
-+       ? isnan((x)->tme_float_value_double) \
-+       : TME_FLOAT_IF_LONG_DOUBLE(isnan((x)->tme_float_value_long_double) ||) FALSE))
-+#else
- #define tme_float_is_nan(x, formats) \
-   (tme_float_assert_formats(x, formats) \
-    && (tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_SINGLE) \
-@@ -353,8 +374,30 @@ tme_float_assert_formats(_tme_const stru
-        : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_DOUBLE) \
-        ? isnan((x)->tme_float_value_double) \
-        : TME_FLOAT_IF_LONG_DOUBLE(isnan((x)->tme_float_value_long_double) ||) FALSE))
-+#endif
- 
- /* this evaluates to nonzero if the float is an infinity: */
-+#if defined(isinf) && defined(__DragonFly__)
-+#define tme_float_is_inf(x, formats) \
-+  (tme_float_assert_formats(x, formats) \
-+   && (tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_SINGLE) \
-+       ? (tme_float_value_ieee754_exponent_single(x) == 0xff \
-+	  && tme_float_value_ieee754_fracor_single(x) == 0) \
-+       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_DOUBLE) \
-+       ? (tme_float_value_ieee754_exponent_double(x) == 0x7ff \
-+	  && tme_float_value_ieee754_fracor_double(x) == 0) \
-+       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_EXTENDED80) \
-+       ? (tme_float_value_ieee754_exponent_extended80(x) == 0x7fff \
-+	  && tme_float_value_ieee754_fracor_extended80(x) == 0) \
-+       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_QUAD) \
-+       ? (tme_float_value_ieee754_exponent_quad(x) == 0x7fff \
-+	  && tme_float_value_ieee754_fracor_quad(x) == 0) \
-+       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_FLOAT) \
-+       ? isinf((x)->tme_float_value_float) \
-+       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_DOUBLE) \
-+       ? isinf((x)->tme_float_value_double) \
-+       : TME_FLOAT_IF_LONG_DOUBLE(isinf((x)->tme_float_value_long_double) ||) FALSE))
-+#else
- #define tme_float_is_inf(x, formats) \
-   (tme_float_assert_formats(x, formats) \
-    && (tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_SINGLE) \
-@@ -374,6 +417,7 @@ tme_float_assert_formats(_tme_const stru
-        : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_DOUBLE) \
-        ? isinf((x)->tme_float_value_double) \
-        : TME_FLOAT_IF_LONG_DOUBLE(isinf((x)->tme_float_value_long_double) ||) FALSE))
-+#endif
- 
- /* this evaluates to nonzero if the float is a zero: */
- #define tme_float_is_zero(x, formats) \
diff --git a/emulators/tme/patches/patch-ai b/emulators/tme/patches/patch-ai
deleted file mode 100644
index e0c536f9641..00000000000
--- a/emulators/tme/patches/patch-ai
+++ /dev/null
@@ -1,242 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2007/03/17 13:44:18 tsutsui Exp $
-
---- bus/multibus/Makefile.in.orig	2005-05-15 10:26:15.000000000 +0900
-+++ bus/multibus/Makefile.in	2006-07-29 14:32:31.000000000 +0900
-@@ -221,9 +221,10 @@
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/3c400.Plo ./$(DEPDIR)/sun-mie.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/sun-sc.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_NO_STRICT_ALIASING)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
--	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-+	$(CFLAGS_NO_STRICT_ALIASING)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
---- generic/Makefile.in.orig	2005-05-15 10:26:16.000000000 +0900
-+++ generic/Makefile.in	2006-07-29 14:30:19.000000000 +0900
-@@ -247,9 +247,10 @@
- @AMDEP_TRUE@	./$(DEPDIR)/scsi.Plo ./$(DEPDIR)/serial.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/tape.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_NO_STRICT_ALIASING)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
--	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-+	$(CFLAGS_NO_STRICT_ALIASING)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
---- host/bsd/Makefile.in.orig	2005-05-15 10:26:17.000000000 +0900
-+++ host/bsd/Makefile.in	2006-07-29 14:32:41.000000000 +0900
-@@ -217,9 +217,10 @@
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bsd-bpf.Plo ./$(DEPDIR)/bsd-if.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_NO_STRICT_ALIASING)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
--	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-+	$(CFLAGS_NO_STRICT_ALIASING)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
---- host/gtk/Makefile.in.orig	2005-05-15 10:26:17.000000000 +0900
-+++ host/gtk/Makefile.in	2006-07-29 14:32:52.000000000 +0900
-@@ -221,9 +221,10 @@
- @AMDEP_TRUE@	./$(DEPDIR)/gtk-mouse.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/gtk-screen.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_NO_STRICT_ALIASING)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
--	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-+	$(CFLAGS_NO_STRICT_ALIASING)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
---- host/posix/Makefile.in.orig	2005-05-15 10:26:18.000000000 +0900
-+++ host/posix/Makefile.in	2006-07-29 14:33:04.000000000 +0900
-@@ -225,9 +225,10 @@
- @AMDEP_TRUE@	./$(DEPDIR)/posix-serial.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/posix-tape.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_NO_STRICT_ALIASING)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
--	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-+	$(CFLAGS_NO_STRICT_ALIASING)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
---- ic/Makefile.in.orig	2005-05-15 10:26:19.000000000 +0900
-+++ ic/Makefile.in	2006-07-29 14:30:51.000000000 +0900
-@@ -280,9 +280,10 @@
- @AMDEP_TRUE@	./$(DEPDIR)/isil7170.Plo ./$(DEPDIR)/mm58167.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/ncr5380.Plo ./$(DEPDIR)/z8530.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_NO_STRICT_ALIASING)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
--	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-+	$(CFLAGS_NO_STRICT_ALIASING)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
---- ic/ieee754/Makefile.in.orig	2005-05-15 10:26:19.000000000 +0900
-+++ ic/ieee754/Makefile.in	2006-07-29 14:33:17.000000000 +0900
-@@ -190,9 +190,10 @@
- @AMDEP_TRUE@	./$(DEPDIR)/ieee754-ops-auto.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/softfloat-tme.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_NO_STRICT_ALIASING)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
--	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-+	$(CFLAGS_NO_STRICT_ALIASING)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
---- ic/m68k/Makefile.in.orig	2005-05-15 10:26:20.000000000 +0900
-+++ ic/m68k/Makefile.in	2006-07-29 14:33:27.000000000 +0900
-@@ -241,9 +241,10 @@
- @AMDEP_TRUE@	./$(DEPDIR)/m68k-misc.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/m68k-opmap.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_NO_STRICT_ALIASING)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
--	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-+	$(CFLAGS_NO_STRICT_ALIASING)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
---- libltdl/Makefile.in.orig	2003-05-14 11:33:05.000000000 +0900
-+++ libltdl/Makefile.in	2006-07-29 14:31:04.000000000 +0900
-@@ -177,9 +177,10 @@
- depcomp =
- am__depfiles_maybe =
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_NO_STRICT_ALIASING)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
--	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-+	$(CFLAGS_NO_STRICT_ALIASING)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
---- libtme/Makefile.in.orig	2005-05-15 10:26:20.000000000 +0900
-+++ libtme/Makefile.in	2006-07-29 14:31:20.000000000 +0900
-@@ -195,9 +195,10 @@
- @AMDEP_TRUE@	./$(DEPDIR)/misc.Plo ./$(DEPDIR)/module.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/threads-sjlj.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_NO_STRICT_ALIASING)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
--	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-+	$(CFLAGS_NO_STRICT_ALIASING)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-
---- machine/sun/Makefile.in.orig	2005-05-15 10:26:22.000000000 +0900
-+++ machine/sun/Makefile.in	2006-07-29 14:33:37.000000000 +0900
-@@ -205,9 +205,10 @@
- @AMDEP_TRUE@	./$(DEPDIR)/sun-mmu.Plo ./$(DEPDIR)/sun-obie.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/sun-si.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_NO_STRICT_ALIASING)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
--	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-+	$(CFLAGS_NO_STRICT_ALIASING)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+++ machine/sun2/Makefile.in	2006-07-29 14:33:45.000000000 +0900
-@@ -230,9 +230,10 @@
- @AMDEP_TRUE@	./$(DEPDIR)/sun2-mainbus.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/sun2-mmu.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_NO_STRICT_ALIASING)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
--	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-+	$(CFLAGS_NO_STRICT_ALIASING)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
---- machine/sun3/Makefile.in.orig	2005-05-15 10:26:23.000000000 +0900
-+++ machine/sun3/Makefile.in	2006-07-29 14:33:54.000000000 +0900
-@@ -230,9 +230,10 @@
- @AMDEP_TRUE@	./$(DEPDIR)/sun3-mainbus.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/sun3-mmu.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_NO_STRICT_ALIASING)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
--	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-+	$(CFLAGS_NO_STRICT_ALIASING)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
---- scsi/Makefile.in.orig	2005-05-15 10:26:23.000000000 +0900
-+++ scsi/Makefile.in	2006-07-29 14:31:42.000000000 +0900
-@@ -235,9 +235,10 @@
- @AMDEP_TRUE@	./$(DEPDIR)/scsi-disk.Plo ./$(DEPDIR)/scsi-msg.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/scsi-tape.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_NO_STRICT_ALIASING)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
--	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-+	$(CFLAGS_NO_STRICT_ALIASING)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
---- serial/Makefile.in.orig	2005-05-15 10:26:24.000000000 +0900
-+++ serial/Makefile.in	2006-07-29 14:31:54.000000000 +0900
-@@ -228,9 +228,10 @@
- @AMDEP_TRUE@	./$(DEPDIR)/ms-mssystems.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/serial-kb.Plo ./$(DEPDIR)/serial-ms.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_NO_STRICT_ALIASING)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
--	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-+	$(CFLAGS_NO_STRICT_ALIASING)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
---- tmesh/Makefile.in.orig	2005-05-15 10:26:27.000000000 +0900
-+++ tmesh/Makefile.in	2006-07-29 14:32:10.000000000 +0900
-@@ -200,9 +200,10 @@
- @AMDEP_TRUE@	./$(DEPDIR)/tmesh-input.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/tmesh-util.Plo ./$(DEPDIR)/tmesh.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_NO_STRICT_ALIASING)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
--	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-+	$(CFLAGS_NO_STRICT_ALIASING)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/emulators/tme/patches/patch-aj b/emulators/tme/patches/patch-aj
deleted file mode 100644
index bdef2ca3613..00000000000
--- a/emulators/tme/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2007/03/17 13:44:18 tsutsui Exp $
-
---- dist/softfloat/softfloat/bits64/softfloat.c.orig	2005-05-11 09:06:30.000000000 +0900
-+++ dist/softfloat/softfloat/bits64/softfloat.c	2007-01-07 22:08:03.000000000 +0900
-@@ -4909,7 +4909,7 @@
-         sub128( aSig0, aSig1, bSig0, bSig1, &aSig0, &aSig1 );

-     } while ( 0 <= (sbits64) aSig0 );

-     add128(

--        aSig0, aSig1, alternateASig0, alternateASig1, &sigMean0, &sigMean1 );

-+        aSig0, aSig1, alternateASig0, alternateASig1, (bits64 *)&sigMean0, &sigMean1 );

-     if (    ( sigMean0 < 0 )

-          || ( ( ( sigMean0 | sigMean1 ) == 0 ) && ( q & 1 ) ) ) {

-         aSig0 = alternateASig0;

diff --git a/emulators/tme/patches/patch-ak b/emulators/tme/patches/patch-ak
deleted file mode 100644
index bb589ed0b26..00000000000
--- a/emulators/tme/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2007/03/17 13:44:18 tsutsui Exp $
-
---- scsi/scsi-cdb.c.orig	2004-12-06 12:40:33.000000000 +0900
-+++ scsi/scsi-cdb.c	2006-07-29 15:14:52.000000000 +0900
-@@ -187,7 +187,7 @@
- /* this adds one of the inquiry strings to the data: */
- static tme_uint8_t *
- _tme_scsi_device_make_inquiry_string(tme_uint8_t *data,
--				     const tme_uint8_t *string,
-+				     char *string,
- 				     unsigned int size)
- {
-   tme_uint8_t c;
diff --git a/emulators/tme/patches/patch-al b/emulators/tme/patches/patch-al
deleted file mode 100644
index 1a1f57ce02d..00000000000
--- a/emulators/tme/patches/patch-al
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-al,v 1.1 2007/03/17 13:44:18 tsutsui Exp $
-
---- host/gtk/gtk-mouse.c.orig	2003-07-31 10:41:48.000000000 +0900
-+++ host/gtk/gtk-mouse.c	2006-07-29 15:04:20.000000000 +0900
-@@ -312,8 +312,8 @@
-   gdk_window_get_geometry(screen->tme_gtk_screen_gtkimage->window,
- 			  &junk,
- 			  &junk,
--			  &screen->tme_gtk_screen_mouse_warp_x,
--			  &screen->tme_gtk_screen_mouse_warp_y,
-+			  (gint *)&screen->tme_gtk_screen_mouse_warp_x,
-+			  (gint *)&screen->tme_gtk_screen_mouse_warp_y,
- 			  &junk);
-   screen->tme_gtk_screen_mouse_warp_x >>= 1;
-   screen->tme_gtk_screen_mouse_warp_y >>= 1;
-@@ -626,12 +626,12 @@
-   /* create the mouse cursor: */
-   source
-     = gdk_bitmap_create_from_data(NULL,
--				  _tme_gtk_mouse_cursor_source,
-+				  (const gchar *)_tme_gtk_mouse_cursor_source,
- 				  TME_GTK_MOUSE_CURSOR_WIDTH,
- 				  TME_GTK_MOUSE_CURSOR_HEIGHT);
-   mask
-     = gdk_bitmap_create_from_data (NULL,
--				   _tme_gtk_mouse_cursor_mask,
-+				   (const gchar *)_tme_gtk_mouse_cursor_mask,
- 				   TME_GTK_MOUSE_CURSOR_WIDTH,
- 				   TME_GTK_MOUSE_CURSOR_HEIGHT);
-   display->tme_gtk_display_mouse_cursor
diff --git a/emulators/tme/patches/patch-am b/emulators/tme/patches/patch-am
deleted file mode 100644
index 2c630de6059..00000000000
--- a/emulators/tme/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2007/03/17 13:44:18 tsutsui Exp $
-
---- ic/m68k/m68k-bus-auto.c.orig	2005-03-23 11:24:55.000000000 +0900
-+++ ic/m68k/m68k-bus-auto.c	2006-07-29 14:46:47.000000000 +0900
-@@ -156,7 +156,7 @@
- };
- 
- /* the 32-bit bus router used on the 68020 and 68030: */
--static const tme_bus_lane_t tme_m68k_router_32[TME_M68K_BUS_ROUTER_SIZE(TME_BUS32_LOG2)] = {
-+const tme_bus_lane_t tme_m68k_router_32[TME_M68K_BUS_ROUTER_SIZE(TME_BUS32_LOG2)] = {
- 
-   /* [m68k] initiator maximum cycle size: 8 bits
-      [m68k] initiator A1,A0: 00
diff --git a/emulators/tme/patches/patch-an b/emulators/tme/patches/patch-an
deleted file mode 100644
index eaea60ac50f..00000000000
--- a/emulators/tme/patches/patch-an
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-an,v 1.1 2007/03/17 13:44:19 tsutsui Exp $
-
---- machine/sun/sun-si.c.orig	2005-02-17 21:19:17.000000000 +0900
-+++ machine/sun/sun-si.c	2006-07-29 14:59:24.000000000 +0900
-@@ -475,7 +475,6 @@
-   tme_uint32_t csr_old, csr_new, csr_diff, csr_mask;
-   tme_bus_addr_t address;
-   tme_uint8_t cycle_size;
--  tme_uint32_t csr;
-   tme_uint32_t dma_count;
-   int new_callouts;
- 
-@@ -561,7 +560,7 @@
-       case TME_SUN_SI_TYPE_VME:
- 	TME_SUN_SI_REG16_PUT(sun_si, TME_SUN_SI_REG_FIFO_COUNT_L, 0);
- 	TME_SUN_SI_REG16_PUT(sun_si, TME_SUN_SI_REG_VME_FIFO_COUNT_H, 0);
--	csr &= ~TME_SUN_SI_CSR_VME_LOB_MASK;
-+	csr_new &= ~TME_SUN_SI_CSR_VME_LOB_MASK;
- 	break;
-       case TME_SUN_SI_TYPE_COBRA:
- 	abort();
-@@ -1428,7 +1427,7 @@
-   sun_si = tme_new0(struct tme_sun_si, 1);
-   sun_si->tme_sun_si_type = si_type;
-   sun_si->tme_sun_si_3e_dma = (si_type == TME_SUN_SI_TYPE_3E
--			       ? tme_new(char, TME_SUN_SI_3E_SIZ_DMA)
-+			       ? tme_new(unsigned char, TME_SUN_SI_3E_SIZ_DMA)
- 			       : NULL);
-   sun_si->tme_sun_si_element = element;
-   TME_SUN_SI_CSR_PUT(sun_si,
diff --git a/emulators/tme/patches/patch-ap b/emulators/tme/patches/patch-ap
deleted file mode 100644
index f983a7f2c6c..00000000000
--- a/emulators/tme/patches/patch-ap
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2007/03/17 13:44:19 tsutsui Exp $
-
---- host/gtk/gtk-keyboard.c.orig	2006-10-19 10:39:26.000000000 -0400
-+++ host/gtk/gtk-keyboard.c	2006-10-19 10:39:50.000000000 -0400
-@@ -399,6 +399,7 @@
- 	= display->tme_gtk_display_keyboard_keysyms_bad;
- 
-       /* log the complaint: */
-+#ifndef NDEBUG
-       tme_log(&display->tme_gtk_display_element->tme_element_log_handle, 0, ENOENT,
- 	      (&display->tme_gtk_display_element->tme_element_log_handle,
- 	       _("cannot generate keysym '%s' directly%s"),
-@@ -407,6 +408,7 @@
- 		== TME_KEYBOARD_LOOKUP_FLAG_OK_DIRECT
- 		? ""
- 		: _(", or through a macro"))));
-+#endif
- 
-       /* free this record: */
-       display->tme_gtk_display_keyboard_keysyms_bad
diff --git a/emulators/tme/patches/patch-aq b/emulators/tme/patches/patch-aq
deleted file mode 100644
index f180e4d6fb3..00000000000
--- a/emulators/tme/patches/patch-aq
+++ /dev/null
@@ -1,169 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2007/03/17 13:44:19 tsutsui Exp $
-
---- ic/m68k/m68k-insns.c.orig	2005-03-23 20:53:02.000000000 +0900
-+++ ic/m68k/m68k-insns.c	2007-03-14 20:28:31.000000000 +0900
-@@ -485,9 +485,8 @@
- TME_M68K_INSN(tme_m68k_cmp2_chk2)
- {
-   tme_uint32_t ireg;
--  unsigned int size_bytes, size_name, size_ireg;
-+  unsigned int size_bytes, size_ireg;
-   tme_uint32_t uvalue, ulower, uupper;
--  tme_int32_t value, lower, upper;
- 
-   TME_M68K_INSN_CANFAULT;
- 
-@@ -495,60 +494,109 @@
-   ireg = TME_M68K_IREG_D0 + TME_FIELD_EXTRACTU(TME_M68K_INSN_SPECOP, 12, 4);
-   size_bytes = TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE, 9, 2);
-   size_ireg = 2 - size_bytes;
--  size_name = TME_M68K_SIZE_8 + size_bytes;
-+
-+  /* size comes back from cp2 instruction as:
-+     0 : byte
-+     1 : word
-+     2 : long
-+      we convert to
-+     0 : byte
-+     1 : word
-+     4 : long
-+  */
-   size_bytes = 1 << size_bytes;
- 
-   /* read in the two bounds: */
--  (*_tme_m68k_read_mem[size_name])(ic, TME_M68K_IREG_MEMX32 << size_ireg);
-+  (*_tme_m68k_read_mem[size_bytes])(ic, TME_M68K_IREG_MEMX32 << size_ireg);
-   if (!TME_M68K_SEQUENCE_RESTARTING) {
-     ic->_tme_m68k_ea_address += size_bytes;
-   }
--  (*_tme_m68k_read_mem[size_name])(ic, TME_M68K_IREG_MEMY32 << size_ireg);
-+  (*_tme_m68k_read_mem[size_bytes])(ic, TME_M68K_IREG_MEMY32 << size_ireg);
- 
--  /* if we have an address register, sign-extend the bounds to 32
--     bits: */
-+  /* if value is an address register, sign-extend the bounds to 32 bits,
-+     then set size of bounds and value to 32 bits (so we check entire
-+     longword value)
-+  */
-   if (ireg >= TME_M68K_IREG_A0) {
--    if (size_name == TME_M68K_SIZE_8) {
-+    if (size_bytes == TME_M68K_SIZE_8) {
-       ic->tme_m68k_ireg_int32(TME_M68K_IREG_MEMX32) = TME_EXT_S8_S32(ic->tme_m68k_ireg_int8(TME_M68K_IREG_MEMX8));
-       ic->tme_m68k_ireg_int32(TME_M68K_IREG_MEMY32) = TME_EXT_S8_S32(ic->tme_m68k_ireg_int8(TME_M68K_IREG_MEMY8));
-     }
--    else if (size_name == TME_M68K_SIZE_16) {
-+    else if (size_bytes == TME_M68K_SIZE_16) {
-       ic->tme_m68k_ireg_int32(TME_M68K_IREG_MEMX32) = TME_EXT_S16_S32(ic->tme_m68k_ireg_int16(TME_M68K_IREG_MEMX16));
-       ic->tme_m68k_ireg_int32(TME_M68K_IREG_MEMY32) = TME_EXT_S16_S32(ic->tme_m68k_ireg_int16(TME_M68K_IREG_MEMY16));
-     }
--    size_bytes = sizeof(tme_uint32_t);
--    size_name = TME_M68K_SIZE_32;
-+    size_bytes = TME_M68K_SIZE_32;
-   }
- 
--  /* get the values to check: */
--  switch (size_name) {
-+  /* get the bounds and value */
-+  switch (size_bytes) {
-   case TME_M68K_SIZE_8:
--    uvalue = ic->tme_m68k_ireg_uint8(ireg);
-     ulower = ic->tme_m68k_ireg_uint8(TME_M68K_IREG_MEMX8);
-     uupper = ic->tme_m68k_ireg_uint8(TME_M68K_IREG_MEMY8);
--    value = ic->tme_m68k_ireg_int8(ireg);
--    lower = ic->tme_m68k_ireg_int8(TME_M68K_IREG_MEMX8);
--    upper = ic->tme_m68k_ireg_int8(TME_M68K_IREG_MEMY8);
-+
-+    /* if value is a data register, read the entire register, extract
-+       the appropriate number of bytes, and sign extend to our own
-+       longword size for comparison.
-+       if value is an address register, just use the entire register as is 
-+    */
-+    if (ireg < TME_M68K_IREG_A0) 
-+      uvalue = (tme_uint32_t)TME_EXT_S8_S32
-+                     ((tme_int32_t)(ic->tme_m68k_ireg_uint32(ireg) & 0xFF));
-+    else
-+      uvalue = ic->tme_m68k_ireg_uint32(ireg);
-+
-     break;
-   case TME_M68K_SIZE_16:
--    uvalue = ic->tme_m68k_ireg_uint16(ireg);
-     ulower = ic->tme_m68k_ireg_uint16(TME_M68K_IREG_MEMX16);
-     uupper = ic->tme_m68k_ireg_uint16(TME_M68K_IREG_MEMY16);
--    value = ic->tme_m68k_ireg_int16(ireg);
--    lower = ic->tme_m68k_ireg_int16(TME_M68K_IREG_MEMX16);
--    upper = ic->tme_m68k_ireg_int16(TME_M68K_IREG_MEMY16);
-+
-+    /* if value is a data register, read the entire register, extract
-+       the appropriate number of bytes, and sign extend to our own
-+       longword size for comparison.
-+       if value is an address register, just use the entire register as is 
-+    */
-+    if (ireg < TME_M68K_IREG_A0) 
-+      uvalue = (tme_uint32_t)TME_EXT_S16_S32
-+                     ((tme_int32_t)(ic->tme_m68k_ireg_uint32(ireg) & 0xFFFF));
-+    else
-+      uvalue = ic->tme_m68k_ireg_uint32(ireg);
-+
-     break;
-   case TME_M68K_SIZE_32:
--    uvalue = ic->tme_m68k_ireg_uint32(ireg);
-     ulower = ic->tme_m68k_ireg_uint32(TME_M68K_IREG_MEMX32);
-     uupper = ic->tme_m68k_ireg_uint32(TME_M68K_IREG_MEMY32);
--    value = ic->tme_m68k_ireg_int32(ireg);
--    lower = ic->tme_m68k_ireg_int32(TME_M68K_IREG_MEMX32);
--    upper = ic->tme_m68k_ireg_int32(TME_M68K_IREG_MEMY32);
-+
-+    uvalue = ic->tme_m68k_ireg_uint32(ireg);
-+
-     break;
-   default: abort();
-   }
- 
-+  /* cmp2 / chk2 can be used for unsigned, or signed.
-+     for either type, the lower bound "should be" <= upper bound
-+     (per m68000 family programmer's reference manual)
-+
-+     cmp2 instruction doesn't know if signed or unsigned
-+     if bound   250 250   then bound is the one value, check unsigned or signed
-+
-+     if bound   253 255   could be unsigned 253 255
-+                                or signed    -3  -1
-+     either way, ok to check.
-+
-+     if bound   255   5   then only makes sense to check signed  -1  5
-+
-+     if bound   255 253   then doesn't make sense either way!
-+                          its either 255 253 unsigned or -1 -3 signed.
-+
-+     reverse engineering the code, by running many test cases shows that
-+     the motorola 68020 microcode does the following.
-+
-+     Always check unsigned.
-+     if low <= high, then out of bounds if either < low  or > high.
-+     if high > low,  then out of bounds if BOTH   < low AND > high.
-+  */
-+
-   /* do the comparison.  if the value is out-of-bounds and this is
-      a chk2 instruction, trap: */
-   ic->tme_m68k_ireg_ccr = (ic->tme_m68k_ireg_ccr & TME_M68K_FLAG_X);
-@@ -556,13 +604,14 @@
-       || uvalue == uupper) {
-     ic->tme_m68k_ireg_ccr |= TME_M68K_FLAG_Z;
-   }
--  else if ((ulower > uupper)
--	   /* signed comparison: */
--	   ? (value < lower || value > upper)
--	   /* unsigned comparison: */
--	   : (uvalue < ulower || uvalue > uupper)) {
-+  else if (((ulower <= uupper) && (uvalue < ulower || uvalue > uupper)) ||
-+           ((ulower >  uupper) && (uvalue < ulower && uvalue > uupper))) {
-     ic->tme_m68k_ireg_ccr |= TME_M68K_FLAG_C;
--    if (TME_M68K_INSN_OPCODE & TME_BIT(11)) {
-+
-+    /* if chk2 instruction,
-+          also cause a CHK instruction exception (vector number 6)
-+    */
-+    if (TME_FIELD_EXTRACTU(TME_M68K_INSN_SPECOP, 11, 1)) {
-       ic->tme_m68k_ireg_pc_last = ic->tme_m68k_ireg_pc;
-       ic->tme_m68k_ireg_pc = ic->tme_m68k_ireg_pc_next;
-       TME_M68K_INSN_EXCEPTION(TME_M68K_EXCEPTION_INST(TME_M68K_VECTOR_CHK));
diff --git a/emulators/tme/patches/patch-ar b/emulators/tme/patches/patch-ar
deleted file mode 100644
index f55af0f75aa..00000000000
--- a/emulators/tme/patches/patch-ar
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2007/03/17 13:44:19 tsutsui Exp $
-
---- ic/m68k/m68k-execute.c.orig	2006-10-01 08:23:58.000000000 -0400
-+++ ic/m68k/m68k-execute.c	2006-10-01 08:27:17.000000000 -0400
-@@ -591,6 +591,18 @@
- 	  _TME_M68K_EXECUTE_FETCH_S16(ea_bd);
- 	  /* XXX simulates preincremented pc: */
- 	  ea_address = ic->tme_m68k_ireg_pc + first_ea_extword_offset + ea_bd;
-+
-+          /* if instruction has immediate, then we need to add either 2 bytes
-+             (for byte or word) or 4 bytes (for lword) to get the effective
-+             address
-+          */
-+          if (TME_M68K_OPCODE_HAS_IMM(params)) {
-+            if (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,6,2) == 2)
-+              ea_address = ea_address + 4;
-+            else
-+              ea_address = ea_address + 2;
-+          }
-+
- 	  ea_function_code = function_code_program;
- 	  break;
- 	}
diff --git a/emulators/tme/patches/patch-aw b/emulators/tme/patches/patch-aw
deleted file mode 100644
index 1489dac125f..00000000000
--- a/emulators/tme/patches/patch-aw
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2007/03/17 13:44:19 tsutsui Exp $
-
---- host/posix/posix-serial.c.orig	2006-11-07 06:29:39.000000000 -0500
-+++ host/posix/posix-serial.c	2006-11-07 08:23:59.000000000 -0500
-@@ -839,6 +839,8 @@
-   int saved_errno;
-   int emulate_break;
- 
-+  int ignore_fd_in = FALSE;
-+
-   /* initialize: */
-   filename_in = NULL;
-   filename_out = NULL;
-@@ -915,24 +917,32 @@
- 
-   /* open the devices: */
-   fd_in = fd_out = -1;
--  if (fd_in < 0
--      && !strcmp(filename_in, "-")) {
--    fd_in = STDIN_FILENO;
-+
-+  ignore_fd_in = (strcmp(filename_in,"NONE") == 0);
-+
-+  if (!ignore_fd_in) {
-+    if (fd_in < 0
-+        && !strcmp(filename_in, "-")) {
-+      fd_in = STDIN_FILENO;
-+    }
-   }
-   if (fd_out < 0
-       && !strcmp(filename_out, "-")) {
-     fd_out = STDOUT_FILENO;
-   }
--  if (fd_in < 0) {
--    if (strcmp(filename_in, filename_out) == 0) {
--      fd_in = fd_out = open(filename_in, O_RDWR | O_NONBLOCK);
--    }
--    else {
--      fd_in = open(filename_in, O_RDONLY | O_NONBLOCK);
--    }
-+
-+  if (!ignore_fd_in) {
-     if (fd_in < 0) {
--      tme_output_append_error(_output, "%s", filename_in);
--      return (errno);
-+      if (strcmp(filename_in, filename_out) == 0) {
-+        fd_in = fd_out = open(filename_in, O_RDWR | O_NONBLOCK);
-+      }
-+      else {
-+        fd_in = open(filename_in, O_RDONLY | O_NONBLOCK);
-+      }
-+      if (fd_in < 0) {
-+        tme_output_append_error(_output, "%s", filename_in);
-+        return (errno);
-+      }
-     }
-   }
-   if (fd_out < 0) {
-@@ -962,7 +972,11 @@
-   tme_mutex_init(&serial->tme_posix_serial_mutex);
-   tme_cond_init(&serial->tme_posix_serial_cond_writer);
-   tme_thread_create((tme_thread_t) _tme_posix_serial_th_writer, serial);
--  tme_thread_create((tme_thread_t) _tme_posix_serial_th_reader, serial);
-+
-+  if (!ignore_fd_in) {
-+    tme_thread_create((tme_thread_t) _tme_posix_serial_th_reader, serial);
-+  }
-+
-   tme_thread_create((tme_thread_t) _tme_posix_serial_th_ctrl, serial);
- 
-   /* fill the element: */
---- libtme/threads-sjlj.c.orig	2006-11-07 06:50:22.000000000 -0500
-+++ libtme/threads-sjlj.c	2006-11-07 07:54:07.000000000 -0500
-@@ -833,7 +833,9 @@
-       if (fd_condition_new != 0) {
- 
- 	/* this thread is now blocking on this fd: */
--	assert(tme_sjlj_fd_thread[fd] == NULL);
-+
-+        /* assert if this fd is already used - unless its stdin */
-+	assert(tme_sjlj_fd_thread[fd] == NULL || fd == STDIN_FILENO);
- 	tme_sjlj_fd_thread[fd] = thread;
- 
- #ifdef HAVE_GTK
diff --git a/emulators/tme/patches/patch-ax b/emulators/tme/patches/patch-ax
deleted file mode 100644
index b57b1eff3a6..00000000000
--- a/emulators/tme/patches/patch-ax
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2007/03/17 13:44:19 tsutsui Exp $
-
---- host/bsd/bsd-bpf.c.orig	2007-03-14 20:49:03.000000000 +0900
-+++ host/bsd/bsd-bpf.c	2007-03-14 20:51:14.000000000 +0900
-@@ -694,6 +701,14 @@
- 		  < the_bpf_header.bh_tstamp.tv_usec))) {
- 
- 	/* set the sleep time: */
-+
-+	/* if asserting, print likely description first */
-+	if (! ((bpf->tme_bsd_bpf_delay_release.tv_sec
-+		 == the_bpf_header.bh_tstamp.tv_sec)
-+		|| ((bpf->tme_bsd_bpf_delay_release.tv_sec + 1)
-+		    == the_bpf_header.bh_tstamp.tv_sec))) {
-+	  printf("someone started a second tmesh without this tmesh first configuring ie0\n");
-+	}
- 	assert ((bpf->tme_bsd_bpf_delay_release.tv_sec
- 		 == the_bpf_header.bh_tstamp.tv_sec)
- 		|| ((bpf->tme_bsd_bpf_delay_release.tv_sec + 1)
diff --git a/emulators/tme/patches/patch-az b/emulators/tme/patches/patch-az
deleted file mode 100644
index cec0cdb38cd..00000000000
--- a/emulators/tme/patches/patch-az
+++ /dev/null
@@ -1,343 +0,0 @@
-$NetBSD: patch-az,v 1.1 2007/03/17 13:44:19 tsutsui Exp $
-
---- ic/i825x6.c.orig	2007-03-15 20:29:47.000000000 +0900
-+++ ic/i825x6.c	2007-03-17 22:07:48.000000000 +0900
-@@ -809,6 +809,9 @@
- 	 | TME_I825X6_SCB_CUS_IDLE
- 	 | TME_I825X6_SCB_RUS_IDLE);
-     
-+    /* clears the SCB command word": */
-+    /* [this is done at end of this routine] */
-+
-     /* "The 82596 ... sends an interrupt to the CPU": */
-     i825x6->tme_i825x6_callout_flags = TME_I825X6_CALLOUTS_RUNNING | TME_I825X6_CALLOUT_INT;
-   }
-@@ -1258,8 +1261,10 @@
-     break;
- 
-   case TME_I825X6_CB_CMD_DUMP:
--  case TME_I825X6_CB_CMD_DIAGNOSE:
-     abort();
-+
-+  case TME_I825X6_CB_CMD_DIAGNOSE:
-+    break;
-   }
-   
-   /* add to the callouts and return the current status: */
-@@ -1898,7 +1903,7 @@
-   tme_uint16_t c_b_ok_a;
-   tme_uint16_t value16;
-   tme_uint32_t value32;
--  int rc, err;
-+  int rc, err, tot_length;
- 
-   /* recover our data structures: */
-   i825x6 = conn_eth->tme_ethernet_connection.tme_connection_element->tme_element_private;
-@@ -1919,7 +1924,7 @@
-   tme_mutex_lock(&i825x6->tme_i825x6_mutex);
- 
-   /* assume that we will have no packet to transmit: */
--  rc = 0;
-+  tot_length = 0;
- 
-   /* if we have a packet to transmit: */
-   if ((i825x6->tme_i825x6_el_s_i_cmd
-@@ -1934,10 +1939,10 @@
- #define CHUNKS_DMA_TX(addr, size)						\
-       err = _tme_i825x6_chunks_dma_tx(i825x6, frame_chunks, (addr), (size));	\
-       if (err != TME_OK) break;							\
--      rc += size
-+      tot_length += size
- #define CHUNKS_MEM_TX(data, size)						\
-       _tme_i825x6_chunks_mem_tx(frame_chunks, (data), (size));			\
--      rc += size
-+      tot_length += size
- 
-       /* if AL-LOC is set to zero, add the Ethernet/802.3 MAC header: */
-       if (i825x6->tme_i825x6_al_loc == 0) {
-@@ -1973,7 +1978,7 @@
- 	CHUNKS_DMA_TX(tb_address,
- 		      (eof_size & TME_I82586_TBD_SIZE_MASK));
- 
--	/* the next transmit buffer: */
-+	/* get out if no next transmit buffer: */
- 	if (eof_size & TME_I82586_TBD_EOF) {
- 	  break;
- 	}
-@@ -2022,7 +2027,7 @@
-   tme_mutex_unlock(&i825x6->tme_i825x6_mutex);
- 
-   /* done: */
--  return (rc);
-+  return (tot_length);
- }
- 
- /* this makes a new Ethernet connection: */
---- host/bsd/bsd-bpf.c.orig2	2006-12-13 08:07:09.000000000 -0500
-+++ host/bsd/bsd-bpf.c	2006-12-13 11:38:27.000000000 -0500
-@@ -292,7 +292,7 @@
-   struct tme_ethernet_connection *conn_eth;
-   int callouts, later_callouts;
-   unsigned int ctrl;
--  int rc;
-+  int rc, status;
-   tme_ethernet_fid_t frame_id;
-   struct tme_ethernet_frame_chunk frame_chunk_buffer;
-   tme_uint8_t frame[TME_ETHERNET_FRAME_MAX];
-@@ -372,6 +372,9 @@
- 		&frame_id,
- 		&frame_chunk_buffer,
- 		TME_ETHERNET_READ_NEXT)));
-+
-+      /* ensure don't get back bad length from i825x6 */
-+      assert(rc <= sizeof(frame));
-       
-       /* lock the mutex: */
-       tme_mutex_lock(&bpf->tme_bsd_bpf_mutex);
-@@ -380,7 +383,11 @@
-       if (rc > 0) {
- 
- 	/* do the write: */
--	tme_thread_write(bpf->tme_bsd_bpf_fd, frame, rc);
-+	status = tme_thread_write(bpf->tme_bsd_bpf_fd, frame, rc);
-+
-+        /* assert if write failed.  also assert if we wrote less bytes
-+           than we commanded */
-+        assert (status == rc);
- 
- 	/* mark that we need to loop to callout to read more frames: */
- 	bpf->tme_bsd_bpf_callout_flags |= TME_BSD_BPF_CALLOUT_READ;
---- machine/sun/sun-obie.c.orig	2005-02-17 07:37:25.000000000 -0500
-+++ machine/sun/sun-obie.c	2006-12-19 05:34:13.000000000 -0500
-@@ -78,7 +78,6 @@
- #define TME_SUN_OBIE_CALLOUT_RUNNING	TME_BIT(0)
- #define TME_SUN_OBIE_CALLOUTS_MASK	(-2)
- #define  TME_SUN_OBIE_CALLOUT_SIGNALS	TME_BIT(1)
--#define	 TME_SUN_OBIE_CALLOUT_INT	TME_BIT(2)
- 
- /* structures: */
- 
-@@ -106,8 +105,15 @@
-   /* the callout flags: */
-   int tme_sun_obie_callout_flags;
- 
--  /* if our interrupt line is currently asserted: */
--  int tme_sun_obie_int_asserted;
-+  /* the obie CSR interrupt enable bit has been set since powerup */
-+  int csr_ie_has_been_set;
-+
-+  /* the i825x6 interrupt is currently active to the obie */
-+  int i825x6_interrupt_is_active;
-+
-+  /* the obie interrupt (forward of the i825x6 interrupt) is currently active
-+     to the bus */
-+  int obie_interrupt_is_active;
- 
-   /* it's easiest to just model the board registers as a chunk of memory: */
-   tme_uint8_t tme_sun_obie_regs[TME_SUN_OBIE_SIZ_REGS];
-@@ -137,17 +143,67 @@
- static const struct tme_bus_signals _tme_sun_obie_bus_signals_generic = TME_BUS_SIGNALS_GENERIC;
- static const struct tme_bus_signals _tme_sun_obie_bus_signals_i825x6 = TME_BUS_SIGNALS_I825X6;
- 
-+
-+/* TME originally never set or cleared TME_SUN_OBIE_CSR_INTR in the obie CSR.
-+ * This worked fine for running NetBSD inside the emulator, as the NetBSD ie0
-+ * driver never checked that bit.  But SunOS 4.1.1 does.
-+ * Following is the logic that makes NetBSD and SunOS work inside the
-+ * emulator (and therefore is likely close to the logic of the actual OBIE
-+ * hardware: The Sun-2 MultiBus Ethernet Controller, part 501-1004).
-+ *
-+ *  When i825x6 chip asserts/deasserts an interrupt to OBIE:
-+ *     1) set or clear TME_SUN_OBIE_CSR_INTR as appropriate
-+ *           and, if the TME_SUN_OBIE_IE (interrupt enable) has ever been set:
-+ *     2) pass along signal to main bus.
-+ *
-+ * Note:
-+ *  When correcting the TME code to work with SunOS, I originally only
-+ *  forwarded the interrupt when IE was active, but SunOS fails five minutes
-+ *  after bootup (complaining about level 3 interrupt) with this arrangement.
-+ *
-+ *  So the actual use of the IE bit remains a mystery.  It is likely sufficient
-+ *  to ignore the IE bit and always pass along the i825x6 interrupt to the main
-+ *  bus.   But the current "has been set" IE logic allows NetBSD and SunOS to
-+ *  fully run ethernet correctly inside the emulator, and that's good enough
-+ *  for me.  ART
-+ */
-+
-+static void
-+_possibly_set_csr_intr_bit(struct tme_sun_obie *sun_obie)
-+{
-+  tme_uint16_t csr;
-+
-+  csr = TME_SUN_OBIE_CSR_GET(sun_obie);
-+  sun_obie->csr_ie_has_been_set |=
-+                ((csr & TME_SUN_OBIE_CSR_IE) == TME_SUN_OBIE_CSR_IE);
-+
-+  /* if a change in interrupt status */
-+  if (sun_obie->obie_interrupt_is_active != sun_obie->i825x6_interrupt_is_active) {
-+
-+    /* transition to assert */
-+    if (!sun_obie->obie_interrupt_is_active) {
-+      csr = (csr | TME_SUN_OBIE_CSR_INTR);
-+    }
-+
-+    /* transition to deassert */
-+    else {
-+      csr = (csr & ~TME_SUN_OBIE_CSR_INTR);
-+    }
-+
-+    TME_SUN_OBIE_CSR_PUT(sun_obie, csr);
-+    sun_obie->obie_interrupt_is_active = sun_obie->i825x6_interrupt_is_active;
-+  }
-+}
-+
- /* the sun_obie callout function.  it must be called with the mutex locked: */
- static void
- _tme_sun_obie_callout(struct tme_sun_obie *sun_obie, int new_callouts)
- {
-   struct tme_bus_connection *conn_i825x6;
--  struct tme_bus_connection *conn_bus;
-   tme_uint16_t csr, csr_diff;
-   unsigned int signal, level;
-   int callouts, later_callouts;
-   int rc;
--  int int_asserted;
-   
-   /* add in any new callouts: */
-   sun_obie->tme_sun_obie_callout_flags |= new_callouts;
-@@ -176,6 +232,8 @@
- 
-       /* get the current CSR value: */
-       csr = TME_SUN_OBIE_CSR_GET(sun_obie);
-+      sun_obie->csr_ie_has_been_set |=
-+                    ((csr & TME_SUN_OBIE_CSR_IE) == TME_SUN_OBIE_CSR_IE);
- 
-       /* get the next signal to call out to the i825x6: */
-       csr_diff = ((csr
-@@ -230,7 +288,10 @@
- 		 (conn_i825x6,
- 		  signal | level))
- 	      : TME_OK);
--	
-+
-+        /* possibly update status of INTR bit in CSR */
-+        _possibly_set_csr_intr_bit(sun_obie);
-+
- 	/* lock the mutex: */
- 	tme_mutex_lock(&sun_obie->tme_sun_obie_mutex);
-       
-@@ -254,55 +315,6 @@
- 	}
-       }
-     }
--
--    /* if we need to call out a possible change to our interrupt
--       signal: */
--    if (callouts & TME_SUN_OBIE_CALLOUT_INT) {
--
--      /* get the current CSR value: */
--      csr = TME_SUN_OBIE_CSR_GET(sun_obie);
--
--      /* see if the interrupt signal should be asserted or negated: */
--      int_asserted = ((csr & (TME_SUN_OBIE_CSR_IE
--			      | TME_SUN_OBIE_CSR_INTR))
--		      == (TME_SUN_OBIE_CSR_IE
--			  | TME_SUN_OBIE_CSR_INTR));
--
--      /* if the interrupt signal doesn't already have the right state: */
--      if (!int_asserted != !sun_obie->tme_sun_obie_int_asserted) {
--
--	/* get our bus connection: */
--	conn_bus = sun_obie->tme_sun_obie_conn_regs;
--	
--	/* unlock our mutex: */
--	tme_mutex_unlock(&sun_obie->tme_sun_obie_mutex);
--	
--	/* call out the bus interrupt signal edge: */
--	rc = (conn_bus != NULL
--	      ? ((*conn_bus->tme_bus_signal)
--		 (conn_bus,
--		  TME_BUS_SIGNAL_INT_UNSPEC
--		  | (int_asserted
--		     ? TME_BUS_SIGNAL_LEVEL_ASSERTED
--		     : TME_BUS_SIGNAL_LEVEL_NEGATED)))
--	      : TME_OK);
--
--	/* lock our mutex: */
--	tme_mutex_lock(&sun_obie->tme_sun_obie_mutex);
--	
--	/* if this callout was successful, note the new state of the
--	   interrupt signal: */
--	if (rc == TME_OK) {
--	  sun_obie->tme_sun_obie_int_asserted = int_asserted;
--	}
--
--	/* otherwise, remember that at some later time this callout
--	   should be attempted again: */
--	else {
--	  later_callouts |= TME_SUN_OBIE_CALLOUT_INT;
--	}
--      }
--    }
-   }
-   
-   /* put in any later callouts, and clear that callouts are running: */
-@@ -321,6 +333,9 @@
-   /* recover our data structure: */
-   sun_obie = (struct tme_sun_obie *) _sun_obie;
- 
-+  /* possibly update status of INTR bit in CSR */
-+  _possibly_set_csr_intr_bit(sun_obie);
-+
-   /* assume we won't need any new callouts: */
-   new_callouts = 0;
- 
-@@ -329,6 +344,8 @@
- 
-   /* get the previous CSR value: */
-   csr_old = TME_SUN_OBIE_CSR_GET(sun_obie);
-+  sun_obie->csr_ie_has_been_set |=
-+                ((csr_old & TME_SUN_OBIE_CSR_IE) == TME_SUN_OBIE_CSR_IE);
- 
-   /* run the cycle: */
-   tme_bus_cycle_xfer_memory(cycle_init, 
-@@ -354,12 +371,6 @@
-     new_callouts |= TME_SUN_OBIE_CALLOUT_SIGNALS;
-   }
-   
--  /* if this is an interrupt mask change, possibly call out an
--     interrupt signal change to the bus: */
--  if (csr_diff & TME_SUN_OBIE_CSR_IE) {
--    new_callouts |= TME_SUN_OBIE_CALLOUT_INT;
--  }
--  
- #ifndef TME_NO_LOG
-   if (csr_new != sun_obie->tme_sun_obie_last_log_csr) {
-     sun_obie->tme_sun_obie_last_log_csr = csr_new;
-@@ -397,6 +408,15 @@
-   /* recover our data structures: */
-   sun_obie = conn_bus->tme_bus_connection.tme_connection_element->tme_element_private;
- 
-+  /* save this information so we'll know it later */
-+  sun_obie->i825x6_interrupt_is_active =
-+    ((signal & TME_BUS_SIGNAL_LEVEL_ASSERTED) == TME_BUS_SIGNAL_LEVEL_ASSERTED);
-+
-+  /* return now if interrupt enable has never been set in CSR */
-+  if (!sun_obie->csr_ie_has_been_set) {
-+    return (TME_OK);
-+  }
-+
-   /* pass the i825x6's signal through to the obio bus: */
-   conn_bus = sun_obie->tme_sun_obie_conn_regs;
-   return (conn_bus != NULL
---- ic/i825x6reg.h.orig	2006-12-13 08:27:48.000000000 -0500
-+++ ic/i825x6reg.h	2006-12-13 08:28:27.000000000 -0500
-@@ -156,7 +156,7 @@
- /* the i82586 and 32-bit segmented i82586 Transmit Buffer: */
- #define TME_I82586_TBD_EOF_SIZE		(0)
- #define  TME_I82586_TBD_EOF		 (0x8000)
--#define  TME_I82586_TBD_SIZE_MASK	 (0x7fff)
-+#define  TME_I82586_TBD_SIZE_MASK	 (0x3fff)
- #define TME_I82586_TBD_TBD_OFFSET	(2)
- #define TME_I82586_TBD_TB_ADDRESS	(4)
- 
diff --git a/emulators/tme/patches/patch-ba b/emulators/tme/patches/patch-ba
deleted file mode 100644
index f29573da6ca..00000000000
--- a/emulators/tme/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2007/03/17 13:44:19 tsutsui Exp $
-
---- host/gtk/gtk-screen.c.orig	2006-12-18 09:35:14.000000000 -0500
-+++ host/gtk/gtk-screen.c	2006-12-18 09:36:18.000000000 -0500
-@@ -537,6 +537,8 @@
-      and auto-shrink: */
-   screen->tme_gtk_screen_window
-     = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-+  gtk_window_set_position(GTK_WINDOW(screen->tme_gtk_screen_window),
-+                          GTK_WIN_POS_CENTER);
-   gtk_window_set_policy(GTK_WINDOW(screen->tme_gtk_screen_window),
- 			TRUE, TRUE, TRUE);
- 
diff --git a/emulators/tme/patches/patch-bb b/emulators/tme/patches/patch-bb
deleted file mode 100644
index b3eedabf805..00000000000
--- a/emulators/tme/patches/patch-bb
+++ /dev/null
@@ -1,195 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2007/03/17 14:36:42 tsutsui Exp $
-
---- ic/m68k/m68k-insns-auto.sh.orig	2005-03-23 11:09:33.000000000 +0900
-+++ ic/m68k/m68k-insns-auto.sh	2007-03-17 23:25:24.000000000 +0900
-@@ -58,6 +58,96 @@
- EOF
- fi
- 
-+if $header; then
-+    cat <<EOF
-+
-+/* following are to fix the movel sp,-(sp) problem (of the value being pushed
-+   on the stack being off by four) and to warn if there are other possible
-+   problems that haven't been tested */
-+
-+#define PREDEC_POSTINC_CONCERN	(					\\
-+									\\
-+/* if source and destination register are the same number */		\\
-+    (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,0,3) ==			\\
-+     TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,9,3)) &&			\\
-+									\\
-+/* and both are address registers */					\\
-+    (									\\
-+     (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,3,3) >= 1) &&		\\
-+     (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,3,3) <= 6) &&		\\
-+     (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,6,3) >= 1) &&		\\
-+     (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,6,3) <= 6)		\\
-+    ) &&								\\
-+									\\
-+/* and there is a predec or postinc in the src, or a predec in dest */	\\
-+    (									\\
-+     (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,3,3) == 3) ||		\\
-+     (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,3,3) == 4) ||		\\
-+     (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,6,3) == 4)		\\
-+    )									\\
-+  )
-+
-+
-+#define DEST_IS_PREDEC_SRC_IS_REG_BOTH_SP (				\\
-+    (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,6,3) == 4) &&		\\
-+    (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,3,3) == 1) &&		\\
-+    (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,0,3) == 7) &&		\\
-+    (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,9,3) == 7)			\\
-+  )
-+
-+/* following modes test ok */
-+#define MODE35_MODE24_OR_MODE54	(					\\
-+									\\
-+/* src/dest mode 3,5 : this is move.l (a5)+,(028,a5) */			\\
-+    (									\\
-+      (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,3,3) == 3) &&		\\
-+      (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,6,3) == 5)		\\
-+    ) ||								\\
-+									\\
-+/* or src/dest mode 2,4 : this is move.l (a5),-(a5) */			\\
-+    (									\\
-+      (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,3,3) == 2) &&		\\
-+      (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,6,3) == 4)		\\
-+    ) ||								\\
-+									\\
-+/* or src/dest mode 5,4 : this is move.l (028,a5),-(a5) */		\\
-+    (									\\
-+      (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,3,3) == 5) &&		\\
-+      (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,6,3) == 4)		\\
-+    )									\\
-+  ) 
-+
-+
-+#define PRINT_WEIRD_SRC_DST_REG_MODE(msg)				\\
-+  printf("%s\nsrc reg: %x src mode: %x dest reg: %x dest mode %x at pc:%x\n", \\
-+    msg,								\\
-+    TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,0,3),			\\
-+    TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,3,3),			\\
-+    TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,9,3),			\\
-+    TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,6,3),			\\
-+    ic->tme_m68k_ireg_pc)
-+
-+
-+#define HITRETURN(msg)	do {						\\
-+  printf("%s, pc:0x%08x, insn:0x%08x: please",				\\
-+    msg, ic->tme_m68k_ireg_pc, TME_M68K_INSN_OPCODE);			\\
-+  printf("  analyze M68K instruction.\n");				\\
-+  printf("  generate test case.\n");					\\
-+  printf("  if TME emulation is incorrect, correct problem.\n");	\\
-+  printf("  modify source to avoid this message in the future.\n");	\\
-+  printf("press any to continue:");					\\
-+  (void)getchar();							\\
-+  printf("continuing\n");						\\
-+} while (0)
-+
-+EOF
-+else
-+    cat <<EOF
-+#include <stdio.h>
-+
-+EOF
-+fi
-+
- # permute for the three different operand sizes we need to handle:
- for size in 8 16 32; do
-     
-@@ -162,16 +252,16 @@
- 		    echo ""
- 		    echo "  if (!TME_M68K_SEQUENCE_RESTARTING) {"
- 		    echo "    ic->_tme_m68k_ea_function_code = function_code;"
--		    echo "    ic->_tme_m68k_ea_address = ic->tme_m68k_ireg_uint32(TME_M68K_IREG_A0 + ireg_dst);"
--		    echo "    ic->tme_m68k_ireg_uint32(TME_M68K_IREG_A0 + ireg_dst) += ireg_dst_adjust;"
--		    echo "  }"
--		    echo "  tme_m68k_read_memx${size}(ic);"
--		    echo "  if (!TME_M68K_SEQUENCE_RESTARTING) {"
--		    echo "    ic->_tme_m68k_ea_function_code = function_code;"
- 		    echo "    ic->_tme_m68k_ea_address = ic->tme_m68k_ireg_uint32(TME_M68K_IREG_A0 + ireg_src);"
- 		    echo "    ic->tme_m68k_ireg_uint32(TME_M68K_IREG_A0 + ireg_src) += ireg_src_adjust;"
- 		    echo "  }"
- 		    echo "  tme_m68k_read_mem${size}(ic, TME_M68K_IREG_MEMY${size});"
-+		    echo "  if (!TME_M68K_SEQUENCE_RESTARTING) {"
-+		    echo "    ic->_tme_m68k_ea_function_code = function_code;"
-+		    echo "    ic->_tme_m68k_ea_address = ic->tme_m68k_ireg_uint32(TME_M68K_IREG_A0 + ireg_dst);"
-+		    echo "    ic->tme_m68k_ireg_uint32(TME_M68K_IREG_A0 + ireg_dst) += ireg_dst_adjust;"
-+		    echo "  }"
-+		    echo "  tme_m68k_read_memx${size}(ic);"
- 		    echo "  ${dst} = ic->tme_m68k_ireg_memx${size};"
- 		    echo "  ${src} = ic->tme_m68k_ireg_memy${size};"
- 		    ;;
-@@ -181,6 +271,12 @@
- 		addx|subx)
- 		    echo "  tme_uint16_t memory;"
- 		    echo ""
-+		    # sanity checks for addx/subx
-+		    echo "  if ((ireg_src == ireg_dst) &&"
-+		    echo "    (TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,3,1) == 1)) {"
-+		    echo "    HITRETURN(\"weird ${name}${size}\");"
-+		    echo "  }"
-+		    echo ""
- 		    echo "  memory = (TME_M68K_INSN_OPCODE & TME_BIT(3));"
- 		    echo "  if (memory) {"
- 		    echo "    TME_M68K_INSN_CANFAULT;"
-@@ -239,6 +335,35 @@
- 	    fi
- 	    echo ";"
- 
-+	    # check "moveX sp,-(sp)" and adjust res
-+	    if test ${name} = move; then
-+		echo ""
-+		echo "  if (PREDEC_POSTINC_CONCERN) {"
-+		echo "    if (DEST_IS_PREDEC_SRC_IS_REG_BOTH_SP) {"
-+		if test ${size} = 8; then
-+		    echo "      printf(\"ERROR: ${name}${size}: how can addr/addr be 8 bits? at pc:%x\\n\","
-+		    echo "        ic->tme_m68k_ireg_pc);"
-+		else
-+		    echo "#if 0"
-+		    echo "      printf(\"${name}${size}: chg predec dest res from:%x to %x for register %d at pc %x\\n\","
-+		    echo "         res, res + (${size} / 8), TME_FIELD_EXTRACTU(TME_M68K_INSN_OPCODE,0,3), ic->tme_m68k_ireg_pc);"
-+		    echo "#endif"
-+		    echo "      res = res + (${size} / 8);"
-+		fi
-+		echo "      } else if (!(MODE35_MODE24_OR_MODE54)) {"
-+		echo "        PRINT_WEIRD_SRC_DST_REG_MODE(\"WEIRD: ${name}${size}\");"
-+		echo "    }"
-+		echo "  }"
-+	    fi
-+
-+	    # sanity check for cmpa16
-+	    if test ${name} = cmpa; then
-+		echo ""
-+		echo "  if PREDEC_POSTINC_CONCERN {"
-+		echo "    PRINT_WEIRD_SRC_DST_REG_MODE(\"weird ${name}${size}\");"
-+		echo "  }"
-+	    fi
-+
- 	    # store the result:
- 	    if $store_res; then
- 		echo ""
-@@ -362,6 +487,10 @@
- 	adda) op='+' ; src="_op0" ; dst="_op1" ;;
- 	movea) op='' ; src="_op1" ; dst="_op0" ;;
- 	esac
-+	echo "  if (PREDEC_POSTINC_CONCERN) {"
-+	echo "    PRINT_WEIRD_SRC_DST_REG_MODE(\"weird ${name}${size}\");"
-+	echo "  }"
-+	echo ""
- 	echo "  *((tme_int32_t *) ${dst}) ${op}= *((tme_int${size}_t *) ${src});"
- 	echo "  TME_M68K_INSN_OK;"
- 	echo "}"
-@@ -801,6 +930,10 @@
- 		echo "  tme_uint16_t specopy = TME_M68K_INSN_OP0(tme_uint16_t);"
- 		echo "  tme_uint32_t addrx;"
- 		echo "  tme_uint32_t addry;"
-+	    fi
-+	    echo ""
-+	    echo "  TME_M68K_INSN_CANFAULT;"
-+	    if test $name = cas2_; then
- 		echo ""
- 		echo "  /* get the function code and addresses we'll be dealing with: */"
- 		echo "  ic->_tme_m68k_ea_function_code = TME_M68K_FUNCTION_CODE_DATA(ic);"
diff --git a/emulators/tme/patches/patch-bc b/emulators/tme/patches/patch-bc
deleted file mode 100644
index 34f3d585455..00000000000
--- a/emulators/tme/patches/patch-bc
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2007/03/17 13:44:20 tsutsui Exp $
-
---- ic/ieee754/ieee754-ops-auto.sh.orig	2005-03-23 20:47:37.000000000 +0900
-+++ ic/ieee754/ieee754-ops-auto.sh	2007-03-14 22:00:59.000000000 +0900
-@@ -126,7 +126,7 @@
- 
- 	    # generate the operations:
- 	    #
--	    for name in add sub mul div \
-+	    for name in add cmp sub mul div \
- 			rem sqrt abs neg move \
- 			rint \
- 			cos acos cosh \
-@@ -144,7 +144,7 @@
- 		#
- 		monadic=true
- 		case "${name}" in
--		add | sub | mul | div | rem | pow | scale)
-+		add | cmp | sub | mul | div | rem | pow | scale)
- 		    monadic=false
- 		    ;;
- 		esac
-@@ -243,13 +243,14 @@
- 			func_softfloat="${name}"
- 			;;
- 		    *-add) op_builtin='+' ;;
-+		    *-cmp) op_builtin='-' ;;
- 		    *-sub) op_builtin='-' ;;
- 		    *-mul) op_builtin='*' ;;
- 		    *-div) op_builtin='/' ;;
- 		    *-sqrt) func_libm=sqrt ;;
- 		    partial-abs | unknown-abs) func_libm=fabs ;;
- 		    strict-neg)	op0=0 ; func_softfloat=sub ; op1=src0 ;;
--		    partial-neg | unknown-neg) op0=0 ; op_builtin='-'; op1=src0 ;;
-+		    partial-neg | unknown-neg) op0=-1.0 ; op_builtin='*'; op1=src0 ;;
- 		    strict-move) func_softfloat=add ; op1=0 ;;
- 		    *-move) type="${level_stricter}-move" ; src0_buffer=false ;;
- 		    strict-rint) func_softfloat=round_to_int ;;
-@@ -547,6 +548,15 @@
- 			# a builtin operation:
- 			#
- 			builtin)
-+			    if test ${name} = "cmp"; then
-+
-+				echo "  if (tme_float_is_inf(src0, TME_FLOAT_FORMAT_IEEE754_${capprecision} ) &"
-+				echo "      tme_float_is_inf(src1, TME_FLOAT_FORMAT_IEEE754_${capprecision}) &"
-+				echo "      (tme_float_is_negative(src0, TME_FLOAT_FORMAT_IEEE754_${capprecision}) =="
-+				echo "      tme_float_is_negative(src1, TME_FLOAT_FORMAT_IEEE754_${capprecision})))"
-+				echo "    tme_ieee754_${precision}_value_builtin_set(dst, TME_FLOAT_FORMAT_IEEE754_${capprecision}_BUILTIN, 0.0);"
-+				echo "  else"
-+			    fi;
- 			    echo "  tme_ieee754_${precision}_value_builtin_set(dst, TME_FLOAT_FORMAT_IEEE754_${capprecision}_BUILTIN, ${op0} ${op_builtin} ${op1});"
- 			    ;;
- 
---- ic/m68k/m6888x-auto.sh.orig	2006-10-01 08:22:49.000000000 -0400
-+++ ic/m68k/m6888x-auto.sh	2006-10-01 08:22:56.000000000 -0400
-@@ -136,7 +136,7 @@
- 	    12) name=asin ; fpu_types=TME_M68K_FPU_M6888X ;;	# fasin pp 315
- 	    10) name=atan ; fpu_types=TME_M68K_FPU_M6888X ;;	# fatan pp 318
- 	    13) name=atanh ; fpu_types=TME_M68K_FPU_M6888X ;;	# fatanh pp 321
--	    56) name=cmp ; name_ieee754=sub ; optype=DST_SRC ;;	# fcmp pp 326
-+	    56) name=cmp ; optype=DST_SRC ;;	# fcmp pp 326
- 	    29) name=cos ; fpu_types=TME_M68K_FPU_M6888X ;;	# fcos pp 329
- 	    25) name=cosh ; fpu_types=TME_M68K_FPU_M6888X ;;	# fcosh pp 332
- 
diff --git a/emulators/tme/patches/patch-bd b/emulators/tme/patches/patch-bd
deleted file mode 100644
index 0fd68e606c8..00000000000
--- a/emulators/tme/patches/patch-bd
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2007/03/17 13:44:20 tsutsui Exp $
-
---- generic/fb-xlat-auto.sh.orig	2005-05-15 04:02:20.000000000 +0900
-+++ generic/fb-xlat-auto.sh	2007-03-11 18:06:24.000000000 +0900
-@@ -458,11 +458,11 @@
-       if (bits < 32) {						\\
-         if (order == TME_ENDIAN_BIG) {				\\
-           fifo |= (next >> bits);				\\
--          next <<= (32 - bits);					\\
-+          next = (bits == 0) ? 0 : (next << (32 - bits));	\\
-         }							\\
-         else {							\\
-           fifo |= (next << bits);				\\
--          next >>= (32 - bits);					\\
-+          next = (bits == 0) ? 0 : (next >> (32 - bits));	\\
-         }							\\
-       }								\\
- 								\\
-@@ -506,11 +506,12 @@
-     /* shift the FIFO: */					\\
-     if (order == TME_ENDIAN_BIG) {				\\
-       next |= (fifo >> bits);					\\
--      fifo <<= (32 - bits);					\\
-+      fifo = (bits == 0) ? 0 : (fifo << (32 - bits));		\\
-     }								\\
-     else {							\\
-       next |= (fifo << bits);					\\
-       fifo >>= (32 - bits);					\\
-+      fifo = (bits == 0) ? 0 : (fifo >> (32 - bits));		\\
-     }								\\
-     bits += (shift);						\\
- 								\\
diff --git a/emulators/tme/patches/patch-be b/emulators/tme/patches/patch-be
deleted file mode 100644
index ccfc6d03f92..00000000000
--- a/emulators/tme/patches/patch-be
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-be,v 1.1 2007/03/17 13:44:20 tsutsui Exp $
-
---- ic/m68k/m68k-iset.txt.orig	2005-03-23 20:55:34.000000000 +0900
-+++ ic/m68k/m68k-iset.txt	2007-03-14 01:31:57.000000000 +0900
-@@ -59,8 +59,10 @@
- .if m68020 || m68030
- specop specop16 cmp2_chk2
- 0000 0ss0 11xx xxxx cmp2_chk2 X, x0/control	! chk2 pp 174, cmp2 pp 185
--specop specop16 cas
--0000 1SS0 11xx xxxx cas.S X, x0/memalt/un	! cas pp 169
-+specop specop16 cas8 cas16 cas32
-+0000 1010 11xx xxxx cas8 X, x0/memalt/un	! cas pp 169
-+0000 1100 11xx xxxx cas16 X, x0/memalt/un	! cas pp 169
-+0000 1110 11xx xxxx cas32 X, x0/memalt/un	! cas pp 169
- specop specop16 cas2_16 cas2_32
- 0000 1100 1111 1100 cas2_16 #16			! cas2 pp 169
- 0000 1110 1111 1100 cas2_32 #16			! cas2 pp 169
diff --git a/emulators/tuxnes/DESCR b/emulators/tuxnes/DESCR
deleted file mode 100644
index c0c7537bc2e..00000000000
--- a/emulators/tuxnes/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-tuxnes is a NES emulator.
-
-Features:
-- open source
-- dynamic recompilation from 6502 opcodes -> x86 native opcodes
-- mappers: 0, 1, 2, 3, 4, 7, 9, 11, 32, 66, 99
-- experimental mappers: 15, 22, 23, and 71
-- gzip and zip file support
-- game saving
-- built-in disassembler
-- joystick support (2- & 4-button)
-- experimental sound support
-- capture screenshots in X pixmap (xpm) or portable pixmap (ppm) format
-- Game Genie code support
-- trainer support
-- alternate palette support
diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile
deleted file mode 100644
index 4e2088a72af..00000000000
--- a/emulators/tuxnes/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/12/18 01:35:35 wiz Exp $
-#
-
-DISTNAME=		tuxnes-0.75
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tuxnes/}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://tuxnes.sourceforge.net/
-COMMENT=		NES emulator
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-
-SUBST_CLASSES+=		dsp
-SUBST_STAGE.dsp=	post-patch
-SUBST_MESSAGE.dsp=	Adjusting sound device path.
-SUBST_FILES.dsp=	consts.h
-SUBST_SED.dsp=		-e "s|/dev/dsp|${DEVOSSAUDIO}|"
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tuxnes
-.for doc in AUTHORS BUGS COPYING README THANKS
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/tuxnes
-.endfor
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/tuxnes/PLIST b/emulators/tuxnes/PLIST
deleted file mode 100644
index df9f8d7fcaf..00000000000
--- a/emulators/tuxnes/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/19 20:29:37 wiz Exp $
-bin/tuxnes
-bin/romfixer
-share/doc/tuxnes/AUTHORS
-share/doc/tuxnes/BUGS
-share/doc/tuxnes/COPYING
-share/doc/tuxnes/README
-share/doc/tuxnes/THANKS
-@dirrm share/doc/tuxnes
diff --git a/emulators/tuxnes/distinfo b/emulators/tuxnes/distinfo
deleted file mode 100644
index 8ff1ce4072b..00000000000
--- a/emulators/tuxnes/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/01/12 21:03:20 joerg Exp $
-
-SHA1 (tuxnes-0.75.tar.gz) = 1729cb3a33a5a3e0c8fa81a1341f912cd0b8d18b
-RMD160 (tuxnes-0.75.tar.gz) = d4a94e00f7c90cbf6fbf19537ede22aca05eeafd
-Size (tuxnes-0.75.tar.gz) = 198735 bytes
-SHA1 (patch-aa) = d907d8c64ffec0977160f61bf70eb5223a6fc1d2
-SHA1 (patch-ab) = b2acfc6915f30f28aadc5a9ddf780596c8120f72
-SHA1 (patch-ac) = dc4bb8796812c3dd24f338f7c8b465199d80207e
-SHA1 (patch-ad) = 25a937a0fcc0e52a42f8614656ca9e6eb08f02b9
-SHA1 (patch-ae) = 4f988a7351a1bceb5eb5add4e11cd3d02d011908
-SHA1 (patch-af) = dd655363b844f0264879f8efd3e5efae6672b43c
-SHA1 (patch-ag) = 4afd1f53df82ddc229ff3c505be1133a3cb206d6
diff --git a/emulators/tuxnes/patches/patch-aa b/emulators/tuxnes/patches/patch-aa
deleted file mode 100644
index d7788251b2e..00000000000
--- a/emulators/tuxnes/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/07/19 20:29:37 wiz Exp $
-
---- Makefile.in.orig	2004-07-19 22:03:46.000000000 +0200
-+++ Makefile.in
-@@ -99,7 +99,7 @@ tuxnes_OBJECTS =  x86.o d6502.o dynrec.o
- mapper.o sound.o ggi.o x11.o w.o renderer.o ntsc_pal.o unzip.o \
- ziploader.o
- tuxnes_DEPENDENCIES =  table.o
--tuxnes_LDFLAGS = 
-+tuxnes_LDFLAGS = ${LIBOSSAUDIO}
- comptbl_OBJECTS =  comptbl.o
- comptbl_LDADD = $(LDADD)
- comptbl_DEPENDENCIES = 
diff --git a/emulators/tuxnes/patches/patch-ab b/emulators/tuxnes/patches/patch-ab
deleted file mode 100644
index 9e10c546286..00000000000
--- a/emulators/tuxnes/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/07/19 20:29:37 wiz Exp $
-
---- mapper.c.orig	2001-04-11 23:45:47.000000000 +0200
-+++ mapper.c
-@@ -13,6 +13,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "consts.h"
- #include "globals.h"
diff --git a/emulators/tuxnes/patches/patch-ac b/emulators/tuxnes/patches/patch-ac
deleted file mode 100644
index e3c4567f456..00000000000
--- a/emulators/tuxnes/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2006/01/12 21:03:20 joerg Exp $
-
---- sound.c.orig	2001-04-11 21:45:47.000000000 +0000
-+++ sound.c
-@@ -104,11 +104,12 @@
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
- #if defined(__FreeBSD__)
- #include <machine/endian.h>
--#elif defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #include <sys/endian.h>
- #else /* Linux */
- #include <endian.h>
-@@ -411,7 +412,7 @@ InitAudio(int argc, char **argv)
-         {
-           int desired_fragmentsize = 0; 
- #ifdef SNDCTL_DSP_RESET
--          if (! ioctl (audiofd, SNDCTL_DSP_RESET)) {
-+          if (! ioctl (audiofd, SNDCTL_DSP_RESET, 0)) {
-             int desired_audiorate;
-             int desired_audiostereo;
-             struct SampleFormat *desired_sample_format = sample_format;
diff --git a/emulators/tuxnes/patches/patch-ad b/emulators/tuxnes/patches/patch-ad
deleted file mode 100644
index 8636e74944e..00000000000
--- a/emulators/tuxnes/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/07/19 20:29:37 wiz Exp $
-
---- unzip.h.orig	2001-04-11 22:23:10.000000000 +0200
-+++ unzip.h
-@@ -49,6 +49,10 @@ extern "C" {
- #include "zlib.h"
- #endif
- 
-+#ifndef OF
-+#define OF(a) a
-+#endif
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
-     from (void*) without cast */
diff --git a/emulators/tuxnes/patches/patch-ae b/emulators/tuxnes/patches/patch-ae
deleted file mode 100644
index e5d3b98c422..00000000000
--- a/emulators/tuxnes/patches/patch-ae
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/01/12 21:03:20 joerg Exp $
-
---- emu.c.orig	2006-01-12 20:46:29.000000000 +0000
-+++ emu.c
-@@ -890,7 +890,7 @@ loadpal(char *palfile)
-       len = strlen(palfile) + 1;
-       if (! (buffer = malloc(len)))
- 	{
--	  perror (__FUNCTION__ ": malloc");
-+	  perror ("loadpal: malloc");
- 	  return;
- 	}
-       memcpy (buffer, palfile, len);
-@@ -912,7 +912,7 @@ loadpal(char *palfile)
-       len = strlen(filename) + 1;
-       if (! (buffer = malloc(len)))
- 	{
--	  perror (__FUNCTION__ ": malloc");
-+	  perror ("loadpal: malloc");
- 	  return;
- 	}
-       memcpy (buffer, filename, len);
-@@ -924,7 +924,7 @@ loadpal(char *palfile)
- 	return;
-       if (!(palfile = malloc ((len = strlen (filename)) + 11)))
-         {
--          perror (__FUNCTION__ ": malloc");
-+          perror ("loadpal: malloc");
-           return;
-         }
-       strcpy (palfile, filename);
-@@ -1602,7 +1602,7 @@ main (int argc, char **argv)
- 
-     if (! (basefilename = malloc(baseend - basestart + 1)))
-       {
--        perror (__FUNCTION__ ": malloc");
-+        perror ("main: malloc");
-         exit (1);
-       }
- 
diff --git a/emulators/tuxnes/patches/patch-af b/emulators/tuxnes/patches/patch-af
deleted file mode 100644
index a4c483f76bd..00000000000
--- a/emulators/tuxnes/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/01/12 21:03:20 joerg Exp $
-
---- x11.c.orig	2006-01-12 20:53:39.000000000 +0000
-+++ x11.c
-@@ -31,7 +31,7 @@
- #include <unistd.h>
- #if defined(__FreeBSD__)
- #include <machine/endian.h>
--#elif defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #include <sys/endian.h>
- #else /* Linux */
- #include <endian.h>
diff --git a/emulators/tuxnes/patches/patch-ag b/emulators/tuxnes/patches/patch-ag
deleted file mode 100644
index 8cc03aeb645..00000000000
--- a/emulators/tuxnes/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/01/12 21:03:20 joerg Exp $
-
---- w.c.orig	2006-01-12 20:48:51.000000000 +0000
-+++ w.c
-@@ -29,7 +29,7 @@
- #include <unistd.h>
- #if defined(__FreeBSD__)
- #include <machine/endian.h>
--#elif defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #include <sys/endian.h>
- #else /* Linux */
- #include <endian.h>
diff --git a/emulators/twin/DESCR b/emulators/twin/DESCR
deleted file mode 100644
index 83daa301d2a..00000000000
--- a/emulators/twin/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Willows TWIN is a GNU software package for emulating the Microsoft
-Win32 API.  It consists of a library set and an emulator program.  The
-emulator program allows the execution of Windows binary applications
-on supported platforms; using the native Intel x86 processors, or
-through the built-in instruction set interpreter.  The native
-libraries allow programmers natively to build Win32 and MFC
-applications from source code.
diff --git a/emulators/twin/MESSAGE b/emulators/twin/MESSAGE
deleted file mode 100644
index b9d7247c400..00000000000
--- a/emulators/twin/MESSAGE
+++ /dev/null
@@ -1,22 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/05/06 17:41:11 jmmv Exp $
-
-TWIN gotchas:
-	* Only tested on NetBSD i386 and requires USER_LDT kernel option
-
-	* Platforms other than NetBSD i386 can only run 16 bit binaries and
-	  this hasn't been extensively tested.
-
-	* Some w32 functions are implemented but not prototyped in the
-	  TWIN headers.  Many functions are not implemented and the TWIN
-	  headers are out of date.  devel/w32api may be a useful reference
-
-	* When building programs, some libraries must be
-	  explicitly linked to, unlike in Windows.  ie: you
-	  need to specify -lshell to get RegOpenKeyEx()
-
-	* The resource compiler doesn't understand "" to mean ", so replace
-	  "" with \042 in your resource files.  There is no winresrc.h,
-	  replace it with windows.h in your resource files.
-
-===========================================================================
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
deleted file mode 100644
index a79fbe81cb3..00000000000
--- a/emulators/twin/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.28 2007/02/09 15:15:49 joerg Exp $
-#
-
-DISTNAME=		twin-src-3.1.14
-PKGNAME=		twin-3.1.14
-PKGREVISION=		3
-CATEGORIES=		emulators
-MASTER_SITES=		ftp://ftp.willows.com/pub/twin/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.willows.com/
-COMMENT=		Cross-platform implementation of the Win32 API
-
-BROKEN_IN=		pkgsrc-2005Q4 pkgsrc-2006Q1 pkgsrc-2006Q4
-
-WRKSRC=			${WRKDIR}/twin
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
-BUILD_TARGET=		depend world
-CONFIGURE_ARGS+=	--enable-debugger
-
-pre-build:
-	${CP} ${WRKSRC}/windows/Execfreebsd.c ${WRKSRC}/windows/Execnetbsd.c
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/twin
-	${INSTALL_DATA} ${WRKSRC}/documentation/* ${PREFIX}/share/doc/twin/
-	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/
-	${INSTALL_DATA} ${WRKSRC}/include/*.h.in ${PREFIX}/include/
-	${INSTALL_DATA} ${WRKSRC}/documentation/rc.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKSRC}/documentation/debugger.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/rc/rc ${PREFIX}/bin
-
-BUILDLINK_DEPMETHOD.libXt?=	build
-
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/twin/PLIST b/emulators/twin/PLIST
deleted file mode 100644
index f618cf46ce7..00000000000
--- a/emulators/twin/PLIST
+++ /dev/null
@@ -1,121 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/08 03:15:49 jmc Exp $
-bin/xwin32
-bin/rc
-man/man1/rc.1
-man/man1/debugger.1
-lib/libdll.a
-lib/libcommdlg.so
-lib/libshell.so
-lib/libkeyboard.so
-lib/libversion.so
-lib/libsystem.so
-lib/liblzexpand.so
-lib/libtoolhelp.so
-lib/libcomm.so
-lib/libwinsock.so
-lib/libddeml.so
-lib/libsound.so
-lib/libw32sys.so
-lib/libwin87em.so
-lib/libwinspool.so
-lib/libcomctl32.so
-lib/libadvapi32.so
-lib/libmsvcrt.so
-lib/libolesvr.so
-lib/libolecli.so
-lib/libmmsystem.so
-lib/libtwin32.so
-include/LZExpand.h
-include/Bin32.h
-include/ModTable.h
-include/Log.h
-include/Module.h
-include/MsgCode.h
-include/Net.h
-include/OEM.h
-include/ObjEngine.h
-include/Printer.h
-include/Resources.h
-include/Segment.h
-include/System.h
-include/Ver.h
-include/WSA.h
-include/WinMalloc.h
-include/WinSockUtil.h
-include/WinSocktypes.h
-include/tchar.h
-include/winnls.h
-include/winerror.h
-include/commctrl.h
-include/shellapi.h
-include/platform.h.in
-include/winbase.h
-include/windef.h
-include/windows.h
-include/cderr.h
-include/coguid.h
-include/colordlg.h
-include/wingdi.h
-include/commdlg.h
-include/compobj.h
-include/dde.h
-include/ddeml.h
-include/debug.h
-include/debugdefs.h
-include/debugtools.h
-include/dir.h
-include/direct.h
-include/dlgs.h
-include/dos.h
-include/inifile.h
-include/initguid.h
-include/io.h
-include/kerndef.h
-include/ldt.h
-include/mmsystem.h
-include/mtlock.h
-include/ole.h
-include/ole2ver.h
-include/print.h
-include/winmaptypes.h
-include/prsht.h
-include/share.h
-include/winnt.h
-include/toolhelp.h
-include/twindlfcn.h
-include/twindll.h
-include/twinhelp.h
-include/twinlog.h
-include/twinrt.h
-include/win_con.h
-include/winreg.h
-include/winuser.h
-include/windowsx.h
-include/winsock.h
-include/wincon.h
-include/windowsx16.h
-include/winmapclib.h
-include/windowsx32.h
-include/winspool.h
-include/winver.h
-include/thread.h
-include/platform.h
-share/doc/twin/bin-convert.txt
-share/doc/twin/config.doc
-share/doc/twin/debugger.1
-share/doc/twin/dll-binary.txt
-share/doc/twin/dll-native.txt
-share/doc/twin/lib-config.txt
-share/doc/twin/lib-debug.txt
-share/doc/twin/lib-porting.txt
-share/doc/twin/lib-qna.txt
-share/doc/twin/lib-thunk.c
-share/doc/twin/lib-verify.txt
-share/doc/twin/rc.1
-share/doc/twin/readme.twinrc
-share/doc/twin/sample.twinrc
-share/doc/twin/src-issues.txt
-share/doc/twin/twinrc.doc
-share/doc/twin/win.ini
-share/doc/twin/wrt-setup.txt
-@dirrm share/doc/twin
diff --git a/emulators/twin/PLIST.i386 b/emulators/twin/PLIST.i386
deleted file mode 100644
index 897b3c1be0f..00000000000
--- a/emulators/twin/PLIST.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.i386,v 1.2 2003/04/21 20:25:45 cjep Exp $
-lib/libreadline.a
-lib/libdebug.so
-lib/libpe32.so
diff --git a/emulators/twin/distinfo b/emulators/twin/distinfo
deleted file mode 100644
index 130c4cb659b..00000000000
--- a/emulators/twin/distinfo
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: distinfo,v 1.6 2006/02/17 19:25:24 wiz Exp $
-
-SHA1 (twin-src-3.1.14.tar.gz) = b1652f07adcc2c98948a4458480b2d8436cc893f
-RMD160 (twin-src-3.1.14.tar.gz) = e4b54f515505176498335387415dc5797b3e63eb
-Size (twin-src-3.1.14.tar.gz) = 2216218 bytes
-SHA1 (patch-aa) = 05a391a08a6f9d8407a6b61b2388f68c60d62a30
-SHA1 (patch-ab) = 7e7b4d3da2afb119a4222a953ae44251b0c253f2
-SHA1 (patch-ac) = ead087b78674b30c076f132d71c3d372c77f0e1f
-SHA1 (patch-ad) = baf4144bf251e5eef3613fc7b2a4cc9168fa7292
-SHA1 (patch-ae) = 572243b61d00492d257669132939c35dff98d9c8
-SHA1 (patch-af) = 818f91cce6010145756221b90bd3461557c53d9a
-SHA1 (patch-ag) = 2f6f51e9f837920c7d0db11686071a6de2d66887
-SHA1 (patch-ah) = 82deae0df4dd9f695b6a402fe9be8f4b9a9bc4f4
-SHA1 (patch-ai) = 30c18f5770b839fbae7143ce2e0b435eb90cfc76
-SHA1 (patch-aj) = 904103343dec345480b7566f9fe980fb027faade
-SHA1 (patch-ak) = 6b5e3de5b714031f028656dceeb5cb263bf1f7aa
-SHA1 (patch-al) = 9c27e11439360db805d6d6165a3af0f75064dcec
-SHA1 (patch-am) = 1df7aa9125830374cb52a02638249473c69af833
-SHA1 (patch-an) = 8eb83db7351e146bfb0357dd2f4495a38d28530b
-SHA1 (patch-ao) = 7c4a48ad57d76238e097bcf9f1b2fe773cf374ff
-SHA1 (patch-ap) = 728d3ad7a7094e55cd25581d5e1221b0818c3bb0
diff --git a/emulators/twin/patches/patch-aa b/emulators/twin/patches/patch-aa
deleted file mode 100644
index e3a48882783..00000000000
--- a/emulators/twin/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/01/15 19:20:59 joerg Exp $
-
---- configure.in.orig	Sun Jan 14 08:23:50 2001
-+++ configure.in	Fri Apr  5 22:31:14 2002
-@@ -147,6 +147,14 @@ case "$host" in
- 	TARGET=freebsd
- 	;;
- 
-+   i386-*-dragonfly* )
-+	TARGET=freebsd
-+	;;
-+
-+   *netbsd* )
-+	TARGET=netbsd
-+	;;
-+
-    i*86-*-linux* )
- 	TARGET=linux
- 	;;
-@@ -350,6 +358,11 @@ case "$host" in
- 	# egcs still broken on ppc
- 	TWIN_CFLAGS=-g
- 	;;
-+
-+   *netbsd* | *dragonfly* | *freebsd*)
-+	LIBTWIN_LDFLAGS="$LDFLAGS $LIBTWIN_LDFLAGS"
-+	DLL_LDFLAGS="$LDFLAGS $DLL_LDFLAGS"
-+	;;
- esac
- 
- dnl Determine the initialization method for shared libraries.
diff --git a/emulators/twin/patches/patch-ab b/emulators/twin/patches/patch-ab
deleted file mode 100644
index 47a6b6df521..00000000000
--- a/emulators/twin/patches/patch-ab
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/03/08 03:15:51 jmc Exp $
-
---- osdll/Makefile.in.orig	Sun Aug 22 05:55:20 1999
-+++ osdll/Makefile.in	Fri Apr  5 20:42:06 2002
-@@ -8,16 +8,22 @@
- 
- THREAD_alpha_linux	= DrvThreads_nothreads.c
- THREAD_alpha_freebsd	= DrvThreads_nothreads.c
-+THREAD_alpha_netbsd	= DrvThreads_generic.c
- THREAD_alpha_osf 	= DrvThreads_nothreads.c
-+THREAD_arm_netbsd	= DrvThreads_generic.c
- THREAD_arm_linux	= DrvThreads_nothreads.c
- #THREAD_hppa_hpux 	= DrvThreads_generic.c FIXME: temporary fix.
- THREAD_hppa_hpux 	= DrvThreads_nothreads.c
-+THREAD_mips_netbsd	= DrvThreads_generic.c
- THREAD_mips_irix	= DrvThreads_generic.c
- THREAD_ppc_aix 		= DrvThreads_nothreads.c
- THREAD_ppc_linux 	= DrvThreads_generic.c
-+THREAD_ppc_netbsd	= DrvThreads_generic.c
- THREAD_sparc_solaris 	= DrvThreads_generic.c
-+THREAD_sparc_netbsd	= DrvThreads_generic.c
- THREAD_sparc_sunos	= DrvThreads_generic.c
- THREAD_X386_freebsd	= DrvThreads_X386.c
-+THREAD_X386_netbsd	= DrvThreads_X386.c
- THREAD_X386_linux	= DrvThreads_X386.c
- THREAD_X386_sco		= DrvThreads_X386.c
- THREAD_X386_solaris 	= DrvThreads_X386.c
-@@ -30,11 +36,15 @@
- #SYSTEM_hppa_hpux 	= DrvSystem_hppa.s FIXME: bad assembly code.
- SYSTEM_hppa_hpux 	=
- SYSTEM_mips_irix	= DrvSystem_mips.s
-+SYSTEM_mips_netbsd	= DrvSystem_mips.s
- SYSTEM_ppc_aix 		= DrvSystem_ppc.s
- SYSTEM_ppc_linux 	= DrvSystem_ppc-gcc.s
-+SYSTEM_ppc_netbsd 	= DrvSystem_ppc-gcc.s
- SYSTEM_sparc_solaris 	= DrvSystem_sparc.s
- SYSTEM_sparc_sunos	= DrvSystem_sparc.s
-+SYSTEM_sparc_netbsd	= DrvSystem_sparc.s
- SYSTEM_X386_freebsd	=
-+SYSTEM_X386_netbsd	=
- SYSTEM_X386_linux	=
- SYSTEM_X386_sco		=
- SYSTEM_X386_solaris 	=
diff --git a/emulators/twin/patches/patch-ac b/emulators/twin/patches/patch-ac
deleted file mode 100644
index 5321dde6e2c..00000000000
--- a/emulators/twin/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/05/15 09:46:37 agc Exp $
-
---- dlls/winsock/WinSock.c.orig	Sun May 13 02:24:38 2001
-+++ dlls/winsock/WinSock.c	Sun May 13 02:24:39 2001
-@@ -28,6 +28,7 @@
- 
-  */
- 
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <sys/socket.h>
- #include <sys/time.h>
diff --git a/emulators/twin/patches/patch-ad b/emulators/twin/patches/patch-ad
deleted file mode 100644
index e7755ed5114..00000000000
--- a/emulators/twin/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/05/15 09:46:37 agc Exp $
-
---- dlls/winsock/WinSockIF.c.orig	Sun May 13 02:25:35 2001
-+++ dlls/winsock/WinSockIF.c	Sun May 13 02:25:47 2001
-@@ -28,6 +28,7 @@
- 
-  */
- 
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <sys/socket.h>
- #include <sys/time.h>
diff --git a/emulators/twin/patches/patch-ae b/emulators/twin/patches/patch-ae
deleted file mode 100644
index 013dc8cbc72..00000000000
--- a/emulators/twin/patches/patch-ae
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2006/01/15 19:20:59 joerg Exp $
-
---- debugger/sig_context.h.orig	Sun May 13 03:01:07 2001
-+++ debugger/sig_context.h	Sun May 13 03:25:31 2001
-@@ -57,7 +57,21 @@ enum {
- 
- #endif  /* linux */
- 
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-+
-+enum {
-+    REG_GS = 0, REG_FS, REG_ES, REG_DS,
-+    REG_EDI, REG_ESI, REG_EBP,
-+    REG_EBX, REG_EDX, REG_ECX, REG_EAX,
-+    REG_EIP, REG_CS, REG_EFL, REG_ESP,
-+    REG_SS, REG_BSD_ONSTACK, REG_BSD_MASK13,
-+    REG_TRAPNO, REG_ERR,
-+
-+    REG_AX = 100, REG_BX, REG_CX, REG_DX,
-+    REG_BP, REG_IP, REG_SP,
-+    REG_DI, REG_SI,
-+    REG_FL
-+};
- 
- #include <signal.h>
- typedef struct sigcontext SIGCONTEXT;
-@@ -120,7 +134,7 @@ typedef struct _CONTEXT		/* Note 1 */
- 
- 
- #if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) \
-- || defined(__OpenBSD__)
-+ || defined(__OpenBSD__) || defined(__DragonFly__)
- 
- #define EAX_sig(context)     ((context)->sc_eax)
- #define EBX_sig(context)     ((context)->sc_ebx)
-@@ -143,7 +157,7 @@ typedef struct _CONTEXT		/* Note 1 */
- #define TRAP_sig(context)    ((context)->sc_trapno)
- #endif
-                             
--#ifndef __FreeBSD__         
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- #define EFL_sig(context)     ((context)->sc_eflags)
- #else                       
- #define EFL_sig(context)     ((context)->sc_efl)
diff --git a/emulators/twin/patches/patch-af b/emulators/twin/patches/patch-af
deleted file mode 100644
index 41569557940..00000000000
--- a/emulators/twin/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/05/15 09:46:37 agc Exp $
-
---- tools/rc/cmdline.c.orig	Wed Aug 11 01:34:18 1999
-+++ tools/rc/cmdline.c	Sun May 13 10:09:31 2001
-@@ -61,7 +61,7 @@
- extern char cpp_module_name[];
- extern char libentry_name[];
- extern char tbl_name[];
--static char *system_include_path[1] = { STDINC };
-+static char *system_include_path[2] = { STDINC, __INCPATH__ };
- static int n_system_include_path = sizeof(system_include_path) / 
- 				   sizeof(*system_include_path);
- static char **user_include_path = NULL;
diff --git a/emulators/twin/patches/patch-ag b/emulators/twin/patches/patch-ag
deleted file mode 100644
index 17236027e82..00000000000
--- a/emulators/twin/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/05/15 09:46:37 agc Exp $
-
---- tools/rc/Makefile.in.orig	Sun Mar 21 02:47:49 1999
-+++ tools/rc/Makefile.in	Sun May 13 10:38:04 2001
-@@ -20,6 +20,8 @@
- 
- include $(blddir)/Make.rules
- 
-+CFLAGS		+= -D__INCPATH__=\"${prefix}/include\"
-+
- $(target): $(OBJS)
- 	$(CC) $(LDFLAGS) -o $@ $(OBJS)
- 
diff --git a/emulators/twin/patches/patch-ah b/emulators/twin/patches/patch-ah
deleted file mode 100644
index d5edd6e9ccc..00000000000
--- a/emulators/twin/patches/patch-ah
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2003/03/08 03:15:51 jmc Exp $
-
---- windows/WSprintf.c.orig	Fri Apr  5 20:42:48 2002
-+++ windows/WSprintf.c	Fri Apr  5 20:43:47 2002
-@@ -56,6 +56,14 @@
- int WINAPI
- wvsprintf(LPSTR buf, LPCSTR fmt, void *args)
- {
-+#ifdef __NetBSD__
-+#ifdef __powerpc__
-+	va_list *ap = args;
-+
-+	vsprintf(buf,fmt,*ap);
-+#endif
-+#else
- 	vsprintf(buf,fmt,args);
-+#endif
- 	return strlen(buf);
- }
diff --git a/emulators/twin/patches/patch-ai b/emulators/twin/patches/patch-ai
deleted file mode 100644
index bdd6b4aa46f..00000000000
--- a/emulators/twin/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2003/03/08 03:15:52 jmc Exp $
-
---- osdll/DrvSystem_ppc-gcc.s.orig	Fri Apr  5 21:29:15 2002
-+++ osdll/DrvSystem_ppc-gcc.s	Fri Apr  5 21:29:27 2002
-@@ -61,7 +61,7 @@
- 	mr	SP,r3
- # gcc/gas breaks on this
- #	bl	.TWIN_InitStackEnd{PR}
--	bl	TWIN_InitStackEnd
-+	bl	TWIN_InitStackEnd@plt
- 	nop
- 	nop
- 	nop
diff --git a/emulators/twin/patches/patch-aj b/emulators/twin/patches/patch-aj
deleted file mode 100644
index 4ece0c06613..00000000000
--- a/emulators/twin/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/03/08 03:15:52 jmc Exp $
-
---- windows/Makefile.in.orig	Fri Apr  5 21:33:13 2002
-+++ windows/Makefile.in	Fri Apr  5 20:46:17 2002
-@@ -17,7 +17,7 @@
- 
- target          = $(LIBTWIN)
- 
--LIBTWIN_LDFLAGS = @LIBTWIN_LDFLAGS@
-+LIBTWIN_LDFLAGS = @LIBTWIN_LDFLAGS@ ${LDFLAGS}
- 
- ############################################################################
- #
diff --git a/emulators/twin/patches/patch-ak b/emulators/twin/patches/patch-ak
deleted file mode 100644
index 3f09cabe9fd..00000000000
--- a/emulators/twin/patches/patch-ak
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2006/01/15 19:20:59 joerg Exp $
-
---- msdos/mfs_fileio.c.orig	2001-01-14 04:19:38.000000000 +0100
-+++ msdos/mfs_fileio.c
-@@ -32,6 +32,7 @@ To send email to the maintainer of the W
- 
- #include "platform.h"
- 
-+#include <errno.h>
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>  /* unlink() */
-@@ -213,8 +214,8 @@ mfs_delete(DWORD p1, DWORD p2, DWORD p3,
-            (strcmp(filename, xdos.fileio[slot].filename) == 0) ) {
-           /* Get the handle */
-           if ((handle = gethandle()) < 0) {
--              ERRSTR((LF_ERROR,"mfs_delete cannot get handle for file %s %d
-- %d\n", filename, errno, slot));
-+              ERRSTR((LF_ERROR,"mfs_delete cannot get handle for file %s %d"
-+" %d\n", filename, errno, slot));
-               return MAKELONG(NO_HANDLES & 0xffff,0xffff);
-           }
-           xdos.fileptr[handle] = &xdos.fileio[slot];
-@@ -232,8 +233,8 @@ mfs_delete(DWORD p1, DWORD p2, DWORD p3,
-      	       return unlink(filename);
-               }
-           }
--          else ERRSTR((LF_ERROR,"mfs_delete : invalid handle %d for file
--%s\n",handle, filename));
-+          else ERRSTR((LF_ERROR,"mfs_delete : invalid handle %d for file "
-+"%s\n",handle, filename));
-          }
-      }
-      /* At this point, either the file was fclosed by us, or it was
-@@ -332,7 +333,6 @@ mfs_openfile(char *filename, int mode, c
- {
- 	char	altname[_MAX_PATH];
- 	int	slot,handle,freeslot;
--	extern  int errno;
- 	int     drive;
- 	int	fd;
- 	int	nclosed;
diff --git a/emulators/twin/patches/patch-al b/emulators/twin/patches/patch-al
deleted file mode 100644
index 41f4ed9239b..00000000000
--- a/emulators/twin/patches/patch-al
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-al,v 1.1 2004/07/11 00:55:19 wiz Exp $
-
---- include/winuser.h.orig	2001-01-01 01:51:19.000000000 +0100
-+++ include/winuser.h
-@@ -3723,7 +3723,9 @@ CharPrev(LPCTSTR, LPCTSTR);
- int WideCharToMultiByte(UINT ,DWORD ,LPCWSTR ,int ,LPSTR ,int ,LPCSTR ,LPBOOL );
- int MultiByteToWideChar(UINT ,DWORD ,LPCSTR ,int ,LPWSTR ,int );
- 
-+#ifndef __NetBSD__
- size_t WINAPI wcslen(LPCWSTR);
-+#endif
- 
- #endif	/* NOAPIPROTO */
- 
diff --git a/emulators/twin/patches/patch-am b/emulators/twin/patches/patch-am
deleted file mode 100644
index 2a511dbf584..00000000000
--- a/emulators/twin/patches/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-am,v 1.1 2006/01/15 19:20:59 joerg Exp $
-
---- msdos/dos_timer.c.orig	2006-01-15 18:50:44.000000000 +0000
-+++ msdos/dos_timer.c
-@@ -31,6 +31,7 @@ To send email to the maintainer of the W
- #include "platform.h"
- 
- #define		_POSIX_SOURCE	1
-+#include <sys/types.h>
- #include	<time.h>
- 
- 
diff --git a/emulators/twin/patches/patch-an b/emulators/twin/patches/patch-an
deleted file mode 100644
index a1c6d31db03..00000000000
--- a/emulators/twin/patches/patch-an
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-an,v 1.1 2006/01/15 19:20:59 joerg Exp $
-
---- msdos/fat_fileio.c.orig	2006-01-15 18:54:48.000000000 +0000
-+++ msdos/fat_fileio.c
-@@ -30,6 +30,7 @@ To send email to the maintainer of the W
- 
- #include "platform.h"
- 
-+#include <errno.h>
- #include <stdio.h>
- #include <string.h>
- #include <sys/types.h>
-@@ -132,7 +133,6 @@ fat_open(DWORD p1, DWORD p2, DWORD p3, D
-         int     DosHandle;
- 
-         int     slot,handle,freeslot;
--        extern  int errno;
-         int     nclosed;
-         LPMFSFILE   fp;
- 	DWORD   DosDrive;
diff --git a/emulators/twin/patches/patch-ao b/emulators/twin/patches/patch-ao
deleted file mode 100644
index 36d121ae59d..00000000000
--- a/emulators/twin/patches/patch-ao
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2006/01/15 19:20:59 joerg Exp $
-
---- windows/vsprintf32.c.orig	2006-01-15 18:59:25.000000000 +0000
-+++ windows/vsprintf32.c
-@@ -264,9 +264,9 @@ wsprintfW(char * buf, LPCWSTR format, ..
- 			num = va_arg(args, unsigned long);
- 		else if (qualifier == 'h')
- 			if (flags & SIGN)
--				num = va_arg(args, short);
-+				num = va_arg(args, int);
- 			else
--				num = va_arg(args, unsigned short);
-+				num = va_arg(args, unsigned int);
- 		else if (flags & SIGN)
- 			num = va_arg(args, int);
- 		else
diff --git a/emulators/twin/patches/patch-ap b/emulators/twin/patches/patch-ap
deleted file mode 100644
index de4f52a682d..00000000000
--- a/emulators/twin/patches/patch-ap
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/02/17 19:25:24 wiz Exp $
-
---- configure.orig	2001-01-14 08:25:13.000000000 +0000
-+++ configure
-@@ -830,6 +830,14 @@ case "$host" in
- 	TARGET=freebsd
- 	;;
- 
-+   i386-*-dragonfly* )
-+	TARGET=freebsd
-+	;;
-+
-+   *netbsd* )
-+	TARGET=netbsd
-+	;;
-+
-    i*86-*-linux* )
- 	TARGET=linux
- 	;;
-@@ -2849,6 +2857,11 @@ EOF
- 	# egcs still broken on ppc
- 	TWIN_CFLAGS=-g
- 	;;
-+
-+   *netbsd* | *dragonfly* | *freebsd*)
-+	LIBTWIN_LDFLAGS="$LDFLAGS $LIBTWIN_LDFLAGS"
-+	DLL_LDFLAGS="$LDFLAGS $DLL_LDFLAGS"
-+	;;
- esac
- 
- if test -n "$GCC"
diff --git a/emulators/uae/DESCR b/emulators/uae/DESCR
deleted file mode 100644
index 235c2bb909e..00000000000
--- a/emulators/uae/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-UAE allows you to run most of the available Amiga software. It is a software
-emulation, meaning that no extra or special hardware is needed to do this.
-The hardware of an Amiga is emulated accurately, so that Amiga software is
-tricked into thinking it is running on the real thing, with your computer's
-display, keyboard, harddisk and mouse taking the parts of their emulated
-counterparts.
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
deleted file mode 100644
index 5417dac4dab..00000000000
--- a/emulators/uae/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.44 2007/01/29 17:43:52 tron Exp $
-
-DISTNAME=	uae-0.8.25
-PKGREVISION=	3
-CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.coresystems.de/pub/uae/sources/develop/ \
-		http://www.freiburg.linux.de/~uae/bin/sources/develop/
-
-MAINTAINER=	kristerw@NetBSD.org
-HOMEPAGE=	http://uae.coresystems.de/
-COMMENT=	The UAE Amiga Emulator
-
-DEPENDS+=	unzip>=5.40:../../archivers/unzip
-
-USE_TOOLS+=	gmake pkg-config
-GNU_CONFIGURE=	yes
-
-CONFIGURE_ARGS+=	--enable-dga --enable-vidmode
-
-.include "../../mk/pthread.buildlink3.mk"
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
-.include "../../x11/gtk2/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-ui
-.endif
-
-.if ${OPSYS} == NetBSD && exists(/usr/include/sys/statvfs.h)
-CONFIGURE_ENV+=	cv_func_getmntinfo=yes fu_cv_sys_mounted_getmntinfo=yes
-.endif
-
-INSTALLATION_DIRS=	bin
-
-do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} readdisk uae ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/uae
-	cd ${WRKSRC}/docs && ${INSTALL_DATA} FAQ README \
-		${PREFIX}/share/doc/uae
-
-.include "../../mk/x11.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/uae/PLIST b/emulators/uae/PLIST
deleted file mode 100644
index 418502fccdc..00000000000
--- a/emulators/uae/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:01 zuntum Exp $
-bin/readdisk
-bin/uae
-share/doc/uae/FAQ
-share/doc/uae/README
-@dirrm share/doc/uae
diff --git a/emulators/uae/distinfo b/emulators/uae/distinfo
deleted file mode 100644
index 327fb15cefb..00000000000
--- a/emulators/uae/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.16 2006/10/18 23:38:59 wiz Exp $
-
-SHA1 (uae-0.8.25.tar.gz) = 41b7a70cf672d3cc516bd3856a051459a95a6517
-RMD160 (uae-0.8.25.tar.gz) = 6990dc7aaf43c8bda0d7b86e6d0ae164209d1eb1
-Size (uae-0.8.25.tar.gz) = 970727 bytes
-SHA1 (patch-aa) = c185427ad9042e0e81ec4990c0ae4b5e6977a74e
-SHA1 (patch-ab) = 4dc5d66008a9c056c7a93f74d25c4778d4f1b6cb
-SHA1 (patch-ac) = 94e15570fe9d8df48945be0e1f2a723826e2ceda
-SHA1 (patch-ad) = 6ac0d9bd6e60408f366f050898ae87e8730466ec
-SHA1 (patch-ae) = 9235c20d2a60b3c48e87eb23463a14f558e0de4e
-SHA1 (patch-af) = ca05a7ec786d48e488d3b29e0650da1ef4f67d37
-SHA1 (patch-ag) = f62849869131a4ce3c87c4f3596fe2479ca3df8e
-SHA1 (patch-ah) = 3c467cd0e1de340733b9feb9e9e9c9365f9205ea
diff --git a/emulators/uae/patches/patch-aa b/emulators/uae/patches/patch-aa
deleted file mode 100644
index 94a4a1c50f9..00000000000
--- a/emulators/uae/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2005/10/14 22:15:49 kristerw Exp $
-
---- src/zfile.c.orig	2005-08-12 20:46:41.000000000 +0200
-+++ src/zfile.c	2005-08-12 20:47:10.000000000 +0200
-@@ -125,10 +125,8 @@
-     char cmd[1024];
-     if (!dst)
- 	return 1;
--#if defined AMIGA || defined __unix
-     sprintf (cmd, "unzip -p %s '*.adf' >%s", src, dst);
-     return !system (cmd);
--#endif
- }
- 
- /*
diff --git a/emulators/uae/patches/patch-ab b/emulators/uae/patches/patch-ab
deleted file mode 100644
index ea0da3f7cdd..00000000000
--- a/emulators/uae/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2005/10/14 22:15:49 kristerw Exp $
-
---- src/disk.c.orig	2005-08-12 20:48:07.000000000 +0200
-+++ src/disk.c	2005-08-12 20:48:56.000000000 +0200
-@@ -1178,6 +1178,8 @@
-        also it seems some copy protections require this fix */
-     DISK_start ();
- 
-+    /* The following fails with some versions of Kickstart. Disable it. */
-+#if 0
-     /* Try to make floppy access from Kickstart faster.  */
-     if (dskdmaen != 2)
- 	return;
-@@ -1222,6 +1224,7 @@
- 	    }
- 	}
-     }
-+#endif
- }
- 
- /* not a real hardware register */
diff --git a/emulators/uae/patches/patch-ac b/emulators/uae/patches/patch-ac
deleted file mode 100644
index a7ecffaa410..00000000000
--- a/emulators/uae/patches/patch-ac
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2006/04/28 15:10:18 joerg Exp $
-
---- configure.orig	2005-07-01 13:00:17.000000000 +0000
-+++ configure
-@@ -12767,7 +12767,7 @@ echo "$as_me:$LINENO: checking for pthre
- echo $ECHO_N "checking for pthread library... $ECHO_C" >&6
- TMP_SAVE_CFLAGS=$CFLAGS
- TMP_SAVE_LIBS=$LIBS
--LIBS="$LIBS -lpthread"
-+LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -14385,16 +14385,16 @@ else if [ "x$WANT_ALSA" = "xyes" ]; then
- echo "${ECHO_T}ALSA" >&6
-   SOUNDDEP=sd-alsa
-   USE_SOUND=yes
--else if [ "x$HAVE_USS_SOUND" = "xyes" ]; then
--  echo "$as_me:$LINENO: result: USS" >&5
--echo "${ECHO_T}USS" >&6
--  SOUNDDEP=sd-uss
--  USE_SOUND=yes
- else if [ "x$ac_cv_header_sys_audioio_h" = "xyes" -o "x$ac_cv_header_sun_audioio_h" = "xyes" ]; then
-   echo "$as_me:$LINENO: result: Solaris/NetBSD" >&5
- echo "${ECHO_T}Solaris/NetBSD" >&6
-   SOUNDDEP=sd-solaris
-   USE_SOUND=yes
-+else if [ "x$HAVE_USS_SOUND" = "xyes" ]; then
-+  echo "$as_me:$LINENO: result: USS" >&5
-+echo "${ECHO_T}USS" >&6
-+  SOUNDDEP=sd-uss
-+  USE_SOUND=yes
- else if [ "x$HAVE_AF_LIB" = "xyes" ]; then
-   echo "$as_me:$LINENO: result: AF sound" >&5
- echo "${ECHO_T}AF sound" >&6
-@@ -14466,7 +14466,7 @@ if [ "x$USE_THREADS" = "xyes" -o "x$NEED
-   else if [ "x$HAVE_PTHREAD_LIB" = "xyes" ]; then
-     THREADDEP=td-posix
-     CFLAGS="$CFLAGS -DSUPPORT_THREADS -D_REENTRANT"
--    LIBS="$LIBS -lpthread"
-+    LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
-     if [ "x$HAVE_POSIX4_LIB" = "xyes" ]; then
-       LIBS="$LIBS -lposix4"
-     fi
diff --git a/emulators/uae/patches/patch-ad b/emulators/uae/patches/patch-ad
deleted file mode 100644
index 6f92546faee..00000000000
--- a/emulators/uae/patches/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/07/02 15:47:16 tron Exp $
-
---- src/custom.c.orig	2005-07-02 17:24:06.000000000 +0100
-+++ src/custom.c	2006-07-02 16:38:58.000000000 +0100
-@@ -111,7 +111,8 @@
- static uae_u16 sprdata[MAX_SPRITES][4], sprdatb[MAX_SPRITES][4];
- static int sprite_last_drawn_at[MAX_SPRITES];
- static int last_sprite_point, nr_armed;
--static int sprite_width, sprres, sprite_buffer_res;
-+int sprite_width;
-+static int sprres, sprite_buffer_res;
- 
- static uae_u32 bpl1dat, bpl2dat, bpl3dat, bpl4dat, bpl5dat, bpl6dat, bpl7dat, bpl8dat;
- static uae_s16 bpl1mod, bpl2mod;
-@@ -234,9 +235,9 @@
- struct draw_info line_drawinfo[2][2 * (MAXVPOS + 1) + 1];
- struct color_entry color_tables[2][(MAXVPOS + 1) * 2];
- 
--static int next_sprite_entry = 0;
--static int prev_next_sprite_entry;
--static int next_sprite_forced = 1;
-+int next_sprite_entry = 0;
-+int prev_next_sprite_entry;
-+int next_sprite_forced = 1;
- 
- struct sprite_entry *curr_sprite_entries, *prev_sprite_entries;
- struct color_change *curr_color_changes, *prev_color_changes;
diff --git a/emulators/uae/patches/patch-ae b/emulators/uae/patches/patch-ae
deleted file mode 100644
index d5067eb608a..00000000000
--- a/emulators/uae/patches/patch-ae
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/07/02 15:47:16 tron Exp $
-
---- src/cia.c.orig	2005-07-02 17:24:06.000000000 +0100
-+++ src/cia.c	2006-07-02 16:29:42.000000000 +0100
-@@ -46,18 +46,18 @@
- static unsigned int clock_control_e = 0;
- static unsigned int clock_control_f = RTC_F_24_12;
- 
--static unsigned int ciaaicr, ciaaimask, ciabicr, ciabimask;
--static unsigned int ciaacra, ciaacrb, ciabcra, ciabcrb;
-+unsigned int ciaaicr, ciaaimask, ciabicr, ciabimask;
-+unsigned int ciaacra, ciaacrb, ciabcra, ciabcrb;
- 
- /* Values of the CIA timers.  */
--static unsigned long ciaata, ciaatb, ciabta, ciabtb;
-+unsigned long ciaata, ciaatb, ciabta, ciabtb;
- /* Computed by compute_passed_time.  */
--static unsigned long ciaata_passed, ciaatb_passed, ciabta_passed, ciabtb_passed;
-+unsigned long ciaata_passed, ciaatb_passed, ciabta_passed, ciabtb_passed;
- 
--static unsigned long ciaatod, ciabtod, ciaatol, ciabtol, ciaaalarm, ciabalarm;
--static int ciaatlatch, ciabtlatch;
-+unsigned long ciaatod, ciabtod, ciaatol, ciabtol, ciaaalarm, ciabalarm;
-+int ciaatlatch, ciabtlatch;
- 
--static unsigned int ciabpra;
-+unsigned int ciabpra;
- 
- unsigned int gui_ledstate;
- 
diff --git a/emulators/uae/patches/patch-af b/emulators/uae/patches/patch-af
deleted file mode 100644
index 140660ebd79..00000000000
--- a/emulators/uae/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/07/02 15:47:16 tron Exp $
-
---- src/autoconf.c.orig	2004-10-10 16:53:32.000000000 +0100
-+++ src/autoconf.c	2006-07-02 16:31:19.000000000 +0100
-@@ -218,7 +218,7 @@
- 
- /* ROM tag area memory access */
- 
--static uae_u8 *rtarea;
-+uae_u8 *rtarea;
- 
- static uae_u32 rtarea_lget (uaecptr) REGPARAM;
- static uae_u32 rtarea_wget (uaecptr) REGPARAM;
diff --git a/emulators/uae/patches/patch-ag b/emulators/uae/patches/patch-ag
deleted file mode 100644
index 96dc0d18fc1..00000000000
--- a/emulators/uae/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/07/02 15:47:16 tron Exp $
-
---- src/inputdevice.c.orig	2005-07-02 17:23:50.000000000 +0100
-+++ src/inputdevice.c	2006-07-02 16:33:10.000000000 +0100
-@@ -511,8 +511,8 @@
- 
- /* Mousehack stuff */
- 
--static int ievent_alive = 0;
--static int lastmx, lastmy;
-+int ievent_alive = 0;
-+int lastmx, lastmy;
- 
- int mousehack_alive (void)
- {
-@@ -1739,7 +1739,7 @@
-     return 0;
- }
- 
--static struct inputdevice_functions idev[3];
-+struct inputdevice_functions idev[3];
- 
- void inputdevice_init (void)
- {
diff --git a/emulators/uae/patches/patch-ah b/emulators/uae/patches/patch-ah
deleted file mode 100644
index fa16d2d7a24..00000000000
--- a/emulators/uae/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/10/18 23:38:59 wiz Exp $
-
---- src/install_libscg.orig	2000-07-23 14:32:04.000000000 +0000
-+++ src/install_libscg
-@@ -9,7 +9,7 @@
- #
- # check arguments
- #
--if [ $# -lt 1 ] || [ $# -gt 3 ] || [ "$1" == "--help" ]; then
-+if [ $# -lt 1 ] || [ $# -gt 3 ] || [ "$1" = "--help" ]; then
-     echo "usage: $0 <cdrecord dir> <machine type (optional)>"
-     exit 0
- fi
-@@ -31,7 +31,7 @@ else
-         echo "please specify your machine type - libscg was compiled for:"
-         echo "$machine"
-         exit 10
--    elif [ "$machine"x == x ]; then
-+    elif [ "$machine"x = x ]; then
-         echo "please compile cdrecord for your machine first"
-         exit 10
-     fi
diff --git a/emulators/ucon64/DESCR b/emulators/ucon64/DESCR
deleted file mode 100644
index 11bbac6446a..00000000000
--- a/emulators/ucon64/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-uCON64 - THE tool for all your video game console concerns.
-
-- Support for 14+ different cartridge and disc-based video game console system
-- Support for ALL common patch file formats like: IPS *), APS, BSL, PPF and
-  Game Genie
-  *) with RLE compression
-- Support for 10+ different backup units to backup/restore ROM(s), disc(s) and
-  SRAM(s) like: Flash Advance Linker, Flash 2 Advance, Doctor V64 (Junior),
-  Super Wild Card, Game Doctor, Dexdrive, Super Magic Drive, Game Boy Xchanger
-  Mad Catz Camera Link, Lynxit, MD-PRO, SMS-PRO, PCE-PRO, GG-PRO, Super Flash
-  and your CD-writer.
-
-  Including:
-  *VERY* verbose ROM information for ALL systems, detection of bad dumps using
-  internal checksums or DAT files, CRC32 calculation, ROM comparison,
-  modification (strip, pad, etc...), SRAM conversion (emulator <-> backup
-  unit), DiscJuggler and Nero image conversions, complete gzip and zip support
-  for all file-related funtions, etc...
diff --git a/emulators/ucon64/Makefile b/emulators/ucon64/Makefile
deleted file mode 100644
index 6e2dc832abd..00000000000
--- a/emulators/ucon64/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2007/03/19 16:40:27 tv Exp $
-#
-
-DISTNAME=		ucon64-2.0.0-src
-PKGNAME=		${DISTNAME:S/-src//}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ucon64/}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://ucon64.sourceforge.net/
-COMMENT=		Emulator ROM and disk image converter and inspector
-
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
-
-CONFIGURE_ARGS+=	--disable-discmage # requires some work
-CONFIGURE_ARGS+=	--disable-dload
-CPPFLAGS+=		-D__unix__
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
-CHECK_PORTABILITY_SKIP+=install_beos.sh
-
-INSTALLATION_DIRS=	share/examples/ucon64 share/doc/ucon64/images
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ucon64 ${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/[a-z]*.txt ${PREFIX}/share/examples/ucon64/
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/*.html \
-		${PREFIX}/share/doc/ucon64/
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/images/* \
-		${PREFIX}/share/doc/ucon64/images/
-
-.include "options.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/ucon64/PLIST b/emulators/ucon64/PLIST
deleted file mode 100644
index 87b32052435..00000000000
--- a/emulators/ucon64/PLIST
+++ /dev/null
@@ -1,40 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/07/26 04:12:22 tv Exp $
-bin/ucon64
-share/doc/ucon64/changes.html
-share/doc/ucon64/developers.html
-share/doc/ucon64/faq.html
-share/doc/ucon64/hardware.html
-share/doc/ucon64/images/bg.jpg
-share/doc/ucon64/images/cameralink.png
-share/doc/ucon64/images/cd_rw.png
-share/doc/ucon64/images/dexdrive.png
-share/doc/ucon64/images/f2a.png
-share/doc/ucon64/images/fal.png
-share/doc/ucon64/images/fig.png
-share/doc/ucon64/images/gbx.png
-share/doc/ucon64/images/ggpro.png
-share/doc/ucon64/images/hr.png
-share/doc/ucon64/images/icon.png
-share/doc/ucon64/images/logo.png
-share/doc/ucon64/images/mdpro.png
-share/doc/ucon64/images/msg.png
-share/doc/ucon64/images/pcepro.png
-share/doc/ucon64/images/sf3.png
-share/doc/ucon64/images/smc.png
-share/doc/ucon64/images/smd.png
-share/doc/ucon64/images/smspro.png
-share/doc/ucon64/images/swc.png
-share/doc/ucon64/images/v64.png
-share/doc/ucon64/images/v64jr.png
-share/doc/ucon64/install.html
-share/doc/ucon64/license.html
-share/doc/ucon64/readme.html
-share/examples/ucon64/genpal.txt
-share/examples/ucon64/mdntsc.txt
-share/examples/ucon64/snescopy.txt
-share/examples/ucon64/snesntsc.txt
-share/examples/ucon64/snespal.txt
-share/examples/ucon64/snesslow.txt
-@dirrm share/examples/ucon64
-@dirrm share/doc/ucon64/images
-@dirrm share/doc/ucon64
diff --git a/emulators/ucon64/distinfo b/emulators/ucon64/distinfo
deleted file mode 100644
index 8eae1bee3a7..00000000000
--- a/emulators/ucon64/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/10/23 11:17:55 tv Exp $
-
-SHA1 (ucon64-2.0.0-src.tar.gz) = 8782bbc2bf5760fafe3fa4cd02b67991d984a973
-RMD160 (ucon64-2.0.0-src.tar.gz) = c28921cfae1a010db917b96be542c089690b374c
-Size (ucon64-2.0.0-src.tar.gz) = 1188488 bytes
-SHA1 (patch-aa) = fd1543314b6ca6d432c6d88b8b7590085dfc51e9
-SHA1 (patch-ab) = 25f5311844511674d5e64efe7c35cf86dacc34a9
-SHA1 (patch-ac) = 9c7febe59e1c8e6959f56e34ced83a31fa54c294
-SHA1 (patch-ad) = c41895de15bc2a48bf5de1535f03d070ade79ea3
-SHA1 (patch-ae) = bfb38ecec2408deaaef881fa33943e2c45bccd4d
-SHA1 (patch-af) = 5fea372717e49f3d161c544e5ee01a8d23d688ba
diff --git a/emulators/ucon64/options.mk b/emulators/ucon64/options.mk
deleted file mode 100644
index 4cfda48f557..00000000000
--- a/emulators/ucon64/options.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/07/26 04:12:22 tv Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.ucon64
-PKG_SUPPORTED_OPTIONS=	libusb
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Build with USB support.
-###
-.if !empty(PKG_OPTIONS:Mlibusb)
-CONFIGURE_ARGS+=	--with-libusb
-CPPFLAGS+=		-I${BUILDLINK_PREFIX.libusb}/include
-LDFLAGS+=		-L${BUILDLINK_PREFIX.libusb}/lib
-LDFLAGS+=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libusb}/lib
-.  include "../../devel/libusb/buildlink3.mk"
-.endif
diff --git a/emulators/ucon64/patches/patch-aa b/emulators/ucon64/patches/patch-aa
deleted file mode 100644
index 9b67c6be9af..00000000000
--- a/emulators/ucon64/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/07/26 04:12:22 tv Exp $
-
---- Makefile.in.orig	2004-09-05 10:32:27.000000000 -0400
-+++ Makefile.in
-@@ -7,8 +7,8 @@
- @DEFINE_LIBCD64_MAKE@
- 
- CC=@CC@
--CFLAGS=-I. -Wall -W -O3 @DEFS@
--LDFLAGS=-s
-+CFLAGS=-I. -Wall -W @CPPFLAGS@ @CFLAGS@ @DEFS@
-+LDFLAGS=@LDFLAGS@
- TARGETS=
- 
- ifdef USE_DISCMAGE
-@@ -76,7 +76,7 @@ endif
- else                                    # DLOPEN
- ifdef USE_DISCMAGE                      # GNU specific: "simply expanded variable"
- FULLLIBNAME_DM:=$(addprefix lib,$(FULLLIBNAME_DM))
--LDFLAGS+=-Llibdiscmage -l$(LIBNAME_DM)
-+LDFLAGS+=-Llibdiscmage -l$(LIBNAME_DM) -lm
- endif
- 
- endif
diff --git a/emulators/ucon64/patches/patch-ab b/emulators/ucon64/patches/patch-ab
deleted file mode 100644
index 9685937a32a..00000000000
--- a/emulators/ucon64/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/07/26 04:12:22 tv Exp $
-
---- libdiscmage/libdiscmage.h.orig	2005-07-25 18:00:47.000000000 -0400
-+++ libdiscmage/libdiscmage.h
-@@ -28,7 +28,7 @@ extern "C" {
- 
- #include <stdio.h>                              // FILENAME_MAX
- 
--#if     defined __linux__ || defined __FreeBSD__ || defined __OpenBSD__ || \
-+#if     defined __linux__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ || \
-         defined __solaris__ || defined __MINGW32__ || defined __CYGWIN__ || \
-         defined __BEOS__ || defined AMIGA || defined __APPLE__ // Mac OS X actually
- // We cannot use config.h (for HAVE_INTTYPES_H), because this header file may be
diff --git a/emulators/ucon64/patches/patch-ac b/emulators/ucon64/patches/patch-ac
deleted file mode 100644
index d6aaabe6ca3..00000000000
--- a/emulators/ucon64/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/07/26 04:12:22 tv Exp $
-
---- misc/unzip.h.orig	2004-07-28 13:27:22.000000000 -0400
-+++ misc/unzip.h
-@@ -48,6 +48,9 @@ extern "C" {
- #ifndef _ZLIB_H
- #include "zlib.h"
- #endif
-+#ifndef OF
-+#define OF(x) x
-+#endif
- 
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
diff --git a/emulators/ucon64/patches/patch-ad b/emulators/ucon64/patches/patch-ad
deleted file mode 100644
index 782509a639b..00000000000
--- a/emulators/ucon64/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/12/09 11:48:11 joerg Exp $
-
---- misc/file.c.orig	2005-12-09 11:37:31.000000000 +0000
-+++ misc/file.c
-@@ -90,10 +90,6 @@ Foundation, Inc., 675 Mass Ave, Cambridg
- #define inline __inline
- #endif
- 
--
--extern int errno;
--
--
- int
- isfname (int c)
- {
diff --git a/emulators/ucon64/patches/patch-ae b/emulators/ucon64/patches/patch-ae
deleted file mode 100644
index 4f7b6f2e183..00000000000
--- a/emulators/ucon64/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/12/09 11:48:11 joerg Exp $
-
---- misc/misc.c.orig	2005-12-09 11:41:00.000000000 +0000
-+++ misc/misc.c
-@@ -88,9 +88,6 @@ typedef struct termios tty_t;
- #endif  // MAXBUFSIZE
- #define MAXBUFSIZE 32768
- 
--
--extern int errno;
--
- typedef struct st_func_node
- {
-   void (*func) (void);
diff --git a/emulators/ucon64/patches/patch-af b/emulators/ucon64/patches/patch-af
deleted file mode 100644
index e00b7f6237b..00000000000
--- a/emulators/ucon64/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/12/09 11:48:11 joerg Exp $
-
---- misc/archive.c.orig	2005-12-09 11:42:47.000000000 +0000
-+++ misc/archive.c
-@@ -48,9 +48,6 @@ Foundation, Inc., 675 Mass Ave, Cambridg
- #define MAXBUFSIZE 32768
- 
- 
--extern int errno;
--
--
- int
- fsizeof (const char *filename)
- // If USE_ZLIB is defined this function is very slow. Please avoid to use
diff --git a/emulators/uips/DESCR b/emulators/uips/DESCR
deleted file mode 100644
index 1c568654a74..00000000000
--- a/emulators/uips/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-UIPS - Universal IPS create/apply utility
-
-UIPS is a command-line based utility for creating and applying IPS
-patches. Multiple source files and IPS v2 truncation are supported.
diff --git a/emulators/uips/Makefile b/emulators/uips/Makefile
deleted file mode 100644
index 65cadf7b551..00000000000
--- a/emulators/uips/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2005/06/16 06:57:51 jlam Exp $
-#
-
-DISTNAME=		uips
-PKGNAME=		uips-1.0
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.neillcorlett.com/uips/
-DISTFILES=		uips.c uips.txt
-
-MAINTAINER=		wiz@NetBSD.org
-HOMEPAGE=		http://www.neillcorlett.com/uips/
-COMMENT=		IPS patcher with v2 support
-
-DIST_SUBDIR=		${PKGNAME_NOREV}
-
-WRKSRC=			${WRKDIR}
-INSTALLATION_DIRS=	bin
-
-do-extract:
-	${CP} ${_DISTDIR}/uips.c ${WRKSRC}/
-	${CP} ${_DISTDIR}/uips.txt ${WRKSRC}/
-	${CP} ${FILESDIR}/Makefile ${WRKSRC}/
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/uips ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/uips
-	${INSTALL_DATA} ${WRKSRC}/uips.txt ${PREFIX}/share/doc/uips
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/uips/PLIST b/emulators/uips/PLIST
deleted file mode 100644
index a4fbd9cbb5c..00000000000
--- a/emulators/uips/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/27 15:35:57 wiz Exp $
-bin/uips
-share/doc/uips/uips.txt
-@dirrm share/doc/uips
diff --git a/emulators/uips/distinfo b/emulators/uips/distinfo
deleted file mode 100644
index d0e6d84b239..00000000000
--- a/emulators/uips/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:21 agc Exp $
-
-SHA1 (uips-1.0/uips.c) = ef0acd30549d815a997cf1a7501c072e061fc79a
-RMD160 (uips-1.0/uips.c) = a6e0eeb26cb7be532d8f3d783a76b29417ce6ded
-Size (uips-1.0/uips.c) = 12410 bytes
-SHA1 (uips-1.0/uips.txt) = b9da81d6a2242bb2fd2a0bd20aa26669b106b326
-RMD160 (uips-1.0/uips.txt) = af412775db71779107d1d787c38bb4ca033e48d9
-Size (uips-1.0/uips.txt) = 1833 bytes
diff --git a/emulators/uips/files/Makefile b/emulators/uips/files/Makefile
deleted file mode 100644
index a6946800500..00000000000
--- a/emulators/uips/files/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-all: uips
-
-uips: uips.c
diff --git a/emulators/vba/DESCR b/emulators/vba/DESCR
deleted file mode 100644
index 487f1e03deb..00000000000
--- a/emulators/vba/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Visual Boy Advance is a Gameboy Advance emulator.
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
deleted file mode 100644
index 568dea8ad89..00000000000
--- a/emulators/vba/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2007/02/16 01:52:20 wiz Exp $
-
-DISTNAME=		VisualBoyAdvance-src-1.7.2
-PKGNAME=		vba-1.7.2
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vba/}
-
-MAINTAINER=		dillo@NetBSD.org
-HOMEPAGE=		http://vba.ngemu.com/
-COMMENT=		Gameboy advance emulator
-
-WRKSRC=			${WRKDIR}/VisualBoyAdvance-1.7.2
-USE_TOOLS+=		gmake
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-#CONFIGURE_ARGS+=	--enable-c-core
-#CONFIGURE_ARGS+=	--without-mmx
-USE_LANGUAGES=		c c++
-UNLIMIT_RESOURCES=	datasize
-
-GCC_REQD+=		3.0.0
-INSTALLATION_DIRS=	bin
-
-.if ${MACHINE_ARCH} == "i386"
-BUILD_DEPENDS+=		nasm-[0-9]*:../../devel/nasm
-.endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/sdl/TestEmu ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/src/sdl/VisualBoyAdvance ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vba
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/vba
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/vba/PLIST b/emulators/vba/PLIST
deleted file mode 100644
index 180dda84b98..00000000000
--- a/emulators/vba/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/03 23:34:46 xtraeme Exp $
-bin/TestEmu
-bin/VisualBoyAdvance
-share/doc/vba/README
-@dirrm share/doc/vba
diff --git a/emulators/vba/distinfo b/emulators/vba/distinfo
deleted file mode 100644
index dfba334d9d5..00000000000
--- a/emulators/vba/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.4 2007/02/16 01:52:20 wiz Exp $
-
-SHA1 (VisualBoyAdvance-src-1.7.2.tar.gz) = 04d82406079563fd17cda07f72488185e9152f51
-RMD160 (VisualBoyAdvance-src-1.7.2.tar.gz) = 44f94a4f270f2cda25879681c52892f6978caf99
-Size (VisualBoyAdvance-src-1.7.2.tar.gz) = 1410762 bytes
-SHA1 (patch-aa) = 2871ea4cf2451d489d1afe72af4abb86f1a58ca0
-SHA1 (patch-ab) = 55e1084d1cc48cff28b98a7fa68213d97f1f3d7e
-SHA1 (patch-ac) = 33158335dc12f335471d10962b4552082b589d25
-SHA1 (patch-ad) = b61c4053bbed582db5df2039c20b436e1d9e1ff1
-SHA1 (patch-ae) = b7e08365abd77b5c0f3473b4ce091b747298dfc8
-SHA1 (patch-af) = 0b194e624acb083942bd8f9f1a56c34bdd97d9e4
diff --git a/emulators/vba/patches/patch-aa b/emulators/vba/patches/patch-aa
deleted file mode 100644
index a1df988ea8f..00000000000
--- a/emulators/vba/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/04/17 14:50:47 wiz Exp $
-
---- src/unzip.h.orig	Sun Oct 20 06:03:12 2002
-+++ src/unzip.h	Mon Jun 30 23:45:30 2003
-@@ -68,6 +68,15 @@
- #include "zlib.h"
- #endif
- 
-+// nasty stuff taken from win32/include/zlib/zconf.h to make this compile
-+#ifndef OF /* function prototypes */
-+#  ifdef STDC
-+#    define OF(args)  args
-+#  else
-+#    define OF(args)  ()
-+#  endif
-+#endif
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
-     from (void*) without cast */
diff --git a/emulators/vba/patches/patch-ab b/emulators/vba/patches/patch-ab
deleted file mode 100644
index 0459bba5bc9..00000000000
--- a/emulators/vba/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/04/17 14:50:47 wiz Exp $
-
---- win32/include/zlib/zutil.h.orig	2004-01-18 00:07:32.000000000 +0100
-+++ win32/include/zlib/zutil.h
-@@ -26,6 +26,10 @@
- #   include <errno.h>
- #endif
- 
-+#ifndef OF
-+#define OF(X)	X
-+#endif
-+
- #ifndef local
- #  define local static
- #endif
diff --git a/emulators/vba/patches/patch-ac b/emulators/vba/patches/patch-ac
deleted file mode 100644
index b40d1c28bd5..00000000000
--- a/emulators/vba/patches/patch-ac
+++ /dev/null
@@ -1,271 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/04/17 14:50:47 wiz Exp $
-
---- src/sdl/SDL.cpp.orig	2004-05-21 22:16:58.000000000 +0200
-+++ src/sdl/SDL.cpp
-@@ -98,6 +98,7 @@ extern void MotionBlurIB32(u8*,u32,int,i
- void Init_Overlay(SDL_Surface *surface, int overlaytype);
- void Quit_Overlay(void);
- void Draw_Overlay(SDL_Surface *surface, int size);
-+SDL_Surface *Set_Video(bool first);
- 
- extern void remoteInit();
- extern void remoteCleanUp();
-@@ -248,8 +249,12 @@ bool screenMessage = false;
- char screenMessageBuffer[21];
- u32  screenMessageTime = 0;
- 
-+#if 0
- SDL_cond *cond = NULL;
- SDL_mutex *mutex = NULL;
-+#else
-+SDL_sem *rsem, *wsem;
-+#endif
- u8 sdlBuffer[4096];
- int sdlSoundLen = 0;
- 
-@@ -886,8 +891,8 @@ FILE *sdlFindFile(const char *name)
-   char *home = getenv("HOME");
- 
-   if(home != NULL) {
--    fprintf(stderr, "Searching home directory: %s\n", home);
--    sprintf(path, "%s%c%s", home, FILE_SEP, name);
-+    fprintf(stderr, "Searching home directory: %s%c.vba\n", home, FILE_SEP);
-+    sprintf(path, "%s%c.vba%c%s", home, FILE_SEP, FILE_SEP, name);
-     f = fopen(path, "r");
-     if(f != NULL)
-       return f;
-@@ -1744,11 +1749,8 @@ void sdlPollEvents()
-       case SDLK_f:
-         if(!(event.key.keysym.mod & MOD_NOCTRL) &&
-            (event.key.keysym.mod & KMOD_CTRL)) {
--          int flags = 0;
-           fullscreen = !fullscreen;
--          if(fullscreen)
--            flags |= SDL_FULLSCREEN;
--          SDL_SetVideoMode(destWidth, destHeight, systemColorDepth, flags);
-+	  Set_Video(false);
-           //          if(SDL_WM_ToggleFullScreen(surface))
-           //            fullscreen = !fullscreen;
-         }
-@@ -2320,9 +2322,7 @@ int main(int argc, char **argv)
-   destWidth = (sizeOption+1)*srcWidth;
-   destHeight = (sizeOption+1)*srcHeight;
-   
--  surface = SDL_SetVideoMode(destWidth, destHeight, 16,
--                             SDL_ANYFORMAT|SDL_HWSURFACE|SDL_DOUBLEBUF|
--                             (fullscreen ? SDL_FULLSCREEN : 0));
-+  surface = Set_Video(true);
-   
-   if(surface == NULL) {
-     systemMessage(0, "Failed to set video mode");
-@@ -2916,6 +2916,7 @@ void soundCallback(void *,u8 *stream,int
- {
-   if(!emulating)
-     return;
-+#if 0
-   SDL_mutexP(mutex);
-   //  printf("Locked mutex\n");
-   if(!speedup && !throttle) {
-@@ -2926,19 +2927,27 @@ void soundCallback(void *,u8 *stream,int
-         break;
-     }
-   }
-+#else
-+  SDL_SemWait(rsem);
-+#endif
-   if(emulating) {
-     //  printf("Copying data\n");
-     memcpy(stream, sdlBuffer, len);
-   }
-   sdlSoundLen = 0;
-+#if 0
-   if(mutex)
-     SDL_mutexV(mutex);
-+#else
-+  SDL_SemPost(wsem);
-+#endif
- }
- 
- void systemWriteDataToSoundBuffer()
- {
-   if(SDL_GetAudioStatus() != SDL_AUDIO_PLAYING)
-     SDL_PauseAudio(0);
-+#if 0
-   bool cont = true;
-   while(cont && !speedup && !throttle) {
-     SDL_mutexP(mutex);
-@@ -2976,6 +2985,11 @@ soundBufferLen);
-     memcpy(&sdlBuffer[sdlSoundLen], soundFinalWave, soundBufferLen);
-     sdlSoundLen += soundBufferLen;
-   }
-+#else
-+  memcpy(sdlBuffer, soundFinalWave, soundBufferLen);
-+  SDL_SemPost(rsem);
-+  SDL_SemWait(wsem);
-+#endif
- }
- 
- bool systemSoundInit()
-@@ -2998,7 +3012,7 @@ bool systemSoundInit()
-   }
-   audio.format=AUDIO_S16SYS;
-   audio.channels = 2;
--  audio.samples = 1024;
-+  audio.samples = soundBufferLen/4;
-   audio.callback = soundCallback;
-   audio.userdata = NULL;
-   if(SDL_OpenAudio(&audio, NULL)) {
-@@ -3006,8 +3020,13 @@ bool systemSoundInit()
-     return false;
-   }
-   soundBufferTotalLen = soundBufferLen*10;
-+#if 0
-   cond = SDL_CreateCond();
-   mutex = SDL_CreateMutex();
-+#else
-+  rsem = SDL_CreateSemaphore(0);
-+  wsem = SDL_CreateSemaphore(0);
-+#endif
-   sdlSoundLen = 0;
-   systemSoundOn = true;
-   return true;
-@@ -3015,6 +3034,7 @@ bool systemSoundInit()
- 
- void systemSoundShutdown()
- {
-+#if 0
-   SDL_mutexP(mutex);
-   SDL_CondSignal(cond);
-   SDL_mutexV(mutex);
-@@ -3022,7 +3042,15 @@ void systemSoundShutdown()
-   cond = NULL;
-   SDL_DestroyMutex(mutex);
-   mutex = NULL;
-+#else
-+  SDL_SemPost(rsem);
-+#endif
-   SDL_CloseAudio();
-+#if 0
-+#else
-+  SDL_DestroySemaphore(rsem);
-+  SDL_DestroySemaphore(wsem);
-+#endif 
- }
- 
- void systemSoundPause()
-@@ -3139,9 +3167,15 @@ bool systemPauseOnFrame()
- 
- void Init_Overlay(SDL_Surface *gbascreen, int overlaytype)
- {
--  
--  overlay = SDL_CreateYUVOverlay( GBA_WIDTH,
--                                  GBA_HEIGHT,
-+  int width;
-+
-+  if (overlaytype == SDL_YUY2_OVERLAY)
-+    width = srcWidth *2;
-+  else
-+    width = srcWidth;
-+
-+  overlay = SDL_CreateYUVOverlay( width,
-+                                  srcHeight,
-                                   overlaytype, gbascreen);
-   fprintf(stderr, "Created %dx%dx%d %s %s overlay\n",
-           overlay->w,overlay->h,overlay->planes,
-@@ -3304,19 +3338,15 @@ inline void ConvertRGBtoYUY2(SDL_Overlay
-   
-   SDL_LockYUVOverlay(o);
-   
--  for(y=0; y<160 && y<o->h; y++) {
-+  for(y=0; y<srcHeight && y<o->h; y++) {
-     p=(Uint8 *)pix+srcPitch*y;
-     op=o->pixels[0]+o->pitches[0]*y;
--    for(x=0; x<240 && x<o->w; x++) {
-+    for(x=0; x<srcWidth && x<o->w; x++) {
-       RGBtoYUV(p,yuv);
--      if(x%2==0) {
--        *(op++)=yuv[0];
--        *(op++)=yuv[1];
--        op[1]=yuv[2];
--      } else {
--        *op=yuv[0];
--        op+=2;
--      }
-+      *(op++)=yuv[0];
-+      *(op++)=yuv[1];
-+      *(op++)=yuv[0];
-+      *(op++)=yuv[2];
-       
-       p+=4; //s->format->BytesPerPixel;
-     }
-@@ -3358,11 +3388,6 @@ inline void Draw_Overlay(SDL_Surface *di
-   
-   Convert32bit(display);
-   
--  overlay_rect.x = 0;
--  overlay_rect.y = 0;
--  overlay_rect.w = GBA_WIDTH  * size;
--  overlay_rect.h = GBA_HEIGHT * size;
--
-   SDL_DisplayYUVOverlay(overlay, &overlay_rect);
-   SDL_UnlockYUVOverlay(overlay);
- }
-@@ -3378,9 +3403,8 @@ void systemGbBorderOn()
-   destWidth = (sizeOption+1)*srcWidth;
-   destHeight = (sizeOption+1)*srcHeight;
-   
--  surface = SDL_SetVideoMode(destWidth, destHeight, 16,
--                             SDL_ANYFORMAT|SDL_HWSURFACE|SDL_DOUBLEBUF|
--                             (fullscreen ? SDL_FULLSCREEN : 0));  
-+  surface = Set_Video(true);
-+
- #ifndef C_CORE
-   sdlMakeStretcher(srcWidth);
- #else
-@@ -3440,3 +3464,46 @@ void systemGbBorderOn()
-       srcPitch = srcWidth*3;
-   }
- }
-+
-+SDL_Surface *
-+Set_Video(bool first)
-+{
-+  int flags;
-+
-+  flags = SDL_HWSURFACE|SDL_DOUBLEBUF;
-+  if (first) {
-+    flags |= SDL_ANYFORMAT;
-+    systemColorDepth = 16;
-+  }
-+
-+  if(fullscreen)
-+    flags |= SDL_FULLSCREEN;
-+
-+  destWidth = srcWidth*(sizeOption+1);
-+  destHeight = srcHeight*(sizeOption+1);
-+
-+  if (yuv) {
-+    double mul, mul2;
-+
-+    if (fullscreen) {
-+      SDL_Rect **mode;
-+      if ((mode=SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE))
-+	  != NULL) {
-+	destWidth = mode[0]->w;
-+	destHeight = mode[0]->h;
-+      }
-+    }
-+    
-+    mul = (double)destWidth/srcWidth;
-+    mul2 = (double)destHeight/srcHeight;
-+    if (mul2 < mul)
-+      mul = mul2;
-+
-+    overlay_rect.w = (Uint16)(srcWidth*mul);
-+    overlay_rect.h = (Uint16)(srcHeight*mul);
-+    overlay_rect.x = (destWidth-overlay_rect.w)/2;
-+    overlay_rect.y = (destHeight-overlay_rect.h)/2;
-+  }
-+
-+  return SDL_SetVideoMode(destWidth, destHeight, systemColorDepth, flags);
-+}
diff --git a/emulators/vba/patches/patch-ad b/emulators/vba/patches/patch-ad
deleted file mode 100644
index c7cf6603d88..00000000000
--- a/emulators/vba/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/02/16 01:52:20 wiz Exp $
-
---- src/prof/gmon.h.orig	2002-11-20 14:29:08.000000000 +0100
-+++ src/prof/gmon.h
-@@ -119,7 +119,7 @@
- 
- struct tostruct
-   {
--    char *selfpc;
-+    uint32_t selfpc;
-     int count;
-     unsigned short link;
-   };
diff --git a/emulators/vba/patches/patch-ae b/emulators/vba/patches/patch-ae
deleted file mode 100644
index 68520bdd5cb..00000000000
--- a/emulators/vba/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/02/16 01:52:20 wiz Exp $
-
---- src/prof/prof.cpp.orig	2004-05-13 16:31:58.000000000 +0200
-+++ src/prof/prof.cpp
-@@ -279,7 +279,7 @@ void profCleanup()
- 
- void profCount()
- {
--  register char *selfpc;
-+  register u32 selfpc;
-   register unsigned short *frompcindex;
-   register struct tostruct *top;
-   register struct tostruct *prevtop;
-@@ -292,7 +292,7 @@ void profCount()
-   
-   /* selfpc = pc pushed by mcount call.
-      This identifies the function that was just entered.  */
--  selfpc = (char *) reg[14].I;
-+  selfpc = (u32) reg[14].I;
-   /* frompcindex = pc in preceding frame.
-      This identifies the caller of the function just entered.  */
-   frompcindex = (unsigned short *) reg[12].I;
diff --git a/emulators/vba/patches/patch-af b/emulators/vba/patches/patch-af
deleted file mode 100644
index d7fb1598a04..00000000000
--- a/emulators/vba/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/02/16 01:52:20 wiz Exp $
-
---- src/sdl/debugger.cpp.orig	2004-05-13 16:13:14.000000000 +0200
-+++ src/sdl/debugger.cpp
-@@ -950,9 +950,9 @@ void debuggerBreakOnWrite(u32 *mem, u32 
- {
-   u32 address = 0;
-   if(mem >= (u32*)&workRAM[0] && mem <= (u32*)&workRAM[0x3ffff])
--    address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]);
-+    address = 0x2000000 + (u32)((u8 *)mem - &workRAM[0]);
-   else
--    address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]);
-+    address = 0x3000000 + (u32)((u8 *)mem - &internalRAM[0]);
- 
-   if(size == 2)
-     printf("Breakpoint (on write) address %08x old:%08x new:%08x\n", 
diff --git a/emulators/vice/DESCR b/emulators/vice/DESCR
deleted file mode 100644
index 0d0e2b1b80d..00000000000
--- a/emulators/vice/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-VICE is the one and only Versatile Commodore Emulator. It provides
-emulation of the Commodore 64, 128, VIC20 and PET 8-bit computers
-within a single package. The emulators run as separate programs, but
-have the same user interface, share the same settings and support the
-same file formats.
-
-All the emulators provide an accurate 6502/6510 emulator, with
-emulation of all the opcodes (both documented and undocumented ones)
-and accurate timing. Unlike other emulators, VICE aims to be cycle
-accurate; it tries to emulate chip timings as precisely as possible
-and does so efficiently.
-
-Please do not expect the VIC20, C128 and PET emulators to be as good
-as the C64 one, as they are still under construction.
-
-The current version emulates the C64, the C128, the VIC20, the CBM-II
-line (B128, B256), and all the PET models.
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
deleted file mode 100644
index bbf667bf569..00000000000
--- a/emulators/vice/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# $NetBSD: Makefile,v 1.72 2007/02/07 19:43:29 wiz Exp $
-#
-
-DISTNAME=		vice-1.20
-CATEGORIES=		emulators
-MASTER_SITES=		ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/ \
-			http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/
-
-MAINTAINER=		kristerw@NetBSD.org
-HOMEPAGE=		http://www.viceteam.org/
-COMMENT=		Emulator for C64, C128, CBM-II, PET, and VIC20
-
-RESTRICTED=		ROM image copyright is questionable.
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_FTP=		${RESTRICTED}
-
-EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
-
-USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		bdftopcf gmake mkfontdir msgfmt
-USE_LANGUAGES=		c c++
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--enable-fullscreen
-
-INFO_FILES=		YES
-FONTS_DIRS.x11=		${PREFIX}/share/vice/fonts
-REQD_DIRS+=		${PREFIX}/share/vice/fonts
-REQD_DIRS+=		${PREFIX}/share/vice
-
-.include "options.mk"
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == NetBSD)
-CONFIGURE_ARGS+=	--without-oss
-.endif
-
-# These changes are rather common, so sed instead of patch:
-post-patch:
-	set -e;								\
-	for file in `${FIND} ${WRKSRC} -name Makefile.in -print`	\
-			${WRKSRC}/src/arch/unix/archdep.h; do		\
-		sed  -e "s|/lib/vice/doc|/share/doc/vice|g"		\
-			-e "s|/lib/vice|/share/vice|g"			\
-			-e "/^pkglibdir/s|(libdir)|(datadir)|g"		\
-			"$$file" > "$$file".new;			\
-		if cmp -s "$$file" "$$file".new; then			\
-			rm -f "$$file".new;				\
-		else							\
-			mv -f "$$file".new "$$file";			\
-		fi;							\
-	done
-
-.include "../../devel/readline/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/vice/PLIST b/emulators/vice/PLIST
deleted file mode 100644
index fa9bf7c0afa..00000000000
--- a/emulators/vice/PLIST
+++ /dev/null
@@ -1,259 +0,0 @@
-@comment $NetBSD: PLIST,v 1.18 2007/02/07 19:43:29 wiz Exp $
-bin/c1541
-bin/cartconv
-bin/petcat
-bin/vsid
-bin/x128
-bin/x64
-bin/xcbm2
-bin/xpet
-bin/xplus4
-bin/xvic
-info/vice.info
-man/man1/c1541.1
-man/man1/petcat.1
-man/man1/vice.1
-share/doc/vice/64doc.txt
-share/doc/vice/BUGS
-share/doc/vice/COPYING
-share/doc/vice/MSDOS-Ethernet-Howto.txt
-share/doc/vice/MSDOS-Howto.txt
-share/doc/vice/Minix-Howto.txt
-share/doc/vice/NEWS
-share/doc/vice/NLS-Howto.txt
-share/doc/vice/PETdoc.txt
-share/doc/vice/Readme.beos
-share/doc/vice/Readme.dos
-share/doc/vice/ReadmeMacOSX.txt
-share/doc/vice/TODO
-share/doc/vice/Walkthrough-Howto.txt
-share/doc/vice/Win32-Howto.txt
-share/doc/vice/amigaos.html
-share/doc/vice/cartconv.txt
-share/doc/vice/cbm_basic_tokens.txt
-share/doc/vice/drive_info.txt
-share/doc/vice/iec-bus.txt
-share/doc/vice/index.html
-share/doc/vice/mon.txt
-share/doc/vice/new.gif
-share/doc/vice/serial.txt
-share/doc/vice/solaris.html
-share/doc/vice/vice-logo.jpg
-share/doc/vice/vice_1.html
-share/doc/vice/vice_10.html
-share/doc/vice/vice_11.html
-share/doc/vice/vice_12.html
-share/doc/vice/vice_13.html
-share/doc/vice/vice_14.html
-share/doc/vice/vice_15.html
-share/doc/vice/vice_16.html
-share/doc/vice/vice_2.html
-share/doc/vice/vice_3.html
-share/doc/vice/vice_4.html
-share/doc/vice/vice_5.html
-share/doc/vice/vice_6.html
-share/doc/vice/vice_7.html
-share/doc/vice/vice_8.html
-share/doc/vice/vice_9.html
-share/doc/vice/vice_toc.html
-share/locale/de/LC_MESSAGES/vice.mo
-share/locale/fr/LC_MESSAGES/vice.mo
-share/locale/it/LC_MESSAGES/vice.mo
-share/locale/nl/LC_MESSAGES/vice.mo
-share/locale/pl/LC_MESSAGES/vice.mo
-share/locale/sv/LC_MESSAGES/vice.mo
-share/vice/C128/amiga_pos.vkm
-share/vice/C128/amiga_sym.vkm
-share/vice/C128/basic64
-share/vice/C128/basichi
-share/vice/C128/basiclo
-share/vice/C128/beos_pos.vkm
-share/vice/C128/beos_sym.vkm
-share/vice/C128/c64hq.vpl
-share/vice/C128/c64s.vpl
-share/vice/C128/ccs64.vpl
-share/vice/C128/chargde
-share/vice/C128/chargen
-share/vice/C128/chargfr
-share/vice/C128/chargse
-share/vice/C128/default.vpl
-share/vice/C128/default.vrs
-share/vice/C128/dos_pos.vkm
-share/vice/C128/dos_sym.vkm
-share/vice/C128/frodo.vpl
-share/vice/C128/godot.vpl
-share/vice/C128/kernal
-share/vice/C128/kernal64
-share/vice/C128/kernalde
-share/vice/C128/kernalfi
-share/vice/C128/kernalfr
-share/vice/C128/kernalit
-share/vice/C128/kernalno
-share/vice/C128/kernalse
-share/vice/C128/os2.vkm
-share/vice/C128/pc64.vpl
-share/vice/C128/vdc_deft.vpl
-share/vice/C128/vice.vpl
-share/vice/C128/win_pos.vkm
-share/vice/C128/win_sym.vkm
-share/vice/C128/x11_pos.vkm
-share/vice/C128/x11_sym.vkm
-share/vice/C64/amiga_pos.vkm
-share/vice/C64/amiga_sym.vkm
-share/vice/C64/basic
-share/vice/C64/beos_pos.vkm
-share/vice/C64/beos_sym.vkm
-share/vice/C64/c64hq.vpl
-share/vice/C64/c64mem.sym
-share/vice/C64/c64s.vpl
-share/vice/C64/ccs64.vpl
-share/vice/C64/chargen
-share/vice/C64/default.vpl
-share/vice/C64/default.vrs
-share/vice/C64/dos_pos.vkm
-share/vice/C64/dos_sym.vkm
-share/vice/C64/frodo.vpl
-share/vice/C64/godot.vpl
-share/vice/C64/kernal
-share/vice/C64/os2.vkm
-share/vice/C64/os2_sym.vkm
-share/vice/C64/pc64.vpl
-share/vice/C64/vice.vpl
-share/vice/C64/win_pos.vkm
-share/vice/C64/win_sym_de.vkm
-share/vice/C64/win_sym_us.vkm
-share/vice/C64/x11_pos.vkm
-share/vice/C64/x11_sym.vkm
-share/vice/CBM-II/amber.vpl
-share/vice/CBM-II/amiga_bukp.vkm
-share/vice/CBM-II/amiga_buks.vkm
-share/vice/CBM-II/basic.128
-share/vice/CBM-II/basic.256
-share/vice/CBM-II/basic.500
-share/vice/CBM-II/beos_bukp.vkm
-share/vice/CBM-II/beos_buks.vkm
-share/vice/CBM-II/c64hq.vpl
-share/vice/CBM-II/c64s.vpl
-share/vice/CBM-II/ccs64.vpl
-share/vice/CBM-II/chargen.500
-share/vice/CBM-II/chargen.600
-share/vice/CBM-II/chargen.700
-share/vice/CBM-II/default.vpl
-share/vice/CBM-II/dos_bukp.vkm
-share/vice/CBM-II/dos_buks.vkm
-share/vice/CBM-II/frodo.vpl
-share/vice/CBM-II/godot.vpl
-share/vice/CBM-II/green.vpl
-share/vice/CBM-II/kernal
-share/vice/CBM-II/kernal.500
-share/vice/CBM-II/os2.vkm
-share/vice/CBM-II/pc64.vpl
-share/vice/CBM-II/rom128h.vrs
-share/vice/CBM-II/rom128l.vrs
-share/vice/CBM-II/rom256h.vrs
-share/vice/CBM-II/rom256l.vrs
-share/vice/CBM-II/rom500.vrs
-share/vice/CBM-II/white.vpl
-share/vice/CBM-II/win_pos_uk.vkm
-share/vice/CBM-II/win_sym_uk.vkm
-share/vice/CBM-II/x11_buks.vkm
-share/vice/DRIVES/d1541II
-share/vice/DRIVES/d1571cr
-share/vice/DRIVES/dos1001
-share/vice/DRIVES/dos1541
-share/vice/DRIVES/dos1551
-share/vice/DRIVES/dos1570
-share/vice/DRIVES/dos1571
-share/vice/DRIVES/dos1581
-share/vice/DRIVES/dos2031
-share/vice/DRIVES/dos2040
-share/vice/DRIVES/dos3040
-share/vice/DRIVES/dos4040
-share/vice/PET/amber.vpl
-share/vice/PET/amiga_bgrs.vkm
-share/vice/PET/amiga_buks.vkm
-share/vice/PET/basic1
-share/vice/PET/basic2
-share/vice/PET/basic4
-share/vice/PET/beos_bgrs.vkm
-share/vice/PET/beos_buks.vkm
-share/vice/PET/chargen
-share/vice/PET/chargen.de
-share/vice/PET/dos_bgrs.vkm
-share/vice/PET/dos_buks.vkm
-share/vice/PET/edit1g
-share/vice/PET/edit2b
-share/vice/PET/edit2g
-share/vice/PET/edit4b40
-share/vice/PET/edit4b80
-share/vice/PET/edit4g40
-share/vice/PET/green.vpl
-share/vice/PET/kernal1
-share/vice/PET/kernal2
-share/vice/PET/kernal4
-share/vice/PET/os2.vkm
-share/vice/PET/os2_40.vkm
-share/vice/PET/rom1g.vrs
-share/vice/PET/rom2b.vrs
-share/vice/PET/rom2g.vrs
-share/vice/PET/rom4b40.vrs
-share/vice/PET/rom4b80.vrs
-share/vice/PET/rom4g40.vrs
-share/vice/PET/white.vpl
-share/vice/PET/win_sym_gr.vkm
-share/vice/PET/win_sym_uk.vkm
-share/vice/PET/x11_bdep.vkm
-share/vice/PET/x11_bdes.vkm
-share/vice/PET/x11_bgrs.vkm
-share/vice/PET/x11_buks.vkm
-share/vice/PLUS4/3plus1hi
-share/vice/PLUS4/3plus1lo
-share/vice/PLUS4/amiga_pos.vkm
-share/vice/PLUS4/amiga_sym.vkm
-share/vice/PLUS4/basic
-share/vice/PLUS4/beos_pos.vkm
-share/vice/PLUS4/beos_sym.vkm
-share/vice/PLUS4/default.vpl
-share/vice/PLUS4/default.vrs
-share/vice/PLUS4/dos_pos.vkm
-share/vice/PLUS4/dos_sym.vkm
-share/vice/PLUS4/kernal
-share/vice/PLUS4/os2.vkm
-share/vice/PLUS4/vice.vpl
-share/vice/PLUS4/win_pos.vkm
-share/vice/PLUS4/win_sym.vkm
-share/vice/PLUS4/x11_pos.vkm
-share/vice/PLUS4/x11_sym.vkm
-share/vice/PRINTER/cbm1526
-share/vice/PRINTER/mps801
-share/vice/PRINTER/mps803
-share/vice/PRINTER/mps803.vpl
-share/vice/PRINTER/nl10-cbm
-share/vice/VIC20/amiga_pos.vkm
-share/vice/VIC20/amiga_sym.vkm
-share/vice/VIC20/basic
-share/vice/VIC20/beos_pos.vkm
-share/vice/VIC20/beos_sym.vkm
-share/vice/VIC20/chargen
-share/vice/VIC20/default.vpl
-share/vice/VIC20/default.vrs
-share/vice/VIC20/dos_pos.vkm
-share/vice/VIC20/dos_sym.vkm
-share/vice/VIC20/kernal
-share/vice/VIC20/os2.vkm
-share/vice/VIC20/win_pos.vkm
-share/vice/VIC20/win_sym.vkm
-share/vice/VIC20/x11_pos.vkm
-share/vice/VIC20/x11_sym.vkm
-share/vice/fonts/vice-cbm.pcf
-@comment in REQ_DIRS: @dirrm share/vice/fonts
-@dirrm share/vice/VIC20
-@dirrm share/vice/PRINTER
-@dirrm share/vice/PLUS4
-@dirrm share/vice/PET
-@dirrm share/vice/DRIVES
-@dirrm share/vice/CBM-II
-@dirrm share/vice/C64
-@dirrm share/vice/C128
-@comment in REQ_DIRS: @dirrm share/vice
-@dirrm share/doc/vice
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
deleted file mode 100644
index 026ec57eb5d..00000000000
--- a/emulators/vice/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.29 2007/02/07 19:43:29 wiz Exp $
-
-SHA1 (vice-1.20.tar.gz) = ab24d4cda34e93eb8663337af127402cc6ccaa6a
-RMD160 (vice-1.20.tar.gz) = b4f7a50257cbdd6338d4e685760e99c07ad14adb
-Size (vice-1.20.tar.gz) = 5183757 bytes
-SHA1 (patch-aa) = dffd85c1be1f311508eddbbe559ad2bf73f9974d
-SHA1 (patch-ab) = 12657561998b724c39699c380290e7333365d300
-SHA1 (patch-ac) = 32d10e8d63e0031a099062e34cd918531aae5692
-SHA1 (patch-ad) = 608d170e8b5745c239c98408e8fe216768951c6c
-SHA1 (patch-af) = 524913b7bc753dafde909bb26ace8f0500be14d5
-SHA1 (patch-ag) = 293114fe28b7b3832ad0087d89da1d1a37066bbc
diff --git a/emulators/vice/options.mk b/emulators/vice/options.mk
deleted file mode 100644
index 84da38164e1..00000000000
--- a/emulators/vice/options.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2007/02/07 19:43:29 wiz Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.vice
-PKG_SUPPORTED_OPTIONS=	esound ffmpeg lame gnome
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mesound)
-.include "../../audio/esound/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-esd
-.endif
-
-.if !empty(PKG_OPTIONS:Mffmpeg)
-CONFIGURE_ARGS+=	--enable-ffmpeg
-.include "../../multimedia/ffmpeg/buildlink3.mk"
-.  if !empty(PKG_OPTIONS:Mlame)
-.  include "../../audio/lame/buildlink3.mk"
-.  endif
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnome)
-CONFIGURE_ARGS+=	--enable-gnomeui
-USE_TOOLS+=		pkg-config
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.endif
diff --git a/emulators/vice/patches/patch-aa b/emulators/vice/patches/patch-aa
deleted file mode 100644
index 6621ab5c7f2..00000000000
--- a/emulators/vice/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2007/02/07 19:43:29 wiz Exp $
-
---- doc/Makefile.in.orig	2007-01-21 01:53:08.000000000 +0000
-+++ doc/Makefile.in
-@@ -245,7 +245,7 @@ xcbm2_LDFLAGS = @xcbm2_LDFLAGS@
- xpet_LDFLAGS = @xpet_LDFLAGS@
- xplus4_LDFLAGS = @xplus4_LDFLAGS@
- xvic_LDFLAGS = @xvic_LDFLAGS@
--docdir = $(VICEDIR)/doc
-+docdir = $(datadir)/doc/vice
- 
- doc_DATA = \
- 	MSDOS-Ethernet-Howto.txt \
diff --git a/emulators/vice/patches/patch-ab b/emulators/vice/patches/patch-ab
deleted file mode 100644
index ddcc51d6070..00000000000
--- a/emulators/vice/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2006/06/29 22:56:34 dillo Exp $
-
---- src/arch/unix/archdep.h.orig	2005-03-28 21:10:20.000000000 +0200
-+++ src/arch/unix/archdep.h
-@@ -96,8 +96,8 @@
- extern const char *archdep_home_path(void);
- 
- /* Define the default system directory (where the ROMs are).  */
--#define LIBDIR          PREFIX "/lib/vice"
--#define DOCDIR          LIBDIR "/doc"
-+#define LIBDIR          PREFIX "/share/vice"
-+#define DOCDIR          PREFIX "/share/doc/vice"
- #define VICEUSERDIR     ".vice"
- 
- #endif
diff --git a/emulators/vice/patches/patch-ac b/emulators/vice/patches/patch-ac
deleted file mode 100644
index e16f33c264a..00000000000
--- a/emulators/vice/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.16 2007/02/07 19:43:29 wiz Exp $
-
---- src/sounddrv/soundsun.c.orig	2006-08-06 15:54:56.000000000 +0000
-+++ src/sounddrv/soundsun.c
-@@ -204,7 +204,7 @@ static void sun_close(void)
-     sun_fd = -1;
-     sun_8bit = 0;
-     sun_bufsize = 0;
--#if !defined(__NETBSD__)
-+#if !defined(__NetBSD__)
-     sun_written = 0;
- #endif
-     sun_channels = 1;
diff --git a/emulators/vice/patches/patch-ad b/emulators/vice/patches/patch-ad
deleted file mode 100644
index a2e0261e7f0..00000000000
--- a/emulators/vice/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.11 2007/02/07 19:43:29 wiz Exp $
-
---- doc/html/Makefile.in.orig	2007-01-21 01:53:08.000000000 +0000
-+++ doc/html/Makefile.in
-@@ -245,7 +245,7 @@ xcbm2_LDFLAGS = @xcbm2_LDFLAGS@
- xpet_LDFLAGS = @xpet_LDFLAGS@
- xplus4_LDFLAGS = @xplus4_LDFLAGS@
- xvic_LDFLAGS = @xvic_LDFLAGS@
--docdir = $(VICEDIR)/doc
-+docdir = $(datadir)/doc/vice
- 
- doc_DATA = \
- 	amigaos.html \
diff --git a/emulators/vice/patches/patch-af b/emulators/vice/patches/patch-af
deleted file mode 100644
index 065ffb35052..00000000000
--- a/emulators/vice/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.6 2006/06/29 22:56:34 dillo Exp $
-
---- src/arch/unix/x11/video.c.orig	2006-01-02 01:04:55.000000000 +0100
-+++ src/arch/unix/x11/video.c
-@@ -210,11 +210,7 @@ int video_init_cmdline_options(void)
- 
- /* ------------------------------------------------------------------------- */
- 
--#if !defined(__NETBSD__)
- static GC _video_gc;
--#else
--GC _video_gc;
--#endif
- static void (*_refresh_func)();
- 
- /* This is set to 1 if the Shared Memory Extensions can actually be used. */
diff --git a/emulators/vice/patches/patch-ag b/emulators/vice/patches/patch-ag
deleted file mode 100644
index 685768f44cb..00000000000
--- a/emulators/vice/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.8 2007/02/07 19:43:29 wiz Exp $
-
---- configure.orig	2007-01-21 01:44:51.000000000 +0000
-+++ configure
-@@ -23531,7 +23531,7 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
- 
- 
--VICEDIR="$PREFIX/lib/vice";
-+VICEDIR="$PREFIX/share/vice";
- 
- 
- if false ; then
diff --git a/emulators/vmips/DESCR b/emulators/vmips/DESCR
deleted file mode 100644
index 87c3c9603de..00000000000
--- a/emulators/vmips/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-vmips is a virtual machine simulator based around a MIPS R3000 RISC CPU
-core.
diff --git a/emulators/vmips/Makefile b/emulators/vmips/Makefile
deleted file mode 100644
index 30a55fac166..00000000000
--- a/emulators/vmips/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2007/01/07 09:13:53 rillig Exp $
-#
-
-DISTNAME=		vmips-1.3.1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vmips/}
-
-MAINTAINER=		rillig@NetBSD.org
-HOMEPAGE=		http://vmips.sourceforge.net/
-COMMENT=		MIPS R3000 emulator
-
-USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
-INSTALLATION_DIRS=	bin include/vmips ${PKGMANDIR}/man1 share/vmips share/examples/vmips
-INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
-
-EGDIR=			${PREFIX}/share/examples/vmips
-CONF_FILES=		${EGDIR}/vmipsrc ${PKG_SYSCONFDIR}/vmipsrc
-
-USE_LANGUAGES=		c c++
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/vmips/PLIST b/emulators/vmips/PLIST
deleted file mode 100644
index 38eb9849e4b..00000000000
--- a/emulators/vmips/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/11/20 13:30:03 rillig Exp $
-bin/vmips
-bin/vmipstool
-include/vmips/asm_regnames.h
-info/vmips.info
-man/man1/vmips.1
-man/man1/vmipstool.1
-share/examples/vmips/vmipsrc
-share/vmips/ld.script
-@dirrm share/vmips
-@dirrm share/examples/vmips
-@dirrm include/vmips
diff --git a/emulators/vmips/distinfo b/emulators/vmips/distinfo
deleted file mode 100644
index 1ba84881416..00000000000
--- a/emulators/vmips/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/11/20 13:30:03 rillig Exp $
-
-SHA1 (vmips-1.3.1.tar.gz) = 0ca5d942db5ceaabe18aae831e80df59be8e16d9
-RMD160 (vmips-1.3.1.tar.gz) = cfc831072cac4295e26fc57d8ed892d56f32c81a
-Size (vmips-1.3.1.tar.gz) = 1144409 bytes
diff --git a/emulators/vmware-module/DESCR b/emulators/vmware-module/DESCR
deleted file mode 100644
index b2a96c122ea..00000000000
--- a/emulators/vmware-module/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This package consists of set of kernel modules and scripts that will
-allow owners of the Linux version of VMware 2.x to run their binaries under
-NetBSD.
diff --git a/emulators/vmware-module/MESSAGE b/emulators/vmware-module/MESSAGE
deleted file mode 100644
index 9ec3c4155f5..00000000000
--- a/emulators/vmware-module/MESSAGE
+++ /dev/null
@@ -1,23 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2006/07/05 06:53:12 jlam Exp $
-
-To use ${PKGNAME}, you will need to copy the following files from
-${PREFIX}/etc/rc.d to /etc/rc.d:
-
-	linuxrtc vmmon vmnet vmnetif
-
-and append the following content to /etc/rc.conf:
-
-	vmware_prefix="${PREFIX}"
-	vmmon=YES
-	vmnet=YES
-	linuxrtc=NO
-	# XXX should cater for multiple interfaces
-	vmnetif=YES
-	vmnetifname=vmnet1
-	vmnetdev=/dev/vmnet1
-	vmnetifconfig="inet 172.16.212.1 netmask 0xffffff00"
-	vmnetif_use_dhcpd=NO
-
-Then, reboot your system.
-===========================================================================
diff --git a/emulators/vmware-module/Makefile b/emulators/vmware-module/Makefile
deleted file mode 100644
index 4c0b7650453..00000000000
--- a/emulators/vmware-module/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2007/02/22 19:26:29 wiz Exp $
-
-DISTNAME=	vmware-netbsd-1.2
-PKGNAME=	vmware-module-1.2
-CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/vmware/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.wasabisystems.com/
-COMMENT=	Kernel modules for the VMware 2.x emulator
-
-BROKEN_IN=	pkgsrc-2005Q4 pkgsrc-2006Q1 pkgsrc-2006Q4
-
-CONFLICTS=	vmware-module-3*
-
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
-
-WRKSRC=		${WRKDIR}
-NO_CONFIGURE=	yes
-
-NO_SRC_ON_FTP=		already there
-
-# to override <bsd.own.mk>, MUST be set this way BEFORE bsd.prefs.mk
-BSDSRCDIR?=	/nonexistent
-
-.include "../../mk/bsd.prefs.mk"
-
-pre-extract:
-.if ${BSDSRCDIR} == "/nonexistent"
-	@${ECHO_MSG} "Please set BSDSRCDIR in /etc/mk.conf, pointing it"
-	@${ECHO_MSG} "to a directory that contains sources that match"
-	@${ECHO_MSG} "your currently running system (esp. kernel), e.g."
-	@${ECHO_MSG} "/usr/src."
-	@${FALSE}
-.endif
-.if !exists(${BSDSRCDIR}/sys/lib/libkern/libkern.h)
-	@${ECHO_MSG} "Need a kernel source tree in ${BSDSRCDIR}/sys."
-	@${ECHO_MSG} "(Or set BSDSRCDIR correctly in /etc/mk.conf.)"
-	@${FALSE}
-.endif
-
-do-build:
-.for dir in linuxrtc vmmon vmnet
-	cd ${WRKSRC}/source/${dir} && ${MAKE}
-.endfor
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lkm
-	${INSTALL_DATA_DIR} ${PREFIX}/etc/rc.conf.d
-	${INSTALL_DATA} ${WRKDIR}/rc.conf.d/linuxrtc ${PREFIX}/etc/rc.conf.d
-	${INSTALL_DATA} ${WRKDIR}/rc.conf.d/vmmon ${PREFIX}/etc/rc.conf.d
-	${INSTALL_DATA} ${WRKDIR}/rc.conf.d/vmnet ${PREFIX}/etc/rc.conf.d
-	${INSTALL_DATA} ${WRKDIR}/rc.conf.d/vmnetif ${PREFIX}/etc/rc.conf.d
-	${INSTALL_DATA} ${WRKDIR}/source/linuxrtc/linuxrtc.o ${PREFIX}/lkm
-	${INSTALL_DATA} ${WRKDIR}/source/vmmon/vmmon.o ${PREFIX}/lkm
-	${INSTALL_DATA} ${WRKDIR}/source/vmnet/if_hub.o ${PREFIX}/lkm
-	${INSTALL_SCRIPT} ${WRKDIR}/share/lkm/if_hub_post.sh ${PREFIX}/lkm
-	${INSTALL_SCRIPT} ${WRKDIR}/share/lkm/linuxrtc_post.sh ${PREFIX}/lkm
-	${INSTALL_SCRIPT} ${WRKDIR}/share/lkm/vmmon_post.sh ${PREFIX}/lkm
-	@cd ${WRKSRC}/rc.d && for f in linuxrtc vmmon vmnet vmnetif; do \
-		${SED}  -e 's,@PREFIX@,${PREFIX},' < $$f > $$f.patched; \
-		${INSTALL_SCRIPT} $$f.patched ${PREFIX}/etc/rc.d/$$f; \
-	done
-	${SED} -e 's,@VMWARE_PREFIX@,${PREFIX},' \
-		< ${WRKSRC}/rc.conf.d/vmware > ${WRKSRC}/rc.conf.d/vmware.patched
-	${INSTALL_DATA} ${WRKSRC}/rc.conf.d/vmware.patched \
-		${PREFIX}/etc/rc.conf.d/vmware
-
-.include "../../mk/bsd.pkg.mk"
-
-LDFLAGS=	# empty since we use BSD-style makefiles
diff --git a/emulators/vmware-module/PLIST b/emulators/vmware-module/PLIST
deleted file mode 100644
index 26786b8cf8c..00000000000
--- a/emulators/vmware-module/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:21 tron Exp $
-etc/rc.conf.d/linuxrtc
-etc/rc.conf.d/vmmon
-etc/rc.conf.d/vmnet
-etc/rc.conf.d/vmnetif
-etc/rc.conf.d/vmware
-etc/rc.d/linuxrtc
-etc/rc.d/vmmon
-etc/rc.d/vmnet
-etc/rc.d/vmnetif
-lkm/if_hub.o
-lkm/if_hub_post.sh
-lkm/linuxrtc.o
-lkm/linuxrtc_post.sh
-lkm/vmmon.o
-lkm/vmmon_post.sh
-@dirrm etc/rc.conf.d
-@unexec ${RM} -f %D/lkm/if_hub. 2>/dev/null || ${TRUE}
-@unexec ${RM} -f %D/lkm/linuxrtc 2>/dev/null || ${TRUE}
-@unexec ${RM} -f %D/lkm/vmmon 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lkm 2>/dev/null || ${TRUE}
diff --git a/emulators/vmware-module/distinfo b/emulators/vmware-module/distinfo
deleted file mode 100644
index cda2df38cd3..00000000000
--- a/emulators/vmware-module/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 18:49:21 agc Exp $
-
-SHA1 (vmware-netbsd-1.2.tgz) = 383512f5a9f6cbc50ad5d25ea7e2ae921b00bb1a
-RMD160 (vmware-netbsd-1.2.tgz) = 857b17876611ca999747e38fce234a85ed9802a9
-Size (vmware-netbsd-1.2.tgz) = 97596 bytes
-SHA1 (patch-ab) = 19ff0b151b62870835a2b87e69a52b1cb3d95045
diff --git a/emulators/vmware-module/patches/patch-ab b/emulators/vmware-module/patches/patch-ab
deleted file mode 100644
index 94fc9949224..00000000000
--- a/emulators/vmware-module/patches/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/02/16 02:35:56 bad Exp $
-
---- rc.d/linuxrtc	Wed Apr  4 04:43:17 2001
-+++ rc.d/linuxrtc	Sun Jun 10 13:55:56 2001
-@@ -13,8 +17,8 @@
- 
- load_rc_config $name
- 
--linuxrtc_lkm="$vmware_prefix/share/vmware/lkm/linuxrtc.o"
--linuxrtc_post_script="$vmware_prefix/share/vmware/lkm/linuxrtc_post.sh"
-+linuxrtc_lkm="@PREFIX@/lkm/linuxrtc.o"
-+linuxrtc_post_script="@PREFIX@/lkm/linuxrtc_post.sh"
- 
- linuxrtc_prestart()
- {
---- rc.d/vmmon	Wed Apr  4 04:42:40 2001
-+++ rc.d/vmmon	Sun Jun 10 13:56:04 2001
-@@ -13,8 +13,8 @@
- 
- load_rc_config $name
- 
--vmmon_lkm="$vmware_prefix/share/vmware/lkm/vmmon.o"
--vmmon_post_script="$vmware_prefix/share/vmware/lkm/vmmon_post.sh"
-+vmmon_lkm="@PREFIX@/lkm/vmmon.o"
-+vmmon_post_script="@PREFIX@/lkm/vmmon_post.sh"
- 
- vmmon_prestart()
- {
---- rc.d/vmnet	Wed Apr  4 04:42:40 2001
-+++ rc.d/vmnet	Sun Jun 10 13:56:12 2001
-@@ -13,8 +13,8 @@
- 
- load_rc_config $name
- 
--vmnet_lkm="$vmware_prefix/share/vmware/lkm/if_hub.o"
--vmnet_post_script="$vmware_prefix/share/vmware/lkm/if_hub_post.sh"
-+vmnet_lkm="@PREFIX@/lkm/if_hub.o"
-+vmnet_post_script="@PREFIX@/lkm/if_hub_post.sh"
- 
- vmnet_prestart()
- {
diff --git a/emulators/vmware-module3/DESCR b/emulators/vmware-module3/DESCR
deleted file mode 100644
index e60c0da5d4d..00000000000
--- a/emulators/vmware-module3/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This package consists of set of kernel modules and scripts that will
-allow owners of the Linux version of VMware 3.x to run their binaries under
-NetBSD.
diff --git a/emulators/vmware-module3/MESSAGE b/emulators/vmware-module3/MESSAGE
deleted file mode 100644
index 9ec3c4155f5..00000000000
--- a/emulators/vmware-module3/MESSAGE
+++ /dev/null
@@ -1,23 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2006/07/05 06:53:12 jlam Exp $
-
-To use ${PKGNAME}, you will need to copy the following files from
-${PREFIX}/etc/rc.d to /etc/rc.d:
-
-	linuxrtc vmmon vmnet vmnetif
-
-and append the following content to /etc/rc.conf:
-
-	vmware_prefix="${PREFIX}"
-	vmmon=YES
-	vmnet=YES
-	linuxrtc=NO
-	# XXX should cater for multiple interfaces
-	vmnetif=YES
-	vmnetifname=vmnet1
-	vmnetdev=/dev/vmnet1
-	vmnetifconfig="inet 172.16.212.1 netmask 0xffffff00"
-	vmnetif_use_dhcpd=NO
-
-Then, reboot your system.
-===========================================================================
diff --git a/emulators/vmware-module3/Makefile b/emulators/vmware-module3/Makefile
deleted file mode 100644
index f9c2e61ff6e..00000000000
--- a/emulators/vmware-module3/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:29 wiz Exp $
-
-DISTNAME=	vmware-netbsd-3.2.1.8
-PKGNAME=	vmware-module-3.2.1.8
-CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/vmware/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	jdolecek@NetBSD.org
-HOMEPAGE=	http://www.wasabisystems.com/
-COMMENT=	Kernel modules for the VMware 3.2.1 PC emulator
-
-CONFLICTS=	vmware-module-1.*
-
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
-
-NO_CONFIGURE=	yes
-
-NO_SRC_ON_FTP=		already there
-
-.include "../../mk/bsd.prefs.mk"
-
-pre-extract:
-.if !exists(${BSDSRCDIR}/sys/lib/libkern/libkern.h)
-	@${ECHO_MSG} "Please set BSDSRCDIR in /etc/mk.conf, pointing it"
-	@${ECHO_MSG} "to a directory that contains sources that match"
-	@${ECHO_MSG} "your currently running system (esp. kernel), e.g."
-	@${ECHO_MSG} "/usr/src."
-	@${FALSE}
-.endif
-.if !exists(${BSDSRCDIR}/sys/lib/libkern/libkern.h)
-	@${ECHO_MSG} "Need a kernel source tree in ${BSDSRCDIR}/sys."
-	@${ECHO_MSG} "(Or set BSDSRCDIR correctly in /etc/mk.conf.)"
-	@${FALSE}
-.endif
-
-do-build:
-.for dir in linuxrtc vmmon vmnet
-	cd ${WRKSRC}/source/${dir} && ${MAKE}
-.endfor
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lkm
-	${INSTALL_DATA_DIR} ${PREFIX}/etc/rc.conf.d
-	${INSTALL_DATA} ${WRKSRC}/rc.conf.d/linuxrtc ${PREFIX}/etc/rc.conf.d
-	${INSTALL_DATA} ${WRKSRC}/rc.conf.d/vmmon ${PREFIX}/etc/rc.conf.d
-	${INSTALL_DATA} ${WRKSRC}/rc.conf.d/vmnet ${PREFIX}/etc/rc.conf.d
-	${INSTALL_DATA} ${WRKSRC}/rc.conf.d/vmnetif ${PREFIX}/etc/rc.conf.d
-	${INSTALL_DATA} ${WRKSRC}/source/linuxrtc/linuxrtc.o ${PREFIX}/lkm
-	${INSTALL_DATA} ${WRKSRC}/source/vmmon/vmmon.o ${PREFIX}/lkm
-	${INSTALL_DATA} ${WRKSRC}/source/vmnet/vmnet.o ${PREFIX}/lkm
-	${INSTALL_SCRIPT} ${WRKSRC}/share/lkm/vmnet_post.sh ${PREFIX}/lkm
-	${INSTALL_SCRIPT} ${WRKSRC}/share/lkm/linuxrtc_post.sh ${PREFIX}/lkm
-	${INSTALL_SCRIPT} ${WRKSRC}/share/lkm/vmmon_post.sh ${PREFIX}/lkm
-	@cd ${WRKSRC}/rc.d && for f in linuxrtc vmmon vmnet vmnetif; do \
-		${SED}  -e 's,@PREFIX@,${PREFIX},' < $$f > $$f.patched; \
-		${INSTALL_SCRIPT} $$f.patched ${PREFIX}/etc/rc.d/$$f; \
-	done
-	${SED} -e 's,@VMWARE_PREFIX@,${PREFIX},' \
-		< ${WRKSRC}/rc.conf.d/vmware > ${WRKSRC}/rc.conf.d/vmware.patched
-	${INSTALL_DATA} ${WRKSRC}/rc.conf.d/vmware.patched \
-		${PREFIX}/etc/rc.conf.d/vmware
-
-.include "../../mk/bsd.pkg.mk"
-
-LDFLAGS=	# empty since we use BSD-style makefiles
diff --git a/emulators/vmware-module3/PLIST b/emulators/vmware-module3/PLIST
deleted file mode 100644
index acf7e8fb58b..00000000000
--- a/emulators/vmware-module3/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/16 19:43:36 bad Exp $
-etc/rc.conf.d/linuxrtc
-etc/rc.conf.d/vmmon
-etc/rc.conf.d/vmnet
-etc/rc.conf.d/vmnetif
-etc/rc.conf.d/vmware
-etc/rc.d/linuxrtc
-etc/rc.d/vmmon
-etc/rc.d/vmnet
-etc/rc.d/vmnetif
-lkm/vmnet.o
-lkm/vmnet_post.sh
-lkm/linuxrtc.o
-lkm/linuxrtc_post.sh
-lkm/vmmon.o
-lkm/vmmon_post.sh
-@dirrm etc/rc.conf.d
-@unexec ${RM} -f %D/lkm/vmnet 2>/dev/null || ${TRUE}
-@unexec ${RM} -f %D/lkm/linuxrtc 2>/dev/null || ${TRUE}
-@unexec ${RM} -f %D/lkm/vmmon 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lkm 2>/dev/null || ${TRUE}
diff --git a/emulators/vmware-module3/distinfo b/emulators/vmware-module3/distinfo
deleted file mode 100644
index 041d6ac770c..00000000000
--- a/emulators/vmware-module3/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.12 2006/03/26 21:34:51 veego Exp $
-
-SHA1 (vmware-netbsd-3.2.1.8.tar.bz2) = 48fc126458f3da61ec68f45655e62e87fe0821cb
-RMD160 (vmware-netbsd-3.2.1.8.tar.bz2) = baa97e70efea5de83eb9f40f31024c8db474480b
-Size (vmware-netbsd-3.2.1.8.tar.bz2) = 81787 bytes
-SHA1 (patch-ab) = 412a3fa0a49aebe5f52cb46015fb9b981625f4ac
diff --git a/emulators/vmware-module3/patches/patch-ab b/emulators/vmware-module3/patches/patch-ab
deleted file mode 100644
index 2c95affacf0..00000000000
--- a/emulators/vmware-module3/patches/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/02/16 19:43:36 bad Exp $
-
---- rc.d/linuxrtc	Wed Apr  4 04:43:17 2001
-+++ rc.d/linuxrtc	Sun Jun 10 13:55:56 2001
-@@ -13,8 +17,8 @@
- 
- load_rc_config $name
- 
--linuxrtc_lkm="$vmware_prefix/share/vmware/lkm/linuxrtc.o"
--linuxrtc_post_script="$vmware_prefix/share/vmware/lkm/linuxrtc_post.sh"
-+linuxrtc_lkm="@PREFIX@/lkm/linuxrtc.o"
-+linuxrtc_post_script="@PREFIX@/lkm/linuxrtc_post.sh"
- 
- linuxrtc_prestart()
- {
---- rc.d/vmmon	Wed Apr  4 04:42:40 2001
-+++ rc.d/vmmon	Sun Jun 10 13:56:04 2001
-@@ -13,8 +13,8 @@
- 
- load_rc_config $name
- 
--vmmon_lkm="$vmware_prefix/share/vmware/lkm/vmmon.o"
--vmmon_post_script="$vmware_prefix/share/vmware/lkm/vmmon_post.sh"
-+vmmon_lkm="@PREFIX@/lkm/vmmon.o"
-+vmmon_post_script="@PREFIX@/lkm/vmmon_post.sh"
- 
- vmmon_prestart()
- {
---- rc.d/vmnet	Wed Apr  4 04:42:40 2001
-+++ rc.d/vmnet	Sun Jun 10 13:56:12 2001
-@@ -13,8 +13,8 @@
- 
- load_rc_config $name
- 
--vmnet_lkm="$vmware_prefix/share/vmware/lkm/vmnet.o"
--vmnet_post_script="$vmware_prefix/share/vmware/lkm/vmnet_post.sh"
-+vmnet_lkm="@PREFIX@/lkm/vmnet.o"
-+vmnet_post_script="@PREFIX@/lkm/vmnet_post.sh"
- 
- vmnet_prestart()
- {
diff --git a/emulators/vmware/DESCR b/emulators/vmware/DESCR
deleted file mode 100644
index 8d7c2de0ac2..00000000000
--- a/emulators/vmware/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Run Windows 95, Windows 98, Windows NT, Windows 2000, FreeBSD, NetBSD,
-or Linux under VMware Workstation 2.x.
-
-Each VMware world is the equivalent of a full PC in a window.
-
-Operating systems run simultaneously without dual booting.
-
-Add new operating systems without repartitioning disks.
diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile
deleted file mode 100644
index af49dc32bb1..00000000000
--- a/emulators/vmware/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2007/03/21 16:15:58 tron Exp $
-
-DISTNAME=	VMware-2.0.4-1142
-PKGNAME=	vmware-2.0.4
-PKGREVISION=	1
-CATEGORIES=	emulators
-MASTER_SITES=	http://www4.vmware.com/software/ \
-		http://www.vmware.com/download1/software/ \
-		ftp://download1.vmware.com/pub/software/ \
-		http://vmware-svca.www.conxion.com/software/ \
-		http://vmware-chil.www.conxion.com/software/ \
-		http://vmware-heva.www.conxion.com/software/ \
-		ftp://vmware.wespe.de/pub/software/ \
-		ftp://mirror.aarnet.edu.au/pub/vmware/software/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.vmware.com/
-COMMENT=	VMware 2.x emulator
-
-CONFLICTS=	vmware-3*
-
-DEPENDS+=	vmware-module-1.*:../../emulators/vmware-module
-DEPENDS+=	suse_vmware>=6.4nb1:../../emulators/${SUSE_DIR_PREFIX}_vmware
-
-LICENSE=	vmware-license
-
-WRKSRC=		${WRKDIR}/vmware-distrib
-
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
-
-# We could install it into /etc/vmware, but that would mean we install
-# it somewhere out of ${PREFIX}, which is not a good idea, and the linux
-# emulation has a fallbackmode to look into ${PREFIX}/emul/linux/etc,
-# so use this way.
-VMWARE_CFG_DIR=		${PREFIX}/emul/linux/etc/vmware
-
-.include "../../mk/bsd.prefs.mk"
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
-do-build:
-	${GZCAT} ${WRKSRC}/man/man1/vmware.1.gz > ${WRKDIR}/vmware.1
-
-do-install: do-install-dirs do-install-binaries do-install-docs \
-		do-install-share
-
-do-install-dirs:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vmware
-	for dirs in configurator doc floppies help smb xkeymap; do \
-		${INSTALL_DATA_DIR} ${PREFIX}/share/vmware/$$dirs; \
-	done
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vmware/smb/codepages
-	${INSTALL_DATA_DIR} ${VMWARE_CFG_DIR}
-
-do-install-binaries:
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${PREFIX}/bin
-	${CHMOD} u+s ${PREFIX}/bin/vmware
-
-do-install-docs:
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/vmware/doc
-
-do-install-share:
-	${INSTALL_DATA} ${WRKSRC}/lib/help/* ${PREFIX}/share/vmware/help
-	${INSTALL_DATA} ${WRKSRC}/lib/xkeymap/* ${PREFIX}/share/vmware/xkeymap
-	${INSTALL_DATA} ${WRKSRC}/lib/floppies/* ${PREFIX}/share/vmware/floppies
-	${INSTALL_DATA} ${WRKSRC}/lib/smb/codepages/* ${PREFIX}/share/vmware/smb/codepages
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/* ${PREFIX}/share/vmware/configurator
-	${INSTALL_DATA} ${WRKSRC}/lib/config ${PREFIX}/share/vmware
-	${INSTALL_DATA} ${WRKSRC}/lib/floppy.nvr ${PREFIX}/share/vmware
-	${INSTALL_MAN} ${WRKDIR}/vmware.1 ${PREFIX}/${PKGMANDIR}/man1
-
-post-install:
-	@${RM} -f ${VMWARE_CFG_DIR}/config
-	@(								\
-	${ECHO} "vmware.fullpath = \"${PREFIX}/bin/vmware\"";		\
-	${ECHO} "wizard.fullpath = \"${PREFIX}/bin/vmware-wizard\"";	\
-	${ECHO} "dhcpd.fullpath = \"${PREFIX}/bin/vmware-dhcpd\"";	\
-	${ECHO} "loop.fullpath = \"${PREFIX}/bin/vmware-loop\"";	\
-	${ECHO} "smbpasswd.fullpath = \"${PREFIX}/bin/vmware-smbpasswd\"";	\
-	${ECHO} "libdir = \"${PREFIX}/share/vmware\"";			\
-	${ECHO} "vmnet1.HostOnlyAddress = \"172.16.212.1\"";		\
-	${ECHO} "vmnet1.HostOnlyNetMask = \"255.255.255.0\"";		\
-	) > ${VMWARE_CFG_DIR}/config
-
-.include "../../emulators/suse_linux/Makefile.application"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/vmware/PLIST b/emulators/vmware/PLIST
deleted file mode 100644
index f9c89f02195..00000000000
--- a/emulators/vmware/PLIST
+++ /dev/null
@@ -1,136 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:06 zuntum Exp $
-bin/vmnet-bridge
-bin/vmnet-dhcpd
-bin/vmnet-netifup
-bin/vmnet-sniffer
-bin/vmware
-bin/vmware-config.pl
-bin/vmware-loop
-bin/vmware-mount.pl
-bin/vmware-nmbd
-bin/vmware-ping
-bin/vmware-smbd
-bin/vmware-smbpasswd
-bin/vmware-smbpasswd.bin
-bin/vmware-uninstall.pl
-bin/vmware-wizard
-emul/linux/etc/vmware/config
-man/man1/vmware.1
-share/vmware/config
-share/vmware/configurator/vmnet-dhcpd.conf
-share/vmware/configurator/vmnet-smb.conf
-share/vmware/doc/CHANGES
-share/vmware/doc/DHCP-COPYRIGHT
-share/vmware/doc/EULA
-share/vmware/doc/INSTALL
-share/vmware/doc/README
-share/vmware/doc/SAMBA-LICENSE
-share/vmware/floppies/linux.flp
-share/vmware/floppies/windows.flp
-share/vmware/floppy.nvr
-share/vmware/help/AutoFit.htm
-share/vmware/help/ConfigDiskPartition.htm
-share/vmware/help/ConfigDisks.htm
-share/vmware/help/ConfigEditor.htm
-share/vmware/help/ConfigEthernet.htm
-share/vmware/help/ConfigFloppy.htm
-share/vmware/help/ConfigGuestOS.htm
-share/vmware/help/ConfigMemory.htm
-share/vmware/help/ConfigMisc.htm
-share/vmware/help/ConfigParallel.htm
-share/vmware/help/ConfigScsiDisks.htm
-share/vmware/help/ConfigSerial.htm
-share/vmware/help/ConfigSound.htm
-share/vmware/help/ConfigWiz.htm
-share/vmware/help/Configuration.htm
-share/vmware/help/Fit.htm
-share/vmware/help/FullScreen.gif
-share/vmware/help/Fullscreen.htm
-share/vmware/help/GeneralInput.htm
-share/vmware/help/GeneralMemory.htm
-share/vmware/help/GeneralPreferences.htm
-share/vmware/help/Glossary.htm
-share/vmware/help/Help.gif
-share/vmware/help/Interacting.htm
-share/vmware/help/Introduction.htm
-share/vmware/help/Power.htm
-share/vmware/help/PowerOff.gif
-share/vmware/help/PowerOff.htm
-share/vmware/help/PowerOn.gif
-share/vmware/help/PowerOn.htm
-share/vmware/help/PowerReset.gif
-share/vmware/help/PowerReset.htm
-share/vmware/help/Resume.gif
-share/vmware/help/Resume.htm
-share/vmware/help/RunVM.htm
-share/vmware/help/SendCtlAltDel.htm
-share/vmware/help/Setremdev.htm
-share/vmware/help/Settings.htm
-share/vmware/help/ShowAllHints.htm
-share/vmware/help/StatusBar.htm
-share/vmware/help/Suspend.gif
-share/vmware/help/Suspend.htm
-share/vmware/help/ToolbarButtons.htm
-share/vmware/help/ToolsInstall.htm
-share/vmware/help/View.htm
-share/vmware/help/Wizcd.htm
-share/vmware/help/Wizcongrats.htm
-share/vmware/help/Wizdisk.htm
-share/vmware/help/Wizdisk3.htm
-share/vmware/help/WizdiskType.htm
-share/vmware/help/Wizfloppy.htm
-share/vmware/help/Wiznetwork.htm
-share/vmware/help/Wizos.htm
-share/vmware/help/Wizpath.htm
-share/vmware/help/toc.htm
-share/vmware/smb/codepages/codepage.437
-share/vmware/smb/codepages/codepage.737
-share/vmware/smb/codepages/codepage.850
-share/vmware/smb/codepages/codepage.852
-share/vmware/smb/codepages/codepage.861
-share/vmware/smb/codepages/codepage.866
-share/vmware/smb/codepages/codepage.932
-share/vmware/smb/codepages/codepage.936
-share/vmware/smb/codepages/codepage.949
-share/vmware/smb/codepages/codepage.950
-share/vmware/xkeymap/be101
-share/vmware/xkeymap/be104
-share/vmware/xkeymap/chde101
-share/vmware/xkeymap/chde104
-share/vmware/xkeymap/chfr101
-share/vmware/xkeymap/chfr104
-share/vmware/xkeymap/de101
-share/vmware/xkeymap/de104
-share/vmware/xkeymap/dk101
-share/vmware/xkeymap/dk104
-share/vmware/xkeymap/es101
-share/vmware/xkeymap/es104
-share/vmware/xkeymap/fi101
-share/vmware/xkeymap/fi104
-share/vmware/xkeymap/fr101
-share/vmware/xkeymap/fr104
-share/vmware/xkeymap/gb101
-share/vmware/xkeymap/gb104
-share/vmware/xkeymap/is101
-share/vmware/xkeymap/is104
-share/vmware/xkeymap/it101
-share/vmware/xkeymap/it104
-share/vmware/xkeymap/jp106
-share/vmware/xkeymap/jp109
-share/vmware/xkeymap/no101
-share/vmware/xkeymap/no104
-share/vmware/xkeymap/pt101
-share/vmware/xkeymap/pt104
-share/vmware/xkeymap/se101
-share/vmware/xkeymap/se104
-share/vmware/xkeymap/us101
-share/vmware/xkeymap/us104
-@dirrm emul/linux/etc/vmware
-@dirrm share/vmware/configurator
-@dirrm share/vmware/doc
-@dirrm share/vmware/floppies
-@dirrm share/vmware/help
-@dirrm share/vmware/smb/codepages
-@dirrm share/vmware/smb
-@dirrm share/vmware/xkeymap
-@dirrm share/vmware
diff --git a/emulators/vmware/distinfo b/emulators/vmware/distinfo
deleted file mode 100644
index fee929dd8bd..00000000000
--- a/emulators/vmware/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:21 agc Exp $
-
-SHA1 (VMware-2.0.4-1142.tar.gz) = 3c1ae31a366b46d787817054685a4cf6c0606afd
-RMD160 (VMware-2.0.4-1142.tar.gz) = d42a69939b83c51be07562a7789a9add1f05f6b9
-Size (VMware-2.0.4-1142.tar.gz) = 6533427 bytes
diff --git a/emulators/vmware3/DESCR b/emulators/vmware3/DESCR
deleted file mode 100644
index e8fbd10e0db..00000000000
--- a/emulators/vmware3/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Run Windows 95, Windows 98, Windows NT, Windows 2000, FreeBSD, NetBSD,
-or Linux under VMware Workstation 3.x.
-
-Each VMware world is the equivalent of a full PC in a window.
-
-Operating systems run simultaneously without dual booting.
-
-Add new operating systems without repartitioning disks.
diff --git a/emulators/vmware3/MESSAGE.NetBSD b/emulators/vmware3/MESSAGE.NetBSD
deleted file mode 100644
index f30e230196e..00000000000
--- a/emulators/vmware3/MESSAGE.NetBSD
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.2 2006/03/26 21:37:12 veego Exp $
-
-NetBSD had problem with emulation of Linux SVID shared memory handling,
-which caused black screen in VMware 3.x when the guest OS switched
-to graphics mode. The problem has been fixed in NetBSD 2.99.9 and
-2.0RC3.
-
-If you experience this problem, setting your DISPLAY environment variable
-to "localhost:0" should help.
-
-VMware fails to start if you use a tmpfs for /tmp.
-===========================================================================
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
deleted file mode 100644
index 567f8ff0ccb..00000000000
--- a/emulators/vmware3/Makefile
+++ /dev/null
@@ -1,114 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2007/01/07 09:13:53 rillig Exp $
-
-DISTNAME=	VMware-workstation-3.2.1-2242
-PKGNAME=	vmware-3.2.1pl1
-PKGREVISION=	2
-CATEGORIES=	emulators
-MASTER_SITES=	http://download3.vmware.com/software/wkst/ \
-		http://vmware-svca.www.conxion.com/software/ \
-		http://vmware-chil.www.conxion.com/software/ \
-		http://vmware-heva.www.conxion.com/software/ \
-		ftp://mirror.aarnet.edu.au/pub/vmware/software/
-
-MAINTAINER=	jdolecek@NetBSD.org
-HOMEPAGE=	http://www.vmware.com/
-COMMENT=	VMware emulator 3.x
-
-CONFLICTS=	vmware-2.*
-
-# Binary patch to fix an problem with the nice(3) interface in an
-# newer glibc (>= v2.3.3)
-VMWARE_BIN_PATCH=	vmware-any-any-update99
-
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=	${VMWARE_BIN_PATCH}.tar.gz
-SITES.${VMWARE_BIN_PATCH}.tar.gz=	ftp://ftp.cvut.cz/vmware/obsolete/
-
-DEPENDS+=	vmware-module>=3.2.1.8:../../emulators/vmware-module3
-DEPENDS+=	suse_vmware>=6.4nb1:../../emulators/suse91_vmware
-
-LICENSE=	vmware-license
-
-WRKSRC=		${WRKDIR}/vmware-distrib
-
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
-# There is a kernel bug in NetBSD 3.0 for vmware.
-NOT_FOR_PLATFORM=	NetBSD-3.0*-i386
-
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-# We could install it into /etc/vmware, but that would mean we install
-# it somewhere out of ${PREFIX}, which is not a good idea, and the linux
-# emulation has a fallbackmode to look into ${PREFIX}/emul/linux/etc,
-# so use this way.
-VMWARE_CFG_DIR=		${PREFIX}/emul/linux/etc/vmware
-
-.include "../../mk/bsd.prefs.mk"
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
-do-build:
-	${GZCAT} ${WRKSRC}/man/man1/vmware.1.gz > ${WRKDIR}/vmware.1
-	cd ${WRKDIR}/${VMWARE_BIN_PATCH} &&	\
-	${RM} -f update &&			\
-	${CC} ${CFLAGS} -o update update.c &&	\
-	${CHMOD} u+w ${WRKSRC}/bin/vmware && 	\
-	./update vmware ${WRKSRC}/bin/vmware
-
-do-install: do-install-dirs do-install-binaries do-install-docs \
-		do-install-share
-
-do-install-dirs:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vmware
-	for dirs in bin configurator doc isoimages help licenses messages smb xkeymap; do \
-		${INSTALL_DATA_DIR} ${PREFIX}/share/vmware/$$dirs; \
-	done
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vmware/licenses/site
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vmware/licenses/user
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vmware/messages/chef
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vmware/messages/ja
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vmware/messages/jive
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vmware/smb/codepages
-	${INSTALL_DATA_DIR} ${VMWARE_CFG_DIR}
-
-do-install-binaries:
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${PREFIX}/bin
-	${CHMOD} u+s ${PREFIX}/bin/vmware
-
-do-install-docs:
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/vmware/doc
-
-do-install-share:
-	${INSTALL_SCRIPT} ${WRKSRC}/lib/bin/* ${PREFIX}/share/vmware/bin
-	${INSTALL_DATA} ${WRKSRC}/lib/help/* ${PREFIX}/share/vmware/help
-	${INSTALL_DATA} ${WRKSRC}/lib/xkeymap/* ${PREFIX}/share/vmware/xkeymap
-	${INSTALL_DATA} ${WRKSRC}/lib/isoimages/* ${PREFIX}/share/vmware/isoimages
-	${INSTALL_DATA} ${WRKSRC}/lib/licenses/user/* ${PREFIX}/share/vmware/licenses/user
-	${INSTALL_DATA} ${WRKSRC}/lib/messages/chef/* ${PREFIX}/share/vmware/messages/chef
-	${INSTALL_DATA} ${WRKSRC}/lib/messages/ja/* ${PREFIX}/share/vmware/messages/ja
-	${INSTALL_DATA} ${WRKSRC}/lib/messages/jive/* ${PREFIX}/share/vmware/messages/jive
-	${INSTALL_DATA} ${WRKSRC}/lib/smb/codepages/* ${PREFIX}/share/vmware/smb/codepages
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/* ${PREFIX}/share/vmware/configurator
-	${INSTALL_DATA} ${WRKSRC}/lib/config ${PREFIX}/share/vmware
-	${INSTALL_MAN} ${WRKDIR}/vmware.1 ${PREFIX}/${PKGMANDIR}/man1
-
-post-install:
-	@${RM} -f ${VMWARE_CFG_DIR}/config
-	@(								\
-	${ECHO} "vmware.fullpath = \"${PREFIX}/bin/vmware\"";		\
-	${ECHO} "wizard.fullpath = \"${PREFIX}/bin/vmware-wizard\"";	\
-	${ECHO} "dhcpd.fullpath = \"${PREFIX}/bin/vmware-dhcpd\"";	\
-	${ECHO} "natd.fullpath = \"${PREFIX}/bin/vmware-natd\"";	\
-	${ECHO} "smbpasswd.fullpath = \"${PREFIX}/bin/vmware-smbpasswd\"";	\
-	${ECHO} "libdir = \"${PREFIX}/share/vmware\"";			\
-	${ECHO} "vmnet1.HostOnlyAddress = \"172.16.212.1\"";		\
-	${ECHO} "vmnet1.HostOnlyNetMask = \"255.255.255.0\"";		\
-	${ECHO} "host.FSSupportLocking1 = 0x1";				\
-	${ECHO} "xkeymap.usekeycodeMapIfXFree86 = true";		\
-	) > ${VMWARE_CFG_DIR}/config
-
-.include "../../emulators/suse_linux/Makefile.application"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/vmware3/PLIST b/emulators/vmware3/PLIST
deleted file mode 100644
index 20ebd5f7912..00000000000
--- a/emulators/vmware3/PLIST
+++ /dev/null
@@ -1,323 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/16 19:54:56 bad Exp $
-bin/vmnet-bridge
-bin/vmnet-dhcpd
-bin/vmnet-natd
-bin/vmnet-netifup
-bin/vmnet-sniffer
-bin/vmware
-bin/vmware-config.pl
-bin/vmware-nmbd
-bin/vmware-ping
-bin/vmware-smbd
-bin/vmware-smbpasswd
-bin/vmware-smbpasswd.bin
-bin/vmware-uninstall.pl
-bin/vmware-wizard
-emul/linux/etc/vmware/config
-man/man1/vmware.1
-share/vmware/bin/vmware-mks
-share/vmware/bin/vmware-ui
-share/vmware/config
-share/vmware/configurator/vmnet-dhcpd.conf
-share/vmware/configurator/vmnet-nat.conf
-share/vmware/configurator/vmnet-smb.conf
-share/vmware/doc/EULA
-share/vmware/doc/INSTALL
-share/vmware/doc/README
-share/vmware/doc/open_source_licenses.txt
-share/vmware/help/CUSTOM-NETWORK.gif
-share/vmware/help/ConfigWiz.htm
-share/vmware/help/FullScreen.gif
-share/vmware/help/Help.gif
-share/vmware/help/PowerOff.gif
-share/vmware/help/PowerOn.gif
-share/vmware/help/PowerReset.gif
-share/vmware/help/Resume.gif
-share/vmware/help/Suspend.gif
-share/vmware/help/Wizcd.htm
-share/vmware/help/Wizcongrats.htm
-share/vmware/help/Wizdisk.htm
-share/vmware/help/Wizdisk3.htm
-share/vmware/help/WizdiskType.htm
-share/vmware/help/Wizfloppy.htm
-share/vmware/help/Wizguestkit.htm
-share/vmware/help/Wiznetwork.htm
-share/vmware/help/Wizos.htm
-share/vmware/help/Wizpath.htm
-share/vmware/help/about_this_help.htm
-share/vmware/help/commandref_linux.htm
-share/vmware/help/config_editor.htm
-share/vmware/help/config_editor_newvm.htm
-share/vmware/help/configvm.htm
-share/vmware/help/configvm_adv.htm
-share/vmware/help/configvm_automation.htm
-share/vmware/help/configvm_debug.htm
-share/vmware/help/configvm_disableaccel.htm
-share/vmware/help/configvm_display-problems.htm
-share/vmware/help/configvm_displayname.htm
-share/vmware/help/configvm_guestos.htm
-share/vmware/help/configvm_logs.htm
-share/vmware/help/configvm_memory.htm
-share/vmware/help/configvm_options.htm
-share/vmware/help/configvm_state.htm
-share/vmware/help/configvm_virtualdisk.htm
-share/vmware/help/configvmware-disablemem.htm
-share/vmware/help/configvmware-inputgrab.htm
-share/vmware/help/configvmware-maxmemory.htm
-share/vmware/help/configvmware-shift.htm
-share/vmware/help/configvmware.htm
-share/vmware/help/configvmware_copy_paste.htm
-share/vmware/help/devices.htm
-share/vmware/help/devices_autostart.htm
-share/vmware/help/devices_cdrom-changeconnect.htm
-share/vmware/help/devices_cdrom-disable.htm
-share/vmware/help/devices_cdrom-issues-linux.htm
-share/vmware/help/devices_cdrom-issues.htm
-share/vmware/help/devices_cdrom-removable.htm
-share/vmware/help/devices_cdrom-remove.htm
-share/vmware/help/devices_cdrom.htm
-share/vmware/help/devices_floppy.htm
-share/vmware/help/devices_floppy_changeconnect.htm
-share/vmware/help/devices_genscsi.htm
-share/vmware/help/devices_genscsi_linux.htm
-share/vmware/help/devices_modem.htm
-share/vmware/help/devices_mouse.htm
-share/vmware/help/devices_netadapter.htm
-share/vmware/help/devices_parallel-info.htm
-share/vmware/help/devices_parallel-onguestos.htm
-share/vmware/help/devices_parallel.htm
-share/vmware/help/devices_parallel_changeconnect.htm
-share/vmware/help/devices_pcmcia.htm
-share/vmware/help/devices_plaindisk-info.htm
-share/vmware/help/devices_plaindisk.htm
-share/vmware/help/devices_printer.htm
-share/vmware/help/devices_rawdisk.htm
-share/vmware/help/devices_remove_netadapter.htm
-share/vmware/help/devices_scanner.htm
-share/vmware/help/devices_scsi-bios.htm
-share/vmware/help/devices_scsi-guestos.htm
-share/vmware/help/devices_scsi.htm
-share/vmware/help/devices_scsi_info.htm
-share/vmware/help/devices_scsi_vs-ide.htm
-share/vmware/help/devices_serial.htm
-share/vmware/help/devices_sound-issues.htm
-share/vmware/help/devices_sound.htm
-share/vmware/help/devices_sound_changeconn.htm
-share/vmware/help/devices_usb-info.htm
-share/vmware/help/devices_usb.htm
-share/vmware/help/devices_video-linux-res.htm
-share/vmware/help/devices_video-linux.htm
-share/vmware/help/devices_video-win2000.htm
-share/vmware/help/devices_video-win95.htm
-share/vmware/help/devices_video-win98.htm
-share/vmware/help/devices_virtualdrive-consolidate.htm
-share/vmware/help/devices_virtualdrive-diskmode.htm
-share/vmware/help/devices_virtualdrive-virtualdisk-physical.htm
-share/vmware/help/devices_virtualdrive-virtualdisk-reuse.htm
-share/vmware/help/devices_virtualdrive-virtualdisk.htm
-share/vmware/help/devices_virtualdrive.htm
-share/vmware/help/devices_zipdrive.htm
-share/vmware/help/glossary.htm
-share/vmware/help/grab.htm
-share/vmware/help/guestos-corellinux.htm
-share/vmware/help/guestos-dos.htm
-share/vmware/help/guestos-freebsd.htm
-share/vmware/help/guestos-kit.htm
-share/vmware/help/guestos-mandrake-linux.htm
-share/vmware/help/guestos-mandrake-linux8081.htm
-share/vmware/help/guestos-mandrake-linux82.htm
-share/vmware/help/guestos-novell-4.htm
-share/vmware/help/guestos-novell-5.htm
-share/vmware/help/guestos-novell-6.htm
-share/vmware/help/guestos-novell-zenwrks.htm
-share/vmware/help/guestos-openlinux.htm
-share/vmware/help/guestos-rawdisk.htm
-share/vmware/help/guestos-redhat-linux.htm
-share/vmware/help/guestos-redhat-linux6.x.htm
-share/vmware/help/guestos-redhat-linux7.0.htm
-share/vmware/help/guestos-redhat-linux7.1.htm
-share/vmware/help/guestos-redhat-linux7.3.htm
-share/vmware/help/guestos-solaris7.htm
-share/vmware/help/guestos-suse-linux-6.x.htm
-share/vmware/help/guestos-suse-linux-7.0.htm
-share/vmware/help/guestos-suse-linux-7.1.htm
-share/vmware/help/guestos-suse-linux-8.0.htm
-share/vmware/help/guestos-suse-linux.htm
-share/vmware/help/guestos-turbolinux-6.0.htm
-share/vmware/help/guestos-turbolinux-7.0.htm
-share/vmware/help/guestos-turbolinux.htm
-share/vmware/help/guestos-win2000.htm
-share/vmware/help/guestos-win95.htm
-share/vmware/help/guestos-win98.htm
-share/vmware/help/guestos-winNETSvr.htm
-share/vmware/help/guestos-winXP.htm
-share/vmware/help/guestos-winme.htm
-share/vmware/help/guestos-winnt.htm
-share/vmware/help/guestos.htm
-share/vmware/help/hotkey.htm
-share/vmware/help/image001.gif
-share/vmware/help/index.htm
-share/vmware/help/install_apps.htm
-share/vmware/help/introduction.htm
-share/vmware/help/keyboard_issus.htm
-share/vmware/help/lock_files.htm
-share/vmware/help/memory.htm
-share/vmware/help/migratevm-toupgrade.htm
-share/vmware/help/migratevm-uninstall.htm
-share/vmware/help/migratevm-upgrade.htm
-share/vmware/help/migratevm.htm
-share/vmware/help/migratevm_buildno.htm
-share/vmware/help/migratevm_pc.htm
-share/vmware/help/migrating.htm
-share/vmware/help/movefiles.htm
-share/vmware/help/networking-components.htm
-share/vmware/help/networking-onguestos.htm
-share/vmware/help/networking-onhost.htm
-share/vmware/help/networking-promiscuous.htm
-share/vmware/help/networking.htm
-share/vmware/help/networking_assignip.htm
-share/vmware/help/networking_bridged-onguestos.htm
-share/vmware/help/networking_bridged-second.htm
-share/vmware/help/networking_bridged.htm
-share/vmware/help/networking_changing.htm
-share/vmware/help/networking_custom.htm
-share/vmware/help/networking_host-onguestos.htm
-share/vmware/help/networking_host-twointerfaces.htm
-share/vmware/help/networking_host.htm
-share/vmware/help/networking_host_ipleaks.htm
-share/vmware/help/networking_host_issues-linux.htm
-share/vmware/help/networking_host_routing.htm
-share/vmware/help/networking_host_samba.htm
-share/vmware/help/networking_ipmasqerade.htm
-share/vmware/help/networking_ipmasqerade_firewallrh.htm
-share/vmware/help/networking_ipmasqerade_fwconfig.htm
-share/vmware/help/networking_macaddr.htm
-share/vmware/help/networking_nat.htm
-share/vmware/help/networking_nat_intro.htm
-share/vmware/help/networking_proxy.htm
-share/vmware/help/networking_wireless.htm
-share/vmware/help/newvm-diskpartition.htm
-share/vmware/help/newvm-diskpartition_access.htm
-share/vmware/help/newvm-diskpartition_hide.htm
-share/vmware/help/newvm-dualboot-hdwr.htm
-share/vmware/help/newvm-dualboot-scsi.htm
-share/vmware/help/newvm-dualboot.htm
-share/vmware/help/newvm-virtualdisk.htm
-share/vmware/help/newvm.htm
-share/vmware/help/newvm_wizard.htm
-share/vmware/help/newvm_wizard_process_cdrom.htm
-share/vmware/help/newvm_wizard_process_directory.htm
-share/vmware/help/newvm_wizard_process_disksize.htm
-share/vmware/help/newvm_wizard_process_disktype.htm
-share/vmware/help/newvm_wizard_process_floppy.htm
-share/vmware/help/newvm_wizard_process_guestos.htm
-share/vmware/help/newvm_wizard_process_network.htm
-share/vmware/help/perform-guestos-linux.htm
-share/vmware/help/perform-guestos-win2000.htm
-share/vmware/help/perform-guestos-win95-98.htm
-share/vmware/help/perform-linuxhost.htm
-share/vmware/help/perform.htm
-share/vmware/help/screensavers.htm
-share/vmware/help/serialnumber.htm
-share/vmware/help/sharefiles_hos_gos.htm
-share/vmware/help/sharevm.htm
-share/vmware/help/sizewin.htm
-share/vmware/help/sizewin_fullscreen.htm
-share/vmware/help/startvm.htm
-share/vmware/help/startvmware.htm
-share/vmware/help/statevm.htm
-share/vmware/help/statevm_off.htm
-share/vmware/help/statevm_on.htm
-share/vmware/help/statevm_repeat_resume.htm
-share/vmware/help/statevm_reset.htm
-share/vmware/help/statevm_resume.htm
-share/vmware/help/statevm_suspend.htm
-share/vmware/help/support.htm
-share/vmware/help/switching.htm
-share/vmware/help/sysreqs.htm
-share/vmware/help/toc.htm
-share/vmware/help/user-permissions-linux.htm
-share/vmware/help/vm_common.htm
-share/vmware/help/vmtools-copypaste.htm
-share/vmware/help/vmtools-defrag.htm
-share/vmware/help/vmtools-shrink.htm
-share/vmware/help/vmtools.htm
-share/vmware/help/vmtools_install.htm
-share/vmware/help/vmtools_install_freebsd.htm
-share/vmware/help/vmtools_install_linux.htm
-share/vmware/help/vmtools_install_win.htm
-share/vmware/help/vmtools_prefs.htm
-share/vmware/help/whatsnew.htm
-share/vmware/isoimages/freebsd.iso
-share/vmware/isoimages/linux.iso
-share/vmware/isoimages/windows.iso
-share/vmware/licenses/user/license.ws.3.0
-share/vmware/messages/chef/vmware-mks.vmsg
-share/vmware/messages/chef/vmware-ui.vmsg
-share/vmware/messages/chef/vmware.vmsg
-share/vmware/messages/ja/vmware-mks.vmsg
-share/vmware/messages/ja/vmware-ui.vmsg
-share/vmware/messages/ja/vmware.vmsg
-share/vmware/messages/jive/vmware-mks.vmsg
-share/vmware/messages/jive/vmware-ui.vmsg
-share/vmware/messages/jive/vmware.vmsg
-share/vmware/smb/codepages/codepage.437
-share/vmware/smb/codepages/codepage.737
-share/vmware/smb/codepages/codepage.850
-share/vmware/smb/codepages/codepage.852
-share/vmware/smb/codepages/codepage.861
-share/vmware/smb/codepages/codepage.866
-share/vmware/smb/codepages/codepage.932
-share/vmware/smb/codepages/codepage.936
-share/vmware/smb/codepages/codepage.949
-share/vmware/smb/codepages/codepage.950
-share/vmware/xkeymap/be101
-share/vmware/xkeymap/be104
-share/vmware/xkeymap/chde101
-share/vmware/xkeymap/chde104
-share/vmware/xkeymap/chfr101
-share/vmware/xkeymap/chfr104
-share/vmware/xkeymap/de101
-share/vmware/xkeymap/de104
-share/vmware/xkeymap/dk101
-share/vmware/xkeymap/dk104
-share/vmware/xkeymap/es101
-share/vmware/xkeymap/es104
-share/vmware/xkeymap/fi101
-share/vmware/xkeymap/fi104
-share/vmware/xkeymap/fr101
-share/vmware/xkeymap/fr104
-share/vmware/xkeymap/gb101
-share/vmware/xkeymap/gb104
-share/vmware/xkeymap/is101
-share/vmware/xkeymap/is104
-share/vmware/xkeymap/it101
-share/vmware/xkeymap/it104
-share/vmware/xkeymap/jp106
-share/vmware/xkeymap/jp109
-share/vmware/xkeymap/no101
-share/vmware/xkeymap/no104
-share/vmware/xkeymap/pt101
-share/vmware/xkeymap/pt104
-share/vmware/xkeymap/se101
-share/vmware/xkeymap/se104
-share/vmware/xkeymap/us101
-share/vmware/xkeymap/us104
-@dirrm emul/linux/etc/vmware
-@dirrm share/vmware/bin
-@dirrm share/vmware/configurator
-@dirrm share/vmware/doc
-@dirrm share/vmware/isoimages
-@dirrm share/vmware/help
-@exec ${MKDIR} -p %D/share/vmware/licenses/site
-@dirrm share/vmware/licenses/site
-@dirrm share/vmware/licenses/user
-@dirrm share/vmware/licenses
-@dirrm share/vmware/messages/chef
-@dirrm share/vmware/messages/ja
-@dirrm share/vmware/messages/jive
-@dirrm share/vmware/messages
-@dirrm share/vmware/smb/codepages
-@dirrm share/vmware/smb
-@dirrm share/vmware/xkeymap
-@dirrm share/vmware
diff --git a/emulators/vmware3/distinfo b/emulators/vmware3/distinfo
deleted file mode 100644
index 36623e2a59d..00000000000
--- a/emulators/vmware3/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.7 2006/03/26 21:37:12 veego Exp $
-
-SHA1 (VMware-workstation-3.2.1-2242.tar.gz) = 3f3c8539270707087525e220264a38639bf17547
-RMD160 (VMware-workstation-3.2.1-2242.tar.gz) = f2a6c3cc38f3c3851446e8902237b958367293a1
-Size (VMware-workstation-3.2.1-2242.tar.gz) = 12577292 bytes
-SHA1 (vmware-any-any-update99.tar.gz) = ac2a6621fdaacfe40422d71fe27d567826635dd7
-RMD160 (vmware-any-any-update99.tar.gz) = e22e0530d248dde2922283683573eaa02cdbc567
-Size (vmware-any-any-update99.tar.gz) = 296093 bytes
-SHA1 (patch-aa) = 85d8d8da295c3cfb733b93f32bd2b6f6a25d13ac
diff --git a/emulators/vmware3/patches/patch-aa b/emulators/vmware3/patches/patch-aa
deleted file mode 100644
index 598cd9f1e9e..00000000000
--- a/emulators/vmware3/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/03/26 21:37:12 veego Exp $
-
---- ../vmware-any-any-update99/update.c.orig	2006-02-19 09:51:39.000000000 +0100
-+++ ../vmware-any-any-update99/update.c
-@@ -508,8 +508,10 @@ static int trypatch2242(struct file* fd,
- "\xEB\x26\xFF\x73\x14\xE8";
- 	return trypatch(fd, name, (off_t)0x12930, oldcodeNICE,        newcodeNICE,        sizeof(newcodeNICE) - 1,
- 				  (off_t)0x1299A, oldcodeNICE2,       newcodeNICE2,       sizeof(newcodeNICE2) - 1,
-+/*
- 				  (off_t)416460,  oldcodeALLOCLOWMEM, newcodeALLOCLOWMEM, sizeof(newcodeALLOCLOWMEM) - 1,
- 				  (off_t)0x65CE4, oldcodeFREELOWMEM,  newcodeFREELOWMEM,  sizeof(newcodeFREELOWMEM) - 1,
-+*/
- 				  (off_t)0);
- }
- 
diff --git a/emulators/wine/DESCR b/emulators/wine/DESCR
deleted file mode 100644
index 451e0373278..00000000000
--- a/emulators/wine/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Wine is a program which allows running Microsoft Windows programs
-(including DOS, Windows 3.x and Win32 executables) on Unix.  It consists
-of a program loader which loads and executes an Microsoft Windows binary,
-and a library that implements Windows API calls using their Unix or X11
-equivalents.  The library may also be used for porting Win32 code into
-native Unix executables.
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
deleted file mode 100644
index 47d477ec635..00000000000
--- a/emulators/wine/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: Makefile,v 1.126 2007/03/17 23:07:57 adam Exp $
-
-DISTNAME=	wine-0.9.33
-CATEGORIES=	emulators
-MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/ \
-		${MASTER_SITE_SOURCEFORGE:=wine/}
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://www.winehq.com/
-COMMENT=	Free implementation of Windows on Unix (still alpha)
-
-BUILD_DEPENDS+=	fontforge-[0-9]*:../../fonts/fontforge
-
-ONLY_FOR_PLATFORM=	NetBSD-1.5Z*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
-ONLY_FOR_PLATFORM+=	FreeBSD-*-i386 Linux-*-i386 SunOS-*-i386 Darwin-*-i386
-ONLY_FOR_PLATFORM+=	*-*-x86_64
-
-WRKSRC=			${WRKDIR}/${DISTNAME:S/W/w/}
-USE_DIRS+=		xdg-1.1
-USE_LANGUAGES=		c
-USE_LIBTOOL=		yes
-USE_NCURSES=		yes
-USE_TOOLS+=		bison gmake mktemp
-GNU_CONFIGURE=		yes
-UNLIMIT_RESOURCES=	datasize
-
-REPLACE_PERL+=		tools/winemaker tools/winedump/function_grep.pl
-
-# The Wine configure script has problems locating the libraries in the
-# buildlink directory, so prepend all of the LDFLAGS necessary to link
-# against the libraries.
-#
-CONFIGURE_ENV+=		X_LIBS=${LDFLAGS:M*:Q}
-CONFIGURE_ENV+=		CFLAGS=${CFLAGS:M*:Q}\ -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
-LIBS+=			${LDFLAGS}
-
-.include "options.mk"
-
-post-install:
-.for tool in bin2res fnt2bdf
-	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/tools/${tool} \
-		${PREFIX}/bin
-.endfor
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../databases/openldap-client/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/libungif/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
deleted file mode 100644
index b5a807aa3c6..00000000000
--- a/emulators/wine/PLIST
+++ /dev/null
@@ -1,919 +0,0 @@
-@comment $NetBSD: PLIST,v 1.58 2007/03/17 23:07:58 adam Exp $
-bin/bin2res
-bin/fnt2bdf
-bin/function_grep.pl
-bin/msiexec
-bin/notepad
-bin/progman
-bin/regedit
-bin/regsvr32
-bin/uninstaller
-bin/widl
-bin/wine
-bin/wineboot
-bin/winebrowser
-bin/winebuild
-bin/winecfg
-bin/wineconsole
-bin/winecpp
-bin/winedbg
-bin/winedump
-bin/winefile
-bin/wineg++
-bin/winegcc
-bin/winelauncher
-bin/winemaker
-bin/winemine
-bin/winepath
-bin/wineprefixcreate
-bin/wineserver
-bin/wineshelllink
-bin/winhelp
-bin/wmc
-bin/wrc
-include/wine/debug.h
-include/wine/exception.h
-include/wine/itss.h
-include/wine/itss.idl
-include/wine/library.h
-include/wine/msvcrt/conio.h
-include/wine/msvcrt/crtdbg.h
-include/wine/msvcrt/ctype.h
-include/wine/msvcrt/direct.h
-include/wine/msvcrt/dirent.h
-include/wine/msvcrt/dos.h
-include/wine/msvcrt/eh.h
-include/wine/msvcrt/errno.h
-include/wine/msvcrt/fcntl.h
-include/wine/msvcrt/float.h
-include/wine/msvcrt/io.h
-include/wine/msvcrt/limits.h
-include/wine/msvcrt/locale.h
-include/wine/msvcrt/malloc.h
-include/wine/msvcrt/math.h
-include/wine/msvcrt/mbctype.h
-include/wine/msvcrt/mbstring.h
-include/wine/msvcrt/process.h
-include/wine/msvcrt/search.h
-include/wine/msvcrt/setjmp.h
-include/wine/msvcrt/share.h
-include/wine/msvcrt/signal.h
-include/wine/msvcrt/stddef.h
-include/wine/msvcrt/stdio.h
-include/wine/msvcrt/stdlib.h
-include/wine/msvcrt/string.h
-include/wine/msvcrt/sys/locking.h
-include/wine/msvcrt/sys/stat.h
-include/wine/msvcrt/sys/timeb.h
-include/wine/msvcrt/sys/types.h
-include/wine/msvcrt/sys/unistd.h
-include/wine/msvcrt/sys/utime.h
-include/wine/msvcrt/time.h
-include/wine/msvcrt/unistd.h
-include/wine/msvcrt/wchar.h
-include/wine/msvcrt/wctype.h
-include/wine/unicode.h
-include/wine/windows/accctrl.h
-include/wine/windows/aclapi.h
-include/wine/windows/activscp.h
-include/wine/windows/activscp.idl
-include/wine/windows/adshlp.h
-include/wine/windows/advpub.h
-include/wine/windows/amstream.h
-include/wine/windows/amstream.idl
-include/wine/windows/amvideo.h
-include/wine/windows/amvideo.idl
-include/wine/windows/appmgmt.h
-include/wine/windows/audevcod.h
-include/wine/windows/austream.h
-include/wine/windows/austream.idl
-include/wine/windows/aviriff.h
-include/wine/windows/axcore.idl
-include/wine/windows/axextend.idl
-include/wine/windows/basetsd.h
-include/wine/windows/basetyps.h
-include/wine/windows/cderr.h
-include/wine/windows/cfgmgr32.h
-include/wine/windows/cguid.h
-include/wine/windows/cierror.h
-include/wine/windows/clusapi.h
-include/wine/windows/comcat.h
-include/wine/windows/comcat.idl
-include/wine/windows/commctrl.h
-include/wine/windows/commdlg.h
-include/wine/windows/compobj.h
-include/wine/windows/control.h
-include/wine/windows/control.idl
-include/wine/windows/cpl.h
-include/wine/windows/custcntl.h
-include/wine/windows/cvconst.h
-include/wine/windows/d3d.h
-include/wine/windows/d3d8.h
-include/wine/windows/d3d8caps.h
-include/wine/windows/d3d8types.h
-include/wine/windows/d3d9.h
-include/wine/windows/d3d9caps.h
-include/wine/windows/d3d9types.h
-include/wine/windows/d3dcaps.h
-include/wine/windows/d3dhal.h
-include/wine/windows/d3drm.h
-include/wine/windows/d3dtypes.h
-include/wine/windows/d3dvec.inl
-include/wine/windows/d3dx8core.h
-include/wine/windows/dbghelp.h
-include/wine/windows/dbinit.idl
-include/wine/windows/dbprop.idl
-include/wine/windows/dbs.idl
-include/wine/windows/dbt.h
-include/wine/windows/dciddi.h
-include/wine/windows/dciman.h
-include/wine/windows/dde.h
-include/wine/windows/ddeml.h
-include/wine/windows/ddk/compstui.h
-include/wine/windows/ddk/hidsdi.h
-include/wine/windows/ddk/ntddcdvd.h
-include/wine/windows/ddk/ntddser.h
-include/wine/windows/ddk/ntddtape.h
-include/wine/windows/ddk/wdm.h
-include/wine/windows/ddk/winsplp.h
-include/wine/windows/ddraw.h
-include/wine/windows/ddrawi.h
-include/wine/windows/ddstream.h
-include/wine/windows/ddstream.idl
-include/wine/windows/devenum.idl
-include/wine/windows/devguid.h
-include/wine/windows/digitalv.h
-include/wine/windows/dinput.h
-include/wine/windows/dispdib.h
-include/wine/windows/dispex.h
-include/wine/windows/dispex.idl
-include/wine/windows/dlgs.h
-include/wine/windows/dls1.h
-include/wine/windows/dls2.h
-include/wine/windows/dmdls.h
-include/wine/windows/dmerror.h
-include/wine/windows/dmo.h
-include/wine/windows/dmoreg.h
-include/wine/windows/dmort.h
-include/wine/windows/dmplugin.h
-include/wine/windows/dmusbuff.h
-include/wine/windows/dmusicc.h
-include/wine/windows/dmusicf.h
-include/wine/windows/dmusici.h
-include/wine/windows/dmusics.h
-include/wine/windows/docobj.h
-include/wine/windows/docobj.idl
-include/wine/windows/downloadmgr.h
-include/wine/windows/downloadmgr.idl
-include/wine/windows/dpaddr.h
-include/wine/windows/dplay.h
-include/wine/windows/dplay8.h
-include/wine/windows/dplobby.h
-include/wine/windows/dplobby8.h
-include/wine/windows/dpnathlp.h
-include/wine/windows/dsconf.h
-include/wine/windows/dsdriver.h
-include/wine/windows/dsgetdc.h
-include/wine/windows/dshow.h
-include/wine/windows/dsound.h
-include/wine/windows/dsrole.h
-include/wine/windows/dxdiag.h
-include/wine/windows/dxerr8.h
-include/wine/windows/dxerr9.h
-include/wine/windows/dxfile.h
-include/wine/windows/dyngraph.idl
-include/wine/windows/errors.h
-include/wine/windows/evcode.h
-include/wine/windows/evntrace.h
-include/wine/windows/excpt.h
-include/wine/windows/exdisp.h
-include/wine/windows/exdisp.idl
-include/wine/windows/exdispid.h
-include/wine/windows/fci.h
-include/wine/windows/fdi.h
-include/wine/windows/guiddef.h
-include/wine/windows/hlguids.h
-include/wine/windows/hlink.h
-include/wine/windows/hlink.idl
-include/wine/windows/htiframe.h
-include/wine/windows/htiframe.idl
-include/wine/windows/htmlhelp.h
-include/wine/windows/iads.h
-include/wine/windows/iads.idl
-include/wine/windows/icm.h
-include/wine/windows/icmpapi.h
-include/wine/windows/idispids.h
-include/wine/windows/imagehlp.h
-include/wine/windows/imm.h
-include/wine/windows/indexsrv.h
-include/wine/windows/indexsrv.idl
-include/wine/windows/initguid.h
-include/wine/windows/ipexport.h
-include/wine/windows/iphlpapi.h
-include/wine/windows/ipifcons.h
-include/wine/windows/iprtrmib.h
-include/wine/windows/iptypes.h
-include/wine/windows/ks.h
-include/wine/windows/ksguid.h
-include/wine/windows/ksmedia.h
-include/wine/windows/lm.h
-include/wine/windows/lmaccess.h
-include/wine/windows/lmapibuf.h
-include/wine/windows/lmbrowsr.h
-include/wine/windows/lmcons.h
-include/wine/windows/lmerr.h
-include/wine/windows/lmjoin.h
-include/wine/windows/lmmsg.h
-include/wine/windows/lmserver.h
-include/wine/windows/lmshare.h
-include/wine/windows/lmstats.h
-include/wine/windows/lmwksta.h
-include/wine/windows/lzexpand.h
-include/wine/windows/mapi.h
-include/wine/windows/mapicode.h
-include/wine/windows/mapidefs.h
-include/wine/windows/mapiguid.h
-include/wine/windows/mapitags.h
-include/wine/windows/mapiutil.h
-include/wine/windows/mapival.h
-include/wine/windows/mapix.h
-include/wine/windows/mciavi.h
-include/wine/windows/mcx.h
-include/wine/windows/mediaerr.h
-include/wine/windows/mediaobj.h
-include/wine/windows/mediaobj.idl
-include/wine/windows/mimeinfo.h
-include/wine/windows/mimeinfo.idl
-include/wine/windows/minmax.h
-include/wine/windows/mlang.h
-include/wine/windows/mlang.idl
-include/wine/windows/mmddk.h
-include/wine/windows/mmreg.h
-include/wine/windows/mmstream.h
-include/wine/windows/mmstream.idl
-include/wine/windows/mmsystem.h
-include/wine/windows/mprapi.h
-include/wine/windows/msacm.h
-include/wine/windows/msacmdlg.h
-include/wine/windows/msacmdrv.h
-include/wine/windows/mscat.h
-include/wine/windows/mshtmcid.h
-include/wine/windows/mshtmdid.h
-include/wine/windows/mshtmhst.h
-include/wine/windows/mshtmhst.idl
-include/wine/windows/mshtml.h
-include/wine/windows/mshtml.idl
-include/wine/windows/msi.h
-include/wine/windows/msidefs.h
-include/wine/windows/msiquery.h
-include/wine/windows/mssip.h
-include/wine/windows/mswsock.h
-include/wine/windows/msxml.h
-include/wine/windows/msxml.idl
-include/wine/windows/msxml2.h
-include/wine/windows/msxml2.idl
-include/wine/windows/msxml2did.h
-include/wine/windows/msxmldid.h
-include/wine/windows/nb30.h
-include/wine/windows/ndrtypes.h
-include/wine/windows/npapi.h
-include/wine/windows/nspapi.h
-include/wine/windows/ntddcdrm.h
-include/wine/windows/ntddscsi.h
-include/wine/windows/ntddstor.h
-include/wine/windows/ntdsapi.h
-include/wine/windows/ntquery.h
-include/wine/windows/ntsecapi.h
-include/wine/windows/ntstatus.h
-include/wine/windows/oaidl.h
-include/wine/windows/oaidl.idl
-include/wine/windows/objbase.h
-include/wine/windows/objidl.h
-include/wine/windows/objidl.idl
-include/wine/windows/objsafe.h
-include/wine/windows/objsafe.idl
-include/wine/windows/objsel.h
-include/wine/windows/ocidl.h
-include/wine/windows/ocidl.idl
-include/wine/windows/ocmm.h
-include/wine/windows/ocmm.idl
-include/wine/windows/odbcinst.h
-include/wine/windows/ole2.h
-include/wine/windows/ole2ver.h
-include/wine/windows/oleauto.h
-include/wine/windows/olectl.h
-include/wine/windows/oledb.h
-include/wine/windows/oledb.idl
-include/wine/windows/oledlg.h
-include/wine/windows/oleidl.h
-include/wine/windows/oleidl.idl
-include/wine/windows/optary.h
-include/wine/windows/optary.idl
-include/wine/windows/pktdef.h
-include/wine/windows/poppack.h
-include/wine/windows/powrprof.h
-include/wine/windows/profinfo.h
-include/wine/windows/propidl.h
-include/wine/windows/propidl.idl
-include/wine/windows/prsht.h
-include/wine/windows/psapi.h
-include/wine/windows/pshpack1.h
-include/wine/windows/pshpack2.h
-include/wine/windows/pshpack4.h
-include/wine/windows/pshpack8.h
-include/wine/windows/pstore.h
-include/wine/windows/pstore.idl
-include/wine/windows/ras.h
-include/wine/windows/reason.h
-include/wine/windows/regstr.h
-include/wine/windows/richedit.h
-include/wine/windows/richole.h
-include/wine/windows/richole.idl
-include/wine/windows/rmxfguid.h
-include/wine/windows/rpc.h
-include/wine/windows/rpcdce.h
-include/wine/windows/rpcdcep.h
-include/wine/windows/rpcndr.h
-include/wine/windows/rpcnterr.h
-include/wine/windows/rpcproxy.h
-include/wine/windows/schannel.h
-include/wine/windows/schemadef.h
-include/wine/windows/schnlsp.h
-include/wine/windows/sddl.h
-include/wine/windows/secext.h
-include/wine/windows/security.h
-include/wine/windows/sensapi.h
-include/wine/windows/sensevts.h
-include/wine/windows/sensevts.idl
-include/wine/windows/servprov.h
-include/wine/windows/servprov.idl
-include/wine/windows/setupapi.h
-include/wine/windows/sfc.h
-include/wine/windows/shellapi.h
-include/wine/windows/shldisp.h
-include/wine/windows/shldisp.idl
-include/wine/windows/shlguid.h
-include/wine/windows/shlobj.h
-include/wine/windows/shlwapi.h
-include/wine/windows/shobjidl.h
-include/wine/windows/shobjidl.idl
-include/wine/windows/shtypes.h
-include/wine/windows/shtypes.idl
-include/wine/windows/sipbase.h
-include/wine/windows/snmp.h
-include/wine/windows/softpub.h
-include/wine/windows/sql.h
-include/wine/windows/sqlext.h
-include/wine/windows/sqltypes.h
-include/wine/windows/sspi.h
-include/wine/windows/stdole2.idl
-include/wine/windows/stdole2.tlb
-include/wine/windows/storage.h
-include/wine/windows/strmif.h
-include/wine/windows/strmif.idl
-include/wine/windows/svrapi.h
-include/wine/windows/tapi.h
-include/wine/windows/tchar.h
-include/wine/windows/textserv.h
-include/wine/windows/tlhelp32.h
-include/wine/windows/tmschema.h
-include/wine/windows/tom.h
-include/wine/windows/tom.idl
-include/wine/windows/twain.h
-include/wine/windows/unknwn.h
-include/wine/windows/unknwn.idl
-include/wine/windows/urlhist.h
-include/wine/windows/urlhist.idl
-include/wine/windows/urlmon.h
-include/wine/windows/urlmon.idl
-include/wine/windows/usp10.h
-include/wine/windows/uuids.h
-include/wine/windows/uxtheme.h
-include/wine/windows/ver.h
-include/wine/windows/vfw.h
-include/wine/windows/vfwmsgs.h
-include/wine/windows/winbase.h
-include/wine/windows/wincon.h
-include/wine/windows/wincred.h
-include/wine/windows/wincrypt.h
-include/wine/windows/windef.h
-include/wine/windows/windns.h
-include/wine/windows/windows.h
-include/wine/windows/windowsx.h
-include/wine/windows/winerror.h
-include/wine/windows/wingdi.h
-include/wine/windows/wininet.h
-include/wine/windows/winioctl.h
-include/wine/windows/winldap.h
-include/wine/windows/winnetwk.h
-include/wine/windows/winnls.h
-include/wine/windows/winnls32.h
-include/wine/windows/winnt.h
-include/wine/windows/winreg.h
-include/wine/windows/winres.h
-include/wine/windows/winresrc.h
-include/wine/windows/winsock.h
-include/wine/windows/winsock2.h
-include/wine/windows/winspool.h
-include/wine/windows/winsvc.h
-include/wine/windows/wintab.h
-include/wine/windows/wintabx.h
-include/wine/windows/winternl.h
-include/wine/windows/wintrust.h
-include/wine/windows/winuser.h
-include/wine/windows/winver.h
-include/wine/windows/wmistr.h
-include/wine/windows/wnaspi32.h
-include/wine/windows/wownt32.h
-include/wine/windows/ws2spi.h
-include/wine/windows/ws2tcpip.h
-include/wine/windows/wshisotp.h
-include/wine/windows/wsipx.h
-include/wine/windows/wsnwlink.h
-include/wine/windows/wtsapi32.h
-include/wine/windows/wtypes.h
-include/wine/windows/wtypes.idl
-include/wine/windows/xcmc.h
-include/wine/windows/xmldom.h
-include/wine/windows/xmldom.idl
-include/wine/windows/xmldomdid.h
-include/wine/windows/xmldso.h
-include/wine/windows/xmldso.idl
-include/wine/windows/xmldsodid.h
-include/wine/windows/zmouse.h
-lib/libwine.so
-lib/libwine.so.1
-lib/libwine.so.1.0
-lib/wine/activeds.dll.so
-lib/wine/advapi32.dll.so
-lib/wine/advpack.dll.so
-lib/wine/amstream.dll.so
-lib/wine/atl.dll.so
-lib/wine/avicap32.dll.so
-lib/wine/avifil32.dll.so
-lib/wine/avifile.dll16
-lib/wine/browseui.dll.so
-lib/wine/cabinet.dll.so
-lib/wine/capi2032.dll.so
-lib/wine/cards.dll.so
-lib/wine/cfgmgr32.dll.so
-lib/wine/clock.exe.so
-lib/wine/clusapi.dll.so
-lib/wine/cmd.exe.so
-lib/wine/comcat.dll.so
-lib/wine/comctl32.dll.so
-lib/wine/comdlg32.dll.so
-lib/wine/comm.drv16
-lib/wine/commdlg.dll16
-lib/wine/compobj.dll16
-lib/wine/compstui.dll.so
-lib/wine/control.exe.so
-lib/wine/credui.dll.so
-lib/wine/crtdll.dll.so
-lib/wine/crypt32.dll.so
-lib/wine/cryptdll.dll.so
-lib/wine/cryptnet.dll.so
-lib/wine/ctl3d.dll16
-lib/wine/ctl3d32.dll.so
-lib/wine/ctl3dv2.dll16
-lib/wine/d3d8.dll.so
-lib/wine/d3d9.dll.so
-lib/wine/d3dim.dll.so
-lib/wine/d3drm.dll.so
-lib/wine/d3dx8.dll.so
-lib/wine/d3dxof.dll.so
-lib/wine/dbghelp.dll.so
-lib/wine/dciman32.dll.so
-lib/wine/ddeml.dll16
-lib/wine/ddraw.dll.so
-lib/wine/ddrawex.dll.so
-lib/wine/devenum.dll.so
-lib/wine/dinput.dll.so
-lib/wine/dinput8.dll.so
-lib/wine/dispdib.dll16
-lib/wine/display.drv16
-lib/wine/dmband.dll.so
-lib/wine/dmcompos.dll.so
-lib/wine/dmime.dll.so
-lib/wine/dmloader.dll.so
-lib/wine/dmscript.dll.so
-lib/wine/dmstyle.dll.so
-lib/wine/dmsynth.dll.so
-lib/wine/dmusic.dll.so
-lib/wine/dmusic32.dll.so
-lib/wine/dnsapi.dll.so
-lib/wine/dplay.dll.so
-lib/wine/dplayx.dll.so
-lib/wine/dpnaddr.dll.so
-lib/wine/dpnet.dll.so
-lib/wine/dpnhpast.dll.so
-lib/wine/dsound.dll.so
-lib/wine/dswave.dll.so
-lib/wine/dxdiagn.dll.so
-lib/wine/eject.exe.so
-lib/wine/expand.exe.so
-lib/wine/explorer.exe.so
-lib/wine/gdi.exe16
-lib/wine/gdi32.dll.so
-${WINE_OPENGL}lib/wine/glu32.dll.so
-lib/wine/gphoto2.ds.so
-lib/wine/hh.exe.so
-lib/wine/hhctrl.ocx.so
-lib/wine/hid.dll.so
-lib/wine/hlink.dll.so
-lib/wine/iccvid.dll.so
-lib/wine/icinfo.exe.so
-lib/wine/icmp.dll.so
-lib/wine/iexplore.exe.so
-lib/wine/ifsmgr.vxd.so
-lib/wine/imaadp32.acm.so
-lib/wine/imagehlp.dll.so
-lib/wine/imm.dll16
-lib/wine/imm32.dll.so
-lib/wine/infosoft.dll.so
-lib/wine/inseng.dll.so
-lib/wine/iphlpapi.dll.so
-lib/wine/itss.dll.so
-lib/wine/kernel32.dll.so
-lib/wine/keyboard.drv16
-lib/wine/krnl386.exe16
-lib/wine/libactiveds.def
-lib/wine/libadvapi32.def
-lib/wine/libadvpack.def
-lib/wine/libatl.def
-lib/wine/libavicap32.def
-lib/wine/libavifil32.def
-lib/wine/libcabinet.def
-lib/wine/libcapi2032.def
-lib/wine/libcards.def
-lib/wine/libcfgmgr32.def
-lib/wine/libclusapi.def
-lib/wine/libcomctl32.def
-lib/wine/libcomdlg32.def
-lib/wine/libcompstui.def
-lib/wine/libcrtdll.def
-lib/wine/libcrypt32.def
-lib/wine/libcryptdll.def
-lib/wine/libctl3d32.def
-lib/wine/libd3d8.def
-lib/wine/libd3d9.def
-lib/wine/libd3dim.def
-lib/wine/libd3drm.def
-lib/wine/libd3dx8.def
-lib/wine/libd3dxof.def
-lib/wine/libdbghelp.def
-lib/wine/libdciman32.def
-lib/wine/libddraw.def
-lib/wine/libdinput.def
-lib/wine/libdinput.def.a
-lib/wine/libdinput8.def
-lib/wine/libdmusic32.def
-lib/wine/libdnsapi.def
-lib/wine/libdplay.def
-lib/wine/libdplayx.def
-lib/wine/libdpnet.def
-lib/wine/libdsound.def
-lib/wine/libdxerr8.a
-lib/wine/libdxerr9.a
-lib/wine/libdxguid.a
-lib/wine/libgdi32.def
-${WINE_OPENGL}lib/wine/libglu32.def
-lib/wine/libhid.def
-lib/wine/libhlink.def
-lib/wine/libicmp.def
-lib/wine/libimagehlp.def
-lib/wine/libimm32.def
-lib/wine/libiphlpapi.def
-lib/wine/libkernel32.def
-lib/wine/liblz32.def
-lib/wine/libmapi32.def
-lib/wine/libmlang.def
-lib/wine/libmpr.def
-lib/wine/libmprapi.def
-lib/wine/libmsacm32.def
-lib/wine/libmscms.def
-lib/wine/libmsdmo.def
-lib/wine/libmshtml.def
-lib/wine/libmsi.def
-lib/wine/libmsimg32.def
-lib/wine/libmsvcrt.def
-lib/wine/libmsvcrt20.def
-lib/wine/libmsvcrt40.def
-lib/wine/libmsvcrtd.def
-lib/wine/libmsvfw32.def
-lib/wine/libmswsock.def
-lib/wine/libnddeapi.def
-lib/wine/libnetapi32.def
-lib/wine/libnewdev.def
-lib/wine/libntdll.def
-lib/wine/libntdsapi.def
-lib/wine/libodbc32.def
-lib/wine/libodbccp32.def
-lib/wine/libole32.def
-lib/wine/liboleacc.def
-lib/wine/liboleaut32.def
-lib/wine/libolecli32.def
-lib/wine/liboledlg.def
-lib/wine/libolepro32.def
-lib/wine/libolesvr32.def
-${WINE_OPENGL}lib/wine/libopengl32.def
-lib/wine/libpowrprof.def
-lib/wine/libpsapi.def
-lib/wine/libquartz.def
-lib/wine/librasapi32.def
-lib/wine/libresutils.def
-lib/wine/libriched20.def
-lib/wine/librpcrt4.def
-lib/wine/librsaenh.def
-lib/wine/libsecur32.def
-lib/wine/libsensapi.def
-lib/wine/libserialui.def
-lib/wine/libsetupapi.def
-lib/wine/libsfc.def
-lib/wine/libsfc_os.def
-lib/wine/libshdocvw.def
-lib/wine/libshell32.def
-lib/wine/libshfolder.def
-lib/wine/libshlwapi.def
-lib/wine/libsnmpapi.def
-lib/wine/libsti.def
-lib/wine/libstrmiids.a
-lib/wine/libtapi32.def
-lib/wine/libunicows.def
-lib/wine/liburl.def
-lib/wine/liburlmon.def
-lib/wine/libuser32.def
-lib/wine/libusp10.def
-lib/wine/libuuid.a
-lib/wine/libuxtheme.def
-lib/wine/libvdmdbg.def
-lib/wine/libversion.def
-lib/wine/libwinecrt0.a
-${WINE_OPENGL}lib/wine/libwined3d.def
-lib/wine/libwinedos.def
-lib/wine/libwininet.def
-lib/wine/libwinmm.def
-lib/wine/libwinnls32.def
-lib/wine/libwinspool.def
-lib/wine/libwintab32.def
-lib/wine/libwintrust.def
-lib/wine/libwldap32.def
-lib/wine/libwnaspi32.def
-lib/wine/libwow32.def
-lib/wine/libws2_32.def
-lib/wine/libwsock32.def
-lib/wine/libwtsapi32.def
-lib/wine/localspl.dll.so
-lib/wine/lz32.dll.so
-lib/wine/lzexpand.dll16
-lib/wine/mapi32.dll.so
-lib/wine/mciavi32.dll.so
-lib/wine/mcicda.dll.so
-lib/wine/mciseq.dll.so
-lib/wine/mciwave.dll.so
-lib/wine/midimap.dll.so
-lib/wine/mlang.dll.so
-lib/wine/mmdevldr.vxd.so
-lib/wine/mmsystem.dll16
-lib/wine/monodebg.vxd.so
-lib/wine/mouse.drv16
-lib/wine/mpr.dll.so
-lib/wine/mprapi.dll.so
-lib/wine/msacm.dll16
-lib/wine/msacm32.dll.so
-lib/wine/msacm32.drv.so
-lib/wine/msadp32.acm.so
-lib/wine/mscms.dll.so
-lib/wine/mscoree.dll.so
-lib/wine/msdmo.dll.so
-lib/wine/msftedit.dll.so
-lib/wine/msg711.acm.so
-lib/wine/mshtml.dll.so
-lib/wine/msi.dll.so
-lib/wine/msiexec.exe.so
-lib/wine/msimg32.dll.so
-lib/wine/msisys.ocx.so
-lib/wine/msnet32.dll.so
-lib/wine/msrle32.dll.so
-lib/wine/msvcrt.dll.so
-lib/wine/msvcrt20.dll.so
-lib/wine/msvcrt40.dll.so
-lib/wine/msvcrtd.dll.so
-lib/wine/msvfw32.dll.so
-lib/wine/msvidc32.dll.so
-lib/wine/msvideo.dll16
-lib/wine/mswsock.dll.so
-lib/wine/msxml3.dll.so
-lib/wine/nddeapi.dll.so
-lib/wine/netapi32.dll.so
-lib/wine/newdev.dll.so
-lib/wine/notepad.exe.so
-lib/wine/ntdll.dll.so
-lib/wine/ntdsapi.dll.so
-lib/wine/objsel.dll.so
-lib/wine/odbc32.dll.so
-lib/wine/odbccp32.dll.so
-lib/wine/ole2.dll16
-lib/wine/ole2conv.dll16
-lib/wine/ole2disp.dll16
-lib/wine/ole2nls.dll16
-lib/wine/ole2prox.dll16
-lib/wine/ole2thk.dll16
-lib/wine/ole32.dll.so
-lib/wine/oleacc.dll.so
-lib/wine/oleaut32.dll.so
-lib/wine/olecli.dll16
-lib/wine/olecli32.dll.so
-lib/wine/oledlg.dll.so
-lib/wine/olepro32.dll.so
-lib/wine/olesvr.dll16
-lib/wine/olesvr32.dll.so
-${WINE_OPENGL}lib/wine/opengl32.dll.so
-lib/wine/oleview.exe.so
-lib/wine/powrprof.dll.so
-lib/wine/progman.exe.so
-lib/wine/psapi.dll.so
-lib/wine/pstorec.dll.so
-lib/wine/qcap.dll.so
-lib/wine/quartz.dll.so
-lib/wine/query.dll.so
-lib/wine/rasapi16.dll16
-lib/wine/rasapi32.dll.so
-lib/wine/regedit.exe.so
-lib/wine/regsvr32.exe.so
-lib/wine/resutils.dll.so
-lib/wine/riched20.dll.so
-lib/wine/riched32.dll.so
-lib/wine/rpcrt4.dll.so
-lib/wine/rpcss.exe.so
-lib/wine/rsabase.dll.so
-lib/wine/rsaenh.dll.so
-lib/wine/rundll32.exe.so
-lib/wine/sane.ds.so
-lib/wine/schannel.dll.so
-lib/wine/secur32.dll.so
-lib/wine/security.dll.so
-lib/wine/sensapi.dll.so
-lib/wine/serialui.dll.so
-lib/wine/setupapi.dll.so
-lib/wine/setupx.dll16
-lib/wine/sfc.dll.so
-lib/wine/sfc_os.dll.so
-lib/wine/shdoclc.dll.so
-lib/wine/shdocvw.dll.so
-lib/wine/shell.dll16
-lib/wine/shell32.dll.so
-lib/wine/shfolder.dll.so
-lib/wine/shlwapi.dll.so
-lib/wine/snmpapi.dll.so
-lib/wine/sound.drv16
-lib/wine/spoolss.dll.so
-lib/wine/start.exe.so
-lib/wine/stdole2.tlb.so
-lib/wine/stdole32.tlb.so
-lib/wine/sti.dll.so
-lib/wine/storage.dll16
-lib/wine/stress.dll16
-lib/wine/svrapi.dll.so
-lib/wine/system.drv16
-lib/wine/tapi32.dll.so
-lib/wine/taskmgr.exe.so
-lib/wine/toolhelp.dll16
-lib/wine/twain.dll16
-lib/wine/twain_32.dll.so
-lib/wine/typelib.dll16
-lib/wine/unicows.dll.so
-lib/wine/uninstaller.exe.so
-lib/wine/url.dll.so
-lib/wine/urlmon.dll.so
-lib/wine/user.exe16
-lib/wine/user32.dll.so
-lib/wine/userenv.dll.so
-lib/wine/usp10.dll.so
-lib/wine/uxtheme.dll.so
-lib/wine/vdhcp.vxd.so
-lib/wine/vdmdbg.dll.so
-lib/wine/ver.dll16
-lib/wine/version.dll.so
-lib/wine/vmm.vxd.so
-lib/wine/vnbt.vxd.so
-lib/wine/vnetbios.vxd.so
-lib/wine/vtdapi.vxd.so
-lib/wine/vwin32.vxd.so
-lib/wine/w32skrnl.dll.so
-lib/wine/w32sys.dll16
-lib/wine/win32s16.dll16
-lib/wine/win87em.dll16
-lib/wine/winaspi.dll16
-lib/wine/windebug.dll16
-lib/wine/winealsa.drv.so
-lib/wine/winearts.drv.so
-lib/wine/wineaudioio.drv.so
-lib/wine/wineboot.exe.so
-lib/wine/winebrowser.exe.so
-lib/wine/winecfg.exe.so
-lib/wine/wineconsole.exe.so
-lib/wine/winecoreaudio.drv.so
-${WINE_OPENGL}lib/wine/wined3d.dll.so
-lib/wine/winedbg.exe.so
-lib/wine/winedos.dll.so
-lib/wine/wineesd.drv.so
-lib/wine/winefile.exe.so
-lib/wine/winejack.drv.so
-lib/wine/winejoystick.drv.so
-lib/wine/winemenubuilder.exe.so
-lib/wine/winemine.exe.so
-lib/wine/winemp3.acm.so
-lib/wine/winenas.drv.so
-lib/wine/wineoss.drv.so
-lib/wine/winepath.exe.so
-lib/wine/wineps.drv.so
-lib/wine/wineps16.drv16
-lib/wine/winevdm.exe.so
-lib/wine/winex11.drv.so
-lib/wine/wing.dll16
-lib/wine/wing32.dll.so
-lib/wine/winhelp.exe.so
-lib/wine/wininet.dll.so
-lib/wine/winmm.dll.so
-lib/wine/winnls.dll16
-lib/wine/winnls32.dll.so
-lib/wine/winsock.dll16
-lib/wine/winspool.drv.so
-lib/wine/wintab.dll16
-lib/wine/wintab32.dll.so
-lib/wine/wintrust.dll.so
-lib/wine/winver.exe.so
-lib/wine/wldap32.dll.so
-lib/wine/wnaspi32.dll.so
-lib/wine/wordpad.exe.so
-lib/wine/wow32.dll.so
-lib/wine/wprocs.dll16
-lib/wine/ws2_32.dll.so
-lib/wine/wsock32.dll.so
-lib/wine/wtsapi32.dll.so
-man/man1/widl.1
-man/man1/wine.1
-man/man1/winebuild.1
-man/man1/winedbg.1
-man/man1/winedump.1
-man/man1/wineg++.1
-man/man1/winegcc.1
-man/man1/winemaker.1
-man/man1/wineprefixcreate.1
-man/man1/wineserver.1
-man/man1/wmc.1
-man/man1/wrc.1
-share/aclocal/wine.m4
-share/applications/wine.desktop
-share/wine/fonts/coue1255.fon
-share/wine/fonts/coue1256.fon
-share/wine/fonts/coue1257.fon
-share/wine/fonts/coure.fon
-share/wine/fonts/couree.fon
-share/wine/fonts/coureg.fon
-share/wine/fonts/courer.fon
-share/wine/fonts/couret.fon
-share/wine/fonts/cvgasys.fon
-share/wine/fonts/hvgasys.fon
-share/wine/fonts/jsmalle.fon
-share/wine/fonts/jvgasys.fon
-share/wine/fonts/marlett.ttf
-share/wine/fonts/smae1255.fon
-share/wine/fonts/smae1256.fon
-share/wine/fonts/smae1257.fon
-share/wine/fonts/smalle.fon
-share/wine/fonts/smallee.fon
-share/wine/fonts/smalleg.fon
-share/wine/fonts/smaller.fon
-share/wine/fonts/smallet.fon
-share/wine/fonts/ssee1255.fon
-share/wine/fonts/ssee1256.fon
-share/wine/fonts/ssee1257.fon
-share/wine/fonts/ssee874.fon
-share/wine/fonts/sserife.fon
-share/wine/fonts/sserifee.fon
-share/wine/fonts/sserifeg.fon
-share/wine/fonts/sserifer.fon
-share/wine/fonts/sserifet.fon
-share/wine/fonts/svgasys.fon
-share/wine/fonts/vgas1255.fon
-share/wine/fonts/vgas1256.fon
-share/wine/fonts/vgas1257.fon
-share/wine/fonts/vgas874.fon
-share/wine/fonts/vgasys.fon
-share/wine/fonts/vgasyse.fon
-share/wine/fonts/vgasysg.fon
-share/wine/fonts/vgasysr.fon
-share/wine/fonts/vgasyst.fon
-share/wine/generic.ppd
-share/wine/wine.inf
-@dirrm share/wine/fonts
-@dirrm share/wine
-@comment in xdg-dirs: @dirrm share/applications
-@dirrm lib/wine
-@dirrm include/wine/windows/ddk
-@dirrm include/wine/windows
-@dirrm include/wine/msvcrt/sys
-@dirrm include/wine/msvcrt
-@dirrm include/wine
diff --git a/emulators/wine/buildlink3.mk b/emulators/wine/buildlink3.mk
deleted file mode 100644
index 61a01cd16a2..00000000000
--- a/emulators/wine/buildlink3.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.13 2007/03/18 11:11:09 rillig Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-WINE_BUILDLINK3_MK:=	${WINE_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	wine
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwine}
-BUILDLINK_PACKAGES+=	wine
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wine
-
-.if ${WINE_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.wine+=	wine>=0.9.6nb1
-BUILDLINK_PKGSRCDIR.wine?=	../../emulators/wine
-.endif	# WINE_BUILDLINK3_MK
-
-pkgbase:= wine
-.include "../../mk/pkg-build-options.mk"
-
-.include "../../graphics/freetype2/buildlink3.mk"
-.if !empty(PKG_BUILD_OPTIONS.wine:Mopengl)
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
-.endif
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/libungif/buildlink3.mk"
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
deleted file mode 100644
index bebddca95c7..00000000000
--- a/emulators/wine/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.64 2007/03/17 23:07:58 adam Exp $
-
-SHA1 (wine-0.9.33.tar.bz2) = e08827d917185b29294e15ed82ae6184f6ab3dd9
-RMD160 (wine-0.9.33.tar.bz2) = a93ddf4b3913932f5015d4d582472aa720f48a15
-Size (wine-0.9.33.tar.bz2) = 11708829 bytes
-SHA1 (patch-aa) = 13006794c5c93ab377880f8eb8b8b875bf5ceafe
-SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
-SHA1 (patch-ad) = 21b66f430149cae8319eb80a30cf8ad890d1b1ef
-SHA1 (patch-ae) = a4f39995baf5511ddc70b4e1c006a159a86eeb22
-SHA1 (patch-af) = 413d6ebc5fa7f176d7e14cbc62007c96476bb111
-SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
-SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
-SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
-SHA1 (patch-ak) = b1820ff79ef47da0df8cc57ddd29591097d8e46e
-SHA1 (patch-al) = 4233cdc5d9b4db0a2ffebc037810af8fc94b7c2d
diff --git a/emulators/wine/options.mk b/emulators/wine/options.mk
deleted file mode 100644
index d4861f7fc5f..00000000000
--- a/emulators/wine/options.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: options.mk,v 1.6 2006/05/31 19:06:08 ghen Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.wine
-PKG_SUPPORTED_OPTIONS=	arts cups opengl sane
-PKG_SUGGESTED_OPTIONS=	opengl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Marts)
-.include "../../audio/arts/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mopengl)
-PLIST_SUBST+=	WINE_OPENGL=""
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-opengl
-PLIST_SUBST+=	WINE_OPENGL="@comment "
-.endif
-
-.if !empty(PKG_OPTIONS:Msane)
-.include "../../graphics/sane-backends/buildlink3.mk"
-.endif
diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
deleted file mode 100644
index e5a15e3b298..00000000000
--- a/emulators/wine/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.27 2007/03/17 23:07:58 adam Exp $
-
---- Make.rules.in.orig	2007-03-16 17:40:46.000000000 +0100
-+++ Make.rules.in
-@@ -118,7 +118,7 @@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_
-                 $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \
-                 $(MC_SRCS:.mc=.mc.rc) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res)
- 
--OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(EXTRA_OBJS)
-+OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o)
- 
- RCOBJS = $(RC_SRCS:.rc=.res.o)
- LINTS  = $(C_SRCS:.c=.ln)
diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab
deleted file mode 100644
index 5c41b4dac04..00000000000
--- a/emulators/wine/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.19 2005/07/26 13:24:36 adam Exp $
-
---- dlls/ntdll/cdrom.c.orig	2005-07-20 10:28:27.000000000 +0000
-+++ dlls/ntdll/cdrom.c
-@@ -64,6 +64,16 @@
- #endif
- #ifdef HAVE_LINUX_CDROM_H
- # include <linux/cdrom.h>
-+#else
-+# ifndef CD_FRAMES
-+#  define CD_FRAMES 75
-+# endif
-+# ifndef CDROM_MSF
-+#  define CDROM_MSF 0x02
-+# endif
-+# ifndef CD_SECS
-+#  define CD_SECS 60
-+# endif
- #endif
- #ifdef HAVE_LINUX_UCDROM_H
- # include <linux/ucdrom.h>
diff --git a/emulators/wine/patches/patch-ad b/emulators/wine/patches/patch-ad
deleted file mode 100644
index 819763752fc..00000000000
--- a/emulators/wine/patches/patch-ad
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ad,v 1.12 2007/02/19 17:30:02 rillig Exp $
-
---- dlls/iphlpapi/ipstats.c.orig	2007-02-16 15:48:13.000000000 +0100
-+++ dlls/iphlpapi/ipstats.c	2007-02-17 15:02:32.000000000 +0100
-@@ -27,6 +27,10 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
-+#if defined(__NetBSD__)
-+#include <sys/param.h>
-+#endif
-+#include <unistd.h>
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
-@@ -627,7 +631,11 @@ DWORD getNumRoutes(void)
- 
-       /* Ignore all entries except for gateway routes which aren't
-          multicast */
-+#if !defined(RTF_MULTICAST)
-+      if (!(rtm->rtm_flags & RTF_GATEWAY))
-+#else
-       if (!(rtm->rtm_flags & RTF_GATEWAY) || (rtm->rtm_flags & RTF_MULTICAST))
-+#endif
-          continue;
- 
-       RouteCount++;
-@@ -700,8 +708,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
- 
-           /* Ignore all entries except for gateway routes which aren't
-              multicast */
-+#if !defined(RTF_MULTICAST)
-+          if (!(rtm->rtm_flags & RTF_GATEWAY))
-+#else
-           if (!(rtm->rtm_flags & RTF_GATEWAY) ||
-               (rtm->rtm_flags & RTF_MULTICAST))
-+#endif
-              continue;
- 
-           memset (&table->table[table->dwNumEntries], 0,
diff --git a/emulators/wine/patches/patch-ae b/emulators/wine/patches/patch-ae
deleted file mode 100644
index ee46e2b3a43..00000000000
--- a/emulators/wine/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.12 2006/10/18 20:37:21 adam Exp $
-
---- dlls/winex11.drv/opengl.c.orig	2006-09-15 08:03:29.000000000 +0200
-+++ dlls/winex11.drv/opengl.c
-@@ -48,6 +48,7 @@ WINE_DECLARE_DEBUG_CHANNEL(opengl);
- #endif
- #ifdef HAVE_GL_GLX_H
- # include <GL/glx.h>
-+# include <GL/glxext.h>
- #endif
- #ifdef HAVE_GL_GLEXT_H
- # include <GL/glext.h>
diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af
deleted file mode 100644
index a7fa184bd63..00000000000
--- a/emulators/wine/patches/patch-af
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-af,v 1.22 2007/03/17 23:07:58 adam Exp $
-
---- dlls/ntdll/signal_i386.c.orig	2007-03-16 17:40:46.000000000 +0100
-+++ dlls/ntdll/signal_i386.c
-@@ -167,7 +167,7 @@ typedef struct trapframe SIGCONTEXT;
- 
- #endif /* bsdi */
- 
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
-+#if (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
- 
- typedef struct sigcontext SIGCONTEXT;
- 
-@@ -290,6 +290,43 @@ typedef ucontext_t SIGCONTEXT;
- 
- #endif /* __APPLE__ */
- 
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000)
-+# include <sys/ucontext.h>
-+# include <sys/types.h>
-+# include <signal.h>
-+
-+typedef ucontext_t SIGCONTEXT;
-+
-+#define EAX_sig(context)	((context)->uc_mcontext.__gregs[_REG_EAX])
-+#define EBX_sig(context)	((context)->uc_mcontext.__gregs[_REG_EBX])
-+#define ECX_sig(context)	((context)->uc_mcontext.__gregs[_REG_ECX])
-+#define EDX_sig(context)	((context)->uc_mcontext.__gregs[_REG_EDX])
-+#define ESI_sig(context)	((context)->uc_mcontext.__gregs[_REG_ESI])
-+#define EDI_sig(context)	((context)->uc_mcontext.__gregs[_REG_EDI])
-+#define EBP_sig(context)	((context)->uc_mcontext.__gregs[_REG_EBP])
-+
-+#define CS_sig(context)		((context)->uc_mcontext.__gregs[_REG_CS])
-+#define DS_sig(context)		((context)->uc_mcontext.__gregs[_REG_DS])
-+#define ES_sig(context)		((context)->uc_mcontext.__gregs[_REG_ES])
-+#define FS_sig(context)		((context)->uc_mcontext.__gregs[_REG_FS])
-+#define GS_sig(context)		((context)->uc_mcontext.__gregs[_REG_GS])
-+#define SS_sig(context)		((context)->uc_mcontext.__gregs[_REG_SS])
-+
-+#define EFL_sig(context)	((context)->uc_mcontext.__gregs[_REG_EFL])
-+
-+#define EIP_sig(context)	(*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_EIP]))
-+#define ESP_sig(context)	(*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_ESP]))
-+
-+#define TRAP_sig(context)	((context)->uc_mcontext.__gregs[_REG_TRAPNO])
-+#define ERROR_sig(context)	((context)->uc_mcontext.__gregs[_REG_ERR])
-+
-+#define FAULT_ADDRESS		(__siginfo->si_addr)
-+
-+#define HANDLER_DEF(name) void name( int __signal, siginfo_t *__siginfo, SIGCONTEXT *__context )
-+#define HANDLER_CONTEXT (__context)
-+
-+#endif /* __NetBSD__ */
-+
- WINE_DEFAULT_DEBUG_CHANNEL(seh);
- 
- typedef int (*wine_signal_handler)(unsigned int sig);
-@@ -322,8 +359,13 @@ enum i386_trap_code
-     TRAP_x86_PAGEFLT    = T_PAGEFLT,    /* Page fault */
-     TRAP_x86_ARITHTRAP  = T_ARITHTRAP,  /* Floating point exception */
-     TRAP_x86_ALIGNFLT   = T_ALIGNFLT,   /* Alignment check exception */
-+#if defined(__NetBSD__)
-+    TRAP_x86_MCHK       = T_MCA,        /* Machine check exception */
-+    TRAP_x86_CACHEFLT   = T_XMM         /* Cache flush exception */
-+#else
-     TRAP_x86_MCHK       = T_MCHK,       /* Machine check exception */
-     TRAP_x86_CACHEFLT   = T_XMMFLT      /* Cache flush exception */
-+#endif
- #else
-     TRAP_x86_DIVIDE     = 0,   /* Division by zero exception */
-     TRAP_x86_TRCTRAP    = 1,   /* Single-step exception */
-@@ -1376,7 +1418,11 @@ BOOL SIGNAL_Init(void)
- #endif  /* HAVE_SIGALTSTACK */
- 
-     sig_act.sa_mask = server_block_set;
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)
-+    sig_act.sa_flags = SA_RESTART;
-+#else
-     sig_act.sa_flags = SA_SIGINFO | SA_RESTART;
-+#endif
- #ifdef SA_ONSTACK
-     sig_act.sa_flags |= SA_ONSTACK;
- #endif
diff --git a/emulators/wine/patches/patch-ag b/emulators/wine/patches/patch-ag
deleted file mode 100644
index 1728516714a..00000000000
--- a/emulators/wine/patches/patch-ag
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2006/10/21 08:22:54 wiz Exp $
-
---- dlls/ntdll/signal_x86_64.c.orig	2006-10-13 14:43:39.000000000 +0000
-+++ dlls/ntdll/signal_x86_64.c
-@@ -93,6 +93,53 @@ typedef struct ucontext SIGCONTEXT;
- 
- #endif /* linux */
- 
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000)
-+# include <sys/ucontext.h>
-+# include <sys/types.h>
-+# include <signal.h>
-+
-+typedef ucontext_t SIGCONTEXT;
-+
-+#define RAX_sig(context)	((context)->uc_mcontext.__gregs[_REG_RAX])
-+#define RBX_sig(context)	((context)->uc_mcontext.__gregs[_REG_RBX])
-+#define RCX_sig(context)	((context)->uc_mcontext.__gregs[_REG_RCX])
-+#define RDX_sig(context)	((context)->uc_mcontext.__gregs[_REG_RDX])
-+#define RSI_sig(context)	((context)->uc_mcontext.__gregs[_REG_RSI])
-+#define RDI_sig(context)	((context)->uc_mcontext.__gregs[_REG_RDI])
-+#define RBP_sig(context)	((context)->uc_mcontext.__gregs[_REG_RBP])
-+#define R8_sig(context)		((context)->uc_mcontext.__gregs[_REG_R8])
-+#define R9_sig(context)		((context)->uc_mcontext.__gregs[_REG_R9])
-+#define R10_sig(context)	((context)->uc_mcontext.__gregs[_REG_R10])
-+#define R11_sig(context)	((context)->uc_mcontext.__gregs[_REG_R11])
-+#define R12_sig(context)	((context)->uc_mcontext.__gregs[_REG_R12])
-+#define R13_sig(context)	((context)->uc_mcontext.__gregs[_REG_R13])
-+#define R14_sig(context)	((context)->uc_mcontext.__gregs[_REG_R14])
-+#define R15_sig(context)	((context)->uc_mcontext.__gregs[_REG_R15])
-+
-+#define CS_sig(context)		((context)->uc_mcontext.__gregs[_REG_CS])
-+#define DS_sig(context)		((context)->uc_mcontext.__gregs[_REG_DS])
-+#define ES_sig(context)		((context)->uc_mcontext.__gregs[_REG_ES])
-+#define FS_sig(context)		((context)->uc_mcontext.__gregs[_REG_FS])
-+#define GS_sig(context)		((context)->uc_mcontext.__gregs[_REG_GS])
-+#define SS_sig(context)		((context)->uc_mcontext.__gregs[_REG_SS])
-+
-+#define EFL_sig(context)	((context)->uc_mcontext.__gregs[_REG_RFL])
-+
-+#define RIP_sig(context)	(*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_RIP]))
-+#define RSP_sig(context)	(*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_URSP]))
-+
-+#define TRAP_sig(context)	((context)->uc_mcontext.__gregs[_REG_TRAPNO])
-+#define ERROR_sig(context)	((context)->uc_mcontext.__gregs[_REG_ERR])
-+
-+#define FAULT_CODE		(__siginfo->si_code)
-+#define FAULT_ADDRESS		(__siginfo->si_addr)
-+
-+#define HANDLER_DEF(name) void name( int __signal, siginfo_t *__siginfo, SIGCONTEXT *__context )
-+#define HANDLER_CONTEXT (__context)
-+
-+#define FPU_sig(context)     ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.__fpregs))
-+#endif /* __NetBSD__ */
-+
- enum i386_trap_code
- {
-     TRAP_x86_UNKNOWN    = -1,  /* Unknown fault (TRAP_sig not defined) */
diff --git a/emulators/wine/patches/patch-ai b/emulators/wine/patches/patch-ai
deleted file mode 100644
index 15924abad12..00000000000
--- a/emulators/wine/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.8 2006/01/20 14:58:53 adam Exp $
-
---- include/winternl.h.orig	2005-11-11 09:56:44.000000000 +0100
-+++ include/winternl.h
-@@ -22,6 +22,7 @@
- #define __WINE_WINTERNL_H
- 
- #include <windef.h>
-+#include <stdarg.h>
- 
- #ifdef __cplusplus
- extern "C" {
diff --git a/emulators/wine/patches/patch-aj b/emulators/wine/patches/patch-aj
deleted file mode 100644
index aafaa7f35d2..00000000000
--- a/emulators/wine/patches/patch-aj
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aj,v 1.6 2007/01/30 13:11:04 adam Exp $
-
---- dlls/wineoss.drv/oss.c.orig	2005-12-24 10:24:01.000000000 +0100
-+++ dlls/wineoss.drv/oss.c
-@@ -42,7 +42,9 @@ static LRESULT OSS_drvLoad(void)
- {
-     TRACE("()\n");
-     OSS_WaveInit();
-+#ifdef HAVE_OSS_MIDI
-     OSS_MidiInit();
-+#endif
-     OSS_MixerInit();
-     OSS_AuxInit();
-     return 1;
-@@ -55,7 +57,9 @@ static LRESULT OSS_drvFree(void)
- {
-     TRACE("()\n");
-     OSS_WaveExit();
-+#ifdef HAVE_OSS_MIDI
-     OSS_MidiExit();
-+#endif
-     OSS_MixerExit();
-     OSS_AuxExit();
-     return 1;
diff --git a/emulators/wine/patches/patch-ak b/emulators/wine/patches/patch-ak
deleted file mode 100644
index aa6677a2a00..00000000000
--- a/emulators/wine/patches/patch-ak
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ak,v 1.10 2007/01/30 13:11:04 adam Exp $
-
---- dlls/ntdll/file.c.orig	2007-01-25 16:53:50.000000000 +0100
-+++ dlls/ntdll/file.c
-@@ -1773,6 +1773,35 @@ static NTSTATUS get_device_info( int fd,
-             info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
-             break;
-         }
-+#elif defined(__NetBSD__)
-+	struct statvfs stfs;
-+
-+	if (fstatvfs( fd, &stfs) < 0)
-+	    info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
-+	else if (!strncmp("cd9660", stfs.f_fstypename,
-+			sizeof(stfs.f_fstypename)))
-+	{
-+	    info->DeviceType = FILE_DEVICE_CD_ROM_FILE_SYSTEM;
-+	    info->Characteristics |= FILE_REMOVABLE_MEDIA;
-+	}
-+	else if (!strncmp("nfs", stfs.f_fstypename,
-+			sizeof(stfs.f_fstypename)))
-+	{
-+	    info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM;
-+	    info->Characteristics |= FILE_REMOTE_DEVICE;
-+	}
-+	else if (!strncmp("procfs", stfs.f_fstypename,
-+			sizeof(stfs.f_fstypename)))
-+	    info->DeviceType = FILE_DEVICE_VIRTUAL_DISK;
-+	else
-+	    info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
-+	if (stfs.f_flag & MNT_RDONLY)
-+	    info->Characteristics |= FILE_READ_ONLY_DEVICE;
-+	if (!(stfs.f_flag & MNT_LOCAL))
-+	{
-+	    info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM;
-+	    info->Characteristics |= FILE_REMOTE_DEVICE;
-+	}
- #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
-         struct statfs stfs;
- 
diff --git a/emulators/wine/patches/patch-al b/emulators/wine/patches/patch-al
deleted file mode 100644
index 2934ffaf5a0..00000000000
--- a/emulators/wine/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.7 2007/02/17 10:19:38 adam Exp $
-
---- dlls/riched20/tests/editor.c.orig	2007-02-16 15:48:13.000000000 +0100
-+++ dlls/riched20/tests/editor.c
-@@ -19,6 +19,7 @@
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
- 
-+#include <winsock.h>
- #include <wine/test.h>
- #include <windows.h>
- #include <richedit.h>
diff --git a/emulators/x48/DESCR b/emulators/x48/DESCR
deleted file mode 100644
index eac31089d24..00000000000
--- a/emulators/x48/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-This emulator is capable of providing a faithful replication of the
-HP48. In order to do so, it requires a copy of the ROM software
-from YOUR calculator. In order to avoid breaking copyright laws,
-and upsetting HP, you MUST BE THE PROUD OWNER OF AN HP48 before
-running this program. Of course you can run this program without a
-copy of the ROM software in order to write trivial machine code
-programs but you will not be able to access any of the calculator
-functionality.
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
deleted file mode 100644
index b885ab9d177..00000000000
--- a/emulators/x48/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:36 joerg Exp $
-#
-
-DISTNAME=	x48_041
-PKGNAME=	x48-0.4.1
-PKGREVISION=	1
-CATEGORIES=	emulators
-MASTER_SITES=	http://home.earthlink.net/~rmmlgetz/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://home.earthlink.net/~rmmlgetz/
-COMMENT=	HP48 emulator
-
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-USE_IMAKE=	YES
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/x48
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/x48/romdump
-	cd ${WRKSRC}/doc && \
-		${INSTALL_MAN} CARDS.doc INSTALLING ROMDump.doc \
-			${PREFIX}/share/doc/x48
-	cd ${WRKSRC}/romdump && \
-		${INSTALL_MAN} README ${PREFIX}/share/doc/x48/romdump && \
-		${INSTALL_DATA} ROMDump ROMDump.s \
-			${PREFIX}/share/doc/x48/romdump
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/x48/PLIST b/emulators/x48/PLIST
deleted file mode 100644
index 3dfdec87862..00000000000
--- a/emulators/x48/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:18 zuntum Exp $
-bin/x48
-bin/dump2rom
-bin/checkrom
-bin/mkcard
-lib/X11/app-defaults/X48
-share/doc/x48/CARDS.doc
-share/doc/x48/INSTALLING
-share/doc/x48/ROMDump.doc
-share/doc/x48/romdump/README
-share/doc/x48/romdump/ROMDump
-share/doc/x48/romdump/ROMDump.s
-@dirrm share/doc/x48/romdump
-@dirrm share/doc/x48
diff --git a/emulators/x48/distinfo b/emulators/x48/distinfo
deleted file mode 100644
index c3cbde2416c..00000000000
--- a/emulators/x48/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/12/03 17:16:52 joerg Exp $
-
-SHA1 (x48_041.tar.gz) = 7b166ab4a7570b0617a0d8d01d0938b6ae372ab6
-RMD160 (x48_041.tar.gz) = e41b32bd2b38c4163e4a1aae0776048b0c372637
-Size (x48_041.tar.gz) = 193864 bytes
-SHA1 (patch-aa) = 75af6f30b4e43d09212a50972957655f5bb4c837
-SHA1 (patch-ab) = 8053d3173be2b68f7ddb18b4bdebfe384f0336e2
-SHA1 (patch-ac) = ee5784614db4bf00c047e819aaa0f272d3bf9bce
-SHA1 (patch-ad) = c1f98b7672fe96ab8e203081dfedd6cf96075cfa
-SHA1 (patch-ae) = 29ec4f1495ab23d520883eebd51356b394c7143f
-SHA1 (patch-af) = 60adc15ae8c20528892cbcaa029a3dd206a7edca
diff --git a/emulators/x48/patches/patch-aa b/emulators/x48/patches/patch-aa
deleted file mode 100644
index 729ba0830f9..00000000000
--- a/emulators/x48/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/27 14:56:27 agc Exp $
-
---- config.h.orig	Sun Feb  4 18:30:34 2001
-+++ config.h
-@@ -29,7 +29,7 @@
- /*
-  * Which OS are you on?
-  */
--#define UNIX_DEF -DLINUX
-+/* #define UNIX_DEF -DLINUX */
- /* #define UNIX_DEF -DSOLARIS */
- /* #define UNIX_DEF -DSUNOS */
- /* #define UNIX_DEF -DIRIX */
-@@ -56,7 +56,7 @@
- /*
-  * Which Compiler to use:
-  */
--#define CC_DEF gcc
-+/* #define CC_DEF gcc */
- 
- /*
-  * Which Optimization Flags:
diff --git a/emulators/x48/patches/patch-ab b/emulators/x48/patches/patch-ab
deleted file mode 100644
index d6a1fe01a70..00000000000
--- a/emulators/x48/patches/patch-ab
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/04/27 14:56:27 agc Exp $
-
---- src/Imakefile.orig	Sun Feb  4 18:31:52 2001
-+++ src/Imakefile
-@@ -60,7 +60,7 @@
-       LDOPTIONS = LDOPTIONS_DEF
- #endif
- 
--        DEFINES = -I/usr/openwin/include UNIX_DEF XSHM_DEF READLINE_DEF
-+        DEFINES = UNIX_DEF XSHM_DEF READLINE_DEF
-            HDRS = annunc.h append.h buttons.h constants.h debugger.h \
-                   device.h disasm.h errors.h global.h hp.h hp48.h \
-                   hp48_emu.h hp48char.h icon.h mmu.h options.h resources.h \
-@@ -87,9 +87,9 @@
-              CO = co -l
-        TARFILES = Imakefile X48.ad $(TARS1) $(SRCS2) $(SRCS3) $(SRCS4) $(HDRS)
- 
--all:: $(BIN)/x48 $(BIN)/dump2rom $(BIN)/checkrom $(BIN)/mkcard
-+all:: x48 dump2rom checkrom mkcard
- 
--       PROGRAMS = $(BIN)/x48 $(BIN)/dump2rom $(BIN)/checkrom $(BIN)/mkcard
-+       PROGRAMS = x48 dump2rom checkrom mkcard
- 
- depend:: version.c X48.ad.h
- 
-@@ -102,16 +102,20 @@
- 	RemoveTargetProgram($@)                                         @@\
- 	$(CC) -o $@ $(LDOPTIONS) $(OBJS4) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS) @@\
-                                                                         @@\
--SaberProgramTarget(program,$(SRCS4),$(OBJS4),locallib,syslib)           @@\
-                                                                         @@\
- InstallProgram(program,$(BINDIR))                                       @@\
- InstallManPage(program,$(MANDIR))
- #endif /* ComplexProgramTarget_4 */
- 
--ComplexProgramTarget_1($(BIN)/x48, $(X48LIBS),)
--ComplexProgramTarget_2($(BIN)/dump2rom,,)
--ComplexProgramTarget_3($(BIN)/checkrom,,)
--ComplexProgramTarget_4($(BIN)/mkcard,,)
-+NormalProgramTarget(x48, $(OBJS1),, $(X48LIBS),)
-+NormalProgramTarget(dump2rom, $(OBJS2),,,)
-+NormalProgramTarget(checkrom, $(OBJS3),,,)
-+NormalProgramTarget(mkcard, $(OBJS4),,,)
-+
-+InstallProgram(x48, $(BINDIR))
-+InstallProgram(dump2rom, $(BINDIR))
-+InstallProgram(checkrom, $(BINDIR))
-+InstallProgram(mkcard, $(BINDIR))
- 
- InstallAppDefaults(X48)
- 
diff --git a/emulators/x48/patches/patch-ac b/emulators/x48/patches/patch-ac
deleted file mode 100644
index af6129bfa72..00000000000
--- a/emulators/x48/patches/patch-ac
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/04/27 14:56:27 agc Exp $
-
---- src/init.c.orig	Sun Feb  4 18:32:22 2001
-+++ src/init.c
-@@ -1204,13 +1204,15 @@
-   struct stat    st;
-   FILE          *fp;
- 
--  fprintf(stderr, "testing: Getting home dir\n");
-+  if (!quiet)
-+    fprintf(stderr, "testing: Getting home dir\n");
-   get_home_directory(path);
-   strcat(path, "/");
- 
-   saturn.rom = (word_4 *)NULL;
- 
--  fprintf(stderr, "testing: Reading ROM files\n");
-+  if (!quiet)
-+    fprintf(stderr, "testing: Reading ROM files\n");
-   strcpy(fnam, path);
-   strcat(fnam, "rom");
-   if (!read_rom_file(fnam, &saturn.rom, &rom_size))
-@@ -1367,7 +1369,8 @@
-       exit (1);
-     }
- 
--  fprintf(stderr, "testing: Reading RAM file\n");
-+  if (!quiet)
-+    fprintf(stderr, "testing: Reading RAM file\n");
- 
-   strcpy(fnam, path);
-   strcat(fnam, "ram");
-@@ -1466,11 +1469,13 @@
-       saturn.card_status |= port2_is_ram ? 8 : 0;
-     }
- 
-+#ifdef notyet
-   fprintf(stderr, "testing: Reading Enteries file\n");
-   strcpy(fnam, path);
-   strcat(fnam, "entries.o");
-   if (!read_entries_file(fnam, &saturn.entries)) 
-     return 0;
-+#endif
- 
- 
-   return 1;
-@@ -1841,7 +1846,8 @@
- {
-   if (!initialize)
-   {
--    fprintf(stderr, "testing: Read Files\n");
-+    if (!quiet)
-+       fprintf(stderr, "testing: Read Files\n");
-     if (read_files())
-       {
-         if (resetOnStartup)
diff --git a/emulators/x48/patches/patch-ad b/emulators/x48/patches/patch-ad
deleted file mode 100644
index 5e2431dd25f..00000000000
--- a/emulators/x48/patches/patch-ad
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/04/27 14:56:27 agc Exp $
-
---- src/main.c.orig	Sun Feb  4 18:32:37 2001
-+++ src/main.c
-@@ -70,6 +70,7 @@
- #include "x48_x11.h"
- #include "hp48.h"
- #include "debugger.h"
-+#include "resources.h"
- 
- char  *progname;
- char  *res_name;
-@@ -169,7 +170,15 @@
-   /*
-    *  Open up the display
-    */
--  fprintf(stderr, "testing1\n");
-+#ifdef noyet
-+  /*
-+   * XXX options are not parsed yet so quiet is still 0. The
-+   * parsing of options is done by the X11 specific code in
-+   * InitDisplay.
-+   */
-+  if (!quiet)
-+    fprintf(stderr, "testing: InitDisplay\n");
-+#endif
-   if (InitDisplay(argc, argv) < 0) {
-     exit (1);
-   }
-@@ -177,9 +186,11 @@
-   /*
-    * initialize emulator stuff
-    */
--  fprintf(stderr, "testing1\n");
-+  if (!quiet)
-+    fprintf(stderr, "testing: init_emulator\n");
-   init_emulator();
--  fprintf(stderr, "testing2\n");
-+  if (!quiet)
-+    fprintf(stderr, "testing: init_emulator done\n");
- 
-   
-   /*
diff --git a/emulators/x48/patches/patch-ae b/emulators/x48/patches/patch-ae
deleted file mode 100644
index f82ee24b98b..00000000000
--- a/emulators/x48/patches/patch-ae
+++ /dev/null
@@ -1,194 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2005/12/03 17:16:52 joerg Exp $
-
---- src/serial.c.orig	1999-06-28 22:12:29.000000000 +0000
-+++ src/serial.c
-@@ -69,7 +69,7 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <sys/time.h>
--#if defined(LINUX) || defined(HPUX)
-+#if defined(LINUX) || defined(HPUX) || defined(CSRG_BASED)
- #include <sys/ioctl.h>
- #endif
- #include <unistd.h>
-@@ -77,6 +77,8 @@
- #ifdef SOLARIS
- #include <sys/stream.h>
- #include <sys/stropts.h>
-+#endif
-+#if defined(SOLARIS) || defined(CSRG_BASED)
- #include <sys/termios.h>
- #endif
- 
-@@ -129,6 +131,9 @@ serial_init()
- #else
-   int   c;
- #endif
-+#if defined(CSRG_BASED)
-+  char *ptr1, *ptr2;
-+#endif
-   int   n;
-   char  tty_dev_name[128];
-   struct termios ttybuf;
-@@ -200,6 +205,51 @@ serial_init()
-         }
-       while ((wire_fd < 0) && (errno != ENOENT));
- #else  /* LINUX */
-+#if defined(CSRG_BASED)
-+      c = c; /* XXX gcc */
-+/* This is how Stevens does it in:
-+ * Advanced programming in the UNIX environment
-+ */
-+      strcpy(tty_dev_name, "/dev/ptyXY");
-+        /* array index: 0123456789 (for references in following code) */
-+      for (ptr1 = "pqrstuvwxyzPQRST"; *ptr1 != 0; ptr1++)
-+        {
-+          tty_dev_name[8] = *ptr1;
-+          for (ptr2 = "0123456789abcdef"; *ptr2 != 0; ptr2++)
-+            {
-+              tty_dev_name[9] = *ptr2;
-+
-+              /* try open the master */
-+              if ((wire_fd = open(tty_dev_name, O_RDWR, 0666)) < 0)
-+                {
-+                  if (errno == ENOENT)
-+                    {
-+                      wire_fd = -1;              /* out of pty devices */
-+                      ttyp = -1;
-+                      goto break_for_pty;
-+                    }
-+                  else
-+                    continue;                    /* try next pty device */
-+                }
-+
-+              tty_dev_name[5] = 't';   /* change pty to tty */
-+              if ((ttyp = open(tty_dev_name, O_RDWR, 0666)) < 0)
-+                {
-+                  printf("open tty: %s failed: %s, trying with another\n",
-+                          tty_dev_name, strerror(errno));
-+                  close(wire_fd);
-+                  wire_fd = -1;
-+                  ttyp = -1;
-+                  continue;
-+                }
-+              if (verbose)
-+                printf("%s: wire connection on %s\n", progname, tty_dev_name);
-+              wire_name = strdup(tty_dev_name);
-+              goto break_for_pty;
-+            }
-+        }
-+break_for_pty:
-+#else
-       /*
-        * Here we go for SUNOS, HPUX
-        */
-@@ -231,14 +281,16 @@ serial_init()
-           c++;
-         }
-       while ((wire_fd < 0) && (errno != ENOENT));
-+#endif /* CSRG_BASED */
- #endif /* LINUX */
- #endif /* SOLARIS */
- #endif /* IRIX */
-+	;
-     }
- 
-   if (ttyp >= 0)
-     {
--#if defined(SUNOS) || defined(HPUX)
-+#if defined(SUNOS) || defined(HPUX) || defined(CSRG_BASED)
-       if (tcgetattr(ttyp, &ttybuf) < 0)
- #else
-       if (ioctl(ttyp, TCGETS, (char *)&ttybuf) < 0)
-@@ -263,7 +315,7 @@ serial_init()
- 
-   if (ttyp >= 0)
-     {
--#if defined(SUNOS) || defined (HPUX)
-+#if defined(SUNOS) || defined (HPUX) || defined(CSRG_BASED)
-       if (tcsetattr(ttyp, TCSANOW, &ttybuf) < 0)
- #else
-       if (ioctl(ttyp, TCSETS, (char *)&ttybuf) < 0)
-@@ -291,7 +343,7 @@ serial_init()
- 
-   if (ir_fd >= 0)
-     {
--#if defined(SUNOS) || defined (HPUX)
-+#if defined(SUNOS) || defined (HPUX) || defined(CSRG_BASED)
-       if (tcgetattr(ir_fd, &ttybuf) < 0)
- #else
-       if (ioctl(ir_fd, TCGETS, (char *)&ttybuf) < 0)
-@@ -315,7 +367,7 @@ serial_init()
- 
-   if (ir_fd >= 0)
-     {
--#if defined(SUNOS) || defined(HPUX)
-+#if defined(SUNOS) || defined(HPUX) || defined(CSRG_BASED)
-       if (tcsetattr(ir_fd, TCSANOW, &ttybuf) < 0)
- #else
-       if (ioctl(ir_fd, TCSETS, (char *)&ttybuf) < 0)
-@@ -344,7 +396,7 @@ int baud;
- 
-   if (ir_fd >= 0)
-     {
--#if defined(SUNOS) || defined (HPUX)
-+#if defined(SUNOS) || defined (HPUX) || defined(CSRG_BASED)
-       if (tcgetattr(ir_fd, &ttybuf) < 0)
- #else
-       if (ioctl(ir_fd, TCGETS, (char *)&ttybuf) < 0)
-@@ -358,6 +410,10 @@ int baud;
-         }
-     }
- 
-+#if defined(CSRG_BASED)
-+  cfsetspeed(&ttybuf, baud);
-+#else
-+
-   ttybuf.c_cflag &= ~CBAUD;
- 
-   baud &= 0x7;
-@@ -404,9 +460,11 @@ int baud;
-       ttybuf.c_cflag |= B9600;
-     }
- 
-+#endif /* CSRG_BASED */
-+
-   if (ir_fd >= 0)
-     {
--#if defined(SUNOS) || defined(HPUX)
-+#if defined(SUNOS) || defined(HPUX) || defined(CSRG_BASED)
-       if (tcsetattr(ir_fd, TCSANOW, &ttybuf) < 0)
- #else
-       if (ioctl(ir_fd, TCSETS, (char *)&ttybuf) < 0)
-@@ -422,7 +480,7 @@ int baud;
- 
-   if (ttyp >= 0)
-     {
--#if defined(SUNOS) || defined(HPUX)
-+#if defined(SUNOS) || defined(HPUX) || defined(CSRG_BASED)
-       if (tcgetattr(ttyp, &ttybuf) < 0)
- #else
-       if (ioctl(ttyp, TCGETS, (char *)&ttybuf) < 0)
-@@ -437,6 +495,9 @@ int baud;
-         }
-     }
- 
-+#if defined(CSRG_BASED)
-+  cfsetspeed(&ttybuf, baud);
-+#else
-   ttybuf.c_cflag &= ~CBAUD;
- 
-   baud &= 0x7;
-@@ -482,10 +543,11 @@ int baud;
-         fprintf(stderr, "%s: can\'t set baud rate, using 9600\n", progname);
-       ttybuf.c_cflag |= B9600;
-     }
-+#endif
- 
-   if (ttyp >= 0)
-     {
--#if defined(SUNOS) || defined(HPUX)
-+#if defined(SUNOS) || defined(HPUX) || defined(CSRG_BASED)
-       if (tcsetattr(ttyp, TCSANOW, &ttybuf) < 0)
- #else
-       if (ioctl(ttyp, TCSETS, (char *)&ttybuf) < 0)
diff --git a/emulators/x48/patches/patch-af b/emulators/x48/patches/patch-af
deleted file mode 100644
index b28d105db26..00000000000
--- a/emulators/x48/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/04/27 14:56:27 agc Exp $
-
---- src/x48_x11.c.orig	Sun Feb  4 18:33:36 2001
-+++ src/x48_x11.c
-@@ -3605,6 +3605,8 @@
-       break;
-     case XK_Alt_L:
-     case XK_Alt_R:
-+    case XK_Meta_L:
-+    case XK_Meta_R:
-       key_event(BUTTON_ALPHA, xev);
-       wake = 1;
-       break;
diff --git a/emulators/xbeeb/DESCR b/emulators/xbeeb/DESCR
deleted file mode 100644
index 1f8a58c8d70..00000000000
--- a/emulators/xbeeb/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Xbeeb is an Acorn BBC Micro emulator with an X based interface.
-
-The emulation is good enough to run many games.  Xbeeb includes a filesystem
-interface for native filesystem access.
-
-To run the emulator you must have ROM images from the original machines.
diff --git a/emulators/xbeeb/MESSAGE b/emulators/xbeeb/MESSAGE
deleted file mode 100644
index 685105663e3..00000000000
--- a/emulators/xbeeb/MESSAGE
+++ /dev/null
@@ -1,50 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2006/06/13 13:24:35 dsainty Exp $
-
-You must copy the BBC "BASIC2" ROM image to
-
-	${PREFIX}/${XBEEBROOT}/roms/BASIC2.rom
-
-and the BBC "OS1.2" ROM image to
-
-	${PREFIX}/${XBEEBROOT}/roms/OS1.2.rom
-
-As an alternative to extracting these ROM images from your own BBC hardware,
-archives of these ROM images may also be found at:
-
-	http://bbc.nvg.org/rom/Acorn/lang/BASIC2.rom
-	http://bbc.nvg.org/rom/Acorn/os/OS-1.2.rom
-
-The emulator expects files in the chosen directory to have matching
-<filename>.inf files containing the BBC file attributes.  This is the style
-that many archives found on the Internet use.
-
-You also need to ensure that your X session can access the fonts
-needed. This can be done with:
-
-	$ xset fp+ ${PREFIX}/lib/X11/fonts/xbeeb
-
-To make the effect permanent for future X sessions, you can do this by
-editing certain files in your X installation.
-
-For example if you are only using the "startx" command to start a local
-X session then you would add the above command to your ~/.xinitrc
-script.
-
-If you're running a local X server from xdm then you would need to set
-the complete set of font directories in the xdm/Xservers file with the
-'-fp' option common to all X servers.
-
-If you are using the X font server (xfs) then you would add the
-intlfonts install directory to the xfs/config file in the comma
-separated list of directories given for the "catalogue" setting.
-For example:
-
-	catalogue = ${PREFIX}/lib/X11/fonts/misc/,
-		  ${PREFIX}/lib/X11/fonts/Speedo/,
-		  ${PREFIX}/lib/X11/fonts/Type1/,
-		  ${PREFIX}/lib/X11/fonts/100dpi/,
-		  ${PREFIX}/lib/X11/fonts/75dpi/,
-		  ${PREFIX}/lib/X11/fonts/xbeeb/
-
-===========================================================================
diff --git a/emulators/xbeeb/Makefile b/emulators/xbeeb/Makefile
deleted file mode 100644
index 3203ed39d31..00000000000
--- a/emulators/xbeeb/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2007/02/07 18:28:00 joerg Exp $
-#
-
-DISTNAME=	xbeeb-0.4.1
-PKGREVISION=	1
-CATEGORIES=	emulators x11
-MASTER_SITES=	http://bbc.nvg.org/emul/Xbeeb/ \
-		http://www.getafile.com/cgi-bin/merlot/get/james/xbeeb/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	dsainty@NetBSD.org
-HOMEPAGE=	http://www.cloud9.co.uk/james/BBCMicro/Xbeeb/
-COMMENT=	Acorn BBC Micro emulator with an X based interface
-
-USE_IMAKE=	yes
-USE_TOOLS+=	bdftopcf xmkmf mkfontdir
-MAN_PAGE=	${WRKDIR}/xbeeb.1
-
-XBEEBROOT=	share/xbeeb
-MESSAGE_SUBST+=	XBEEBROOT=${XBEEBROOT}
-PLIST_SUBST+=	XBEEBROOT=${XBEEBROOT:Q}
-
-FONTS_DIRS.x11=	${PREFIX}/lib/X11/fonts/xbeeb
-REQD_DIRS=	${PREFIX}/lib/X11/fonts/xbeeb
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.xbeeb
-PKG_SUPPORTED_OPTIONS=	mitshm
-PKG_SUGGESTED_OPTIONS=
-
-.include "../../mk/bsd.options.mk"
-
-# The emulator can be compiled either to use MIT-SHM, or to not.
-# Unfortunately it doesn't support both at once.
-.if empty(PKG_OPTIONS:Mmitshm)
-SUBST_CLASSES+=		nomitshm
-SUBST_STAGE.nomitshm=	post-patch
-SUBST_MESSAGE.nomitshm=	Disabling MIT-SHM
-SUBST_FILES.nomitshm=	src/Config.h
-SUBST_SED.nomitshm=	-e "s|\#define	*MITSHM|\#undef MITSHM|"
-.endif
-
-
-.include "../../mk/oss.buildlink3.mk"
-
-.if ${OSS_TYPE} != "none"
-
-SUBST_CLASSES+=		dsp
-SUBST_STAGE.dsp=	post-patch
-SUBST_MESSAGE.dsp=	Adjusting sound device path
-SUBST_FILES.dsp=	src/SoundOSS.c
-SUBST_SED.dsp=		-e "s|\"/dev/dsp\"|\"${DEVOSSAUDIO}\"|"
-
-SUBST_CLASSES+=		osslib
-SUBST_STAGE.osslib=	post-patch
-SUBST_MESSAGE.osslib=	Linking OSS library
-SUBST_FILES.osslib=	src/Imakefile
-SUBST_SED.osslib=	-e "s|\\(SYS_LIBRARIES[	 ]*=.*\\)|\\1 ${LIBOSSAUDIO}|"
-
-.else
-
-SUBST_CLASSES+=		nooss
-SUBST_STAGE.nooss=	post-patch
-SUBST_MESSAGE.nooss=	Disabling sound support: No OSS on this platform
-SUBST_FILES.nooss=	src/Config.h
-SUBST_SED.nooss=	-e "s|^\#define\\([	 ]*SOUND_OSS.*\\)\$$|\#undef\\1|"
-
-.endif # OSS_TYPE
-
-
-SUBST_CLASSES+=		beebroot
-SUBST_STAGE.beebroot=	post-patch
-SUBST_MESSAGE.beebroot=	Adjusting XBEEBROOT path
-SUBST_FILES.beebroot=	src/Config.h
-SUBST_SED.beebroot=	-e "s|^\\(\#define[	 ]*XBEEBROOT[	 ]*\\)[^	 ].*\$$|\\1\"${PREFIX}/${XBEEBROOT}/\"|"
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${XBEEBROOT}/roms ${XBEEBROOT}/docs lib/X11/fonts/xbeeb
-
-# xbeeb build starts in the source directory
-do-configure:
-	cd ${WRKSRC}/src && xmkmf
-
-post-patch:
-	sed	-e 's+@XBEEBROOT@+${XBEEBROOT}+g' \
-		-e 's+@PREFIX@+${PREFIX}+g' \
-		${FILESDIR}/xbeeb.1 > ${MAN_PAGE}
-
-do-build:
-	cd ${WRKSRC}/src && env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} xbeeb
-	set -e; \
-	cd ${WRKSRC}/fonts; \
-	for i in *.bdf; do \
-		bdftopcf "$$i" -o `${BASENAME} "$$i" .bdf`.pcf; \
-	done
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/xbeeb ${PREFIX}/bin/xbeeb
-	${INSTALL_MAN} ${MAN_PAGE} ${PREFIX}/${PKGMANDIR}/man1/xbeeb.1
-	${INSTALL_DATA} ${WRKSRC}/roms/xdfs0.90.rom ${PREFIX}/${XBEEBROOT}/roms/xdfs0.90.rom
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${PREFIX}/${XBEEBROOT}/docs
-	cd ${WRKSRC}/fonts && ${INSTALL_DATA} *.pcf ${PREFIX}/lib/X11/fonts/xbeeb
-	mkfontdir ${PREFIX}/lib/X11/fonts/xbeeb
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xbeeb/PLIST b/emulators/xbeeb/PLIST
deleted file mode 100644
index 8168b9d8620..00000000000
--- a/emulators/xbeeb/PLIST
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2007/01/06 15:09:59 rillig Exp $
-bin/xbeeb
-lib/X11/fonts/xbeeb/ttext-grc-ldh.pcf
-lib/X11/fonts/xbeeb/ttext-grc-udh.pcf
-lib/X11/fonts/xbeeb/ttext-grc.pcf
-lib/X11/fonts/xbeeb/ttext-grs-ldh.pcf
-lib/X11/fonts/xbeeb/ttext-grs-udh.pcf
-lib/X11/fonts/xbeeb/ttext-grs.pcf
-lib/X11/fonts/xbeeb/ttext-std-ldh.pcf
-lib/X11/fonts/xbeeb/ttext-std-udh.pcf
-lib/X11/fonts/xbeeb/ttext-std.pcf
-man/man1/xbeeb.1
-${XBEEBROOT}/docs/64doc
-${XBEEBROOT}/docs/Changes-v0.3
-${XBEEBROOT}/docs/Changes-v0.4
-${XBEEBROOT}/docs/Configuration
-${XBEEBROOT}/docs/DataXfer
-${XBEEBROOT}/docs/DiskEmulation
-${XBEEBROOT}/docs/Help
-${XBEEBROOT}/docs/Installation
-${XBEEBROOT}/docs/Keyboard
-${XBEEBROOT}/docs/KnownBugs
-${XBEEBROOT}/docs/MailingLists
-${XBEEBROOT}/docs/Options
-${XBEEBROOT}/docs/RomPatches
-${XBEEBROOT}/docs/SnapshotFormat
-${XBEEBROOT}/docs/Thanks
-${XBEEBROOT}/docs/WWWSites
-${XBEEBROOT}/roms/xdfs0.90.rom
-@dirrm ${XBEEBROOT}/docs
-@dirrm ${XBEEBROOT}/roms
-@dirrm ${XBEEBROOT}
diff --git a/emulators/xbeeb/distinfo b/emulators/xbeeb/distinfo
deleted file mode 100644
index 29b2f7f3541..00000000000
--- a/emulators/xbeeb/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.7 2006/09/22 13:21:37 dsainty Exp $
-
-SHA1 (xbeeb-0.4.1.tgz) = 5e2fccfabd0aa5a656758b2ea0536570a790dabe
-RMD160 (xbeeb-0.4.1.tgz) = 67dba3262f7e5886a86e5656288d807fea540d9b
-Size (xbeeb-0.4.1.tgz) = 351715 bytes
-SHA1 (patch-ab) = 704fca768a80b17e3aed1ebb8c6525c52f30e3f0
-SHA1 (patch-ac) = 72622acf9671ac0f72bd9b8271fc17f25d3655f1
-SHA1 (patch-ad) = 733916029e94e65ee7702778ce344468ab3cf658
-SHA1 (patch-ae) = 00906d13e5dd9ec03f011053e7399fac581efc3d
-SHA1 (patch-af) = 62c888cc324742142d7a95c9db55067daba4dacd
-SHA1 (patch-ag) = 85f2cd6bddabfa865ab392d38c3a4db7cd2a8026
diff --git a/emulators/xbeeb/files/xbeeb.1 b/emulators/xbeeb/files/xbeeb.1
deleted file mode 100644
index b791445f2a6..00000000000
--- a/emulators/xbeeb/files/xbeeb.1
+++ /dev/null
@@ -1,209 +0,0 @@
-.\" $NetBSD: xbeeb.1,v 1.4 2006/06/13 13:24:35 dsainty Exp $
-.\"
-.Dd May 27, 2000
-.Dt XBEEB 1
-.Sh NAME
-.Nm xbeeb
-.Nd Acorn BBC Micro emulator with X interface
-.Sh SYNOPSIS
-.Nm
-.Op Fl ahV?
-.Op Fl o Ar file
-.Oo
-.Fl p Ns Op Ns Ar number
-.Ar file
-.Oc
-.Op Fl w Ar number
-.Op Fl s Ar number
-.Op Fl m Ar mode
-.Op Fl d Ar dir
-.Op Ar file
-.Sh DESCRIPTION
-The
-.Nm
-program is an X11 based emulator of the Acorn BBC
-(British Broadcasting Corporation) Micro. The BBC Micro
-was first produced in the early 1980s by Acorn Computers
-of Cambridge.
-.Pp
-The BBC Micro was based on the 6502 processor with a 16k
-operating system ROM, upto 32k RAM and 15 paged 16k ROMs for
-utilities.
-.Ss Options
-The options are as follows:
-.Bl -tag -width Ds
-.It Fl ?
-Display usage information.
-.It Fl a
-Emulate the Model A only - if available.
-.It Fl d Ar dir
-Use
-.Ar dir
-as the directory for disk emulation.
-.It Fl h
-Display usage information.
-.It Fl m Ar mode
-Start in display mode
-.Ar mode .
-.It Fl o Ar file
-Load the
-.Ar file
-as the Operating System image, i.e. at address 0xc000.
-.It Xo
-.Fl p Ns Op Ns Ar number
-.Ar file
-.Xc
-Load the ROM image specified by
-.Ar file
-into the paged ROM location specified by
-.Ar number .
-If
-.Ar number
-is not specified the image is loaded into ROM number 15.
-.It Fl s Ar number
-Set the DIP switches to
-.Ar number ,
-where
-.Ar number
-can be specified in octal, decimal or hex. Only the 5
-least significant bits of
-.Ar number
-are used by the emulator.
-.It Fl V
-Display the version information.
-.It Fl w Ar number
-Set the paged ROM slot specified by
-.Ar number
-as writable.
-.It Ar file
-Load the snapshot
-.Ar file
-as the start point of the emulator.
-.El
-.Ss Implementation
-All of the instruction set of a standard 6502 CPU,
-Illegal or undocumented opcodes on the NMOS 6502
-and changes for the CMOS R65C02 and R65C12 are implemented.
-.Pp
-The 6522 VIA implementation is almost complete.  The
-emulation of the system VIA is sufficient to provide clock
-interrupts and keyboard handling for the OS.
-.Pp
-The CRTC, Serial ULA and display implementation is
-complete enough to provide a reasonable emulation of the
-display. X11 fonts for all the teletext characters are
-provided.
-.Ss Keyboard
-The keyboard handling is pretty much there, but not
-quite perfect as the Beeb has a somewhat non-standard
-keyboard layout compared with most available today.
-.Pp
-There are a number of keys on the BBC Micro that do not
-work in the same way as a standard PC keyboard. As the
-keycodes depend on your X setting experimentation is
-probably the best way to understanding the mapping. Some
-important keys should be as follows:
-.Pp
-.Bl -bullet -compact
-.It
-Pause is the BREAK key
-.It
-Right Alt is the SHIFT LOCK key
-.It
-F10 is the F0 key
-.It
-End quits the emulator
-.It
-Home creates a snapshot
-.It
-Enter on the keypad changes the directory used for the
-emulated file system
-.El
-.Ss Snapshots
-There is a snapshot format for saving the complete
-machine state.
-.Ss Disk Emulation
-The emulated disk system requires a directory containing a
-set of files present on a given disk, exactly as they
-would appear on a BBC disk. In addition there is a file
-called
-.Qq __CATALOG__
-which contains the name, load and
-execution address, length and sector number for each file
-as it would be displayed by *INFO
-.Pp
-The sectory number is unused in this emulation - it's
-there for the sake of completeness and maybe used in the
-future.
-.Sh FILES
-.Bl -tag -width @PREFIX@/@XBEEBROOT@/roms/xdfs0.90.rom -compact
-.It Pa @PREFIX@/@XBEEBROOT@/roms/OS1.2.rom
-the Operating System rom image
-.It Pa @PREFIX@/@XBEEBROOT@/roms/BASIC2.rom
-the BBC Basic rom image
-.It Pa @PREFIX@/@XBEEBROOT@/roms/xdfs0.70.rom
-the XDFS rom image required for disc emulation
-.El
-.Sh SEE ALSO
-The best site for information about BBC Micro is
-.Pa http://www.nvg.ntnu.no/bbc
-.Sh AUTHORS
-This program was written by James Fidell. This man page was
-put together by Nick Hudson (nick@nthcliff.demon.co.uk)
-.Sh BUGS
-The following are known bugs:
-.Bl -bullet
-.It
-Serial IO, the ADC, Econet, the FRED and JIM
-memory-mapped IO pages, the Tube and User VIA are pretty
-much all ignored.
-.It
-The mark/space ratio for flashing teletext is a guess.
-I haven't a clue what it really is.
-.It
-The emulator possibly only works on pseudo-colour X
-displays. It is untested on any others.
-.It
-The MODE 7 screen emulation flickers because it updates
-the whole screen when it changes, rather than just the
-changed bits. The reason it works this way is
-because of the handling of double height characters -
-the context of each line may change because of a change in
-the line above it.
-.It
-The code for re-initialising the screen when a snapshot
-has been loaded is quite horrid and is probably the
-source of a number of bugs. It needs more thought and
-work.
-.It
-There are numerous places where it is unknown how the
-emulator should handle a given situation. These are
-usually documented in the code, but will cause a fatal
-error if encountered.
-.It
-The cursor isn't implemented for bitmapped modes.
-.It
-Handling of mixed case in filenames is incomplete. If a
-filename is mixed case on the disk, its exact name must
-be used in any command for loading or running it.
-.It
-Although you won't hear anything, the emulator still
-does all that's necessary from the programming point of
-view to make sounds even if you don't have sound support.
-This means that there will be delays in programs that play
-sounds before they continue. The emulator hasn't crashed,
-honest.
-.It
-Handling of hardware-scrolled screens isn't perfect.  In
-the efs-demo and xdfs-demo directories there's a program
-called B.DEMO that will usually demonstrate the problem.
-.It
-Changing the Horizontal Sync. register in the
-CRTC isn't implemented but is required for some games.
-.It
-The counter in Hopper is screwy. I did have this
-working at once stage, but I've broken it again.
-.It
-The screen window overlaps the window with the LED
-status in sometimes.
-.El
diff --git a/emulators/xbeeb/patches/patch-ab b/emulators/xbeeb/patches/patch-ab
deleted file mode 100644
index ec9c4379589..00000000000
--- a/emulators/xbeeb/patches/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/06/17 06:37:55 dsainty Exp $
-
-Make sure ioctl() gets a third dummy argument, for the three argument macro
-defined in the NetBSD OSS emulation soundcard.h.
-
-rand() is too weak to generate quality white noise, use random() instead.
-
---- src/SoundOSS.c.orig	2002-01-16 04:46:43.000000000 +1300
-+++ src/SoundOSS.c	2006-06-03 18:25:08.000000000 +1200
-@@ -106,7 +106,7 @@
- 		return;
- 	}
- 
--	if ( ioctl ( SoundFD, SNDCTL_DSP_RESET ) < 0 ) {
-+	if ( ioctl ( SoundFD, SNDCTL_DSP_RESET, &dummy ) < 0 ) {
- 		fprintf ( stderr, "Can't reset sound device\n" );
- 		return;
- 	}
-@@ -328,13 +328,13 @@
- 					SampleState[c] ^= 1;
- 				else {
- 					if ( SoundFb )
--						SampleState[c] = rand() & 1;
-+						SampleState[c] = random() & 1;
- 					else {
- 						if ( pnoise++ == 10240 ) {
--							srand(time(0));
-+							srandom(time(0));
- 							pnoise = 0;
- 						}
--						SampleState[c] = rand() & 1;
-+						SampleState[c] = random() & 1;
- 					}
- 				}
- 			}
diff --git a/emulators/xbeeb/patches/patch-ac b/emulators/xbeeb/patches/patch-ac
deleted file mode 100644
index 2c5f5c0fca7..00000000000
--- a/emulators/xbeeb/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/05/22 22:13:12 skrll Exp $
-
---- src/Memory.c.orig	Sat Oct 12 16:03:26 1996
-+++ src/Memory.c	Sun May 21 21:22:13 2000
-@@ -254,6 +254,19 @@
- 	}
- 
- 	close ( fd );
-+#ifdef EMUL_FS
-+	/*
-+	 * This code is taken from pch/pch.c to patch up the OS rom when
-+	 * using EMUL_FS
-+	 */
-+
-+        /* The OSFILE trap */
-+        Mem [ 0xc000 + 0x327d ] = 0x22;
-+
-+        /* The OSFSC trap */
-+        Mem [ 0xc000 + 0x31b1 ] = 0x02;
-+#endif
-+	
- 	return;
- }
- 
diff --git a/emulators/xbeeb/patches/patch-ad b/emulators/xbeeb/patches/patch-ad
deleted file mode 100644
index f6fb5de5ffb..00000000000
--- a/emulators/xbeeb/patches/patch-ad
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/06/13 13:24:36 dsainty Exp $
-
-The R65C02 is a generally more capable processor than the M6502, and a BBC B
-can run almost all software with a R65C02 replacing its standard CPU.  In
-addition, the R65C02 allows running some software intended for the Master
-series of microcomputer, making the R65C02 the more interesting CPU to
-emulate.
-
-Since patch-ac modifies the OS1.2.rom on the fly, it is no longer necessary to
-patch the ROM externally for EMUL_FS, so keep OS_ROM the same.
-
---- src/Config.h.orig	2002-01-16 04:46:43.000000000 +1300
-+++ src/Config.h	2006-06-04 12:44:23.000000000 +1200
-@@ -290,8 +290,8 @@
-  * Processor type
-  */
- 
--#define		M6502
--#undef		R65C02
-+#undef		M6502
-+#define		R65C02
- #undef		R65C12
- 
- /*
-@@ -344,11 +344,7 @@
-  * Names of ROMs to load by default
-  */
-   
--#ifdef	EMUL_FS
--#define		OS_ROM			"OS1.2p1.rom"
--#else
- #define		OS_ROM			"OS1.2.rom"
--#endif
- 
- #ifdef	M6502
- #define		LANG_ROM		"BASIC2.rom"
diff --git a/emulators/xbeeb/patches/patch-ae b/emulators/xbeeb/patches/patch-ae
deleted file mode 100644
index 5a9cba86ed1..00000000000
--- a/emulators/xbeeb/patches/patch-ae
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/06/13 13:24:36 dsainty Exp $
-
-Don't fail if the display has multiple visuals.  Just default to the default
-one and don't concern ourselves with the others.
-
-Check if MIT-SHM is available before trying XShmQueryVersion(), since
-XShmQueryVersion() will abort outright if MIT-SHM isn't available.
-
---- src/Screen.c.orig	2002-01-16 04:46:43.000000000 +1300
-+++ src/Screen.c	2006-06-03 19:08:48.000000000 +1200
-@@ -286,11 +286,6 @@
- 	VisualTmpl.depth = DefDepth;
- 	MyVisual = XGetVisualInfo ( dpy, VisualScreenMask | VisualDepthMask,
- 		&VisualTmpl, &visuals );
--	if ( visuals != 1 ) {
--		fprintf ( stderr, "can't handle default screen with multiple "
--			"visuals\n" );
--		exit ( 1 );
--	}
- 	VisualClass = MyVisual->class;
- 	XFree ( MyVisual );
- 
-@@ -381,7 +376,8 @@
- 	 * See if we can use shared memory
- 	 */
- 
--    if ( XShmQueryVersion ( dpy, &dummy, &dummy, &SharedPixmapSupport ))
-+    if ( XShmQueryExtension ( dpy ) &&
-+         XShmQueryVersion ( dpy, &dummy, &dummy, &SharedPixmapSupport ))
- 	{
- 		if ( SharedPixmapSupport )
- 		{
diff --git a/emulators/xbeeb/patches/patch-af b/emulators/xbeeb/patches/patch-af
deleted file mode 100644
index 28876f767bf..00000000000
--- a/emulators/xbeeb/patches/patch-af
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/06/13 13:24:36 dsainty Exp $
-
-Remove use of non-standard "a" modifier in scanf format.  Under non-Linux
-systems it is more likely to just core.
-
---- src/InfFS.c.orig	2002-01-16 04:46:43.000000000 +1300
-+++ src/InfFS.c	2006-06-04 13:36:52.000000000 +1200
-@@ -1516,24 +1516,23 @@
- 			if ( !access ( beebfile, R_OK ) &&
- 						( cat_fp = fopen ( entry->d_name, "r" ))) {
- 				if ( fgets ( buff, 79, cat_fp ) > 0 ) {
-+					char locked[10];
- 					/*
- 					 * FIX ME
- 					 * Check for errors from malloc and sscanf
- 					 */
- 					p = malloc ( sizeof ( FileInfoL ));
--					sscanf ( buff, "%*s %X %X %as",
--						&(p->info.LoadAddress), &(p->info.ExeAddress), &lock );
-+					locked[0] = '\0';
-+					sscanf ( buff, "%*s %X %X %9s",
-+						&(p->info.LoadAddress), &(p->info.ExeAddress), locked);
- 					p->info.StartSector = 0;
- 					stat ( beebfile, &sb );
- 					p->info.FileLength = sb.st_size;
--					if ( lock ) {
- #ifdef	XDFS
--						if ( !strncmp ( lock, "Locked", 6 )) {
--							p->info.LockFlag = 'L';
--						}
--#endif
--						free ( lock );
-+					if ( !strncmp ( locked, "Locked", 6 )) {
-+						p->info.LockFlag = 'L';
- 					}
-+#endif
- 					/*
- 					 * Filenames are right-padded with spaces initially.
- 					 */
diff --git a/emulators/xbeeb/patches/patch-ag b/emulators/xbeeb/patches/patch-ag
deleted file mode 100644
index bcc8abc1723..00000000000
--- a/emulators/xbeeb/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/09/21 21:47:32 dsainty Exp $
-
-Fix build under gcc 4.1.2, which catches an extern Vs static inconsistency.
-
---- src/VideoUla.h.orig	2002-01-16 04:46:43.000000000 +1300
-+++ src/VideoUla.h	2006-09-22 01:06:05.000000000 +1200
-@@ -88,6 +88,5 @@
- extern	unsigned char		CursorByteWidth;
- extern	unsigned char		MasterCursorWidth;
- extern	unsigned char		ClockRate;
--extern	byteval				VidRegister0;
- 
- #endif	/* VIDEOULA_H */
diff --git a/emulators/xcopilot/DESCR b/emulators/xcopilot/DESCR
deleted file mode 100644
index 1b2baf307c2..00000000000
--- a/emulators/xcopilot/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-XCopilot is an emulator for the 3Com/USRobotics
-Pilot/PalmPilot/PalmIII that runs on Unix systems under X11.
-
-XCopilot is a Unix/X11 port of the copilot emulator, which was
-originally written for Windows95. Greg Hewgill wrote copilot.
-Ivan A. Curtis created XCopilot.
diff --git a/emulators/xcopilot/Makefile b/emulators/xcopilot/Makefile
deleted file mode 100644
index 99a1c404b80..00000000000
--- a/emulators/xcopilot/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:36 joerg Exp $
-#
-
-DISTNAME=		xcopilot-0.6.6
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		http://xcopilot.cuspy.com/build/
-
-MAINTAINER=		nathanw@NetBSD.org
-HOMEPAGE=		http://xcopilot.cuspy.com/
-COMMENT=		PalmPilot emulator for X
-
-NOT_FOR_PLATFORM=	*-*-alpha	# suspected LP64 bugs
-
-GNU_CONFIGURE=		YES
-
-post-extract:
-	${RM} -f ${WRKSRC}/mc68k/custom.c
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xcopilot/PLIST b/emulators/xcopilot/PLIST
deleted file mode 100644
index ebb3653b820..00000000000
--- a/emulators/xcopilot/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:23 zuntum Exp $
-bin/xcopilot
-man/man1/xcopilot.1
diff --git a/emulators/xcopilot/distinfo b/emulators/xcopilot/distinfo
deleted file mode 100644
index 626fc115b48..00000000000
--- a/emulators/xcopilot/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.6 2006/06/30 22:14:49 tron Exp $
-
-SHA1 (xcopilot-0.6.6.tar.gz) = 91f76d1fd8fc19b6fea18853425aa3076e945d5d
-RMD160 (xcopilot-0.6.6.tar.gz) = e267495db384070e7e192043f23290f0004ecd4a
-Size (xcopilot-0.6.6.tar.gz) = 343264 bytes
-SHA1 (patch-aa) = 3354ed73dfa6c05273c7f430d45bacb0c8adbcf5
-SHA1 (patch-ab) = d0e1eba65c0e8c963953856b939629fa0b99ea3c
-SHA1 (patch-ac) = 7755e1a2ada8e3ca4f1e7d144b82d166ed2d3360
-SHA1 (patch-ad) = b59e359dc575f3321385e54b87c9d6342461bf6f
-SHA1 (patch-ae) = 26067d585aac5fc30fcc8bc58b561acc4bdfae44
-SHA1 (patch-af) = 5b1a93a5b08444e53fdbb17e1148149542cc6dd1
-SHA1 (patch-ag) = 68a22072946811f9cc97434f532081a07fda567f
-SHA1 (patch-ah) = fa166c5ecf7458c91f89b216aee5acb6de270292
-SHA1 (patch-ai) = 255d997e2ef340a8d4b91ce25c2a3071df5c4520
-SHA1 (patch-aj) = 560a3dd902323ec1d07c292b6e8f95acb6c1c939
-SHA1 (patch-ak) = 830984e8d2992b3c6ff1229309328717b4f9f473
-SHA1 (patch-al) = 991331f9cd004ced4b37253a55e6ecc3e66cc7c3
diff --git a/emulators/xcopilot/patches/patch-aa b/emulators/xcopilot/patches/patch-aa
deleted file mode 100644
index 2462dd36084..00000000000
--- a/emulators/xcopilot/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/02/05 07:38:15 nathanw Exp $
-
---- Makefile.in.orig	Wed Feb  3 11:22:56 1999
-+++ Makefile.in	Wed Feb  3 11:27:24 1999
-@@ -93,7 +93,7 @@
- xcopilot_DEPENDENCIES =  mc68k/libmc68k.a mx/libmx.a
- xcopilot_LDFLAGS = 
- CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(X_CFLAGS) $(CFLAGS)
- LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
- man1dir = $(mandir)/man1
- MANS = $(man_MANS)
diff --git a/emulators/xcopilot/patches/patch-ab b/emulators/xcopilot/patches/patch-ab
deleted file mode 100644
index 623bc455bd4..00000000000
--- a/emulators/xcopilot/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/02/05 07:38:15 nathanw Exp $
-
---- mx/Makefile.in.orig	Wed Feb  3 11:27:46 1999
-+++ mx/Makefile.in	Wed Feb  3 11:27:07 1999
-@@ -102,7 +102,7 @@
- test_filesel_DEPENDENCIES =  libmx.a
- test_filesel_LDFLAGS = 
- CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(X_CFLAGS) $(CFLAGS)
- LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
- DIST_COMMON =  Makefile.am Makefile.in
- 
diff --git a/emulators/xcopilot/patches/patch-ac b/emulators/xcopilot/patches/patch-ac
deleted file mode 100644
index 3ebe55a582a..00000000000
--- a/emulators/xcopilot/patches/patch-ac
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2006/06/30 22:14:49 tron Exp $
-
---- mc68k/memory.c.orig	1998-08-25 05:52:56.000000000 +0100
-+++ mc68k/memory.c	2006-06-30 23:09:38.000000000 +0100
-@@ -346,9 +346,11 @@
- 			       0xff, 0xff, 0x00 };
- 
-     const unsigned char *bootsign = _bootsign, *bootmask = _bootmask;
--    
-+    char *p;
-+
-+    p = (const char *)rom;
-     while ((*bootsign & *bootmask) == *bootsign)
--	if ((*((char *)rom)++ & *bootmask++) != *bootsign++)
-+	if ((*p++ & *bootmask++) != *bootsign++)
- 	    return 0;
- 
-     return 1;
-@@ -377,6 +379,7 @@
-   int i;
-   char *rombuf;
-   char *resetv;
-+  void *tmpmemory;
-   int f;
-   struct stat st;
-   
-@@ -405,12 +408,24 @@
-     rom_size = pow_of_2;
-   }
-   
--  rommemory = (UWORD*)mmap(0, rom_size, PROT_READ|PROT_WRITE, 
--			   MAP_FILE|MAP_PRIVATE, f, 0);
--  if (rommemory == (UWORD *)-1) {
-+  /* mmap'ing a larger region than the underlying object does not work.
-+   * Instead, mmap the actual object and copy into a power-of-two sized
-+   * buffer.
-+   */
-+  tmpmemory = mmap(0, st.st_size, PROT_READ|PROT_WRITE, 
-+		   MAP_FILE|MAP_PRIVATE, f, 0);
-+  if (tmpmemory == (void *)-1) {
-     return PILOTCPU_ERROR_LOADING_ROM;
-   }
--  
-+
-+  /* We want the end of the buffer to be zero-filled */
-+  rommemory = (UWORD *) calloc(1, rom_size);
-+  if (rommemory == 0) {
-+    return PILOTCPU_ERROR_LOADING_ROM;
-+  }
-+  memcpy(rommemory, tmpmemory, st.st_size);
-+  munmap(tmpmemory, st.st_size);
-+
-   if (!nocheck) {
-   /* Check if the reset vector looks plausible */
-     resetv = (char *)rommemory +
-@@ -430,23 +445,15 @@
- 	offset = resetv - find_entrypoint((char *)rommemory);
-       }
- 
--      /* Did we find it? If not, lets go with the original. */
--      if ((char *)offset != resetv) {
--	/* It may not always be page aligned... */
--	pageoffset = ((offset-1) & ~(getpagesize() - 1)) + getpagesize();
--
--	if ((st.st_size + offset) > rom_size)
--          rom_size <<= 1;
--
--	rommemory = (UWORD *)mmap((void*)(rommemory + pageoffset),
--                                  rom_size - pageoffset,
--				  PROT_READ | PROT_WRITE,
--				  MAP_FILE | MAP_PRIVATE | MAP_FIXED, f, 0);
--	if (rommemory == (UWORD *)-1)
--	  return PILOTCPU_ERROR_LOADING_ROM;
--
--	memcpy(((char *)rommemory) - offset, rommemory, 256);
--	((char *)rommemory) -= offset;
-+      if (offset != 0) {
-+	if ((st.st_size + offset) > rom_size) {
-+	  rom_size <<= 1;
-+	  rommemory = realloc(rommemory, rom_size);
-+	  if (rommemory == 0)
-+	    return PILOTCPU_ERROR_LOADING_ROM;
-+	}
-+	
-+	memmove((char *)rommemory + offset, rommemory, st.st_size);
-       }
-     }
-   }
diff --git a/emulators/xcopilot/patches/patch-ad b/emulators/xcopilot/patches/patch-ad
deleted file mode 100644
index 232a4a862a4..00000000000
--- a/emulators/xcopilot/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/02/23 23:56:32 nathanw Exp $
-
---- mc68k/Makefile.in.orig	Tue Feb 23 18:33:06 1999
-+++ mc68k/Makefile.in	Tue Feb 23 18:33:15 1999
-@@ -283,8 +283,8 @@
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
- 
- 
--custom.c: fab_custom.c
--	$(CC) -o fab_custom $<
-+custom.c: fab_custom.o
-+	$(CC) -o fab_custom $?
- 	./fab_custom
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/emulators/xcopilot/patches/patch-ae b/emulators/xcopilot/patches/patch-ae
deleted file mode 100644
index 77403fde874..00000000000
--- a/emulators/xcopilot/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/03/15 13:54:24 simonb Exp $
-
---- main.c.orig	Tue Aug 25 15:06:36 1998
-+++ main.c	Tue Mar 16 00:45:28 1999
-@@ -638,7 +638,6 @@
-   struct stat buf;
- 
-   expand_tilde(&pilot->DataDir);
--  add_slash(&pilot->DataDir);
-   if (stat(pilot->DataDir, &buf) == -1) {
-     if (errno == ENOENT) {
-       if (mkdir(pilot->DataDir, S_IRWXU)) {
-@@ -651,6 +650,7 @@
-         exit(1);
-     }
-   }
-+  add_slash(&pilot->DataDir);
- 
-   /* Set the memory version */
-   pdebug_memversion = pilot->MemVersion;
diff --git a/emulators/xcopilot/patches/patch-af b/emulators/xcopilot/patches/patch-af
deleted file mode 100644
index fef854d81c3..00000000000
--- a/emulators/xcopilot/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 1999/09/13 21:31:51 tron Exp $
-
---- xcopilot.c.orig	Tue Aug 25 06:53:31 1998
-+++ xcopilot.c	Mon Sep 13 23:26:33 1999
-@@ -111,7 +111,7 @@
- 
-   XtGetApplicationResources(pilot.topWidget, &pilot, resources, XtNumber(ros),
-                             NULL, 0);
--
-+  pilot.threads = 0;
-   if (pilot.DoublePixels)
-     pilot.MagFactor = 2;
- 
diff --git a/emulators/xcopilot/patches/patch-ag b/emulators/xcopilot/patches/patch-ag
deleted file mode 100644
index ebf7ffeba1d..00000000000
--- a/emulators/xcopilot/patches/patch-ag
+++ /dev/null
@@ -1,141 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/02/12 14:09:25 wiz Exp $
-
---- display.c.orig	Tue Aug 25 15:56:02 1998
-+++ display.c	Tue Feb  6 15:02:19 2001
-@@ -272,8 +272,13 @@
- }
- 
- static int xcpHandleExpose(XEvent *event) {
--  xcpPutImage(event->xexpose.x, event->xexpose.y, event->xexpose.width,
--              event->xexpose.height);
-+  if (shared->LcdPower == lcdOff) {
-+      XClearWindow (xcpDisplay, xcpLCDWindow);
-+      XFlush(xcpDisplay);
-+  }
-+  else
-+    xcpPutImage(event->xexpose.x, event->xexpose.y, event->xexpose.width,
-+                event->xexpose.height);
-   return event->xexpose.count;
- }
- 
-@@ -360,15 +365,26 @@
- typedef struct _Key {
-   const char *name;
-   XRectangle bounds;
-+  KeySym key;
- } Key;
- 
--static Key keys[] = {{"power", {0, 281, 16, 22}},
--                     {"up", {100, 280, 25, 12}},
--                     {"down", {100, 302, 25, 12}},
--                     {"datebook", {24, 277, 28, 29}},
--                     {"phone", {63, 277, 28, 29}},
--                     {"todo", {134, 277, 28, 29}},
--                     {"memo", {173, 277, 28, 29}}};
-+typedef struct _NonprintKey {
-+  KeySym sym;
-+  int code;
-+} NonprintKey;
-+
-+static Key keys[] = {{"power", {0, 281, 16, 22}, XK_Escape},
-+                     {"up", {100, 280, 25, 12}, XK_Page_Up},
-+                     {"down", {100, 302, 25, 12}, XK_Page_Down},
-+                     {"datebook", {24, 277, 28, 29}, XK_F9},
-+                     {"phone", {63, 277, 28, 29}, XK_F10},
-+                     {"todo", {134, 277, 28, 29}, XK_F11},
-+                     {"memo", {173, 277, 28, 29}, XK_F12}};
-+
-+static NonprintKey nonprint_keys[] = {{XK_Left, 0x1c /* chrLeftArrow */},
-+				  {XK_Right, 0x1d /* chrRightArrow */},
-+				  {XK_Down, 0x103 /* vchrNextField */},
-+				  {XK_Up, 0x10c /* vchrPrevField */}};
- 
- static void HandleKey(Widget w, XtPointer client_data, XEvent *event,
-                       Boolean *continue_to_dispatch)
-@@ -502,7 +518,7 @@
- {
-   static KeySym		keysym;
-   static XComposeStatus	compose;
--  int			count, bufsize, in;
-+  int			count, bufsize, in, i, code;
-   char			buffer[8];
- 
-   bufsize = 8;
-@@ -511,16 +527,55 @@
- 			bufsize,
- 			&keysym,
- 			&compose);
-+
-+  for (i = 0; i < XtNumber(keys); i++)
-+    if (keysym == keys[i].key) {
-+      xcpKeyEvent(1, i);
-+      return;
-+  }
-+
-+  if (count > 0) {
-+    if (buffer[0] == '\r')
-+      code = '\n';
-+    else
-+      code = buffer[0];
-+  }
-+  else {
-+    for (i = 0; i < XtNumber(nonprint_keys); i++)
-+      if (keysym == nonprint_keys[i].sym) {
-+        count = 1;
-+        code = nonprint_keys[i].code;
-+      }
-+  }
-+
-   if (count > 0) {
--    if (buffer[0] == '\r') {
--      buffer[0] = '\n';
--    }
-     in = shptr->kbin;
--    shptr->kb[in] = buffer[0];
-+    shptr->kb[in] = code;
-     shptr->kbin = (in + 1) & 7;
-   }
- }
- 
-+static void xcpKBKey(XEvent *event)
-+{
-+  static KeySym		keysym;
-+  static XComposeStatus	compose;
-+  int			count, bufsize, in, i;
-+  char			buffer[8];
-+
-+  bufsize = 8;
-+  count = XLookupString((XKeyEvent *) event,
-+			buffer,
-+			bufsize,
-+			&keysym,
-+			&compose);
-+
-+  for (i = 0; i < XtNumber(keys); i++)
-+    if (keysym == keys[i].key) {
-+      xcpKeyEvent(0, i);
-+      return;
-+    }
-+}
-+
- static void HandleClientMessage(Widget w, XtPointer client_data, XEvent *event,
-                                 Boolean *continue_to_dispatch)
- {
-@@ -542,6 +597,8 @@
-   case KeyPress:
-     xcpKBtoASCII(shptr, event);
-     break;
-+  case KeyRelease:
-+    xcpKBKey(event);
-   case ButtonPress:		/* a mouse button was pressed */
-     if (event->xbutton.button == 3)
-       do_menu(event->xbutton.x_root, event->xbutton.y_root);
-@@ -623,7 +680,7 @@
-                 XtNborder, BlackPixel(xcpDisplay, xcpScreenNum), NULL);
- 
-   XtAddEventHandler(topWidget, ButtonPressMask | KeyPressMask |
--                    OwnerGrabButtonMask, False, HandleXEvents,
-+                    KeyReleaseMask | OwnerGrabButtonMask, False, HandleXEvents,
-                     (XtPointer)shptr);
- 
-   /*
diff --git a/emulators/xcopilot/patches/patch-ah b/emulators/xcopilot/patches/patch-ah
deleted file mode 100644
index a9d33c0abb8..00000000000
--- a/emulators/xcopilot/patches/patch-ah
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2001/02/12 14:09:25 wiz Exp $
-
---- xcopilot.1.orig	Sun Feb  4 18:59:03 2001
-+++ xcopilot.1	Mon Feb  5 00:27:53 2001
-@@ -216,7 +216,18 @@
- it to tap the power button, any of the other buttons, or on the screen.
- You can use it to write in graffiti in the appropriate area of the LCD.
- Additionally, you can type, and what you type will be passed to
--XCopilot, making input easier.
-+XCopilot, making input easier.  The hardware buttons are also bound
-+to the following keys:
-+.Pp
-+F9: Datebook
-+.Pp
-+F10: Address
-+.Pp
-+F11: Todo
-+.Pp
-+F12: Memopad
-+.Pp
-+ESC: Power
- .Pp
- \fBThe Right Mouse Menu\fP
- .Pp
diff --git a/emulators/xcopilot/patches/patch-ai b/emulators/xcopilot/patches/patch-ai
deleted file mode 100644
index 3796eee8d66..00000000000
--- a/emulators/xcopilot/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2001/02/12 14:09:25 wiz Exp $
-
---- mc68k/shared.h.orig	Tue Feb  6 14:49:07 2001
-+++ mc68k/shared.h	Tue Feb  6 14:49:32 2001
-@@ -95,7 +95,7 @@
-   int pen, pendown, penx, peny;	/* modified by lcd process */
-   int key, keydown;		/* modified by lcd process */
-   int kbin, kbout;		/* ring-buffer for X11 keyboard */
--  char kb[8];			/* ASCII data from X11 keyboard */
-+  int kb[8];			/* data from X11 keyboard (palm chr codes) */
- 
-   /*
-    * X Output devices (display_proc)
diff --git a/emulators/xcopilot/patches/patch-aj b/emulators/xcopilot/patches/patch-aj
deleted file mode 100644
index 1031f29d72b..00000000000
--- a/emulators/xcopilot/patches/patch-aj
+++ /dev/null
@@ -1,502 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/09/30 17:47:44 tron Exp $
-
---- mc68k/fab_custom.c.orig	1998-07-29 01:08:48.000000000 +0200
-+++ mc68k/fab_custom.c	2003-09-30 19:22:12.000000000 +0200
-@@ -1027,252 +1027,251 @@
-  *						Max Okumoto
-  *---------------------------------------------------------------------------*/
- static char	*HACK[] = {
--"
--/****************************************
-- * Handle a key event. The fields	*
-- * keydown and key of the shared image	*
-- * are interpreted, and the dragonball	*
-- * registers updated			*
-- ****************************************/
--static void
--dokey(void)
--{
--	UBYTE		d;
--	d = db_PDDATA.x;
--	if (CustShptr->keydown) {
--		db_PDDATA.x |= (1 << CustShptr->key);
--		CustShptr->keydown = 0;
--		CustShptr->key = -1;
--	} else if (CustShptr->key >= 0) {
--		db_PDDATA.x &= ~(1 << CustShptr->key);
--		CustShptr->key = -1;
--	}
--	db_PDDATA_edge |= db_PDDATA.x & ~d;
--	db_IPR.anon.PEN = CustShptr->pen;
--	db_IPR.x = (db_IPR.x & 0xffff00ff) |
--		((((db_PDDATA_edge & db_PDIRQEDGE.x) |
--		   (db_PDDATA.x & ~db_PDIRQEDGE.x)) & db_PDIRQEN.x) << 8);
--}
--
--void
--updateisr()
--{
--	db_IPR.anon.PEN = CustShptr->pen;
--	db_ISR.x = db_IPR.x & ~db_IMR.x;
--	if (db_ISR.x) {
--		specialflags |= SPCFLAG_INT;
--	}
--	CustShptr->run_updateisr = 0;
--}
--
--void
--maybe_updateisr()
--{
--	if (CustShptr->run_updateisr) {
--		dokey();
--		updateisr();
--	}
--}
--
--int
--intbase()
--{
--	return db_IVR.anon.VECTOR << 3;
--}
--
--int
--intlev()
--{
--	if (db_ISR.anon.IRQ7)	return 7;
--	if (db_ISR.anon.SPIS)	return 6;
--	if (db_ISR.anon.TMR1)	return 6;
--	if (db_ISR.anon.IRQ6)	return 6;
--	if (db_ISR.anon.PEN)	return 5;
--	if (db_ISR.anon.SPIM)	return 4;
--	if (db_ISR.anon.TMR2)	return 4;
--	if (db_ISR.anon.UART)	return 4;
--	if (db_ISR.anon.WDT)	return 4;
--	if (db_ISR.anon.RTC)	return 4;
--	if (db_ISR.anon.KB)	return 4;
--	if (db_ISR.anon.PWM)	return 4;
--	if (db_ISR.anon.INT0)	return 4;
--	if (db_ISR.anon.INT1)	return 4;
--	if (db_ISR.anon.INT2)	return 4;
--	if (db_ISR.anon.INT3)	return 4;
--	if (db_ISR.anon.INT4)	return 4;
--	if (db_ISR.anon.INT5)	return 4;
--	if (db_ISR.anon.INT6)	return 4;
--	if (db_ISR.anon.INT7)	return 4;
--	if (db_ISR.anon.IRQ3)	return 3;
--	if (db_ISR.anon.IRQ2)	return 2;
--	if (db_ISR.anon.IRQ1)	return 1;
--	return -1;
--}
--
--static void
--pen(int down, int x, int y)
--{
--	if (!pendown && down) {
--		db_IPR.anon.PEN = 1;
--		updateisr();
--	} else if (pendown && !down) {
--		db_IPR.anon.PEN = 0;
--		updateisr();
--	}
--	pendown = down;
--	penx = x;
--	peny = y;
--}
--
--static void
--hotsync(int down)
--{
--	if (down) {
--		db_IPR.anon.IRQ1 = 1;
--	} else {
--		db_IPR.anon.IRQ1 = 0;
--	}
--	updateisr();
--}
--
--/*
-- * custptr is a pointer to a shared memory block which will \"back-up\"
-- * the register values of the custom circuits, allowing other processes
-- * to look at register values
-- */
--void
--custom_init(shared_img * shptr)
--{
--	CustShptr = shptr;
--	CustShptr->PICF = 0;
--	CustShptr->VPW = 0xff;
--	CustShptr->POSR = 0;
--	CustShptr->grpalette[0] = 1;
--	CustShptr->grpalette[1] = 0;
--	CustShptr->grpalette[2] = 3;
--	CustShptr->grpalette[3] = 7;
--	CustShptr->quit = 0;
--	CustShptr->run_updateisr = 0;
--	CustShptr->LcdPower = lcdOn;
--	CustShptr->Backlight = 0;
--	customreset();
--}
--
--void
--do_cycles(int longtime)
--{
--	if (db_TCTL2.anon.TEN) {
--		db_TCN2.anon.COUNT++;
--		if (db_TCN2.anon.COUNT > db_TCMP2.anon.COMPARE || longtime) {
--			db_TSTAT2.anon.COMP = 1;
--			if (db_TCTL2.anon.FRR == 0) {
--				db_TCN2.anon.COUNT = 0;
--			}
--			if (db_TCTL2.anon.IRQEN) {
--				db_IPR.anon.TMR2 = 1;
--				updateisr();
--			}
--		}
--	}
--	/*
--	 * Determine if there are any chars to read from the serial port or
--	 * debugger
--	 */
--
--	/*
--	 * WARNING: This uses a shared memory data structure to store the
--	 * FIFO. The producer is adding things to this _at the same time_ as
--	 * this is consuming.  Examine main.c and take a course in concurrent
--	 * programming before modifying this.  :-) - Ian
--	 */
--
--	if (CustShptr->serial.head != CustShptr->serial.tail &&
--	    db_USTCNT.anon.UART_ENABLE && !db_URX.anon.DATA_READY) {
--		int	curhead = CustShptr->serial.head;
--		db_URX.anon.DATA = CustShptr->serial.fifo[curhead];
--		curhead += 1;
--		if (curhead == FIFO_SIZE) {
--			curhead = 0;
--		}
--		CustShptr->serial.head = curhead;
--		db_URX.anon.DATA_READY = 1;
--		if (db_USTCNT.anon.RX_READY_ENABLE) {
--			db_IPR.anon.UART = 1;
--			updateisr();
--		}
--	}
--	if (CustShptr->gdb.head != CustShptr->gdb.tail &&
--	    db_USTCNT.anon.UART_ENABLE && !db_URXdb.anon.DATA_READY) {
--		int	curhead = CustShptr->gdb.head;
--		db_URXdb.anon.DATA = CustShptr->gdb.fifo[curhead];
--		curhead += 1;
--		if (curhead == FIFO_SIZE) {
--			curhead = 0;
--		}
--		CustShptr->gdb.head = curhead;
--		db_URXdb.anon.DATA_READY = 1;
--	}
--}
--
--struct EventType {
--	UWORD	eType;
--	UWORD	penDown;
--	UWORD	screenX;
--	UWORD	screenY;
--	UWORD	data[8];
--};
--
--struct SndCommandType {
--	UWORD	cmd;
--	UWORD	param1hi;
--	UWORD	param1lo;
--	UWORD	param2;
--	UWORD	param3;
--};
--
--#define keyDownEvent		4
--#define sysTrapEvtGetEvent	41245
--#define sysTrapSndDoCmd		41523
--
--int
--do_api(int api)
--{
--	switch (api) {
--		case sysTrapEvtGetEvent:
--		if (CustShptr->kbin != CustShptr->kbout) {
--
--			struct EventType	*ev;
--			int			out;
--
--			out = CustShptr->kbout;
--			ev = (struct EventType *) get_real_address(get_long(CustShptr->regs.a[7]));
--
--			ev->eType = keyDownEvent;
--			ev->data[0] = CustShptr->kb[out];
--			ev->data[1] = 0;
--			ev->data[2] = 0;
--			CustShptr->kbout = (out + 1) & 7;
--			return 1;
--		}
--		break;
--	case sysTrapSndDoCmd:
--		{
--			struct SndCommandType *sc;
--			sc = (struct SndCommandType *)
--				get_real_address(get_long(CustShptr->regs.a[7] + 4));
--			if ((sc->cmd >> 8) == 1) {
--				CustShptr->BellFreq = (sc->param1hi << 16) + sc->param1lo;
--				CustShptr->BellDur = sc->param2;
--				CustShptr->BellAmp = sc->param3;
--				CustShptr->LcdReq = lcdBell;
--				return 1;
--			}
--		}
--		break;
--	}
--	return 0;
--}
--"
-+"\n"
-+"/****************************************\n"
-+" * Handle a key event. The fields	*\n"
-+" * keydown and key of the shared image	*\n"
-+" * are interpreted, and the dragonball	*\n"
-+" * registers updated			*\n"
-+" ****************************************/\n"
-+"static void\n"
-+"dokey(void)\n"
-+"{\n"
-+"	UBYTE		d;\n"
-+"	d = db_PDDATA.x;\n"
-+"	if (CustShptr->keydown) {\n"
-+"		db_PDDATA.x |= (1 << CustShptr->key);\n"
-+"		CustShptr->keydown = 0;\n"
-+"		CustShptr->key = -1;\n"
-+"	} else if (CustShptr->key >= 0) {\n"
-+"		db_PDDATA.x &= ~(1 << CustShptr->key);\n"
-+"		CustShptr->key = -1;\n"
-+"	}\n"
-+"	db_PDDATA_edge |= db_PDDATA.x & ~d;\n"
-+"	db_IPR.anon.PEN = CustShptr->pen;\n"
-+"	db_IPR.x = (db_IPR.x & 0xffff00ff) |\n"
-+"		((((db_PDDATA_edge & db_PDIRQEDGE.x) |\n"
-+"		   (db_PDDATA.x & ~db_PDIRQEDGE.x)) & db_PDIRQEN.x) << 8);\n"
-+"}\n"
-+"\n"
-+"void\n"
-+"updateisr()\n"
-+"{\n"
-+"	db_IPR.anon.PEN = CustShptr->pen;\n"
-+"	db_ISR.x = db_IPR.x & ~db_IMR.x;\n"
-+"	if (db_ISR.x) {\n"
-+"		specialflags |= SPCFLAG_INT;\n"
-+"	}\n"
-+"	CustShptr->run_updateisr = 0;\n"
-+"}\n"
-+"\n"
-+"void\n"
-+"maybe_updateisr()\n"
-+"{\n"
-+"	if (CustShptr->run_updateisr) {\n"
-+"		dokey();\n"
-+"		updateisr();\n"
-+"	}\n"
-+"}\n"
-+"\n"
-+"int\n"
-+"intbase()\n"
-+"{\n"
-+"	return db_IVR.anon.VECTOR << 3;\n"
-+"}\n"
-+"\n"
-+"int\n"
-+"intlev()\n"
-+"{\n"
-+"	if (db_ISR.anon.IRQ7)	return 7;\n"
-+"	if (db_ISR.anon.SPIS)	return 6;\n"
-+"	if (db_ISR.anon.TMR1)	return 6;\n"
-+"	if (db_ISR.anon.IRQ6)	return 6;\n"
-+"	if (db_ISR.anon.PEN)	return 5;\n"
-+"	if (db_ISR.anon.SPIM)	return 4;\n"
-+"	if (db_ISR.anon.TMR2)	return 4;\n"
-+"	if (db_ISR.anon.UART)	return 4;\n"
-+"	if (db_ISR.anon.WDT)	return 4;\n"
-+"	if (db_ISR.anon.RTC)	return 4;\n"
-+"	if (db_ISR.anon.KB)	return 4;\n"
-+"	if (db_ISR.anon.PWM)	return 4;\n"
-+"	if (db_ISR.anon.INT0)	return 4;\n"
-+"	if (db_ISR.anon.INT1)	return 4;\n"
-+"	if (db_ISR.anon.INT2)	return 4;\n"
-+"	if (db_ISR.anon.INT3)	return 4;\n"
-+"	if (db_ISR.anon.INT4)	return 4;\n"
-+"	if (db_ISR.anon.INT5)	return 4;\n"
-+"	if (db_ISR.anon.INT6)	return 4;\n"
-+"	if (db_ISR.anon.INT7)	return 4;\n"
-+"	if (db_ISR.anon.IRQ3)	return 3;\n"
-+"	if (db_ISR.anon.IRQ2)	return 2;\n"
-+"	if (db_ISR.anon.IRQ1)	return 1;\n"
-+"	return -1;\n"
-+"}\n"
-+"\n"
-+"static void\n"
-+"pen(int down, int x, int y)\n"
-+"{\n"
-+"	if (!pendown && down) {\n"
-+"		db_IPR.anon.PEN = 1;\n"
-+"		updateisr();\n"
-+"	} else if (pendown && !down) {\n"
-+"		db_IPR.anon.PEN = 0;\n"
-+"		updateisr();\n"
-+"	}\n"
-+"	pendown = down;\n"
-+"	penx = x;\n"
-+"	peny = y;\n"
-+"}\n"
-+"\n"
-+"static void\n"
-+"hotsync(int down)\n"
-+"{\n"
-+"	if (down) {\n"
-+"		db_IPR.anon.IRQ1 = 1;\n"
-+"	} else {\n"
-+"		db_IPR.anon.IRQ1 = 0;\n"
-+"	}\n"
-+"	updateisr();\n"
-+"}\n"
-+"\n"
-+"/*\n"
-+" * custptr is a pointer to a shared memory block which will \"back-up\"\n"
-+" * the register values of the custom circuits, allowing other processes\n"
-+" * to look at register values\n"
-+" */\n"
-+"void\n"
-+"custom_init(shared_img * shptr)\n"
-+"{\n"
-+"	CustShptr = shptr;\n"
-+"	CustShptr->PICF = 0;\n"
-+"	CustShptr->VPW = 0xff;\n"
-+"	CustShptr->POSR = 0;\n"
-+"	CustShptr->grpalette[0] = 1;\n"
-+"	CustShptr->grpalette[1] = 0;\n"
-+"	CustShptr->grpalette[2] = 3;\n"
-+"	CustShptr->grpalette[3] = 7;\n"
-+"	CustShptr->quit = 0;\n"
-+"	CustShptr->run_updateisr = 0;\n"
-+"	CustShptr->LcdPower = lcdOn;\n"
-+"	CustShptr->Backlight = 0;\n"
-+"	customreset();\n"
-+"}\n"
-+"\n"
-+"void\n"
-+"do_cycles(int longtime)\n"
-+"{\n"
-+"	if (db_TCTL2.anon.TEN) {\n"
-+"		db_TCN2.anon.COUNT++;\n"
-+"		if (db_TCN2.anon.COUNT > db_TCMP2.anon.COMPARE || longtime) {\n"
-+"			db_TSTAT2.anon.COMP = 1;\n"
-+"			if (db_TCTL2.anon.FRR == 0) {\n"
-+"				db_TCN2.anon.COUNT = 0;\n"
-+"			}\n"
-+"			if (db_TCTL2.anon.IRQEN) {\n"
-+"				db_IPR.anon.TMR2 = 1;\n"
-+"				updateisr();\n"
-+"			}\n"
-+"		}\n"
-+"	}\n"
-+"	/*\n"
-+"	 * Determine if there are any chars to read from the serial port or\n"
-+"	 * debugger\n"
-+"	 */\n"
-+"\n"
-+"	/*\n"
-+"	 * WARNING: This uses a shared memory data structure to store the\n"
-+"	 * FIFO. The producer is adding things to this _at the same time_ as\n"
-+"	 * this is consuming.  Examine main.c and take a course in concurrent\n"
-+"	 * programming before modifying this.  :-) - Ian\n"
-+"	 */\n"
-+"\n"
-+"	if (CustShptr->serial.head != CustShptr->serial.tail &&\n"
-+"	    db_USTCNT.anon.UART_ENABLE && !db_URX.anon.DATA_READY) {\n"
-+"		int	curhead = CustShptr->serial.head;\n"
-+"		db_URX.anon.DATA = CustShptr->serial.fifo[curhead];\n"
-+"		curhead += 1;\n"
-+"		if (curhead == FIFO_SIZE) {\n"
-+"			curhead = 0;\n"
-+"		}\n"
-+"		CustShptr->serial.head = curhead;\n"
-+"		db_URX.anon.DATA_READY = 1;\n"
-+"		if (db_USTCNT.anon.RX_READY_ENABLE) {\n"
-+"			db_IPR.anon.UART = 1;\n"
-+"			updateisr();\n"
-+"		}\n"
-+"	}\n"
-+"	if (CustShptr->gdb.head != CustShptr->gdb.tail &&\n"
-+"	    db_USTCNT.anon.UART_ENABLE && !db_URXdb.anon.DATA_READY) {\n"
-+"		int	curhead = CustShptr->gdb.head;\n"
-+"		db_URXdb.anon.DATA = CustShptr->gdb.fifo[curhead];\n"
-+"		curhead += 1;\n"
-+"		if (curhead == FIFO_SIZE) {\n"
-+"			curhead = 0;\n"
-+"		}\n"
-+"		CustShptr->gdb.head = curhead;\n"
-+"		db_URXdb.anon.DATA_READY = 1;\n"
-+"	}\n"
-+"}\n"
-+"\n"
-+"struct EventType {\n"
-+"	UWORD	eType;\n"
-+"	UWORD	penDown;\n"
-+"	UWORD	screenX;\n"
-+"	UWORD	screenY;\n"
-+"	UWORD	data[8];\n"
-+"};\n"
-+"\n"
-+"struct SndCommandType {\n"
-+"	UWORD	cmd;\n"
-+"	UWORD	param1hi;\n"
-+"	UWORD	param1lo;\n"
-+"	UWORD	param2;\n"
-+"	UWORD	param3;\n"
-+"};\n"
-+"\n"
-+"#define keyDownEvent		4\n"
-+"#define sysTrapEvtGetEvent	41245\n"
-+"#define sysTrapSndDoCmd		41523\n"
-+"\n"
-+"int\n"
-+"do_api(int api)\n"
-+"{\n"
-+"	switch (api) {\n"
-+"		case sysTrapEvtGetEvent:\n"
-+"		if (CustShptr->kbin != CustShptr->kbout) {\n"
-+"\n"
-+"			struct EventType	*ev;\n"
-+"			int			out;\n"
-+"\n"
-+"			out = CustShptr->kbout;\n"
-+"			ev = (struct EventType *) get_real_address(get_long(CustShptr->regs.a[7]));\n"
-+"\n"
-+"			ev->eType = keyDownEvent;\n"
-+"			ev->data[0] = CustShptr->kb[out];\n"
-+"			ev->data[1] = 0;\n"
-+"			ev->data[2] = 0;\n"
-+"			CustShptr->kbout = (out + 1) & 7;\n"
-+"			return 1;\n"
-+"		}\n"
-+"		break;\n"
-+"	case sysTrapSndDoCmd:\n"
-+"		{\n"
-+"			struct SndCommandType *sc;\n"
-+"			sc = (struct SndCommandType *)\n"
-+"				get_real_address(get_long(CustShptr->regs.a[7] + 4));\n"
-+"			if ((sc->cmd >> 8) == 1) {\n"
-+"				CustShptr->BellFreq = (sc->param1hi << 16) + sc->param1lo;\n"
-+"				CustShptr->BellDur = sc->param2;\n"
-+"				CustShptr->BellAmp = sc->param3;\n"
-+"				CustShptr->LcdReq = lcdBell;\n"
-+"				return 1;\n"
-+"			}\n"
-+"		}\n"
-+"		break;\n"
-+"	}\n"
-+"	return 0;\n"
-+"}\n\n"
- };
- 
- /*---------------------------------------------------------------------------*
diff --git a/emulators/xcopilot/patches/patch-ak b/emulators/xcopilot/patches/patch-ak
deleted file mode 100644
index 3d33e8a35f2..00000000000
--- a/emulators/xcopilot/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2006/06/30 22:14:49 tron Exp $
-
---- config.h.in.orig	2006-01-12 20:51:24.000000000 +0000
-+++ config.h.in
-@@ -71,6 +71,8 @@
- /* AIX requires this to be the first thing in the file.  */
- #if HAVE_ALLOCA_H
- # include <alloca.h>
-+#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+# include <stdlib.h>
- #else
- # ifdef _AIX
-  #pragma alloca
diff --git a/emulators/xcopilot/patches/patch-al b/emulators/xcopilot/patches/patch-al
deleted file mode 100644
index bc367cba570..00000000000
--- a/emulators/xcopilot/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/06/30 22:14:49 tron Exp $
-
---- mc68k/custom.h.orig	1998-04-25 18:50:11.000000000 +0100
-+++ mc68k/custom.h	2006-06-30 23:07:10.000000000 +0100
-@@ -43,7 +43,6 @@
- extern void do_cycles(int longtime);
- extern int do_api(int api);
- 
--extern unsigned long cycles;
- extern unsigned long specialflags;
- 
- #define SPCFLAG_STOP 2
diff --git a/emulators/xm7/DESCR b/emulators/xm7/DESCR
deleted file mode 100644
index 7371eb0cb47..00000000000
--- a/emulators/xm7/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-XM7 is the X11 based emulator of FM-7, which was the very
-popular personal computer in Japan at 8-bits age.  It has a
-built-in ROM BASIC, two M6809 microprocessors, and many other
-good features.  It was produced by FUJITSU LIMITED.
-
-You must own a real machine and make required ROM files from
-it to run FM-7 software on it.  But it'd be rather difficalt
-in these days.
diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile
deleted file mode 100644
index 2add0755e1e..00000000000
--- a/emulators/xm7/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2007/02/16 10:53:11 rillig Exp $
-#
-
-DISTNAME=		xm71010s
-PKGNAME=		xm7-1010s
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.ipc-tokai.or.jp/~ytanaka/fm7/
-EXTRACT_SUFX=		.lzh
-
-MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
-HOMEPAGE=		http://www.ipc-tokai.or.jp/~ytanaka/fm7/xm7.shtml
-COMMENT=		X11-based FM-7 emulator
-
-BUILD_DEPENDS+=		nkf>=1.7:../../converters/nkf
-
-RESTRICTED=		source archive is not redistributable
-LICENSE=		no-commercial-use
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_SRC_ON_FTP=		${RESTRICTED}
-
-EXTRACT_OPTS_LHA=	qt	# convert CRLF to LF
-
-WRKSRC=			${WRKDIR}/vm
-NO_CONFIGURE=		yes
-MAKE_FILE=		makefile.x11
-INSTALLATION_DIRS=	bin
-
-post-extract:
-	cd ${WRKDIR} && mv linux/* vm
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/vm/xm7 ${PREFIX}/bin
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xm7/PLIST b/emulators/xm7/PLIST
deleted file mode 100644
index 891017603b9..00000000000
--- a/emulators/xm7/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:26 zuntum Exp $
-bin/xm7
diff --git a/emulators/xm7/distinfo b/emulators/xm7/distinfo
deleted file mode 100644
index 71a909cd9fe..00000000000
--- a/emulators/xm7/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.12 2007/02/16 10:53:11 rillig Exp $
-
-SHA1 (xm71010s.lzh) = 1afad6f530e05545505582d47bb0aa92965e6f71
-RMD160 (xm71010s.lzh) = df1d96fa997c39ab6bbd0c9d3953a90cfbfb9efa
-Size (xm71010s.lzh) = 273065 bytes
-SHA1 (patch-aa) = b49f4dac3dde6395fcf1d4ab0c987d577e5e9ce4
-SHA1 (patch-ab) = 4e6cc9113e25eca32a1f672b82b3c07ed141a5b7
-SHA1 (patch-ac) = e55f25cb7046455489ab052dbe268043983a9e5f
-SHA1 (patch-ad) = d92ce48806c57a8cf0447f3e647202709e9a63d3
-SHA1 (patch-ae) = ee3a92da9301db4aca1b9eff7b4850f17334345c
diff --git a/emulators/xm7/patches/patch-aa b/emulators/xm7/patches/patch-aa
deleted file mode 100644
index e25d46b60f2..00000000000
--- a/emulators/xm7/patches/patch-aa
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2006/01/12 21:05:19 joerg Exp $
-
---- makefile.x11.orig	2000-03-22 16:01:00.000000000 +0000
-+++ makefile.x11
-@@ -6,21 +6,29 @@
- 
- COMMONSRC = \
- 	debug.c disasm.c gui.c \
--	cpu_x86.asm fdc.c keyboard.c kanji.c tapelp.c \
-+	fdc.c keyboard.c kanji.c tapelp.c \
- 	maincpu.c mainmem.c mainetc.c system.c multipag.c \
- 	subcpu.c submem.c display.c subctrl.c tools.c ttlpalet.c \
- 	opn.c opna.cpp fmgen.cpp psg.cpp 
- 
-+.if defined(__i386__)
-+COMMONSRC += cpu_x86.asm 
-+.endif
-+
- LOCALSRC = \
- 	xw_disp.c xw_key.c xw_main.c xw_file.c xw_snd.cpp
- 
- COMMONOBJ = \
- 	debug.o disasm.o gui.o \
--	cpu_x86.o fdc.o keyboard.o kanji.o tapelp.o \
-+	fdc.o keyboard.o kanji.o tapelp.o \
- 	maincpu.o mainmem.o mainetc.o system.o multipag.o \
- 	subcpu.o submem.o display.o subctrl.o tools.o ttlpalet.o \
- 	opn.o opna.o fmgen.o psg.o
- 
-+.if defined(__i386__)
-+COMMONSRC += cpu_x86.o 
-+.endif
-+
- LOCALOBJ = \
- 	xw_disp.o xw_key.o xw_main.o xw_file.o xw_snd.o
- 
-@@ -29,22 +37,27 @@ LOCALOBJ = \
- SRCS =	${COMMONSRC} ${LOCALSRC}
- OBJS =	${COMMONOBJ} ${LOCALOBJ}
- #LIBS = -L/usr/X11R6/lib -lX11 -lXt -lXext -lm -lc
--LIBS = -L/usr/X11R6/lib -lX11 -lXt -lXext -lm -lc -lstdc++
-+LIBS = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lX11 -lXt -lXext -lm -lc -lstdc++ \
-+       ${LIBOSSAUDIO}
- 
- #CFLAGS = 	-D_XWIN -DNDEBUG -O3 -funroll-loops -I/usr/X11R6/include -I.
-+.if defined(__i386__)
--CFLAGS = 	-D_XWIN -DNDEBUG -DCPU_ASM -O3 -I/usr/X11R6/include -I.
-+CFLAGS = 	-D_XWIN -DNDEBUG -DCPU_ASM -O3 -I${X11BASE}/include -I.
-+.else
-+CFLAGS = 	-D_XWIN -DNDEBUG -O3 -I${X11BASE}/include -I.
-+.endif
- ASFLAGS =	-f elf -d _XWIN
- 
- all:	xm7
- 
- xm7:	${OBJS}
--	gcc -o xm7 ${OBJS} ${LIBS}
-+	${CC} -o xm7 ${OBJS} ${LIBS}
- 
- .c.o:
--	gcc ${CFLAGS} -o $@ -c $<
-+	${CC} ${CFLAGS} -o $@ -c $<
- 
- .cpp.o:
--	g++ ${CFLAGS} -o $@ -c $<
-+	${CC} ${CFLAGS} -o $@ -c $<
- 
- .asm.o:
- 	nasm ${ASFLAGS} $<
-@@ -56,7 +69,7 @@ linkclean:
- 	find . -type l -exec rm -f {} \;
- 
- convert:
--	./convert.sh
-+	sh ./convert.sh
- 
- symlink:
--	./symlink.sh
-\ No newline at end of file
-+	sh ./symlink.sh
diff --git a/emulators/xm7/patches/patch-ab b/emulators/xm7/patches/patch-ab
deleted file mode 100644
index f6215805abd..00000000000
--- a/emulators/xm7/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2006/02/12 07:49:12 rillig Exp $
-
---- convert.sh.orig	2000-03-22 16:01:00.000000000 +0000
-+++ convert.sh
-@@ -7,3 +7,7 @@
- rm t t.lzh
- done
- 
-+for X in *.cpp;do
-+nkf -e < $X > t
-+mv t $X
-+done
diff --git a/emulators/xm7/patches/patch-ac b/emulators/xm7/patches/patch-ac
deleted file mode 100644
index d055877c20c..00000000000
--- a/emulators/xm7/patches/patch-ac
+++ /dev/null
@@ -1,429 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/07/11 17:23:15 kristerw Exp $
-
---- xw_disp.c.orig	2000-03-22 17:01:00.000000000 +0100
-+++ xw_disp.c	2004-07-11 19:10:44.000000000 +0200
-@@ -24,11 +24,14 @@
- #include <X11/Xatom.h>
- #include <X11/keysym.h>
- #include <string.h>
-+#if defined(__NetBSD__)
-+#include <errno.h>
-+#endif
- #include <sys/time.h>
- #include <sys/errno.h>
- /**/
- #include <X11/extensions/XShm.h>
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <machine/param.h>
- #endif
- #include <sys/types.h>
-@@ -79,36 +82,36 @@
- 		case 15:
- 		case 16:
- 			for( x = 0 ; x < XSIZE; x+=8 ) {
--				__asm__ ("
--		pushl %0
--		pushl %2
--		popl %%edi
--		popl %%esi
--		movl %1,%%ebx
--
--		movzbl (%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movw %%ax,(%%edi)
--		movzbl 1(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movw %%ax,2(%%edi)
--		movzbl 2(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movw %%ax,4(%%edi)
--		movzbl 3(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movw %%ax,6(%%edi)
--		movzbl 4(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movw %%ax,8(%%edi)
--		movzbl 5(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movw %%ax,10(%%edi)
--		movzbl 6(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movw %%ax,12(%%edi)
--		movzbl 7(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
-+				__asm__ ("\n\
-+		pushl %0\n\
-+		pushl %2\n\
-+		popl %%edi\n\
-+		popl %%esi\n\
-+		movl %1,%%ebx\n\
-+\n\
-+		movzbl (%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movw %%ax,(%%edi)\n\
-+		movzbl 1(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movw %%ax,2(%%edi)\n\
-+		movzbl 2(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movw %%ax,4(%%edi)\n\
-+		movzbl 3(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movw %%ax,6(%%edi)\n\
-+		movzbl 4(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movw %%ax,8(%%edi)\n\
-+		movzbl 5(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movw %%ax,10(%%edi)\n\
-+		movzbl 6(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movw %%ax,12(%%edi)\n\
-+		movzbl 7(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
- 		movw %%ax,14(%%edi)" : : 
- 		"g"(&(imgval[addr])),	/* %0 <= &imgval[] */
- 		"g"(&palette),		/* %1 <= palette */
-@@ -119,36 +122,36 @@
- 			break;
- 		case 8:
- 			for( x = 0 ; x < XSIZE; x+=8 ) {
--				__asm__ ("
--		pushl %0
--		pushl %2
--		popl %%edi
--		popl %%esi
--		movl %1,%%ebx
--
--		movzbl (%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movb %%al,(%%edi)
--		movzbl 1(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movb %%ax,1(%%edi)
--		movzbl 2(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movb %%ax,2(%%edi)
--		movzbl 3(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movb %%ax,3(%%edi)
--		movzbl 4(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movb %%ax,4(%%edi)
--		movzbl 5(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movb %%ax,5(%%edi)
--		movzbl 6(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movb %%ax,6(%%edi)
--		movzbl 7(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
-+				__asm__ ("\n\
-+		pushl %0\n\
-+		pushl %2\n\
-+		popl %%edi\n\
-+		popl %%esi\n\
-+		movl %1,%%ebx\n\
-+\n\
-+		movzbl (%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movb %%al,(%%edi)\n\
-+		movzbl 1(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movb %%ax,1(%%edi)\n\
-+		movzbl 2(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movb %%ax,2(%%edi)\n\
-+		movzbl 3(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movb %%ax,3(%%edi)\n\
-+		movzbl 4(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movb %%ax,4(%%edi)\n\
-+		movzbl 5(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movb %%ax,5(%%edi)\n\
-+		movzbl 6(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movb %%ax,6(%%edi)\n\
-+		movzbl 7(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
- 		movb %%ax,7(%%edi)" : : 
- 		"g"(&(imgval[addr])),	/* %0 <= &imgval[] */
- 		"g"(&palette),		/* %1 <= palette */
-@@ -205,77 +208,77 @@
- 	/* update imgval, based on vram_c */
- 	{
- #ifdef __i386__
--		__asm__ __volatile__ ("
--		movl %0,%%esi
--		movl %1,%%edi
--		
--		movb 0x8000(%%esi),%%ah
--		movb 0x4000(%%esi),%%bl
--		movb (%%esi),%%bh
--		
--		xorb %%al,%%al
--		shlb $1,%%ah
--		rclb $1,%%al
--		shlb $1,%%bl
--		rclb $1,%%al
--		shlb $1,%%bh
--		rclb $1,%%al
--		movb %%al,(%%edi)
--		xorb %%al,%%al
--		shlb $1,%%ah
--		rclb $1,%%al
--		shlb $1,%%bl
--		rclb $1,%%al
--		shlb $1,%%bh
--		rclb $1,%%al
--		movb %%al,1(%%edi)
--		xorb %%al,%%al
--		shlb $1,%%ah
--		rclb $1,%%al
--		shlb $1,%%bl
--		rclb $1,%%al
--		shlb $1,%%bh
--		rclb $1,%%al
--		movb %%al,2(%%edi)
--		xorb %%al,%%al
--		shlb $1,%%ah
--		rclb $1,%%al
--		shlb $1,%%bl
--		rclb $1,%%al
--		shlb $1,%%bh
--		rclb $1,%%al
--		movb %%al,3(%%edi)
--		xorb %%al,%%al
--		shlb $1,%%ah
--		rclb $1,%%al
--		shlb $1,%%bl
--		rclb $1,%%al
--		shlb $1,%%bh
--		rclb $1,%%al
--		movb %%al,4(%%edi)
--		xorb %%al,%%al
--		shlb $1,%%ah
--		rclb $1,%%al
--		shlb $1,%%bl
--		rclb $1,%%al
--		shlb $1,%%bh
--		rclb $1,%%al
--		movb %%al,5(%%edi)
--		xorb %%al,%%al
--		shlb $1,%%ah
--		rclb $1,%%al
--		shlb $1,%%bl
--		rclb $1,%%al
--		shlb $1,%%bh
--		rclb $1,%%al
--		movb %%al,6(%%edi)
--		xorb %%al,%%al
--		shlb $1,%%ah
--		rclb $1,%%al
--		shlb $1,%%bl
--		rclb $1,%%al
--		shlb $1,%%bh
--		rclb $1,%%al
-+		__asm__ __volatile__ ("\n\
-+		movl %0,%%esi\n\
-+		movl %1,%%edi\n\
-+		\n\
-+		movb 0x8000(%%esi),%%ah\n\
-+		movb 0x4000(%%esi),%%bl\n\
-+		movb (%%esi),%%bh\n\
-+		\n\
-+		xorb %%al,%%al\n\
-+		shlb $1,%%ah\n\
-+		rclb $1,%%al\n\
-+		shlb $1,%%bl\n\
-+		rclb $1,%%al\n\
-+		shlb $1,%%bh\n\
-+		rclb $1,%%al\n\
-+		movb %%al,(%%edi)\n\
-+		xorb %%al,%%al\n\
-+		shlb $1,%%ah\n\
-+		rclb $1,%%al\n\
-+		shlb $1,%%bl\n\
-+		rclb $1,%%al\n\
-+		shlb $1,%%bh\n\
-+		rclb $1,%%al\n\
-+		movb %%al,1(%%edi)\n\
-+		xorb %%al,%%al\n\
-+		shlb $1,%%ah\n\
-+		rclb $1,%%al\n\
-+		shlb $1,%%bl\n\
-+		rclb $1,%%al\n\
-+		shlb $1,%%bh\n\
-+		rclb $1,%%al\n\
-+		movb %%al,2(%%edi)\n\
-+		xorb %%al,%%al\n\
-+		shlb $1,%%ah\n\
-+		rclb $1,%%al\n\
-+		shlb $1,%%bl\n\
-+		rclb $1,%%al\n\
-+		shlb $1,%%bh\n\
-+		rclb $1,%%al\n\
-+		movb %%al,3(%%edi)\n\
-+		xorb %%al,%%al\n\
-+		shlb $1,%%ah\n\
-+		rclb $1,%%al\n\
-+		shlb $1,%%bl\n\
-+		rclb $1,%%al\n\
-+		shlb $1,%%bh\n\
-+		rclb $1,%%al\n\
-+		movb %%al,4(%%edi)\n\
-+		xorb %%al,%%al\n\
-+		shlb $1,%%ah\n\
-+		rclb $1,%%al\n\
-+		shlb $1,%%bl\n\
-+		rclb $1,%%al\n\
-+		shlb $1,%%bh\n\
-+		rclb $1,%%al\n\
-+		movb %%al,5(%%edi)\n\
-+		xorb %%al,%%al\n\
-+		shlb $1,%%ah\n\
-+		rclb $1,%%al\n\
-+		shlb $1,%%bl\n\
-+		rclb $1,%%al\n\
-+		shlb $1,%%bh\n\
-+		rclb $1,%%al\n\
-+		movb %%al,6(%%edi)\n\
-+		xorb %%al,%%al\n\
-+		shlb $1,%%ah\n\
-+		rclb $1,%%al\n\
-+		shlb $1,%%bl\n\
-+		rclb $1,%%al\n\
-+		shlb $1,%%bh\n\
-+		rclb $1,%%al\n\
- 		movb %%al,7(%%edi)" : : 
- 		"g"(&(vram_c[addr])),		/* %0 <= &vram_c[] */
- 		"g"(&(imgval[addr*8]))		/* %1 <= &imgval[] */
-@@ -302,34 +305,34 @@
- #ifdef __i386__
- 		case 15:
- 		case 16:
--			__asm__ ("
--		movl %2,%%edi
--		movl %0,%%esi
--		movl %1,%%ebx
--		
--		movzbl (%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movw %%ax,(%%edi)
--		movzbl 1(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movw %%ax,2(%%edi)
--		movzbl 2(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movw %%ax,4(%%edi)
--		movzbl 3(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movw %%ax,6(%%edi)
--		movzbl 4(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movw %%ax,8(%%edi)
--		movzbl 5(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movw %%ax,10(%%edi)
--		movzbl 6(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movw %%ax,12(%%edi)
--		movzbl 7(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
-+			__asm__ ("\n\
-+		movl %2,%%edi\n\
-+		movl %0,%%esi\n\
-+		movl %1,%%ebx\n\
-+		\n\
-+		movzbl (%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movw %%ax,(%%edi)\n\
-+		movzbl 1(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movw %%ax,2(%%edi)\n\
-+		movzbl 2(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movw %%ax,4(%%edi)\n\
-+		movzbl 3(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movw %%ax,6(%%edi)\n\
-+		movzbl 4(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movw %%ax,8(%%edi)\n\
-+		movzbl 5(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movw %%ax,10(%%edi)\n\
-+		movzbl 6(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movw %%ax,12(%%edi)\n\
-+		movzbl 7(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
- 		movw %%ax,14(%%edi)" : : 
- 		"g"(&(imgval[bufaddr])),/* %0 <= &imgval[] */
- 		"g"(&palette),		/* %1 <= palette */
-@@ -337,34 +340,34 @@
- 		: "ax","bx","si","di" );
- 			break;
- 		case 8:
--			__asm__ ("
--		movl %2,%%edi
--		movl %0,%%esi
--		movl %1,%%ebx
--		
--		movzbl (%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movb %%al,(%%edi)
--		movzbl 1(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movb %%al,1(%%edi)
--		movzbl 2(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movb %%al,2(%%edi)
--		movzbl 3(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movb %%al,3(%%edi)
--		movzbl 4(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movb %%al,4(%%edi)
--		movzbl 5(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movb %%al,5(%%edi)
--		movzbl 6(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
--		movb %%al,6(%%edi)
--		movzbl 7(%%esi),%%eax
--		movl (%%ebx,%%eax,4),%%eax
-+			__asm__ ("\n\
-+		movl %2,%%edi\n\
-+		movl %0,%%esi\n\
-+		movl %1,%%ebx\n\
-+		\n\
-+		movzbl (%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movb %%al,(%%edi)\n\
-+		movzbl 1(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movb %%al,1(%%edi)\n\
-+		movzbl 2(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movb %%al,2(%%edi)\n\
-+		movzbl 3(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movb %%al,3(%%edi)\n\
-+		movzbl 4(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movb %%al,4(%%edi)\n\
-+		movzbl 5(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movb %%al,5(%%edi)\n\
-+		movzbl 6(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
-+		movb %%al,6(%%edi)\n\
-+		movzbl 7(%%esi),%%eax\n\
-+		movl (%%ebx,%%eax,4),%%eax\n\
- 		movb %%al,7(%%edi)" : : 
- 		"g"(&(imgval[bufaddr])),/* %0 <= &imgval[] */
- 		"g"(&palette),		/* %1 <= palette */
diff --git a/emulators/xm7/patches/patch-ad b/emulators/xm7/patches/patch-ad
deleted file mode 100644
index 805c4ba7354..00000000000
--- a/emulators/xm7/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/01/12 21:05:19 joerg Exp $
-
---- xw_snd.cpp.orig	2000-03-22 16:01:00.000000000 +0000
-+++ xw_snd.cpp
-@@ -22,8 +22,10 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <sys/time.h>
--#ifdef __FreeBSD__
--#include <machine/soundcard.h>
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-+#include <sys/soundcard.h>
-+#elif defined(__NetBSD__) || defined(__OpenBSD__)
-+#include <soundcard.h>
- #else
- #include <linux/soundcard.h>
- #endif
diff --git a/emulators/xm7/patches/patch-ae b/emulators/xm7/patches/patch-ae
deleted file mode 100644
index 52cd5a94926..00000000000
--- a/emulators/xm7/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/02/16 10:53:11 rillig Exp $
-
-Prevents a gcc error message.
-
---- fdc.c.orig	2000-03-22 17:01:00.000000000 +0100
-+++ fdc.c	2007-02-16 11:39:13.000000000 +0100
-@@ -56,7 +56,7 @@ static BYTE fdc_indexcnt;						/* INDEXƒ
- /*
-  *	ƒvƒ�ƒgƒ^ƒCƒv�錾
-  */
--void fdc_readbuf(int drive);		/* ‚Pƒgƒ‰ƒbƒN•ª“Ç‚Ý�ž‚Ý */
-+static void fdc_readbuf(int drive);		/* ‚Pƒgƒ‰ƒbƒN•ª“Ç‚Ý�ž‚Ý */
- 
- /*
-  *	FDC
diff --git a/emulators/xmame/DESCR b/emulators/xmame/DESCR
deleted file mode 100644
index d8b8e545719..00000000000
--- a/emulators/xmame/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Xmame is the X11 port of the MAME arcade game emulator.
-
-MAME is a virtual machine emulator; it includes emulators for numerous
-CPUs, sound and video chips used in arcade games, as well as special
-purpose decoding PALs and detailed information about the memory layout of
-each game.
-
-To play games in Xmame you must have a copy of the original game ROMs.
diff --git a/emulators/xmame/MESSAGE b/emulators/xmame/MESSAGE
deleted file mode 100644
index f677c690126..00000000000
--- a/emulators/xmame/MESSAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:29:59 wiz Exp $
-
-Some games, especially encrypted newer Neo-Geo games, require lots
-of memory to decrypt the graphic ROMs.  In case the graphics look
-garbled, try doing
-	ulimit -d unlimited
-before running xmame.
-
-===========================================================================
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
deleted file mode 100644
index a668c0f232d..00000000000
--- a/emulators/xmame/Makefile
+++ /dev/null
@@ -1,126 +0,0 @@
-# $NetBSD: Makefile,v 1.149 2007/02/09 14:28:48 joerg Exp $
-#
-
-DISTNAME=		xmame-0.106
-CATEGORIES=		emulators games x11
-MASTER_SITES=		http://x.mame.net/download/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		kristerw@NetBSD.org
-HOMEPAGE=		http://x.mame.net/
-COMMENT=		X11 emulator for old arcade machines
-
-RESTRICTED=		selling is not allowed
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-USE_TOOLS+=		gmake
-MAKE_FILE=		makefile.unix
-TARGET=			${PKGBASE}
-UNLIMIT_RESOURCES=	datasize
-
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
-ROMPATH=		${PREFIX}/share/${TARGET}
-SPOOLDIR=		${VARBASE}/games/${TARGET}
-
-MAKE_FLAGS+=		TARGET="${TARGET:S/x//}"
-MAKE_FLAGS+=		X11INC= X11LIB=
-
-# Network support is broken since xmame-0.85
-#MAKE_FLAGS+=		XMAME_NET=1
-
-# Determine which CPU-specific code to use.
-.for MARCH in alpha m68k i386 ia64 mips
-MAME_CPU.${MARCH}?=	${MARCH}
-.endfor
-MAME_CPU.x86_64?=	amd64
-.if !defined(MAME_CPU.${MACHINE_ARCH})
-.  include "../../mk/endian.mk"
-_MAME_CPU.big-endian=		risc
-_MAME_CPU.little-endian=	risc_lsb
-_MAME_CPU.unknown-endian=	risc		# assume unknown == big
-MAME_CPU.${MACHINE_ARCH}?=	${_MAME_CPU.${MACHINE_ENDIAN}-endian}
-.endif
-
-# Determine which operating system defaults to use.
-MAME_ARCH.NetBSD?=	netbsd
-MAME_ARCH.Linux?=	linux
-MAME_ARCH.SunOS?=	solaris
-MAME_ARCH.DragonFly?=	dragonfly
-.if !defined(MAME_ARCH.${OPSYS})
-MAME_ARCH.${OPSYS}?=	generic
-.endif
-
-MAKE_FLAGS+=		DISPLAY_METHOD=${MAME_DISP_METHOD:Q}
-MAKE_FLAGS+=		MY_CPU="${MAME_CPU.${MACHINE_ARCH}}"
-MAKE_FLAGS+=		ARCH="${MAME_ARCH.${OPSYS}}"
-
-.if ${X11_TYPE} == "modular"
-.include "../../x11/libXv/buildlink3.mk"
-.include "../../x11/libXxf86dga/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-MAKE_FLAGS+=		X11_DGA=1
-MAKE_FLAGS+=		X11_XV=1
-.else 
-.  if exists(${X11BASE}/include/X11/extensions/xf86dga.h)
-MAKE_FLAGS+=		X11_DGA=1
-.  endif
-.  if exists(${X11BASE}/include/X11/extensions/Xv.h)
-MAKE_FLAGS+=		X11_XV=1
-.  endif
-.endif
-
-# If supported, add appropriate definitions to build joystick drivers.
-.if exists(/usr/include/machine/joystick.h) ||				\
-    exists(/usr/include/linux/joystick.h)
-MAKE_FLAGS+=		JOY_STANDARD=1
-.endif
-.if ${OPSYS} == "NetBSD"
-.  if exists(/usr/lib/libusb.a) || exists(/usr/lib/libusbhid.a)
-MAKE_FLAGS+=		JOY_USB=1
-.  endif
-.endif
-
-OWN_DIRS=		${SPOOLDIR}
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
-
-post-configure:
-	cd ${WRKSRC}/doc;						\
-	${SED}	-e "s|@ROMPATH@|${ROMPATH}|g"				\
-		-e "s|@SPOOLDIR@|${SPOOLDIR}|g"				\
-		${TARGET}rc.dist > ${TARGET}rc
-.if !empty(MAKE_FLAGS:M*USB*)
-	${LN} -fs /usr/include/usb.h ${BUILDLINK_DIR}/include
-	for FILE in /usr/lib/libusb*; do				\
-		${LN} -fs $$FILE ${BUILDLINK_DIR}/lib;			\
-	done
-.endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${TARGET}.${MAME_DISP_METHOD}	\
-		${PREFIX}/bin/${TARGET}
-	${INSTALL_PROGRAM} ${WRKSRC}/romcmp ${PREFIX}/bin/romcmp
-	${INSTALL_PROGRAM} ${WRKSRC}/chdman ${PREFIX}/bin/chdman
-	${INSTALL_PROGRAM} ${WRKSRC}/xml2info ${PREFIX}/bin/xml2info
-	${INSTALL_MAN} ${WRKSRC}/doc/${TARGET}.6			\
-		${PREFIX}/${PKGMANDIR}/man6/${TARGET}.6
-	${INSTALL_DATA_DIR} ${ROMPATH}
-	${INSTALL_DATA} ${WRKSRC}/doc/${TARGET}rc ${ROMPATH}/${TARGET}rc
-	${INSTALL_DATA_DIR}  ${PREFIX}/share/doc/html/xmame/
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/html/xmame/
-	${INSTALL_DATA_DIR}  ${PREFIX}/share/doc/xmame
-	${INSTALL_DATA} ${WRKSRC}/doc/xmame-doc.txt ${PREFIX}/share/doc/xmame
-
-# Pragma once is not needed, and case warnings/errors on gcc
-SUBST_CLASSES+=		pragma
-SUBST_STAGE.pragma=	pre-configure
-SUBST_FILES.pragma=	src/*.h src/*/*.h
-SUBST_SED.pragma=	-e "s|\#pragma once||g"
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xmame/PLIST b/emulators/xmame/PLIST
deleted file mode 100644
index a9b5d3f3e00..00000000000
--- a/emulators/xmame/PLIST
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/12/30 19:38:20 kristerw Exp $
-bin/chdman
-bin/romcmp
-bin/xmame
-bin/xml2info
-man/man6/xmame.6
-share/doc/html/xmame/xmame-doc-2.html
-share/doc/html/xmame/xmame-doc-3.html
-share/doc/html/xmame/xmame-doc-4.html
-share/doc/html/xmame/xmame-doc-5.html
-share/doc/html/xmame/xmame-doc-6.html
-share/doc/html/xmame/xmame-doc-7.html
-share/doc/html/xmame/xmame-doc.html
-share/doc/html/xmame/xmame-gdoc-1.html
-share/doc/html/xmame/xmame-gdoc-2.html
-share/doc/html/xmame/xmame-gdoc-3.html
-share/doc/html/xmame/xmame-gdoc-4.html
-share/doc/html/xmame/xmame-gdoc-5.html
-share/doc/html/xmame/xmame-gdoc-6.html
-share/doc/html/xmame/xmame-gdoc-7.html
-share/doc/html/xmame/xmame-gdoc-8.html
-share/doc/html/xmame/xmame-gdoc.html
-share/doc/xmame/xmame-doc.txt
-share/xmame/xmamerc
-@dirrm share/xmame
-@dirrm share/doc/xmame
-@dirrm share/doc/html/xmame
diff --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo
deleted file mode 100644
index afbd8543218..00000000000
--- a/emulators/xmame/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.73 2006/06/15 17:33:03 dillo Exp $
-
-SHA1 (xmame-0.106.tar.bz2) = 7ae50f869067e101e053ca18e6f788297fcad9e2
-RMD160 (xmame-0.106.tar.bz2) = eab4fa232d59fce5b2216f942f8bc58a992f8d26
-Size (xmame-0.106.tar.bz2) = 17117298 bytes
-SHA1 (patch-aa) = b3bd9a8e3a55483fe074453b7ddfc5d111bd9d58
-SHA1 (patch-ab) = 04312e7fad1c39da40bdc9ec84074c676e8eb7e2
-SHA1 (patch-ac) = f4e0f614577924d19713e1862efa1e6d42e791c4
-SHA1 (patch-ad) = 087e162f8b05d894532e6d5091d8b0008c3f0e80
-SHA1 (patch-ae) = efd91447d33b6cb1246bbd2264f92b4ab9be44e0
-SHA1 (patch-af) = 1498df9c05561ee0ace376203506aeb3ecbc9e72
-SHA1 (patch-ag) = c33b9f3f8c81756abcb1bb1d81820f522f3f7293
diff --git a/emulators/xmame/options.mk b/emulators/xmame/options.mk
deleted file mode 100644
index 459080f46e6..00000000000
--- a/emulators/xmame/options.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2005/09/03 18:16:07 xtraeme Exp $
-#
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.xmame
-PKG_OPTIONS_OPTIONAL_GROUPS=	video
-PKG_OPTIONS_GROUP.video=	sdl opengl
-PKG_SUPPORTED_OPTIONS=		esound
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Msdl)
-MAME_DISP_METHOD?=	SDL
-.include "../../devel/SDL/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Mopengl)
-MAME_DISP_METHOD?=	xgl
-.include "../../graphics/Mesa/buildlink3.mk"
-.else
-MAME_DISP_METHOD?=	x11
-.endif
-
-.if !empty(PKG_OPTIONS:Mesound)
-MAKE_FLAGS+=		SOUND_ESOUND=1
-.include "../../audio/esound/buildlink3.mk"
-.endif
diff --git a/emulators/xmame/patches/patch-aa b/emulators/xmame/patches/patch-aa
deleted file mode 100644
index c555bcb0a48..00000000000
--- a/emulators/xmame/patches/patch-aa
+++ /dev/null
@@ -1,166 +0,0 @@
-$NetBSD: patch-aa,v 1.40 2006/06/15 11:40:00 dillo Exp $
-
---- makefile.unix.orig	2006-05-15 18:53:34.000000000 +0200
-+++ makefile.unix
-@@ -33,7 +33,7 @@
- ###########################################################################
- 
- # Uncomment one of these.
--TARGET = mame
-+# TARGET = mame
- # TARGET = mess
- # TARGET = mage
- # TARGET = mmsnd
-@@ -97,7 +97,7 @@
- # just as well.  However, stay away from the `cc' Ultrix compiler if 
- # possible.
- 
--CC	= @gcc
-+# CC	= @gcc
- # CC    = @cc
- # CC	= @icc
- # CC	= @c89
-@@ -118,7 +118,7 @@
- 
- # If you want to use whatever CFLAGS are currently set in your 
- # environment, then comment this out.
--CFLAGS =
-+# CFLAGS =
- 
- 
- ###########################################################################
-@@ -127,7 +127,7 @@
- ###########################################################################
- 
- # GCC on x86
--CFLAGS = -O2
-+# CFLAGS = -O2
- 
- # GCC on x86 with some optimizations
- # CFLAGS = -O2 -mtune=i686 -fomit-frame-pointer -fstrength-reduce -ffast-math
-@@ -181,13 +181,13 @@
-   #########################################################################
-   
-   # Check for C89 + GNU extensions compliance.
--  CFLAGS += -std=gnu89
-+  # CFLAGS += -std=gnu89
- 
-   # Show all warnings.
--  CFLAGS += -Wall
-+  # CFLAGS += -Wall
- 
-   # Don't warn about unused variables.
--  CFLAGS += -Wno-unused
-+  # CFLAGS += -Wno-unused
- 
-   # Warn about declarations after statements.
-   # CFLAGS += -Wdeclaration-after-statement
-@@ -328,16 +328,16 @@
- ifeq ($(CC),icc)
- 
-   # Optimizations for the Intel compiler.
--  CFLAGS    = -O3 -rcd -Xa -ipo -ipo_obj
-+  # CFLAGS    = -O3 -rcd -Xa -ipo -ipo_obj
- 
- else
- ifeq ($(CC),sun-forte)
-   #
-   # sun-forte given above is just an artifice to get us into this section
--  CC = cc
-+  # CC = cc
- 
-   # uncomment to set compiler defaults oriented for maximum performance
--  XOPT += -fast
-+  # XOPT += -fast
- 
-   # Choose one optimization level;
-   #XOPT += -xO0
-@@ -346,7 +346,7 @@
-   #XOPT += -xO3
-   # -xO4 and above automatically inline
-   #XOPT += -xO4
--  XOPT += -xO5
-+  # XOPT += -xO5
- 
-   # uncomment for code generation targeted to the local machine; this
-   # supplies -xarch, -xcpu, -xtarget.  It also seems to cause an annoying
-@@ -354,11 +354,11 @@
-   # older hardware, which apparently can't be disabled.  As an alternative,
-   # the particular -xtarget for your system could be specified; 
-   # -xtarget=ultra2/2300
--  XTARGET += -native 
-+  # XTARGET += -native 
-   #XTARGET += -xtarget=ultra2/2300
- 
-   # uncomment to inline library math functions
--  EXTRA_OPTS += -xlibmil
-+  # EXTRA_OPTS += -xlibmil
- 
-   ######################################################
-   # Additional options for parallelization optimizations
-@@ -374,7 +374,7 @@
- 
-   # Sparc only, uncomment to do loop restructuring optimizations
-   # and speculative prefetch for v8plusa and above
--  EXTRA_OPTS += -xdepend  -xsafe=mem
-+  # EXTRA_OPTS += -xdepend  -xsafe=mem
- 
-   #################################################
-   # Additional options for glx builds
-@@ -384,14 +384,14 @@
-   # (libGLU dlopen() complains of missing name mangled symbols)
-   # GLCFLAGS += -DSUN_FORTE_DLOPEN_LIBCRUN='\"libCrun.so.1\"'
- 
--  CFLAGS= $(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
--  LDFLAGS=$(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
-+  # CFLAGS= $(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
-+  # LDFLAGS=$(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
- 
-   # uncomment for silence...
--  CFLAGS += -erroff
-+  # CFLAGS += -erroff
-   # Tell xmame that we really are in fact elf.  If not supplied, 
-   # SHARED_PREFIX is set causing dlopen()'s to fail.
--  CFLAGS += -D__ELF__ 
-+  # CFLAGS += -D__ELF__ 
- endif
- endif
- endif
-@@ -614,7 +614,7 @@
- ###########################################################################
- 
- # Linux 
--ARCH  = linux
-+# ARCH  = linux
- 
- # FreeBSD
- # ARCH  = freebsd
-@@ -727,7 +727,7 @@
- # use SDL.
- 
- # X11 (including Glide & OpenGL if enabled below)
--DISPLAY_METHOD = x11
-+# DISPLAY_METHOD = x11
- 
- # SDL library 
- # DISPLAY_METHOD = SDL
-@@ -758,7 +758,7 @@
- X11_MITSHM = 1
- 
- # Use Xv extension for hardware scaling.
--X11_XV = 1
-+# X11_XV = 1
- 
- # Enable XFree86 DGA.  This also causes "make install" to set the suid bit 
- # on the executable.
-@@ -782,8 +782,8 @@
- # X11LIB		= -L/usr/lib/X11
- 
- # Standard location for XFree86
--X11INC		= -I/usr/X11R6/include
--X11LIB		= -L/usr/X11R6/lib
-+# X11INC		= -I/usr/X11R6/include
-+# X11LIB		= -L/usr/X11R6/lib
- 
- # Standard location for Sun systems
- # X11INC		= -I/usr/openwin/include
diff --git a/emulators/xmame/patches/patch-ab b/emulators/xmame/patches/patch-ab
deleted file mode 100644
index 9d47af99a39..00000000000
--- a/emulators/xmame/patches/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ab,v 1.32 2006/06/15 11:40:00 dillo Exp $
-
---- src/unix/unix.mak.orig	2006-05-26 06:52:07.000000000 +0200
-+++ src/unix/unix.mak
-@@ -242,7 +242,7 @@ CFLAGS += $(IL) $(CFLAGS.$(MY_CPU)) \
- 	$(COREDEFS) $(SOUNDDEFS) $(CPUDEFS) $(ASMDEFS) \
- 	$(INCLUDES) $(INCLUDE_PATH)
- 
--LIBS += $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD))
-+LIBS += $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD)) -lexpat
- 
- ifdef DEBUG
- CFLAGS += -DMAME_DEBUG
-@@ -559,15 +559,15 @@ xlistdev: src/unix/contrib/tools/xlistde
- 
- romcmp: $(OBJ)/romcmp.o $(OBJ)/unzip.o $(ZLIB)
- 	@echo 'Linking $@...'
--	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-+	$(LD) $(LDFLAGS) $^ -lz -o $@
- 
- chdman: $(OBJ)/chdman.o $(OBJ)/chd.o $(OBJ)/chdcd.o $(OBJ)/cdrom.o $(OBJ)/md5.o $(OBJ)/sha1.o $(OBJ)/version.o $(ZLIB) $(OSTOOLOBJS)
- 	@echo 'Linking $@...'
--	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-+	$(LD) $(LDFLAGS) $^ -lz -o $@
- 
- xml2info: $(OBJ)/xml2info.o $(EXPAT)
- 	@echo 'Linking $@...'
--	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-+	$(LD) $(LDFLAGS) $^ -lexpat -lz -o $@
- 
- jedutil: $(OBJ)/jedutil.o $(OBJ)/jedparse.o $(OSDBGOBJS)
- 	@echo 'Linking $@...'
diff --git a/emulators/xmame/patches/patch-ac b/emulators/xmame/patches/patch-ac
deleted file mode 100644
index ba82517536d..00000000000
--- a/emulators/xmame/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.12 2005/11/17 19:55:55 joerg Exp $
-
---- src/unix/video-drivers/xf86_dga1.c.orig	2005-11-17 15:56:02.000000000 +0000
-+++ src/unix/video-drivers/xf86_dga1.c
-@@ -6,6 +6,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
-+#include <sys/time.h>
- #include <sys/wait.h>
- #include <sys/resource.h>
- #include <X11/Xlib.h>
diff --git a/emulators/xmame/patches/patch-ad b/emulators/xmame/patches/patch-ad
deleted file mode 100644
index 883d348e305..00000000000
--- a/emulators/xmame/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2005/11/17 19:55:55 joerg Exp $
-
---- src/unix/video-drivers/xf86_dga2.c.orig	2005-11-17 16:14:12.000000000 +0000
-+++ src/unix/video-drivers/xf86_dga2.c
-@@ -9,6 +9,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
-+#include <sys/time.h>
- #include <sys/wait.h>
- #include <sys/resource.h>
- #include <X11/Xlib.h>
diff --git a/emulators/xmame/patches/patch-ae b/emulators/xmame/patches/patch-ae
deleted file mode 100644
index da73e4b3592..00000000000
--- a/emulators/xmame/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.23 2005/10/14 20:57:49 kristerw Exp $
-
---- src/unix/doc/xmamerc.dist.orig	Sat Nov  6 21:40:52 2004
-+++ src/unix/doc/xmamerc.dist	Sat Nov  6 21:42:31 2004
-@@ -62,10 +62,10 @@
- analogstick             0
- 
- ### Fileio Related ###
--rompath                 /usr/local/share/xmame/roms
-+rompath                 @ROMPATH@
- snapshot_directory      .
--cheat_file              /usr/local/share/xmame/cheat.dat
--hiscore_file            /usr/local/share/xmame/hiscore.dat
-+cheat_file              @SPOOLDIR@/cheat.dat
-+hiscore_file            @SPOOLDIR@/hiscore.dat
- 
- ### Mame Related ###
- defaultgame             robby
diff --git a/emulators/xmame/patches/patch-af b/emulators/xmame/patches/patch-af
deleted file mode 100644
index beb69b3d9a9..00000000000
--- a/emulators/xmame/patches/patch-af
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-af,v 1.7 2005/11/17 19:55:55 joerg Exp $
-
---- src/unix/joystick-drivers/joy_standard.c.orig	2005-11-17 16:17:48.000000000 +0000
-+++ src/unix/joystick-drivers/joy_standard.c
-@@ -6,7 +6,7 @@ static int use_old_driver = 0;
- 
- struct rc_option joy_standard_opts[] = {
-    /* name, shortname, type, dest, deflt, min, max, func, help */
--#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd)
-+#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) || defined(__ARCH_dragonfly)
-    { "joydevname",	"jdev",			rc_string,	&joy_dev,
-      "/dev/joy",	0,			0,		NULL,
-      "Joystick device prefix (defaults to /dev/joy)" },
-@@ -29,7 +29,7 @@ struct rc_option joy_standard_opts[] = {
- #include <sys/ioctl.h>
- 
- /* specific joystick for PC clones */
--#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd)
-+#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) || defined(__ARCH_dragonfly)
- 
- #include <machine/joystick.h>
- typedef struct joystick joy_struct;
-@@ -142,7 +142,7 @@ void joy_standard_init(void)
- 					/* fall through to the next case */
- 				case 1:
- 					joy_data[i].num_axes = 2;
--#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd)
-+#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) || defined(__ARCH_dragonfly)
- 					joy_data[i].num_buttons = 2;
- #else
- 					joy_data[i].num_buttons = JOY_BUTTONS;
-@@ -217,7 +217,7 @@ void joy_standard_poll(void)
- 			continue;
- 
- 		/* get value of buttons */
--#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd)
-+#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) || defined(__ARCH_dragonfly)
- 		joy_data[i].buttons[0] = my_joy_data.b1;
- 		joy_data[i].buttons[1] = my_joy_data.b2;
- #else
diff --git a/emulators/xmame/patches/patch-ag b/emulators/xmame/patches/patch-ag
deleted file mode 100644
index 67c2b4650f8..00000000000
--- a/emulators/xmame/patches/patch-ag
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2005/11/17 19:55:55 joerg Exp $
-
---- src/unix/joystick-drivers/joy_usb.c.orig	2005-11-17 16:19:51.000000000 +0000
-+++ src/unix/joystick-drivers/joy_usb.c
-@@ -22,7 +22,7 @@ struct rc_option joy_usb_opts[] = {
- #ifdef USB_JOYSTICK
- 
-     
--#if !defined(__ARCH_openbsd) && !defined(__ARCH_netbsd) && !defined(__ARCH_freebsd)
-+#if !defined(__ARCH_openbsd) && !defined(__ARCH_netbsd) && !defined(__ARCH_freebsd) && !defined(__ARCH_dragonfly)
- #error "USB joysticks are only supported under OpenBSD, NetBSD and FreeBSD.  Patches to support other archs are welcome ;)"
- #endif
- 
-@@ -47,8 +47,13 @@ struct rc_option joy_usb_opts[] = {
- #include <sys/ioctl.h>
- #endif
- 
-+#ifdef __ARCH_dragonfly
-+#include <bus/usb/usb.h>
-+#include <bus/usb/usbhid.h>
-+#else
- #include <dev/usb/usb.h>
- #include <dev/usb/usbhid.h>
-+#endif
- 
- int axis_usage[] = {
-   HUG_X, HUG_Y, HUG_Z,
-@@ -118,7 +123,7 @@ static int joy_initialize_hid(int i)
-     }
- 
- #if defined(HAVE_USBHID_H) || defined(HAVE_LIBUSBHID_H)
--#if defined(__ARCH_openbsd) || defined(__ARCH_netbsd) || (defined(__ARCH_freebsd) && __FreeBSD_version > 500000)
-+#if defined(__ARCH_openbsd) || defined(__ARCH_netbsd) || (defined(__ARCH_freebsd) && __FreeBSD_version > 500000) || defined(__ARCH_dragonfly)
-   if (ioctl(joy_data[i].fd, USB_GET_REPORT_ID, &report_id) < 0)
-     {
-       fprintf(stderr_file, "error: /dev/uhid%d: %s", i, strerror(errno));
diff --git a/emulators/xmess/DESCR b/emulators/xmess/DESCR
deleted file mode 100644
index d30a206a69e..00000000000
--- a/emulators/xmess/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-X-MESS is the X11 port of the MESS game console emulator.
-
-MESS is a virtual machine emulator; it includes emulators for the CPUs,
-sound and video chips used in game consoles, as well as special purpose
-PALs and detailed information about the memory layout of each machine.
-
-To play games in X-MESS you must have a copy of the original game,
-extracted from a cartridge, floppy or tape image.
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
deleted file mode 100644
index 3fc4b2e42dc..00000000000
--- a/emulators/xmess/Makefile
+++ /dev/null
@@ -1,125 +0,0 @@
-# $NetBSD: Makefile,v 1.89 2007/02/07 19:20:12 joerg Exp $
-#
-
-DISTNAME=		xmame-0.106
-PKGNAME=		xmess-0.106
-CATEGORIES=		emulators games x11
-MASTER_SITES=		http://x.mame.net/download/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		kristerw@NetBSD.org
-HOMEPAGE=		http://x.mame.net/
-COMMENT=		X11 emulator for old computers and console machines
-
-RESTRICTED=		selling is not allowed
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-USE_TOOLS+=		gmake
-MAKE_FILE=		makefile.unix
-TARGET=			${PKGBASE}
-UNLIMIT_RESOURCES=	datasize
-
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
-ROMPATH=		${PREFIX}/share/${TARGET}
-SPOOLDIR=		${VARBASE}/games/${TARGET}
-
-MAKE_FLAGS+=		TARGET="${TARGET:S/x//}"
-MAKE_FLAGS+=		X11INC= X11LIB=
-
-# Network support is broken since xmame-0.85
-#MAKE_FLAGS+=		XMAME_NET=1
-
-# Determine which CPU-specific code to use.
-.for MARCH in alpha m68k i386 ia64 mips
-MAME_CPU.${MARCH}?=	${MARCH}
-.endfor
-MAME_CPU.x86_64?=	amd64
-.if !defined(MAME_CPU.${MACHINE_ARCH})
-.  include "../../mk/endian.mk"
-_MAME_CPU.big-endian=		risc
-_MAME_CPU.little-endian=	risc_lsb
-_MAME_CPU.unknown-endian=	risc		# assume unknown == big
-MAME_CPU.${MACHINE_ARCH}?=	${_MAME_CPU.${MACHINE_ENDIAN}-endian}
-.endif
-
-# Determine which operating system defaults to use.
-MAME_ARCH.NetBSD?=	netbsd
-MAME_ARCH.Linux?=	linux
-MAME_ARCH.SunOS?=	solaris
-MAME_ARCH.DragonFly?=	dragonfly
-.if !defined(MAME_ARCH.${OPSYS})
-MAME_ARCH.${OPSYS}?=	generic
-.endif
-
-MAKE_FLAGS+=		DISPLAY_METHOD=${MAME_DISP_METHOD:Q}
-MAKE_FLAGS+=		MY_CPU="${MAME_CPU.${MACHINE_ARCH}}"
-MAKE_FLAGS+=		ARCH="${MAME_ARCH.${OPSYS}}"
-
-.if ${X11_TYPE} == "modular"
-.include "../../x11/libXv/buildlink3.mk"
-.include "../../x11/libXxf86dga/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-MAKE_FLAGS+=		X11_DGA=1
-MAKE_FLAGS+=		X11_XV=1
-.else
-.  if exists(${X11BASE}/include/X11/extensions/xf86dga.h)
-MAKE_FLAGS+=		X11_DGA=1
-.  endif
-.  if exists(${X11BASE}/include/X11/extensions/Xv.h)
-MAKE_FLAGS+=		X11_XV=1
-.  endif
-.endif
-
-# If supported, add appropriate definitions to build joystick drivers.
-.if exists(/usr/include/machine/joystick.h) ||				\
-    exists(/usr/include/linux/joystick.h)
-MAKE_FLAGS+=		JOY_STANDARD=1
-.endif
-.if ${OPSYS} == "NetBSD"
-.  if exists(/usr/lib/libusb.a) || exists(/usr/lib/libusbhid.a)
-MAKE_FLAGS+=		JOY_USB=1
-.  endif
-.endif
-
-# This should be supported with the proper defines
-#.include "../../x11/libXi/buildlink3.mk"
-#.include "../../x11/libXinerama/buildlink3.mk"
-
-OWN_DIRS=		${SPOOLDIR}
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
-
-post-configure:
-	cd ${WRKSRC}/doc;						\
-	${SED}	-e "s|@ROMPATH@|${ROMPATH}|g"				\
-		-e "s|@SPOOLDIR@|${SPOOLDIR}|g"				\
-		${TARGET}rc.dist > ${TARGET}rc
-.if !empty(MAKE_FLAGS:M*USB*)
-	${LN} -fs /usr/include/usb.h ${BUILDLINK_DIR}/include
-	for FILE in /usr/lib/libusb*; do				\
-		${LN} -fs $$FILE ${BUILDLINK_DIR}/lib;			\
-	done
-.endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${TARGET}.${MAME_DISP_METHOD}	\
-		${PREFIX}/bin/${TARGET}
-	${INSTALL_PROGRAM} ${WRKSRC}/imgtool ${PREFIX}/bin/imgtool
-	${INSTALL_MAN} ${WRKSRC}/doc/${TARGET}.6			\
-		${PREFIX}/${PKGMANDIR}/man6/${TARGET}.6
-	${INSTALL_DATA_DIR} ${ROMPATH}
-	${INSTALL_DATA} ${WRKSRC}/doc/${TARGET}rc ${ROMPATH}/${TARGET}rc
-
-# Pragma once is not needed, and case warnings/errors on gcc
-SUBST_CLASSES+=		pragma
-SUBST_STAGE.pragma=	pre-configure
-SUBST_FILES.pragma=	src/*.h src/*/*.h
-SUBST_SED.pragma=	-e "s|\#pragma once||g"
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xmess/PLIST b/emulators/xmess/PLIST
deleted file mode 100644
index ac889c0fa46..00000000000
--- a/emulators/xmess/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/05/16 00:28:23 kristerw Exp $
-bin/imgtool
-bin/xmess
-man/man6/xmess.6
-share/xmess/xmessrc
-@dirrm share/xmess
diff --git a/emulators/xmess/distinfo b/emulators/xmess/distinfo
deleted file mode 100644
index aa12052da5f..00000000000
--- a/emulators/xmess/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.46 2006/06/15 11:40:00 dillo Exp $
-
-SHA1 (xmame-0.106.tar.bz2) = 7ae50f869067e101e053ca18e6f788297fcad9e2
-RMD160 (xmame-0.106.tar.bz2) = eab4fa232d59fce5b2216f942f8bc58a992f8d26
-Size (xmame-0.106.tar.bz2) = 17117298 bytes
-SHA1 (patch-aa) = b3bd9a8e3a55483fe074453b7ddfc5d111bd9d58
-SHA1 (patch-ab) = 04312e7fad1c39da40bdc9ec84074c676e8eb7e2
-SHA1 (patch-ac) = f4e0f614577924d19713e1862efa1e6d42e791c4
-SHA1 (patch-ad) = 087e162f8b05d894532e6d5091d8b0008c3f0e80
-SHA1 (patch-ae) = cf9b2684b4bdfdec7d2f09bcc424b7ee79d7f45a
-SHA1 (patch-af) = 1498df9c05561ee0ace376203506aeb3ecbc9e72
-SHA1 (patch-ag) = c33b9f3f8c81756abcb1bb1d81820f522f3f7293
diff --git a/emulators/xmess/options.mk b/emulators/xmess/options.mk
deleted file mode 100644
index e3d734e7378..00000000000
--- a/emulators/xmess/options.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2005/09/03 18:16:07 xtraeme Exp $
-#
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.xmess
-PKG_OPTIONS_OPTIONAL_GROUPS=	video
-PKG_OPTIONS_GROUP.video=	sdl opengl
-PKG_SUPPORTED_OPTIONS=		esound
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Msdl)
-MAME_DISP_METHOD?=	SDL
-.include "../../devel/SDL/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Mopengl)
-MAME_DISP_METHOD?=	xgl
-.include "../../graphics/Mesa/buildlink3.mk"
-.else
-MAME_DISP_METHOD?=	x11
-.endif
-
-.if !empty(PKG_OPTIONS:Mesound)
-MAKE_FLAGS+=		SOUND_ESOUND=1
-.include "../../audio/esound/buildlink3.mk"
-.endif
diff --git a/emulators/xmess/patches/patch-aa b/emulators/xmess/patches/patch-aa
deleted file mode 100644
index eda48783269..00000000000
--- a/emulators/xmess/patches/patch-aa
+++ /dev/null
@@ -1,166 +0,0 @@
-$NetBSD: patch-aa,v 1.25 2006/06/15 11:40:00 dillo Exp $
-
---- makefile.unix.orig	2006-05-15 18:53:34.000000000 +0200
-+++ makefile.unix
-@@ -33,7 +33,7 @@
- ###########################################################################
- 
- # Uncomment one of these.
--TARGET = mame
-+# TARGET = mame
- # TARGET = mess
- # TARGET = mage
- # TARGET = mmsnd
-@@ -97,7 +97,7 @@
- # just as well.  However, stay away from the `cc' Ultrix compiler if 
- # possible.
- 
--CC	= @gcc
-+# CC	= @gcc
- # CC    = @cc
- # CC	= @icc
- # CC	= @c89
-@@ -118,7 +118,7 @@
- 
- # If you want to use whatever CFLAGS are currently set in your 
- # environment, then comment this out.
--CFLAGS =
-+# CFLAGS =
- 
- 
- ###########################################################################
-@@ -127,7 +127,7 @@
- ###########################################################################
- 
- # GCC on x86
--CFLAGS = -O2
-+# CFLAGS = -O2
- 
- # GCC on x86 with some optimizations
- # CFLAGS = -O2 -mtune=i686 -fomit-frame-pointer -fstrength-reduce -ffast-math
-@@ -181,13 +181,13 @@
-   #########################################################################
-   
-   # Check for C89 + GNU extensions compliance.
--  CFLAGS += -std=gnu89
-+  # CFLAGS += -std=gnu89
- 
-   # Show all warnings.
--  CFLAGS += -Wall
-+  # CFLAGS += -Wall
- 
-   # Don't warn about unused variables.
--  CFLAGS += -Wno-unused
-+  # CFLAGS += -Wno-unused
- 
-   # Warn about declarations after statements.
-   # CFLAGS += -Wdeclaration-after-statement
-@@ -328,16 +328,16 @@
- ifeq ($(CC),icc)
- 
-   # Optimizations for the Intel compiler.
--  CFLAGS    = -O3 -rcd -Xa -ipo -ipo_obj
-+  # CFLAGS    = -O3 -rcd -Xa -ipo -ipo_obj
- 
- else
- ifeq ($(CC),sun-forte)
-   #
-   # sun-forte given above is just an artifice to get us into this section
--  CC = cc
-+  # CC = cc
- 
-   # uncomment to set compiler defaults oriented for maximum performance
--  XOPT += -fast
-+  # XOPT += -fast
- 
-   # Choose one optimization level;
-   #XOPT += -xO0
-@@ -346,7 +346,7 @@
-   #XOPT += -xO3
-   # -xO4 and above automatically inline
-   #XOPT += -xO4
--  XOPT += -xO5
-+  # XOPT += -xO5
- 
-   # uncomment for code generation targeted to the local machine; this
-   # supplies -xarch, -xcpu, -xtarget.  It also seems to cause an annoying
-@@ -354,11 +354,11 @@
-   # older hardware, which apparently can't be disabled.  As an alternative,
-   # the particular -xtarget for your system could be specified; 
-   # -xtarget=ultra2/2300
--  XTARGET += -native 
-+  # XTARGET += -native 
-   #XTARGET += -xtarget=ultra2/2300
- 
-   # uncomment to inline library math functions
--  EXTRA_OPTS += -xlibmil
-+  # EXTRA_OPTS += -xlibmil
- 
-   ######################################################
-   # Additional options for parallelization optimizations
-@@ -374,7 +374,7 @@
- 
-   # Sparc only, uncomment to do loop restructuring optimizations
-   # and speculative prefetch for v8plusa and above
--  EXTRA_OPTS += -xdepend  -xsafe=mem
-+  # EXTRA_OPTS += -xdepend  -xsafe=mem
- 
-   #################################################
-   # Additional options for glx builds
-@@ -384,14 +384,14 @@
-   # (libGLU dlopen() complains of missing name mangled symbols)
-   # GLCFLAGS += -DSUN_FORTE_DLOPEN_LIBCRUN='\"libCrun.so.1\"'
- 
--  CFLAGS= $(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
--  LDFLAGS=$(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
-+  # CFLAGS= $(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
-+  # LDFLAGS=$(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
- 
-   # uncomment for silence...
--  CFLAGS += -erroff
-+  # CFLAGS += -erroff
-   # Tell xmame that we really are in fact elf.  If not supplied, 
-   # SHARED_PREFIX is set causing dlopen()'s to fail.
--  CFLAGS += -D__ELF__ 
-+  # CFLAGS += -D__ELF__ 
- endif
- endif
- endif
-@@ -614,7 +614,7 @@
- ###########################################################################
- 
- # Linux 
--ARCH  = linux
-+# ARCH  = linux
- 
- # FreeBSD
- # ARCH  = freebsd
-@@ -727,7 +727,7 @@
- # use SDL.
- 
- # X11 (including Glide & OpenGL if enabled below)
--DISPLAY_METHOD = x11
-+# DISPLAY_METHOD = x11
- 
- # SDL library 
- # DISPLAY_METHOD = SDL
-@@ -758,7 +758,7 @@
- X11_MITSHM = 1
- 
- # Use Xv extension for hardware scaling.
--X11_XV = 1
-+# X11_XV = 1
- 
- # Enable XFree86 DGA.  This also causes "make install" to set the suid bit 
- # on the executable.
-@@ -782,8 +782,8 @@
- # X11LIB		= -L/usr/lib/X11
- 
- # Standard location for XFree86
--X11INC		= -I/usr/X11R6/include
--X11LIB		= -L/usr/X11R6/lib
-+# X11INC		= -I/usr/X11R6/include
-+# X11LIB		= -L/usr/X11R6/lib
- 
- # Standard location for Sun systems
- # X11INC		= -I/usr/openwin/include
diff --git a/emulators/xmess/patches/patch-ab b/emulators/xmess/patches/patch-ab
deleted file mode 100644
index a274905acf4..00000000000
--- a/emulators/xmess/patches/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ab,v 1.21 2006/06/15 11:40:00 dillo Exp $
-
---- src/unix/unix.mak.orig	2006-05-26 06:52:07.000000000 +0200
-+++ src/unix/unix.mak
-@@ -242,7 +242,7 @@ CFLAGS += $(IL) $(CFLAGS.$(MY_CPU)) \
- 	$(COREDEFS) $(SOUNDDEFS) $(CPUDEFS) $(ASMDEFS) \
- 	$(INCLUDES) $(INCLUDE_PATH)
- 
--LIBS += $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD))
-+LIBS += $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD)) -lexpat
- 
- ifdef DEBUG
- CFLAGS += -DMAME_DEBUG
-@@ -559,15 +559,15 @@ xlistdev: src/unix/contrib/tools/xlistde
- 
- romcmp: $(OBJ)/romcmp.o $(OBJ)/unzip.o $(ZLIB)
- 	@echo 'Linking $@...'
--	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-+	$(LD) $(LDFLAGS) $^ -lz -o $@
- 
- chdman: $(OBJ)/chdman.o $(OBJ)/chd.o $(OBJ)/chdcd.o $(OBJ)/cdrom.o $(OBJ)/md5.o $(OBJ)/sha1.o $(OBJ)/version.o $(ZLIB) $(OSTOOLOBJS)
- 	@echo 'Linking $@...'
--	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-+	$(LD) $(LDFLAGS) $^ -lz -o $@
- 
- xml2info: $(OBJ)/xml2info.o $(EXPAT)
- 	@echo 'Linking $@...'
--	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-+	$(LD) $(LDFLAGS) $^ -lexpat -lz -o $@
- 
- jedutil: $(OBJ)/jedutil.o $(OBJ)/jedparse.o $(OSDBGOBJS)
- 	@echo 'Linking $@...'
diff --git a/emulators/xmess/patches/patch-ac b/emulators/xmess/patches/patch-ac
deleted file mode 100644
index 7d4e7cc1af5..00000000000
--- a/emulators/xmess/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2005/11/17 19:54:09 joerg Exp $
-
---- src/unix/video-drivers/xf86_dga1.c.orig	2005-11-17 15:56:02.000000000 +0000
-+++ src/unix/video-drivers/xf86_dga1.c
-@@ -6,6 +6,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
-+#include <sys/time.h>
- #include <sys/wait.h>
- #include <sys/resource.h>
- #include <X11/Xlib.h>
diff --git a/emulators/xmess/patches/patch-ad b/emulators/xmess/patches/patch-ad
deleted file mode 100644
index bb8844ceba5..00000000000
--- a/emulators/xmess/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2005/11/17 19:54:09 joerg Exp $
-
---- src/unix/video-drivers/xf86_dga2.c.orig	2005-11-17 16:14:12.000000000 +0000
-+++ src/unix/video-drivers/xf86_dga2.c
-@@ -9,6 +9,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
-+#include <sys/time.h>
- #include <sys/wait.h>
- #include <sys/resource.h>
- #include <X11/Xlib.h>
diff --git a/emulators/xmess/patches/patch-ae b/emulators/xmess/patches/patch-ae
deleted file mode 100644
index c43f464a1f2..00000000000
--- a/emulators/xmess/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.10 2004/11/07 16:11:48 kristerw Exp $
-
---- doc/xmessrc.dist.orig	Sun Nov  7 13:51:40 2004
-+++ doc/xmessrc.dist	Sun Nov  7 13:53:30 2004
-@@ -66,11 +66,11 @@
- analogstick             0
- 
- ### Fileio Related ###
--biospath                /usr/local/share/xmess/bios
--softwarepath            /usr/local/share/xmess/software
--hash_directory          /usr/local/share/xmess/hash
-+biospath                @ROMPATH@/bios
-+softwarepath            @ROMPATH@/software
-+hash_directory          @ROMPATH@/hash
- snapshot_directory      .
--hiscore_file            /usr/local/share/xmess/hiscore.dat
-+hiscore_file            @SPOOLDIR@/hiscore.dat
- 
- ### Mess Related ###
- language                english
diff --git a/emulators/xmess/patches/patch-af b/emulators/xmess/patches/patch-af
deleted file mode 100644
index 4421fa9076d..00000000000
--- a/emulators/xmess/patches/patch-af
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-af,v 1.4 2005/11/17 19:54:09 joerg Exp $
-
---- src/unix/joystick-drivers/joy_standard.c.orig	2005-11-17 16:17:48.000000000 +0000
-+++ src/unix/joystick-drivers/joy_standard.c
-@@ -6,7 +6,7 @@ static int use_old_driver = 0;
- 
- struct rc_option joy_standard_opts[] = {
-    /* name, shortname, type, dest, deflt, min, max, func, help */
--#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd)
-+#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) || defined(__ARCH_dragonfly)
-    { "joydevname",	"jdev",			rc_string,	&joy_dev,
-      "/dev/joy",	0,			0,		NULL,
-      "Joystick device prefix (defaults to /dev/joy)" },
-@@ -29,7 +29,7 @@ struct rc_option joy_standard_opts[] = {
- #include <sys/ioctl.h>
- 
- /* specific joystick for PC clones */
--#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd)
-+#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) || defined(__ARCH_dragonfly)
- 
- #include <machine/joystick.h>
- typedef struct joystick joy_struct;
-@@ -142,7 +142,7 @@ void joy_standard_init(void)
- 					/* fall through to the next case */
- 				case 1:
- 					joy_data[i].num_axes = 2;
--#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd)
-+#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) || defined(__ARCH_dragonfly)
- 					joy_data[i].num_buttons = 2;
- #else
- 					joy_data[i].num_buttons = JOY_BUTTONS;
-@@ -217,7 +217,7 @@ void joy_standard_poll(void)
- 			continue;
- 
- 		/* get value of buttons */
--#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd)
-+#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) || defined(__ARCH_dragonfly)
- 		joy_data[i].buttons[0] = my_joy_data.b1;
- 		joy_data[i].buttons[1] = my_joy_data.b2;
- #else
diff --git a/emulators/xmess/patches/patch-ag b/emulators/xmess/patches/patch-ag
deleted file mode 100644
index 764093c4683..00000000000
--- a/emulators/xmess/patches/patch-ag
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2005/11/17 19:54:09 joerg Exp $
-
---- src/unix/joystick-drivers/joy_usb.c.orig	2005-11-17 16:19:51.000000000 +0000
-+++ src/unix/joystick-drivers/joy_usb.c
-@@ -22,7 +22,7 @@ struct rc_option joy_usb_opts[] = {
- #ifdef USB_JOYSTICK
- 
-     
--#if !defined(__ARCH_openbsd) && !defined(__ARCH_netbsd) && !defined(__ARCH_freebsd)
-+#if !defined(__ARCH_openbsd) && !defined(__ARCH_netbsd) && !defined(__ARCH_freebsd) && !defined(__ARCH_dragonfly)
- #error "USB joysticks are only supported under OpenBSD, NetBSD and FreeBSD.  Patches to support other archs are welcome ;)"
- #endif
- 
-@@ -47,8 +47,13 @@ struct rc_option joy_usb_opts[] = {
- #include <sys/ioctl.h>
- #endif
- 
-+#ifdef __ARCH_dragonfly
-+#include <bus/usb/usb.h>
-+#include <bus/usb/usbhid.h>
-+#else
- #include <dev/usb/usb.h>
- #include <dev/usb/usbhid.h>
-+#endif
- 
- int axis_usage[] = {
-   HUG_X, HUG_Y, HUG_Z,
-@@ -118,7 +123,7 @@ static int joy_initialize_hid(int i)
-     }
- 
- #if defined(HAVE_USBHID_H) || defined(HAVE_LIBUSBHID_H)
--#if defined(__ARCH_openbsd) || defined(__ARCH_netbsd) || (defined(__ARCH_freebsd) && __FreeBSD_version > 500000)
-+#if defined(__ARCH_openbsd) || defined(__ARCH_netbsd) || (defined(__ARCH_freebsd) && __FreeBSD_version > 500000) || defined(__ARCH_dragonfly)
-   if (ioctl(joy_data[i].fd, USB_GET_REPORT_ID, &report_id) < 0)
-     {
-       fprintf(stderr_file, "error: /dev/uhid%d: %s", i, strerror(errno));
diff --git a/emulators/xtrs/DESCR b/emulators/xtrs/DESCR
deleted file mode 100644
index 7e1602a5507..00000000000
--- a/emulators/xtrs/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-xtrs is a Radio Shack TRS-80 Model I/III/4/4P emulator for Unix
-and the X Window System.  It includes lower case, the real time
-clock, hi-res graphics, serial port, parallel printer, mouse,
-cassette, sound and music output (requires OSS), 5" and 8" floppy
-disk drives in single and double density, and even hard disk drives.
-The emulated floppy and hard disk file formats are compatible with
-the popular MSDOS-based emulators by Jeff Vavasour, Matthew Reed,
-and David Keil, and (if you choose a capable enough file format),
-all features of the original TRS-80 floppy disk controller are
-emulated.  Under Linux, physical floppy disk drives are also
-supported.  Physical cassettes can be read and written too. The
-user interface is a bit spartan, but it gets the job done.
diff --git a/emulators/xtrs/Makefile b/emulators/xtrs/Makefile
deleted file mode 100644
index f9126bf86d3..00000000000
--- a/emulators/xtrs/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2007/02/06 18:22:35 joerg Exp $
-#
-
-DISTNAME=	xtrs-4.9
-PKGREVISION=	2
-CATEGORIES=	emulators
-MASTER_SITES=	http://www.tim-mann.org/trs80/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	${MASTER_SITES}
-COMMENT=	TRS-80 Model I/III/4 Emulator for Unix
-
-
-BUILD_TARGET=	default
-
-SUBST_CLASSES+=		mf
-SUBST_STAGE.mf=		post-patch
-SUBST_FILES.mf=		Makefile.local
-SUBST_SED.mf=		-e 's|/usr/local|${PREFIX}|g' \
-			-e 's|/usr/X11/|${X11PREFIX}/|g' \
-			-e 's|/usr/include/X11|${X11BASE}/include|g' \
-			-e 's|^\(LDFLAGS = \)-L/usr/X11R6/lib|\1-Wl,-R${X11BASE}/lib -L${X11BASE}/lib|g' \
-			-e 's|/share/man|/man|g'
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/xtrs
-	${INSTALL_DATA} ${WRKSRC}/xtrsrom4p.hex ${PREFIX}/lib/xtrs/romimage.m4p
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xtrs
-	${INSTALL_DATA} ${WRKSRC}/xtrsrom4p.README ${PREFIX}/share/doc/xtrs
-
-# The sources assume <malloc.h> exists.  Create a fake one for platforms
-# that don't have it.
-post-wrapper:
-	if ${TEST} ! -f /usr/include/malloc.h; then		\
-		${ECHO} "#include <stdlib.h>"			\
-			> ${BUILDLINK_DIR}/include/malloc.h;	\
-	fi
-
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xtrs/PLIST b/emulators/xtrs/PLIST
deleted file mode 100644
index bb47aa401da..00000000000
--- a/emulators/xtrs/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/09/25 16:26:47 uebayasi Exp $
-bin/cmddump
-bin/hex2cmd
-bin/mkdisk
-bin/xtrs
-lib/xtrs/romimage.m4p
-man/man1/cassette.1
-man/man1/cmddump.1
-man/man1/hex2cmd.1
-man/man1/mkdisk.1
-man/man1/xtrs.1
-share/doc/xtrs/xtrsrom4p.README
-@dirrm share/doc/xtrs
-@dirrm lib/xtrs
diff --git a/emulators/xtrs/distinfo b/emulators/xtrs/distinfo
deleted file mode 100644
index 16f1c7275af..00000000000
--- a/emulators/xtrs/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:22 agc Exp $
-
-SHA1 (xtrs-4.9.tar.gz) = abfbbdb972c7fa2b3545ed42698162a88168bded
-RMD160 (xtrs-4.9.tar.gz) = 6daabf36a53e4af8b9d6b97d91cba00cc55b406f
-Size (xtrs-4.9.tar.gz) = 422910 bytes
diff --git a/emulators/xyame/DESCR b/emulators/xyame/DESCR
deleted file mode 100644
index 38ea22a50fc..00000000000
--- a/emulators/xyame/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-YAME is a multi-system emulator which currently emulates the Gameboy,
-NES, and PC-Engine.
-
-This is a Japanese emulator. It has sound logging, frameskip, and
-realtime save/load. The man page is in Japanese though.
-
-This package contains the Linux binary of the program.
diff --git a/emulators/xyame/Makefile b/emulators/xyame/Makefile
deleted file mode 100644
index 1be1ea8ae9e..00000000000
--- a/emulators/xyame/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:53 rillig Exp $
-#
-
-DISTNAME=		xyame038
-PKGNAME=		xyame-038
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.emuxhaven.net/emuxhaven/multis/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-#HOMEPAGE=		http://www.geocities.co.jp/Stylish/2068/yame.html
-COMMENT=		Multi-system emulator (Gameboy, NES, and PC-Engine)
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
-
-WRKSRC=		${WRKDIR}
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-
-ONLY_FOR_PLATFORM+=	*-*-i386
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xyame ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/yame.6 ${PREFIX}/${PKGMANDIR}/man6/xyame.6
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xyame/PLIST b/emulators/xyame/PLIST
deleted file mode 100644
index 36ae4e74b74..00000000000
--- a/emulators/xyame/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/16 01:00:43 wiz Exp $
-bin/xyame
-man/man6/xyame.6
diff --git a/emulators/xyame/distinfo b/emulators/xyame/distinfo
deleted file mode 100644
index 45b15568ab6..00000000000
--- a/emulators/xyame/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:22 agc Exp $
-
-SHA1 (xyame038.tar.gz) = 0af5635c68e026d23688eda9607e4c2b702b9973
-RMD160 (xyame038.tar.gz) = 8da4752eabe48a241f4d898c7f7d6696df7d2738
-Size (xyame038.tar.gz) = 239396 bytes
diff --git a/emulators/z26/DESCR b/emulators/z26/DESCR
deleted file mode 100644
index 459af45c264..00000000000
--- a/emulators/z26/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-A fast and stable emulator for the mighty Atari 2600 game console.
-Lots of features and options, even comes with a man page with gobs of
-detailed information to help you fine tune everything.  Try the
-various timing and video mode settings to get the maximum performance
-on your computer.
diff --git a/emulators/z26/Makefile b/emulators/z26/Makefile
deleted file mode 100644
index 07159dd4569..00000000000
--- a/emulators/z26/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2006/10/22 16:30:22 rillig Exp $
-#
-
-DISTNAME=		z26v213
-PKGNAME=		z26-2.13
-PKGREVISION=		3
-CATEGORIES=		emulators games
-MASTER_SITES=		http://www.whimsey.com/z26/
-
-MAINTAINER=		xmor61@users.sourceforge.net
-HOMEPAGE=		http://www.whimsey.com/z26/
-COMMENT=		Atari 2600 Emulator
-
-BUILD_DEPENDS+=		nasm-[0-9]*:../../devel/nasm
-
-ONLY_FOR_PLATFORM+=	*-*-i386
-
-WRKSRC=			${WRKDIR}/z26_snapshot-20040523
-USE_TOOLS+=		gmake perl
-BUILD_TARGET=		netbsd
-MAKE_ENV+=		INSTALL_BINDIR=${PREFIX}/bin
-MAKE_ENV+=		INSTALL_MANDIR=${PREFIX}/${PKGMANDIR}/man1
-MAKE_FLAGS+=		INSTALL_USER=${ROOT_USER}
-MAKE_FLAGS+=		INSTALL_GROUP=${ROOT_GROUP}
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/z26/PLIST b/emulators/z26/PLIST
deleted file mode 100644
index 89b5f3e9fb1..00000000000
--- a/emulators/z26/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/21 03:49:56 minskim Exp $
-bin/z26
-man/man1/z26.1
diff --git a/emulators/z26/distinfo b/emulators/z26/distinfo
deleted file mode 100644
index 172acb08404..00000000000
--- a/emulators/z26/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/21 03:49:56 minskim Exp $
-
-SHA1 (z26v213.tar.gz) = b9a913ab7965f021be79ee9079fdba79ad26a5da
-RMD160 (z26v213.tar.gz) = 52d0e99839bbc290e184d31a765ce3f3043937c4
-Size (z26v213.tar.gz) = 216375 bytes
diff --git a/emulators/zsnes/DESCR b/emulators/zsnes/DESCR
deleted file mode 100644
index 2704baf6418..00000000000
--- a/emulators/zsnes/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Play Super Nintendo games on your Intel x86 or compatible PC.
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
deleted file mode 100644
index b2c411e91dc..00000000000
--- a/emulators/zsnes/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.35 2006/06/12 16:28:07 wiz Exp $
-#
-
-DISTNAME=		zsnes142src
-PKGNAME=		zsnes-1.42
-PKGREVISION=		6
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=zsnes/}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.zsnes.com/
-COMMENT=		Super NES emulator
-
-BUILD_DEPENDS+=		nasm-[0-9]*:../../devel/nasm
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-BUILD_TARGET=		zsnes
-
-WRKSRC=			${WRKDIR}/zsnes_1_42/src
-GNU_CONFIGURE=		yes
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/zsnes/PLIST b/emulators/zsnes/PLIST
deleted file mode 100644
index 987c3f99088..00000000000
--- a/emulators/zsnes/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:33 zuntum Exp $
-bin/zsnes
-man/man1/zsnes.1
diff --git a/emulators/zsnes/distinfo b/emulators/zsnes/distinfo
deleted file mode 100644
index 376856aa457..00000000000
--- a/emulators/zsnes/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.11 2006/12/26 20:13:30 wiz Exp $
-
-SHA1 (zsnes142src.tar.gz) = d38ca8c1b4168edc5bb5815f504b52654100bc4b
-RMD160 (zsnes142src.tar.gz) = d794c69e876265715e141c26ecb6ed1802ffc27d
-Size (zsnes142src.tar.gz) = 1102840 bytes
-SHA1 (patch-aa) = 8394e0888dea04ba69ed513cd5b8e7fafd074dbe
-SHA1 (patch-ab) = d3c00a1e77fc8edc132f3040a1219ae4a4d87967
-SHA1 (patch-ac) = 76e640aec3816eb4cbbfbe0dff1fcd2fa52f7876
-SHA1 (patch-ad) = 3c79a4c3ffe65151cd4d299b9837c6d20c8f8522
-SHA1 (patch-ae) = 81236ed52fe7095f6317f655374234ce17cf30dd
-SHA1 (patch-af) = a0a4da051a7370671c17160bca91a12e630cdb6a
diff --git a/emulators/zsnes/patches/patch-aa b/emulators/zsnes/patches/patch-aa
deleted file mode 100644
index a22f5f86c82..00000000000
--- a/emulators/zsnes/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/12/26 20:13:30 wiz Exp $
-
---- configure.orig	2005-01-20 03:21:54.000000000 +0100
-+++ configure
-@@ -2909,6 +2909,10 @@ case "$target" in
- 		CFLAGS="$CFLAGS -D__LINUX__ -D__FreeBSD__"
- 		NFLAGS="$NFLAGS -D__LINUX__ -D__FreeBSD__ -DELF -f elf"
- 		;;
-+	*-*-dragonfly*)
-+		CFLAGS="$CFLAGS -D__LINUX__ -D__FreeBSD__"
-+		NFLAGS="$NFLAGS -D__LINUX__ -D__FreeBSD__ -DELF -f elf"
-+		;;
- 	*-*-cygwin* | *-*-*ming*)
- 		CFLAGS="$CFLAGS -D__LINUX__"
- 		NFLAGS="$NFLAGS -D__LINUX__ -f win32"
-@@ -4115,7 +4119,6 @@ else
- 	echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
--	CFLAGS="$CFLAGS -O3 -ffast-math -fomit-frame-pointer -fexpensive-optimizations -s"
- 	NFLAGS="$NFLAGS -O1"
- 	ZSNESEXE="zsnes"
- fi
diff --git a/emulators/zsnes/patches/patch-ab b/emulators/zsnes/patches/patch-ab
deleted file mode 100644
index 1d107bb80e4..00000000000
--- a/emulators/zsnes/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2006/12/26 18:04:28 adam Exp $
-
---- gblhdr.h.orig	2005-01-14 14:10:39.000000000 +0100
-+++ gblhdr.h
-@@ -105,6 +105,8 @@ Foundation, Inc., 675 Mass Ave, Cambridg
- 	#include <sys/ioctl.h>
- 	#include <sys/socket.h>
- 	#include <sys/types.h>
-+	#undef FALSE
-+	#undef TRUE
- 	#include <netinet/in.h>
- 	#include <netdb.h>
- 	#include <utime.h>
-@@ -122,4 +124,4 @@ Foundation, Inc., 675 Mass Ave, Cambridg
- 	#endif
- 	#endif
- 
--
-+	#include <pthread.h>
diff --git a/emulators/zsnes/patches/patch-ac b/emulators/zsnes/patches/patch-ac
deleted file mode 100644
index f339a3832b3..00000000000
--- a/emulators/zsnes/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/01/20 00:43:15 xtraeme Exp $
-
---- zip/unzip.c.orig	2005-01-20 01:32:47.000000000 +0100
-+++ zip/unzip.c	2005-01-20 01:33:03.000000000 +0100
-@@ -15,6 +15,10 @@
- #include "zlib.h"
- #include "zunzip.h"
- 
-+#ifndef OF
-+# define OF(args)      args
-+#endif
-+
- #ifdef STDC
- #  include <stddef.h>
- #  include <string.h>
diff --git a/emulators/zsnes/patches/patch-ad b/emulators/zsnes/patches/patch-ad
deleted file mode 100644
index 0c1063d2441..00000000000
--- a/emulators/zsnes/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2005/01/20 00:43:15 xtraeme Exp $
-
---- linux/sw_draw.c.orig	2005-01-14 14:11:18.000000000 +0100
-+++ linux/sw_draw.c	2005-01-20 01:34:10.000000000 +0100
-@@ -124,6 +124,11 @@
- 
- void sw_drawwin()
- {
-+#ifdef _PTH_PTHREAD_H_
-+	pthread_yield_np();
-+#endif
-+
-+
-     NGNoTransp = 0;             // Set this value to 1 within the appropriate
-                                 // video mode if you want to add a custom
-                                 // transparency routine or hardware
diff --git a/emulators/zsnes/patches/patch-ae b/emulators/zsnes/patches/patch-ae
deleted file mode 100644
index a745ccc48c2..00000000000
--- a/emulators/zsnes/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/01/20 00:43:15 xtraeme Exp $
-
---- zip/zunzip.h.orig	2005-01-20 01:37:57.000000000 +0100
-+++ zip/zunzip.h	2005-01-20 01:38:09.000000000 +0100
-@@ -41,6 +41,10 @@
- #ifndef _unz_H
- #define _unz_H
- 
-+#ifndef OF
-+# define OF(args)      args
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/emulators/zsnes/patches/patch-af b/emulators/zsnes/patches/patch-af
deleted file mode 100644
index 757dbcc3806..00000000000
--- a/emulators/zsnes/patches/patch-af
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/05/21 17:09:53 joerg Exp $
-
---- linux/zfilew.c.orig	2005-01-14 14:11:19.000000000 +0100
-+++ linux/zfilew.c
-@@ -471,14 +471,17 @@ void obtaindir()
- {
-   char *homedir = 0;
-   DIR *tmp;
-+  int getenvSuccess = 0;
- 
-   if ((homedir = (char *)getenv("HOME")) == 0)
-   {
-     homedir = (char *)malloc(ZCFG_DIR_LEN);
-     getcwd(homedir, ZCFG_DIR_LEN);
-+    getenvSuccess = 1;
-   }
-   strcpy(zcfgdir, homedir);
--  free(homedir);
-+  if (getenvSuccess == 1)
-+    free(homedir);
-   strcat(zcfgdir, ZCFG_DIR);
-   tmp = opendir(zcfgdir);
-   if (tmp == NULL)