Remove sdlmame and sdlmess, replaced by mame and mess, respectively.

Add mame+mess to category Makefile.

26 files changed, 3 insertions, 1178 deletions

diff --git a/emulators/Makefile b/emulators/Makefile
index 977c9ddf78f..d0aba0f56af 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.184 2010/09/24 01:31:59 chs Exp $
+# $NetBSD: Makefile,v 1.185 2011/02/03 22:24:45 wiz Exp $
 #
 
 COMMENT=	Emulators for other operating systems
@@ -76,7 +76,9 @@ SUBDIR+=	linuxppc_lib
 SUBDIR+=	lrmi
 SUBDIR+=	m1
 SUBDIR+=	makeppf
+SUBDIR+=	mame
 SUBDIR+=	mednafen
+SUBDIR+=	mess
 SUBDIR+=	minivmac
 SUBDIR+=	mmix
 SUBDIR+=	nestopia
@@ -100,8 +102,6 @@ SUBDIR+=	pearpc
 SUBDIR+=	qemu
 SUBDIR+=	raine
 #SUBDIR+=	sap	# only contains a Makefile.common
-SUBDIR+=	sdlmame
-SUBDIR+=	sdlmess
 SUBDIR+=	simh
 SUBDIR+=	simulavr
 SUBDIR+=	ski
diff --git a/emulators/sdlmame/DESCR b/emulators/sdlmame/DESCR
deleted file mode 100644
index 1527e0ac823..00000000000
--- a/emulators/sdlmame/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-SDL mame is the SDL 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 MAME you must have a copy of the original game ROMs.
diff --git a/emulators/sdlmame/Makefile b/emulators/sdlmame/Makefile
deleted file mode 100644
index 6b5a103fc8b..00000000000
--- a/emulators/sdlmame/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2011/01/13 13:37:36 wiz Exp $
-#
-
-# Don't update to 0.XXXuN, those are development snapshots.
-DISTNAME=		sdlmame0136
-PKGNAME=		${DISTNAME:S/0/-0./}
-PKGREVISION=		4
-
-COMMENT=		Multiple Arcade Machine Emulator, SDL port
-
-CONFLICTS=		xmame-[0-9]*
-
-MAKE_FILE=		makefile
-
-DOCDIR=			share/doc/sdlmame
-INSTALLATION_DIRS=	bin ${DOCDIR}
-
-do-install:
-	set -e; \
-	for prg in chdman jedutil mame romcmp; \
-	do \
-		${INSTALL_PROGRAM} ${WRKSRC}/"$$prg" ${DESTDIR}${PREFIX}/bin; \
-	done
-	${INSTALL_DATA} ${WRKSRC}/SDLMAME.txt ${DESTDIR}${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/license.txt ${DESTDIR}${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/mame.txt ${DESTDIR}${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/windows.txt ${DESTDIR}${PREFIX}/${DOCDIR}
-
-.include "Makefile.common"
diff --git a/emulators/sdlmame/Makefile.common b/emulators/sdlmame/Makefile.common
deleted file mode 100644
index fbd91eb1869..00000000000
--- a/emulators/sdlmame/Makefile.common
+++ /dev/null
@@ -1,62 +0,0 @@
-# $NetBSD: Makefile.common,v 1.3 2009/09/14 22:35:02 zafer Exp $
-#
-# used by emulators/sdlmess/Makefile
-
-CATEGORIES=		emulators
-MASTER_SITES=		http://rbelmont.mameworld.info/
-EXTRACT_SUFX=		.zip
-
-MAINTAINER=		dillo@NetBSD.org
-HOMEPAGE=		http://rbelmont.mameworld.info/?page_id=163
-LICENSE=		mame-license
-
-RESTRICTED=		selling is not allowed
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-USE_TOOLS+=		gmake pkg-config
-UNLIMIT_RESOURCES+=	datasize
-
-.if ${MACHINE_ARCH:Mi386}
-MAKE_FLAGS+=	X86_MIPS3_DRC=1
-MAKE_FLAGS+=	X86_PPC_DRC=1
-#MAKE_FLAGS+=	X86_ASM=1
-.else
-MAKE_FLAGS+=	X86_MIPS3_DRC=
-MAKE_FLAGS+=	X86_PPC_DRC=
-.endif
-# XXX: PTR64
-.if ${MACHINE_ARCH:Mx86_64}
-MAKE_FLAGS+=	PTR64=true
-# XXX: FORCE_DRC_C_BACKEND?
-.endif
-
-.  include "../../mk/endian.mk"
-.if ${MACHINE_ENDIAN:Mbig}
-MAKE_FLAGS+=	BIGENDIAN=true
-.endif
-
-MAKE_FLAGS+=	SDLMAME_NO64BITIO=true
-
-# Pragma once is not needed, and creates 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"
-
-# Using LD with calling conventions of CC is wrong, use CC instead.
-SUBST_CLASSES+=		ldcc
-SUBST_STAGE.ldcc=	pre-configure
-SUBST_FILES.ldcc=	${MAKE_FILE}
-SUBST_FILES.ldcc+=	*.mak */*.mak */*/*.mak */*/*/*.mak */*/*/*/*.mak
-SUBST_SED.ldcc=		-e "s|(LD)|(CC)|"
-
-.include "../../devel/GConf/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/sdlmame/PLIST b/emulators/sdlmame/PLIST
deleted file mode 100644
index 309c59472a5..00000000000
--- a/emulators/sdlmame/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:51:07 joerg Exp $
-bin/chdman
-bin/jedutil
-bin/mame
-bin/romcmp
-share/doc/sdlmame/SDLMAME.txt
-share/doc/sdlmame/license.txt
-share/doc/sdlmame/mame.txt
-share/doc/sdlmame/windows.txt
diff --git a/emulators/sdlmame/distinfo b/emulators/sdlmame/distinfo
deleted file mode 100644
index c6f4c9e3c70..00000000000
--- a/emulators/sdlmame/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.12 2010/11/18 10:08:31 wiz Exp $
-
-SHA1 (sdlmame0136.zip) = 19c11abc3b3ab2633df62f3867921b3541bb582e
-RMD160 (sdlmame0136.zip) = 1cb9b24ae6f97c0f223f13ed97a074de14e2892e
-Size (sdlmame0136.zip) = 18936113 bytes
-SHA1 (patch-aa) = 93dd00e02110e8257f3fe0c18a94d7f7ca594352
-SHA1 (patch-ab) = 3cc161845baae6ebcdab42fbd19f74e2ee3d4cb1
-SHA1 (patch-ac) = e97e7b730305aa2d10363cfd65f8e2b30f2fc292
-SHA1 (patch-ad) = 8d6312b593343eb2e5b29f177376c8fa243d8293
-SHA1 (patch-ae) = d110f0338d224823d959c8a2b57026321a3f0a38
-SHA1 (patch-af) = 4e7b4eab76e43feec91e91238d855c70ac43e15b
-SHA1 (patch-ag) = 28a86606c098a0b057029ef9ba9b136b4c223a86
-SHA1 (patch-ah) = f2dbfc44e30857fd9b52ed5d107b5190d5e5f6da
diff --git a/emulators/sdlmame/patches/patch-aa b/emulators/sdlmame/patches/patch-aa
deleted file mode 100644
index 3e4e5c39e09..00000000000
--- a/emulators/sdlmame/patches/patch-aa
+++ /dev/null
@@ -1,126 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2009/09/20 10:03:58 wiz Exp $
-
---- makefile.orig	2009-08-31 04:45:36.000000000 +0000
-+++ makefile
-@@ -125,10 +125,10 @@ endif
- # BIGENDIAN = 1
- 
- # uncomment next line to build expat as part of MAME build
--BUILD_EXPAT = 1
-+# BUILD_EXPAT = 1
- 
- # uncomment next line to build zlib as part of MAME build
--BUILD_ZLIB = 1
-+# BUILD_ZLIB = 1
- 
- # uncomment next line to include the symbols
- # SYMBOLS = 1
-@@ -196,9 +196,9 @@ BUILD_EXE = $(EXE)
- endif
- 
- # compiler, linker and utilities
--AR = @ar
--CC = @gcc
--LD = @gcc
-+#AR = @ar
-+#CC = @gcc
-+#LD = @gcc
- MD = -mkdir$(EXE)
- RM = @rm -f
- 
-@@ -227,7 +227,7 @@ NAME = $(TARGET)$(SUBTARGET)
- endif
- 
- # fullname is prefix+name+suffix+debugsuffix
--FULLNAME = $(PREFIX)$(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX)
-+FULLNAME = $(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX)
- 
- # add an EXE suffix to get the final emulator name
- EMULATOR = $(FULLNAME)$(EXE)
-@@ -309,11 +309,11 @@ endif
- 
- # we compile C-only to C89 standard with GNU extensions
- # we compile C++ code to C++98 standard with GNU extensions
--CONLYFLAGS += -std=gnu89
--CPPONLYFLAGS += -x c++ -std=gnu++98
-+#CONLYFLAGS += -std=gnu89
-+#CPPONLYFLAGS += -x c++ -std=gnu++98
- 
- # this speeds it up a bit by piping between the preprocessor/compiler/assembler
--CCOMFLAGS += -pipe
-+#CCOMFLAGS += -pipe
- 
- # add -g if we need symbols, and ensure we have frame pointers
- ifdef SYMBOLS
-@@ -331,18 +331,18 @@ CCOMFLAGS += -pg
- endif
- 
- # add the optimization flag
--CCOMFLAGS += -O$(OPTIMIZE)
-+#CCOMFLAGS += -O$(OPTIMIZE)
- 
- # if we are optimizing, include optimization options
- # and make all errors into warnings
- ifneq ($(OPTIMIZE),0)
- ifneq ($(TARGETOS),os2)
- ifndef IA64
--CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
-+#CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
- else
- endif
- else
--CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
-+#CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
- endif
- endif
- 
-@@ -372,7 +372,7 @@ endif
- #-------------------------------------------------
- 
- # add core include paths
--CCOMFLAGS += \
-+CCOMFLAGS := \
- 	-I$(SRC)/$(TARGET) \
- 	-I$(SRC)/$(TARGET)/includes \
- 	-I$(OBJ)/$(TARGET)/layout \
-@@ -382,7 +382,7 @@ CCOMFLAGS += \
- 	-I$(SRC)/lib/util \
- 	-I$(SRC)/osd \
- 	-I$(SRC)/osd/$(OSD) \
--
-+	$(CFLAGS)
- 
- 
- #-------------------------------------------------
-@@ -391,11 +391,11 @@ CCOMFLAGS += \
- 
- # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
- # flags only used when linking the core emulator
--LDFLAGS =
-+#LDFLAGS =
- ifneq ($(TARGETOS),macosx)
- ifneq ($(TARGETOS),os2)
- ifneq ($(TARGETOS),solaris)
--LDFLAGS = -Wl,--warn-common
-+#LDFLAGS = -Wl,--warn-common
- endif
- endif
- endif
-@@ -410,7 +410,7 @@ endif
- ifndef SYMBOLS
- ifndef PROFILE
- ifneq ($(TARGETOS),macosx)
--LDFLAGS += -s
-+#LDFLAGS += -s
- endif
- endif
- endif
-@@ -561,7 +561,7 @@ $(VERSIONOBJ): $(DRVLIBS) $(LIBOSD) $(LI
- 
- $(EMULATOR): $(VERSIONOBJ) $(DRVLIBS) $(LIBOSD) $(LIBEMU) $(LIBCPU) $(LIBDASM) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(RESFILE)
- 	@echo Linking $@...
--	$(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@
-+	$(CC) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@
- 
- endif
- 
diff --git a/emulators/sdlmame/patches/patch-ab b/emulators/sdlmame/patches/patch-ab
deleted file mode 100644
index 46a119a8e9f..00000000000
--- a/emulators/sdlmame/patches/patch-ab
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2009/11/13 14:45:25 wiz Exp $
-
---- src/osd/sdl/sdlsync_tc.c.orig	2009-10-25 05:54:58.000000000 +0000
-+++ src/osd/sdl/sdlsync_tc.c
-@@ -341,15 +341,28 @@ int osd_thread_adjust_priority(osd_threa
- 
- int osd_thread_cpu_affinity(osd_thread *thread, UINT32 mask)
- {
--#if !defined(NO_AFFINITY_NP)
-+#if !defined(NO_AFFINITY_NP) && !defined(__DragonFly__)
-+#if defined(__NetBSD__)
-+	cpuset_t *cmask;
-+#else
- 	cpu_set_t	cmask;
-+#endif
- 	pthread_t	lthread;
- 	int			bitnum;
-+	int			ret;
- 
-+#if defined(__NetBSD__)
-+	cmask = cpuset_create(); /* initializes set as well */
-+#else
- 	CPU_ZERO(&cmask);
-+#endif
- 	for (bitnum=0; bitnum<32; bitnum++)
- 		if (mask & (1<<bitnum))
-+#if defined(__NetBSD__)
-+			cpuset_set(bitnum, cmask);
-+#else
- 			CPU_SET(bitnum, &cmask);
-+#endif
- 	
- 	if (thread == NULL)
- 		lthread = pthread_self();
-@@ -360,10 +373,15 @@ int osd_thread_cpu_affinity(osd_thread *
- 	{
- 		/* Not available during link in all targets */
- 		fprintf(stderr, "error %d setting cpu affinity to mask %08x", errno, mask);
--		return FALSE;
-+		ret = FALSE;
- 	}
- 	else
--		return TRUE;
-+		ret = TRUE;
-+
-+#if defined(__NetBSD__)
-+	cpuset_destroy(cmask);
-+#endif
-+	return ret;
- #else
- 	return TRUE;
- #endif
diff --git a/emulators/sdlmame/patches/patch-ac b/emulators/sdlmame/patches/patch-ac
deleted file mode 100644
index c0158724901..00000000000
--- a/emulators/sdlmame/patches/patch-ac
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2009/11/13 14:45:25 wiz Exp $
-
---- src/emu/mamecore.h.orig	2009-11-01 00:44:54.000000000 +0000
-+++ src/emu/mamecore.h
-@@ -9,7 +9,7 @@
- 
- ***************************************************************************/
- 
--#pragma once
-+
- 
- #ifndef __MAMECORE_H__
- #define __MAMECORE_H__
-@@ -333,6 +333,10 @@ DECL_NORETURN void CLIB_DECL fatalerror_
-     INLINE FUNCTIONS
- ***************************************************************************/
- 
-+#if defined(__NetBSD__)
-+#include <sys/param.h>
-+#endif
-+#if !defined(__NetBSD__) || (__NetBSD_Version__ < 599001500)
- /* population count */
- INLINE int popcount(UINT32 val)
- {
-@@ -342,6 +346,7 @@ INLINE int popcount(UINT32 val)
- 		val &= val - 1;
- 	return count;
- }
-+#endif
- 
- 
- /* convert a series of 32 bits into a float */
diff --git a/emulators/sdlmame/patches/patch-ad b/emulators/sdlmame/patches/patch-ad
deleted file mode 100644
index 8e03f235236..00000000000
--- a/emulators/sdlmame/patches/patch-ad
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2009/11/13 14:45:25 wiz Exp $
-
---- src/mame/machine/n64.c.orig	2009-11-01 00:44:54.000000000 +0000
-+++ src/mame/machine/n64.c
-@@ -1474,7 +1474,7 @@ static UINT32 si_dram_addr = 0;
- static UINT32 si_pif_addr = 0;
- static UINT32 si_pif_addr_rd64b = 0;
- static UINT32 si_pif_addr_wr64b = 0;
--static UINT32 si_status = 0;
-+static UINT32 mame_si_status = 0;
- 
- static UINT8 eeprom[512];
- static UINT8 mempack[0x8000];
-@@ -1884,7 +1884,7 @@ static void pif_dma(running_machine *mac
- 		}
- 	}
- 
--	si_status |= 0x1000;
-+	mame_si_status |= 0x1000;
- 	signal_rcp_interrupt(machine, SI_INTERRUPT);
- }
- 
-@@ -1896,7 +1896,7 @@ READ32_HANDLER( n64_si_reg_r )
- 			//return si_dram_addr;
- 
- 		case 0x18/4:		// SI_STATUS_REG
--			return si_status;
-+			return mame_si_status;
- 	}
- 	return 0;
- }
-@@ -1925,7 +1925,7 @@ WRITE32_HANDLER( n64_si_reg_w )
- 			break;
- 
- 		case 0x18/4:		// SI_STATUS_REG
--			si_status &= ~0x1000;
-+			mame_si_status &= ~0x1000;
- 			clear_rcp_interrupt(space->machine, SI_INTERRUPT);
- 			break;
- 
-@@ -2036,7 +2036,7 @@ MACHINE_RESET( n64 )
- 	memset(pif_cmd, 0, sizeof(pif_cmd));
- 	si_dram_addr = 0;
- 	si_pif_addr = 0;
--	si_status = 0;
-+	mame_si_status = 0;
- 
- 	memset(eeprom, 0, sizeof(eeprom));
- 	memset(mempack, 0, sizeof(mempack));
diff --git a/emulators/sdlmame/patches/patch-ae b/emulators/sdlmame/patches/patch-ae
deleted file mode 100644
index 7db9170c48f..00000000000
--- a/emulators/sdlmame/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2009/07/25 22:26:12 wiz Exp $
-
---- src/osd/sdl/sdldir.c.orig	2009-05-07 17:09:00.000000000 +0000
-+++ src/osd/sdl/sdldir.c
-@@ -28,6 +28,11 @@
- #define __USE_BSD	// to get DT_xxx on Linux
- #endif
- #undef _POSIX_C_SOURCE  // to get DT_xxx on OS X
-+#if defined(__NetBSD__)
-+#ifndef _NETBSD_SOURCE
-+#define _NETBSD_SOURCE  // to get DT_xxx on NetBSD
-+#endif
-+#endif
- #include <dirent.h>
- 
- #include "osdcore.h"
diff --git a/emulators/sdlmame/patches/patch-af b/emulators/sdlmame/patches/patch-af
deleted file mode 100644
index 5ababa519a6..00000000000
--- a/emulators/sdlmame/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2010/06/05 12:20:07 wiz Exp $
-
---- src/osd/sdl/dview.c.orig	2009-12-19 16:18:15.000000000 +0000
-+++ src/osd/sdl/dview.c
-@@ -213,7 +213,7 @@ static void dview_size_allocate(GtkWidge
- 	debug_view_set_visible_position(dv->dw, pos); 
- 	debug_view_set_visible_size(dv->dw, vsize);
- 
--	if(GTK_WIDGET_REALIZED(wdv))
-+	if(gtk_widget_get_realized(wdv))
- 		gdk_window_move_resize(wdv->window,
- 							   allocation->x, allocation->y,
- 							   allocation->width, allocation->height);
diff --git a/emulators/sdlmame/patches/patch-ag b/emulators/sdlmame/patches/patch-ag
deleted file mode 100644
index 18be8dadcf2..00000000000
--- a/emulators/sdlmame/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2010/11/18 10:08:31 wiz Exp $
-
---- src/osd/sdl/sdl.mak.orig	2009-12-19 16:18:21.000000000 +0000
-+++ src/osd/sdl/sdl.mak
-@@ -300,7 +300,6 @@ ifndef NO_X11
- OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
- CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0` 
- LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
--CFLAGS += -DGTK_DISABLE_DEPRECATED
- else
- OSDCOREOBJS += $(SDLOBJ)/debugwin.o
- endif # NO_X11
diff --git a/emulators/sdlmame/patches/patch-ah b/emulators/sdlmame/patches/patch-ah
deleted file mode 100644
index c58377b4f2f..00000000000
--- a/emulators/sdlmame/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2009/06/06 21:21:34 wiz Exp $
-
---- src/osd/sdl/sdlprefix.h.orig	2009-03-19 09:09:46.000000000 +0000
-+++ src/osd/sdl/sdlprefix.h
-@@ -30,7 +30,7 @@
- #elif defined(__linux__)
- #define SDLMAME_LINUX 1
- 
--#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined (__NetBSD__)
- #define SDLMAME_BSD 1
- #endif
- 
diff --git a/emulators/sdlmess/DESCR b/emulators/sdlmess/DESCR
deleted file mode 100644
index 0be75382110..00000000000
--- a/emulators/sdlmess/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-MESS is a free emulator which emulates a large variety of different
-systems.
-
-This package contains the SDL port of MESS.
diff --git a/emulators/sdlmess/Makefile b/emulators/sdlmess/Makefile
deleted file mode 100644
index f09575a2529..00000000000
--- a/emulators/sdlmess/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2011/01/13 13:40:10 wiz Exp $
-#
-
-DISTNAME=		sdlmess0136
-PKGNAME=		sdlmess-0.136
-PKGREVISION=		3
-
-COMMENT=		Multi Emulator Super System, SDL port
-
-CONFLICTS=		xmess-[0-9]*
-
-MAKE_FILE=		makefile
-
-DOCDIR=			share/doc/mess
-SHAREDIR=		share/mess
-INSTALLATION_DIRS=	bin ${DOCDIR}/sysinfo ${SHAREDIR}/artwork \
-			${SHAREDIR}/hash
-
-pre-patch:
-	cd ${WRKSRC} && mv makefile.sdl makefile
-
-post-build:
-	cd ${WRKSRC} && ./dat2html
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/castool ${DESTDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/imgtool ${DESTDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/mess ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/artwork/* \
-		${DESTDIR}${PREFIX}/${SHAREDIR}/artwork
-	${INSTALL_DATA} ${WRKSRC}/hash/* \
-		${DESTDIR}${PREFIX}/${SHAREDIR}/hash
-	${INSTALL_DATA} ${WRKSRC}/sysinfo.htm ${DESTDIR}${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/sysinfo/* \
-		${DESTDIR}${PREFIX}/${DOCDIR}/sysinfo
-
-.include "../../emulators/sdlmame/Makefile.common"
diff --git a/emulators/sdlmess/PLIST b/emulators/sdlmess/PLIST
deleted file mode 100644
index ed8e68a421d..00000000000
--- a/emulators/sdlmess/PLIST
+++ /dev/null
@@ -1,383 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2010/02/03 16:18:28 wiz Exp $
-bin/castool
-bin/imgtool
-bin/mess
-share/doc/mess/sysinfo.htm
-share/doc/mess/sysinfo/3do.htm
-share/doc/mess/sysinfo/990189.htm
-share/doc/mess/sysinfo/990189v.htm
-share/doc/mess/sysinfo/a1000n.htm
-share/doc/mess/sysinfo/a2600.htm
-share/doc/mess/sysinfo/a310.htm
-share/doc/mess/sysinfo/a400.htm
-share/doc/mess/sysinfo/a500n.htm
-share/doc/mess/sysinfo/a5200.htm
-share/doc/mess/sysinfo/a7800.htm
-share/doc/mess/sysinfo/a800.htm
-share/doc/mess/sysinfo/a800xl.htm
-share/doc/mess/sysinfo/abc80.htm
-share/doc/mess/sysinfo/abc800c.htm
-share/doc/mess/sysinfo/acrnsys1.htm
-share/doc/mess/sysinfo/adam.htm
-share/doc/mess/sysinfo/advision.htm
-share/doc/mess/sysinfo/aim65.htm
-share/doc/mess/sysinfo/al520ex.htm
-share/doc/mess/sysinfo/alice.htm
-share/doc/mess/sysinfo/amsterd.htm
-share/doc/mess/sysinfo/apexc.htm
-share/doc/mess/sysinfo/apfimag.htm
-share/doc/mess/sysinfo/apfm1000.htm
-share/doc/mess/sysinfo/apple1.htm
-share/doc/mess/sysinfo/apple2.htm
-share/doc/mess/sysinfo/apple2c.htm
-share/doc/mess/sysinfo/apple2cp.htm
-share/doc/mess/sysinfo/apple2e.htm
-share/doc/mess/sysinfo/apple2gs.htm
-share/doc/mess/sysinfo/apple2p.htm
-share/doc/mess/sysinfo/apple3.htm
-share/doc/mess/sysinfo/aquarius.htm
-share/doc/mess/sysinfo/arcadia.htm
-share/doc/mess/sysinfo/astrocde.htm
-share/doc/mess/sysinfo/at.htm
-share/doc/mess/sysinfo/atarist.htm
-share/doc/mess/sysinfo/atariste.htm
-share/doc/mess/sysinfo/atom.htm
-share/doc/mess/sysinfo/atvga.htm
-share/doc/mess/sysinfo/avigo.htm
-share/doc/mess/sysinfo/b2m.htm
-share/doc/mess/sysinfo/bbca.htm
-share/doc/mess/sysinfo/bbcbc.htm
-share/doc/mess/sysinfo/bbcm.htm
-share/doc/mess/sysinfo/bebox.htm
-share/doc/mess/sysinfo/bk0010.htm
-share/doc/mess/sysinfo/bondwell.htm
-share/doc/mess/sysinfo/bw2.htm
-share/doc/mess/sysinfo/c128.htm
-share/doc/mess/sysinfo/c16.htm
-share/doc/mess/sysinfo/c64.htm
-share/doc/mess/sysinfo/c64gs.htm
-share/doc/mess/sysinfo/c65.htm
-share/doc/mess/sysinfo/cbm30.htm
-share/doc/mess/sysinfo/cbm40.htm
-share/doc/mess/sysinfo/cbm500.htm
-share/doc/mess/sysinfo/cbm610.htm
-share/doc/mess/sysinfo/cbm710.htm
-share/doc/mess/sysinfo/cbm80.htm
-share/doc/mess/sysinfo/cdtv.htm
-share/doc/mess/sysinfo/cgenie.htm
-share/doc/mess/sysinfo/channelf.htm
-share/doc/mess/sysinfo/coco.htm
-share/doc/mess/sysinfo/coco3.htm
-share/doc/mess/sysinfo/coco3h.htm
-share/doc/mess/sysinfo/coleco.htm
-share/doc/mess/sysinfo/compis.htm
-share/doc/mess/sysinfo/comquest.htm
-share/doc/mess/sysinfo/concept.htm
-share/doc/mess/sysinfo/coupe.htm
-share/doc/mess/sysinfo/cpc464.htm
-share/doc/mess/sysinfo/cpc464p.htm
-share/doc/mess/sysinfo/cpc6128.htm
-share/doc/mess/sysinfo/cpc6128p.htm
-share/doc/mess/sysinfo/cpc664.htm
-share/doc/mess/sysinfo/crvision.htm
-share/doc/mess/sysinfo/dai.htm
-share/doc/mess/sysinfo/dallas.htm
-share/doc/mess/sysinfo/dc.htm
-share/doc/mess/sysinfo/dgone.htm
-share/doc/mess/sysinfo/einstein.htm
-share/doc/mess/sysinfo/electron.htm
-share/doc/mess/sysinfo/ep128.htm
-share/doc/mess/sysinfo/europc.htm
-share/doc/mess/sysinfo/exidy.htm
-share/doc/mess/sysinfo/famicom.htm
-share/doc/mess/sysinfo/famitwin.htm
-share/doc/mess/sysinfo/fellow.htm
-share/doc/mess/sysinfo/g7400.htm
-share/doc/mess/sysinfo/galaxy.htm
-share/doc/mess/sysinfo/galeb.htm
-share/doc/mess/sysinfo/gameboy.htm
-share/doc/mess/sysinfo/gamecom.htm
-share/doc/mess/sysinfo/gamegear.htm
-share/doc/mess/sysinfo/gamepock.htm
-share/doc/mess/sysinfo/gbcolor.htm
-share/doc/mess/sysinfo/genesis.htm
-share/doc/mess/sysinfo/geneve.htm
-share/doc/mess/sysinfo/glasgow.htm
-share/doc/mess/sysinfo/gmaster.htm
-share/doc/mess/sysinfo/gx4000.htm
-share/doc/mess/sysinfo/hp48s.htm
-share/doc/mess/sysinfo/i8530286.htm
-share/doc/mess/sysinfo/ibm5150.htm
-share/doc/mess/sysinfo/ibm5160.htm
-share/doc/mess/sysinfo/ibmat.htm
-share/doc/mess/sysinfo/ibmpcjr.htm
-share/doc/mess/sysinfo/intv.htm
-share/doc/mess/sysinfo/intvkbd.htm
-share/doc/mess/sysinfo/intvsrs.htm
-share/doc/mess/sysinfo/jaguar.htm
-share/doc/mess/sysinfo/jupiter.htm
-share/doc/mess/sysinfo/kaypro.htm
-share/doc/mess/sysinfo/kc85_3.htm
-share/doc/mess/sysinfo/kc85_4.htm
-share/doc/mess/sysinfo/kccomp.htm
-share/doc/mess/sysinfo/kim1.htm
-share/doc/mess/sysinfo/laser110.htm
-share/doc/mess/sysinfo/laser200.htm
-share/doc/mess/sysinfo/laser210.htm
-share/doc/mess/sysinfo/laser310.htm
-share/doc/mess/sysinfo/laser350.htm
-share/doc/mess/sysinfo/lisa2.htm
-share/doc/mess/sysinfo/lviv.htm
-share/doc/mess/sysinfo/lynx.htm
-share/doc/mess/sysinfo/mac128k.htm
-share/doc/mess/sysinfo/mac512ke.htm
-share/doc/mess/sysinfo/macclasc.htm
-share/doc/mess/sysinfo/macplus.htm
-share/doc/mess/sysinfo/macse.htm
-share/doc/mess/sysinfo/max.htm
-share/doc/mess/sysinfo/mbee.htm
-share/doc/mess/sysinfo/mc10.htm
-share/doc/mess/sysinfo/megaduck.htm
-share/doc/mess/sysinfo/megast.htm
-share/doc/mess/sysinfo/megaste.htm
-share/doc/mess/sysinfo/microtan.htm
-share/doc/mess/sysinfo/mikro80.htm
-share/doc/mess/sysinfo/mk1.htm
-share/doc/mess/sysinfo/mk2.htm
-share/doc/mess/sysinfo/mm4.htm
-share/doc/mess/sysinfo/mm5.htm
-share/doc/mess/sysinfo/mo5.htm
-share/doc/mess/sysinfo/mo5e.htm
-share/doc/mess/sysinfo/mo5nr.htm
-share/doc/mess/sysinfo/mo6.htm
-share/doc/mess/sysinfo/mpf1.htm
-share/doc/mess/sysinfo/msx.htm
-share/doc/mess/sysinfo/msx2.htm
-share/doc/mess/sysinfo/msx2p.htm
-share/doc/mess/sysinfo/mtx512.htm
-share/doc/mess/sysinfo/mz700.htm
-share/doc/mess/sysinfo/mz800.htm
-share/doc/mess/sysinfo/n64.htm
-share/doc/mess/sysinfo/nascom1.htm
-share/doc/mess/sysinfo/nascom2.htm
-share/doc/mess/sysinfo/nc100.htm
-share/doc/mess/sysinfo/nc200.htm
-share/doc/mess/sysinfo/neat.htm
-share/doc/mess/sysinfo/nes.htm
-share/doc/mess/sysinfo/odyssey2.htm
-share/doc/mess/sysinfo/orao.htm
-share/doc/mess/sysinfo/oric1.htm
-share/doc/mess/sysinfo/orica.htm
-share/doc/mess/sysinfo/orion128.htm
-share/doc/mess/sysinfo/orionpro.htm
-share/doc/mess/sysinfo/osborne1.htm
-share/doc/mess/sysinfo/p2000t.htm
-share/doc/mess/sysinfo/pasogo.htm
-share/doc/mess/sysinfo/pc1251.htm
-share/doc/mess/sysinfo/pc1350.htm
-share/doc/mess/sysinfo/pc1401.htm
-share/doc/mess/sysinfo/pc1403.htm
-share/doc/mess/sysinfo/pc1512.htm
-share/doc/mess/sysinfo/pc1640.htm
-share/doc/mess/sysinfo/pc200.htm
-share/doc/mess/sysinfo/pc88srl.htm
-share/doc/mess/sysinfo/pce.htm
-share/doc/mess/sysinfo/pcw16.htm
-share/doc/mess/sysinfo/pcw8256.htm
-share/doc/mess/sysinfo/pdp1.htm
-share/doc/mess/sysinfo/pet.htm
-share/doc/mess/sysinfo/pmd851.htm
-share/doc/mess/sysinfo/pokemini.htm
-share/doc/mess/sysinfo/ppc512.htm
-share/doc/mess/sysinfo/prav8d.htm
-share/doc/mess/sysinfo/primoa32.htm
-share/doc/mess/sysinfo/pro128.htm
-share/doc/mess/sysinfo/psj.htm
-share/doc/mess/sysinfo/ql.htm
-share/doc/mess/sysinfo/raaspec.htm
-share/doc/mess/sysinfo/rebel5.htm
-share/doc/mess/sysinfo/roma.htm
-share/doc/mess/sysinfo/saturn.htm
-share/doc/mess/sysinfo/sb2m600b.htm
-share/doc/mess/sysinfo/sc3000.htm
-share/doc/mess/sysinfo/sf7000.htm
-share/doc/mess/sysinfo/sfzch.htm
-share/doc/mess/sysinfo/sg1000.htm
-share/doc/mess/sysinfo/sg1000m2.htm
-share/doc/mess/sysinfo/sgx.htm
-share/doc/mess/sysinfo/sms.htm
-share/doc/mess/sysinfo/snes.htm
-share/doc/mess/sysinfo/sordm5.htm
-share/doc/mess/sysinfo/spec128.htm
-share/doc/mess/sysinfo/special.htm
-share/doc/mess/sysinfo/specpls4.htm
-share/doc/mess/sysinfo/spectrum.htm
-share/doc/mess/sysinfo/srdm5fd5.htm
-share/doc/mess/sysinfo/ssystem3.htm
-share/doc/mess/sysinfo/stbook.htm
-share/doc/mess/sysinfo/studio2.htm
-share/doc/mess/sysinfo/super80.htm
-share/doc/mess/sysinfo/supergb.htm
-share/doc/mess/sysinfo/svi318.htm
-share/doc/mess/sysinfo/svi328.htm
-share/doc/mess/sysinfo/svision.htm
-share/doc/mess/sysinfo/sx64.htm
-share/doc/mess/sysinfo/sym1.htm
-share/doc/mess/sysinfo/t1000hx.htm
-share/doc/mess/sysinfo/t1000sx.htm
-share/doc/mess/sysinfo/t9000.htm
-share/doc/mess/sysinfo/telstrat.htm
-share/doc/mess/sysinfo/ti81.htm
-share/doc/mess/sysinfo/ti82.htm
-share/doc/mess/sysinfo/ti83.htm
-share/doc/mess/sysinfo/ti83p.htm
-share/doc/mess/sysinfo/ti85.htm
-share/doc/mess/sysinfo/ti86.htm
-share/doc/mess/sysinfo/ti990_10.htm
-share/doc/mess/sysinfo/ti990_4.htm
-share/doc/mess/sysinfo/ti99_224.htm
-share/doc/mess/sysinfo/ti99_4.htm
-share/doc/mess/sysinfo/ti99_4a.htm
-share/doc/mess/sysinfo/ti99_4ev.htm
-share/doc/mess/sysinfo/ti99_8.htm
-share/doc/mess/sysinfo/tmc600s2.htm
-share/doc/mess/sysinfo/to7.htm
-share/doc/mess/sysinfo/to770.htm
-share/doc/mess/sysinfo/to770a.htm
-share/doc/mess/sysinfo/to8.htm
-share/doc/mess/sysinfo/to8d.htm
-share/doc/mess/sysinfo/to9.htm
-share/doc/mess/sysinfo/to9p.htm
-share/doc/mess/sysinfo/trs80.htm
-share/doc/mess/sysinfo/trs80m3.htm
-share/doc/mess/sysinfo/trs80m4.htm
-share/doc/mess/sysinfo/tutor.htm
-share/doc/mess/sysinfo/tx0_64kw.htm
-share/doc/mess/sysinfo/tx0_8kw.htm
-share/doc/mess/sysinfo/uk101.htm
-share/doc/mess/sysinfo/ut88mini.htm
-share/doc/mess/sysinfo/vc4000.htm
-share/doc/mess/sysinfo/vcg.htm
-share/doc/mess/sysinfo/vectrex.htm
-share/doc/mess/sysinfo/vic20.htm
-share/doc/mess/sysinfo/vip.htm
-share/doc/mess/sysinfo/wscolor.htm
-share/doc/mess/sysinfo/wswan.htm
-share/doc/mess/sysinfo/x68000.htm
-share/doc/mess/sysinfo/z88.htm
-share/doc/mess/sysinfo/zx80.htm
-share/doc/mess/sysinfo/zx81.htm
-share/mess/artwork/4004clk.zip
-share/mess/artwork/aim65.zip
-share/mess/artwork/amsterd.zip
-share/mess/artwork/avigo.zip
-share/mess/artwork/dallas.zip
-share/mess/artwork/dallas16.zip
-share/mess/artwork/dallas32.zip
-share/mess/artwork/dir.txt
-share/mess/artwork/floppyr.png
-share/mess/artwork/floppyw.png
-share/mess/artwork/glasgow.zip
-share/mess/artwork/hp48g.zip
-share/mess/artwork/hp48gp.zip
-share/mess/artwork/hp48gx.zip
-share/mess/artwork/hp48s.zip
-share/mess/artwork/hp48sx.zip
-share/mess/artwork/junior.zip
-share/mess/artwork/kim1.zip
-share/mess/artwork/ledoff.png
-share/mess/artwork/ledon.png
-share/mess/artwork/mk1.zip
-share/mess/artwork/mk2.zip
-share/mess/artwork/mm4.zip
-share/mess/artwork/mm5.zip
-share/mess/artwork/mm50.zip
-share/mess/artwork/mpf1.zip
-share/mess/artwork/mpf1b.zip
-share/mess/artwork/nes.zip
-share/mess/artwork/pc1401.zip
-share/mess/artwork/pc1402.zip
-share/mess/artwork/pc1403.zip
-share/mess/artwork/rebel5.zip
-share/mess/artwork/roma32.zip
-share/mess/artwork/ssystem3.zip
-share/mess/artwork/thomson.lay
-share/mess/artwork/thomson.zip
-share/mess/hash/a2600.hsi
-share/mess/hash/a5200.hsi
-share/mess/hash/a7800.hsi
-share/mess/hash/a800.hsi
-share/mess/hash/a800xl.hsi
-share/mess/hash/advision.hsi
-share/mess/hash/aim65.hsi
-share/mess/hash/apexc.hsi
-share/mess/hash/apfm1000.hsi
-share/mess/hash/apple1.hsi
-share/mess/hash/apple2.hsi
-share/mess/hash/aquarius.hsi
-share/mess/hash/arcadia.hsi
-share/mess/hash/astrocde.hsi
-share/mess/hash/bbca.hsi
-share/mess/hash/c128.hsi
-share/mess/hash/c16.hsi
-share/mess/hash/c64.hsi
-share/mess/hash/cbm30.hsi
-share/mess/hash/cbm40.hsi
-share/mess/hash/cbm610.hsi
-share/mess/hash/cbm80.hsi
-share/mess/hash/cgenie.hsi
-share/mess/hash/channelf.hsi
-share/mess/hash/coco.hsi
-share/mess/hash/coleco.hsi
-share/mess/hash/coupe.hsi
-share/mess/hash/cpc464.hsi
-share/mess/hash/cpc6128.hsi
-share/mess/hash/dragon64.hsi
-share/mess/hash/ep128.hsi
-share/mess/hash/exidy.hsi
-share/mess/hash/gameboy.hsi
-share/mess/hash/gamecom.hsi
-share/mess/hash/gamegear.hsi
-share/mess/hash/genesis.hsi
-share/mess/hash/ibmpc.hsi
-share/mess/hash/ibmpcjr.hsi
-share/mess/hash/intv.hsi
-share/mess/hash/jaguar.hsi
-share/mess/hash/jupiter.hsi
-share/mess/hash/laser210.hsi
-share/mess/hash/lisa2.hsi
-share/mess/hash/lviv.hsi
-share/mess/hash/lynx.hsi
-share/mess/hash/max.hsi
-share/mess/hash/mc10.hsi
-share/mess/hash/megaduck.hsi
-share/mess/hash/microtan.hsi
-share/mess/hash/msx.hsi
-share/mess/hash/msx2.hsi
-share/mess/hash/mtx512.hsi
-share/mess/hash/n64.hsi
-share/mess/hash/nascom1.hsi
-share/mess/hash/nes.hsi
-share/mess/hash/odyssey2.hsi
-share/mess/hash/oric.hsi
-share/mess/hash/p2000t.hsi
-share/mess/hash/pce.hsi
-share/mess/hash/pdp1.hsi
-share/mess/hash/pet.hsi
-share/mess/hash/pico.hsi
-share/mess/hash/pokemini.hsi
-share/mess/hash/psx.hsi
-share/mess/hash/samcoupe.hsi
-share/mess/hash/sms.hsi
-share/mess/hash/snes.hsi
-share/mess/hash/sordm5.hsi
-share/mess/hash/spectrum.hsi
-share/mess/hash/studio2.hsi
-share/mess/hash/svi318.hsi
-share/mess/hash/svision.hsi
-share/mess/hash/ti99_4a.hsi
-share/mess/hash/ts2068.hsi
-share/mess/hash/vc4000.hsi
-share/mess/hash/vectrex.hsi
-share/mess/hash/vic20.hsi
-share/mess/hash/wswan.hsi
diff --git a/emulators/sdlmess/distinfo b/emulators/sdlmess/distinfo
deleted file mode 100644
index e193d06112c..00000000000
--- a/emulators/sdlmess/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.11 2010/11/18 10:08:31 wiz Exp $
-
-SHA1 (sdlmess0136.zip) = 54ec2faf96564a86dbe38c4e0666f977d85c4e22
-RMD160 (sdlmess0136.zip) = 9463ad4dd5ed7a898af331709c8aa4d78915d43e
-Size (sdlmess0136.zip) = 36705871 bytes
-SHA1 (patch-aa) = 05b17c0478921c0cf31e1581b96fdd5506f0ed98
-SHA1 (patch-ab) = 3cc161845baae6ebcdab42fbd19f74e2ee3d4cb1
-SHA1 (patch-ac) = 32503c6dcdeb9a0d082375a11f0e23bac53410db
-SHA1 (patch-ad) = 8d6312b593343eb2e5b29f177376c8fa243d8293
-SHA1 (patch-ae) = d110f0338d224823d959c8a2b57026321a3f0a38
-SHA1 (patch-af) = 4e7b4eab76e43feec91e91238d855c70ac43e15b
-SHA1 (patch-ag) = 0f9f2dff7c5e6b74f447e020176224fe8793fb67
-SHA1 (patch-ah) = f2dbfc44e30857fd9b52ed5d107b5190d5e5f6da
diff --git a/emulators/sdlmess/patches/patch-aa b/emulators/sdlmess/patches/patch-aa
deleted file mode 100644
index c8aa1265af5..00000000000
--- a/emulators/sdlmess/patches/patch-aa
+++ /dev/null
@@ -1,126 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2009/12/15 14:17:30 wiz Exp $
-
---- makefile.orig	2009-09-17 00:49:53.000000000 +0000
-+++ makefile
-@@ -125,10 +125,10 @@ endif
- # BIGENDIAN = 1
- 
- # uncomment next line to build expat as part of MAME build
--BUILD_EXPAT = 1
-+# BUILD_EXPAT = 1
- 
- # uncomment next line to build zlib as part of MAME build
--BUILD_ZLIB = 1
-+# BUILD_ZLIB = 1
- 
- # uncomment next line to include the symbols
- # SYMBOLS = 1
-@@ -196,9 +196,9 @@ BUILD_EXE = $(EXE)
- endif
- 
- # compiler, linker and utilities
--AR = @ar
--CC = @gcc
--LD = @gcc
-+#AR = @ar
-+#CC = @gcc
-+#LD = @gcc
- MD = -mkdir$(EXE)
- RM = @rm -f
- 
-@@ -227,7 +227,7 @@ NAME = $(TARGET)$(SUBTARGET)
- endif
- 
- # fullname is prefix+name+suffix+debugsuffix
--FULLNAME = $(PREFIX)$(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX)
-+FULLNAME = $(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX)
- 
- # add an EXE suffix to get the final emulator name
- EMULATOR = $(FULLNAME)$(EXE)
-@@ -309,11 +309,11 @@ endif
- 
- # we compile C-only to C89 standard with GNU extensions
- # we compile C++ code to C++98 standard with GNU extensions
--CONLYFLAGS += -std=gnu89
--CPPONLYFLAGS += -x c++ -std=gnu++98
-+#CONLYFLAGS += -std=gnu89
-+#CPPONLYFLAGS += -x c++ -std=gnu++98
- 
- # this speeds it up a bit by piping between the preprocessor/compiler/assembler
--CCOMFLAGS += -pipe
-+#CCOMFLAGS += -pipe
- 
- # add -g if we need symbols, and ensure we have frame pointers
- ifdef SYMBOLS
-@@ -331,18 +331,18 @@ CCOMFLAGS += -pg
- endif
- 
- # add the optimization flag
--CCOMFLAGS += -O$(OPTIMIZE)
-+#CCOMFLAGS += -O$(OPTIMIZE)
- 
- # if we are optimizing, include optimization options
- # and make all errors into warnings
- ifneq ($(OPTIMIZE),0)
- ifneq ($(TARGETOS),os2)
- ifndef IA64
--CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
-+#CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
- else
- endif
- else
--CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
-+#CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
- endif
- endif
- 
-@@ -372,7 +372,7 @@ endif
- #-------------------------------------------------
- 
- # add core include paths
--CCOMFLAGS += \
-+CCOMFLAGS := \
- 	-I$(SRC)/$(TARGET) \
- 	-I$(SRC)/$(TARGET)/includes \
- 	-I$(OBJ)/$(TARGET)/layout \
-@@ -382,7 +382,7 @@ CCOMFLAGS += \
- 	-I$(SRC)/lib/util \
- 	-I$(SRC)/osd \
- 	-I$(SRC)/osd/$(OSD) \
--
-+	$(CFLAGS)
- 
- 
- #-------------------------------------------------
-@@ -391,11 +391,11 @@ CCOMFLAGS += \
- 
- # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
- # flags only used when linking the core emulator
--LDFLAGS =
-+#LDFLAGS =
- ifneq ($(TARGETOS),macosx)
- ifneq ($(TARGETOS),os2)
- ifneq ($(TARGETOS),solaris)
--LDFLAGS = -Wl,--warn-common
-+#LDFLAGS = -Wl,--warn-common
- endif
- endif
- endif
-@@ -410,7 +410,7 @@ endif
- ifndef SYMBOLS
- ifndef PROFILE
- ifneq ($(TARGETOS),macosx)
--LDFLAGS += -s
-+#LDFLAGS += -s
- endif
- endif
- endif
-@@ -561,7 +561,7 @@ $(VERSIONOBJ): $(DRVLIBS) $(LIBOSD) $(LI
- 
- $(EMULATOR): $(VERSIONOBJ) $(DRVLIBS) $(LIBOSD) $(LIBEMU) $(LIBCPU) $(LIBDASM) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(RESFILE)
- 	@echo Linking $@...
--	$(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@
-+	$(CC) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@
- 
- endif
- 
diff --git a/emulators/sdlmess/patches/patch-ab b/emulators/sdlmess/patches/patch-ab
deleted file mode 100644
index 850b568d867..00000000000
--- a/emulators/sdlmess/patches/patch-ab
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2009/12/15 14:17:30 wiz Exp $
-
---- src/osd/sdl/sdlsync_tc.c.orig	2009-10-25 05:54:58.000000000 +0000
-+++ src/osd/sdl/sdlsync_tc.c
-@@ -341,15 +341,28 @@ int osd_thread_adjust_priority(osd_threa
- 
- int osd_thread_cpu_affinity(osd_thread *thread, UINT32 mask)
- {
--#if !defined(NO_AFFINITY_NP)
-+#if !defined(NO_AFFINITY_NP) && !defined(__DragonFly__)
-+#if defined(__NetBSD__)
-+	cpuset_t *cmask;
-+#else
- 	cpu_set_t	cmask;
-+#endif
- 	pthread_t	lthread;
- 	int			bitnum;
-+	int			ret;
- 
-+#if defined(__NetBSD__)
-+	cmask = cpuset_create(); /* initializes set as well */
-+#else
- 	CPU_ZERO(&cmask);
-+#endif
- 	for (bitnum=0; bitnum<32; bitnum++)
- 		if (mask & (1<<bitnum))
-+#if defined(__NetBSD__)
-+			cpuset_set(bitnum, cmask);
-+#else
- 			CPU_SET(bitnum, &cmask);
-+#endif
- 	
- 	if (thread == NULL)
- 		lthread = pthread_self();
-@@ -360,10 +373,15 @@ int osd_thread_cpu_affinity(osd_thread *
- 	{
- 		/* Not available during link in all targets */
- 		fprintf(stderr, "error %d setting cpu affinity to mask %08x", errno, mask);
--		return FALSE;
-+		ret = FALSE;
- 	}
- 	else
--		return TRUE;
-+		ret = TRUE;
-+
-+#if defined(__NetBSD__)
-+	cpuset_destroy(cmask);
-+#endif
-+	return ret;
- #else
- 	return TRUE;
- #endif
diff --git a/emulators/sdlmess/patches/patch-ac b/emulators/sdlmess/patches/patch-ac
deleted file mode 100644
index 11fdb6cbf04..00000000000
--- a/emulators/sdlmess/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/09/01 15:45:44 wiz Exp $
-
---- src/emu/mamecore.h.orig	2009-07-20 12:03:21.000000000 +0000
-+++ src/emu/mamecore.h
-@@ -333,6 +333,10 @@ DECL_NORETURN void CLIB_DECL fatalerror_
-     INLINE FUNCTIONS
- ***************************************************************************/
- 
-+#if defined(__NetBSD__)
-+#include <sys/param.h>
-+#endif
-+#if !defined(__NetBSD__) || (__NetBSD_Version__ < 599001500)
- /* population count */
- INLINE int popcount(UINT32 val)
- {
-@@ -342,6 +346,7 @@ INLINE int popcount(UINT32 val)
- 		val &= val - 1;
- 	return count;
- }
-+#endif
- 
- 
- /* convert a series of 32 bits into a float */
diff --git a/emulators/sdlmess/patches/patch-ad b/emulators/sdlmess/patches/patch-ad
deleted file mode 100644
index 369d1a5516f..00000000000
--- a/emulators/sdlmess/patches/patch-ad
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2009/12/15 14:17:30 wiz Exp $
-
---- src/mame/machine/n64.c.orig	2009-11-01 00:44:54.000000000 +0000
-+++ src/mame/machine/n64.c
-@@ -1474,7 +1474,7 @@ static UINT32 si_dram_addr = 0;
- static UINT32 si_pif_addr = 0;
- static UINT32 si_pif_addr_rd64b = 0;
- static UINT32 si_pif_addr_wr64b = 0;
--static UINT32 si_status = 0;
-+static UINT32 mame_si_status = 0;
- 
- static UINT8 eeprom[512];
- static UINT8 mempack[0x8000];
-@@ -1884,7 +1884,7 @@ static void pif_dma(running_machine *mac
- 		}
- 	}
- 
--	si_status |= 0x1000;
-+	mame_si_status |= 0x1000;
- 	signal_rcp_interrupt(machine, SI_INTERRUPT);
- }
- 
-@@ -1896,7 +1896,7 @@ READ32_HANDLER( n64_si_reg_r )
- 			//return si_dram_addr;
- 
- 		case 0x18/4:		// SI_STATUS_REG
--			return si_status;
-+			return mame_si_status;
- 	}
- 	return 0;
- }
-@@ -1925,7 +1925,7 @@ WRITE32_HANDLER( n64_si_reg_w )
- 			break;
- 
- 		case 0x18/4:		// SI_STATUS_REG
--			si_status &= ~0x1000;
-+			mame_si_status &= ~0x1000;
- 			clear_rcp_interrupt(space->machine, SI_INTERRUPT);
- 			break;
- 
-@@ -2036,7 +2036,7 @@ MACHINE_RESET( n64 )
- 	memset(pif_cmd, 0, sizeof(pif_cmd));
- 	si_dram_addr = 0;
- 	si_pif_addr = 0;
--	si_status = 0;
-+	mame_si_status = 0;
- 
- 	memset(eeprom, 0, sizeof(eeprom));
- 	memset(mempack, 0, sizeof(mempack));
diff --git a/emulators/sdlmess/patches/patch-ae b/emulators/sdlmess/patches/patch-ae
deleted file mode 100644
index 1afc7a5a6ee..00000000000
--- a/emulators/sdlmess/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2009/08/15 17:24:00 wiz Exp $
-
---- src/osd/sdl/sdldir.c.orig	2009-05-07 17:09:00.000000000 +0000
-+++ src/osd/sdl/sdldir.c
-@@ -28,6 +28,11 @@
- #define __USE_BSD	// to get DT_xxx on Linux
- #endif
- #undef _POSIX_C_SOURCE  // to get DT_xxx on OS X
-+#if defined(__NetBSD__)
-+#ifndef _NETBSD_SOURCE
-+#define _NETBSD_SOURCE  // to get DT_xxx on NetBSD
-+#endif
-+#endif
- #include <dirent.h>
- 
- #include "osdcore.h"
diff --git a/emulators/sdlmess/patches/patch-af b/emulators/sdlmess/patches/patch-af
deleted file mode 100644
index 5ababa519a6..00000000000
--- a/emulators/sdlmess/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2010/06/05 12:20:07 wiz Exp $
-
---- src/osd/sdl/dview.c.orig	2009-12-19 16:18:15.000000000 +0000
-+++ src/osd/sdl/dview.c
-@@ -213,7 +213,7 @@ static void dview_size_allocate(GtkWidge
- 	debug_view_set_visible_position(dv->dw, pos); 
- 	debug_view_set_visible_size(dv->dw, vsize);
- 
--	if(GTK_WIDGET_REALIZED(wdv))
-+	if(gtk_widget_get_realized(wdv))
- 		gdk_window_move_resize(wdv->window,
- 							   allocation->x, allocation->y,
- 							   allocation->width, allocation->height);
diff --git a/emulators/sdlmess/patches/patch-ag b/emulators/sdlmess/patches/patch-ag
deleted file mode 100644
index f5b66edde1f..00000000000
--- a/emulators/sdlmess/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2010/11/18 10:08:32 wiz Exp $
-
---- src/osd/sdl/sdl.mak.orig	2010-11-18 09:39:45.000000000 +0000
-+++ src/osd/sdl/sdl.mak
-@@ -300,7 +300,6 @@ ifndef NO_X11
- OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
- CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0` 
- LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
--CFLAGS += -DGTK_DISABLE_DEPRECATED
- else
- OSDCOREOBJS += $(SDLOBJ)/debugwin.o
- endif # NO_X11
diff --git a/emulators/sdlmess/patches/patch-ah b/emulators/sdlmess/patches/patch-ah
deleted file mode 100644
index 910e3c9ba04..00000000000
--- a/emulators/sdlmess/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2009/08/15 17:24:00 wiz Exp $
-
---- src/osd/sdl/sdlprefix.h.orig	2009-03-19 09:09:46.000000000 +0000
-+++ src/osd/sdl/sdlprefix.h
-@@ -30,7 +30,7 @@
- #elif defined(__linux__)
- #define SDLMAME_LINUX 1
- 
--#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined (__NetBSD__)
- #define SDLMAME_BSD 1
- #endif
-