[pkgsrc/trunk]: pkgsrc/security/openssh add CONFLICT with ssh2-nox11.

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/57fa2db52885
branches:  trunk
changeset: 478541:57fa2db52885
user:      grant <grant%pkgsrc.org@localhost>
date:      Sun Jul 25 12:36:03 2004 +0000

description:
add CONFLICT with ssh2-nox11.

diffstat:

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

diffs (19 lines):

diff -r 8b28661ec97e -r 57fa2db52885 security/openssh/Makefile
--- a/security/openssh/Makefile Sun Jul 25 12:35:06 2004 +0000
+++ b/security/openssh/Makefile Sun Jul 25 12:36:03 2004 +0000
@@ -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 @@
 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