5 files changed, 68 insertions, 68 deletions
diff --git a/emulators/mame/patches/patch-makefile b/emulators/mame/patches/patch-makefile
index e7f2b4b351a..0b2c7195fcc 100644
--- a/emulators/mame/patches/patch-makefile
+++ b/emulators/mame/patches/patch-makefile
@@ -1,25 +1,25 @@
-$NetBSD: patch-makefile,v 1.3 2011/02/11 13:16:40 abs Exp $
+$NetBSD: patch-makefile,v 1.4 2011/02/26 07:06:24 wiz Exp $
 
 First chunk accepted upstream, second pkgsrc-only.
 
 --- makefile.orig	2010-12-29 22:50:26.000000000 +0000
 +++ makefile
-@@ -86,6 +86,9 @@ endif
- ifeq ($(firstword $(filter GNU/kFreeBSD,$(UNAME))),GNU/kFreeBSD)
- TARGETOS = freebsd
- endif
-+ifeq ($(firstword $(filter NetBSD,$(UNAME))),NetBSD)
-+TARGETOS = netbsd
-+endif
- ifeq ($(firstword $(filter OpenBSD,$(UNAME))),OpenBSD)
- TARGETOS = openbsd
- endif
-@@ -344,7 +347,7 @@ NAME = $(TARGET)$(SUBTARGET)
- endif
- 
- # fullname is prefix+name+suffix+suffix64+suffixdebug
--FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
-+FULLNAME = $(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
- 
- # add an EXE suffix to get the final emulator name
- EMULATOR = $(FULLNAME)$(EXE)
+@@ -86,6 +88,9 @@ endif
+ ifeq ($(firstword $(filter GNU/kFreeBSD,$(UNAME))),GNU/kFreeBSD)
+ TARGETOS = freebsd
+ endif
++ifeq ($(firstword $(filter NetBSD,$(UNAME))),NetBSD)
++TARGETOS = netbsd
++endif
+ ifeq ($(firstword $(filter OpenBSD,$(UNAME))),OpenBSD)
+ TARGETOS = openbsd
+ endif
+@@ -344,7 +349,7 @@ NAME = $(TARGET)$(SUBTARGET)
+ endif
+ 
+ # fullname is prefix+name+suffix+suffix64+suffixdebug
+-FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
++FULLNAME = $(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
+ 
+ # add an EXE suffix to get the final emulator name
+ EMULATOR = $(FULLNAME)$(EXE)
diff --git a/emulators/mame/patches/patch-src_emu_debug_debugcpu.c b/emulators/mame/patches/patch-src_emu_debug_debugcpu.c
index 9a8e455932a..283d96378bd 100644
--- a/emulators/mame/patches/patch-src_emu_debug_debugcpu.c
+++ b/emulators/mame/patches/patch-src_emu_debug_debugcpu.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_emu_debug_debugcpu.c,v 1.3 2011/02/11 13:16:40 abs Exp $
+$NetBSD: patch-src_emu_debug_debugcpu.c,v 1.4 2011/02/26 07:06:24 wiz Exp $
 
 Sent upstream and accepted.
 
 --- src/emu/debug/debugcpu.c.orig	2010-12-31 16:41:26.000000000 +0000
 +++ src/emu/debug/debugcpu.c
 @@ -51,7 +51,7 @@
- #include "xmlfile.h"
- #include <ctype.h>
- #include <zlib.h>
--#ifdef SDLMAME_FREEBSD
-+#if defined(SDLMAME_FREEBSD) || defined(SDLMAME_NETBSD)
- # undef tolower
- #endif
- 
+ #include "xmlfile.h"
+ #include <ctype.h>
+ #include <zlib.h>
+-#ifdef SDLMAME_FREEBSD
++#if defined(SDLMAME_FREEBSD) || defined(SDLMAME_NETBSD)
+ # undef tolower
+ #endif
+ 
diff --git a/emulators/mame/patches/patch-src_emu_emucore.h b/emulators/mame/patches/patch-src_emu_emucore.h
index 90d0960e2f1..6a303492811 100644
--- a/emulators/mame/patches/patch-src_emu_emucore.h
+++ b/emulators/mame/patches/patch-src_emu_emucore.h
@@ -1,22 +1,22 @@
-$NetBSD: patch-src_emu_emucore.h,v 1.3 2011/02/11 13:16:40 abs Exp $
+$NetBSD: patch-src_emu_emucore.h,v 1.4 2011/02/26 07:06:24 wiz Exp $
 
 Sent upstream and accepted.
 
 --- src/emu/emucore.h.orig	2010-12-31 14:59:46.000000000 +0000
 +++ src/emu/emucore.h
 @@ -686,6 +686,7 @@ inline void fatalerror_exitcode(running_
- //**************************************************************************
- 
- // population count
-+#ifndef SDLMAME_NETBSD
- inline int popcount(UINT32 val)
- {
- 	int count;
-@@ -694,6 +695,7 @@ inline int popcount(UINT32 val)
- 		val &= val - 1;
- 	return count;
- }
-+#endif
- 
- 
- // convert a series of 32 bits into a float
+ //**************************************************************************
+ 
+ // population count
++#ifndef SDLMAME_NETBSD
+ inline int popcount(UINT32 val)
+ {
+ 	int count;
+@@ -694,6 +695,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/mame/patches/patch-src_lib_util_astring.h b/emulators/mame/patches/patch-src_lib_util_astring.h
index b596f3ed3b2..3d023e23dfd 100644
--- a/emulators/mame/patches/patch-src_lib_util_astring.h
+++ b/emulators/mame/patches/patch-src_lib_util_astring.h
@@ -1,17 +1,17 @@
-$NetBSD: patch-src_lib_util_astring.h,v 1.3 2011/02/11 13:16:40 abs Exp $
+$NetBSD: patch-src_lib_util_astring.h,v 1.4 2011/02/26 07:06:24 wiz Exp $
 
 Sent upstream and accepted.
 
 --- src/lib/util/astring.h.orig	2010-10-31 23:48:04.000000000 +0000
 +++ src/lib/util/astring.h
 @@ -296,6 +296,10 @@ INLINE astring *astring_assemble_5(astri
- ***************************************************************************/
- 
- #ifdef __cplusplus
-+#ifdef SDLMAME_NETBSD
-+#undef toupper
-+#undef tolower
-+#endif
- 
- /* derived class for C++ */
- class astring : public astring_base
+ ***************************************************************************/
+ 
+ #ifdef __cplusplus
++#ifdef SDLMAME_NETBSD
++#undef toupper
++#undef tolower
++#endif
+ 
+ /* derived class for C++ */
+ class astring : public astring_base
diff --git a/emulators/mame/patches/patch-src_osd_sdl_sdlsync__ntc.c b/emulators/mame/patches/patch-src_osd_sdl_sdlsync__ntc.c
index 3e7cdb71a82..e9cfac8659c 100644
--- a/emulators/mame/patches/patch-src_osd_sdl_sdlsync__ntc.c
+++ b/emulators/mame/patches/patch-src_osd_sdl_sdlsync__ntc.c
@@ -1,18 +1,18 @@
-$NetBSD: patch-src_osd_sdl_sdlsync__ntc.c,v 1.3 2011/02/11 13:16:40 abs Exp $
+$NetBSD: patch-src_osd_sdl_sdlsync__ntc.c,v 1.4 2011/02/26 07:06:24 wiz Exp $
 
 Sent upstream and accepted.
 
 --- src/osd/sdl/sdlsync_ntc.c.orig	2010-01-15 20:12:06.000000000 +0000
 +++ src/osd/sdl/sdlsync_ntc.c
 @@ -19,6 +19,11 @@
- #include <mach/mach.h>
- #endif
- 
-+#ifdef SDLMAME_NETBSD
-+/* for SIGKILL */
-+#include <signal.h>
-+#endif
-+
- // standard C headers
- #include <math.h>
- #include <unistd.h>
+ #include <mach/mach.h>
+ #endif
+ 
++#ifdef SDLMAME_NETBSD
++/* for SIGKILL */
++#include <signal.h>
++#endif
++
+ // standard C headers
+ #include <math.h>
+ #include <unistd.h>