Update xmess to 0.62.1 (rc3)

Changes since last packaged version are mainly that the emulation core
is based on MAME 0.62, together with random bugfixes.

7 files changed, 33 insertions, 118 deletions

diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index 295d7d9fe7a..570706cd6c6 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2002/12/07 21:00:08 kristerw Exp $
+# $NetBSD: Makefile,v 1.28 2002/12/14 15:14:26 kristerw Exp $
 #
 
-DISTNAME=		xmame-0.56.2
-PKGNAME=		xmess-0.56.2
-PKGREVISION=		1
+DISTNAME=		xmame-0.62.1-rc3
+PKGNAME=		xmess-0.62.1
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://x.mame.net/download/
 EXTRACT_SUFX=		.tar.bz2
@@ -85,7 +84,7 @@ post-configure:
 	cd ${WRKSRC}/doc;						\
 	${SED}	-e "s|@ROMPATH@|${ROMPATH}|g"				\
 		-e "s|@SPOOLDIR@|${SPOOLDIR}|g"				\
-		xmamerc.dist > ${TARGET}rc
+		${TARGET}rc.dist > ${TARGET}rc
 .if !empty(MAKE_FLAGS:M*USB*)
 	${LN} -fs /usr/include/usb.h ${BUILDLINK_DIR}/include
 	for FILE in /usr/lib/libusb*; do				\
diff --git a/emulators/xmess/distinfo b/emulators/xmess/distinfo
index e98b27ab604..663f9a8e8f4 100644
--- a/emulators/xmess/distinfo
+++ b/emulators/xmess/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.4 2002/12/07 21:00:08 kristerw Exp $
+$NetBSD: distinfo,v 1.5 2002/12/14 15:14:26 kristerw Exp $
 
-SHA1 (xmame-0.56.2.tar.bz2) = a6fa58be23231d919540f5b3c619a1f2565b03e8
-Size (xmame-0.56.2.tar.bz2) = 7049295 bytes
+SHA1 (xmame-0.62.1-rc3.tar.bz2) = efea14b36573d89dd47634872cfe38efa57d668d
+Size (xmame-0.62.1-rc3.tar.bz2) = 8322423 bytes
 SHA1 (patch-aa) = be131167296c50e3aea55da46288dfc16bf3ad8e
-SHA1 (patch-ab) = b6bb3acba452b91c8b9dd946531e9195d5d196fb
-SHA1 (patch-ac) = 08dda8c365c9891e1f54ef622325015a38cb9758
 SHA1 (patch-ad) = e389102fc29bd7c40711cfd493bad902ee102ae2
-SHA1 (patch-ae) = dfd2f103139dbf1f575cf00d8feda75085db39be
+SHA1 (patch-ae) = 3acdf82f5662bc812cc6b48c916ba38457a13258
diff --git a/emulators/xmess/patches/patch-aa b/emulators/xmess/patches/patch-aa
index 0fab76f2388..f538327596f 100644
--- a/emulators/xmess/patches/patch-aa
+++ b/emulators/xmess/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.14 2002/01/03 00:19:01 kristerw Exp $
+$NetBSD: patch-aa,v 1.15 2002/12/14 15:14:26 kristerw Exp $
 --- makefile.unix.orig	Wed Jan  2 01:32:01 2002
 +++ makefile.unix	Wed Jan  2 18:44:08 2002
 @@ -32,7 +32,6 @@
diff --git a/emulators/xmess/patches/patch-ab b/emulators/xmess/patches/patch-ab
deleted file mode 100644
index 056bba006f9..00000000000
--- a/emulators/xmess/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2002/01/12 22:53:16 kristerw Exp $
---- src/unix/unix.mak.orig	Sun Jan  6 03:44:58 2002
-+++ src/unix/unix.mak	Sun Jan  6 19:01:36 2002
-@@ -214,7 +214,16 @@
- endif
- ifdef JOY_USB
- CONFIG += -DUSB_JOYSTICK
-+ifeq ($(ARCH), netbsd)
-+ifeq ($(shell test -f /usr/include/usbhid.h && echo have_usbhid), have_usbhid)
-+CONFIG += -DHAVE_USBHID_H
-+MY_LIBS += -lusbhid
-+else
- MY_LIBS += -lusb
-+endif
-+else
-+MY_LIBS += -lusb
-+endif
- endif
- 
- ifdef EFENCE
diff --git a/emulators/xmess/patches/patch-ac b/emulators/xmess/patches/patch-ac
deleted file mode 100644
index 2dbcdc1a106..00000000000
--- a/emulators/xmess/patches/patch-ac
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/01/12 22:53:16 kristerw Exp $
---- src/unix/joystick-drivers/joy_usb.c.orig	Wed Jan  2 03:45:55 2002
-+++ src/unix/joystick-drivers/joy_usb.c	Sun Jan  6 22:17:55 2002
-@@ -21,7 +21,11 @@
- #endif
- 
- #if defined(__ARCH_netbsd)
-+#ifdef HAVE_USBHID_H
-+#include <usbhid.h>
-+#else
- #include <usb.h>
-+#endif
- #elif defined(__ARCH_freebsd)
- #include <libusb.h>
- #endif
-@@ -69,7 +73,7 @@
- 
- static int joy_initialize_hid(int i)
- {
--  int size, is_joystick, report_id;
-+  int size, is_joystick, report_id = 0;
-   struct hid_data *d;
-   struct hid_item h;
-   report_desc_t rd;
-@@ -82,7 +86,19 @@
- 
-   priv_joy_data[i].hids = NULL;
- 
-+#ifdef HAVE_USBHID_H
-+  if (ioctl(joy_data[i].fd, USB_GET_REPORT_ID, &report_id) < 0)
-+    {
-+      fprintf(stderr_file, "error: /dev/uhid%d: %s", i, strerror(errno));
-+      return FALSE;
-+    }
-+
-+  size = hid_report_size(rd, hid_input, report_id);
-+  priv_joy_data[i].offset = 0;
-+#else
-   size = hid_report_size(rd, hid_input, &report_id);
-+  priv_joy_data[i].offset = (report_id != 0);
-+#endif
-   if ((priv_joy_data[i].data_buf = malloc(size)) == NULL)
-     {
-       fprintf(stderr_file, "error: couldn't malloc %d bytes\n", size);
-@@ -90,10 +106,14 @@
-       return FALSE;
-     }
-   priv_joy_data[i].dlen = size;
--  priv_joy_data[i].offset = (report_id != 0);
- 
-   is_joystick = 0;
-+#ifdef HAVE_USBHID_H
-+  for (d = hid_start_parse(rd, 1 << hid_input, report_id);
-+       hid_get_item(d, &h); )
-+#else
-   for (d = hid_start_parse(rd, 1 << hid_input); hid_get_item(d, &h); )
-+#endif
-     {
-       int axis, usage, page, interesting_hid;
- 
diff --git a/emulators/xmess/patches/patch-ad b/emulators/xmess/patches/patch-ad
index 7fb26aacd46..54f008fdfbd 100644
--- a/emulators/xmess/patches/patch-ad
+++ b/emulators/xmess/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2002/12/07 21:00:09 kristerw Exp $
+$NetBSD: patch-ad,v 1.2 2002/12/14 15:14:27 kristerw Exp $
 --- src/unix/video-drivers/blit.h.orig	Sat Dec  7 03:00:00 2002
 +++ src/unix/video-drivers/blit.h	Sat Dec  7 03:02:49 2002
 @@ -156,6 +156,7 @@
diff --git a/emulators/xmess/patches/patch-ae b/emulators/xmess/patches/patch-ae
index cbe8d07ee91..6f3d31f3f5e 100644
--- a/emulators/xmess/patches/patch-ae
+++ b/emulators/xmess/patches/patch-ae
@@ -1,30 +1,28 @@
-$NetBSD: patch-ae,v 1.4 2001/09/02 23:04:24 kristerw Exp $
---- doc/xmamerc.dist.orig	Mon Jul  2 02:03:49 2001
-+++ doc/xmamerc.dist	Mon Sep  3 00:34:24 2001
-@@ -70,20 +70,18 @@
+$NetBSD: patch-ae,v 1.5 2002/12/14 15:14:27 kristerw Exp $
+--- doc/xmessrc.dist.orig	Tue Dec 10 05:58:31 2002
++++ doc/xmessrc.dist	Sat Dec 14 15:46:29 2002
+@@ -69,16 +69,16 @@
  mouse                   1
  
  ### Fileio Related ###
--rompath                 /usr/games/lib/xmame
--spooldir                /usr/games/lib/xmame
-+rompath                 @ROMPATH@
-+spooldir                @SPOOLDIR@
- screenshotdir           .
--cheatfile               /usr/games/lib/xmame/cheat.dat
--hiscorefile             /usr/games/lib/xmame/hiscore.dat
--historyfile             /usr/games/lib/xmame/history.dat
--mameinfofile            /usr/games/lib/xmame/mameinfo.dat
-+cheatfile               @SPOOLDIR@/cheat.dat
-+hiscorefile             @SPOOLDIR@/hiscore.dat
-+historyfile             @SPOOLDIR@/history.dat
-+mameinfofile            @SPOOLDIR@/mameinfo.dat
+-biospath                /usr/games/lib/xmess/bios
+-softwarepath            /usr/games/lib/xmess/software
+-CRC_directory           /usr/games/lib/xmess/crc
+-hiscore_directory       /usr/games/lib/xmess/hiscore
++biospath                @ROMPATH@/bios
++softwarepath            @ROMPATH@/software
++CRC_directory           @ROMPATH@/crc
++hiscore_directory       @SPOOLDIR@/hiscore
+ snapshot_directory      .
+-cheat_directory         /usr/games/lib/xmess/cheat
++cheat_directory         @SPOOLDIR@/cheat
+ cheatfile               cheat.cdb
+-hiscore_file            /usr/games/lib/xmess/hiscore.dat
+-history_file            /usr/games/lib/xmess/history.dat
+-mameinfo_file           /usr/games/lib/xmess/mameinfo.dat
++hiscore_file            @SPOOLDIR@/hiscore.dat
++history_file            @SPOOLDIR@/history.dat
++mameinfo_file           @SPOOLDIR@/mameinfo.dat
  
- ### Mame Related ###
--defaultgame             pacman
+ ### Mess Related ###
  language                english
- fuzzycmp                1
- cheat                   0
--debug                   0
- 
- ### Frontend Related ###
- clones                  1