summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/ssh2-nox11/Makefile3
-rw-r--r--security/ssh2/Makefile3
2 files changed, 2 insertions, 4 deletions
diff --git a/security/ssh2-nox11/Makefile b/security/ssh2-nox11/Makefile
index bd72bfcc0c1..e66d780fa43 100644
--- a/security/ssh2-nox11/Makefile
+++ b/security/ssh2-nox11/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2004/07/25 12:35:06 grant Exp $
+# $NetBSD: Makefile,v 1.3 2004/07/31 12:52:42 seb 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 --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