From nobody Mon Oct 21 22:03:46 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 4XXTpq2G0Zz51gsm; Mon, 21 Oct 2024 22:03:47 +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 4XXTpq0Mc5z4m0v; Mon, 21 Oct 2024 22:03:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729548227; 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=8pmdNPEpGmmJznC4piPa2tRrYk4zQswkitrQds37T6w=; b=a1p04mqtyYAsAs/bFk10OofPCLoO1MKQH7iFSON5JucZsZ/3PyDWTrDpm7SpDvREMZn9WH 4zrjnYhIzNuQijlFrt5pQEfqKS4DOh4mIBJ3E9ARbxfuoB2zAdnHwvlQnB9CjllFtfGJTs HzIqSAoQILlBLcDhRCu2yK7PtiRczN9Nlw/eiKJe0PL8yR/PV5NQqiL9EV/7r8rlTQtIe9 +CYqDD+/cceQycM4pmrbI2vTAGwE22jaFSyuEw/uYTuehHVTkURyjPKamczNenKDKzc58N 6PFnPnJ0lPDUu7NtdakSXzIkU35FcKhvtMZrzd2nI3t4DljZWgBEGbCt6BDYUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729548227; 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=8pmdNPEpGmmJznC4piPa2tRrYk4zQswkitrQds37T6w=; b=PSH59FiYA44BId3ySOiMxlPeuapHq/aeHKxe7ZeWoV3TctXOmHpvB1aEdhnpg/KBx7SsFd jsVw+Ovc2JRokTCvbkFij/hD6eTcrTuOkmqDtTjZxz/jt5p/D5TcKILQUYEt/XcKeS4y0L 8k9DA/wmptxGCMmPYXC0j16C88w0SJc7tKaxXcXuqJ9NskWl6KE7XPlF1msQRajU4q8dd+ 0coOjvKcv3ptW4P2nH+RW1BHAumkQm6DKiD6AkVDr7Bb/V0BmA+9a1wnB/Et5e8FXcgtrE lZpXakMRxKkGiCJv5vbtDaDzLI6PlSfrqJOIbXQ1z9NPY/Y2kej/B8QS8HDtIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729548227; a=rsa-sha256; cv=none; b=CFPrfl8sjrMXXh+14O1R2hE0otcg074aKTboExPDGE+dZFEYC94o2worYsEVh5a4ez2Gk2 AHTNfjPUuKbQfOS7X5XqXbDVk16wBOm0QhLWbjS/jdflHtdInw+0BbwTmL62/NqrH16gaz jusjxkuzBGE2fNVdXrme/mTk1IDhs8TAn5QTjDoxv+/0ZwNUs8jcR1FRJVifXHZblykRCE FrTYVUWlei0y1Zpts9OhVXayzLSpPhc7aGbs67Ss6BnldCj8etgDWFKJa7uRNNussgeDzy D6JliFrbiO8SGRVBpOSU61RnAyZ9QLqtMXGDjBkqIrpDSgfJ8U43Fka2eJBpJA== 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 4XXTpp75cYzndV; Mon, 21 Oct 2024 22:03:46 +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 49LM3kSb026794; Mon, 21 Oct 2024 22:03:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LM3kQK026791; Mon, 21 Oct 2024 22:03:46 GMT (envelope-from git) Date: Mon, 21 Oct 2024 22:03:46 GMT Message-Id: <202410212203.49LM3kQK026791@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: d51325fac343 - 2024Q4 - devel/git-filter-repo: Register conflict with -devel port 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: d51325fac343b29eb8373fb7f9f427d4e9f2964f Auto-Submitted: auto-generated The branch 2024Q4 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d51325fac343b29eb8373fb7f9f427d4e9f2964f commit d51325fac343b29eb8373fb7f9f427d4e9f2964f Author: Cy Schubert AuthorDate: 2024-10-21 20:30:02 +0000 Commit: Cy Schubert CommitDate: 2024-10-21 22:03:14 +0000 devel/git-filter-repo: Register conflict with -devel port devel/git-filter-repo has just been added. Register a conflict with it. (cherry picked from commit 6844d1d7a508c23e80115766f44cc7e5a8033f4b) --- devel/git-filter-repo/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devel/git-filter-repo/Makefile b/devel/git-filter-repo/Makefile index d6ff6efc027a..1ceb2eaee522 100644 --- a/devel/git-filter-repo/Makefile +++ b/devel/git-filter-repo/Makefile @@ -10,6 +10,8 @@ WWW= https://github.com/newren/git-filter-repo LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING.mit +CONFLICTS= git-filter-repo-devel-* + RUN_DEPENDS= git:devel/git USES= python shebangfix