[pkgsrc/trunk]: pkgsrc OpenSSL has not had base64 for a while now, so these t...

[jschauma <jschauma%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/228c0afbf4e6
branches:  trunk
changeset: 463593:228c0afbf4e6
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Wed Nov 19 02:52:46 2003 +0000

description:
OpenSSL has not had base64 for a while now, so these two no longer need
to conflict.  Noted by Bernhard Riedel.

diffstat:

 converters/base64/Makefile |  3 +--
 security/openssl/Makefile  |  5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r 25e5a1416db8 -r 228c0afbf4e6 converters/base64/Makefile
--- a/converters/base64/Makefile        Wed Nov 19 00:00:01 2003 +0000
+++ b/converters/base64/Makefile        Wed Nov 19 02:52:46 2003 +0000
@@ -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 @@
 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 -r 25e5a1416db8 -r 228c0afbf4e6 security/openssl/Makefile
--- a/security/openssl/Makefile Wed Nov 19 00:00:01 2003 +0000
+++ b/security/openssl/Makefile Wed Nov 19 02:52:46 2003 +0000
@@ -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 @@
 
 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