Update pkg to version 0.37b4.1

6 files changed, 83 insertions, 63 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index f59a49fd1f0..269baf8ddb1 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2000/04/20 22:45:50 tron Exp $
+# $NetBSD: Makefile,v 1.37 2000/07/13 20:54:01 martin Exp $
 #
 
-DISTNAME=		xmame-0.36b16.1
+DISTNAME=		xmame-0.37b4.1
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://x.mame.net/download/
 EXTRACT_SUFX=		.tgz
@@ -15,6 +15,7 @@ DEPENDS+=		xpm-3.4k:../../graphics/xpm
 USE_X11BASE=		yes
 USE_GMAKE=		yes
 MAKE_ENV+=		OPSYS=${OPSYS} ARCH=${ARCH} \
+			MAME_CPU=${MAME_CPU} \
 			INSTALL_MAN="${INSTALL_MAN}" \
 			INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 			NETBSD_JOYSTICK="${NETBSD_JOYSTICK}" \
@@ -30,12 +31,24 @@ NETBSD_JOYSTICK=	yes
 .else
 NETBSD_JOYSTICK=	no
 .endif
-.if exists(/usr/X11R6/include/X11/extensions/xf86dga.h)
+.if exists(${X11BASE}/include/X11/extensions/xf86dga.h)
 NETBSD_DGA=		yes
 .else
 NETBSD_DGA=		no
 .endif
 
+.if ${MACHINE_ARCH} == "m68k"
+MAME_CPU=		m68k
+.elif ${MACHINE_ARCH} == "alpha"
+MAME_CPU=		alpha
+.elif ${MACHINE_ARCH} == "i386"
+MAME_CPU=		i386
+.elif ${MACHINE_ARCH} == "mipsel"
+MAME_CPU=		risc_lsb
+.else
+MAME_CPU=		risc
+.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 b771c876752..bf33084fb53 100644
--- a/emulators/xmame/files/md5
+++ b/emulators/xmame/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.13 2000/03/14 11:42:50 soren Exp $
+$NetBSD: md5,v 1.14 2000/07/13 20:54:02 martin Exp $
 
-MD5 (xmame-0.36b16.1.tgz) = 8c5ac1e7dc380f829e5ea628e8cfa342
+MD5 (xmame-0.37b4.1.tgz) = cab8d60c005a5a6aaf0e92d01350f5c2
diff --git a/emulators/xmame/files/patch-sum b/emulators/xmame/files/patch-sum
index de5ea94dfe4..86694671c8e 100644
--- a/emulators/xmame/files/patch-sum
+++ b/emulators/xmame/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.5 2000/03/14 11:42:50 soren Exp $
+$NetBSD: patch-sum,v 1.6 2000/07/13 20:54:03 martin Exp $
 
-MD5 (patch-aa) = 7e79227fefdaa738407dfff28609ce51
-MD5 (patch-ae) = dbd7f08769a7d8d73aa0bf8e0d14c2b0
-MD5 (patch-am) = af84ac7b8eebdb10f1895c16de59a4b5
+MD5 (patch-aa) = 057e774a7c79ebbf5fcd1dfa038fc58e
+MD5 (patch-ae) = 93297e6b91bbe9e9cacf3522b1235ed8
+MD5 (patch-am) = 8c8b60e678f71ec9a32d531c2c2103a8
diff --git a/emulators/xmame/patches/patch-aa b/emulators/xmame/patches/patch-aa
index a2d8eae4092..3f1c8145ca7 100644
--- a/emulators/xmame/patches/patch-aa
+++ b/emulators/xmame/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.23 2000/03/16 12:41:22 wiz Exp $
---- makefile.unix.orig	Fri Mar  3 10:16:40 2000
-+++ makefile.unix	Tue Mar 14 12:02:51 2000
-@@ -142,14 +142,14 @@
+$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
+@@ -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... )
@@ -9,39 +9,61 @@ $NetBSD: patch-aa,v 1.23 2000/03/16 12:41:22 wiz Exp $
 -MANDIR  = /usr/local/man/man6
 +DESTDIR = ${PREFIX}/bin
 +MANDIR  = ${PREFIX}/man/man6
- DISTDIR = /home/ftp/pub/emulators/$(NAME)
  
  # *** 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/$(NAME)
-+XMAMEROOT = ${PREFIX}/share/$(NAME)
+-XMAMEROOT = /usr/games/lib/x$(TARGET)
++XMAMEROOT = ${PREFIX}/share/xmame
  
  
  ##############################################################################
-@@ -214,7 +214,7 @@
- # JSLIB   = -lXi
+@@ -152,7 +152,7 @@
+ ##############################################################################
+ 
+ ### i386 + gnu-asm
+-MY_CPU = i386
++MY_CPU = ${MAME_CPU}
+ ### i386 no asm
+ # MY_CPU = i386_noasm
+ ### alpha
+@@ -171,11 +171,11 @@
+ ##############################################################################
  
- # *** On iX86 based OS's, if supported, you can use standard joystick driver
--# JSI386 = -DI386_JOYSTICK
-+JSI386 = -DI386_JOYSTICK
+ ### Linux 
+-ARCH  = linux
++# ARCH  = linux
+ ### FreeBSD
+ # ARCH  = freebsd
+ ### NetBSD
+-# ARCH  = netbsd
++ARCH  = netbsd
+ ### 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
++ifeq (${NETBSD_JOYSTICK},yes)
++JOY_I386 = 1
++endif
  
- # *** Linux FM-TOWNS game PAD joystick emulation support
- # Thanks to Osamu Kurati for provided patch
-@@ -265,8 +265,10 @@
- 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
+ ##############################################################################
+@@ -249,7 +252,10 @@
+ # MIT-Shared Memory X Extensions, comment the
+ X11_MITSHM = 1
+ # XFree86 DGA
+-# X11_DGA = 1
++ifeq (${NETBSD_DGA},yes)  
++X11_DGA = 1
 +endif
++
+ # The XIL library (Solaris 2.5.1 and higher), uncomment
+ # X11_XIL = 1
  
- # *** If you have the XIL library (Solaris 2.5.1 and higher), uncomment
- # the following lines:
-@@ -278,8 +280,8 @@
+@@ -258,8 +264,8 @@
  # X11INC		= -I/usr/include/X11
  # X11LIB		= -L/usr/lib/X11
  # standard location for XFree86
@@ -52,17 +74,3 @@ $NetBSD: patch-aa,v 1.23 2000/03/16 12:41:22 wiz Exp $
  # for Sun systems
  # X11INC		= -I/usr/openwin/include
  # X11LIB		= -L/usr/openwin/lib
-@@ -321,11 +323,11 @@
- ##############################################################################
- 
- ### Linux 
--ARCH  = linux
-+# ARCH  = linux
- ### FreeBSD
- # ARCH  = freebsd
- ### NetBSD
--# ARCH  = netbsd
-+ARCH	= netbsd
- ### Solaris
- # ARCH  = solaris
- ### OpenStep
diff --git a/emulators/xmame/patches/patch-ae b/emulators/xmame/patches/patch-ae
index 4e49fa32bca..91a3c6f372f 100644
--- a/emulators/xmame/patches/patch-ae
+++ b/emulators/xmame/patches/patch-ae
@@ -1,15 +1,15 @@
-$NetBSD: patch-ae,v 1.10 2000/03/16 12:41:22 wiz Exp $
---- doc/xmamerc.dist.orig	Fri Mar  3 14:42:02 2000
-+++ doc/xmamerc.dist	Tue Mar 14 12:41:39 2000
-@@ -3,15 +3,15 @@
+$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 @@
+ 
  ### Digital sound related ###
- # dsp-driver            <NULL> (not set)
- bufsize                 0.080000
+ # dsp-plugin            <NULL> (not set)
 -timer                   0
 +timer                   1
  
  ### Sound mixer related ###
- # sound-mixer-driver    <NULL> (not set)
+ # sound-mixer-plugin    <NULL> (not set)
  
  ### Video Related ###
  bpp                     0
@@ -21,8 +21,8 @@ $NetBSD: patch-ae,v 1.10 2000/03/16 12:41:22 wiz Exp $
  dirty                   1
  scanlines               0
 @@ -61,7 +61,7 @@
- samples                 1
  samplefreq              22050
+ bufsize                 2.000000
  volume                  -3
 -# audiodevice           <NULL> (not set)
 +audiodevice             /dev/audio0
diff --git a/emulators/xmame/patches/patch-am b/emulators/xmame/patches/patch-am
index 99da7ed1862..d8979ec6290 100644
--- a/emulators/xmame/patches/patch-am
+++ b/emulators/xmame/patches/patch-am
@@ -1,8 +1,7 @@
-$NetBSD: patch-am,v 1.2 1999/11/10 08:01:29 soren Exp $
-
---- src/cpuintrf.c.orig	Thu Nov  4 09:13:49 1999
-+++ src/cpuintrf.c	Wed Nov 10 07:26:25 1999
-@@ -94,13 +94,34 @@
+$NetBSD: patch-am,v 1.3 2000/07/13 20:54:04 martin Exp $
+--- src/cpuintrf.c.orig	Fri Jun 23 12:05:01 2000
++++ src/cpuintrf.c	Thu Jul 13 00:02:05 2000
+@@ -126,13 +126,34 @@
  #define LOG(x)
  #endif
  
@@ -34,9 +33,9 @@ $NetBSD: patch-am,v 1.2 1999/11/10 08:01:29 soren Exp $
 +
  /* How do I calculate the next power of two from CPUINFO_SIZE using a macro? */
 -#ifdef __LP64__
--#define CPUINFO_ALIGN   (128-CPUINFO_SIZE)
+-#define CPUINFO_ALIGN	(128-CPUINFO_SIZE)
 -#else
--#define CPUINFO_ALIGN   (64-CPUINFO_SIZE)
+-#define CPUINFO_ALIGN	(64-CPUINFO_SIZE)
 -#endif
 +
 +#define CPUINFO_ALIGN ((sizeof(cpuinfo_test) > 64 ? 128 : 64) - sizeof(cpuinfo_test))