svn commit: r299643 - in stable/10: share/man/man8 tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Fri May 13 09:31:40 2016
New Revision: 299643
URL: https://svnweb.freebsd.org/changeset/base/299643

Log:
  MFC r299162,r299163:
  
  r299162:
  
  Only install NIS section 8 manpages if MK_NIS != no
  
  r299163:
  
  Fix r299162
  
  share/man/man8/Makefile:
  - Add src.opts.mk so MK_NIS can be tested
  - Fix typo in MK_NIS conditional
  
  tools/build/mk/OptionalObsoleteFiles.inc:
  - Remove WIP diff from ^/user/ngie/detangle-rc

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

Modified: stable/10/share/man/man8/Makefile
==============================================================================
--- stable/10/share/man/man8/Makefile	Fri May 13 09:24:16 2016	(r299642)
+++ stable/10/share/man/man8/Makefile	Fri May 13 09:31:40 2016	(r299643)
@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 MAN=	crash.8 \
 	diskless.8 \
 	intro.8 \
@@ -11,7 +13,6 @@ MAN=	crash.8 \
 	rc.subr.8 \
 	rescue.8 \
 	${_uefi.8} \
-	yp.8
 
 MLINKS=	rc.8 rc.atm.8 \
 	rc.8 rc.d.8 \
@@ -21,9 +22,14 @@ MLINKS=	rc.8 rc.atm.8 \
 	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: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Fri May 13 09:24:16 2016	(r299642)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Fri May 13 09:31:40 2016	(r299643)
@@ -3662,6 +3662,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