From nobody Mon Mar 16 12:58:22 2026 X-Original-To: dev-commits-ports-main@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 4fZFWg13PWz6VMG4 for ; Mon, 16 Mar 2026 12:58:23 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fZFWg0NvFz3LQZ for ; Mon, 16 Mar 2026 12:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773665903; 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=ORgTGDqfu9DSAUAgEtCpC0G3CL5nmBW+oFZH+KNmUxM=; b=fq9EBmBvu0Zj1L6fXVcVbIdkKYovHjvFwoJ/xVM0cU0D6TQF0nbiWpyAu5yFovwcs5FHN6 yvlYpa8KJ6cirCUv6MfLPPCgf0H1t19yblHfKk4ODMrTmMt5aH5JLwRzdcQA3pyQn3VrEL ghrM0m/uXWQnj13LlD+93RkAVQywtxuOVJK+c1MwEXTELRSbqGPOXFTQocfV8U9+I2TXxe 57ujf+um2qhNb2a/ZIyliYzJm02ZISRv6EWYD/jmyfdg+AM1Tu5YKnuTg56r3EpFlZfQ0a 5554elKPhSQw+fSqEBYcuWAsyQfzQTpOeHK1YipZSYBX5Z79loSxFyTozJwOgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773665903; a=rsa-sha256; cv=none; b=wbndp3cl+jyz6qTsbGE3iIPVBDdFEgoJGNpvPNHCG7/c1fA6Ol4TbNuXfnznRyIm+yukmh ar8Uf7G/Kq0L1PZpjYRkMLrtN/ifp2dTj1CqOIUPvSb2UGjEyBdJmrF1e/pA0EWtUqSQH0 yfe/duRysYwowOT6ezXZoMDUGMQwG91qYHzX54OmqbWSwbNnkggtKT6sNhMxksBQOd+aB7 WZ4htiym3UBR5yGIptA/Semvq/gjlaGsbWmAU2azbDhXb5TXxE3ggp6Bu1rJkZRwSQIo4+ OwA+LqSArJaVC8mmbHgUi8dN+eKgXXcRwSmI7RIKbS5Fe4aVOXoDT6bRp23bPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773665903; 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=ORgTGDqfu9DSAUAgEtCpC0G3CL5nmBW+oFZH+KNmUxM=; b=s1CBwDfGA/KrBeEqgx6EoLMX8IzsxbwY2NcuBWdMd6OSa1EQJUKljIU9Zfq/DQn3jOgPuj WaY0iPGDDBQPB1EtiE/rhHIudxSlaAA2KndnnCHe3cSKeKMYyD+1SNSML6DbcUAia9RLZg ejdFici07MG3PKpE2hpsMXyRF2MqHLebyb2Yr+RcUwsSCsdbXgWWNuMExzdQIdt8wMmX6H Y7HAWyGVxHdaNFIh4f/UssPuk4tfneP9VILjS/hQzoCftHOCJnKw6fNArxU5M2RHZyJrMS 7qQUR/gSSNfs6u3xUT5yl65yj6wNPwvD7QONVQGPLueeTFfj+BbYD52BzCmj0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fZFWf6jp8zc1Q for ; Mon, 16 Mar 2026 12:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36d2b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Mar 2026 12:58:22 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alan Somers Subject: git: 9233032063d7 - main - sysutils/rubygem-tmuxinator: fix conflict with shells/fish List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9233032063d7be6ab33a07a3345a70a885238c6c Auto-Submitted: auto-generated Date: Mon, 16 Mar 2026 12:58:22 +0000 Message-Id: <69b7fe6e.36d2b.25e925e1@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/ports/commit/?id=9233032063d7be6ab33a07a3345a70a885238c6c commit 9233032063d7be6ab33a07a3345a70a885238c6c Author: Alan Somers AuthorDate: 2026-03-15 22:41:32 +0000 Commit: Alan Somers 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