Update ns-flash to 9.0.31nb1:

    - Add a nspluginwrapper option (enabled by default on non Linux x86
      platforms) which pulls in nspluginwrapper and libflashsupport, and
      enables a INSTALL script which enables the plugin wrapper

Copy of note in options.mk:
# XXXX: If nspluginwrapper is enabled and this package is installed after
# firefox (or similar) it will install a system wide wrapped plugin into
# @PREFIX/lib/<browser>/plugins. If it is installed before a browser
# it will install a plugin for the current user in ~/.mozilla/plugins/
# or similar. This is inconsistant and potentially confusing.

4 files changed, 58 insertions, 8 deletions

diff --git a/multimedia/ns-flash/DESCR b/multimedia/ns-flash/DESCR
index 9030c300aba..10d4aab4cc0 100644
--- a/multimedia/ns-flash/DESCR
+++ b/multimedia/ns-flash/DESCR
@@ -1,8 +1,12 @@
-Netscape plugin for MacroMedia Flash player.  This package contains a
-plugin that enables Netscape to render the Flash format.
+Netscape plugin for MacroMedia Flash player.  This package contains
+a plugin that enables Netscape to render the Flash format.
 
-To use the Linux flash player into a native Firefox browser on a x86
-system other than 32 bit Linux:
-  - Also install www/nspluginwrapper and multimedia/libflashsupport
-  - Run "nspluginwrapper -i /usr/pkg/lib/netscape/plugins/libflashplayer.so"
-  - Install and run Firefox
+The nspluginwrapper option (enabled by default) permits the use of
+the the Linux x86 flash player in Firefox browsers on other x86
+systems.
+
+Tested systems
+    - NetBSD-4.0			- works
+    - NetBSD-4.99.{15,16} (-current)	- does not work
+    - firefox / firefox2		- works
+    - firefox-gtk1 / firefox2-gtk1	- does not work
diff --git a/multimedia/ns-flash/INSTALL.nspluginwrapper b/multimedia/ns-flash/INSTALL.nspluginwrapper
new file mode 100644
index 00000000000..03981d46dca
--- /dev/null
+++ b/multimedia/ns-flash/INSTALL.nspluginwrapper
@@ -0,0 +1,18 @@
+#!/bin/sh
+# $NetBSD: INSTALL.nspluginwrapper,v 1.1 2007/03/23 18:59:41 abs Exp $
+
+case $STAGE in
+    POST-INSTALL)
+	nspluginwrapper -i @PREFIX@/lib/netscape/plugins/libflashplayer.so
+	;;
+esac
+
+
+case $STAGE in
+    DEINSTALL)
+	for wrapped in `nspluginwrapper -l | grep ^/` ; do
+	    nspluginwrapper -r $wrapped
+	done
+	;;
+esac
+
diff --git a/multimedia/ns-flash/Makefile b/multimedia/ns-flash/Makefile
index a717a5f5fd7..9a3482bf0df 100644
--- a/multimedia/ns-flash/Makefile
+++ b/multimedia/ns-flash/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:51 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2007/03/23 18:59:41 abs Exp $
 
 CATEGORIES=		multimedia www
+PKGREVISION=		1
 MASTER_SITES=		http://fpdownload.macromedia.com/get/flashplayer/current/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -57,6 +58,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/flashplayer.xpt ${NS_PLUGINS_DIR}
 	${INSTALL_DATA} ${WRKSRC}/libflashplayer.so ${NS_PLUGINS_DIR}
 
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
+
 .if ${OPSYS} != "SunOS"
 .include "../../emulators/suse_linux/Makefile.application"
 .endif
diff --git a/multimedia/ns-flash/options.mk b/multimedia/ns-flash/options.mk
new file mode 100644
index 00000000000..0d0e3f8b241
--- /dev/null
+++ b/multimedia/ns-flash/options.mk
@@ -0,0 +1,24 @@
+# $NetBSD: options.mk,v 1.1 2007/03/23 18:59:41 abs Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.ns-flash
+PKG_SUPPORTED_OPTIONS=	nspluginwrapper
+
+# XXXX: If nspluginwrapper is enabled and this package is installed after
+# firefox (or similar) it will install a system wide wrapped plugin into
+# @PREFIX/lib/<browser>/plugins. If it is installed before a browser
+# it will install a plugin for the current user in ~/.mozilla/plugins/
+# or similar. This is inconsistant and potentially confusing.
+
+.if ${MACHINE_ARCH} == "i386" && ${OPSYS} != "Linux"
+PKG_SUGGESTED_OPTIONS=  nspluginwrapper
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mnspluginwrapper)
+DEPENDS+= nspluginwrapper>0:../../www/nspluginwrapper
+DEPENDS+= libflashsupport>0:../../multimedia/libflashsupport
+INSTALL_TEMPLATES+=	${PKGDIR}/INSTALL.nspluginwrapper
+DEINSTALL_TEMPLATES+=	${PKGDIR}/INSTALL.nspluginwrapper
+.endif