svn commit: r299162 - in head: share/man/man8 tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Fri May  6 08:42:33 2016
New Revision: 299162
URL: https://svnweb.freebsd.org/changeset/base/299162

Log:
  Only install NIS section 8 manpages if MK_NIS != no
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/share/man/man8/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/share/man/man8/Makefile
==============================================================================
--- head/share/man/man8/Makefile	Fri May  6 08:24:06 2016	(r299161)
+++ head/share/man/man8/Makefile	Fri May  6 08:42:33 2016	(r299162)
@@ -13,7 +13,6 @@ MAN=	crash.8 \
 	rc.subr.8 \
 	rescue.8 \
 	${_uefi.8} \
-	yp.8
 
 MLINKS= \
 	nanobsd.8 nanobsd.sh.8 \
@@ -25,9 +24,14 @@ MLINKS= \
 	rc.8 rc.pccard.8 \
 	rc.8 rc.serial.8 \
 	rc.8 rc.shutdown.8
+
+.if ${MK_NIS!= "no"
+MAN+=	yp.8
+
 MLINKS+=yp.8 NIS.8 \
 	yp.8 nis.8 \
 	yp.8 YP.8
+.endif
 
 .if ${MACHINE_CPUARCH} == "amd64"
 _uefi.8= uefi.8

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Fri May  6 08:24:06 2016	(r299161)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Fri May  6 08:42:33 2016	(r299162)
@@ -5998,6 +5998,13 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-N
 .endif
 
 .if ${MK_NIS} == no
+OLD_FILES+=etc/rc.d/nisdomain
+OLD_FILES+=etc/rc.d/ypbind
+OLD_FILES+=etc/rc.d/yppasswdd
+OLD_FILES+=etc/rc.d/ypserv
+OLD_FILES+=etc/rc.d/ypset
+OLD_FILES+=etc/rc.d/ypupdated
+OLD_FILES+=etc/rc.d/ypxfrd
 OLD_FILES+=usr/bin/ypcat
 OLD_FILES+=usr/bin/ypchfn
 OLD_FILES+=usr/bin/ypchpass
@@ -6040,6 +6047,10 @@ OLD_FILES+=usr/share/man/man5/netid.5.gz
 OLD_FILES+=usr/share/man/man8/mknetid.8.gz
 OLD_FILES+=usr/share/man/man8/rpc.yppasswdd.8.gz
 OLD_FILES+=usr/share/man/man8/rpc.ypxfrd.8.gz
+OLD_FILES+=usr/share/man/man8/NIS.8.gz
+OLD_FILES+=usr/share/man/man8/YP.8.gz
+OLD_FILES+=usr/share/man/man8/yp.8.gz
+OLD_FILES+=usr/share/man/man8/nis.8.gz
 OLD_FILES+=usr/share/man/man8/yp_mkdb.8.gz
 OLD_FILES+=usr/share/man/man8/ypbind.8.gz
 OLD_FILES+=usr/share/man/man8/ypinit.8.gz