4 files changed, 55 insertions, 43 deletions

diff --git a/emulators/mupen64/Makefile b/emulators/mupen64/Makefile
index 1aca9ed0b43c..4ae7389c04b7 100644
--- a/emulators/mupen64/Makefile
+++ b/emulators/mupen64/Makefile
@@ -6,40 +6,43 @@
 #
 
 PORTNAME=	mupen64
-PORTVERSION=	0.4
-PORTREVISION=	2
-CATEGORIES+=	emulators
+PORTVERSION=	0.5
+CATEGORIES=	emulators
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
-MAINTAINER?=	tlp@LiquidX.org
-COMMENT=	Mupen64 is a Nintendo 64 emulator with plugins
+MAINTAINER?=	acm@FreeBSD.org
+COMMENT=	Mupen64 is a Nintendo 64 emulator with plugins (meta port)
 
-RUN_DEPENDS+=	${LOCALBASE}/bin/mupen64:${PORTSDIR}/${PKGCATEGORY}/mupen64-base
-RUN_DEPENDS+=	${PLUGINDIR}/dummyaudio.so:${PORTSDIR}/${PKGCATEGORY}/mupen64-dummyaudio
-RUN_DEPENDS+=	${PLUGINDIR}/mupen64_audio.so:${PORTSDIR}/${PKGCATEGORY}/mupen64-sound
-RUN_DEPENDS+=	${PLUGINDIR}/jttl_audio.so:${PORTSDIR}/${PKGCATEGORY}/mupen64-sdlaudio
-RUN_DEPENDS+=	${PLUGINDIR}/mupen64_input.so:${PORTSDIR}/${PKGCATEGORY}/mupen64-input
-RUN_DEPENDS+=	${PLUGINDIR}/blight_input.so:${PORTSDIR}/${PKGCATEGORY}/mupen64-sdlinput
-RUN_DEPENDS+=	${PLUGINDIR}/mupen64_hle_rsp_azimer.so:${PORTSDIR}/${PKGCATEGORY}/mupen64-rsp
-RUN_DEPENDS+=	${PLUGINDIR}/Glide64.so:${PORTSDIR}/${PKGCATEGORY}/mupen64-glide
-RUN_DEPENDS+=	${PLUGINDIR}/glN64-0.4.1.so:${PORTSDIR}/${PKGCATEGORY}/mupen64-gln64
+# Mupen64 Emulator gui and no-gui
+RUN_DEPENDS+=	${LOCALBASE}/bin/mupen64:${PORTSDIR}/emulators/mupen64-base
+
+# Audio plugins
+RUN_DEPENDS+=	${PLUGINDIR}/dummyaudio.so:${PORTSDIR}/emulators/mupen64-dummyaudio
+RUN_DEPENDS+=	${PLUGINDIR}/mupen64_audio.so:${PORTSDIR}/emulators/mupen64-sound
+RUN_DEPENDS+=	${PLUGINDIR}/jttl_audio.so:${PORTSDIR}/emulators/mupen64-sdlaudio
+
+# Input plugins
+RUN_DEPENDS+=	${PLUGINDIR}/mupen64_input.so:${PORTSDIR}/emulators/mupen64-input
+RUN_DEPENDS+=	${PLUGINDIR}/blight_input.so:${PORTSDIR}/emulators/mupen64-sdlinput
+RUN_DEPENDS+=	${PLUGINDIR}/mupen64_hle_rsp_azimer.so:${PORTSDIR}/emulators/mupen64-rsp
+
+# Graphic plugins
+RUN_DEPENDS+=	${PLUGINDIR}/ricedaedalus.so:${PORTSDIR}/emulators/mupen64-rice
+RUN_DEPENDS+=	${PLUGINDIR}/mupen64_soft_gfx.so:${PORTSDIR}/emulators/mupen64-softgfx
+RUN_DEPENDS+=	${PLUGINDIR}/Glide64.so:${PORTSDIR}/emulators/mupen64-glide
+RUN_DEPENDS+=	${PLUGINDIR}/glN64.so:${PORTSDIR}/emulators/mupen64-gln64
 
 NO_MTREE=	yes
 NO_BUILD=	yes
-
-do-install:	# empty
+SUB_FILES=	pkg-message
 
 PLUGINDIR=	${LOCALBASE}/share/mupen64/plugins
 
+do-install:	# empty
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-.if ${MACHINE_ARCH} == "i386"
-RUN_DEPENDS+=	${PLUGINDIR}/ricedaedalus.so:${PORTSDIR}/${PKGCATEGORY}/mupen64-rice
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/mupen64/files/pkg-message.in b/emulators/mupen64/files/pkg-message.in
new file mode 100644
index 000000000000..fd7af16121fd
--- /dev/null
+++ b/emulators/mupen64/files/pkg-message.in
@@ -0,0 +1,27 @@
+###############################################################################
+
+The mupen64 emulator was installed
+
+1) If you have installed/upgraded any new plugins or are upgrading from a 
+previous version of Mupen64, please note that in order for these changes to 
+take effect, you -must- backup and then remove ~/.mupen64 first. After you 
+have removed the directory, run 'mupen64' to re-create it. Then, manually copy
+back your save files/other data you need from the backup if necessary.
+
+2) This port install gui and no-gui version of Mupen64
+
+   Run gui version
+
+   # mupen64
+
+   Run no-gui version
+
+   # mupen64_nogui
+
+3) You can see an use manual about mupen64 at
+
+  # %%DOCSDIR%%/readme.pdf
+
+4) Enjoy it ;)
+
+###############################################################################
diff --git a/emulators/mupen64/pkg-descr b/emulators/mupen64/pkg-descr
index 648185b5638a..581a69c0d7a5 100644
--- a/emulators/mupen64/pkg-descr
+++ b/emulators/mupen64/pkg-descr
@@ -1,13 +1,4 @@
-Mupen64 is a highly portable Nintendo 64 emulator. It has been developed 
-on/for Linux originally but has already been ported successfully to other 
-operating systems. The program can easily be ported to all operating systems 
-supported by the SDL library.
-
-In its current state, the emulator is highly compatible and uses a plugin 
-system. With the correct plugins ("correct" can be computer dependent), it 
-can achieve nearly perfect graphics and sound in many games.
+This is the metaport to install the mupen64 emulator and all graphics, input
+and audio plugins.
 
 WWW: http://mupen64.emulation64.com/
-
-- Travis Poppe
-tlp@liquidx.org
diff --git a/emulators/mupen64/pkg-message b/emulators/mupen64/pkg-message
deleted file mode 100644
index d53470396a22..000000000000
--- a/emulators/mupen64/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
--------------------------------------------------------------------------------
-If you have installed/upgraded any new plugins or are upgrading from a previous
-version of Mupen64, please note that in order for these changes to take effect,
-you -must- backup and then remove ~/.mupen64 first. After you have removed the
-directory, run 'mupen64' to re-create it. Then, manually copy back your save 
-files/other data you need from the backup if necessary.
-
-Enjoy!
--------------------------------------------------------------------------------