0.34b8.1

6 files changed, 101 insertions, 87 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 87bb5d61dc9..edd6a9dff99 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.25 1998/11/19 15:40:46 agc Exp $
+# $NetBSD: Makefile,v 1.26 1998/12/15 10:34:34 mycroft Exp $
 #
 
-DISTNAME=		xmame-0.34b5.2
+DISTNAME=		xmame-0.34b8.1
 CATEGORIES=		emulators games x11
-MASTER_SITES=		ftp://drake.dit.upm.es/xmame/ftpsite/
+MASTER_SITES=		http://xmame.retrogames.com/download/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		mycroft@NetBSD.ORG
-HOMEPAGE=		http://drake.dit.upm.es/~mame/
+HOMEPAGE=		http://xmame.retrogames.com/
 
 DEPENDS=		unzip-5.32:../../archivers/unzip
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
 CONFLICTS=		xmame-0.30.1 xmame-0.33b6.1 xmame-0.34b1.1 \
-			xmame-0.34b2.1 xmame-0.34b2.2
+			xmame-0.34b2.1 xmame-0.34b2.2 xmame-0.34b5.2
 
 NOT_FOR_ARCHS=		alpha	#gcc lossage
 
@@ -23,9 +23,10 @@ MAKE_ENV+=		OPSYS=${OPSYS} ARCH=${ARCH} DESTDIR=${DESTDIR} \
 			INSTALL_MAN="${INSTALL_MAN}" \
 			INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 			NETBSD_JOYSTICK="${NETBSD_JOYSTICK}" \
+			NETBSD_DGA="${NETBSD_DGA}" \
 			DISPLAY_METHOD="${DISPLAY_METHOD}"
 MAKEFILE=		makefile.unix
-DISPLAY_METHOD=		x11
+DISPLAY_METHOD= 	x11
 
 ROMPATH=		${PREFIX}/share/xmame
 SPOOLDIR=		/var/games/xmame
@@ -34,6 +35,11 @@ NETBSD_JOYSTICK=	yes
 .else
 NETBSD_JOYSTICK=	no
 .endif
+.if exists(/usr/X11R6/include/X11/extensions/xf86dga.h)
+NETBSD_DGA=		yes
+.else
+NETBSD_DGA=		no
+.endif
 
 post-patch:
 	(cd ${WRKSRC}/doc && ${SED} 's|@ROMPATH@|${ROMPATH}|;s|@SPOOLDIR@|${SPOOLDIR}|' xmamerc.dist >xmamerc)
diff --git a/emulators/xmame/files/md5 b/emulators/xmame/files/md5
index 745a69f75ee..321c8d2d1c1 100644
--- a/emulators/xmame/files/md5
+++ b/emulators/xmame/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.8 1998/10/25 22:06:23 mycroft Exp $
+$NetBSD: md5,v 1.9 1998/12/15 10:34:34 mycroft Exp $
 
-MD5 (xmame-0.34b5.2.tgz) = 14c8e57d3c40d08b1f6a2941e2d72073
+MD5 (xmame-0.34b8.1.tgz) = 25de139b1146c9e69ba7c291d0c8d294
diff --git a/emulators/xmame/patches/patch-aa b/emulators/xmame/patches/patch-aa
index 36910ec7451..2e25dea30c0 100644
--- a/emulators/xmame/patches/patch-aa
+++ b/emulators/xmame/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.16 1998/11/12 23:20:10 frueauf Exp $
+$NetBSD: patch-aa,v 1.17 1998/12/15 10:34:34 mycroft Exp $
 
---- makefile.unix.orig	Wed Oct 21 08:20:43 1998
-+++ makefile.unix	Sun Oct 25 04:03:24 1998
+--- makefile.unix.orig	Sun Dec  6 04:26:46 1998
++++ makefile.unix	Tue Dec 15 04:06:03 1998
 @@ -39,7 +39,7 @@
  # GNU MAKE is MANDATORY !!!
  # so please give me the path...
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.16 1998/11/12 23:20:10 frueauf Exp $
  # else ...
  # MAKE=/usr/people/jantonio/bin/gmake
  
-@@ -106,18 +106,18 @@
+@@ -105,18 +105,18 @@
  # *** Select destination directory for your compiled program , manual page
  # and binary distribution ( if you want to... )
  # ( only needed to install, not to compile... )
@@ -35,32 +35,21 @@ $NetBSD: patch-aa,v 1.16 1998/11/12 23:20:10 frueauf Exp $
  
  # *** Where is cheat.dat ? 
  CHEATFILE = \"/usr/games/lib/$(NAME)/cheat.dat\"
-@@ -132,7 +132,9 @@
- ##############################################################################
- 
- # *** To enable joystick support uncomment next line
--# JOY		= -DUSE_JOYSTICK
-+ifeq (${NETBSD_JOYSTICK},yes)
-+JOY		= -DUSE_JOYSTICK
-+endif
- 
- # if you have selected joystick support , select your preferences:
- #
-@@ -148,7 +150,9 @@
+@@ -145,7 +145,9 @@
  # JSLIB   = -lXi
  
  # On iX86 based OS's, if supported, you can use standard joystick driver
--# JS	= -DI386_JOYSTICK
+-# JSI386 = -DI386_JOYSTICK
 +ifeq (${NETBSD_JOYSTICK},yes)
-+JS	= -DI386_JOYSTICK
++JSI386 = -DI386_JOYSTICK
 +endif
  
  # Linux FM-TOWNS game PAD joystick emulation support
  # Thanks to Osamu Kurati for provided patch
-@@ -169,8 +173,8 @@
+@@ -165,8 +167,8 @@
+ # *** If your system supports query audio buffer size (like IRIX or Linux )
  # 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
- #
+ # timer based audio code.
 -S_TIM = -DDONTUSE_TIMER
 -# S_TIM = -DUSE_TIMER
 +# S_TIM = -DDONTUSE_TIMER
@@ -68,33 +57,30 @@ $NetBSD: patch-aa,v 1.16 1998/11/12 23:20:10 frueauf Exp $
  
  # *** When using timer, you should provide the frequency to generate audio sample
  # frames in your system. See readme.unix notes about these item
-@@ -223,7 +227,7 @@
- # note: x11 is the only one supported on all platforms
- 
- ### 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
-@@ -244,19 +248,23 @@
+@@ -245,16 +247,18 @@
  # uncomment following section to support them ( you should have libxpm 
  # available :-) )
  # COMMENT IT if your are not compiling for normal x11
 -# XPM	= -DHAS_XPM
--# XPMLIB	= -lXpm -L/usr/X11R6/lib
-+ifeq (${DISPLAY_METHOD},x11)
+-# XPMLIB	= -lXpm
 +XPM	= -DHAS_XPM
-+XPMLIB	= -lXpm -L/usr/X11R6/lib
-+endif
++XPMLIB	= -lXpm
   
  # *** 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
+ 
+ #if you are running xfree86 and wnat to use DGA, uncomment the following:
+-# DGA     = -DUSE_DGA
+-# DGALIBS = -lXxf86dga -lXxf86vm
++ifeq (${NETBSD_DGA},yes)
++DGA     = -DUSE_DGA
++DGALIBS = -lXxf86dga -lXxf86vm
 +endif
  
- # standard location for X11 
+ # *** If you have the XIL library (Solaris 2.5.1 and higher), uncomment
+ # the following lines:
+@@ -265,8 +269,8 @@
  # X11INC		= -I/usr/include/X11
  # X11LIB		= -L/usr/lib/X11
  # standard location for XFree86
@@ -102,10 +88,10 @@ $NetBSD: patch-aa,v 1.16 1998/11/12 23:20:10 frueauf Exp $
 -X11LIB		= -L/usr/X11R6/lib
 +X11INC		= -I${PREFIX}/include
 +X11LIB		= -L${PREFIX}/lib
- # for Sun systems 
+ # for Sun systems
  # X11INC		= -I/usr/openwin/include
  # X11LIB		= -L/usr/openwin/lib
-@@ -273,11 +281,11 @@
+@@ -283,11 +287,11 @@
  
  # OpenGL include path
  
@@ -119,7 +105,7 @@ $NetBSD: patch-aa,v 1.16 1998/11/12 23:20:10 frueauf Exp $
  
  # OpenGL libs
  
-@@ -310,11 +318,12 @@
+@@ -320,11 +324,12 @@
  ######## Alpha/Linux
  # ARCH  = linux_alpha
  ######## ix86/Linux
@@ -134,7 +120,7 @@ $NetBSD: patch-aa,v 1.16 1998/11/12 23:20:10 frueauf Exp $
  ######## Sparc/SunOS ( no sound )
  # ARCH  = sunos
  ######## ix86/Solaris
-@@ -351,7 +360,11 @@
+@@ -364,7 +369,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
@@ -147,17 +133,17 @@ $NetBSD: patch-aa,v 1.16 1998/11/12 23:20:10 frueauf Exp $
  DEFS.sunos	   = -Dsun -DCLOCKS_PER_SEC=1000000 -DACORN
  DEFS.solaris	   = -Dsun -DACORN 
  DEFS.solaris_i386  = -DLSB_FIRST -Dsun -Dsolaris
-@@ -371,12 +384,14 @@
- LIBS.irix          = -laudio
+@@ -389,12 +398,14 @@
  LIBS.irix_al       = -laudio
  LIBS.aix           = -lUMSobj
+ LIBS.unixware7	   = -lsocket
 +LIBS.netbsd	   = -lm
  
  ##############################################################################
  # **** Architecture dependent cflags. Only change if you know what're you doing...
  ##############################################################################
  CFLAGS.linux_powerpc = -fsigned-char
- CFLAGS.aix	     = -I/usr/include/UMS -I/usr/lpp/som/include 
+ CFLAGS.aix	     = -I/usr/include/UMS -I/usr/lpp/som/include
 +CFLAGS.netbsd	     = -fstrength-reduce -funroll-loops -fomit-frame-pointer
  
  #############################################################################
diff --git a/emulators/xmame/patches/patch-ae b/emulators/xmame/patches/patch-ae
index 1459db74490..3fb5e677dab 100644
--- a/emulators/xmame/patches/patch-ae
+++ b/emulators/xmame/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.5 1998/09/07 22:54:50 mycroft Exp $
+$NetBSD: patch-ae,v 1.6 1998/12/15 10:34:34 mycroft Exp $
 
---- doc/xmamerc.dist.orig	Sat Sep  5 18:08:38 1998
-+++ doc/xmamerc.dist	Mon Sep  7 18:44:30 1998
+--- doc/xmamerc.dist.orig	Fri Oct 23 08:41:44 1998
++++ doc/xmamerc.dist	Tue Dec 15 05:05:19 1998
 @@ -23,10 +23,10 @@
  
  # Where does your Mame rom files reside? 
@@ -13,5 +13,14 @@ $NetBSD: patch-ae,v 1.5 1998/09/07 22:54:50 mycroft Exp $
 -spooldir        /usr/games/lib/xmame
 +spooldir        @SPOOLDIR@
  
- # What is your loved game? ( remember that mame defaults to "pacman" )
- defaultgame	galturbo
+ # Where can xmame find the cheat database?
+ cheatfile	/usr/games/lib/xmame/CHEAT.DAT
+@@ -77,7 +77,7 @@
+ mouse		1
+ 
+ # Use joystick if available
+-joy		1
++joytype		1
+ 
+ # Is your joystick analog?
+ analogstick	0
diff --git a/emulators/xmame/patches/patch-af b/emulators/xmame/patches/patch-af
index 35c9508e090..7a4e57de0ac 100644
--- a/emulators/xmame/patches/patch-af
+++ b/emulators/xmame/patches/patch-af
@@ -1,31 +1,13 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 10:40:37 agc Exp $
+$NetBSD: patch-af,v 1.3 1998/12/15 10:34:34 mycroft Exp $
 
---- src/unix/devices.c.orig	Wed Jun 17 05:48:00 1998
-+++ src/unix/devices.c	Sat Jul  4 07:42:07 1998
-@@ -60,7 +60,7 @@
- #elif  I386_JOYSTICK
- void i386_poll_joystick (void);
- /* specific joystick for PC clones */
--#ifdef netbsd_i386
-+#ifdef NETBSD
- #include <machine/joystick.h>
- extern struct joystick joy_data,joy_orig;
- #else
-@@ -658,7 +658,7 @@
- {
- #if ( defined USE_JOYSTICK ) && ( defined  I386_JOYSTICK )
-         int res;
--#ifdef netbsd_i386
-+#ifdef NETBSD
- 	res = read(joy_fd,&joy_data,sizeof(struct joystick) );
- 	if (res == sizeof(struct joystick )) {
- #else
-@@ -666,7 +666,7 @@
- 	if (res == sizeof(struct JS_DATA_TYPE )) {
- #endif
- 	/* get value of buttons */
--#ifdef netbsd_i386
-+#ifdef NETBSD
- 	    joy_b1 = joy_data.b1;
- 	    joy_b2 = joy_data.b2;
- #else
+--- src/unix/devices.c.orig	Sun Dec  6 07:18:42 1998
++++ src/unix/devices.c	Tue Dec 15 04:10:00 1998
+@@ -13,7 +13,7 @@
+ #include "xmame.h"
+ #include "devices.h"
+ 
+-#if defined I386_JOYSTICK && !(defined netbsd_i386)
++#if defined I386_JOYSTICK && !(defined NETBSD)
+ #include <linux/joystick.h>
+ #ifdef JS_VERSION
+ #define I386NEW_JOYSTICK 1
diff --git a/emulators/xmame/patches/patch-ah b/emulators/xmame/patches/patch-ah
new file mode 100644
index 00000000000..fd9781442c6
--- /dev/null
+++ b/emulators/xmame/patches/patch-ah
@@ -0,0 +1,31 @@
+$NetBSD: patch-ah,v 1.1 1998/12/15 10:34:35 mycroft Exp $
+
+--- src/unix/joy_i386.c.orig	Sun Dec  6 07:52:18 1998
++++ src/unix/joy_i386.c	Tue Dec 15 04:11:10 1998
+@@ -4,7 +4,7 @@
+ #include "devices.h"
+ 
+ /* specific joystick for PC clones */
+-#ifdef netbsd_i386
++#ifdef NETBSD
+ #include <machine/joystick.h>
+ static struct joystick joy_data;
+ #else
+@@ -77,7 +77,7 @@
+         for(i=0;i<MAX_JOY;i++)
+         {
+ 	   if (joydata[i].fd < 0) continue;
+-#ifdef netbsd_i386
++#ifdef NETBSD
+ 	   res = read(joydata[i].fd,&joy_data,sizeof(struct joystick) );
+ 	   if (res != sizeof(struct joystick )) continue;
+ #else
+@@ -85,7 +85,7 @@
+ 	   if (res != sizeof(struct JS_DATA_TYPE )) continue;
+ #endif
+ 	   /* get value of buttons */
+-#ifdef netbsd_i386
++#ifdef NETBSD
+ 	   joydata[i].buttons[0] = joy_data.b1;
+ 	   joydata[i].buttons[1] = joy_data.b2;
+ #else