- Preparing for new mupen64plus plugin ports

- Bump PORTREVISION

5 files changed, 37 insertions, 7 deletions

diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile
index 3c4dcb8a7cbe..f4afe34bb24b 100644
--- a/emulators/mupen64plus-core/Makefile
+++ b/emulators/mupen64plus-core/Makefile
@@ -7,10 +7,12 @@
 
 PORTNAME=	mupen64plus
 PORTVERSION?=	1.99.4
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
-		${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}
+		${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} \
+		${MASTER_SITE_GOOGLE_CODE}:plugin \
+		http://cdn.bitbucket.org/wahrhaft/${PORTNAME}${PKGNAMESUFFIX}/downloads/:plugin
 PKGNAMESUFFIX?=	-core
 DIST_SUBDIR=	${PORTNAME}
 
diff --git a/emulators/mupen64plus-core/Makefile.common b/emulators/mupen64plus-core/Makefile.common
index 486db1dc65a5..ceb5822b1020 100644
--- a/emulators/mupen64plus-core/Makefile.common
+++ b/emulators/mupen64plus-core/Makefile.common
@@ -2,10 +2,10 @@ USE_DOS2UNIX=		*.c *.cpp *.h *.H *.ini *.conf
 
 DISTNAME=		${PORTNAME}-bundle-src-${PORTVERSION}
 PATCHDIR=		${.CURDIR}/files
-BUILD_WRKSRC=		${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
+BUILD_WRKSRC?=		${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
 WRKSRC?=		${WRKDIR}/${DISTNAME}
 
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - "${DISTNAME}/source/${PORTNAME}-core/*" \
+EXTRACT_AFTER_ARGS?=	| ${TAR} -xf - "${DISTNAME}/source/${PORTNAME}-core/*" \
 				"${DISTNAME}/source/${PORTNAME}${PKGNAMESUFFIX}/*"
 
 .if ${PKGNAMESUFFIX} == "-core"
@@ -35,6 +35,10 @@ pre-install:
 		@${ECHO_CMD} "%%DATADIR%%/RiceVideoLinux.ini" >> ${PLIST}
 .	endif
 
+.	if ${PKGNAMESUFFIX} == "-video-glide64"
+		@${ECHO_CMD} "%%DATADIR%%/Glide64.ini" >> ${PLIST}
+.	endif
+
 .	if ${PKGNAMESUFFIX} == "-input-sdl"
 		@${ECHO_CMD} "%%DATADIR%%/InputAutoCfg.ini" >> ${PLIST}
 .	endif
@@ -72,11 +76,17 @@ do-install:
 .	if ${PKGNAMESUFFIX} == "-ui-console"
 		${INSTALL_MAN} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/doc/${MAN6} ${PREFIX}/man/man6/
 .	endif
+
 .	if ${PKGNAMESUFFIX} == "-video-rice"
 		@${MKDIR} ${DATADIR}
 		${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/RiceVideoLinux.ini ${DATADIR}
 .	endif
 
+.	if ${PKGNAMESUFFIX} == "-video-glide64"
+		@${MKDIR} ${DATADIR}
+		${INSTALL_DATA} ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/data/Glide64.ini ${DATADIR}
+.	endif
+
 .	if ${PKGNAMESUFFIX} == "-input-sdl"
 		@${MKDIR} ${DATADIR}
 		${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/InputAutoCfg.ini ${DATADIR}
diff --git a/emulators/mupen64plus-core/distinfo b/emulators/mupen64plus-core/distinfo
index 943dc7475ce8..6abc451cea04 100644
--- a/emulators/mupen64plus-core/distinfo
+++ b/emulators/mupen64plus-core/distinfo
@@ -1,2 +1,10 @@
 SHA256 (mupen64plus/mupen64plus-bundle-src-1.99.4.tar.gz) = 07f69ccefdf7224cb29a39c0525daa87807b44846ca14fcad97728d6a22f4da2
 SIZE (mupen64plus/mupen64plus-bundle-src-1.99.4.tar.gz) = 1699177
+SHA256 (mupen64plus/mupen64plus-video-arachnoid-src-1.99.4.tar.gz) = fbd1b2908185f020f521ba269b28062427834228e31657e58bac701a8b2a9b43
+SIZE (mupen64plus/mupen64plus-video-arachnoid-src-1.99.4.tar.gz) = 127863
+SHA256 (mupen64plus/mupen64plus-rsp-z64-src-1.99.4.tar.gz) = c2887c197962ac6ea9492fdf74822ad8c21659253353d0a65b29be67ad65ef8b
+SIZE (mupen64plus/mupen64plus-rsp-z64-src-1.99.4.tar.gz) = 44523
+SHA256 (mupen64plus/mupen64plus-video-z64-src-1.99.4.tar.gz) = 81fac289571ca54b8a1a2f53b901677368c0b9e9ea4a84b45e2eebcd08ad35cd
+SIZE (mupen64plus/mupen64plus-video-z64-src-1.99.4.tar.gz) = 65254
+SHA256 (mupen64plus/mupen64plus-video-glide64-src-1.99.4.tar.gz) = 76d62f869b80561e03b1463aa04401a39d283e8ab3ff1344cf7c1c420ea3fe79
+SIZE (mupen64plus/mupen64plus-video-glide64-src-1.99.4.tar.gz) = 339054
diff --git a/emulators/mupen64plus/Makefile b/emulators/mupen64plus/Makefile
index 160a05087d79..1f76d34fd150 100644
--- a/emulators/mupen64plus/Makefile
+++ b/emulators/mupen64plus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mupen64plus
 PORTVERSION=	1.99.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -25,11 +25,13 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-audio-sdl.so:${PORTSDIR}/
 
 # Input plugins
 RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-input-sdl.so:${PORTSDIR}/emulators/mupen64plus-input-sdl
-RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-rsp-hle.so:${PORTSDIR}/emulators/mupen64plus-rsp-hle
 
 # Graphics plugins
 RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-video-rice.so:${PORTSDIR}/emulators/mupen64plus-video-rice
 
+# RSP plugins
+RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-rsp-hle.so:${PORTSDIR}/emulators/mupen64plus-rsp-hle
+
 NO_MTREE=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
diff --git a/emulators/mupen64plus/files/pkg-message.in b/emulators/mupen64plus/files/pkg-message.in
index ed9befcecfa3..e85c2e89d876 100644
--- a/emulators/mupen64plus/files/pkg-message.in
+++ b/emulators/mupen64plus/files/pkg-message.in
@@ -19,6 +19,14 @@ video) of Mupen64Plus and
 
   # man mupen64plus
 
-4) Enjoy it ;)
+4) Additional third party plugins can be installed from
+
+   emulators/mupen64plus-plugins
+
+5) If you want to install a GUI frontend of mupen64plus, you can install 
+   
+  emulators/wxmupen64plus
+
+6) Enjoy it ;)
 
 ###############################################################################