git: d51325fac343 - 2024Q4 - devel/git-filter-repo: Register conflict with -devel port

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Mon, 21 Oct 2024 22:03:46 UTC 
The branch 2024Q4 has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d51325fac343b29eb8373fb7f9f427d4e9f2964f

commit d51325fac343b29eb8373fb7f9f427d4e9f2964f
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-10-21 20:30:02 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
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