OpenSSL has not had base64 for a while now, so these two no longer need

to conflict.  Noted by Bernhard Riedel.
This commit is contained in:
jschauma 2003-11-19 02:52:46 +00:00
parent e6580404a6
commit b5425f7502
2 changed files with 3 additions and 5 deletions

View file

@ -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

View file

@ -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