summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgdt <gdt>2007-10-31 21:42:24 +0000
committergdt <gdt>2007-10-31 21:42:24 +0000
commit5cfc9e06dc98eef7a6504a7eae53d6f02572e400 (patch)
treec42c1d03ca64021fd783dc387c37bbd460471575
parentf38ff9a1d32693451fef8f7ca53a6450313b3e07 (diff)
downloadpkgsrc-5cfc9e06dc98eef7a6504a7eae53d6f02572e400.tar.gz
Add license for mozilla trademark, because the resulting binary cannot
be redistributed, and that seems over the Non-Free line. (This may be revisited if we re-address exactly what free-enough-for-pkgsrc-default means, but it removes a case of "RESTRICTED w/o LICENSE".
-rw-r--r--licenses/mozilla-trademark-license6
-rw-r--r--www/seamonkey/options.mk11
2 files changed, 12 insertions, 5 deletions
diff --git a/licenses/mozilla-trademark-license b/licenses/mozilla-trademark-license
new file mode 100644
index 00000000000..e0bf5ba145c
--- /dev/null
+++ b/licenses/mozilla-trademark-license
@@ -0,0 +1,6 @@
+The Mozilla Foundation restricts distribution of packages with their
+trademarks. See the following URLs:
+
+ http://www.mozilla.org/foundation/trademarks/
+ http://www.mozilla.org/foundation/trademarks/distribution-policy.html
+ http://www.mozilla.org/foundation/trademarks/faq.html
diff --git a/www/seamonkey/options.mk b/www/seamonkey/options.mk
index c362d1c04dc..f05fb2eb21e 100644
--- a/www/seamonkey/options.mk
+++ b/www/seamonkey/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2007/10/16 01:53:28 dmcmahill Exp $
+# $NetBSD: options.mk,v 1.8 2007/10/31 21:42:24 gdt Exp $
PKG_OPTIONS_VAR = PKG_OPTIONS.gecko
PKG_SUPPORTED_OPTIONS = debug
@@ -31,10 +31,11 @@ CONFIGURE_ARGS+= --enable-single-profile
# See http://www.mozilla.org/foundation/trademarks/
.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
CONFIGURE_ARGS+= --enable-official-branding
-# XXX LICENSE=?
-# Does enabling official branding make the package non-Free?
-# Mozilla claims no: http://www.mozilla.org/foundation/trademarks/faq.html
-# The resulting binary package cannot be distributed, which seems non-Free.
+# Mozilla prohibits distribution of packages with their trademarks.
+# It is an open question if this makes the package non-Free. Mozilla
+# claims not, but currently pkgsrc has a "open source implies no
+# redistribution restrictions" notion.
+LICENSE= mozilla-trademark-license
RESTRICTED= Trademark holder prohibits distribution of modified versions.
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}