diff options
| author | marcus <marcus@FreeBSD.org> | 2006-02-03 07:12:05 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2006-02-03 07:12:05 +0800 |
| commit | 271163790c5a16078356365afc03bc40b7100358 (patch) | |
| tree | f01faf0c8856501952b29f0b5140149bc5ad80b5 | |
| parent | a118e4e1714ca71e375644ae7678e9a1d29ec904 (diff) | |
| download | freebsd-ports-gnome-271163790c5a16078356365afc03bc40b7100358.tar.gz freebsd-ports-gnome-271163790c5a16078356365afc03bc40b7100358.tar.zst freebsd-ports-gnome-271163790c5a16078356365afc03bc40b7100358.zip | |
Remove CONFLICTS with nss.
| -rw-r--r-- | biology/emboss/Makefile | 2 | ||||
| -rw-r--r-- | devel/p5-PAR/Makefile | 2 | ||||
| -rw-r--r-- | mail/qmail-ldap/Makefile | 2 | ||||
| -rw-r--r-- | security/digest/Makefile | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile index ab1707ad3087..25da265c60fa 100644 --- a/biology/emboss/Makefile +++ b/biology/emboss/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS= clustalw:${PORTSDIR}/biology/clustalw \ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ png.5:${PORTSDIR}/graphics/png -CONFLICTS= nss-* qmail-ldap2-* digest-* +CONFLICTS= qmail-ldap2-* digest-* USE_SUBMAKE= yes USE_GMAKE= yes diff --git a/devel/p5-PAR/Makefile b/devel/p5-PAR/Makefile index 717b937dd4a3..a9ff705222cf 100644 --- a/devel/p5-PAR/Makefile +++ b/devel/p5-PAR/Makefile @@ -32,8 +32,6 @@ MAN3= App::Packer::PAR.3 PAR.3 \ PAR::Filter::Obfuscate.3 PAR::Filter::PatchContent.3 \ PAR::Filter::PodStrip.3 PAR::Heavy.3 PAR::Tutorial.3 -CONFLICTS= nss-3.* - .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500800 diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile index 9aa8e5667502..fedff2ce0fdd 100644 --- a/mail/qmail-ldap/Makefile +++ b/mail/qmail-ldap/Makefile @@ -16,7 +16,7 @@ COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH LDAP support RUN_DEPENDS= ${LOCALBASE}/bin/svscan:${PORTSDIR}/sysutils/daemontools \ ${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp -CONFLICTS= nss-[0-9]* emboss-[0-9]* digest-[0-9]* +CONFLICTS= emboss-[0-9]* digest-[0-9]* USE_OPENLDAP= yes SLAVE_LDAP= yes diff --git a/security/digest/Makefile b/security/digest/Makefile index 4312761054e6..3cfc40bb0c31 100644 --- a/security/digest/Makefile +++ b/security/digest/Makefile @@ -15,7 +15,7 @@ MASTER_SITES?= http://highsecure.ru/ MAINTAINER?= vsevolod@FreeBSD.org COMMENT?= Message digest wrapper utility -CONFLICTS?= nss-[0-9]* emboss-[0-9]* qmail-ldap2-* +CONFLICTS?= emboss-[0-9]* qmail-ldap2-* GNU_CONFIGURE= yes |