Update CONFLICTS to reflect the addition of the bind96 port,

the demise of bind9-dlz, and updates to the bind9-sdb-* ports.

7 files changed, 7 insertions, 7 deletions

diff --git a/dns/bind9-sdb-ldap/Makefile b/dns/bind9-sdb-ldap/Makefile
index 1a4461dbd30..6129e5ae9fb 100644
--- a/dns/bind9-sdb-ldap/Makefile
+++ b/dns/bind9-sdb-ldap/Makefile
@@ -20,7 +20,7 @@ COMMENT=	The well known Bind9, patched for use of an LDAP based backend
 
 USE_OPENLDAP=	yes
 
-CONFLICTS=	bind9-9.* bind9-dlz-* host-* skalibs-*
+CONFLICTS=	bind9-9.* bind9-sdb-postgresql-* host-* skalibs-*
 
 # ISC releases things like 9.3.0rc1, which our versioning doesn't like
 ISCVERSION=	9.4.2-P1
diff --git a/dns/bind9-sdb-postgresql/Makefile b/dns/bind9-sdb-postgresql/Makefile
index 5e38e95261b..96d6bb6f1aa 100644
--- a/dns/bind9-sdb-postgresql/Makefile
+++ b/dns/bind9-sdb-postgresql/Makefile
@@ -18,7 +18,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	josh.carroll@gmail.com
 COMMENT=	Bind9, patched for use with a PostgreSQL-based backend
 
-CONFLICTS=	bind9-9.[35].* bind9-dlz-* bind9-sdb-ldap-* host-*
+CONFLICTS=	bind9-9.* bind9-sdb-ldap-* host-*
 
 # ISC releases things like 9.3.0rc1, which our versioning doesn't like
 ISCVERSION=	9.4.2-P2
diff --git a/dns/bind9/Makefile b/dns/bind9/Makefile
index b155c2e9085..2b122e063e2 100644
--- a/dns/bind9/Makefile
+++ b/dns/bind9/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 
 USE_OPENSSL=	yes
 
-CONFLICTS=	bind9-9.[45].* bind9-dlz-* bind9-sdb-ldap-* host-*
+CONFLICTS=	bind9-9.[456].* bind9-sdb-* host-*
 
 OPTIONS=	REPLACE_BASE "Replace base BIND with this version" off \
 		THREADS	"Compile with thread support (NOT RECOMMENDED!)" off
diff --git a/dns/bind94/Makefile b/dns/bind94/Makefile
index 8f0335a6cb8..5fdff93b0c9 100644
--- a/dns/bind94/Makefile
+++ b/dns/bind94/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 
 USE_OPENSSL=	yes
 
-CONFLICTS=	bind9-9.[35].* bind9-dlz-* bind9-sdb-ldap-* host-*
+CONFLICTS=	bind9-9.[356].* bind9-sdb-* host-*
 
 OPTIONS=	REPLACE_BASE "Replace base BIND with this version" off \
 		LARGE_FILE "64-bit file support" off \
diff --git a/dns/bind95/Makefile b/dns/bind95/Makefile
index 3315e05a5be..55b9de0552d 100644
--- a/dns/bind95/Makefile
+++ b/dns/bind95/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 
 USE_OPENSSL=	yes
 
-CONFLICTS=	bind9-9.[34].* bind9-dlz-* bind9-sdb-ldap-* host-*
+CONFLICTS=	bind9-9.[346].* bind9-sdb-* host-*
 
 OPTIONS=	XML "Support for xml statistics output" on \
 		IDN "Add IDN support to dig, host, etc." off \
diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile
index 77259f37b14..7d225392b21 100644
--- a/dns/bind96/Makefile
+++ b/dns/bind96/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 
 USE_OPENSSL=	yes
 
-CONFLICTS=	bind9-9.[345].* bind9-dlz-* bind9-sdb-ldap-* host-*
+CONFLICTS=	bind9-9.[345].* bind9-sdb-* host-*
 
 OPTIONS=	XML "Support for xml statistics output" on \
 		IDN "Add IDN support to dig, host, etc." off \
diff --git a/dns/host/Makefile b/dns/host/Makefile
index 932d6fe599d..05923b8c6cc 100644
--- a/dns/host/Makefile
+++ b/dns/host/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An utility to query DNS servers
 
-CONFLICTS=	bind9-9.* bind9-dlz-* bind9-sdb-ldap-* skalibs-*
+CONFLICTS=	bind9-9.* bind9-sdb-* skalibs-*
 NO_WRKSUBDIR=	yes
 
 MAN1=		host.1