summaryrefslogtreecommitdiff
path: root/security/openssh
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2004-07-25 12:36:03 +0000
committergrant <grant@pkgsrc.org>2004-07-25 12:36:03 +0000
commit1e99c0fee70b6389a3430faa0470eaff946497ab (patch)
tree7a6afede4a77f3320a97b59b1346169ed120abe5 /security/openssh
parent0b85776bd8aa624a1a8aeb6b00e1eb48430fff38 (diff)
downloadpkgsrc-1e99c0fee70b6389a3430faa0470eaff946497ab.tar.gz
add CONFLICT with ssh2-nox11.
Diffstat (limited to 'security/openssh')
-rw-r--r--security/openssh/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 747feab6826..94cca0c5d2c 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2004/05/21 23:00:23 reed Exp $
+# $NetBSD: Makefile,v 1.140 2004/07/25 12:36:03 grant Exp $
DISTNAME= openssh-3.8.1p1
PKGNAME= openssh-3.8.1.1
@@ -18,7 +18,8 @@ HOMEPAGE= http://www.openssh.com/
COMMENT= Open Source Secure shell client and server (remote login program)
CONFLICTS= sftp-[0-9]*
-CONFLICTS+= ssh-[0-9]* ssh6-[0-9]* ssh2-[0-9]*
+CONFLICTS+= ssh-[0-9]* ssh6-[0-9]*
+CONFLICTS+= ssh2-[0-9]* ssh2-nox11-[0-9]*
CONFLICTS+= openssh+gssapi-[0-9]*
USE_PERL5= build