diff options
| author | mat <mat@FreeBSD.org> | 2016-12-09 23:40:32 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2016-12-09 23:40:32 +0800 |
| commit | e5b8198b078454cff3d7b1085af0fde8e92d4234 (patch) | |
| tree | 048349fcbb8ba93ce14df26aee1279f5a93add2d /dns | |
| parent | 02e9449775f1e0b9c0242fb29415fcd4d9918e02 (diff) | |
| download | freebsd-ports-gnome-e5b8198b078454cff3d7b1085af0fde8e92d4234.tar.gz freebsd-ports-gnome-e5b8198b078454cff3d7b1085af0fde8e92d4234.tar.zst freebsd-ports-gnome-e5b8198b078454cff3d7b1085af0fde8e92d4234.zip | |
Cleanup CONFLICTS.
Sponsored by: Absolight
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/bind9-devel/Makefile | 6 | ||||
| -rw-r--r-- | dns/bind910/Makefile | 6 | ||||
| -rw-r--r-- | dns/bind911/Makefile | 6 | ||||
| -rw-r--r-- | dns/bind99/Makefile | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index be4ab06b45e8..b2ea0ae52be5 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -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} diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile index 665ba34ac1e1..89644c425176 100644 --- a/dns/bind910/Makefile +++ b/dns/bind910/Makefile @@ -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} diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile index f0698f85bdc5..d58db90418e5 100644 --- a/dns/bind911/Makefile +++ b/dns/bind911/Makefile @@ -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} diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile index 41c6ccf0b294..da3f9f614031 100644 --- a/dns/bind99/Makefile +++ b/dns/bind99/Makefile @@ -37,7 +37,7 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --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 |