svn commit: r277741 - in head: etc/rc.d tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Mon Jan 26 09:51:21 2015
New Revision: 277741
URL: https://svnweb.freebsd.org/changeset/base/277741

Log:
  Respect MK_KERBEROS with etc/rc.d/ipropd_master and etc/rc.d/ipropd_slave
  
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Mon Jan 26 09:43:08 2015	(r277740)
+++ head/etc/rc.d/Makefile	Mon Jan 26 09:51:21 2015	(r277741)
@@ -54,8 +54,6 @@ FILES=	DAEMON \
 	ipfw \
 	ipmon \
 	ipnat \
-	ipropd_master \
-	ipropd_slave \
 	ipsec \
 	${_kadmind} \
 	${_kdc} \
@@ -213,6 +211,8 @@ _nscd=		nscd
 .endif
 
 .if ${MK_KERBEROS} != "no"
+FILES+=		ipropd_master
+FILES+=		ipropd_slave
 _kadmind=	kadmind
 _kdc=		kdc
 _kfd=		kfd

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jan 26 09:43:08 2015	(r277740)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jan 26 09:51:21 2015	(r277741)
@@ -2379,6 +2379,8 @@ OLD_FILES+=usr/share/man/man8/jls.8.gz
 .endif
 
 .if ${MK_KERBEROS} == no
+OLD_FILES+=etc/rc.d/ipropd_master
+OLD_FILES+=etc/rc.d/ipropd_slave
 OLD_FILES+=usr/bin/compile_et
 OLD_FILES+=usr/bin/hxtool
 OLD_FILES+=usr/bin/kadmin