svn commit: r307915 - in stable/11: etc/rc.d tools/build/mk

[Baptiste Daroussin]

Author: bapt
Date: Tue Oct 25 14:56:42 2016
New Revision: 307915
URL: https://svnweb.freebsd.org/changeset/base/307915

Log:
  MFC r307786:
  
  Do not install NIS program rc script if WITHOUT_NIS is set
  
  PR:		213375
  Submitted by:	sergey at akhmatov.ru

Modified:
  stable/11/etc/rc.d/Makefile
  stable/11/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/etc/rc.d/Makefile
==============================================================================
--- stable/11/etc/rc.d/Makefile	Tue Oct 25 14:55:03 2016	(r307914)
+++ stable/11/etc/rc.d/Makefile	Tue Oct 25 14:56:42 2016	(r307915)
@@ -118,14 +118,17 @@ FILES=	DAEMON \
 	ugidfw \
 	${_utx} \
 	var \
-	watchdogd \
-	ypbind \
+	watchdogd
+
+.if ${MK_NIS} != "no"
+FILES+=	ypbind \
 	ypldap \
 	yppasswdd \
 	ypserv \
 	ypset \
 	ypupdated \
 	ypxfrd
+.endif
 
 .if ${MK_ACCT} != "no"
 FILESGROUPS+=	ACCT

Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/11/tools/build/mk/OptionalObsoleteFiles.inc	Tue Oct 25 14:55:03 2016	(r307914)
+++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc	Tue Oct 25 14:56:42 2016	(r307915)
@@ -6059,6 +6059,13 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-N
 .endif
 
 .if ${MK_NIS} == no
+OLD_FILES+=etc/rc.d/ypbind
+OLD_FILES+=etc/rc.d/ypldap
+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