From owner-svn-ports-all@freebsd.org Thu Feb 20 09:09:02 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EEFF4259CB2; Thu, 20 Feb 2020 09:09:01 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48NTKn4XH6z4JpV; Thu, 20 Feb 2020 09:09:01 +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 656201F440; Thu, 20 Feb 2020 09:09:01 +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 01K991o9062386; Thu, 20 Feb 2020 09:09:01 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01K9908L062384; Thu, 20 Feb 2020 09:09:00 GMT (envelope-from mat@FreeBSD.org) Message-Id: <202002200909.01K9908L062384@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 20 Feb 2020 09:09:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526552 - in head/dns: bind9-devel bind911 bind914 X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/dns: bind9-devel bind911 bind914 X-SVN-Commit-Revision: 526552 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.29 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: Thu, 20 Feb 2020 09:09:02 -0000 Author: mat Date: Thu Feb 20 09:09:00 2020 New Revision: 526552 URL: https://svnweb.freebsd.org/changeset/ports/526552 Log: Add forgotten CONFLICTS lines. Modified: head/dns/bind9-devel/Makefile (contents, props changed) head/dns/bind911/Makefile (contents, props changed) head/dns/bind914/Makefile (contents, props changed) Modified: head/dns/bind9-devel/Makefile ============================================================================== --- head/dns/bind9-devel/Makefile Thu Feb 20 09:07:53 2020 (r526551) +++ head/dns/bind9-devel/Makefile Thu Feb 20 09:09:00 2020 (r526552) @@ -83,7 +83,7 @@ EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * # XXX: Add -devel -CONFLICTS= bind911 bind912 bind913 bind914 +CONFLICTS= bind911 bind912 bind913 bind914 bind916 .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes Modified: head/dns/bind911/Makefile ============================================================================== --- head/dns/bind911/Makefile Thu Feb 20 09:07:53 2020 (r526551) +++ head/dns/bind911/Makefile Thu Feb 20 09:09:00 2020 (r526552) @@ -42,7 +42,7 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-c --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS= bind912 bind913 bind914 bind9-devel +CONFLICTS= bind912 bind913 bind914 bind916 bind9-devel SUB_FILES= pkg-message named.conf USE_RC_SUBR= named Modified: head/dns/bind914/Makefile ============================================================================== --- head/dns/bind914/Makefile Thu Feb 20 09:07:53 2020 (r526551) +++ head/dns/bind914/Makefile Thu Feb 20 09:09:00 2020 (r526552) @@ -66,7 +66,7 @@ EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * -CONFLICTS= bind911 bind912 bind13 bind9-devel +CONFLICTS= bind911 bind912 bind13 bind916 bind9-devel .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes