Update for 0.37b6.1.

5 files changed, 42 insertions, 37 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index db8ae87372f..59518a1ebe9 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2000/08/23 23:14:24 tron Exp $
+# $NetBSD: Makefile,v 1.39 2000/11/05 00:43:30 mycroft Exp $
 #
 
-DISTNAME=		xmame-0.37b4.1
+DISTNAME=		xmame-0.37b6.1
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://x.mame.net/download/
 EXTRACT_SUFX=		.tgz
@@ -56,7 +56,7 @@ post-patch:
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} xmame.${DISPLAY_METHOD} \
 		${PREFIX}/bin/xmame)
-	(cd ${WRKSRC}/doc && ${INSTALL_MAN} xmame.man \
+	(cd ${WRKSRC}/doc && ${INSTALL_MAN} xmame.6 \
 		${PREFIX}/man/man6/xmame.6)
 	${MKDIR} ${ROMPATH}
 	(cd ${WRKSRC}/doc && ${INSTALL_DATA} xmamerc ${ROMPATH}/xmamerc)
diff --git a/emulators/xmame/files/md5 b/emulators/xmame/files/md5
index bf33084fb53..53ba130b9fb 100644
--- a/emulators/xmame/files/md5
+++ b/emulators/xmame/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.14 2000/07/13 20:54:02 martin Exp $
+$NetBSD: md5,v 1.15 2000/11/05 00:43:31 mycroft Exp $
 
-MD5 (xmame-0.37b4.1.tgz) = cab8d60c005a5a6aaf0e92d01350f5c2
+MD5 (xmame-0.37b6.1.tgz) = fa98264e0e1544f17f0b684de86a998c
diff --git a/emulators/xmame/files/patch-sum b/emulators/xmame/files/patch-sum
index 86694671c8e..81adfa15a76 100644
--- a/emulators/xmame/files/patch-sum
+++ b/emulators/xmame/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.6 2000/07/13 20:54:03 martin Exp $
+$NetBSD: patch-sum,v 1.7 2000/11/05 00:43:31 mycroft Exp $
 
-MD5 (patch-aa) = 057e774a7c79ebbf5fcd1dfa038fc58e
-MD5 (patch-ae) = 93297e6b91bbe9e9cacf3522b1235ed8
+MD5 (patch-aa) = b84b325216d9a3299a257b0343bc820e
+MD5 (patch-ae) = 10a72920c0cecd82e2c374683c596db5
 MD5 (patch-am) = 8c8b60e678f71ec9a32d531c2c2103a8
diff --git a/emulators/xmame/patches/patch-aa b/emulators/xmame/patches/patch-aa
index 3f1c8145ca7..e74a67f8f6e 100644
--- a/emulators/xmame/patches/patch-aa
+++ b/emulators/xmame/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.24 2000/07/13 20:54:04 martin Exp $
---- makefile.unix.orig	Fri Jun 23 12:05:25 2000
-+++ makefile.unix	Wed Jul 12 23:55:46 2000
+$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... )
@@ -26,8 +26,8 @@ $NetBSD: patch-aa,v 1.24 2000/07/13 20:54:04 martin Exp $
 +MY_CPU = ${MAME_CPU}
  ### i386 no asm
  # MY_CPU = i386_noasm
- ### alpha
-@@ -171,11 +171,11 @@
+ ### ia64
+@@ -173,11 +173,11 @@
  ##############################################################################
  
  ### Linux 
@@ -41,17 +41,23 @@ $NetBSD: patch-aa,v 1.24 2000/07/13 20:54:04 martin Exp $
  ### Solaris / SunOS
  # ARCH  = solaris
  ### OpenStep
-@@ -207,6 +207,9 @@
- # JOY_I386 = 1
- # Linux FM-TOWNS game PAD joystick emulation support, thanks to Osamu Kurati
- # JOY_PAD = 1
+@@ -204,11 +204,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
+-# JOY_I386 = 1
 +ifeq (${NETBSD_JOYSTICK},yes)
 +JOY_I386 = 1
 +endif
+ # Linux FM-TOWNS game PAD joystick emulation support, thanks to Osamu Kurati
+ # JOY_PAD = 1
+ # NetBSD USB joystick support.
+-# JOY_USB = 1
++JOY_USB = 1
  
  
  ##############################################################################
-@@ -249,7 +252,10 @@
+@@ -252,7 +254,10 @@
  # MIT-Shared Memory X Extensions, comment the
  X11_MITSHM = 1
  # XFree86 DGA
@@ -63,7 +69,7 @@ $NetBSD: patch-aa,v 1.24 2000/07/13 20:54:04 martin Exp $
  # The XIL library (Solaris 2.5.1 and higher), uncomment
  # X11_XIL = 1
  
-@@ -258,8 +264,8 @@
+@@ -261,8 +266,8 @@
  # X11INC		= -I/usr/include/X11
  # X11LIB		= -L/usr/lib/X11
  # standard location for XFree86
diff --git a/emulators/xmame/patches/patch-ae b/emulators/xmame/patches/patch-ae
index 91a3c6f372f..88015f49387 100644
--- a/emulators/xmame/patches/patch-ae
+++ b/emulators/xmame/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.11 2000/07/13 20:54:04 martin Exp $
---- doc/xmamerc.dist.orig	Mon May  8 20:57:08 2000
-+++ doc/xmamerc.dist	Wed Jul 12 23:58:34 2000
-@@ -2,15 +2,15 @@
+$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)
@@ -10,26 +10,16 @@ $NetBSD: patch-ae,v 1.11 2000/07/13 20:54:04 martin Exp $
  
  ### Sound mixer related ###
  # sound-mixer-plugin    <NULL> (not set)
- 
- ### Video Related ###
- bpp                     0
--heightscale             1.000000
--widthscale              1.000000
-+heightscale             2.000000
-+widthscale              2.000000
- autodouble              1
- dirty                   1
- scanlines               0
 @@ -61,7 +61,7 @@
  samplefreq              22050
- bufsize                 2.000000
+ bufsize                 3.000000
  volume                  -3
 -# audiodevice           <NULL> (not set)
 +audiodevice             /dev/audio0
  # mixerdevice           <NULL> (not set)
  
  ### Input Related ###
-@@ -70,8 +70,8 @@
+@@ -70,13 +70,13 @@
  mouse                   1
  
  ### Fileio Related ###
@@ -38,5 +28,14 @@ $NetBSD: patch-ae,v 1.11 2000/07/13 20:54:04 martin Exp $
 +rompath                 @ROMPATH@
 +spooldir                @SPOOLDIR@
  screenshotdir           .
- cheatfile               /usr/games/lib/xmame/cheat.dat
- historyfile             /usr/games/lib/xmame/history.dat
+-cheatfile               /usr/games/lib/xmame/cheat.dat
+-hiscorefile             /usr/games/lib/xmame/hiscore.dat
+-historyfile             /usr/games/lib/xmame/history.dat
+-mameinfofile            /usr/games/lib/xmame/mameinfo.dat
++cheatfile               @SPOOLDIR@/cheat.dat
++hiscorefile             @SPOOLDIR@/hiscore.dat
++historyfile             @SPOOLDIR@/history.dat
++mameinfofile            @SPOOLDIR@/mameinfo.dat
+ 
+ ### Mame Related ###
+ defaultgame             pacman