diff options
| author | grant <grant@pkgsrc.org> | 2004-07-25 12:35:06 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2004-07-25 12:35:06 +0000 |
| commit | 0b85776bd8aa624a1a8aeb6b00e1eb48430fff38 (patch) | |
| tree | 37a2c178bf7229996c9f1b5a9ab39c75d314cc6e | |
| parent | d4f7b767c436944d4f1730bf14597969aa00b7e1 (diff) | |
| download | pkgsrc-0b85776bd8aa624a1a8aeb6b00e1eb48430fff38.tar.gz | |
add CONFLICT with openssh.
| -rw-r--r-- | security/ssh2-nox11/Makefile | 3 | ||||
| -rw-r--r-- | security/ssh2/Makefile | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/security/ssh2-nox11/Makefile b/security/ssh2-nox11/Makefile index 78ae4116fab..bd72bfcc0c1 100644 --- a/security/ssh2-nox11/Makefile +++ b/security/ssh2-nox11/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/05/10 10:05:50 seb Exp $ +# $NetBSD: Makefile,v 1.2 2004/07/25 12:35:06 grant 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 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 |