svn commit: r428221 - in head/dns: bind9-devel bind910 bind911 bind99
Mathieu Arnold
mat at FreeBSD.org
Fri Dec 9 15:40:33 UTC 2016
Author: mat
Date: Fri Dec 9 15:40:32 2016
New Revision: 428221
URL: https://svnweb.freebsd.org/changeset/ports/428221
Log:
Cleanup CONFLICTS.
Sponsored by: Absolight
Modified:
head/dns/bind9-devel/Makefile (contents, props changed)
head/dns/bind910/Makefile (contents, props changed)
head/dns/bind911/Makefile (contents, props changed)
head/dns/bind99/Makefile (contents, props changed)
Modified: head/dns/bind9-devel/Makefile
==============================================================================
--- head/dns/bind9-devel/Makefile Fri Dec 9 15:40:21 2016 (r428220)
+++ head/dns/bind9-devel/Makefile Fri Dec 9 15:40:32 2016 (r428221)
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+= --disable-shared
.endif
ETCDIR= ${PREFIX}/etc/namedb
-CONFLICTS+= bind9*-9.[456789].* bind910-* bind911-* bind9*-sdb-9.[456789].*
+CONFLICTS+= bind99 bind910 bind911
.if !defined(BIND_TOOLS_SLAVE)
SUB_FILES= pkg-message
@@ -118,9 +118,9 @@ GSSAPI_MIT_DESC= Using security/krb5
GSSAPI_NONE_DESC= Disable
.if defined(BIND_TOOLS_SLAVE)
-CONFLICTS+= bind910-9.10.*
+CONFLICTS+= bind9-devel
.else
-CONFLICTS+= bind-tools-9.*
+CONFLICTS+= bind-tools
.endif # BIND_TOOLS_SLAVE
SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
Modified: head/dns/bind910/Makefile
==============================================================================
--- head/dns/bind910/Makefile Fri Dec 9 15:40:21 2016 (r428220)
+++ head/dns/bind910/Makefile Fri Dec 9 15:40:32 2016 (r428221)
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --disable-shared
.endif
ETCDIR= ${PREFIX}/etc/namedb
-CONFLICTS+= bind9*-9.[456789].* bind911-* bind9*-sdb-9.[456789].*
+CONFLICTS+= bind99 bind911 bind9-devel
.if !defined(BIND_TOOLS_SLAVE)
SUB_FILES= pkg-message
@@ -118,9 +118,9 @@ FETCHLIMIT_CONFIGURE_ENABLE= fetchlimit
QUERYTRACE_CONFIGURE_ENABLE= querytrace
.if defined(BIND_TOOLS_SLAVE)
-CONFLICTS+= bind910-9.10.*
+CONFLICTS+= bind910
.else
-CONFLICTS+= bind-tools-9.*
+CONFLICTS+= bind-tools
.endif # BIND_TOOLS_SLAVE
SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
Modified: head/dns/bind911/Makefile
==============================================================================
--- head/dns/bind911/Makefile Fri Dec 9 15:40:21 2016 (r428220)
+++ head/dns/bind911/Makefile Fri Dec 9 15:40:32 2016 (r428221)
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --disable-shared
.endif
ETCDIR= ${PREFIX}/etc/namedb
-CONFLICTS+= bind9*-9.[456789].* bind910-* bind9*-sdb-9.[456789].*
+CONFLICTS+= bind99 bind910 bind9-devel
.if !defined(BIND_TOOLS_SLAVE)
SUB_FILES= pkg-message
@@ -116,9 +116,9 @@ GSSAPI_MIT_DESC= Using security/krb5
GSSAPI_NONE_DESC= Disable
.if defined(BIND_TOOLS_SLAVE)
-CONFLICTS+= bind910-9.10.*
+CONFLICTS+= bind911
.else
-CONFLICTS+= bind-tools-9.*
+CONFLICTS+= bind-tools
.endif # BIND_TOOLS_SLAVE
SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
Modified: head/dns/bind99/Makefile
==============================================================================
--- head/dns/bind99/Makefile Fri Dec 9 15:40:21 2016 (r428220)
+++ head/dns/bind99/Makefile Fri Dec 9 15:40:32 2016 (r428221)
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --localstatedir=/var --d
--sysconfdir=${ETCDIR}
ETCDIR= ${PREFIX}/etc/namedb
-CONFLICTS= bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind910-* bind911-* bind-tools-9.*
+CONFLICTS= bind-tools bind9-devel bind910 bind911
SUB_FILES= pkg-message
More information about the svn-ports-head
mailing list