>Number:         27090
>Category:       pkg
>Synopsis:       Fix misc/gxmame
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Sep 30 15:42:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Miguel Mendez
>Release:        NetBSD 2.0_RC1 i386
>Organization:
100% des free 
>Environment:


System: NetBSD 2.0_RC1 (GENERIC.MP) #0: Mon Sep 27 12:08:14 UTC 2004
	autobuild@tgm.netbsd.org:/autobuild/netbsd-2-0/i386/OBJ/autobuild/netbsd-2-0/src/sys/arch/i386/compile/GENERIC.MP



>Description:


gxmame doesn't work with newer versions of xmame.
Add 2 patches that fix the problem and bump revision.
Pick maintainership since this package is currently orphaned.



>How-To-Repeat:


cd /usr/pkgsrc/misc && patch -p0 < gxmame.diff



>Fix:


--- gxmame.diff begins here ---
diff -ruN gxmame.old/Makefile gxmame/Makefile
--- gxmame.old/Makefile	2004-05-07 03:14:48.000000000 +0200
+++ gxmame/Makefile	2004-09-30 17:12:59.000000000 +0200
@@ -2,11 +2,11 @@
 #
 
 DISTNAME=	gxmame-0.34b
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gxmame/}
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	flynn@energyhq.es.eu.org
 HOMEPAGE=	http://gxmame.sourceforge.net/
 COMMENT=	Frontend for XMame using the GTK2 library
 
diff -ruN gxmame.old/distinfo gxmame/distinfo
--- gxmame.old/distinfo	2003-12-23 10:02:39.000000000 +0100
+++ gxmame/distinfo	2004-09-30 17:03:56.000000000 +0200
@@ -2,3 +2,5 @@
 
 SHA1 (gxmame-0.34b.tar.gz) = b727edd4b1ee0405c1e0bcfc1aa62eaa444c3846
 Size (gxmame-0.34b.tar.gz) = 996919 bytes
+SHA1 (patch-aa) = 0bf55d52837c8236045de84111475a0bf7ac4db0
+SHA1 (patch-ab) = 5fe94eab489637a20548abb0df84c6846ed25464
diff -ruN gxmame.old/patches/patch-aa gxmame/patches/patch-aa
--- gxmame.old/patches/patch-aa	1970-01-01 01:00:00.000000000 +0100
+++ gxmame/patches/patch-aa	2004-09-30 16:50:56.000000000 +0200
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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 -ruN gxmame.old/patches/patch-ab gxmame/patches/patch-ab
--- gxmame.old/patches/patch-ab	1970-01-01 01:00:00.000000000 +0100
+++ gxmame/patches/patch-ab	2004-09-30 17:03:39.000000000 +0200
@@ -0,0 +1,40 @@
+$NetBSD$
+
+--- src/options.c.orig	2004-09-30 17:00:40.000000000 +0200
++++ src/options.c	2004-09-30 17:02:40.000000000 +0200
+@@ -7298,8 +7298,6 @@
+ 						"%s "				/* newext */
+ 						"-%sxsync "
+ 						"-%sprivatecmap "
+-						"-%sxil "
+-						"-%smtxil "
+ 						"%s ",				/* Video mode */
+ 						x11mode,
+ 						(target->cursor)?"":"no",
+@@ -7308,8 +7306,6 @@
+ 						newext?newext:"",
+ 						(target->xsync)?"":"no",
+ 						(target->privatecmap)?"":"no",
+-						(target->xil)?"":"no",
+-						(target->mtxil)?"":"no",
+ 						Video_Mode_option?Video_Mode_option:""
+ 						);
+ 		}
+@@ -7323,8 +7319,6 @@
+ 						"%s "				/* newext */
+ 						"-%sxsync "
+ 						"-%sprivatecmap "
+-						"-%sxil "
+-						"-%smtxil "
+ 						"%s ",				/* Video mode */
+ 						target->x11_mode,
+ 						(target->cursor)?"":"no",
+@@ -7334,8 +7328,6 @@
+ 						newext?newext:"",
+ 						(target->xsync)?"":"no",
+ 						(target->privatecmap)?"":"no",
+-						(target->xil)?"":"no",
+-						(target->mtxil)?"":"no",
+ 						Video_Mode_option?Video_Mode_option:""
+ 						);
+ 		}
--- gxmame.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: