Update to 0.34b2.1.

4 files changed, 43 insertions, 46 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 44cd2f38d40..d57a4c1b4d7 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 1998/08/31 08:12:19 mycroft Exp $
+# $NetBSD: Makefile,v 1.16 1998/09/05 12:27:39 mycroft Exp $
 #
 
-DISTNAME=		xmame-0.34b1.1
+DISTNAME=		xmame-0.34b2.1
 CATEGORIES=		emulators games x11
 MASTER_SITES=		ftp://drake.dit.upm.es/xmame/ftpsite/
 EXTRACT_SUFX=		.tgz
@@ -22,7 +22,7 @@ MAKE_ENV+=		OPSYS=${OPSYS} ARCH=${ARCH} DESTDIR=${DESTDIR} \
 			NETBSD_JOYSTICK="${NETBSD_JOYSTICK}" \
 			DISPLAY_METHOD="${DISPLAY_METHOD}"
 MAKEFILE=		makefile.unix
-DISPLAY_METHOD=		xwindows
+DISPLAY_METHOD=		x11
 ALL_TARGET=		xmame.${DISPLAY_METHOD}
 
 MAMEDIR=		${PREFIX}/share/xmame
diff --git a/emulators/xmame/files/md5 b/emulators/xmame/files/md5
index d97f8c5349a..d48cd1fe2ac 100644
--- a/emulators/xmame/files/md5
+++ b/emulators/xmame/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1998/08/29 19:39:56 frueauf Exp $
+$NetBSD: md5,v 1.6 1998/09/05 12:27:40 mycroft Exp $
 
-MD5 (xmame-0.34b1.1.tgz) = 83fb9b6a57743d59a1ca1fe54950d4c0
+MD5 (xmame-0.34b2.1.tgz) = da431a598c1b908114c5a4d25ecb9f9a
diff --git a/emulators/xmame/patches/patch-aa b/emulators/xmame/patches/patch-aa
index 9f8c6b6862a..0b1dcc43ed7 100644
--- a/emulators/xmame/patches/patch-aa
+++ b/emulators/xmame/patches/patch-aa
@@ -1,6 +1,8 @@
---- makefile.unix.orig	Sun Aug 23 17:44:39 1998
-+++ makefile.unix	Mon Aug 31 04:03:21 1998
-@@ -38,7 +38,7 @@
+$NetBSD: patch-aa,v 1.14 1998/09/05 12:27:40 mycroft Exp $
+
+--- makefile.unix.orig	Fri Sep  4 03:02:07 1998
++++ makefile.unix	Sat Sep  5 08:07:04 1998
+@@ -39,7 +39,7 @@
  # GNU MAKE is MANDATORY !!!
  # so please give me the path...
  # if GNU make is "native" use this
@@ -9,7 +11,7 @@
  # else ...
  # MAKE=/usr/people/jantonio/bin/gmake
  
-@@ -98,18 +98,18 @@
+@@ -99,18 +99,18 @@
  # *** Select destination directory for your compiled program , manual page
  # and binary distribution ( if you want to... )
  # ( only needed to install, not to compile... )
@@ -17,23 +19,23 @@
 -MANDIR  = /usr/local/man/man6
 +DESTDIR = ${PREFIX}/bin
 +MANDIR  = ${PREFIX}/man/man6
- DISTDIR = /home/ftp/pub/emulators/mame
+ DISTDIR = /home/ftp/pub/emulators/$(NAME)
  
  # *** Where the ROM source tree ?
--MDIR = \"/usr/games/lib/mame\"
-+MDIR = \"${PREFIX}/share/xmame\"
+-ROMPATH = \"/usr/games/lib/$(NAME)\"
++ROMPATH = \"${PREFIX}/share/$(NAME)\"
  
  # *** Where to store high scores ?
--SDIR = \"/usr/games/lib/mame\"
-+SDIR = \"${PREFIX}/share/xmame\"
+-SDIR = \"/usr/games/lib/$(NAME)\"
++SDIR = \"${PREFIX}/share/$(NAME)\"
  
  # *** Where resides global configuration file ?
--MRC = \"/usr/games/lib/mame/xmamerc\"
-+MRC = \"${PREFIX}/share/xmame/xmamerc\"
+-MRC = \"/usr/games/lib/$(NAME)/$(NAME)rc\"
++MRC = \"${PREFIX}/share/$(NAME)/$(NAME)rc\"
  
  
  ##############################################################################
-@@ -117,7 +117,9 @@
+@@ -118,7 +118,9 @@
  ##############################################################################
  
  # *** To disable joystick support comment next line
@@ -44,7 +46,7 @@
  
  # *** To disable  mouse support comment next line
  MOUSE		= -DUSE_MOUSE
-@@ -136,7 +138,9 @@
+@@ -137,7 +139,9 @@
  # JSLIB   = -lXi
  
  # On iX86 based OS's, if supported, you can use standard joystick driver
@@ -55,7 +57,7 @@
  
  # Linux FM-TOWNS game PAD joystick emulation support
  # Thanks to Osamu Kurati for provided patch
-@@ -157,8 +161,8 @@
+@@ -158,8 +162,8 @@
  # you might decide to use these feature. Otherwise, you should use a 
  # timer based audio code and ajust in src/unix/sound.h AUDIO_TIMER_FREQ item
  #
@@ -66,22 +68,21 @@
  
  # *** When using timer, you should provide the frequency to generate audio sample
  # frames in your system. See readme.unix notes about these item
-@@ -186,7 +190,7 @@
- # note: xwindows is the only one supported on all platforms
+@@ -202,7 +206,7 @@
+ # note: x11 is the only one supported on all platforms
  
- ### normal X-windows
--DISPLAY_METHOD = xwindows
-+#DISPLAY_METHOD = xwindows
- ### xfree86's DGA extension, only tested under linux
+ ### normal X11
+-DISPLAY_METHOD = x11
++#DISPLAY_METHOD = x11
+ ### XFree86's DGA extension, only tested under linux
  #DISPLAY_METHOD = xf86_dga
  ### svgalib, only supported under linux
-@@ -208,14 +212,16 @@
- # *** If you haven't  the MIT-Shared Memory X Extensions, comment the following:
- # ( Test if available by mean of xdpyinfo command )
- # Comment it if not compiling  for normal xwindows
--# MSHM	= -DUSE_MITSHM
-+ifeq (${DISPLAY_METHOD},xwindows)
-+MSHM	= -DUSE_MITSHM
+@@ -224,14 +228,16 @@
+  
+ # *** If you don't have the MIT-Shared Memory X Extensions, comment the
+ # following: ( Test if available by mean of xdpyinfo command )
++ifeq (${DISPLAY_METHOD},x11)
+ MSHM	= -DUSE_MITSHM
 +endif
  
  # standard location for X11 
@@ -95,7 +96,7 @@
  # for Sun systems 
  # X11INC		= -I/usr/openwin/include
  # X11LIB		= -L/usr/openwin/lib
-@@ -236,11 +242,12 @@
+@@ -252,11 +258,12 @@
  ######## Alpha/Linux
  # ARCH  = linux_alpha
  ######## ix86/Linux
@@ -110,7 +111,7 @@
  ######## Sparc/SunOS ( no sound )
  # ARCH  = sunos
  ######## ix86/Solaris
-@@ -275,7 +282,11 @@
+@@ -291,7 +298,11 @@
  DEFS.linux_alpha   = -Dlinux -DLSB_FIRST -DAXP_ASM -DACORN
  DEFS.linux_i386    = -Dlinux -DLSB_FIRST -DX86_ASM
  DEFS.FREEBSD       = -DLSB_FIRST -DX86_ASM -Dlinux -DFREEBSD_SOUND_WORKAROUND
@@ -123,7 +124,7 @@
  DEFS.sunos	   = -Dsun -DCLOCKS_PER_SEC=1000000 -DACORN
  DEFS.solaris	   = -Dsun -DACORN 
  DEFS.solaris_i386  = -DLSB_FIRST -Dsun -Dsolaris
-@@ -293,12 +304,14 @@
+@@ -309,12 +320,14 @@
  LIBS.solaris_i386  = -lm -lnsl -lsocket
  LIBS.irix          = -lm -laudio
  LIBS.aix           = -lm -lUMSobj
diff --git a/emulators/xmame/patches/patch-ae b/emulators/xmame/patches/patch-ae
index ff9f3532d85..34a09b18066 100644
--- a/emulators/xmame/patches/patch-ae
+++ b/emulators/xmame/patches/patch-ae
@@ -1,17 +1,13 @@
-$NetBSD: patch-ae,v 1.3 1998/08/07 10:40:37 agc Exp $
+$NetBSD: patch-ae,v 1.4 1998/09/05 12:27:40 mycroft Exp $
 
---- doc/xmamerc.dist.orig	Sun Jun  7 07:50:24 1998
-+++ doc/xmamerc.dist	Sat Jul  4 07:17:18 1998
-@@ -23,10 +23,10 @@
+--- doc/xmamerc.dist.orig	Thu Sep  3 10:54:29 1998
++++ doc/xmamerc.dist	Sat Sep  5 08:16:16 1998
+@@ -23,7 +23,7 @@
  
  # Where does your Mame rom files reside? 
  # This option can be overriden by MAMEDIR environment variable
--mamedir		/usr/games/lib/mame
-+mamedir		@MAMEDIR@
+-rompath		/usr/games/lib/mame
++rompath		@MAMEDIR@
  
  # Also Mame needs a public-writable directory to store high scores
--spooldir        /var/games/mame
-+spooldir        @MAMEDIR@
- 
- # What is your loved game? ( remember that mame defaults to "pacman" )
- defaultgame	galturbo
+ spooldir        /var/games/mame