Update xmame to 0.87.

Changes since 0.86:
- Everything from MAME 0.87 (http://x.mame.net/changes-mame.html) and
  MESS 0.87 (http://x.mame.net/changes-mess.html).
- Reworked the video mode functions (Hans de Goede):
  * Unified and moved the aspect ratio calculations from xgl, fx, and
    x11_window to mode.c since all display targets that support
    arbitrary scaling through hardware make use of this.
  * Modified the code to use the aspect ratio supplied by the game
    driver instead of doing all kinds of magic.  This corrects, for
    example, the aspect ratio of 1942.
  * Added a new option, "-perfectaspect (-pa)", which automatically
    sets yarbsize to honor the aspect ratio provided by the game
    driver.  This is disabled by default because it can cause scaling
    artifacts.
  * When video modes are matched, the aspect ratio is now taken into
    account.
  - Made changes to the X11 targets (Hans de Goede):
    * Restored widthscale == 2 yuy2 code for perfect yuy2 blitting.
    * Fixed a bug introduced by the aspect ratio patches which caused the
      Xv fallback code to not detect an error case and crash later on
      instead of falling back to MITSHM.
    * The Xv window is now resized with the correct aspect ratio after a
      user resize; this prevents black borders from appearing.
    * Renamed "-perfect-yv12" to "-perfect-yuv".
    * Enabled perfect blitting by default for yuy2, since it fixes the
      ugly color bleeding in, for example, pacman.
    * Fixed colors being way off in Xv for 15bpp direct games, e.g.,
      vector games with artwork disabled.
    * Current mouse values are now initialized in xinput_open, which
      should fix the problem of the visor going to the lower right corner
      in starwars when the video mode is switched from windowed X11 to
      DGA fullscreen while the mouse is grabbed.
    * Fixed the display of a 32bpp source on a 24bpp packed pixel window.
    * Fixed a bug in the DGA2 target which caused it to throw an XError
      when it failed to find a suitable mode, causing xmame to abort.
    * XInput now maps controls to mice 2 - 5 and leaves mouse 1 free for
      the default mouse.  (Hans de Goede)
    * Fixed a bug which caused the window to disappear with Xv windowed
      mode under KDE.
    - Added a missing "Rapid Fire" string to the configuration menu.  This
      fixes problems with the configuration of player controls.  (Sylvain
      Trosset)
    - Cleaned up the sound code (Hans de Goede):
      * Cleaned up the ALSA driver.
      * The ALSA driver now reports the actual sample rate to the caller
        rather than the requested one.
      * Removed the "-alsa-pcm" command line option; the ALSA driver now
        supports "-auviodevice (-ad)".  (Hans de Goede)
      * Removed "-fakesound (-fsnd)".  Now sound is always faked since
        certain games won't run without it.
      * Changed the default sample rate to 44100, moving us into the
        Third Millennium.
      * Removed the "-[no]sound" option; if you really want to disable
        sound, specify a bogus device with "-audiodevice".
      - Removed the "-[no]mouse" option.  (Hans de Goede)
      - Split aspect and mode settings so that all targets can use the
        aspect settings.  (Hans de Goede)
      - Fixed the mapping of analog sticks' min..max ranges to the core's
        range.  This fixes games that use analog controls, such as Out Run,
        as well as the jittery movement of the mouse cursor in games such as
        Missile Command.
      - Audio should work much better on Mac OS X.  (anonymous)
      - The MMX assembly language version of the 6-tap filter now works for
        16 and 32bpp source and destination bitmaps; previously, only the
        32bpp screen depth was accelerated.  (Richard Goedeken)
      - Corrected some of the out-of-date information in the documentation.
        Fixes Bugzilla bug 604.
      - Light guns should work again. Also added support for the triggers on
        an ACT LABS USB PC Monitor model that didn't work previously.

In addition, make the package install xml2info using a patch from
Miguel Mendez in PR pkg/27101.

5 files changed, 27 insertions, 25 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 94d0b09327e..aa656cc9076 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.119 2004/10/03 00:14:41 tv Exp $
+# $NetBSD: Makefile,v 1.120 2004/11/06 21:41:52 kristerw Exp $
 #
 
-DISTNAME=		xmame-0.86
-PKGREVISION=	1
+DISTNAME=		xmame-0.87
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://x.mame.net/download/
 EXTRACT_SUFX=		.tar.bz2
@@ -113,6 +112,7 @@ do-install:
 		${PREFIX}/bin/${TARGET}
 	${INSTALL_PROGRAM} ${WRKSRC}/romcmp ${PREFIX}/bin/romcmp
 	${INSTALL_PROGRAM} ${WRKSRC}/chdman ${PREFIX}/bin/chdman
+	${INSTALL_PROGRAM} ${WRKSRC}/xml2info ${PREFIX}/bin/xml2info
 	${INSTALL_MAN} ${WRKSRC}/doc/${TARGET}.6			\
 		${PREFIX}/man/man6/${TARGET}.6
 	${INSTALL_DATA_DIR} ${ROMPATH}
diff --git a/emulators/xmame/PLIST b/emulators/xmame/PLIST
index 6df88b7e87e..e70df0aae2f 100644
--- a/emulators/xmame/PLIST
+++ b/emulators/xmame/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2004/05/16 00:27:30 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/11/06 21:41:52 kristerw Exp $
 bin/chdman
 bin/romcmp
 bin/xmame
+bin/xml2info
 man/man6/xmame.6
 share/doc/html/xmame/xmame-doc-2.html
 share/doc/html/xmame/xmame-doc-3.html
diff --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo
index bc525b7d72a..0ffcadf6664 100644
--- a/emulators/xmame/distinfo
+++ b/emulators/xmame/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.56 2004/09/05 20:40:26 kristerw Exp $
+$NetBSD: distinfo,v 1.57 2004/11/06 21:41:52 kristerw Exp $
 
-SHA1 (xmame-0.86.tar.bz2) = 133e8959cf4078faa10adaf0cbd5059655450123
-Size (xmame-0.86.tar.bz2) = 14538952 bytes
-SHA1 (patch-aa) = 0b9ffcb7c4305e7c349f229b2646acb31553d549
-SHA1 (patch-ae) = df9ce91871bfcff611ff8f616482d4ff2e8204a3
+SHA1 (xmame-0.87.tar.bz2) = dbd70ba76c141412181d8f12fe40e32b32df8867
+Size (xmame-0.87.tar.bz2) = 14601566 bytes
+SHA1 (patch-aa) = b9f486be58b306a815269f859c1031d24c966df1
+SHA1 (patch-ae) = 26c68fff67e3146638cef7e366b57c928274f562
diff --git a/emulators/xmame/patches/patch-aa b/emulators/xmame/patches/patch-aa
index 483195557b8..5de1f5bbc58 100644
--- a/emulators/xmame/patches/patch-aa
+++ b/emulators/xmame/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.34 2004/02/21 00:08:00 kristerw Exp $
+$NetBSD: patch-aa,v 1.35 2004/11/06 21:41:52 kristerw Exp $
 
---- makefile.unix.orig	Sat Feb 21 00:03:46 2004
-+++ makefile.unix	Sat Feb 21 00:08:29 2004
+--- makefile.unix.orig	Sat Nov  6 21:34:15 2004
++++ makefile.unix	Sat Nov  6 21:37:27 2004
 @@ -33,7 +33,7 @@
  ###########################################################################
  
@@ -9,9 +9,9 @@ $NetBSD: patch-aa,v 1.34 2004/02/21 00:08:00 kristerw Exp $
 -TARGET = mame
 +# TARGET = mame
  # TARGET = mess
+ # TARGET = mage
  # TARGET = mmsnd
- # example for a tiny compile
-@@ -88,7 +88,7 @@
+@@ -89,7 +89,7 @@
  # just as well.  However, stay away from the `cc' Ultrix compiler if 
  # possible.
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.34 2004/02/21 00:08:00 kristerw Exp $
  # CC    = cc
  # CC	= icc
  # CC	= c89
-@@ -103,7 +103,7 @@
+@@ -110,7 +110,7 @@
  
  # If you want to use whatever CFLAGS are currently set in your 
  # environment, then comment this out.
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.34 2004/02/21 00:08:00 kristerw Exp $
  
  
  ###########################################################################
-@@ -112,7 +112,7 @@
+@@ -119,7 +119,7 @@
  ###########################################################################
  
  # GCC on x86
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.34 2004/02/21 00:08:00 kristerw Exp $
  
  # GCC on x86 with some optimizations
  # CFLAGS = -O2 -Wall -Wno-unused -mcpu=i686 -fomit-frame-pointer \
-@@ -471,7 +471,7 @@
+@@ -508,7 +508,7 @@
  ###########################################################################
  
  # i386, GNU asm
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.34 2004/02/21 00:08:00 kristerw Exp $
  
  # i386, no asm -- needed for the Intel C++ compiler, which does not fully
  # understand GCC's inline assembly syntax, though you may still enable 
-@@ -506,7 +506,7 @@
+@@ -543,7 +543,7 @@
  ###########################################################################
  
  # Linux 
@@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.34 2004/02/21 00:08:00 kristerw Exp $
  
  # FreeBSD
  # ARCH  = freebsd
-@@ -652,7 +652,7 @@
+@@ -694,7 +694,7 @@
  X11_MITSHM = 1
  
  # Use Xv extension for hardware scaling.
@@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.34 2004/02/21 00:08:00 kristerw Exp $
  
  # Enable XFree86 DGA.  This also causes "make install" to set the suid bit 
  # on the executable.
-@@ -674,8 +674,8 @@
+@@ -716,8 +716,8 @@
  # X11LIB		= -L/usr/lib/X11
  
  # Standard location for XFree86
diff --git a/emulators/xmame/patches/patch-ae b/emulators/xmame/patches/patch-ae
index d9f983892cd..2530c79226a 100644
--- a/emulators/xmame/patches/patch-ae
+++ b/emulators/xmame/patches/patch-ae
@@ -1,8 +1,9 @@
-$NetBSD: patch-ae,v 1.20 2003/02/13 20:53:48 kristerw Exp $
---- src/unix/doc/xmamerc.dist.orig	Thu Feb 13 19:32:31 2003
-+++ src/unix/doc/xmamerc.dist	Thu Feb 13 19:33:47 2003
-@@ -69,12 +69,12 @@
- mouse                   1
+$NetBSD: patch-ae,v 1.21 2004/11/06 21:41:52 kristerw Exp $
+
+--- src/unix/doc/xmamerc.dist.orig	Sat Nov  6 21:40:52 2004
++++ src/unix/doc/xmamerc.dist	Sat Nov  6 21:42:31 2004
+@@ -66,12 +66,12 @@
+ analogstick             0
  
  ### Fileio Related ###
 -rompath                 /usr/local/share/xmame/roms