 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2011/02/03 22:22:35 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2011/02/11 12:49:33 abs Exp $
+#
 # used by emulators/mame/Makefile
 # used by emulators/mess/Makefile
 CATEGORIES=		emulators
 EXTRACT_SUFX=		.zip
 MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.mamedev.org/
 LICENSE=		mame-license
 RESTRICTED=		selling is not allowed
 NO_SRC_ON_CDROM=	${RESTRICTED}
 @@ -27,25 +27,27 @@ PATCHDIR=		${.CURDIR}/../../emulators/ma
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake pkg-config
 UNLIMIT_RESOURCES+=	datasize
 MAKE_FILE=		makefile
 # 0.141 has too many conversion warnings
 MAKE_ENV=		NOWERROR=1
 .  include "../../mk/endian.mk"
 .if ${MACHINE_ENDIAN:Mbig}
 MAKE_FLAGS+=	BIGENDIAN=true
 .endif
 # mame source is double-zipped
 # Note all files have CR-LF but are marked as binary, so unzip -a
 # does not help. Hence all patches must have CR-LF
 post-extract:
 	cd ${WRKDIR} && ${.CURDIR}/../../mk/extract/extract mame.zip
 	rm ${WRKDIR}/mame.zip
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/SDL_ttf/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"

 @@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/02/03 22:22:36 wiz Exp $
+$NetBSD: distinfo,v 1.2 2011/02/11 12:49:33 abs Exp $
 SHA1 (mame0141s.zip) = 80225e2694469dac39a75815f227b864a4992f5e
 RMD160 (mame0141s.zip) = c09ef461280dfd7e45ca638caaa66d8752a9794b
 Size (mame0141s.zip) = 17092788 bytes
-SHA1 (patch-makefile) = 59c3f439e3a250564e82ad6addc30b6c85dbc80c
+SHA1 (patch-makefile) = 87a66c19f0fd637bd90dec41b42940a5e516c2fd
-SHA1 (patch-src_emu_debug_debugcpu.c) = 1838cca446d62ebd824a540d30770fe56819cf03
+SHA1 (patch-src_emu_debug_debugcpu.c) = b980e28e4a97086a585577c68d1d331a146276bc
-SHA1 (patch-src_emu_emucore.h) = 096ae265c2b0eb1021bd9b04b0b8b26e73519a9c
+SHA1 (patch-src_emu_emucore.h) = 602eafc4d2439a206c9429495b4885672d49dc88
-SHA1 (patch-src_lib_util_astring.h) = 9cd5fbc7bd477707ba4de328e0429c0d6cbe6924
+SHA1 (patch-src_lib_util_astring.h) = c401491310c675996b5fb6c180e19c9c9289ab31
-SHA1 (patch-src_osd_sdl_sdlsync__ntc.c) = 1a8e940ad9cd59bd6bbc1850f24040a7d074b57a
+SHA1 (patch-src_osd_sdl_sdlsync__ntc.c) = 697e9b178783f2a8f8d8efe749a75e0023ef6a35

 @@ -1,25 +1,23 @@
-$NetBSD: patch-makefile,v 1.1.1.1 2011/02/03 22:22:36 wiz Exp $
+$NetBSD: patch-makefile,v 1.2 2011/02/11 12:49:33 abs Exp $
 First chunk accepted upstream, second pkgsrc-only.
 --- makefile.orig	2010-12-29 22:50:26.000000000 +0000
 +++ makefile
-@@ -86,6 +88,9 @@ endif
+@@ -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 +349,7 @@ NAME = $(TARGET)$(SUBTARGET)
+@@ -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)

 @@ -1,15 +1,13 @@
-$NetBSD: patch-src_emu_debug_debugcpu.c,v 1.1.1.1 2011/02/03 22:22:36 wiz Exp $
+$NetBSD: patch-src_emu_debug_debugcpu.c,v 1.2 2011/02/11 12:49:33 abs 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

 @@ -1,22 +1,20 @@
-$NetBSD: patch-src_emu_emucore.h,v 1.1.1.1 2011/02/03 22:22:36 wiz Exp $
+$NetBSD: patch-src_emu_emucore.h,v 1.2 2011/02/11 12:49:33 abs 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

 @@ -1,17 +1,15 @@
-$NetBSD: patch-src_lib_util_astring.h,v 1.1.1.1 2011/02/03 22:22:36 wiz Exp $
+$NetBSD: patch-src_lib_util_astring.h,v 1.2 2011/02/11 12:49:33 abs 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

 @@ -1,18 +1,16 @@
-$NetBSD: patch-src_osd_sdl_sdlsync__ntc.c,v 1.1.1.1 2011/02/03 22:22:36 wiz Exp $
+$NetBSD: patch-src_osd_sdl_sdlsync__ntc.c,v 1.2 2011/02/11 12:49:33 abs 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>