3 files changed, 69 insertions, 30 deletions

diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile
index ed7eb49a98b0..5f5579bdf694 100644
--- a/emulators/mupen64plus-core/Makefile
+++ b/emulators/mupen64plus-core/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mupen64plus
 PORTVERSION?=	1.5
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMESUFFIX?=	-base
diff --git a/emulators/mupen64plus-core/Makefile.common b/emulators/mupen64plus-core/Makefile.common
index 00babd5193bf..3f0b8f52489f 100644
--- a/emulators/mupen64plus-core/Makefile.common
+++ b/emulators/mupen64plus-core/Makefile.common
@@ -35,7 +35,7 @@ PLIST_SUB+=	TRANSLATIONS="@comment "
 ALL_TARGET=		mupen64plus
 EXTRACT_AFTER_ARGS+=	"${DISTNAME}/RELEASE" "${DISTNAME}/README" "${DISTNAME}/doc/*" "${DISTNAME}/lang/*" \
 				"${DISTNAME}/icons/*" "${DISTNAME}/memory/*" "${DISTNAME}/r4300/*" "${DISTNAME}/debugger/*" \
-						"${DISTNAME}/translations/*"
+						"${DISTNAME}/translations/*" "${DISTNAME}/fonts/*"
 
 MAN1=			mupen64plus.1
 .else
@@ -158,13 +158,16 @@ do-install:
 	@${MKDIR} ${DATADIR}/config
 	${INSTALL_DATA} ${WRKSRC}/config/mupen64plus.conf ${DATADIR}/config/
 
+	@${MKDIR} ${DATADIR}/fonts
+	${INSTALL_DATA} ${WRKSRC}/fonts/font.ttf ${DATADIR}/fonts/
+
 	@${MKDIR} ${DATADIR}/lang
 	${INSTALL_DATA} ${WRKSRC}/lang/* ${DATADIR}/lang/
 
 	@${MKDIR} ${DATADIR}/icons
 	@cd ${WRKSRC}/icons && \
 		${FIND} * -type d -exec ${MKDIR} "${DATADIR}/icons/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_DATA} "${WRKSRC}/icons/{}" "${DATADIR}/icons/" \;
+			${FIND} * -type f -exec ${INSTALL_DATA} "${WRKSRC}/icons/{}" "${DATADIR}/icons/{}" \;
 
 	@${MKDIR} ${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${DESKTOPDIR}
diff --git a/emulators/mupen64plus-core/pkg-plist b/emulators/mupen64plus-core/pkg-plist
index f320fb3c4721..a58fe74167a2 100644
--- a/emulators/mupen64plus-core/pkg-plist
+++ b/emulators/mupen64plus-core/pkg-plist
@@ -1,32 +1,67 @@
 bin/mupen64plus
 share/applications/mupen64plus.desktop
 %%DATADIR%%/config/mupen64plus.conf
-%%DATADIR%%/icons/view-fullscreen.png
-%%DATADIR%%/icons/cpu.png
-%%DATADIR%%/icons/preferences-system.png
-%%DATADIR%%/icons/media-playback-stop.png
-%%DATADIR%%/icons/audio-card.png
-%%DATADIR%%/icons/edit-delete.png
-%%DATADIR%%/icons/input-gaming.png
-%%DATADIR%%/icons/video-display.png
-%%DATADIR%%/icons/document-open.png
-%%DATADIR%%/icons/document-save-all.png
-%%DATADIR%%/icons/mupen64plus.png
-%%DATADIR%%/icons/gtk-about.png
-%%DATADIR%%/icons/document-save-as.png
-%%DATADIR%%/icons/application-exit.png
-%%DATADIR%%/icons/window-close.png
-%%DATADIR%%/icons/star.png
-%%DATADIR%%/icons/media-playback-pause.png
-%%DATADIR%%/icons/document-save.png
-%%DATADIR%%/icons/mupen64cart.png
-%%DATADIR%%/icons/document-revert.png
-%%DATADIR%%/icons/view-refresh.png
-%%DATADIR%%/icons/media-playback-start.png
-%%DATADIR%%/icons/document-properties.png
-%%DATADIR%%/icons/dialog-warning.png
-%%DATADIR%%/icons/dialog-error.png
-%%DATADIR%%/icons/dialog-question.png
+%%DATADIR%%/fonts/font.ttf
+%%DATADIR%%/lang/english.lng
+%%DATADIR%%/icons/16x16/view-fullscreen.png
+%%DATADIR%%/icons/16x16/cpu.png
+%%DATADIR%%/icons/16x16/preferences-system.png
+%%DATADIR%%/icons/16x16/media-playback-stop.png
+%%DATADIR%%/icons/16x16/audio-card.png
+%%DATADIR%%/icons/16x16/edit-delete.png
+%%DATADIR%%/icons/16x16/input-gaming.png
+%%DATADIR%%/icons/16x16/video-display.png
+%%DATADIR%%/icons/16x16/document-open.png
+%%DATADIR%%/icons/16x16/document-save-all.png
+%%DATADIR%%/icons/16x16/mupen64plus.png
+%%DATADIR%%/icons/16x16/gtk-about.png
+%%DATADIR%%/icons/16x16/document-save-as.png
+%%DATADIR%%/icons/16x16/application-exit.png
+%%DATADIR%%/icons/16x16/window-close.png
+%%DATADIR%%/icons/16x16/star.png
+%%DATADIR%%/icons/16x16/media-playback-pause.png
+%%DATADIR%%/icons/16x16/document-save.png
+%%DATADIR%%/icons/16x16/mupen64cart.png
+%%DATADIR%%/icons/16x16/document-revert.png
+%%DATADIR%%/icons/16x16/view-refresh.png
+%%DATADIR%%/icons/16x16/media-playback-start.png
+%%DATADIR%%/icons/16x16/document-properties.png
+%%DATADIR%%/icons/22x22/view-fullscreen.png
+%%DATADIR%%/icons/22x22/preferences-system.png
+%%DATADIR%%/icons/22x22/media-playback-stop.png
+%%DATADIR%%/icons/22x22/edit-delete.png
+%%DATADIR%%/icons/22x22/document-open.png
+%%DATADIR%%/icons/22x22/document-save-as.png
+%%DATADIR%%/icons/22x22/star.png
+%%DATADIR%%/icons/22x22/media-playback-pause.png
+%%DATADIR%%/icons/22x22/document-save.png
+%%DATADIR%%/icons/22x22/mupen64cart.png
+%%DATADIR%%/icons/22x22/document-revert.png
+%%DATADIR%%/icons/22x22/view-refresh.png
+%%DATADIR%%/icons/22x22/media-playback-start.png
+%%DATADIR%%/icons/22x22/document-properties.png
+%%DATADIR%%/icons/32x32/view-fullscreen.png
+%%DATADIR%%/icons/32x32/cpu.png
+%%DATADIR%%/icons/32x32/preferences-system.png
+%%DATADIR%%/icons/32x32/media-playback-stop.png
+%%DATADIR%%/icons/32x32/audio-card.png
+%%DATADIR%%/icons/32x32/edit-delete.png
+%%DATADIR%%/icons/32x32/input-gaming.png
+%%DATADIR%%/icons/32x32/video-display.png
+%%DATADIR%%/icons/32x32/document-open.png
+%%DATADIR%%/icons/32x32/dialog-warning.png
+%%DATADIR%%/icons/32x32/mupen64plus.png
+%%DATADIR%%/icons/32x32/document-save-as.png
+%%DATADIR%%/icons/32x32/star.png
+%%DATADIR%%/icons/32x32/media-playback-pause.png
+%%DATADIR%%/icons/32x32/dialog-error.png
+%%DATADIR%%/icons/32x32/document-save.png
+%%DATADIR%%/icons/32x32/dialog-question.png
+%%DATADIR%%/icons/32x32/mupen64cart.png
+%%DATADIR%%/icons/32x32/document-revert.png
+%%DATADIR%%/icons/32x32/view-refresh.png
+%%DATADIR%%/icons/32x32/media-playback-start.png
+%%DATADIR%%/icons/32x32/document-properties.png
 %%DATADIR%%/icons/LICENSES
 %%DATADIR%%/icons/applications-utilities.png
 %%DATADIR%%/icons/australia.png
@@ -42,9 +77,9 @@ share/applications/mupen64plus.desktop
 %%DATADIR%%/icons/mupen64plus-large.png
 %%DATADIR%%/icons/mupen64plus.svg
 %%DATADIR%%/icons/preferences-system-network.png
+%%DATADIR%%/icons/preferences-system.png
 %%DATADIR%%/icons/spain.png
 %%DATADIR%%/icons/usa.png
-%%DATADIR%%/lang/english.lng
 %%TRANSLATIONS%%%%DATADIR%%/translations/mupen64plus_de.ts
 %%TRANSLATIONS%%%%DATADIR%%/translations/mupen64plus_en.ts
 %%TRANSLATIONS%%%%DATADIR%%/translations/mupen64plus_nb.ts
@@ -56,6 +91,7 @@ share/applications/mupen64plus.desktop
 @dirrm %%DATADIR%%/icons/22x22
 @dirrm %%DATADIR%%/icons/16x16
 @dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/lang
 @dirrmtry %%DATADIR%%/config
 @dirrmtry %%DATADIR%%/plugins