diff options
| -rw-r--r-- | security/ssh/Makefile | 8 | ||||
| -rw-r--r-- | security/ssh/pkg-plist | 2 | ||||
| -rw-r--r-- | security/ssh/pkg-plist.x11 | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/security/ssh/Makefile b/security/ssh/Makefile index 46ae6feeae7c..b637269eebea 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -143,4 +143,12 @@ LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper CONFIGURE_ARGS+= --with-socks="-L${PREFIX}/lib -lsocks5" --with-socks5 .endif +# Include extra files if X11 is installed +.if exists(${X11BASE}/lib/libX11.a) +PLIST:= ${WRKDIR}/PLIST +pre-install: + @${CAT} ${PKGDIR}/PLIST.X11 > ${PLIST} + @${CAT} ${PKGDIR}/PLIST >> ${PLIST} +.endif + .include <bsd.port.post.mk> diff --git a/security/ssh/pkg-plist b/security/ssh/pkg-plist index 64badc208448..555641cdf8ef 100644 --- a/security/ssh/pkg-plist +++ b/security/ssh/pkg-plist @@ -8,8 +8,6 @@ bin/ssh-add1 bin/ssh-add bin/ssh-agent1 bin/ssh-agent -bin/ssh-askpass1 -bin/ssh-askpass bin/ssh-keygen1 bin/ssh-keygen bin/make-ssh-known-hosts1 diff --git a/security/ssh/pkg-plist.x11 b/security/ssh/pkg-plist.x11 new file mode 100644 index 000000000000..ffe3a0b71ee0 --- /dev/null +++ b/security/ssh/pkg-plist.x11 @@ -0,0 +1,2 @@ +bin/ssh-askpass1 +bin/ssh-askpass |