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

MFC after: 1 week
X-MFC with: r299162
Sponsored by: EMC / Isilon Storage Division

share/man/man8/Makefile

@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PACKAGE=runtime-manuals
 
 MAN=	crash.8 \
@@ -25,7 +27,7 @@ MLINKS= \
 	rc.8 rc.serial.8 \
 	rc.8 rc.shutdown.8
 
-.if ${MK_NIS!= "no"
+.if ${MK_NIS} != "no"
 MAN+=	yp.8
 
 MLINKS+=yp.8 NIS.8 \

tools/build/mk/OptionalObsoleteFiles.inc

@@ -5998,13 +5998,6 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-NETGRAPH.txt
 .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