summaryrefslogtreecommitdiff
path: root/security/ssh2
diff options
context:
space:
mode:
authorseb <seb@pkgsrc.org>2004-07-31 12:52:42 +0000
committerseb <seb@pkgsrc.org>2004-07-31 12:52:42 +0000
commitc965ed7bfd7ba5f296aeb3df7cb0984fdaea6f67 (patch)
tree16abf498fcd9f1dd269e7f40fb6bb2b8309fd8c0 /security/ssh2
parentf45e88010225c67016899a56f15ab547da8d0006 (diff)
downloadpkgsrc-c965ed7bfd7ba5f296aeb3df7cb0984fdaea6f67.tar.gz
Revert previous: conflicts with openssh (and others) are already specified in
Makefile.common.
Diffstat (limited to 'security/ssh2')
-rw-r--r--security/ssh2/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index d3b63dfdd86..752283e0b28 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2004/07/25 12:35:06 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/07/31 12:52:42 seb 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