summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/openssl/Makefile5
-rw-r--r--textproc/glimpse/Makefile4
2 files changed, 6 insertions, 3 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 21cfb5f4b75..476c106ad6e 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2001/09/27 23:18:39 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2001/10/18 04:51:04 tron Exp $
DISTNAME= openssl-0.9.6
PKGNAME= ${DISTNAME}nb2
@@ -12,7 +12,8 @@ COMMENT= Secure Socket Layer and cryptographic library
BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5
-CONFLICTS= SSLeay-[0-9]* ssleay-[0-9]* base64-[0-9]*
+CONFLICTS= SSLeay-[0-9]* ssleay-[0-9]* base64-[0-9]* \
+ glimpse-[0-9]
CRYPTO= YES
diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index 7297e42882f..eef1d264480 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/10/13 23:43:29 mjl Exp $
+# $NetBSD: Makefile,v 1.15 2001/10/18 04:51:04 tron Exp $
# FreeBSD Id: Makefile,v 1.12 1997/07/17 19:29:07 andreas Exp
#
@@ -10,6 +10,8 @@ MAINTAINER= packages@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}