From owner-svn-src-head@FreeBSD.ORG  Tue Sep 23 22:07:09 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 136F914E;
 Tue, 23 Sep 2014 22:07:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F250EFCD;
 Tue, 23 Sep 2014 22:07:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8NM783H043914;
 Tue, 23 Sep 2014 22:07:08 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8NM786S043912;
 Tue, 23 Sep 2014 22:07:08 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201409232207.s8NM786S043912@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Tue, 23 Sep 2014 22:07:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r272043 - in head: etc/rc.d tools/build/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Sep 2014 22:07:09 -0000

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