From nobody Mon Jul 22 04:10:13 2024 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 4WS6J61WqKz5RFnd; Mon, 22 Jul 2024 04:10:14 +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 4WS6J55NBJz45gx; Mon, 22 Jul 2024 04:10:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721621413; 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=en7BlXWEEiyZgq/8Vd87rBvAEINt+wJd2jgdEN0GLDM=; b=osD59JNASZpPGPGPs+eulfUfG7SCvJKI6AUXwyMD+r0T74TM0sxNuL72URnvSEPNkwB0lT jVJS+qWHla2vm+wu0+VHq4j0VGaR8/5ub7nWktmCXCaXPKyxopohp5oWq14YktV10KheiL aafK5+dRTWTL68pSJKtfCciW2VQin0+LEwFJ7BSUYJuZwt7gxQ4GNyDX4ZSHZjYT4gSBAT ujjgEgPHc0pAdmpIWk2Sk0SJJP5Zo7HuRVcb37sqg0w22CXZThrai4PkMX4+o62YRmCOZ3 K9ZizsZsuBfiJIYtMygf1Ti3HP6oLpq/XHjfJXlFKUR8LZmWkaSFLJk+7Z/iJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721621413; a=rsa-sha256; cv=none; b=A5CH80+udqfnQomWxq5nk8mPx/HVWXWo8FkRkLDmDvqGBKWXWXf9YC9pWr88K2EEZejhDW LqHihOkeM+26doKUmettZSP1//xDT3NyRjlr/h01bjvSAgSAT9AMli8+5boNhiEKWlrUeR AkV6GcL26Db86zE17cmAlikZr6kyTr4UyIMZ5vKvoAQSIerga9qq8Zx2YlPSUC9HbWUdBQ dRl8+iWxyBxpY1IN820//bWdMiTcSFC62ypRDGzf+3SxhHEDb0ROr/NcFwjkA4pp+92fPo YtxfeYUEwKmyAoj6FKR/63yzQwF3lKppKxw4VuwDNw3co0eGYywcc554Pbe5vg== 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=1721621413; 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=en7BlXWEEiyZgq/8Vd87rBvAEINt+wJd2jgdEN0GLDM=; b=l/8xMJDQrizhjEd8P1GcuyYFUdoeuykcYNjUMe2mo+2CjmBsTBShuU95ASPh0Y+l2YMtqd PyXVh3bZbWs2Y6eDOB88/ZeSKzunqaEBe77bxz7bZh/AXCXet8qRKd54VISp1om7gwN1A7 Kb1QGP3Hojl8C0+oIm3E0p+aVU4ay/jpy/vCvWZfzErMCVR91qpxmvbq/0CAEj48w7VMsg gLo4IzHINQi3qLPAvDIiJh8mEAV0TYfzidaXdOmL8xl6INaOLt+L6mzsXh64xs0cH4nuMs Fw6157aFMqTCzNebBMdqgr+LFKSuJI7FON70g+P3v+a0iL4G0hS8l4vYI9UNKA== 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 4WS6J54zSszTrd; Mon, 22 Jul 2024 04:10:13 +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 46M4ADPQ039622; Mon, 22 Jul 2024 04:10:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46M4ADOk039614; Mon, 22 Jul 2024 04:10:13 GMT (envelope-from git) Date: Mon, 22 Jul 2024 04:10:13 GMT Message-Id: <202407220410.46M4ADOk039614@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Hixson Subject: git: 2868ead63c1e - main - sysutils/kubo-go: mark ipfs-go as a conflict 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhixson X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2868ead63c1ef929a6c4c9e54f9daa271589e7c4 Auto-Submitted: auto-generated The branch main has been updated by jhixson: URL: https://cgit.FreeBSD.org/ports/commit/?id=2868ead63c1ef929a6c4c9e54f9daa271589e7c4 commit 2868ead63c1ef929a6c4c9e54f9daa271589e7c4 Author: John Hixson AuthorDate: 2024-07-22 04:08:55 +0000 Commit: John Hixson CommitDate: 2024-07-22 04:08:55 +0000 sysutils/kubo-go: mark ipfs-go as a conflict --- sysutils/kubo-go/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sysutils/kubo-go/Makefile b/sysutils/kubo-go/Makefile index a4324bc7c5b9..8b66de6ecbf5 100644 --- a/sysutils/kubo-go/Makefile +++ b/sysutils/kubo-go/Makefile @@ -1,7 +1,7 @@ PORTNAME= kubo DISTVERSIONPREFIX= v DISTVERSION= 0.29.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils PKGNAMESUFFIX= -go @@ -16,6 +16,8 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE USES= cpe go:1.22,modules +CONFLICTS_INSTALL?= ipfs-go-* + CPE_VENDOR= protocol GO_MODULE= github.com/ipfs/kubo