diff options
author | hubertf <hubertf@pkgsrc.org> | 1999-02-20 22:48:24 +0000 |
---|---|---|
committer | hubertf <hubertf@pkgsrc.org> | 1999-02-20 22:48:24 +0000 |
commit | 2a95ad9c6be52511880e6ee241b087af70706624 (patch) | |
tree | f0ac98b899382f539e1e39385f1316edd18626bd /security | |
parent | 2821cb11104fb7319e84b4cd1808cf56f3604a54 (diff) | |
download | pkgsrc-2a95ad9c6be52511880e6ee241b087af70706624.tar.gz |
Fix CONFLICTS (remove redundancy, mostly)
Diffstat (limited to 'security')
-rw-r--r-- | security/ssh/Makefile | 4 | ||||
-rw-r--r-- | security/ssleay/Makefile | 4 | ||||
-rw-r--r-- | security/sudo/Makefile | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/security/ssh/Makefile b/security/ssh/Makefile index 9f06d00955f..544157a134c 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 1999/02/03 22:44:10 wrstuden Exp $ +# $NetBSD: Makefile,v 1.40 1999/02/20 22:48:42 hubertf Exp $ # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp # @@ -11,8 +11,6 @@ MASTER_SITES= ftp://ftp.cs.hut.fi/pub/ssh/ \ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.cs.hut.fi/ssh/ -CONFLICTS= ssh-1.2.22 ssh-1.2.23 ssh-1.2.25 - RESTRICTED= "Crypto; export-controlled" MIRROR_DISTFILE= no IS_INTERACTIVE= YES diff --git a/security/ssleay/Makefile b/security/ssleay/Makefile index 93049c50091..c46f0fbf8f5 100644 --- a/security/ssleay/Makefile +++ b/security/ssleay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1998/12/03 17:29:58 tv Exp $ +# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:42 hubertf Exp $ # DISTNAME= SSLeay-0.9.0b @@ -11,8 +11,6 @@ MASTER_SITES= ftp://psych.psy.uq.oz.au/pub/Crypto/SSL/ MAINTAINER= explorer@netbsd.org HOMEPAGE= http://www.psy.uq.oz.au/~ftp/Crypto/ -CONFLICTS= SSLeay-* - NOT_FOR_ARCHS= alpha *64 USE_PERL5= yes diff --git a/security/sudo/Makefile b/security/sudo/Makefile index cfd3add2e0d..231cf2f8dad 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1998/12/14 10:25:50 frueauf Exp $ +# $NetBSD: Makefile,v 1.11 1999/02/20 22:48:43 hubertf Exp $ # FreeBSD Id: Makefile,v 1.9 1997/11/12 03:24:41 obrien Exp # @@ -12,8 +12,6 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.courtesan.com/courtesan/products/sudo/ -CONFLICTS= sudo-1.5.3 sudo-1.5.4p1 sudo-1.5.6p2 - GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-C2 --with-skey --with-nbsdops --disable-path-info |