- Update pkg-message.

- Add missing pkg-plist entries.

3 files changed, 46 insertions, 35 deletions

diff --git a/emulators/wahcade/Makefile b/emulators/wahcade/Makefile
index d44f31c34100..ed866afa9b23 100644
--- a/emulators/wahcade/Makefile
+++ b/emulators/wahcade/Makefile
@@ -36,33 +36,32 @@ RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
 .endif
 
+post-extract:
+	@cd ${WRKSRC} && ${RM} install && ${MV} wahcade.desktop ..
+
 do-build:
+	@${MKDIR} ${WRKDIR}/bin
 .for f in ${WRAPPERS}
 	@(${ECHO_CMD} "#!${SH}"; \
 	  ${ECHO_CMD} "cd ${DATADIR} || exit 1"; \
 	  ${ECHO_CMD} 'exec ${PYTHON_CMD} ${f}.py "$$@"') \
-	  > ${WRKSRC}/${f}
+	  > ${WRKDIR}/bin/${f}
 .endfor
 
 do-install:
 .for f in ${WRAPPERS}
-	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/bin/${f} ${PREFIX}/bin
 .endfor
 	${MKDIR} ${DATADIR}
-.for f in *.py config.dist glade locale pixmaps templates
-	${CP} -R ${WRKSRC}/${f} ${DATADIR}
-.endfor
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop \
-		${PREFIX}/share/applications
+	${CP} -R ${WRKSRC}/* ${DATADIR}
 	@${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} ${BINMODE}
 	@${FIND} ${DATADIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}
-	@${FIND} ${DOCSDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} ${BINMODE}
-	@${FIND} ${DOCSDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
+	${LN} -sf ${DATADIR}/doc ${DOCSDIR}
 .endif
+	${MKDIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKDIR}/wahcade.desktop ${PREFIX}/share/applications
+	${LN} -sf ${DATADIR}/pixmaps/wahcade.png ${PREFIX}/share/pixmaps
 
 post-install:
 	@${ECHO_CMD}
diff --git a/emulators/wahcade/files/pkg-message.in b/emulators/wahcade/files/pkg-message.in
index 9d872a06a40c..914f2b12e6ba 100644
--- a/emulators/wahcade/files/pkg-message.in
+++ b/emulators/wahcade/files/pkg-message.in
@@ -9,7 +9,7 @@ When Wah!Cade is first run these files are copied into the user's
 "~/.wahcade" directory. But as they are read-only and permissions are
 preserved during the copy, you have to run the following command (only once):
 
-$ find ~/.wahcade -type f -name "*.ini" | xargs chmod u+w
+$ find ~/.wahcade | xargs chmod u+w
 
 Please read the README file for information on initial setup & configuration
 in "%%DOCSDIR%%".
diff --git a/emulators/wahcade/pkg-plist b/emulators/wahcade/pkg-plist
index ada011453a6a..8d839d2aead9 100644
--- a/emulators/wahcade/pkg-plist
+++ b/emulators/wahcade/pkg-plist
@@ -2,24 +2,8 @@ bin/wahcade
 bin/wahcade-layout-editor
 bin/wahcade-setup
 share/applications/wahcade.desktop
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/INI_FILES
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/KEYS
-%%PORTDOCS%%%%DOCSDIR%%/LAYOUT_EDITOR
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/SETUP_EDITOR
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/file_formats/fav_format.txt
-%%PORTDOCS%%%%DOCSDIR%%/file_formats/filter_format.txt
-%%PORTDOCS%%%%DOCSDIR%%/file_formats/gamelist_format.txt
-%%PORTDOCS%%%%DOCSDIR%%/file_formats/layout_format.txt
-%%PORTDOCS%%%%DOCSDIR%%/xmame/xmame-x11rc
-%%PORTDOCS%%%%DOCSDIR%%/xmame/xmame-x11rc.pre88
-%%PORTDOCS%%%%DOCSDIR%%/xmame/xmamerc
-%%PORTDOCS%%%%DOCSDIR%%/xmame/xmamerc.post105
-%%PORTDOCS%%%%DOCSDIR%%/xmame/xmamerc.pre88
+%%PORTDOCS%%%%DOCSDIR%%
+share/pixmaps/wahcade.png
 %%DATADIR%%/config.dist/cpviewer.ini
 %%DATADIR%%/config.dist/ctrlr/.dir
 %%DATADIR%%/config.dist/ctrlr/default.ini
@@ -42,7 +26,29 @@ share/applications/wahcade.desktop
 %%DATADIR%%/config.dist/layouts/histview/example.lay
 %%DATADIR%%/config.dist/wahcade.ini
 %%DATADIR%%/constants.py
+%%DATADIR%%/doc/CHANGELOG
+%%DATADIR%%/doc/COPYING
+%%DATADIR%%/doc/INI_FILES
+%%DATADIR%%/doc/INSTALL
+%%DATADIR%%/doc/KEYS
+%%DATADIR%%/doc/LAYOUT_EDITOR
+%%DATADIR%%/doc/README
+%%DATADIR%%/doc/SETUP_EDITOR
+%%DATADIR%%/doc/TODO
+%%DATADIR%%/doc/file_formats/fav_format.txt
+%%DATADIR%%/doc/file_formats/filter_format.txt
+%%DATADIR%%/doc/file_formats/gamelist_format.txt
+%%DATADIR%%/doc/file_formats/layout_format.txt
+%%DATADIR%%/doc/xmame/xmame-x11rc
+%%DATADIR%%/doc/xmame/xmame-x11rc.pre88
+%%DATADIR%%/doc/xmame/xmamerc
+%%DATADIR%%/doc/xmame/xmamerc.post105
+%%DATADIR%%/doc/xmame/xmamerc.pre88
+%%DATADIR%%/en.po
+%%DATADIR%%/en_GB.po
+%%DATADIR%%/es.po
 %%DATADIR%%/filters.py
+%%DATADIR%%/fr.po
 %%DATADIR%%/glade/layout_editor.glade
 %%DATADIR%%/glade/wahcade_setup.glade
 %%DATADIR%%/glade/win_cpviewer.png
@@ -52,17 +58,19 @@ share/applications/wahcade.desktop
 %%DATADIR%%/glade/win_options.png
 %%DATADIR%%/glade/win_scrsave.png
 %%DATADIR%%/glade2.py
+%%DATADIR%%/gst_video.py
 %%DATADIR%%/key_consts.py
 %%DATADIR%%/layout_editor.py
 %%DATADIR%%/layout_props.py
 %%DATADIR%%/layout_scr_props.py
+%%DATADIR%%/locale/de/LC_MESSAGES/wahcade.mo
 %%DATADIR%%/locale/en/LC_MESSAGES/wahcade.mo
 %%DATADIR%%/locale/en_GB/LC_MESSAGES/wahcade.mo
 %%DATADIR%%/locale/es/LC_MESSAGES/wahcade.mo
 %%DATADIR%%/locale/fr/LC_MESSAGES/wahcade.mo
 %%DATADIR%%/locale/sv/LC_MESSAGES/wahcade.mo
 %%DATADIR%%/mamewah_ini.py
-%%DATADIR%%/mplayer.py
+%%DATADIR%%/messages.pot
 %%DATADIR%%/pixmaps/empty.png
 %%DATADIR%%/pixmaps/wahcade-logo.png
 %%DATADIR%%/pixmaps/wahcade.ico
@@ -73,8 +81,10 @@ share/applications/wahcade.desktop
 %%DATADIR%%/pixmaps/win_msg.png
 %%DATADIR%%/pixmaps/win_options.png
 %%DATADIR%%/pixmaps/win_scrsave.png
+%%DATADIR%%/run_emu.bat
 %%DATADIR%%/scrolled_list.py
 %%DATADIR%%/setup.py
+%%DATADIR%%/sv.po
 %%DATADIR%%/templates/new_emulator-0.ini
 %%DATADIR%%/templates/new_emulator-1.ini
 %%DATADIR%%/templates/new_emulator.ini
@@ -102,8 +112,13 @@ share/applications/wahcade.desktop
 @dirrm %%DATADIR%%/locale/en_GB
 @dirrm %%DATADIR%%/locale/en/LC_MESSAGES
 @dirrm %%DATADIR%%/locale/en
+@dirrm %%DATADIR%%/locale/de/LC_MESSAGES
+@dirrm %%DATADIR%%/locale/de
 @dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/doc/xmame
+@dirrm %%DATADIR%%/doc/file_formats
+@dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/config.dist/layouts/histview
 @dirrm %%DATADIR%%/config.dist/layouts/cpviewer
 @dirrm %%DATADIR%%/config.dist/layouts/classic_800x600
@@ -115,7 +130,4 @@ share/applications/wahcade.desktop
 @dirrm %%DATADIR%%/config.dist/ctrlr
 @dirrm %%DATADIR%%/config.dist
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/xmame
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/file_formats
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications