diff options
| author | wiz <wiz> | 2001-02-27 18:21:25 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2001-02-27 18:21:25 +0000 |
| commit | bc5265ebe6bd7ca4e2e804e6862d186d8469d180 (patch) | |
| tree | 3b8dee8620f4cdcc843a8a9b2ce0574830e69107 | |
| parent | f6dae6e6bfd66cd346a4e56e23fb670b05ac3685 (diff) | |
| download | pkgsrc-bc5265ebe6bd7ca4e2e804e6862d186d8469d180.tar.gz | |
security/openssl and converters/base64 both install a 'base64' executable,
so make them CONFLICT (pkg/11408).
| -rw-r--r-- | converters/base64/Makefile | 4 | ||||
| -rw-r--r-- | security/openssl/Makefile | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/converters/base64/Makefile b/converters/base64/Makefile index 7713f25cb85..6d136d27a8c 100644 --- a/converters/base64/Makefile +++ b/converters/base64/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 13:59:22 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/27 18:21:26 wiz Exp $ # DISTNAME= base64 @@ -10,6 +10,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.fourmilab.ch/webtools/base64/ COMMENT= encode and decode base64 files +CONFLICTS= openssl-* + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/base64 ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/base64.1 ${PREFIX}/man/man1 diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 843569bcd31..bdb0b63cb91 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2001/02/25 04:18:12 hubertf Exp $ +# $NetBSD: Makefile,v 1.31 2001/02/27 18:21:25 wiz Exp $ # DISTNAME= openssl-0.9.6 @@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.openssl.org/ COMMENT= Secure Socket Layer and cryptographic library -CONFLICTS= SSLeay-* ssleay-* +CONFLICTS= SSLeay-* ssleay-* base64-* CRYPTO= YES USE_PERL5= YES |