Update xmame to 0.36b8.1.

Xmess is now integrated in xmame.

6 files changed, 23 insertions, 22 deletions

diff --git a/emulators/Makefile b/emulators/Makefile
index d02ad13189a..deddfbce8fa 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 1999/09/23 07:58:28 tron Exp $
+# $NetBSD: Makefile,v 1.30 1999/11/10 07:54:45 soren Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/07/31 07:23:58 max Exp
 #
 
@@ -41,6 +41,5 @@
     SUBDIR += xcopilot
 #    SUBDIR += xgs
     SUBDIR += xmame
-    SUBDIR += xmess
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 204e1787934..9f80027e0e2 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.31 1999/05/10 02:17:50 ross Exp $
+# $NetBSD: Makefile,v 1.32 1999/11/10 07:54:46 soren Exp $
 #
 
-DISTNAME=		xmame-0.35b8.1
+DISTNAME=		xmame-0.36b8.1
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://xmame.retrogames.com/download/
 EXTRACT_SUFX=		.tgz
 
-MAINTAINER=		mycroft@NetBSD.ORG
+MAINTAINER=		soren@netbsd.org
 HOMEPAGE=		http://xmame.retrogames.com/
 
 DEPENDS=		unzip-5.40:../../archivers/unzip
@@ -37,8 +37,8 @@ NETBSD_DGA=		no
 .endif
 
 post-patch:
-	(cd ${WRKSRC}/doc && ${SED} 's|@ROMPATH@|${ROMPATH}|;s|@SPOOLDIR@|${SPOOLDIR}|' xmamerc.dist >xmamerc)
-	(cd ${WRKSRC}/src/unix/sound-drivers && ${MV} netbsd_i386.c netbsd.c)
+	(cd ${WRKSRC}/doc && ${SED} 's|@ROMPATH@|${ROMPATH}|;s|@SPOOLDIR@|${SPOOLDIR}|' \
+		xmamerc.dist >xmamerc)
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} xmame.${DISPLAY_METHOD} ${PREFIX}/bin/xmame)
diff --git a/emulators/xmame/files/md5 b/emulators/xmame/files/md5
index 42397aa92db..81eba583d87 100644
--- a/emulators/xmame/files/md5
+++ b/emulators/xmame/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.10 1999/04/03 21:45:16 mycroft Exp $
+$NetBSD: md5,v 1.11 1999/11/10 07:54:46 soren Exp $
 
-MD5 (xmame-0.35b8.1.tgz) = 8a50509b653cfb1202b4859febc6fede
+MD5 (xmame-0.36b8.1.tgz) = 86ab74d20d4106ae840812e63b094624
diff --git a/emulators/xmame/files/patch-sum b/emulators/xmame/files/patch-sum
index cf7148a19b3..ec69b792ae4 100644
--- a/emulators/xmame/files/patch-sum
+++ b/emulators/xmame/files/patch-sum
@@ -1,10 +1,7 @@
-$NetBSD: patch-sum,v 1.2 1999/07/27 03:25:03 mycroft Exp $
+$NetBSD: patch-sum,v 1.3 1999/11/10 07:54:46 soren Exp $
 
-MD5 (patch-aa) = 7a316fd369ac758c4d6cd17e225a6134
-MD5 (patch-ae) = bd5b5c1aa56b11ca23d8c11eb7d9dbd8
-MD5 (patch-ah) = f06e94d47a71537f31f9cf88eee31548
-MD5 (patch-ai) = 90ea6b04cc57c2c144a7f244e84a8923
-MD5 (patch-aj) = 08061feb4dd6a8599224fac169616df2
-MD5 (patch-ak) = 9d763ad476f9fe9d112488a913d8cfad
-MD5 (patch-al) = 690663fbc8809bf35cc68fef939040ee
-MD5 (patch-am) = f794bb8bfeee0df56cdbbec2c580d050
+MD5 (patch-aa) = 637eb930abece25d6669974aa9b969bf
+MD5 (patch-ae) = 6eacece1d254bc63a3a8baf9ad0e7901
+MD5 (patch-ah) = 25feadad02ed54f668d0928a4b3f7d62
+MD5 (patch-ai) = 622fcdcd6adf5896b002f867f97e3936
+MD5 (patch-am) = af84ac7b8eebdb10f1895c16de59a4b5
diff --git a/emulators/xmame/pkg/COMMENT b/emulators/xmame/pkg/COMMENT
index 58601624209..7f474aa5f24 100644
--- a/emulators/xmame/pkg/COMMENT
+++ b/emulators/xmame/pkg/COMMENT
@@ -1 +1 @@
-X11 emulator for old arcade machine ROMs
+X11 emulator for old arcade and console machines
diff --git a/emulators/xmame/pkg/DESCR b/emulators/xmame/pkg/DESCR
index ab3c3325407..536b540c296 100644
--- a/emulators/xmame/pkg/DESCR
+++ b/emulators/xmame/pkg/DESCR
@@ -1,9 +1,14 @@
-X-MAME is the X11 port of the MAME arcade game emulator.
+Xmame is the X11 port of the MAME arcade game emulator.
+
+MAME is a virtual machine emulator; it includes emulators for the CPUs,
+sound and video chips used in game consoles, as well as special purpose
+PALs and detailed information about the memory layout of each machine.
 
 MAME is a virtual machine emulator; it includes emulators for numerous
 CPUs, sound and video chips used in arcade games, as well as special
 purpose decoding PALs and detailed information about the memory layout of
 each game.
 
-To play games in X-MAME you must have a copy of the original ROMs from
-the arcade games.
+MAME now also includes MESS, an emulator for various game consoles.
+
+To play games in Xmame you must have a copy of the original game ROMs.