git: 60e1ce1b37cf - main - tldr/tealdeer: Register conflict

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Adam Weinberger <adamw_at_FreeBSD.org>
Date: Fri, 20 Jun 2025 16:00:25 UTC

The branch main has been updated by adamw:

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

commit 60e1ce1b37cfb4151fe6af95e0532c55aa5c9d6e
Author:     Adam Weinberger <adamw@FreeBSD.org>
AuthorDate: 2025-06-20 16:00:21 +0000
Commit:     Adam Weinberger <adamw@FreeBSD.org>
CommitDate: 2025-06-20 16:00:21 +0000

    tldr/tealdeer: Register conflict
---
 sysutils/tealdeer/Makefile | 2 ++
 sysutils/tldr/Makefile     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/sysutils/tealdeer/Makefile b/sysutils/tealdeer/Makefile
index 9d05f7169a81..b529316e54a5 100644
--- a/sysutils/tealdeer/Makefile
+++ b/sysutils/tealdeer/Makefile
@@ -17,6 +17,8 @@ USES=		cargo ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	dbrgn
 
+CONFLICTS_INSTALL=	tldr
+
 PLIST_FILES=	bin/tldr
 
 PORTDOCS=	CHANGELOG.md README.md
diff --git a/sysutils/tldr/Makefile b/sysutils/tldr/Makefile
index 54a7a2ad640f..cabfbddcfacd 100644
--- a/sysutils/tldr/Makefile
+++ b/sysutils/tldr/Makefile
@@ -15,6 +15,8 @@ USE_GITHUB=	yes
 GH_PROJECT=	tlrc
 GH_ACCOUNT=	tldr-pages
 
+CONFLICTS_INSTALL=	tealdeer
+
 PLIST_FILES=	bin/tldr \
 		share/man/man1/tldr.1.gz \
 		share/bash-completion/completions/tldr \