Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 16 Mar 2026 12:58:22 +0000
From:      Alan Somers <asomers@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 9233032063d7 - main - sysutils/rubygem-tmuxinator: fix conflict with shells/fish
Message-ID:  <69b7fe6e.36d2b.25e925e1@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by asomers:

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

commit 9233032063d7be6ab33a07a3345a70a885238c6c
Author:     Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2026-03-15 22:41:32 +0000
Commit:     Alan Somers <asomers@FreeBSD.org>
CommitDate: 2026-03-16 12:57:39 +0000

    sysutils/rubygem-tmuxinator: fix conflict with shells/fish
    
    They conflict because they both try to install the same completion file.
    Fix the conflict by removing the completion file for tmuxinator, and
    leaving it for fish.
    
    PR:             293846
    MFH:            2026Q1
    Approved by:    mfechner (ruby)
---
 sysutils/rubygem-tmuxinator/Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sysutils/rubygem-tmuxinator/Makefile b/sysutils/rubygem-tmuxinator/Makefile
index e11554589b02..93471d344c32 100644
--- a/sysutils/rubygem-tmuxinator/Makefile
+++ b/sysutils/rubygem-tmuxinator/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tmuxinator
 PORTVERSION=	3.3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	RG
 
@@ -19,7 +19,6 @@ NO_ARCH=	yes
 
 PLIST_FILES=	bin/tmuxinator \
 		etc/bash_completion.d/_tmuxinator.bash \
-		share/fish/completions/tmuxinator.fish \
 		share/zsh/site-functions/_tmuxinator
 
 OPTIONS_SINGLE=	TMUX
@@ -34,8 +33,6 @@ TMUX23_RUN_DEPENDS=	tmux:sysutils/tmux23
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/completion/tmuxinator.bash ${STAGEDIR}${PREFIX}/etc/bash_completion.d/_tmuxinator.bash
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
-	${INSTALL_DATA} ${WRKSRC}/completion/tmuxinator.fish ${STAGEDIR}${PREFIX}/share/fish/completions/tmuxinator.fish
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/completion/tmuxinator.zsh ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_tmuxinator
 


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69b7fe6e.36d2b.25e925e1>