- Fix dependencies

- Fix install
- Add plugins

PR:		ports/60718
Submitted by:	Travis Poppe <tlp@LiquidX.org> (maintainer)

6 files changed, 72 insertions, 50 deletions

diff --git a/emulators/linux-mupen64/Makefile b/emulators/linux-mupen64/Makefile
index 1e061cb3ca23..3ba2a5364697 100644
--- a/emulators/linux-mupen64/Makefile
+++ b/emulators/linux-mupen64/Makefile
@@ -7,21 +7,25 @@
 
 PORTNAME=	mupen64
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	emulators linux
-MASTER_SITES=	http://mupen64.emulation64.com/files/
+MASTER_SITES=	http://mupen64.emulation64.com/files/:mupen \
+		http://www.liquidx.org/distfiles/:plugins
 PKGNAMEPREFIX=	linux-
+DISTFILES=	mupen64-0.3.tar.bz2:mupen mupen64linplugins1.tar.bz2:plugins
 
 MAINTAINER=	tlp@liquidx.org
 COMMENT=	A Nintendo 64 emulator (Linux version)
 
 RUN_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8 \
 		${LINUXBASE}/usr/X11R6/lib/libXi.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
-		${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri \
+		${LINUXBASE}/usr/X11R6/lib/libGLU.so.1:${PORTSDIR}/graphics/linux_dri \
 		${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
 		${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
 USE_BZIP2=	yes
 
+USE_REINPLACE=	yes
 ONLY_FOR_ARCHS=	i386
 INSTALLS_SHLIB=	yes
 NO_BUILD=	yes
@@ -30,21 +34,30 @@ NO_BUILD=	yes
 # because as a side effect it brands the binary as FreeBSD.
 STRIP=
 
+post-patch:
+	@(cp ${FILESDIR}/linux-mupen64_install.in ${WRKDIR}/linux-mupen64_install)
+	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKDIR}/linux-mupen64_install
+
 do-install:
 	${MKDIR} ${PREFIX}/lib/linux-mupen64
-	${MKDIR} ${PREFIX}/lib/linux-mupen64/lang
-	${MKDIR} ${PREFIX}/lib/linux-mupen64/save
+	${MKDIR} ${PREFIX}/share/linux-mupen64
+	${MKDIR} ${PREFIX}/share/linux-mupen64/lang
 	${MKDIR} ${PREFIX}/lib/linux-mupen64/plugins
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/mupen64.ini ${PREFIX}/lib/linux-mupen64/mupen64.ini
+	${INSTALL_DATA} ${WRKSRC}/mupen64.ini ${PREFIX}/share/linux-mupen64/mupen64.ini
 	${INSTALL_DATA} ${WRKSRC}/whatsnew.txt ${DOCSDIR}/whatsnew.txt
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/lang/* ${PREFIX}/lib/linux-mupen64/lang
-	${INSTALL_DATA} ${WRKSRC}/save/* ${PREFIX}/lib/linux-mupen64/save
-	${INSTALL_DATA} ${WRKSRC}/plugins/* ${PREFIX}/lib/linux-mupen64/plugins
-	${INSTALL_PROGRAM} ${WRKSRC}/mupen64 ${PREFIX}/lib/linux-mupen64/mupen64
+	${INSTALL_DATA} ${WRKSRC}/lang/* ${PREFIX}/share/linux-mupen64/lang
+	${INSTALL_DATA} ${WRKDIR}/mupen64linplugins1/* ${PREFIX}/lib/linux-mupen64/plugins
+	${INSTALL_DATA} ${WRKSRC}/plugins/mupen64_audio.so ${PREFIX}/lib/linux-mupen64/plugins/mupen64_audio.so
+	${INSTALL_DATA} ${WRKSRC}/plugins/mupen64_gfx.so ${PREFIX}/lib/linux-mupen64/plugins/mupen64_gfx.so
+	${INSTALL_DATA} ${WRKSRC}/plugins/mupen64_hle_rsp.so ${PREFIX}/lib/linux-mupen64/plugins/mupen64_hle_rsp.so
+	${INSTALL_DATA} ${WRKSRC}/plugins/mupen64_input.so ${PREFIX}/lib/linux-mupen64/plugins/mupen64_input.so
+	${INSTALL_DATA} ${WRKSRC}/plugins/ricedaedalus.so ${PREFIX}/lib/linux-mupen64/plugins/ricedaedalus.so
+	${INSTALL_DATA} ${WRKSRC}/plugins/RiceDaedalus5.1.0.ini ${PREFIX}/lib/linux-mupen64/plugins/RiceDaedalus5.1.0.ini
+	${INSTALL_PROGRAM} ${WRKSRC}/mupen64 ${PREFIX}/libexec/linux-mupen64
 	${INSTALL_SCRIPT} ${FILESDIR}/linux-mupen64 ${PREFIX}/bin/linux-mupen64
-	${INSTALL_SCRIPT} ${FILESDIR}/linux-mupen64_install ${PREFIX}/bin/linux-mupen64_install
+	${INSTALL_SCRIPT} ${WRKDIR}/linux-mupen64_install ${PREFIX}/bin/linux-mupen64_install
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/emulators/linux-mupen64/distinfo b/emulators/linux-mupen64/distinfo
index a4c8110f2486..f8e4eed340b9 100644
--- a/emulators/linux-mupen64/distinfo
+++ b/emulators/linux-mupen64/distinfo
@@ -1 +1,2 @@
 MD5 (mupen64-0.3.tar.bz2) = ba823b71a7ab1d4902480a4b2e2bc5f4
+MD5 (mupen64linplugins1.tar.bz2) = 781050aa6d3d6d1bf7b9c86baf977399
diff --git a/emulators/linux-mupen64/files/linux-mupen64_install b/emulators/linux-mupen64/files/linux-mupen64_install
deleted file mode 100644
index 5b6e9f9f089e..000000000000
--- a/emulators/linux-mupen64/files/linux-mupen64_install
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# linux-mupen64 - linux-Mupen64 user installation
-#
-# 2003 Travis Poppe
-
-if [ -x ~/.linux-mupen64 ]; then
-	echo "linux-Mupen64 user directory appears to already exist."
-	echo "Removing first..."
-	echo ""
-	rm -rf ~/.linux-mupen64
-fi
-
-mkdir ~/.linux-mupen64/
-mkdir ~/.linux-mupen64/lang
-mkdir ~/.linux-mupen64/save
-mkdir ~/.linux-mupen64/plugins
-cd ~/.linux-mupen64
-ln -s /usr/local/lib/linux-mupen64/plugins/* plugins/
-ln -s /usr/local/lib/linux-mupen64/lang/* lang/
-ln -s /usr/local/lib/linux-mupen64/mupen64* .
-echo "User installation of linux-Mupen64 complete!"
-echo "Run 'linux-mupen64' to start."
diff --git a/emulators/linux-mupen64/files/linux-mupen64_install.in b/emulators/linux-mupen64/files/linux-mupen64_install.in
new file mode 100644
index 000000000000..57cd30c367c6
--- /dev/null
+++ b/emulators/linux-mupen64/files/linux-mupen64_install.in
@@ -0,0 +1,28 @@
+#!/bin/sh
+# linux-mupen64 - linux-Mupen64 user installation
+#
+# 2003 Travis Poppe
+#
+# Note: A better installation and wrapper script would be appreciated!
+
+USERDIR=$HOME/.linux-mupen64
+
+if [ -x $USERDIR ]; then
+	echo "linux-Mupen64 user directory appears to already exist."
+	echo "Removing first..."
+	echo ""
+	rm -rf $USERDIR
+fi
+
+mkdir $USERDIR
+mkdir $USERDIR/lang
+mkdir $USERDIR/save
+mkdir $USERDIR/roms
+mkdir $USERDIR/plugins
+cd $USERDIR
+ln -s %%PREFIX%%/libexec/linux-mupen64 ./mupen64
+ln -s %%PREFIX%%/share/linux-mupen64/mupen64.ini ./mupen64.ini
+ln -s %%PREFIX%%/share/linux-mupen64/lang/* lang/
+ln -s %%PREFIX%%/lib/linux-mupen64/plugins/* plugins/
+echo "User installation of linux-Mupen64 complete!"
+echo "Run 'linux-mupen64' to start."
diff --git a/emulators/linux-mupen64/pkg-message b/emulators/linux-mupen64/pkg-message
index 5cdc723af5bc..73714b8ba9bf 100644
--- a/emulators/linux-mupen64/pkg-message
+++ b/emulators/linux-mupen64/pkg-message
@@ -1,11 +1,13 @@
 -------------------------------------------------------------------------------
 You must run 'linux-mupen64_install' as the user you intend to use mupen64 with
-before 'linux-mupen64' will work.
+before 'linux-mupen64' will work. If you are upgrading from a previous version,
+you should probably backup your ~/.linux-mupen64 directory and re-run the 
+installation script.
 
 Note:
 
-For some of the graphics plugins to work, you must have a working libGLU.so.1
-and libGLcore.so.1 file located in /compat/linux/usr/lib/
+For some of the graphics plugins to work, you must have a working libGLcore.so.1
+file located in /compat/linux/usr/lib/
 
 Enjoy!
 -------------------------------------------------------------------------------
diff --git a/emulators/linux-mupen64/pkg-plist b/emulators/linux-mupen64/pkg-plist
index c0b9304fcde2..19d53eed6dba 100644
--- a/emulators/linux-mupen64/pkg-plist
+++ b/emulators/linux-mupen64/pkg-plist
@@ -1,27 +1,27 @@
 bin/linux-mupen64
 bin/linux-mupen64_install
-lib/linux-mupen64/mupen64
-lib/linux-mupen64/mupen64.ini
-lib/linux-mupen64/lang/dutch.lng
-lib/linux-mupen64/lang/english.lng
-lib/linux-mupen64/lang/french.lng
-lib/linux-mupen64/lang/german.lng
-lib/linux-mupen64/lang/italian.lng
-lib/linux-mupen64/lang/spanish.lng
-lib/linux-mupen64/save/empty
-lib/linux-mupen64/plugins/RiceDaedalus5.1.0.ini
-lib/linux-mupen64/plugins/blight_input-0.0.8.so
-lib/linux-mupen64/plugins/glNintendo64-0.3.1.so
+libexec/linux-mupen64
+share/linux-mupen64/mupen64.ini
+share/linux-mupen64/lang/dutch.lng
+share/linux-mupen64/lang/english.lng
+share/linux-mupen64/lang/french.lng
+share/linux-mupen64/lang/german.lng
+share/linux-mupen64/lang/italian.lng
+share/linux-mupen64/lang/spanish.lng
+lib/linux-mupen64/plugins/blight_input-0.0.8-b.so
+lib/linux-mupen64/plugins/glN64-0.4.1-rc2.so
+lib/linux-mupen64/plugins/jttl_sound.so
 lib/linux-mupen64/plugins/mupen64_audio.so
 lib/linux-mupen64/plugins/mupen64_gfx.so
 lib/linux-mupen64/plugins/mupen64_hle_rsp.so
 lib/linux-mupen64/plugins/mupen64_input.so
 lib/linux-mupen64/plugins/ricedaedalus.so
-lib/linux-mupen64/plugins/tr64gl.so
+lib/linux-mupen64/plugins/RiceDaedalus5.1.0.ini
+lib/linux-mupen64/plugins/tr64gl-0.8.7-pre1.so
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
 %%PORTDOCS%%%%DOCSDIR%%/readme.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm share/linux-mupen64/lang
+@dirrm share/linux-mupen64
 @dirrm lib/linux-mupen64/plugins
-@dirrm lib/linux-mupen64/save
-@dirrm lib/linux-mupen64/lang
 @dirrm lib/linux-mupen64