From 5c1ca8e4b0945890596e214b8e67819f02499eb9 Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Sun, 25 Jul 2004 12:36:03 +0000
Subject: add CONFLICT with ssh2-nox11.

---
 security/openssh/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'security/openssh/Makefile')

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
-- 
cgit v1.2.3