diff options
| author | dougb <dougb@FreeBSD.org> | 2009-03-24 20:00:21 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2009-03-24 20:00:21 +0000 |
| commit | 35c13d08a815725b1885d3910fbfd687187cc72c (patch) | |
| tree | 3b23415460764a83f93c1a0a622b69225b9173ea | |
| parent | 7366d48714c4387589886efa72ba228bdece0bf6 (diff) | |
| download | FreeBSD-ports-35c13d08a815725b1885d3910fbfd687187cc72c.zip FreeBSD-ports-35c13d08a815725b1885d3910fbfd687187cc72c.tar.gz | |
Fix CONFLICTS (again). The previous example didn't work at all for ports
other than plain bind9 since the real PORTNAMEs for the other ports are
bind9[456]. This fix has the added advantage of covering REPLACE_BASE.
| -rw-r--r-- | dns/bind9/Makefile | 2 | ||||
| -rw-r--r-- | dns/bind94/Makefile | 2 | ||||
| -rw-r--r-- | dns/bind95/Makefile | 2 | ||||
| -rw-r--r-- | dns/bind96/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/dns/bind9/Makefile b/dns/bind9/Makefile index d672867..c09110d 100644 --- a/dns/bind9/Makefile +++ b/dns/bind9/Makefile @@ -33,7 +33,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --with-randomdev=/dev/random -CONFLICTS= bind9-9.[456].* bind9-sdb-* host-* +CONFLICTS= bind9*-9.[456].* bind9-sdb-* host-* OPTIONS= SSL "Building without OpenSSL removes DNSSEC" on \ REPLACE_BASE "Replace base BIND with this version" off \ diff --git a/dns/bind94/Makefile b/dns/bind94/Makefile index 6b38c0f..c405115 100644 --- a/dns/bind94/Makefile +++ b/dns/bind94/Makefile @@ -33,7 +33,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --with-randomdev=/dev/random -CONFLICTS= bind9-9.[356].* bind9-sdb-* host-* +CONFLICTS= bind9*-9.[356].* bind9-sdb-* host-* OPTIONS= SSL "Building without OpenSSL removes DNSSEC" on \ REPLACE_BASE "Replace base BIND with this version" off \ diff --git a/dns/bind95/Makefile b/dns/bind95/Makefile index a97476c..297fc8c 100644 --- a/dns/bind95/Makefile +++ b/dns/bind95/Makefile @@ -33,7 +33,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --with-randomdev=/dev/random -CONFLICTS= bind9-9.[346].* bind9-sdb-* host-* +CONFLICTS= bind9*-9.[346].* bind9-sdb-* host-* OPTIONS= SSL "Building without OpenSSL removes DNSSEC" on \ XML "Support for xml statistics output" on \ diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile index 9c5aa6e..c12ca2a 100644 --- a/dns/bind96/Makefile +++ b/dns/bind96/Makefile @@ -33,7 +33,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --with-randomdev=/dev/random -CONFLICTS= bind9-9.[345].* bind9-sdb-* host-* +CONFLICTS= bind9*-9.[345].* bind9-sdb-* host-* OPTIONS= SSL "Building without OpenSSL removes DNSSEC" on \ XML "Support for xml statistics output" on \ |
