Sat Apr 7 22:39:31 2018 UTC ()
add mpl


(christos)
diff -r1.20 -r1.21 src/external/Makefile
diff -r1.15 -r1.16 src/external/README
cvs diff -r1.20 -r1.21 src/external/Makefile (expand / switch to unified diff)

--- src/external/Makefile 2018/01/08 11:05:02 1.20
+++ src/external/Makefile 2018/04/07 22:39:31 1.21
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1# $NetBSD: Makefile,v 1.20 2018/01/08 11:05:02 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.21 2018/04/07 22:39:31 christos Exp $
2 2
3SUBDIR+= apache2 atheros broadcom bsd cddl gpl2 gpl3 historical intel-fw-eula 3SUBDIR+= apache2 atheros broadcom bsd cddl gpl2 gpl3 historical intel-fw-eula
4SUBDIR+= intel-fw-public ibm-public mit nvidia-firmware public-domain realtek 4SUBDIR+= intel-fw-public ibm-public mpl mit nvidia-firmware public-domain
 5SUBDIR+= realtek
5 6
6.include <bsd.subdir.mk> 7.include <bsd.subdir.mk>
cvs diff -r1.15 -r1.16 src/external/README (expand / switch to unified diff)

--- src/external/README 2012/06/14 04:14:36 1.15
+++ src/external/README 2018/04/07 22:39:31 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: README,v 1.15 2012/06/14 04:14:36 riz Exp $ 1$NetBSD: README,v 1.16 2018/04/07 22:39:31 christos Exp $
2 2
3Organization of Sources: 3Organization of Sources:
4 4
5This directory hierarchy is using an organization that separates 5This directory hierarchy is using an organization that separates
6source for programs that we have obtained from external third 6source for programs that we have obtained from external third
7parties (where NetBSD is not the primary maintainer) from the 7parties (where NetBSD is not the primary maintainer) from the
8system source. 8system source.
9 9
10The hierarchy is grouped by license, and then package per license, 10The hierarchy is grouped by license, and then package per license,
11and is organized as follows: 11and is organized as follows:
12 12
13 external/ 13 external/
14 14
@@ -69,26 +69,29 @@ The licenses currently used are: @@ -69,26 +69,29 @@ The licenses currently used are:
69 69
70 intel-fw-eula Intel firmware license with redistribution 70 intel-fw-eula Intel firmware license with redistribution
71 restricted to OEM. 71 restricted to OEM.
72 72
73 intel-fw-public Intel firmware license permitting redistribution with 73 intel-fw-public Intel firmware license permitting redistribution with
74 terms similar to BSD licensed software. 74 terms similar to BSD licensed software.
75 75
76 intel-public Intel license permitting redistribution with 76 intel-public Intel license permitting redistribution with
77 terms similar to BSD licensed software. 77 terms similar to BSD licensed software.
78 78
79 mit MIT (X11) style license. 79 mit MIT (X11) style license.
80 http://www.opensource.org/licenses/mit-license.php 80 http://www.opensource.org/licenses/mit-license.php
81 81
 82 mpl Mozilla Public license.
 83 https://opensource.org/licenses/MPL-2.0
 84
82 public-domain Non-license for code that has been explicitly put 85 public-domain Non-license for code that has been explicitly put
83 into the Public Domain. 86 into the Public Domain.
84 87
85 realtek RealTek license. 88 realtek RealTek license.
86 89
87 zlib Zlib (BSD-like) license. 90 zlib Zlib (BSD-like) license.
88 http://www.zlib.net/zlib_license.html 91 http://www.zlib.net/zlib_license.html
89 92
90If a package has components covered by different licenses 93If a package has components covered by different licenses
91(for example, GPL2 and the LGPL), use the <license> subdirectory 94(for example, GPL2 and the LGPL), use the <license> subdirectory
92for the more restrictive license. 95for the more restrictive license.
93 96
94If a package allows the choice of a license to use, we'll 97If a package allows the choice of a license to use, we'll