7 files changed, 50 insertions, 89 deletions

diff --git a/emulators/gsnes9x/Makefile b/emulators/gsnes9x/Makefile
index a0f1b7f40983..9276f55f222f 100644
--- a/emulators/gsnes9x/Makefile
+++ b/emulators/gsnes9x/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gsnes9x
-PORTVERSION=	3.10
+PORTVERSION=	3.12
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,32 +17,19 @@ COMMENT=	A GTK front-end for the Snes9X SNES emulator
 
 RUN_DEPENDS=	snes9x:${PORTSDIR}/emulators/snes9x
 
-GNU_CONFIGURE=	yes
-USE_GNOME=	gnomelibs
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-
-CONFIGURE_ARGS=	--without-included-gettext \
-		--with-esd
-
-.if defined(NOPORTDOCS)
-
-PLIST=	${FILESDIR}/PLIST.nodocs
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/GSnes9x ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/share/gnome \
-		  ${PREFIX}/share/gnome/apps \
-		  ${PREFIX}/share/gnome/apps/Games \
-		  ${PREFIX}/share/gnome/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/gsnes9x.desktop \
-			${PREFIX}/share/gnome/apps/Games/gsnes9x.desktop
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/gsnesdefault.png \
-			${PREFIX}/share/gnome/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/gsnes9x-icon.png \
-			${PREFIX}/share/gnome/pixmaps
-.else
-PLIST=	${FILESDIR}/PLIST.docs
-.endif
+USE_GNOME=	gnomehack gnomeprefix gnomelibs
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+		AUTOHEADER="${TRUE}"
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|^SUBDIRS = intl|SUBDIRS =|g ; \
+		 s|@INTLLIBS@|-lintl|g ; \
+		 s|@INTLDEPS@||g'
 
 .include <bsd.port.mk>
diff --git a/emulators/gsnes9x/distinfo b/emulators/gsnes9x/distinfo
index 8332273b7e98..3c04d1cebd11 100644
--- a/emulators/gsnes9x/distinfo
+++ b/emulators/gsnes9x/distinfo
@@ -1 +1 @@
-MD5 (GSnes9x-3.10.tar.gz) = f51fe79c480b439e6a381bb1729daccd
+MD5 (GSnes9x-3.12.tar.gz) = c8f4631b9ddbf7f513c2af322d12bcc5
diff --git a/emulators/gsnes9x/files/PLIST.docs b/emulators/gsnes9x/files/PLIST.docs
deleted file mode 100644
index 5828977d508c..000000000000
--- a/emulators/gsnes9x/files/PLIST.docs
+++ /dev/null
@@ -1,33 +0,0 @@
-bin/GSnes9x
-share/gnome/help/GSnes9x/C/index.html
-share/gnome/help/GSnes9x/C/topic.dat
-share/gnome/help/GSnes9x/C/addrom.png
-share/gnome/help/GSnes9x/C/cheat.png
-share/gnome/help/GSnes9x/C/codes.png
-share/gnome/help/GSnes9x/C/format.png
-share/gnome/help/GSnes9x/C/info.png
-share/gnome/help/GSnes9x/C/joystick.png
-share/gnome/help/GSnes9x/C/main.png
-share/gnome/help/GSnes9x/C/pop.png
-share/gnome/help/GSnes9x/C/system.png
-share/gnome/help/GSnes9x/C/tooltips.png
-share/gnome/help/GSnes9x/es/index.html
-share/gnome/help/GSnes9x/es/topic.dat
-share/gnome/help/GSnes9x/es/addrom.png
-share/gnome/help/GSnes9x/es/cheat.png
-share/gnome/help/GSnes9x/es/codes.png
-share/gnome/help/GSnes9x/es/format.png
-share/gnome/help/GSnes9x/es/info.png
-share/gnome/help/GSnes9x/es/joystick.png
-share/gnome/help/GSnes9x/es/main.png
-share/gnome/help/GSnes9x/es/pop.png
-share/gnome/help/GSnes9x/es/system.png
-share/gnome/help/GSnes9x/es/tooltips.png
-share/gnome/apps/Games/gsnes9x.desktop
-share/gnome/pixmaps/gsnesdefault.png
-share/gnome/pixmaps/gsnes9x-icon.png
-share/locale/es/LC_MESSAGES/GSnes9x.mo
-share/locale/no/LC_MESSAGES/GSnes9x.mo
-@dirrm share/gnome/help/GSnes9x/C
-@dirrm share/gnome/help/GSnes9x/es
-@dirrm share/gnome/help/GSnes9x
diff --git a/emulators/gsnes9x/files/PLIST.nodocs b/emulators/gsnes9x/files/PLIST.nodocs
deleted file mode 100644
index 42bc03bb45e7..000000000000
--- a/emulators/gsnes9x/files/PLIST.nodocs
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/GSnes9x
-share/gnome/apps/Games/gsnes9x.desktop
-share/gnome/pixmaps/gsnesdefault.png
-share/gnome/pixmaps/gsnes9x-icon.png
-share/locale/es/LC_MESSAGES/GSnes9x.mo
-share/locale/no/LC_MESSAGES/GSnes9x.mo
diff --git a/emulators/gsnes9x/files/patch-ac b/emulators/gsnes9x/files/patch-ac
deleted file mode 100644
index b3fe10d1b18a..000000000000
--- a/emulators/gsnes9x/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- pixmaps/Makefile.in.orig	Sun Jun 18 18:54:02 2000
-+++ pixmaps/Makefile.in	Sun Jun 18 18:54:55 2000
-@@ -99,7 +99,7 @@
- ZVT_LIBS = @ZVT_LIBS@
- l = @l@
- 
--pixmapdir = $(datadir)/pixmaps
-+pixmapdir = $(datadir)/gnome/pixmaps
- 
- pixmap_DATA =  	gsnesdefault.png 	gsnes9x-icon.png
- 
diff --git a/emulators/gsnes9x/files/patch-ad b/emulators/gsnes9x/files/patch-ad
deleted file mode 100644
index 18ddddfcb051..000000000000
--- a/emulators/gsnes9x/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Sun Jun 18 19:43:21 2000
-+++ src/Makefile.in	Sun Jun 18 19:43:35 2000
-@@ -101,7 +101,7 @@
- 
- bin_PROGRAMS = GSnes9x
- 
--INCLUDES = $(GNOME_INCLUDEDIR) -DG_LOG_DOMAIN=\"GSnes9x\" -I$(top_srcdir)/intl 	-DLOCALEDIR=\"$(datadir)/locale\" -DPIXMAPDIR=\"$(datadir)/pixmaps\"
-+INCLUDES = $(GNOME_INCLUDEDIR) -DG_LOG_DOMAIN=\"GSnes9x\" -I$(top_srcdir)/intl 	-DLOCALEDIR=\"$(datadir)/locale\" -DPIXMAPDIR=\"$(datadir)/gnome/pixmaps\"
- 
- 
- CFLAGS =  -Wall @CFLAGS@
diff --git a/emulators/gsnes9x/pkg-plist b/emulators/gsnes9x/pkg-plist
index e69de29bb2d1..b981b51adc52 100644
--- a/emulators/gsnes9x/pkg-plist
+++ b/emulators/gsnes9x/pkg-plist
@@ -0,0 +1,35 @@
+bin/GSnes9x
+share/gnome/apps/Games/gsnes9x.desktop
+share/gnome/help/GSnes9x/C/addrom.png
+share/gnome/help/GSnes9x/C/cheat.png
+share/gnome/help/GSnes9x/C/codes.png
+share/gnome/help/GSnes9x/C/format.png
+share/gnome/help/GSnes9x/C/help-2.html
+share/gnome/help/GSnes9x/C/index.html
+share/gnome/help/GSnes9x/C/info.png
+share/gnome/help/GSnes9x/C/joystick.png
+share/gnome/help/GSnes9x/C/main.png
+share/gnome/help/GSnes9x/C/pop.png
+share/gnome/help/GSnes9x/C/readme-snes9x.html
+share/gnome/help/GSnes9x/C/system.png
+share/gnome/help/GSnes9x/C/tooltips.png
+share/gnome/help/GSnes9x/C/topic.dat
+share/gnome/help/GSnes9x/es/addrom.png
+share/gnome/help/GSnes9x/es/cheat.png
+share/gnome/help/GSnes9x/es/codes.png
+share/gnome/help/GSnes9x/es/format.png
+share/gnome/help/GSnes9x/es/index.html
+share/gnome/help/GSnes9x/es/info.png
+share/gnome/help/GSnes9x/es/joystick.png
+share/gnome/help/GSnes9x/es/main.png
+share/gnome/help/GSnes9x/es/pop.png
+share/gnome/help/GSnes9x/es/system.png
+share/gnome/help/GSnes9x/es/tooltips.png
+share/gnome/help/GSnes9x/es/topic.dat
+share/gnome/pixmaps/gsnes9x-icon.png
+share/gnome/pixmaps/gsnesdefault.png
+share/locale/es/LC_MESSAGES/GSnes9x.mo
+share/locale/no/LC_MESSAGES/GSnes9x.mo
+@dirrm share/gnome/help/GSnes9x/es
+@dirrm share/gnome/help/GSnes9x/C
+@dirrm share/gnome/help/GSnes9x