diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2019-04-25 16:12:20 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2019-04-25 16:12:20 +0000 |
| commit | c4002d93632da360bacdbf39d20793eed442f844 (patch) | |
| tree | b3b6e04c33df01aaa1926937b5cb69a99c5d6628 /dns/bind9-devel | |
| parent | 12f8ff2af98dc456989310ea6113c332a2424292 (diff) | |
| download | ports-c4002d93632da360bacdbf39d20793eed442f844.tar.gz ports-c4002d93632da360bacdbf39d20793eed442f844.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
Notes
Notes:
svn path=/head/; revision=500027
Diffstat (limited to 'dns/bind9-devel')
| -rw-r--r-- | dns/bind9-devel/Makefile | 6 |
1 files changed, 3 insertions, 3 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 |