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

[Garrett Cooper]

Author: ngie
Date: Tue Sep 23 22:07:08 2014
New Revision: 272043
URL: http://svnweb.freebsd.org/changeset/base/272043

Log:
  Don't install /etc/rc.d/keyserv unless MK_OPENSSL == yes
  
  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	Tue Sep 23 21:56:15 2014	(r272042)
+++ head/etc/rc.d/Makefile	Tue Sep 23 22:07:08 2014	(r272043)
@@ -72,7 +72,6 @@ FILES=	DAEMON \
 	jail \
 	kadmind \
 	kdc \
-	keyserv \
 	kfd \
 	kld \
 	kldxref \
@@ -186,6 +185,10 @@ _nscd=		nscd
 _opensm=	opensm
 .endif
 
+.if ${MK_OPENSSL} != "no"
+FILES+=		keyserv
+.endif
+
 .if ${MK_OPENSSH} != "no"
 _sshd=		sshd
 .endif

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Tue Sep 23 21:56:15 2014	(r272042)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Tue Sep 23 22:07:08 2014	(r272043)
@@ -3510,9 +3510,9 @@ OLD_FILES+=usr/libexec/ssh-pkcs11-helper
 OLD_FILES+=usr/sbin/sshd
 .endif
 
-#.if ${MK_OPENSSL} == no
-# to be filled in
-#.endif
+.if ${MK_OPENSSL} == no
+OLD_FILES+=etc/rc.d/keyserv
+.endif
 
 .if ${MK_PC_SYSINSTALL} == no
 # backend-partmanager