diff options
| author | sem <sem@FreeBSD.org> | 2005-02-12 05:11:51 +0800 |
|---|---|---|
| committer | sem <sem@FreeBSD.org> | 2005-02-12 05:11:51 +0800 |
| commit | 5fefc007194d78908e78b431e0222207a5039a0e (patch) | |
| tree | 5ab5b77b35e7101405e0b75e9cf44209e61bb18e /security | |
| parent | fd18e2e3237387aa1947a1f7c47d393f6ea084dc (diff) | |
| download | freebsd-ports-graphics-5fefc007194d78908e78b431e0222207a5039a0e.tar.gz freebsd-ports-graphics-5fefc007194d78908e78b431e0222207a5039a0e.tar.zst freebsd-ports-graphics-5fefc007194d78908e78b431e0222207a5039a0e.zip | |
- Add (or fix) CONFLICTS line. The ports install bin/digest.
Approved by: portmgr (krion)
Diffstat (limited to 'security')
| -rw-r--r-- | security/digest/Makefile | 2 | ||||
| -rw-r--r-- | security/nss/Makefile | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/security/digest/Makefile b/security/digest/Makefile index 2f8db42f2b3..1d57d3495ad 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 bc583809664..390bc9ad726 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 <bsd.port.pre.mk> |