/usr/share/doc/legal: Install some more firmware licenses.
authorSascha Wildner <saw@online.de>
Tue, 20 Jul 2010 13:04:31 +0000 (15:04 +0200)
committerSascha Wildner <saw@online.de>
Tue, 20 Jul 2010 13:04:31 +0000 (15:04 +0200)
Also add /usr/share/doc/legal to the hier(7) manual page and add
a reference to it in /COPYRIGHT.

COPYRIGHT
etc/mtree/BSD.usr.dist
share/doc/legal/Makefile
share/doc/legal/intel_iwn/Makefile [new file with mode: 0644]
share/doc/legal/intel_wpi/Makefile [new file with mode: 0644]
share/doc/legal/ralink_ral/Makefile [new file with mode: 0644]
share/man/man7/hier.7

index 9dc9dd2..de040fa 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,4 @@
 # $FreeBSD: src/COPYRIGHT,v 1.4 1999/09/05 21:33:47 obrien Exp $
-# $DragonFly: src/COPYRIGHT,v 1.11 2007/12/31 23:53:32 swildner Exp $
 #      @(#)COPYRIGHT   8.2 (Berkeley) 3/21/94
 
 Authors of new code wishing specific recognition are encouraged to use the
@@ -47,6 +46,11 @@ SUCH DAMAGE.
 
 --
 
+Additional license files for vendor supplied firmwares can be found in
+/usr/share/legal.
+
+--
+
 The 4.4BSD and 4.4BSD-Lite software is distributed under the following
 terms:
 
index c6962e6..8edb196 100644 (file)
@@ -1,5 +1,4 @@
 # $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.188.2.40 2003/02/14 22:38:14 nectar Exp $
-# $DragonFly: src/etc/mtree/BSD.usr.dist,v 1.54 2008/07/09 07:21:03 swildner Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
             legal
                 intel_iwi
                 ..
+                intel_iwn
+                ..
+                intel_wpi
+                ..
+                ralink_ral
+                ..
             ..
         ..
         examples
index 76b7a1c..6c450db 100644 (file)
@@ -1,5 +1,8 @@
 # $FreeBSD: src/share/doc/legal/Makefile,v 1.3 2010/05/27 08:21:52 rpaulo Exp $
 
-SUBDIR=        intel_iwi
+SUBDIR=        intel_iwi \
+       intel_iwn \
+       intel_wpi \
+       ralink_ral
 
 .include <bsd.subdir.mk>
diff --git a/share/doc/legal/intel_iwn/Makefile b/share/doc/legal/intel_iwn/Makefile
new file mode 100644 (file)
index 0000000..24bcd56
--- /dev/null
@@ -0,0 +1,7 @@
+# $FreeBSD: src/share/doc/legal/intel_iwn/Makefile,v 1.1 2010/05/27 08:21:52 rpaulo Exp $
+
+NOOBJ=
+FILES=         ${.CURDIR}/../../../../sys/contrib/dev/iwn/LICENSE
+FILESDIR=      ${SHAREDIR}/doc/legal/intel_iwn
+
+.include <bsd.prog.mk>
diff --git a/share/doc/legal/intel_wpi/Makefile b/share/doc/legal/intel_wpi/Makefile
new file mode 100644 (file)
index 0000000..ab306d8
--- /dev/null
@@ -0,0 +1,7 @@
+# $FreeBSD: src/share/doc/legal/intel_wpi/Makefile,v 1.1 2007/11/05 11:47:18 benjsc Exp $
+
+NOOBJ=
+FILES=          ${.CURDIR}/../../../../sys/contrib/dev/wpi/LICENSE
+FILESDIR=       ${SHAREDIR}/doc/legal/intel_wpi
+
+.include <bsd.prog.mk>
diff --git a/share/doc/legal/ralink_ral/Makefile b/share/doc/legal/ralink_ral/Makefile
new file mode 100644 (file)
index 0000000..47859ff
--- /dev/null
@@ -0,0 +1,5 @@
+NOOBJ=
+FILES=          ${.CURDIR}/../../../../sys/contrib/dev/ral/LICENSE
+FILESDIR=       ${SHAREDIR}/doc/legal/ralink_ral
+
+.include <bsd.prog.mk>
index 752f3f8..f437bb1 100644 (file)
@@ -31,9 +31,8 @@
 .\"
 .\"    @(#)hier.7      8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man7/hier.7,v 1.29.2.17 2003/01/13 21:43:50 ceri Exp $
-.\" $DragonFly: src/share/man/man7/hier.7,v 1.26 2008/09/06 14:24:44 swildner Exp $
 .\"
-.Dd August 6, 2009
+.Dd July 20, 2010
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -83,10 +82,10 @@ see
 .It Pa dma/
 .Xr dma 8
 configuration files
-.It Pa firmware/
-Firmware image files;
-see
-.Xr firmware 9
+.\".It Pa firmware/
+.\"Firmware image files;
+.\"see
+.\".Xr firmware 9
 .It Pa isdn/
 isdn4bsd configuration files;
 see
@@ -433,6 +432,13 @@ see
 .Xr refer 1
 .El
 .Pp
+.It Pa doc/
+miscellaneous documentation
+.Bl -tag -width Fl -compact
+.It Pa legal/
+License files for vendor supplied firmwares
+.El
+.Pp
 .It Pa examples/
 various examples for users and programmers
 .It Pa games/