aboutsummaryrefslogtreecommitdiff
path: root/dns
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2009-01-04 07:26:28 +0000
committerDoug Barton <dougb@FreeBSD.org>2009-01-04 07:26:28 +0000
commitc288151fe50fef3c00980bcac457819f9efa65f8 (patch)
treef8f98de1fccdf0e899f41ef5cec1d4bc5aaf77f4 /dns
parent3926df4216b5dee23c1578f3a5297a464515d3c8 (diff)
Notes
Diffstat (limited to 'dns')
-rw-r--r--dns/bind9-sdb-ldap/Makefile2
-rw-r--r--dns/bind9-sdb-postgresql/Makefile2
-rw-r--r--dns/bind9/Makefile2
-rw-r--r--dns/bind94/Makefile2
-rw-r--r--dns/bind95/Makefile2
-rw-r--r--dns/bind96/Makefile2
-rw-r--r--dns/host/Makefile2
7 files changed, 7 insertions, 7 deletions
diff --git a/dns/bind9-sdb-ldap/Makefile b/dns/bind9-sdb-ldap/Makefile
index 1a4461dbd304..6129e5ae9fbd 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 5e38e95261bd..96d6bb6f1aa0 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 b155c2e9085d..2b122e063e28 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 8f0335a6cb8e..5fdff93b0c92 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 3315e05a5be5..55b9de0552de 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 77259f37b141..7d225392b218 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 932d6fe599d4..05923b8c6ccd 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