- Update to version 0.26.

3 files changed, 36 insertions, 12 deletions

diff --git a/emulators/wahcade/Makefile b/emulators/wahcade/Makefile
index 630305719f33..fa34165398b0 100644
--- a/emulators/wahcade/Makefile
+++ b/emulators/wahcade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wahcade
-PORTVERSION=	0.25
+PORTVERSION=	0.26
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.anti-particle.com/projects/wahcade/
 
@@ -15,28 +15,34 @@ COMMENT=	A frontend for almost any emulator (MameWAH clone)
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygtk.pth:${PORTSDIR}/x11-toolkits/py-gtk2 \
 		${PYTHON_SITELIBDIR}/cElementTree.so:${PORTSDIR}/devel/py-celementtree \
-		${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
+		${PYTHON_SITELIBDIR}/chardet/__init__.py:${PORTSDIR}/textproc/py-chardet
 
 USE_PYTHON=	2.4+
+WANT_GSTREAMER=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS=	MPLAYER "Install mplayer for movie playback" off \
-		PSYCHO "Enable psycho optimization" on
+OPTIONS=	GSTREAMER "Install gstreamer for video & music playback" on \
+		PSYCHO "Enable psycho optimization" on \
+		PYGAME "Install pygame for joystick support" off
 
 WRAPPERS=	wahcade wahcade-layout-editor wahcade-setup
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_MPLAYER)
-RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
+.if !defined(WITHOUT_GSTREAMER)
+USE_GSTREAMER=	python
 .endif
 
 .if !defined(WITHOUT_PSYCHO) && ${ARCH} == "i386"
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
 .endif
 
+.if defined(WITH_PYGAME)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
+.endif
+
 post-extract:
-	@cd ${WRKSRC} && ${RM} install && ${MV} wahcade.desktop ..
+	@cd ${WRKSRC} && ${RM} install && ${MV} *.desktop ..
 
 do-build:
 	@${MKDIR} ${WRKDIR}/bin
@@ -60,7 +66,7 @@ do-install:
 	${LN} -sf ${DATADIR}/doc ${DOCSDIR}
 .endif
 	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKDIR}/wahcade.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKDIR}/*.desktop ${PREFIX}/share/applications
 	${LN} -sf ${DATADIR}/pixmaps/wahcade.png ${PREFIX}/share/pixmaps
 
 .include <bsd.port.post.mk>
diff --git a/emulators/wahcade/distinfo b/emulators/wahcade/distinfo
index f33e0f57b27d..ee6f0dbdd469 100644
--- a/emulators/wahcade/distinfo
+++ b/emulators/wahcade/distinfo
@@ -1,3 +1,3 @@
-MD5 (wahcade-0.25.tar.gz) = 994e5c19974f522470252d8a700ce4f0
-SHA256 (wahcade-0.25.tar.gz) = 8d8af41549506102ea56da089ceea976ff7dd225f44b435072d4d81737bcd83f
-SIZE (wahcade-0.25.tar.gz) = 285944
+MD5 (wahcade-0.26.tar.gz) = 9f2bc6cacab79466cacc07dad08d98e8
+SHA256 (wahcade-0.26.tar.gz) = bd27d07ea7a60012151370c294e64994c721f6d42cb2863971905aae0546f55f
+SIZE (wahcade-0.26.tar.gz) = 291659
diff --git a/emulators/wahcade/pkg-plist b/emulators/wahcade/pkg-plist
index bc6802d3e9ba..33a6f49e1211 100644
--- a/emulators/wahcade/pkg-plist
+++ b/emulators/wahcade/pkg-plist
@@ -2,8 +2,11 @@ bin/wahcade
 bin/wahcade-layout-editor
 bin/wahcade-setup
 share/applications/wahcade.desktop
+share/applications/wahcade-layout-editor.desktop
+share/applications/wahcade-setup.desktop
 %%PORTDOCS%%%%DOCSDIR%%
 share/pixmaps/wahcade.png
+%%DATADIR%%/bdist_debian.py
 %%DATADIR%%/config.dist/cpviewer.ini
 %%DATADIR%%/config.dist/ctrlr/.dir
 %%DATADIR%%/config.dist/ctrlr/default.ini
@@ -83,14 +86,29 @@ share/pixmaps/wahcade.png
 %%DATADIR%%/pixmaps/win_scrsave.png
 %%DATADIR%%/scrolled_list.py
 %%DATADIR%%/setup.py
+%%DATADIR%%/setup.py2exe.py
 %%DATADIR%%/sv.po
+%%DATADIR%%/templates/advmame.ini
+%%DATADIR%%/templates/atari800.ini
 %%DATADIR%%/templates/default-0.ini
 %%DATADIR%%/templates/default-1.ini
 %%DATADIR%%/templates/default.ini
 %%DATADIR%%/templates/dgen.ini
-%%DATADIR%%/templates/mame.ini
+%%DATADIR%%/templates/dosbox.ini
+%%DATADIR%%/templates/fceu.ini
+%%DATADIR%%/templates/gens.ini
+%%DATADIR%%/templates/mess-colecovision.ini
+%%DATADIR%%/templates/mess-gamegear.ini
+%%DATADIR%%/templates/mess-gbcolor.ini
+%%DATADIR%%/templates/mess-genesis.ini
+%%DATADIR%%/templates/mess-mastersystem.ini
+%%DATADIR%%/templates/mess-nes.ini
+%%DATADIR%%/templates/snes9x.ini
 %%DATADIR%%/templates/stella.ini
+%%DATADIR%%/templates/vbadv.ini
 %%DATADIR%%/templates/videos.ini
+%%DATADIR%%/templates/xmame.ini
+%%DATADIR%%/templates/yabause.ini
 %%DATADIR%%/templates/zsnes.ini
 %%DATADIR%%/wahcade-layout-editor.py
 %%DATADIR%%/wahcade-setup.py