From b5425f7502ea18030cc349a100242f7b00b4dc8d Mon Sep 17 00:00:00 2001 From: jschauma Date: Wed, 19 Nov 2003 02:52:46 +0000 Subject: OpenSSL has not had base64 for a while now, so these two no longer need to conflict. Noted by Bernhard Riedel. --- converters/base64/Makefile | 3 +-- security/openssl/Makefile | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/converters/base64/Makefile b/converters/base64/Makefile index 0b3b75d4656..6e3beb57ee5 100644 --- a/converters/base64/Makefile +++ b/converters/base64/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/11/12 03:39:39 jschauma Exp $ +# $NetBSD: Makefile,v 1.12 2003/11/19 02:52:46 jschauma Exp $ # DISTNAME= base64-1.3 @@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.fourmilab.ch/webtools/base64/ COMMENT= Encode and decode base64 files -CONFLICTS= openssl-[0-9]* GNU_CONFIGURE= yes ALL_TARGET= prog USE_BUILDLINK2= yes diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 499351eda6a..f4960e035a2 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82 2003/11/12 03:35:45 jschauma Exp $ +# $NetBSD: Makefile,v 1.83 2003/11/19 02:52:46 jschauma Exp $ DISTNAME= openssl-0.9.6l SVR4_PKGNAME= ossl @@ -11,8 +11,7 @@ COMMENT= Secure Socket Layer and cryptographic library USE_PERL5= build -CONFLICTS= SSLeay-[0-9]* ssleay-[0-9]* base64-[0-9]* \ - glimpse-[0-9] +CONFLICTS= SSLeay-[0-9]* ssleay-[0-9]* glimpse-[0-9] CRYPTO= YES -- cgit v1.2.3