Fix install location for plugins by USES=webplugin

- Bump PORTREVISION

While on it:
- Modernise pkg-plist
- Cleaning up Makefile

PR:		195170
Submitted by:	jbeich@vfemail.net

2 files changed, 46 insertions, 84 deletions

diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile
index 702295f1a2e7..2c82c83253a5 100644
--- a/multimedia/linux-realplayer/Makefile
+++ b/multimedia/linux-realplayer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	linux-realplayer
 DISTVERSION=	10.0.9.809-20070726
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia audio linux
 MASTER_SITES=	ftp://ftp.tw.freebsd.org/pub/distfiles/:player \
 		http://freeheimdall.spdns.org/files/:player \
@@ -25,14 +25,14 @@ LICENSE_PERMS=	auto-accept
 
 WRKSRC=		${WRKDIR}/usr/local/RealPlayer
 ONLY_FOR_ARCHS=	i386 amd64
+USES=		webplugin:linux
+WEBPLUGIN_FILES=nphelix.so nphelix.xpt
 USE_LINUX=	yes
 USE_LINUX_APPS=	gtk2 xorglibs
 RESTRICTED=	Redistribution not allowed
 NO_BUILD=	yes
-WANT_GNOME=	yes
 
 RADIR=		${PREFIX}/lib/RealPlayer
-PLUGINSDIR=	${PREFIX}/lib/linux-mozilla/plugins
 RABINDIR=	${PREFIX}/bin
 
 OPTIONS_DEFINE=	GNOME ICONS NLS
@@ -49,8 +49,6 @@ PLIST_SUB+=	NLS="" LINUXBASE="${LINUXBASE}"
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${PORT_OPTIONS:MICONS}
 PLIST_SUB+=	ICONS=""
 .else
@@ -109,8 +107,8 @@ do-install:
 .endfor
 .endif
 
-	@${MKDIR} ${STAGEDIR}${PLUGINSDIR}
-	${INSTALL_DATA} ${WRKSRC}/mozilla/* ${STAGEDIR}${PLUGINSDIR}
+	@${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
+	${INSTALL_DATA} ${WRKSRC}/mozilla/* ${STAGEDIR}${WEBPLUGIN_DIR}
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/realplay ${STAGEDIR}${PREFIX}/bin
@@ -146,4 +144,4 @@ do-install:
 		${STAGEDIR}${LOCALBASE}/share/mime-info
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/linux-realplayer/pkg-plist b/multimedia/linux-realplayer/pkg-plist
index a5b34a99814d..e3d43aaf2ded 100644
--- a/multimedia/linux-realplayer/pkg-plist
+++ b/multimedia/linux-realplayer/pkg-plist
@@ -154,31 +154,8 @@ lib/RealPlayer/share/realplay/logo.png
 lib/RealPlayer/share/realplay/prefs_general.png
 lib/RealPlayer/share/realplay/setup_title.png
 lib/RealPlayer/share/realplay/setup_welcome.png
-lib/linux-mozilla/plugins/nphelix.so
-lib/linux-mozilla/plugins/nphelix.xpt
-@dirrm lib/RealPlayer/codecs
-@dirrm lib/RealPlayer/common
-@dirrm lib/RealPlayer/lib
-@dirrm lib/RealPlayer/plugins
-@dirrm lib/RealPlayer/share/default
-%%NLS%%@dirrm lib/RealPlayer/share/locale/de
-%%NLS%%@dirrm lib/RealPlayer/share/locale/es
-%%NLS%%@dirrm lib/RealPlayer/share/locale/fr
-%%NLS%%@dirrm lib/RealPlayer/share/locale/hi
-%%NLS%%@dirrm lib/RealPlayer/share/locale/it
-%%NLS%%@dirrm lib/RealPlayer/share/locale/ja
-%%NLS%%@dirrm lib/RealPlayer/share/locale/ko
-%%NLS%%@dirrm lib/RealPlayer/share/locale/pl
-%%NLS%%@dirrm lib/RealPlayer/share/locale/pt_BR
-%%NLS%%@dirrm lib/RealPlayer/share/locale/zh_CN
-%%NLS%%@dirrm lib/RealPlayer/share/locale/zh_TW
-%%NLS%%@dirrm lib/RealPlayer/share/locale
-@dirrm lib/RealPlayer/share/realplay
-@dirrm lib/RealPlayer/share
-@dirrm lib/RealPlayer
-@dirrmtry lib/linux-mozilla/plugins
-@dirrmtry lib/linux-mozilla
-%%X11%%@cwd %%LOCALBASE%%
+%%WEBPLUGIN_DIR%%/nphelix.so
+%%WEBPLUGIN_DIR%%/nphelix.xpt
 %%GNOME%%share/application-registry/realplay.applications
 %%GNOME%%share/applications/realplay.desktop
 %%GNOME%%share/mime-info/realplay.keys
@@ -230,54 +207,41 @@ lib/linux-mozilla/plugins/nphelix.xpt
 %%ICONS%%share/icons/hicolor/48x48/mimetypes/mime-video-ogg_48x48.png
 %%ICONS%%share/icons/hicolor/48x48/mimetypes/mime-video-rv_48x48.png
 %%ICONS%%share/icons/hicolor/48x48/mimetypes/mime-video-swf_48x48.png
-%%ICONS%%@dirrmtry share/icons/hicolor/48x48/apps
-%%ICONS%%@dirrmtry share/icons/hicolor/48x48/mimetypes
-%%ICONS%%@dirrmtry share/icons/hicolor/48x48
-%%ICONS%%@dirrmtry share/icons/hicolor/32x32/apps
-%%ICONS%%@dirrmtry share/icons/hicolor/32x32
-%%ICONS%%@dirrmtry share/icons/hicolor/192x192/apps
-%%ICONS%%@dirrmtry share/icons/hicolor/192x192/mimetypes
-%%ICONS%%@dirrmtry share/icons/hicolor/192x192
-%%ICONS%%@dirrmtry share/icons/hicolor/16x16/apps
-%%ICONS%%@dirrmtry share/icons/hicolor/16x16
-%%ICONS%%@dirrmtry share/icons/hicolor
-%%ICONS%%@dirrmtry share/icons
-%%NLS%%@cwd %%LINUXBASE%%
-%%NLS%%usr/share/locale/de/LC_MESSAGES/realplay.mo
-%%NLS%%usr/share/locale/es/LC_MESSAGES/realplay.mo
-%%NLS%%usr/share/locale/fr/LC_MESSAGES/realplay.mo
-%%NLS%%usr/share/locale/hi/LC_MESSAGES/realplay.mo
-%%NLS%%usr/share/locale/it/LC_MESSAGES/realplay.mo
-%%NLS%%usr/share/locale/ja/LC_MESSAGES/realplay.mo
-%%NLS%%usr/share/locale/ko/LC_MESSAGES/realplay.mo
-%%NLS%%usr/share/locale/pl/LC_MESSAGES/realplay.mo
-%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/realplay.mo
-%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/realplay.mo
-%%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/realplay.mo
-%%NLS%%@dirrmtry usr/share/locale/de/LC_MESSAGES
-%%NLS%%@dirrmtry usr/share/locale/de
-%%NLS%%@dirrmtry usr/share/locale/es/LC_MESSAGES
-%%NLS%%@dirrmtry usr/share/locale/es
-%%NLS%%@dirrmtry usr/share/locale/fr/LC_MESSAGES
-%%NLS%%@dirrmtry usr/share/locale/fr
-%%NLS%%@dirrmtry usr/share/locale/hi/LC_MESSAGES
-%%NLS%%@dirrmtry usr/share/locale/hi
-%%NLS%%@dirrmtry usr/share/locale/it/LC_MESSAGES
-%%NLS%%@dirrmtry usr/share/locale/it
-%%NLS%%@dirrmtry usr/share/locale/ja/LC_MESSAGES
-%%NLS%%@dirrmtry usr/share/locale/ja
-%%NLS%%@dirrmtry usr/share/locale/ko/LC_MESSAGES
-%%NLS%%@dirrmtry usr/share/locale/ko
-%%NLS%%@dirrmtry usr/share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry usr/share/locale/pl
-%%NLS%%@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
-%%NLS%%@dirrmtry usr/share/locale/pt_BR
-%%NLS%%@dirrmtry usr/share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry usr/share/locale/zh_CN
-%%NLS%%@dirrmtry usr/share/locale/zh_TW/LC_MESSAGES
-%%NLS%%@dirrmtry usr/share/locale/zh_TW
-%%NLS%%@dirrmtry usr/share/locale
-%%NLS%%@dirrmtry usr/share
-%%NLS%%@dirrmtry usr
-%%NLS%%@unexec rmdir "%%LINUXBASE%%" >/dev/null 2>&1 || :
-%%NLS%%@unexec rmdir "/compat" >/dev/null 2>&1 || :
+%%NLS%%%%LINUXBASE%%/usr/share/locale/de/LC_MESSAGES/realplay.mo
+%%NLS%%%%LINUXBASE%%/usr/share/locale/es/LC_MESSAGES/realplay.mo
+%%NLS%%%%LINUXBASE%%/usr/share/locale/fr/LC_MESSAGES/realplay.mo
+%%NLS%%%%LINUXBASE%%/usr/share/locale/hi/LC_MESSAGES/realplay.mo
+%%NLS%%%%LINUXBASE%%/usr/share/locale/it/LC_MESSAGES/realplay.mo
+%%NLS%%%%LINUXBASE%%/usr/share/locale/ja/LC_MESSAGES/realplay.mo
+%%NLS%%%%LINUXBASE%%/usr/share/locale/ko/LC_MESSAGES/realplay.mo
+%%NLS%%%%LINUXBASE%%/usr/share/locale/pl/LC_MESSAGES/realplay.mo
+%%NLS%%%%LINUXBASE%%/usr/share/locale/pt_BR/LC_MESSAGES/realplay.mo
+%%NLS%%%%LINUXBASE%%/usr/share/locale/zh_CN/LC_MESSAGES/realplay.mo
+%%NLS%%%%LINUXBASE%%/usr/share/locale/zh_TW/LC_MESSAGES/realplay.mo
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/de/LC_MESSAGES
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/de
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/es/LC_MESSAGES
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/es
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/fr/LC_MESSAGES
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/fr
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/hi/LC_MESSAGES
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/hi
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/it/LC_MESSAGES
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/it
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/ja/LC_MESSAGES
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/ja
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/ko/LC_MESSAGES
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/ko
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/pl/LC_MESSAGES
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/pl
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/pt_BR
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/zh_CN
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/zh_TW/LC_MESSAGES
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale/zh_TW
+%%NLS%%@dir %%LINUXBASE%%/usr/share/locale
+%%NLS%%@dir %%LINUXBASE%%/usr/share
+%%NLS%%@dir %%LINUXBASE%%/usr
+%%NLS%%@dir %%LINUXBASE%%
+%%NLS%%@dir /compat