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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8b28661ec97e
branches:  trunk
changeset: 478540:8b28661ec97e
user:      grant <grant%pkgsrc.org@localhost>
date:      Sun Jul 25 12:35:06 2004 +0000

description:
add CONFLICT with openssh.

diffstat:

 security/ssh2-nox11/Makefile |  3 ++-
 security/ssh2/Makefile       |  3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 48ffffa2cfc2 -r 8b28661ec97e security/ssh2-nox11/Makefile
--- a/security/ssh2-nox11/Makefile      Sun Jul 25 12:29:19 2004 +0000
+++ b/security/ssh2-nox11/Makefile      Sun Jul 25 12:35:06 2004 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/05/10 10:05:50 seb Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/25 12:35:06 grant Exp $
 #
 
 PKGNAME=       ${DISTNAME:C/ssh-/ssh2-nox11-/}
 COMMENT=        Secure Shell client and server for V.2 SSH protocol without X11 support
 CONFLICTS=             ssh2-[0-9]*
+CONFLICTS+=            openssh-[0-9]*
 CONFIGURE_ARGS+=       --without-x     # be explicit
 
 .include "../../security/ssh2/Makefile.common"
diff -r 48ffffa2cfc2 -r 8b28661ec97e security/ssh2/Makefile
--- a/security/ssh2/Makefile    Sun Jul 25 12:29:19 2004 +0000
+++ b/security/ssh2/Makefile    Sun Jul 25 12:35:06 2004 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2003/05/10 10:02:34 seb Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/25 12:35:06 grant Exp $
 #
 
 PKGNAME=       ${DISTNAME:C/ssh-/ssh2-/}
 COMMENT=        Secure Shell client and server for V.2 SSH protocol
 
 CONFLICTS=     ssh2-nox11-[0-9]*
+CONFLICTS+=    openssh-[0-9]*
 
 USE_X11=               YES
 CONFIGURE_ARGS+=       --with-x        # be explicit