[pkgsrc/trunk]: pkgsrc/multimedia/adobe-flash-plugin10.1 sync with adobe-flas...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/96b01f38a4a0
branches:  trunk
changeset: 594695:96b01f38a4a0
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Nov 03 18:16:51 2011 +0000

description:
sync with adobe-flash-plugin11 - mainly adjust the MESSAGE to only show
in the nspluginwrapper+pulseaudio case
bump PKGREVISION

diffstat:

 multimedia/adobe-flash-plugin10.1/DESCR                   |  16 ++++++++------
 multimedia/adobe-flash-plugin10.1/INSTALL.nspluginwrapper |   3 +-
 multimedia/adobe-flash-plugin10.1/MESSAGE.pulseaudio      |  10 +++++++++
 multimedia/adobe-flash-plugin10.1/Makefile                |   6 ++--
 multimedia/adobe-flash-plugin10.1/options.mk              |   7 ++++-
 5 files changed, 28 insertions(+), 14 deletions(-)

diffs (100 lines):

diff -r 2a04d9216bf4 -r 96b01f38a4a0 multimedia/adobe-flash-plugin10.1/DESCR
--- a/multimedia/adobe-flash-plugin10.1/DESCR   Thu Nov 03 18:14:14 2011 +0000
+++ b/multimedia/adobe-flash-plugin10.1/DESCR   Thu Nov 03 18:16:51 2011 +0000
@@ -1,9 +1,11 @@
-Netscape plugin for Adobe Flash player.  This package contains
-a plugin that enables web browsers to render the Flash format.
+Netscape compatible plugin for Adobe Flash player.  This package
+contains a plugin that enables web browsers to render the Flash
+format.
 
-The nspluginwrapper option (enabled by default) permits the use of
-the the Linux x86 flash player in Firefox browsers on other x86
+The nspluginwrapper option (enabled by default on non Linux platforms)
+permits the use of the the Linux x86 flash player in Firefox browsers
+on other x86 systems and x86_64 systems.
+
+For NetBSD this package requires emul.linux.kern.osrelease = 2.6.18
+or later, which means it will not work on NetBSD 5.x or older
 systems.
-
-This package requires emul.linux.kern.osrelease = 2.6.18 or later.
-This means this package won't work on NetBSD 5.x or older systems!
diff -r 2a04d9216bf4 -r 96b01f38a4a0 multimedia/adobe-flash-plugin10.1/INSTALL.nspluginwrapper
--- a/multimedia/adobe-flash-plugin10.1/INSTALL.nspluginwrapper Thu Nov 03 18:14:14 2011 +0000
+++ b/multimedia/adobe-flash-plugin10.1/INSTALL.nspluginwrapper Thu Nov 03 18:16:51 2011 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: INSTALL.nspluginwrapper,v 1.2 2011/02/10 09:49:09 ahoka Exp $
+# $NetBSD: INSTALL.nspluginwrapper,v 1.3 2011/11/03 18:16:51 abs Exp $
 
 PATH=@PREFIX@/bin:$PATH
 
@@ -17,4 +17,3 @@
        done
        ;;
 esac
-
diff -r 2a04d9216bf4 -r 96b01f38a4a0 multimedia/adobe-flash-plugin10.1/MESSAGE.pulseaudio
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/adobe-flash-plugin10.1/MESSAGE.pulseaudio      Thu Nov 03 18:16:51 2011 +0000
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE.pulseaudio,v 1.1 2011/11/03 18:16:51 abs Exp $
+
+The flash plugin requires tmpfs to be mounted on /dev/shm for PulseAudio.
+
+This can be automated by adding the following to your /etc/fstab:
+
+tmpfs /emul/linux/dev/shm tmpfs rw,-m1777
+
+===========================================================================
diff -r 2a04d9216bf4 -r 96b01f38a4a0 multimedia/adobe-flash-plugin10.1/Makefile
--- a/multimedia/adobe-flash-plugin10.1/Makefile        Thu Nov 03 18:14:14 2011 +0000
+++ b/multimedia/adobe-flash-plugin10.1/Makefile        Thu Nov 03 18:16:51 2011 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2011/11/01 19:18:19 abs Exp $
+# $NetBSD: Makefile,v 1.14 2011/11/03 18:16:51 abs Exp $
 
 DISTNAME=              flash-plugin-${FLASH_VERSION}-release.i386
 PKGNAME=               adobe-${DISTNAME:C/-release.*//}
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            multimedia www
 MASTER_SITES=          http://fpdownload.macromedia.com/get/flashplayer/current/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://www.adobe.com/
+HOMEPAGE=              http://www.adobe.com/products/flashplayer.html
 COMMENT=               Adobe Flash Player Browser plugin
 LICENSE=               flash-license
 
diff -r 2a04d9216bf4 -r 96b01f38a4a0 multimedia/adobe-flash-plugin10.1/options.mk
--- a/multimedia/adobe-flash-plugin10.1/options.mk      Thu Nov 03 18:14:14 2011 +0000
+++ b/multimedia/adobe-flash-plugin10.1/options.mk      Thu Nov 03 18:16:51 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2011/11/01 19:18:19 abs Exp $
+# $NetBSD: options.mk,v 1.7 2011/11/03 18:16:52 abs Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.adobe-flash-plugin
@@ -12,8 +12,10 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "i386" && ${OPSYS} != "Linux"
+.if ${OPSYS} != "Linux"
+.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 PKG_SUGGESTED_OPTIONS= nspluginwrapper
+.  endif
 .endif
 
 .include "../../mk/bsd.options.mk"
@@ -22,6 +24,7 @@
 DEPENDS+= nspluginwrapper>0:../../www/nspluginwrapper
 .  if !empty(PKG_OPTIONS:Mpulseaudio)
 # usr/lib/libpulse.so.0 provided by suse32_gtk2
+MESSAGE_SRC+=          ${PKGDIR}/MESSAGE.pulseaudio
 .  else
 DEPENDS+= libflashsupport>0:../../multimedia/libflashsupport
 .  endif