Update to 0.35beta1, provided by Miguel Mendez (maintainer) in PR

pkg/29675, this version works with our current xmame package, so
pkg/27011 has been fixed too.

4 files changed, 8 insertions, 97 deletions

diff --git a/misc/gxmame/Makefile b/misc/gxmame/Makefile
index 719ef4de2f1..57dc4d64c56 100644
--- a/misc/gxmame/Makefile
+++ b/misc/gxmame/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/12/29 09:50:00 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2005/03/15 15:55:13 xtraeme Exp $
 #
 
-DISTNAME=	gxmame-0.34b
-PKGREVISION=	4
+DISTNAME=	gxmame-0.35beta1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gxmame/}
 
@@ -12,6 +11,7 @@ COMMENT=	Frontend for XMame using the GTK2 library
 
 BUILD_USES_MSGFMT=	yes
 DEPENDS+=		xmame>=0.87:../../emulators/xmame
+DEPENDS+=               p5-XML-Parser>=2.34:../../textproc/p5-XML-Parser
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
@@ -22,5 +22,6 @@ USE_X11=		yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gxmame/distinfo b/misc/gxmame/distinfo
index db52b473abb..4a008bad397 100644
--- a/misc/gxmame/distinfo
+++ b/misc/gxmame/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:02:53 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/03/15 15:55:13 xtraeme Exp $
 
-SHA1 (gxmame-0.34b.tar.gz) = b727edd4b1ee0405c1e0bcfc1aa62eaa444c3846
-RMD160 (gxmame-0.34b.tar.gz) = 9435405761f4ccc0bcf12436b96a80cbb4fa1596
-Size (gxmame-0.34b.tar.gz) = 996919 bytes
-SHA1 (patch-aa) = 0bf55d52837c8236045de84111475a0bf7ac4db0
-SHA1 (patch-ab) = 62b1b9fb02909cdc413a565bc81cb1d95e296e81
+SHA1 (gxmame-0.35beta1.tar.gz) = f17e6826aabc2334cffb0bcbc20842af092125cb
+RMD160 (gxmame-0.35beta1.tar.gz) = 9ed42bc9c9dacca0ef1c2e48c546fbae148b937a
+Size (gxmame-0.35beta1.tar.gz) = 760894 bytes
diff --git a/misc/gxmame/patches/patch-aa b/misc/gxmame/patches/patch-aa
deleted file mode 100644
index b90c41a8855..00000000000
--- a/misc/gxmame/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/11/07 21:13:23 kristerw Exp $
-
---- src/mameio.c.orig	2003-11-26 10:38:21.000000000 +0100
-+++ src/mameio.c	2004-09-30 16:49:42.000000000 +0200
-@@ -217,7 +217,7 @@
- 		
- 	/* Generate the list */
- 	/* without including neither history nor mameinfo to have less to parse after*/
--	opt=g_strdup_printf("%s -listinfo -%s /dev/null -%s /dev/null 2>/dev/null",
-+	opt=g_strdup_printf("%s -listxml -%s /dev/null -%s /dev/null | xml2info 2>/dev/null",
- 			current_exec->path,
- 			available_options->mameinfo_file_option,
- 			available_options->history_file_option);
diff --git a/misc/gxmame/patches/patch-ab b/misc/gxmame/patches/patch-ab
deleted file mode 100644
index b1a85591323..00000000000
--- a/misc/gxmame/patches/patch-ab
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/11/07 21:13:23 kristerw Exp $
-
---- src/options.c.orig	Thu Dec 18 20:03:13 2003
-+++ src/options.c	Sun Nov  7 21:58:46 2004
-@@ -7137,7 +7137,7 @@
- 	if (strcmp((g_strstrip(target->sound_mixer_plugin)),""))
- 		sound_mixer_plugin = g_strdup_printf("-sound-mixer-plugin %s",target->sound_mixer_plugin);
- 
--	option_string = g_strdup_printf (" -%ssound "
-+	option_string = g_strdup_printf (
- 				"-%ssamples "
- 				"%s "				/* fakesound */
- 				"-samplefreq %i "
-@@ -7153,7 +7153,6 @@
- 				"%s "				/* QNX audio_preferred */
- 				"%s "				/* dsp_plugin */
- 				"%s ",				/* sound_mixer_plugin */
--				(target->sound)?"":"no",
- 				(target->samples)?"":"no",
- 				(target->fakesound)?"-fakesound":"",
- 				target->samplefre,
-@@ -7297,9 +7296,6 @@
- 						"%s "				/* vidix */
- 						"%s "				/* newext */
- 						"-%sxsync "
--						"-%sprivatecmap "
--						"-%sxil "
--						"-%smtxil "
- 						"%s ",				/* Video mode */
- 						x11mode,
- 						(target->cursor)?"":"no",
-@@ -7307,9 +7303,6 @@
- 						vidix?vidix:"",
- 						newext?newext:"",
- 						(target->xsync)?"":"no",
--						(target->privatecmap)?"":"no",
--						(target->xil)?"":"no",
--						(target->mtxil)?"":"no",
- 						Video_Mode_option?Video_Mode_option:""
- 						);
- 		}
-@@ -7323,8 +7316,6 @@
- 						"%s "				/* newext */
- 						"-%sxsync "
- 						"-%sprivatecmap "
--						"-%sxil "
--						"-%smtxil "
- 						"%s ",				/* Video mode */
- 						target->x11_mode,
- 						(target->cursor)?"":"no",
-@@ -7334,8 +7325,6 @@
- 						newext?newext:"",
- 						(target->xsync)?"":"no",
- 						(target->privatecmap)?"":"no",
--						(target->xil)?"":"no",
--						(target->mtxil)?"":"no",
- 						Video_Mode_option?Video_Mode_option:""
- 						);
- 		}
-@@ -7578,7 +7567,6 @@
- 	option_string = g_strdup_printf ("-joytype %i "
- 				"-%sanalogstick "
- 				"%s "					/* joy */
--				"-%smouse "
- 				"%s "
- 				"-%susbpspad "
- 				"-%srapidfire "
-@@ -7593,7 +7581,6 @@
- 				target->joytype,
- 				(target->analogstick)?"":"no",
- 				joy?joy:"",
--				(target->mouse)?"":"no",
- 				(ctrlr)?ctrlr:"",
- 				(target->usbpspad)?"":"no",
- 				(target->rapidfire)?"":"no",