aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2008-07-04 15:43:37 +0000
committerDoug Barton <dougb@FreeBSD.org>2008-07-04 15:43:37 +0000
commit6321276ecb0272c669d4558fb7c762b8ee07562e (patch)
tree284157f8248db8d31dcb90f8e6c66fa181504513
parent131fe670c7174f2d60a2c0db3572086b6a256aec (diff)
Notes
-rw-r--r--dns/bind9-dlz/Makefile2
-rw-r--r--dns/bind9-sdb-ldap/Makefile2
-rw-r--r--dns/bind9/Makefile2
-rw-r--r--dns/bind94/Makefile2
-rw-r--r--dns/host/Makefile2
5 files changed, 5 insertions, 5 deletions
diff --git a/dns/bind9-dlz/Makefile b/dns/bind9-dlz/Makefile
index f0996190e3f7..3dec610a232a 100644
--- a/dns/bind9-dlz/Makefile
+++ b/dns/bind9-dlz/Makefile
@@ -24,7 +24,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= dinoex@FreeBSD.org
COMMENT= The Berkeley Internet Name Daemon, with DLZ extensions
-CONFLICTS?= bind-8.* bind84-8.* bind9-9.* bind9-sdb-mysql-* host-* skalibs-*
+CONFLICTS?= bind9-9.* bind9-sdb-ldap-* host-* skalibs-*
MASTER_SITES_DLZ= ${MASTER_SITE_SOURCEFORGE}
DLZVERSION= 0.7.0
diff --git a/dns/bind9-sdb-ldap/Makefile b/dns/bind9-sdb-ldap/Makefile
index 4a1801968f85..e293582cafdf 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= bind-8.* bind84-8.* bind9-9.* bind9-dlz-* host-* skalibs-*
+CONFLICTS= bind9-9.* bind9-dlz-* host-* skalibs-*
# ISC releases things like 9.3.0rc1, which our versioning doesn't like
ISCVERSION= 9.4.1-P1
diff --git a/dns/bind9/Makefile b/dns/bind9/Makefile
index f3dea95bc384..88171e1f98f0 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.4.* bind9-9.5.* bind9-dlz-[0-9]* bind9-sdb-mysql-[0-9]* host-[0-9]*
+CONFLICTS= bind9-9.[45].* bind9-dlz-* bind9-sdb-ldap-* 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 8ca11e9dd10c..20f579d1e784 100644
--- a/dns/bind94/Makefile
+++ b/dns/bind94/Makefile
@@ -34,7 +34,7 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \
USE_OPENSSL= yes
-CONFLICTS= bind9-9.3.* bind9-dlz-* bind9-sdb-mysql-* host-*
+CONFLICTS= bind9-9.[35].* bind9-dlz-* bind9-sdb-ldap-* host-*
OPTIONS= REPLACE_BASE "Replace base BIND with this version" off \
LARGE_FILE "64-bit file support" off \
diff --git a/dns/host/Makefile b/dns/host/Makefile
index 24cf88290374..932d6fe599d4 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= bind-8.* bind84-8.* bind9-9.* bind9-dlz-* bind9-sdb-mysql-* skalibs-*
+CONFLICTS= bind9-9.* bind9-dlz-* bind9-sdb-ldap-* skalibs-*
NO_WRKSUBDIR= yes
MAN1= host.1