Merge from head

5 files changed, 11 insertions, 13 deletions

diff --git a/share/doc/bind9/Makefile b/share/doc/bind9/Makefile
index 3aca4e5..f215fe3 100644
--- a/share/doc/bind9/Makefile
+++ b/share/doc/bind9/Makefile
@@ -18,6 +18,7 @@ ARM=		Bv9ARM.ch01.html Bv9ARM.ch02.html Bv9ARM.ch03.html \
 		man.dnssec-dsfromkey.html man.dnssec-keyfromlabel.html \
 		man.dnssec-keygen.html man.dnssec-revoke.html \
 		man.dnssec-settime.html man.dnssec-signzone.html \
+		man.dnssec-verify.html \
 		man.genrandom.html man.host.html man.isc-hmac-fixup.html \
 		man.named-checkconf.html man.named-checkzone.html \
 		man.named-journalprint.html man.named.html \
diff --git a/share/doc/legal/Makefile b/share/doc/legal/Makefile
index 3ae8eca..9590800 100644
--- a/share/doc/legal/Makefile
+++ b/share/doc/legal/Makefile
@@ -3,6 +3,7 @@
 SUBDIR=	intel_ipw \
 	intel_iwi \
 	intel_iwn \
-	intel_wpi
+	intel_wpi \
+	realtek
 
 .include <bsd.subdir.mk>
diff --git a/share/doc/legal/realtek/Makefile b/share/doc/legal/realtek/Makefile
new file mode 100644
index 0000000..18bbef3
--- /dev/null
+++ b/share/doc/legal/realtek/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+NO_OBJ=
+FILES=		${.CURDIR}/../../../../sys/contrib/dev/urtwn/LICENSE
+FILESDIR=	${SHAREDIR}/doc/legal/realtek
+
+.include <bsd.prog.mk>
diff --git a/share/doc/psd/28.cvs/Makefile b/share/doc/psd/28.cvs/Makefile
deleted file mode 100644
index a624732..0000000
--- a/share/doc/psd/28.cvs/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-VOLUME=		psd/28.cvs
-SRCS=		cvs-paper.ms
-MACROS=		-ms
-USE_PIC=
-USE_TBL=
-SRCDIR=		${.CURDIR}/../../../../contrib/cvs/doc
-
-.include <bsd.doc.mk>
diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile
index d50f05b..243ba99 100644
--- a/share/doc/psd/Makefile
+++ b/share/doc/psd/Makefile
@@ -35,7 +35,6 @@ SUBDIR+=22.rpcgen \
 	24.xdr \
 	25.xdrrfc \
 	26.rpcrfc \
-	27.nfsrpc \
-	28.cvs
+	27.nfsrpc
 
 .include <bsd.subdir.mk>