diff options
| author | ryoon <ryoon@pkgsrc.org> | 2013-09-21 11:40:57 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2013-09-21 11:40:57 +0000 |
| commit | 510a1c64c63c46aa7aa0ce2163d9833989769fd0 (patch) | |
| tree | a649d65d03105c94e464e1605b6e959f854da7c3 /www | |
| parent | 4bd4597c49370d4a27e95d9bc0e573b861660f77 (diff) | |
| download | pkgsrc-510a1c64c63c46aa7aa0ce2163d9833989769fd0.tar.gz | |
Fix non-official branding build.
Diffstat (limited to 'www')
| -rw-r--r-- | www/firefox/PLIST | 5 | ||||
| -rw-r--r-- | www/firefox/options.mk | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/www/firefox/PLIST b/www/firefox/PLIST index da3e83004f9..089df6ee53e 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.73 2013/09/21 10:09:39 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.74 2013/09/21 11:40:57 ryoon Exp $ bin/firefox include/firefox/AbstractMediaDecoder.h include/firefox/AccEvent.h @@ -3379,7 +3379,8 @@ lib/firefox/browser/chrome.manifest ${PLIST.nobranding}lib/firefox/browser/chrome/browser/content/branding/about-background.png lib/firefox/browser/chrome/browser/content/branding/about-logo.png lib/firefox/browser/chrome/browser/content/branding/about-logo@2x.png -lib/firefox/browser/chrome/browser/content/branding/about-wordmark.png +${PLIST.branding}lib/firefox/browser/chrome/browser/content/branding/about-wordmark.png +${PLIST.nobranding}lib/firefox/browser/chrome/browser/content/branding/about-wordmark.svg lib/firefox/browser/chrome/browser/content/branding/about.png lib/firefox/browser/chrome/browser/content/branding/aboutDialog.css lib/firefox/browser/chrome/browser/content/branding/icon16.png diff --git a/www/firefox/options.mk b/www/firefox/options.mk index e5617b29429..7469d12639a 100644 --- a/www/firefox/options.mk +++ b/www/firefox/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.16 2013/07/17 11:00:13 jperkin Exp $ +# $NetBSD: options.mk,v 1.17 2013/09/21 11:40:57 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.firefox PKG_SUPPORTED_OPTIONS= official-mozilla-branding @@ -52,13 +52,14 @@ CONFIGURE_ARGS+= --enable-pulseaudio .endif # XXX end -PLIST_VARS+= nobranding +PLIST_VARS+= branding nobranding .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) CONFIGURE_ARGS+= --enable-official-branding LICENSE= mozilla-trademark-license RESTRICTED= Trademark holder prohibits distribution of modified versions. NO_BIN_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} +PLIST.branding= yes .else PLIST.nobranding= yes .endif |