Mon Jul 11 13:17:40 2011 UTC ()
Fix PLIST when official branding is disabled.


(tnn)
diff -r1.42 -r1.43 pkgsrc/www/firefox/PLIST
diff -r1.9 -r1.10 pkgsrc/www/firefox/options.mk
cvs diff -r1.42 -r1.43 pkgsrc/www/firefox/PLIST (expand / switch to unified diff)

--- pkgsrc/www/firefox/PLIST 2011/04/26 14:18:01 1.42
+++ pkgsrc/www/firefox/PLIST 2011/07/11 13:17:40 1.43
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1@comment $NetBSD: PLIST,v 1.42 2011/04/26 14:18:01 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.43 2011/07/11 13:17:40 tnn Exp $
2bin/firefox 2bin/firefox
3lib/firefox/README.txt 3lib/firefox/README.txt
4lib/firefox/application.ini 4lib/firefox/application.ini
5lib/firefox/blocklist.xml 5lib/firefox/blocklist.xml
6lib/firefox/chrome.manifest 6lib/firefox/chrome.manifest
 7${PLIST.nobranding}lib/firefox/chrome/browser/content/branding/about-background.png
7lib/firefox/chrome/browser/content/branding/about-logo.png 8lib/firefox/chrome/browser/content/branding/about-logo.png
8lib/firefox/chrome/browser/content/branding/about-wordmark.png 9lib/firefox/chrome/browser/content/branding/about-wordmark.png
9lib/firefox/chrome/browser/content/branding/about.png 10lib/firefox/chrome/browser/content/branding/about.png
10lib/firefox/chrome/browser/content/branding/icon128.png 11lib/firefox/chrome/browser/content/branding/icon128.png
11lib/firefox/chrome/browser/content/branding/icon16.png 12lib/firefox/chrome/browser/content/branding/icon16.png
12lib/firefox/chrome/browser/content/branding/icon48.png 13lib/firefox/chrome/browser/content/branding/icon48.png
13lib/firefox/chrome/browser/content/branding/icon64.png 14lib/firefox/chrome/browser/content/branding/icon64.png
14lib/firefox/chrome/browser/content/browser/NetworkPanel.xhtml 15lib/firefox/chrome/browser/content/browser/NetworkPanel.xhtml
15lib/firefox/chrome/browser/content/browser/aboutDialog.css 16lib/firefox/chrome/browser/content/browser/aboutDialog.css
16lib/firefox/chrome/browser/content/browser/aboutDialog.js 17lib/firefox/chrome/browser/content/browser/aboutDialog.js
17lib/firefox/chrome/browser/content/browser/aboutDialog.xul 18lib/firefox/chrome/browser/content/browser/aboutDialog.xul
18lib/firefox/chrome/browser/content/browser/aboutHome-restore-icon-small.png 19lib/firefox/chrome/browser/content/browser/aboutHome-restore-icon-small.png
19lib/firefox/chrome/browser/content/browser/aboutHome-restore-icon.png 20lib/firefox/chrome/browser/content/browser/aboutHome-restore-icon.png
cvs diff -r1.9 -r1.10 pkgsrc/www/firefox/options.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/options.mk 2010/03/16 15:57:03 1.9
+++ pkgsrc/www/firefox/options.mk 2011/07/11 13:17:40 1.10
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1# $NetBSD: options.mk,v 1.9 2010/03/16 15:57:03 tnn Exp $ 1# $NetBSD: options.mk,v 1.10 2011/07/11 13:17:40 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox 3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
4PKG_SUPPORTED_OPTIONS= official-mozilla-branding 4PKG_SUPPORTED_OPTIONS= official-mozilla-branding
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
 8PLIST_VARS+= nobranding
8.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 9.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
9CONFIGURE_ARGS+= --enable-official-branding 10CONFIGURE_ARGS+= --enable-official-branding
10LICENSE= mozilla-trademark-license 11LICENSE= mozilla-trademark-license
11RESTRICTED= Trademark holder prohibits distribution of modified versions. 12RESTRICTED= Trademark holder prohibits distribution of modified versions.
12NO_BIN_ON_CDROM= ${RESTRICTED} 13NO_BIN_ON_CDROM= ${RESTRICTED}
13NO_BIN_ON_FTP= ${RESTRICTED} 14NO_BIN_ON_FTP= ${RESTRICTED}
 15.else
 16PLIST.nobranding= yes
14.endif 17.endif