Update to xmame-0.37b12.1

5 files changed, 32 insertions, 59 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 2a196f5907c..169c04096ce 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.42 2001/02/25 04:17:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.43 2001/03/24 19:52:33 kristerw Exp $
 #
 
-DISTNAME=		xmame-0.37b6.1
+DISTNAME=		xmame-0.37b12.1
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://x.mame.net/download/
 EXTRACT_SUFX=		.tgz
 
-MAINTAINER=		soren@netbsd.org
+MAINTAINER=		kristerw@netbsd.org
 HOMEPAGE=		http://x.mame.net/
 COMMENT=		X11 emulator for old arcade and console machines
 
@@ -46,7 +46,7 @@ MAME_CPU=		alpha
 MAME_CPU=		i386
 .else
 # Rather than enumerating all CPU types, check machine/endian.h
-ENDIAN!=		sh files/endian.sh
+ENDIAN!=		${SH} ${FILESDIR}/endian.sh
 .if ${ENDIAN} == "LITTLE_ENDIAN"
 MAME_CPU=		risc_lsb
 .else
diff --git a/emulators/xmame/files/md5 b/emulators/xmame/files/md5
index 53ba130b9fb..169029863e5 100644
--- a/emulators/xmame/files/md5
+++ b/emulators/xmame/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.15 2000/11/05 00:43:31 mycroft Exp $
+$NetBSD: md5,v 1.16 2001/03/24 19:52:34 kristerw Exp $
 
-MD5 (xmame-0.37b6.1.tgz) = fa98264e0e1544f17f0b684de86a998c
+SHA1 (xmame-0.37b12.1.tgz) = b60885bbfe071ee0a97eef2b5a4f2a882ea76a51
diff --git a/emulators/xmame/files/patch-sum b/emulators/xmame/files/patch-sum
index 81adfa15a76..d0652d5d42a 100644
--- a/emulators/xmame/files/patch-sum
+++ b/emulators/xmame/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.7 2000/11/05 00:43:31 mycroft Exp $
+$NetBSD: patch-sum,v 1.8 2001/03/24 19:52:34 kristerw Exp $
 
-MD5 (patch-aa) = b84b325216d9a3299a257b0343bc820e
-MD5 (patch-ae) = 10a72920c0cecd82e2c374683c596db5
-MD5 (patch-am) = 8c8b60e678f71ec9a32d531c2c2103a8
+SHA1 (patch-aa) = 7c0edf9becbebf268ea49377c633c69f5752ad35
+SHA1 (patch-ae) = e4dc55f21759f50b0c48816314ebdc4039d2490f
+SHA1 (patch-am) = 27908ecd35407621eae4c777de3079279f58176e
diff --git a/emulators/xmame/patches/patch-aa b/emulators/xmame/patches/patch-aa
index e74a67f8f6e..e263d8d2930 100644
--- a/emulators/xmame/patches/patch-aa
+++ b/emulators/xmame/patches/patch-aa
@@ -1,24 +1,16 @@
-$NetBSD: patch-aa,v 1.25 2000/11/05 00:43:31 mycroft Exp $
---- makefile.unix.orig	Sun Sep 10 21:57:37 2000
-+++ makefile.unix	Sat Nov  4 23:35:32 2000
-@@ -138,13 +138,13 @@
- # *** Select destination directory for your compiled program , manual page
- # and binary distribution ( if you want to... )
- # ( only needed to install, not to compile... )
--DESTDIR = /usr/games
--MANDIR  = /usr/local/man/man6
-+DESTDIR = ${PREFIX}/bin
-+MANDIR  = ${PREFIX}/man/man6
- 
+$NetBSD: patch-aa,v 1.26 2001/03/24 19:52:34 kristerw Exp $
+--- makefile.unix.orig	Sat Mar 17 03:11:28 2001
++++ makefile.unix	Fri Mar 23 19:25:28 2001
+@@ -168,7 +168,7 @@
  # *** xmameroot, this is the default rompath, place where the highscores are
  # stored, global rc location etc. Since most of these are configurable through
  # the rc-file anyway, there are no longer seperate defines for each.
--XMAMEROOT = /usr/games/lib/x$(TARGET)
-+XMAMEROOT = ${PREFIX}/share/xmame
+-XMAMEROOT = $(PREFIX)/lib/x$(TARGET)
++XMAMEROOT = $(PREFIX)/share/xmame
  
  
  ##############################################################################
-@@ -152,7 +152,7 @@
+@@ -176,7 +176,7 @@
  ##############################################################################
  
  ### i386 + gnu-asm
@@ -27,7 +19,7 @@ $NetBSD: patch-aa,v 1.25 2000/11/05 00:43:31 mycroft Exp $
  ### i386 no asm
  # MY_CPU = i386_noasm
  ### ia64
-@@ -173,11 +173,11 @@
+@@ -197,11 +197,11 @@
  ##############################################################################
  
  ### Linux 
@@ -38,45 +30,44 @@ $NetBSD: patch-aa,v 1.25 2000/11/05 00:43:31 mycroft Exp $
  ### NetBSD
 -# ARCH  = netbsd
 +ARCH  = netbsd
+ ### OpenBSD
+ # ARCH = openbsd
  ### Solaris / SunOS
- # ARCH  = solaris
- ### OpenStep
-@@ -204,11 +204,13 @@
+@@ -234,11 +234,13 @@
  # X Input Extensions based joystick, this is known to not work right now ;|
  # JOY_X11 = 1
- # on iX86 based OS's, if supported, you can use standard joystick driver
+ # On iX86 based OS's, if supported, you can use standard joystick driver.
 -# JOY_I386 = 1
 +ifeq (${NETBSD_JOYSTICK},yes)
 +JOY_I386 = 1
 +endif
- # Linux FM-TOWNS game PAD joystick emulation support, thanks to Osamu Kurati
+ # Linux FM-TOWNS game PAD joystick emulation support, thanks to Osamu Kurati.
  # JOY_PAD = 1
- # NetBSD USB joystick support.
+ # NetBSD/FreeBSD USB joystick support.
 -# JOY_USB = 1
 +JOY_USB = 1
  
  
  ##############################################################################
-@@ -252,7 +254,10 @@
+@@ -284,7 +286,9 @@
  # MIT-Shared Memory X Extensions, comment the
  X11_MITSHM = 1
  # XFree86 DGA
 -# X11_DGA = 1
-+ifeq (${NETBSD_DGA},yes)  
++ifeq (${NETBSD_DGA},yes)
 +X11_DGA = 1
 +endif
-+
  # The XIL library (Solaris 2.5.1 and higher), uncomment
  # X11_XIL = 1
  
-@@ -261,8 +266,8 @@
+@@ -293,8 +297,8 @@
  # X11INC		= -I/usr/include/X11
  # X11LIB		= -L/usr/lib/X11
  # standard location for XFree86
 -X11INC		= -I/usr/X11R6/include
 -X11LIB		= -L/usr/X11R6/lib
-+X11INC			= -I${PREFIX}/include
-+X11LIB			= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib
++X11INC		= -I${PREFIX}/include
++X11LIB		= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib
  # for Sun systems
  # X11INC		= -I/usr/openwin/include
  # X11LIB		= -L/usr/openwin/lib
diff --git a/emulators/xmame/patches/patch-ae b/emulators/xmame/patches/patch-ae
index 88015f49387..0d54e666148 100644
--- a/emulators/xmame/patches/patch-ae
+++ b/emulators/xmame/patches/patch-ae
@@ -1,24 +1,6 @@
-$NetBSD: patch-ae,v 1.12 2000/11/05 00:43:32 mycroft Exp $
---- doc/xmamerc.dist.orig	Sun Sep 10 22:00:37 2000
-+++ doc/xmamerc.dist	Sat Nov  4 23:40:23 2000
-@@ -2,7 +2,7 @@
- 
- ### Digital sound related ###
- # dsp-plugin            <NULL> (not set)
--timer                   0
-+timer                   1
- 
- ### Sound mixer related ###
- # sound-mixer-plugin    <NULL> (not set)
-@@ -61,7 +61,7 @@
- samplefreq              22050
- bufsize                 3.000000
- volume                  -3
--# audiodevice           <NULL> (not set)
-+audiodevice             /dev/audio0
- # mixerdevice           <NULL> (not set)
- 
- ### Input Related ###
+$NetBSD: patch-ae,v 1.13 2001/03/24 19:52:34 kristerw Exp $
+--- doc/xmamerc.dist.orig	Fri Mar  2 06:38:54 2001
++++ doc/xmamerc.dist	Sat Mar 24 18:56:50 2001
 @@ -70,13 +70,13 @@
  mouse                   1