summaryrefslogtreecommitdiff
path: root/security/ssh2
diff options
context:
space:
mode:
authorgrant <grant>2004-07-25 12:35:06 +0000
committergrant <grant>2004-07-25 12:35:06 +0000
commitd86c3d5b134414c5cd68d39bd808e58c1e8cd620 (patch)
tree37a2c178bf7229996c9f1b5a9ab39c75d314cc6e /security/ssh2
parent99385c22e26f2ed0d1eb01bba97730d9a0b1e0f9 (diff)
downloadpkgsrc-d86c3d5b134414c5cd68d39bd808e58c1e8cd620.tar.gz
add CONFLICT with openssh.
Diffstat (limited to 'security/ssh2')
-rw-r--r--security/ssh2/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 93d840d5dfd..d3b63dfdd86 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -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