Date: Wed, 24 Jan 2018 10:43:30 +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: r459831 - in head/dns: bind9-devel bind910 bind911 bind912 bind99 Message-ID: <201801241043.w0OAhUtT048348@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Jan 24 10:43:30 2018 New Revision: 459831 URL: https://svnweb.freebsd.org/changeset/ports/459831 Log: Catch up with the conflicts lines in the BIND9 ports. Sponsored by: Absolight Modified: head/dns/bind9-devel/Makefile (contents, props changed) head/dns/bind910/Makefile (contents, props changed) head/dns/bind911/Makefile (contents, props changed) head/dns/bind912/Makefile (contents, props changed) head/dns/bind99/Makefile (contents, props changed) Modified: head/dns/bind9-devel/Makefile ============================================================================== --- head/dns/bind9-devel/Makefile Wed Jan 24 10:43:26 2018 (r459830) +++ head/dns/bind9-devel/Makefile Wed Jan 24 10:43:30 2018 (r459831) @@ -54,11 +54,11 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-c --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS= bind99 bind910 bind9-devel +CONFLICTS= bind99 bind910 bind911 bind912 .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared -CONFLICTS+= bind911 +CONFLICTS+= bind9-devel .else USE_RC_SUBR= named SUB_FILES= pkg-message named.conf Modified: head/dns/bind910/Makefile ============================================================================== --- head/dns/bind910/Makefile Wed Jan 24 10:43:26 2018 (r459830) +++ head/dns/bind910/Makefile Wed Jan 24 10:43:30 2018 (r459831) @@ -41,7 +41,7 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-c --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS= bind-tools bind99 bind911 bind9-devel +CONFLICTS= bind-tools bind99 bind911 bind912 bind9-devel SUB_FILES= pkg-message named.conf USE_RC_SUBR= named Modified: head/dns/bind911/Makefile ============================================================================== --- head/dns/bind911/Makefile Wed Jan 24 10:43:26 2018 (r459830) +++ head/dns/bind911/Makefile Wed Jan 24 10:43:30 2018 (r459831) @@ -38,7 +38,7 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-c --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS= bind-tools bind99 bind910 bind9-devel +CONFLICTS= bind-tools bind99 bind910 bind912 bind9-devel SUB_FILES= pkg-message named.conf USE_RC_SUBR= named Modified: head/dns/bind912/Makefile ============================================================================== --- head/dns/bind912/Makefile Wed Jan 24 10:43:26 2018 (r459830) +++ head/dns/bind912/Makefile Wed Jan 24 10:43:30 2018 (r459831) @@ -52,11 +52,11 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-c --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS= bind99 bind910 bind9-devel +CONFLICTS= bind99 bind910 bind911 bind9-devel .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared -CONFLICTS+= bind911 +CONFLICTS+= bind912 .else USE_RC_SUBR= named SUB_FILES= pkg-message named.conf Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Wed Jan 24 10:43:26 2018 (r459830) +++ head/dns/bind99/Makefile Wed Jan 24 10:43:30 2018 (r459831) @@ -41,7 +41,7 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-c --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS= bind-tools bind9-devel bind910 bind911 +CONFLICTS= bind-tools bind9-devel bind910 bind911 bind912 SUB_FILES= pkg-message named.conf USE_RC_SUBR= named
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801241043.w0OAhUtT048348>