Unbreak & update to 0.35 beta1

PR:		ports/78643
Submitted by:	maintainer

5 files changed, 11 insertions, 57 deletions

diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile
index e55dd399c378..ee3edc332aa6 100644
--- a/emulators/gxmame/Makefile
+++ b/emulators/gxmame/Makefile
@@ -6,30 +6,30 @@
 #
 
 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_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-xmame-dir=${X11BASE}/share/xmame
 
 post-configure:
diff --git a/emulators/gxmame/distinfo b/emulators/gxmame/distinfo
index a9426704f146..57910515a124 100644
--- a/emulators/gxmame/distinfo
+++ b/emulators/gxmame/distinfo
@@ -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 --git a/emulators/gxmame/files/patch-src::mameio.c b/emulators/gxmame/files/patch-src::mameio.c
deleted file mode 100644
index cae61e507d99..000000000000
--- a/emulators/gxmame/files/patch-src::mameio.c
+++ /dev/null
@@ -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 --git a/emulators/gxmame/files/patch-src::options.c b/emulators/gxmame/files/patch-src::options.c
deleted file mode 100644
index 27c49415f596..000000000000
--- a/emulators/gxmame/files/patch-src::options.c
+++ /dev/null
@@ -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 --git a/emulators/gxmame/pkg-plist b/emulators/gxmame/pkg-plist
index 3c49a6ec4328..4f90e966850c 100644
--- a/emulators/gxmame/pkg-plist
+++ b/emulators/gxmame/pkg-plist
@@ -31,3 +31,6 @@ share/icons/mini/gxmame.xpm
 %%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