diff options
| author | Sergey Matveychuk <sem@FreeBSD.org> | 2005-02-11 21:11:51 +0000 |
|---|---|---|
| committer | Sergey Matveychuk <sem@FreeBSD.org> | 2005-02-11 21:11:51 +0000 |
| commit | 73d0a2892adb6aa494222cefe4cd8fd054c82d39 (patch) | |
| tree | bbe10d85004076dff7f505aa8115a520856ab8fa | |
| parent | 5dbcda2191b2aa1dcfeaa13897220933763fcbd7 (diff) | |
| download | ports-73d0a2892adb6aa494222cefe4cd8fd054c82d39.tar.gz ports-73d0a2892adb6aa494222cefe4cd8fd054c82d39.zip | |
- Add (or fix) CONFLICTS line. The ports install bin/digest.
Approved by: portmgr (krion)
Notes
Notes:
svn path=/head/; revision=128541
| -rw-r--r-- | biology/emboss/Makefile | 2 | ||||
| -rw-r--r-- | mail/qmail-ldap/Makefile | 2 | ||||
| -rw-r--r-- | security/digest/Makefile | 2 | ||||
| -rw-r--r-- | security/nss/Makefile | 4 |
4 files changed, 8 insertions, 2 deletions
diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile index 18ad062199d2..b0e4759f5025 100644 --- a/biology/emboss/Makefile +++ b/biology/emboss/Makefile @@ -22,6 +22,8 @@ BUILD_DEPENDS= clustalw:${PORTSDIR}/biology/clustalw \ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ png.5:${PORTSDIR}/graphics/png +CONFLICTS= nss-* qmail-ldap2-* digest-* + USE_SUBMAKE= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile index 2e59e9aa8b25..8db7ac39974a 100644 --- a/mail/qmail-ldap/Makefile +++ b/mail/qmail-ldap/Makefile @@ -20,6 +20,8 @@ EXTRA_PATCHES+= ${QMAIL_PORT_PATCHDIR}/patch-ab ${QMAIL_PORT_PATCHDIR}/patch-ac MAINTAINER= lioux@FreeBSD.org COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH LDAP support +CONFLICTS= nss-* emboss-* digest-* + USE_OPENLDAP= yes PKGNAMESUFFIX:= ${PKGNAMESUFFIX}2 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 <bsd.port.pre.mk> |