diff options
| author | jwise <jwise@pkgsrc.org> | 2003-07-24 20:59:03 +0000 |
|---|---|---|
| committer | jwise <jwise@pkgsrc.org> | 2003-07-24 20:59:03 +0000 |
| commit | 17b55e0ebf224173bfc9ab54988d753cc18fae72 (patch) | |
| tree | 1a2b5c528723a4fd5eea29cecceac7bbc3ae7847 /security | |
| parent | bf2ee3a5262166d8dc8a1f61a46ab5022ab2ef5d (diff) | |
| download | pkgsrc-17b55e0ebf224173bfc9ab54988d753cc18fae72.tar.gz | |
Mark conflicts with openssh+gssapi.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh/Makefile | 3 | ||||
| -rw-r--r-- | security/ssh/Makefile | 3 | ||||
| -rw-r--r-- | security/ssh2/Makefile.common | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 7c8597d478f..5acca5e3690 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.102 2003/07/17 22:53:01 grant Exp $ +# $NetBSD: Makefile,v 1.103 2003/07/24 20:59:03 jwise Exp $ DISTNAME= openssh-3.6.1p2 PKGNAME= openssh-3.6.1.2 @@ -19,6 +19,7 @@ COMMENT= Open Source Secure shell client and server (remote login program) CONFLICTS= sftp-[0-9]* CONFLICTS+= ssh-[0-9]* ssh6-[0-9]* ssh2-[0-9]* +CONFLICTS+= openssh+gssapi-[0-9]* USE_PERL5= build diff --git a/security/ssh/Makefile b/security/ssh/Makefile index e40bca252f1..159fcb686ad 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.106 2003/07/17 22:53:16 grant Exp $ +# $NetBSD: Makefile,v 1.107 2003/07/24 20:59:04 jwise Exp $ # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp # @@ -19,6 +19,7 @@ HOMEPAGE= http://www.cs.hut.fi/ssh/ COMMENT= Secure shell client and server (remote login program) CONFLICTS= openssh-[0-9]* ssh2-[0-9]* ssh6-[0-9]* +CONFLICTS= openssh+gssapi-[0-9]* CRYPTO= YES LICENSE= no-commercial-use diff --git a/security/ssh2/Makefile.common b/security/ssh2/Makefile.common index 296e9c92504..157de58d353 100644 --- a/security/ssh2/Makefile.common +++ b/security/ssh2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2003/07/17 22:53:17 grant Exp $ +# $NetBSD: Makefile.common,v 1.4 2003/07/24 20:59:04 jwise Exp $ # DISTNAME= ssh-3.2.2 @@ -9,6 +9,7 @@ MAINTAINER= seb@NetBSD.org HOMEPAGE= http://www.ssh.com CONFLICTS+= openssh-[0-9]* ssh6-[0-9]* ssh-[0-9]* sftp-[0-9]* +CONFLICTS+= openssh+gssapi-[0-9]* USE_BUILDLINK2= YES USE_PKGINSTALL= YES |