summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/openssl/Makefile4
-rw-r--r--textproc/glimpse/Makefile4
2 files changed, 3 insertions, 5 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index f4960e035a2..43e5357cf55 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -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 @@ COMMENT= Secure Socket Layer and cryptographic library
USE_PERL5= build
-CONFLICTS= SSLeay-[0-9]* ssleay-[0-9]* glimpse-[0-9]
+CONFLICTS= SSLeay-[0-9]* ssleay-[0-9]*
CRYPTO= YES
diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index 407e2f5cf30..fa2dd5bc799 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -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 @@ MAINTAINER= tech-pkg@NetBSD.org
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}