svn commit: r319381 - in stable/10: share/man/man4 tools/build/mk

[Ngie Cooper]

Author: ngie
Date: Thu Jun  1 06:37:53 2017
New Revision: 319381
URL: https://svnweb.freebsd.org/changeset/base/319381

Log:
  MFC r318177:
  
  Unconditionally install udp(4) and udplite(4) again
  
  I added this to the MK_USB != no block in error in r278202.

Modified:
  stable/10/share/man/man4/Makefile
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man4/Makefile
==============================================================================
--- stable/10/share/man/man4/Makefile	Thu Jun  1 06:36:40 2017	(r319380)
+++ stable/10/share/man/man4/Makefile	Thu Jun  1 06:37:53 2017	(r319381)
@@ -517,6 +517,8 @@ MAN=	aac.4 \
 	tws.4 \
 	tx.4 \
 	txp.4 \
+	udp.4 \
+	udplite.4 \
 	vale.4 \
 	vga.4 \
 	vge.4 \
@@ -894,8 +896,6 @@ MAN+=	u3g.4 \
 	ucycom.4 \
 	udav.4 \
 	udbp.4 \
-	udp.4 \
-	udplite.4 \
 	uep.4 \
 	ufm.4 \
 	ufoma.4 \

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Thu Jun  1 06:36:40 2017	(r319380)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Thu Jun  1 06:37:53 2017	(r319381)
@@ -5596,8 +5596,6 @@ OLD_FILES+=usr/share/man/man4/ucom.4.gz
 OLD_FILES+=usr/share/man/man4/ucycom.4.gz
 OLD_FILES+=usr/share/man/man4/udav.4.gz
 OLD_FILES+=usr/share/man/man4/udbp.4.gz
-OLD_FILES+=usr/share/man/man4/udp.4.gz
-OLD_FILES+=usr/share/man/man4/udplite.4.gz
 OLD_FILES+=usr/share/man/man4/uep.4.gz
 OLD_FILES+=usr/share/man/man4/ufm.4.gz
 OLD_FILES+=usr/share/man/man4/ufoma.4.gz