From owner-svn-ports-all@FreeBSD.ORG  Thu May 14 16:26:44 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 094E21BD;
 Thu, 14 May 2015 16:26:44 +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 EB2521148;
 Thu, 14 May 2015 16:26:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4EGQh6w014061;
 Thu, 14 May 2015 16:26:43 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4EGQheI014060;
 Thu, 14 May 2015 16:26:43 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201505141626.t4EGQheI014060@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 14 May 2015 16:26:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r386347 - head/security/keychain
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 May 2015 16:26:44 -0000

Author: bdrewery
Date: Thu May 14 16:26:43 2015
New Revision: 386347
URL: https://svnweb.freebsd.org/changeset/ports/386347

Log:
  Revert r386285, removing exists() check on RUN_DEPENDS, for now.
  
  The ports framework properly handles this but the tools that are used do not.
  Portmaster and Portupgrade both incorrectly install openssh-portable even if
  ssh-agent is installed already. Poudriere does not install or add a dependency
  on it, but it does build the dependency.
  
  At least the portmaster and portupgrade issues must be resolved first. They
  will also fix any other port installing unneeded dependencies and allow
  many of the exists() checks to come out of the tree.

Modified:
  head/security/keychain/Makefile

Modified: head/security/keychain/Makefile
==============================================================================
--- head/security/keychain/Makefile	Thu May 14 16:22:28 2015	(r386346)
+++ head/security/keychain/Makefile	Thu May 14 16:26:43 2015	(r386347)
@@ -3,7 +3,7 @@
 
 PORTNAME=	keychain
 PORTVERSION=	2.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://www.funtoo.org/archive/keychain/ \
 		GENTOO
@@ -28,7 +28,9 @@ PLIST_FILES=	bin/${PORTNAME} \
 
 PORTDOCS=	ChangeLog README.md
 
+.if !exists(${LOCALBASE}/bin/ssh-agent) && !exists(/usr/bin/ssh-agent)
 RUN_DEPENDS+=	ssh-agent:${PORTSDIR}/security/openssh-portable
+.endif
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin