From flynn@energyhq.es.eu.org  Wed Mar  9 18:56:01 2005
Return-Path: <flynn@energyhq.es.eu.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id ADE7516A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Mar 2005 18:56:01 +0000 (GMT)
Received: from mindfields.energyhq.es.eu.org (73.Red-213-97-200.pooles.rima-tde.net [213.97.200.73])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 55B9543D46
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Mar 2005 18:55:52 +0000 (GMT)
	(envelope-from flynn@energyhq.es.eu.org)
Received: from scienide.energyhq.es.eu.org (scienide.energyhq.es.eu.org [IPv6:2001:470:1f01:198:210:4bff:fe3d:e256])
	by mindfields.energyhq.es.eu.org (Postfix) with ESMTP id D886F362E4
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Mar 2005 19:55:58 +0100 (CET)
Message-Id: <1110394485.0@scienide.energyhq.es.eu.org>
Date: Wed, 9 Mar 2005 19:54:45 +0100
From: "Miguel Mendez" <flynn@energyhq.es.eu.org>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [Maintainer Update] emulators/gxame update to 0.35 beta1
X-Send-Pr-Version: gtk-send-pr 0.4.4 
X-GNATS-Notify:

>Number:         78643
>Category:       ports
>Synopsis:       [Maintainer Update] emulators/gxame update to 0.35 beta1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    vs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 09 19:00:18 GMT 2005
>Closed-Date:    Sat Mar 12 09:28:50 GMT 2005
>Last-Modified:  Sat Mar 12 09:28:50 GMT 2005
>Originator:     Miguel Mendez
>Release:        FreeBSD 5.4-PRERELEASE i386
>Organization:
>Environment:


System: FreeBSD 5.4-PRERELEASE #0: Mon Feb 28 20:41:06 CET 2005
    root@scienide.energyhq.es.eu.org:/usr/obj/usr/src/sys/SCIENIDE.SMP



>Description:


Full Changelog: http://sourceforge.net/project/shownotes.php?group_id=50621&release_id=301071

Old patches are gone (patch-src::mameio.c patch-src::options.c)

This version works with recent xmame versions (tested with 0.92), it was
marked as i386 only, I do believe it should work on any arch mame runs on.

Fixed PLIST as well.


>How-To-Repeat:





>Fix:


--- gxmame.diff begins here ---
diff -ruN gxmame.old/Makefile gxmame/Makefile
--- gxmame.old/Makefile	Mon Feb 28 01:57:57 2005
+++ gxmame/Makefile	Wed Mar  9 19:49:43 2005
@@ -6,31 +6,34 @@
 #
 
 PORTNAME=	gxmame
-PORTVERSION=	0.34b
-PORTREVISION=	7
+PORTVERSION=	0.35
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION}beta1
 
 MAINTAINER=	flynn@energyhq.es.eu.org
 COMMENT=	GXmame is a GTK frontend for xmame
 
+LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 RUN_DEPENDS=	xmame:${PORTSDIR}/emulators/xmame
 
-BROKEN=		Incomplete pkg-plist
-
 USE_GETTEXT=	yes
 USE_GZIP=	yes
 USE_ICONV=	yes
 USE_XLIB=	yes
 USE_GNOME=	gtk20
+USE_GMAKE=	yes
 USE_REINPLACE=	yes
-ONLY_FOR_ARCHS=	i386
+#ONLY_FOR_ARCHS=	i386
 
 DOCDIR=		share/doc/${PORTNAME}
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--with-xmame-dir=${X11BASE}/share/xmame
+
+pre-configure:
+	@${REINPLACE_CMD} -e 's|LIBS="-lexpat|LIBS="-L${LOCALBASE}/lib -lexpat|' ${WRKSRC}/configure
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|$$(top_builddir)/./mkinstalldirs|./mkinstalldirs|' ${WRKSRC}/intl/Makefile
diff -ruN gxmame.old/distinfo gxmame/distinfo
--- gxmame.old/distinfo	Wed Mar 31 05:07:41 2004
+++ gxmame/distinfo	Wed Mar  9 19:13:25 2005
@@ -1,2 +1,2 @@
-MD5 (gxmame-0.34b.tar.gz) = c34e3b256366a67ed3b2270eda1ee75d
-SIZE (gxmame-0.34b.tar.gz) = 996919
+MD5 (gxmame-0.35beta1.tar.gz) = f5eac2b6e397a9a1996ecaef1c5b8a20
+SIZE (gxmame-0.35beta1.tar.gz) = 760894
diff -ruN gxmame.old/files/patch-src::mameio.c gxmame/files/patch-src::mameio.c
--- gxmame.old/files/patch-src::mameio.c	Tue Oct 12 00:38:54 2004
+++ gxmame/files/patch-src::mameio.c	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- src/mameio.c.orig	Wed Nov 26 10:38:21 2003
-+++ src/mameio.c	Wed Sep  1 18:14:39 2004
-@@ -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/files/patch-src::options.c gxmame/files/patch-src::options.c
--- gxmame.old/files/patch-src::options.c	Thu Oct 28 16:10:03 2004
+++ gxmame/files/patch-src::options.c	Thu Jan  1 01:00:00 1970
@@ -1,38 +0,0 @@
---- src/options.c.orig	Sat Oct 23 18:16:28 2004
-+++ src/options.c	Sat Oct 23 18:17:37 2004
-@@ -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:""
- 						);
- 		}
diff -ruN gxmame.old/pkg-plist gxmame/pkg-plist
--- gxmame.old/pkg-plist	Sun Dec 21 03:39:23 2003
+++ gxmame/pkg-plist	Wed Mar  9 19:32:34 2005
@@ -31,3 +31,6 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/gui
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rmdir %D/share/icons/mini 2>/dev/null || true
+@unexec rmdir %D/share/icons 2>/dev/null || true
+@unexec rmdir %D/share/applications 2>/dev/null || true
--- gxmame.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->vs 
Responsible-Changed-By: vs 
Responsible-Changed-When: Fri Mar 11 17:25:30 GMT 2005 
Responsible-Changed-Why:  
Grab. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=78643 
State-Changed-From-To: open->closed 
State-Changed-By: vs 
State-Changed-When: Sat Mar 12 09:28:32 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=78643 
>Unformatted:
