summaryrefslogtreecommitdiff
path: root/security/ssh
diff options
context:
space:
mode:
authorwiz <wiz>2002-10-20 00:49:55 +0000
committerwiz <wiz>2002-10-20 00:49:55 +0000
commitf3685f332d3671d8e324ce2ce99ed8ba8cee977c (patch)
treecd4644585ab4f241b8616a1865180e3325564ecf /security/ssh
parentae08f248305dd45410eb522e5917af5f2a94ee1f (diff)
downloadpkgsrc-f3685f332d3671d8e324ce2ce99ed8ba8cee977c.tar.gz
Add CONLICT with ssh2 package. From Greg A. Woods in PR 18729.
Diffstat (limited to 'security/ssh')
-rw-r--r--security/ssh/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index d5736140786..4f650548c24 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2002/09/05 00:13:41 itojun Exp $
+# $NetBSD: Makefile,v 1.102 2002/10/20 00:49:55 wiz Exp $
# FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
#
@@ -18,7 +18,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.cs.hut.fi/ssh/
COMMENT= Secure shell client and server (remote login program)
-CONFLICTS= openssh-[0-9]* ssh6-[0-9]*
+CONFLICTS= openssh-[0-9]* ssh2-[0-9]* ssh6-[0-9]*
CRYPTO= YES
LICENSE= no-commercial-use