summaryrefslogtreecommitdiff
path: root/security/openssh/Makefile
diff options
context:
space:
mode:
authorgrant <grant>2004-10-24 02:52:15 +0000
committergrant <grant>2004-10-24 02:52:15 +0000
commit06d84c38e0c3db9d391031bfcfdf3b610800c7de (patch)
tree462b40afbd0ae63e5b5dd0a653a9d8422bbba033 /security/openssh/Makefile
parent9176e2e010622598b819261a7d3d2099a69a163b (diff)
downloadpkgsrc-06d84c38e0c3db9d391031bfcfdf3b610800c7de.tar.gz
tell configure where to find xauth(1) so that X forwarding over ssh
works when using pkgsrc X11. bump PKGREVISION.
Diffstat (limited to 'security/openssh/Makefile')
-rw-r--r--security/openssh/Makefile11
1 files changed, 9 insertions, 2 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 862fabebe17..c8773850982 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.143 2004/10/03 00:18:11 tv Exp $
+# $NetBSD: Makefile,v 1.144 2004/10/24 02:52:15 grant Exp $
DISTNAME= openssh-3.9p1
PKGNAME= openssh-3.9.1
-PKGREVISION= 1
+PKGREVISION= 2
SVR4_PKGNAME= ossh
CATEGORIES= security
MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \
@@ -114,6 +114,13 @@ ASKPASS_PROGRAM= ${X11PREFIX}/bin/ssh-askpass
CONFIGURE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM}
MAKE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM}
+# do the same for xauth
+.if exists(${X11BASE}/bin/xauth)
+CONFIGURE_ARGS+= --with-xauth=${X11BASE}/bin/xauth
+.else
+CONFIGURE_ARGS+= --with-xauth=${X11PREFIX}/bin/xauth
+.endif
+
CONFS= ssh_config sshd_config
SUPPS= moduli