From nobody Fri May 17 19:07:14 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 4VgxKb0HVtz5LddK; Fri, 17 May 2024 19:07:15 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgxKZ6fDVz4s0Z; Fri, 17 May 2024 19:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715972834; 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=vXGL+/HykbdFkV/GNKmenEhsH/o6JMLt5HizMYP8ZD0=; b=faM1+WYx/cl4AILPe37UREIY9V/Kf/o+7NqB7vLcmFE7aXmV07fPIx14YJi3xEQxWw2zBe lmTzuh6IYe/PJYPme1pkFT+zZovo8jz3H75iDgNjiLMCTogfmk+7dLicskc466hQFbDsI/ OHYuczeESMAH0jTZlzPWE/+P+ykJ2CPsUAhSzUnLOMsfLgJP41TVG+Gwdx/u4T/mg/Gp/8 AjIBnW1txCAtjxCeyX71vMYzMMkFE1zp8o+TXff8Lrubb1nPZgiDL2UzZbrcF64xiDyJ4D YgnqvYfVncev19zOt8veoYwnx1/ekEdk2o2709sPUPleIHVhZJEtu0aK0t3b7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715972834; a=rsa-sha256; cv=none; b=KGAKL7wiQ3tBGeekoGEJhAxFKnVuOzsZbmlIEEnUKyDsaiP4U4tin02eBDfl+BaULHzVfY zyR4OqisxybRrdujhq+Lvwq+2uMhA+FXPU7Ku534jq0y3FjJ4vByCez2QSrtfm9nMyEM3a 5jij4CUoI3/+ni3WKDuUhCnPBm/uhfYIMVuUXP5MSv0afLZ3pxwowe8KkZsbT/9f7+Fi86 u8k4pbywiG8fSKfso0IPe2pRrxC8cgFrWD9v6yd7YXfqhmI9BhRWBOBmqKRluxnP0XJy77 8yH6Lm0A6+EKdTTnyRJtTrTn8vS4LrzerqMaN6wusXo8USxG7WiMZ0NdEAOBiA== 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=1715972834; 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=vXGL+/HykbdFkV/GNKmenEhsH/o6JMLt5HizMYP8ZD0=; b=h2irb4Kfdn+9RZSLegtcvUFp5BuQHyo6mDNlbLoTZRCbpEzVSHQnGCAVGXRK3hvHrf6kml B7Qz7IbdCFe25OAuiaaMyAVWQpHjU5LNzorEusEegQ+WRoL1BA7ym2H9P143+1PS3tmmBP 8JpuKWLNT6ZRxw+1weUPdPXc4aVaxY31p1Pmq/XatFHycnR42iHuhIwF7eiCgyY3NzZ+ly bvwtyrydVHdEFgqRm3MjgOtYwuHHJ6BcE73YwTNCz4w1NsMNLWio+qhldCR2nhbk4MxW7k Okr2jGuSDO/a1AQji457bvPHrDeylvSGLL7HGLNgVV8Qj41/9euJnnKftM+zCw== 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 4VgxKZ6FBmzv8S; Fri, 17 May 2024 19:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJ7Es4054849; Fri, 17 May 2024 19:07:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJ7Emu054846; Fri, 17 May 2024 19:07:14 GMT (envelope-from git) Date: Fri, 17 May 2024 19:07:14 GMT Message-Id: <202405171907.44HJ7Emu054846@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 97eda84f87b1 - main - dns/bind918: Update CONFLICTS entry 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97eda84f87b1835c1bb9e2104d699e721df12cd8 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=97eda84f87b1835c1bb9e2104d699e721df12cd8 commit 97eda84f87b1835c1bb9e2104d699e721df12cd8 Author: Daniel Engberg AuthorDate: 2024-05-17 18:17:18 +0000 Commit: Daniel Engberg CommitDate: 2024-05-17 19:06:03 +0000 dns/bind918: Update CONFLICTS entry Remove reference to bind911 which was removed over 2 years ago Approved by: portmgr (blanket) --- dns/bind918/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile index 7a0c42165108..fa6ca912843c 100644 --- a/dns/bind918/Makefile +++ b/dns/bind918/Makefile @@ -72,7 +72,7 @@ EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * -CONFLICTS= bind911 bind916 bind9-devel +CONFLICTS= bind916 bind9-devel .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes