Date: Thu, 25 Apr 2019 16:12:21 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r500027 - in head/dns: bind9-devel bind913 bind914 Message-ID: <201904251612.x3PGCLTP013049@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Apr 25 16:12:20 2019 New Revision: 500027 URL: https://svnweb.freebsd.org/changeset/ports/500027 Log: 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 Modified: head/dns/bind9-devel/Makefile (contents, props changed) head/dns/bind913/Makefile (contents, props changed) head/dns/bind914/Makefile (contents, props changed) Modified: head/dns/bind9-devel/Makefile ============================================================================== --- head/dns/bind9-devel/Makefile Thu Apr 25 16:10:13 2019 (r500026) +++ head/dns/bind9-devel/Makefile Thu Apr 25 16:12:20 2019 (r500027) @@ -64,9 +64,6 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-c --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 Modified: head/dns/bind913/Makefile ============================================================================== --- head/dns/bind913/Makefile Thu Apr 25 16:10:13 2019 (r500026) +++ head/dns/bind913/Makefile Thu Apr 25 16:12:20 2019 (r500027) @@ -53,8 +53,6 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-c --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 Modified: head/dns/bind914/Makefile ============================================================================== --- head/dns/bind914/Makefile Thu Apr 25 16:10:13 2019 (r500026) +++ head/dns/bind914/Makefile Thu Apr 25 16:12:20 2019 (r500027) @@ -53,8 +53,6 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-c --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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904251612.x3PGCLTP013049>