[pkgsrc/trunk]: pkgsrc textproc/glimpse and security/openssl no longer confli...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/823b9fd912be
branches:  trunk
changeset: 463594:823b9fd912be
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Wed Nov 19 02:57:43 2003 +0000

description:
textproc/glimpse and security/openssl no longer conflict, as openssl
does no longer install bin/cast.  Noted by Bernhard Riedel.

diffstat:

 security/openssl/Makefile |  4 ++--
 textproc/glimpse/Makefile |  4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r 228c0afbf4e6 -r 823b9fd912be security/openssl/Makefile
--- a/security/openssl/Makefile Wed Nov 19 02:52:46 2003 +0000
+++ b/security/openssl/Makefile Wed Nov 19 02:57:43 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2003/11/19 02:52:46 jschauma Exp $
+# $NetBSD: Makefile,v 1.84 2003/11/19 02:57:44 jschauma Exp $
 
 DISTNAME=              openssl-0.9.6l
 SVR4_PKGNAME=          ossl
@@ -11,7 +11,7 @@
 
 USE_PERL5=             build
 
-CONFLICTS=             SSLeay-[0-9]* ssleay-[0-9]* glimpse-[0-9]
+CONFLICTS=             SSLeay-[0-9]* ssleay-[0-9]*
 
 CRYPTO=                        YES
 
diff -r 228c0afbf4e6 -r 823b9fd912be textproc/glimpse/Makefile
--- a/textproc/glimpse/Makefile Wed Nov 19 02:52:46 2003 +0000
+++ b/textproc/glimpse/Makefile Wed Nov 19 02:57:43 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/11/12 03:39:43 jschauma Exp $
+# $NetBSD: Makefile,v 1.21 2003/11/19 02:57:43 jschauma Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/07/17 19:29:07 andreas Exp
 #
 
@@ -11,8 +11,6 @@
 HOMEPAGE=      http://webglimpse.net/
 COMMENT=       Text search engine
 
-CONFLICT=      openssl-[0-9]*
-
 LICENSE=       glimpse-license
 RESTRICTED=    "Restrictive copyright (don't sell for profit)"
 NO_SRC_ON_CDROM=       ${RESTRICTED}