diff options
| author | mat <mat@FreeBSD.org> | 2019-04-26 00:12:20 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2019-04-26 00:12:20 +0800 |
| commit | 18c65fb16125938f9d871f7e4392ac36ef201956 (patch) | |
| tree | b3b6e04c33df01aaa1926937b5cb69a99c5d6628 | |
| parent | b56c127f8355f9c7ebe0ca577e0973b6e1213caa (diff) | |
| download | freebsd-ports-gnome-18c65fb16125938f9d871f7e4392ac36ef201956.tar.gz freebsd-ports-gnome-18c65fb16125938f9d871f7e4392ac36ef201956.tar.zst freebsd-ports-gnome-18c65fb16125938f9d871f7e4392ac36ef201956.zip | |
Prevent bind-tools from inheriting CONFLICTS.
I don't see how this can be a problem as bind-tools is never built after
bind9*.
Reported by: Matthew D. Fuller
| -rw-r--r-- | dns/bind9-devel/Makefile | 6 | ||||
| -rw-r--r-- | dns/bind913/Makefile | 3 | ||||
| -rw-r--r-- | dns/bind914/Makefile | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index 017d76c720c4..1dc4acf82056 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -64,9 +64,6 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb -# XXX: Add -devel -CONFLICTS= bind911 bind912 bind913 bind914 - .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared EXTRA_PATCHES= ${PATCHDIR}/extrapatch-bind-tools @@ -76,6 +73,9 @@ SUB_FILES= pkg-message named.conf EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * + +# XXX: Add -devel +CONFLICTS= bind911 bind912 bind913 bind914 .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes diff --git a/dns/bind913/Makefile b/dns/bind913/Makefile index 7750f3ade6b7..9a1e3bed5991 100644 --- a/dns/bind913/Makefile +++ b/dns/bind913/Makefile @@ -53,8 +53,6 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS= bind911 bind912 bind914 bind9-devel - .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared EXTRA_PATCHES= ${PATCHDIR}/extrapatch-bind-tools @@ -64,6 +62,7 @@ SUB_FILES= pkg-message named.conf EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * +CONFLICTS= bind911 bind912 bind914 bind9-devel .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes diff --git a/dns/bind914/Makefile b/dns/bind914/Makefile index 349e3f901618..5bc6436cdaa1 100644 --- a/dns/bind914/Makefile +++ b/dns/bind914/Makefile @@ -53,8 +53,6 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS= bind911 bind912 bind13 bind9-devel - .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared EXTRA_PATCHES= ${PATCHDIR}/extrapatch-bind-tools @@ -64,6 +62,8 @@ SUB_FILES= pkg-message named.conf EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * + +CONFLICTS= bind911 bind912 bind13 bind9-devel .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes |