From 5fefc007194d78908e78b431e0222207a5039a0e Mon Sep 17 00:00:00 2001 From: sem Date: Fri, 11 Feb 2005 21:11:51 +0000 Subject: - Add (or fix) CONFLICTS line. The ports install bin/digest. Approved by: portmgr (krion) --- security/digest/Makefile | 2 +- security/nss/Makefile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'security') diff --git a/security/digest/Makefile b/security/digest/Makefile index 2f8db42f2b3f..1d57d3495ad1 100644 --- a/security/digest/Makefile +++ b/security/digest/Makefile @@ -15,7 +15,7 @@ DISTFILES= MAINTAINER?= eik@FreeBSD.org COMMENT?= Message digest wrapper utility -CONFLICTS?= nss-[0-9]* emboss-[0-9]* +CONFLICTS?= nss-[0-9]* emboss-[0-9]* qmail-ldap2-* GNU_CONFIGURE= yes NO_WRKSUBDIR= yes diff --git a/security/nss/Makefile b/security/nss/Makefile index bc5838096646..390bc9ad726b 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -30,7 +30,9 @@ CFLAGS+= -I${LOCALBASE}/include/nspr DIST= ${WRKSRC}/../../dist -CONFLICTS= btoa-5.* digest-* emboss-2.4.* oases-2.* p5-PAR-0.* +CONFLICTS= btoa-5.* digest-* emboss-2.* oases-2.* p5-PAR-0.* \ + qmail-ldap2-* + .include -- cgit