git: da1c9d9a8582 - main - deskutils/todo: Fix autocompletion

The branch main has been updated by sunpoet:

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

commit da1c9d9a8582c7a38bb1e5a2d95fa404d13f8ca0
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2025-10-19 00:00:48 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2025-10-19 00:00:48 +0000

    deskutils/todo: Fix autocompletion
    
    - Do not rename todo.sh
    - Update CONFLICTS_INSTALL:
      - devel/devtodo: Remove deskutils/todo from CONFLICTS_INSTALL
      - deskutils/todo: Remove CONFLICTS_INSTALL
    - Bump PORTREVISION for package change
    
    PR:             288001
    Reported by:    Laurent Chardon <laurent.chardon@gmail.com>
---
 deskutils/todo/Makefile | 7 +++----
 devel/devtodo/Makefile  | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/deskutils/todo/Makefile b/deskutils/todo/Makefile
index 4e2647bdb0cd..dcb5ef438d9d 100644
--- a/deskutils/todo/Makefile
+++ b/deskutils/todo/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	todo
 PORTVERSION=	2.13.0
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	https://github.com/todotxt/todo.txt-cli/releases/download/v${PORTVERSION}/
 DISTNAME=	todo.txt_cli-${PORTVERSION}
@@ -18,19 +19,17 @@ USES=		shebangfix
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	bin/todo \
+PLIST_FILES=	bin/todo.sh \
 		etc/todo.cfg \
 		etc/bash_completion.d/todo
 
-CONFLICTS_INSTALL=	deforaos-todo devtodo # bin/todo
-
 SHEBANG_FILES=	todo.sh todo_completion
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/todo.sh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/todo.sh ${STAGEDIR}${PREFIX}/bin/todo
+	${INSTALL_SCRIPT} ${WRKSRC}/todo.sh ${STAGEDIR}${PREFIX}/bin/todo.sh
 	${INSTALL_DATA} ${WRKSRC}/todo.cfg ${STAGEDIR}${PREFIX}/etc/todo.cfg
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 	${INSTALL_DATA} ${WRKSRC}/todo_completion ${STAGEDIR}${PREFIX}/etc/bash_completion.d/todo
diff --git a/devel/devtodo/Makefile b/devel/devtodo/Makefile
index 36496a42cf4d..c41e5a485c93 100644
--- a/devel/devtodo/Makefile
+++ b/devel/devtodo/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool to effectively maintain todo lists aimed at developers
 WWW=		https://swapoff.org/devtodo.html
 
-CONFLICTS_INSTALL=	deforaos-todo tdl todo
+CONFLICTS_INSTALL=	deforaos-todo tdl
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share