From nobody Mon Nov 27 18:08:39 2023 X-Original-To: dev-commits-ports-all@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 4SfD9M31BKz52MvK; Mon, 27 Nov 2023 18:08:39 +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 4SfD9M2KcQz4PJn; Mon, 27 Nov 2023 18:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701108519; 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=3+Glkda1dBjs0d4KsOieSzjjrjdZsRCT+PVGi/CYsjE=; b=NVvMCg7LiHd3fum6BzXNkI4V4kmqkXEevU7dGNWQ1aTDwYU4RBtYqYbaOWah3t16MCOC6T HxkN5pCOmOAQui2TUogthLLHk1FF535yWQ4eCKHAJOx2QdJB7QSeaEaFR5vF9mZJYfWMvS PGCaGuF+FnTVK4Kqw8tx1Xui++uizlY18NPkNESkZBseRr6aQiJbBGkQaqJfERqi/gRAem mlJYD0neJjLK0WCxsDNmyWuU62smwsFch6dTWZ43Dhys4w2k/DnlitP79wSp9jBN8n0oOJ wZEKt1XAXCLhfb/Xy02BAY5yZcorYlAhY559hWHw7/o8vqGTKODkLsC2k91Yaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701108519; 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=3+Glkda1dBjs0d4KsOieSzjjrjdZsRCT+PVGi/CYsjE=; b=McH/ThYGWshFsyRCyF3hsQchK6hge9WM99zMlMu0AadyV9MhXrDoxYzsS+i1vUoXrlSliu +58DS0k5xy3HfWKHHKu8WeQCIQrdW6l8mnP3GuKOdSSwprnOJZtWsbLeA/OVnK4yy/Y8wW 28cyiJzz1dC7Nbr0ylYnjTX9lg0TJ63VhVPfq/Ok52NPHWmCpsi9uQ8zwEYJHM+40N3MvZ gvEEzb3Vzmo8M91OFEpzfg37o9+LtY9ZcFJIAodlN4DDdN3ZO8HljjvSuAc+EpKL1PWnya Qw15D18OBHGpD6vH/x2jKugZS6l7s+X4ZrSjKp7LIAIUDaFedOKtZkOVT2Zrag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701108519; a=rsa-sha256; cv=none; b=Tl/+K9kWiUtC8xIQJq4ZdK3B9C+WzhkId5oqiOdrEE+f1PK7c0kyX22OJwf92jZ2kfM7aI mbsfOsDmQO75p4EZZQ/ZMSKUq7k5hRS3tEFpQ0aK0dzPMrDq9LpEn1nniNDckhdS0gTCT2 8cTJHK2uO/nAxd1k6l9QEiHKeNnLOEViycVovu1k7Fiefr0l4pNHU3R18evdJd71f4tewN pWxD2sypbLEN/ETzccb40mvu3UnOKgwnmrRWewWx/2QAr/ayi61LJhwln/b3feAPUU3ebQ OmAh75Jd+1TpDA03LC1pRREv41XYInrIhLREX55kFURFrpsLStr5ns26ZEsRfw== 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 4SfD9M15YszpY9; Mon, 27 Nov 2023 18:08:39 +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 3ARI8d1u067235; Mon, 27 Nov 2023 18:08:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARI8dad067232; Mon, 27 Nov 2023 18:08:39 GMT (envelope-from git) Date: Mon, 27 Nov 2023 18:08:39 GMT Message-Id: <202311271808.3ARI8dad067232@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 9eb002396f77 - main - devel/capnproto1: Update CONFLICTS_INSTALL after capnproto080 removal List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9eb002396f77917038696bf5ad73e60a555a0f2e Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9eb002396f77917038696bf5ad73e60a555a0f2e commit 9eb002396f77917038696bf5ad73e60a555a0f2e Author: Po-Chuan Hsieh AuthorDate: 2023-11-27 18:02:57 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-11-27 18:07:48 +0000 devel/capnproto1: Update CONFLICTS_INSTALL after capnproto080 removal --- devel/capnproto1/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/capnproto1/Makefile b/devel/capnproto1/Makefile index 54c4a249321f..c8968d3bbfae 100644 --- a/devel/capnproto1/Makefile +++ b/devel/capnproto1/Makefile @@ -25,7 +25,7 @@ WRKSRC_SUBDIR= c++ USE_GITHUB= yes -CONFLICTS_INSTALL= capnproto capnproto080 +CONFLICTS_INSTALL= capnproto # databases/tiledb requires capnproto 1.0.1 PORTSCOUT= ignore:1