From owner-svn-src-all@FreeBSD.ORG  Sun Apr 28 17:58:11 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C51C9433;
 Sun, 28 Apr 2013 17:58:11 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B7C1A1FA5;
 Sun, 28 Apr 2013 17:58:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3SHwBCm003182;
 Sun, 28 Apr 2013 17:58:11 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3SHwBCC003180;
 Sun, 28 Apr 2013 17:58:11 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201304281758.r3SHwBCC003180@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 28 Apr 2013 17:58:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250024 - in head: tools/build/mk usr.bin
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Apr 2013 17:58:11 -0000

Author: eadler
Date: Sun Apr 28 17:58:11 2013
New Revision: 250024
URL: http://svnweb.freebsd.org/changeset/base/250024

Log:
  When the world is built WITHOUT_OPENSSH also don't
  install ssh-copy-id.
  
  PR:		misc/177590
  Submitted by:	Oleg Ginzburg <olevole@olevole.ru>
  Reviewed by:	imp

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.bin/Makefile

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Sun Apr 28 16:35:24 2013	(r250023)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Sun Apr 28 17:58:11 2013	(r250024)
@@ -3674,9 +3674,9 @@ OLD_FILES+=usr/share/man/man8/ntptime.8.
 # to be filled in
 #.endif
 
-#.if ${MK_OPENSSH} == no
-# to be filled in
-#.endif
+.if ${MK_OPENSSH} == no
+OLD_FILES+=usr.bin/ssh-copy-id
+.endif
 
 #.if ${MK_OPENSSL} == no
 # to be filled in

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Sun Apr 28 16:35:24 2013	(r250023)
+++ head/usr.bin/Makefile	Sun Apr 28 17:58:11 2013	(r250024)
@@ -148,7 +148,6 @@ SUBDIR=	alias \
 	sockstat \
 	sort \
 	split \
-	ssh-copy-id \
 	stat \
 	stdbuf \
 	su \
@@ -303,6 +302,10 @@ SUBDIR+=	ypmatch
 SUBDIR+=	ypwhich
 .endif
 
+.if ${MK_OPENSSH} != "no"
+SUBDIR+=	ssh-copy-id
+.endif
+
 .if ${MK_OPENSSL} != "no"
 SUBDIR+=	bc
 SUBDIR+=	chkey