Date: Thu, 14 May 2015 16:26:43 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386347 - head/security/keychain Message-ID: <201505141626.t4EGQheI014060@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505141626.t4EGQheI014060>