From nobody Thu Jul 25 17:59:26 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WVJYV31dHz5QyyS; Thu, 25 Jul 2024 17:59:26 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WVJYV2MBtz52DV; Thu, 25 Jul 2024 17:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721930366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8Z/+u5Lb6+DdTHQUcemxjMwMgQMvBaDb04XEIXKoTUI=; b=t9Y5t4lMqF+eaHVx22W/CBQeaW2I5b7GOhnill8XB4knSBAT0B1UwYDCdh/0FGUW2ZcU4U CffabBx6gr4QClyk5VwD9J5fXIV/3ZeO0UrMdbwnT/YP/ggBoSuTYW3NvkGOtF7bVSn8ZH rP6h0xKyYm3nkjE5l5FdddNrhkRGfIe0EMEJtgNSObVdietUeMtEkKj512bnWhsrEu6/gH tMEa80usGFYBorZpojWy0B3MNz1bPnyS9bzIymsNDxRPS3QTlaEMjum3+nG2A0uSpcsOps PZZRBBqXCIkTiTr0d926ncPq5YjK/1l2W8hTIbktxNLpbSvQp/RK6Q8JwQS9kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721930366; a=rsa-sha256; cv=none; b=wyLaWUKe/gImI8atL0wS2pIwH7Opi3usa23yVZqN1CdJTSZp9PWtmomE5qElvTXMgwXPcS U6HPySdEv2qrFuzpS4Ztr3lGeYBcGxF/QR6OwjLGK8tHgmDm+xschk3ZnwwJ62uhDUzcqK BYp8W5/JBj2eWpwUxS2EEY+5rS3zbaYb/KuOFjv4CwHMzI0E8cR5LOQ1pbE53fQ1xrMwb3 SMP+eaapmDDSOCacs1+StzbTw9zoPckDtch/c2KGr82r3/ogE3JEzGPZQ/XL3y8fa+al2A OfBWd/7H41hU1DiSZ8F9STIpfF7O4ly3EFkx4y6Cx4ZGfg6M/gP+yfGyr21H3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721930366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8Z/+u5Lb6+DdTHQUcemxjMwMgQMvBaDb04XEIXKoTUI=; b=vNaxXOCD6UhQJv2XjEHrr7iKJjpG9xIo0rtpdSN9Ds+XvB1B9HUetbLYKfacod102TgIeJ 1f0DpXfDtBY+H0I472o5sVjp9Q0kWEU4PaKm/NBtCTGSvaFk/1SCQ40bwuwfW35yBJ391X PUsEFTvYrgOA5Qxk7FSThAvyToZ56QZW+Y8gr5slSt36rzRs4AojPsqMxeTsFcRJAKiT+u FHwEsf0kYuZlpUuJzeOrtEqHin8FyGonPh4MvXp5nOpfLUGVWIuQ+OTMn4tAn6J+Q+79pk ySvzsc1RCMtOW3uig1eRDQnrshQevAvsVe8a+TjjU9at0QqF59k9/nva73xyZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WVJYV1rFHz13tv; Thu, 25 Jul 2024 17:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46PHxQjd072573; Thu, 25 Jul 2024 17:59:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46PHxQ6F072570; Thu, 25 Jul 2024 17:59:26 GMT (envelope-from git) Date: Thu, 25 Jul 2024 17:59:26 GMT Message-Id: <202407251759.46PHxQ6F072570@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mathieu Arnold Subject: git: 06724402b72a - main - dns/bind918: update CONFLICTS List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06724402b72a607124ba99765e4426cc97387f4f Auto-Submitted: auto-generated The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=06724402b72a607124ba99765e4426cc97387f4f commit 06724402b72a607124ba99765e4426cc97387f4f Author: John W. O'Brien AuthorDate: 2024-07-25 17:55:21 +0000 Commit: Mathieu Arnold CommitDate: 2024-07-25 17:57:23 +0000 dns/bind918: update CONFLICTS --- dns/bind918/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile index 7f612da4eda2..ffa726947dfe 100644 --- a/dns/bind918/Makefile +++ b/dns/bind918/Makefile @@ -72,7 +72,7 @@ EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * -CONFLICTS= bind916 bind9-devel +CONFLICTS= bind920 bind9-devel .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes