summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorjschauma <jschauma>2003-11-19 02:52:46 +0000
committerjschauma <jschauma>2003-11-19 02:52:46 +0000
commit5a9e56e209a36ab1cfdd851ac3b0928bdef07c68 (patch)
tree8f17e2af52a3d6f016f2923bc6564050d6d98caa /security
parent149122d587bfe6be340c9ee18918fa5c03db87f8 (diff)
downloadpkgsrc-5a9e56e209a36ab1cfdd851ac3b0928bdef07c68.tar.gz
OpenSSL has not had base64 for a while now, so these two no longer need
to conflict. Noted by Bernhard Riedel.
Diffstat (limited to 'security')
-rw-r--r--security/openssl/Makefile5
1 files changed, 2 insertions, 3 deletions
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