[pkgsrc/trunk]: pkgsrc/security Add CONFLICTS with lsh (common man page).

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bc12f19fe43c
branches:  trunk
changeset: 493142:bc12f19fe43c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Apr 28 14:11:13 2005 +0000

description:
Add CONFLICTS with lsh (common man page).

diffstat:

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

diffs (34 lines):

diff -r 7009348dc5d8 -r bc12f19fe43c security/openssh+gssapi/Makefile
--- a/security/openssh+gssapi/Makefile  Thu Apr 28 14:10:04 2005 +0000
+++ b/security/openssh+gssapi/Makefile  Thu Apr 28 14:11:13 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:14 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/04/28 14:11:13 wiz Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -29,6 +29,7 @@
 CONFLICTS=             sftp-[0-9]*
 CONFLICTS+=            ssh-[0-9]* ssh6-[0-9]* ssh2-[0-9]*
 CONFLICTS+=            openssh-[0-9]*
+CONFLICTS+=            lsh>2.0
 
 USE_PERL5=             build
 
diff -r 7009348dc5d8 -r bc12f19fe43c security/openssh/Makefile
--- a/security/openssh/Makefile Thu Apr 28 14:10:04 2005 +0000
+++ b/security/openssh/Makefile Thu Apr 28 14:11:13 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.148 2005/04/11 21:47:14 tv Exp $
+# $NetBSD: Makefile,v 1.149 2005/04/28 14:11:13 wiz Exp $
 
 DISTNAME=              openssh-3.9p1
 PKGNAME=               openssh-3.9.1
@@ -22,6 +22,7 @@
 CONFLICTS+=            ssh-[0-9]* ssh6-[0-9]*
 CONFLICTS+=            ssh2-[0-9]* ssh2-nox11-[0-9]*
 CONFLICTS+=            openssh+gssapi-[0-9]*
+CONFLICTS+=            lsh>2.0
 
 USE_PERL5=             build