From owner-svn-ports-all@freebsd.org Wed Jan 24 10:43:32 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C0358ECC713; Wed, 24 Jan 2018 10:43:31 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 72F3A82AE0; Wed, 24 Jan 2018 10:43:31 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6DECD1C9E0; Wed, 24 Jan 2018 10:43:31 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0OAhVmC048353; Wed, 24 Jan 2018 10:43:31 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0OAhUtT048348; Wed, 24 Jan 2018 10:43:30 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201801241043.w0OAhUtT048348@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 24 Jan 2018 10:43:30 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/dns: bind9-devel bind910 bind911 bind912 bind99 X-SVN-Commit-Revision: 459831 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jan 2018 10:43:32 -0000 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