Mon Sep 12 23:35:15 2011 UTC ()
if the package is adobe-flash-plugin, PKG_OPTIONS should be adobe-flash-plugin rather than ns-flash. ++PKGREVISION


(abs)
diff -r1.9 -r1.10 pkgsrc/multimedia/adobe-flash-plugin10.1/Makefile
diff -r1.2 -r1.3 pkgsrc/multimedia/adobe-flash-plugin10.1/options.mk
cvs diff -r1.9 -r1.10 pkgsrc/multimedia/adobe-flash-plugin10.1/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/adobe-flash-plugin10.1/Attic/Makefile 2011/09/04 19:50:04 1.9
+++ pkgsrc/multimedia/adobe-flash-plugin10.1/Attic/Makefile 2011/09/12 23:35:15 1.10
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.9 2011/09/04 19:50:04 tnn Exp $ 1# $NetBSD: Makefile,v 1.10 2011/09/12 23:35:15 abs Exp $
2 2
3PKGNAME= adobe-flash-plugin-${FLASH_VERSION:S/r/./} 3PKGNAME= adobe-flash-plugin-${FLASH_VERSION:S/r/./}
 4PKGREVISION= 1
4CATEGORIES= multimedia www 5CATEGORIES= multimedia www
5MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/current/ 6MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/current/
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.adobe.com/ 9HOMEPAGE= http://www.adobe.com/
9COMMENT= Adobe Flash Player Browser plugin 10COMMENT= Adobe Flash Player Browser plugin
10LICENSE= flash-license 11LICENSE= flash-license
11 12
12RESTRICTED= Redistribution not permitted 13RESTRICTED= Redistribution not permitted
13NO_SRC_ON_FTP= ${RESTRICTED} 14NO_SRC_ON_FTP= ${RESTRICTED}
14NO_SRC_ON_CDROM= ${RESTRICTED} 15NO_SRC_ON_CDROM= ${RESTRICTED}
15NO_BIN_ON_FTP= ${RESTRICTED} 16NO_BIN_ON_FTP= ${RESTRICTED}
16NO_BIN_ON_CDROM= ${RESTRICTED} 17NO_BIN_ON_CDROM= ${RESTRICTED}
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/adobe-flash-plugin10.1/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/adobe-flash-plugin10.1/Attic/options.mk 2011/02/10 09:49:09 1.2
+++ pkgsrc/multimedia/adobe-flash-plugin10.1/Attic/options.mk 2011/09/12 23:35:15 1.3
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: options.mk,v 1.2 2011/02/10 09:49:09 ahoka Exp $ 1# $NetBSD: options.mk,v 1.3 2011/09/12 23:35:15 abs Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.ns-flash 4PKG_OPTIONS_VAR= PKG_OPTIONS.adobe-flash-plugin
5PKG_SUPPORTED_OPTIONS= nspluginwrapper 5PKG_SUPPORTED_OPTIONS= nspluginwrapper
6 6
7# XXXX: If nspluginwrapper is enabled and this package is installed after 7# XXXX: If nspluginwrapper is enabled and this package is installed after
8# firefox (or similar) it will install a system wide wrapped plugin into 8# firefox (or similar) it will install a system wide wrapped plugin into
9# @PREFIX/lib/<browser>/plugins. If it is installed before a browser 9# @PREFIX/lib/<browser>/plugins. If it is installed before a browser
10# it will install a plugin for the current user in ~/.mozilla/plugins/ 10# it will install a plugin for the current user in ~/.mozilla/plugins/
11# or similar. This is inconsistant and potentially confusing. 11# or similar. This is inconsistant and potentially confusing.
12 12
13.include "../../mk/bsd.prefs.mk" 13.include "../../mk/bsd.prefs.mk"
14 14
15.if ${MACHINE_ARCH} == "i386" && ${OPSYS} != "Linux" 15.if ${MACHINE_ARCH} == "i386" && ${OPSYS} != "Linux"
16PKG_SUGGESTED_OPTIONS= nspluginwrapper 16PKG_SUGGESTED_OPTIONS= nspluginwrapper
17.endif 17.endif