Cc: Maintainers
Glancing over semarie@'s diff for devel/jujutsu made me realize that some of
our ports are installing fish completions in the wrong locations, namely into
${LOCALBASE}/share/fish/completions instead of
${LOCALBASE}/share/fish/vendor_completions.d
The ports I identified are
security/sn0int
sysutils/borgbackup
sysutils/lsd
sysutils/nnn
textproc/delta
x11/alacritty
For those ports that I know reasonably well, I have attached trivial diffs.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/alacritty/Makefile,v
diff -u -p -r1.22 Makefile
--- Makefile 15 Jan 2025 17:17:29 -0000 1.22
+++ Makefile 22 Jan 2025 17:18:00 -0000
@@ -6,6 +6,7 @@ MAINTAINER = Eric Auge <eau+obsd@unix4fu
GH_ACCOUNT = alacritty
GH_PROJECT = alacritty
GH_TAGNAME = v0.15.0
+REVISION = 0
HOMEPAGE = https://alacritty.org/
@@ -51,9 +52,9 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions
${INSTALL_DATA} ${EXTRA_DIR}/completions/alacritty.bash \
${PREFIX}/share/bash-completion/completions/alacritty
- ${INSTALL_DATA_DIR} ${PREFIX}/share/fish/completions
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/fish/vendor_completions.d
${INSTALL_DATA} ${EXTRA_DIR}/completions/alacritty.fish \
- ${PREFIX}/share/fish/completions/
+ ${PREFIX}/share/fish/vendor_completions.d/
${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions
${INSTALL_DATA} ${EXTRA_DIR}/completions/_alacritty \
${PREFIX}/share/zsh/site-functions/_alacritty
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/alacritty/pkg/PLIST,v
diff -u -p -r1.6 PLIST
--- pkg/PLIST 19 Apr 2024 14:27:57 -0000 1.6
+++ pkg/PLIST 22 Jan 2025 17:18:00 -0000
@@ -7,8 +7,8 @@ share/applications/Alacritty.desktop
share/bash-completion/completions/alacritty
share/doc/pkg-readmes/${PKGSTEM}
share/fish/
-share/fish/completions/
-share/fish/completions/alacritty.fish
+share/fish/vendor_completions.d/
+share/fish/vendor_completions.d/alacritty.fish
share/pixmaps/
share/pixmaps/Alacritty.svg
share/terminfo/
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/delta/Makefile,v
diff -u -p -r1.22 Makefile
--- Makefile 16 Sep 2024 21:17:47 -0000 1.22
+++ Makefile 22 Jan 2025 17:18:18 -0000
@@ -3,6 +3,7 @@ COMMENT = viewer for git and diff outpu
GH_ACCOUNT = dandavison
GH_PROJECT = delta
GH_TAGNAME = 0.18.2
+REVISION = 0
CATEGORIES = textproc
@@ -25,9 +26,9 @@ CONFIGURE_STYLE = cargo
SEPARATE_BUILD = Yes
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/fish/completions/
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/fish/vendor_completions.d/
${INSTALL_DATA} ${WRKSRC}/etc/completion/completion.fish \
- ${PREFIX}/share/fish/completions/delta.fish
+ ${PREFIX}/share/fish/vendor_completions.d/delta.fish
${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions/
${INSTALL_DATA} ${WRKSRC}/etc/completion/completion.zsh \
${PREFIX}/share/zsh/site-functions/_delta
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/delta/pkg/PLIST,v
diff -u -p -r1.3 PLIST
--- pkg/PLIST 29 Apr 2024 17:10:32 -0000 1.3
+++ pkg/PLIST 22 Jan 2025 17:18:18 -0000
@@ -3,8 +3,8 @@ share/bash-completion/
share/bash-completion/completions/
share/bash-completion/completions/delta
share/fish/
-share/fish/completions/
-share/fish/completions/delta.fish
+share/fish/vendor_completions.d/
+share/fish/vendor_completions.d/delta.fish
share/zsh/
share/zsh/site-functions/
share/zsh/site-functions/_delta
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/goreleaser/Makefile,v
diff -u -p -r1.20 Makefile
--- Makefile 21 Dec 2024 14:17:10 -0000 1.20
+++ Makefile 22 Jan 2025 17:18:41 -0000
@@ -2,6 +2,7 @@ COMMENT = deliver Go binaries as fast an
MODGO_MODNAME = github.com/goreleaser/goreleaser/v2
MODGO_VERSION = v2.5.0
+REVISION = 0
DISTNAME = goreleaser-${MODGO_VERSION}
@@ -32,9 +33,9 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/completion.bash \
${PREFIX}/share/bash-completion/completions/goreleaser
- ${INSTALL_DATA_DIR} ${PREFIX}/share/fish/completions/
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/fish/vendor_completions.d/
${INSTALL_DATA} ${WRKSRC}/completion.fish \
- ${PREFIX}/share/fish/completions/goreleaser.fish
+ ${PREFIX}/share/fish/vendor_completions.d/goreleaser.fish
${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions/
${INSTALL_DATA} ${WRKSRC}/completion.zsh \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/goreleaser/pkg/PLIST,v
diff -u -p -r1.3 PLIST
--- pkg/PLIST 3 May 2023 10:28:22 -0000 1.3
+++ pkg/PLIST 22 Jan 2025 17:18:41 -0000
@@ -3,8 +3,8 @@ share/bash-completion/
share/bash-completion/completions/
share/bash-completion/completions/goreleaser
share/fish/
-share/fish/completions/
-share/fish/completions/goreleaser.fish
+share/fish/vendor_completions.d/
+share/fish/vendor_completions.d/goreleaser.fish
share/zsh/
share/zsh/site-functions/
share/zsh/site-functions/_goreleaser
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/lsd/Makefile,v
diff -u -p -r1.4 Makefile
--- Makefile 21 Jan 2025 19:23:58 -0000 1.4
+++ Makefile 22 Jan 2025 17:18:58 -0000
@@ -3,6 +3,7 @@ COMMENT = pretty ls alternative with sup
GH_ACCOUNT = lsd-rs
GH_PROJECT = lsd
GH_TAGNAME = v1.1.5
+REVISION = 0
CATEGORIES = sysutils
@@ -31,9 +32,9 @@ post-install:
lowdown -s -tman -m section=1 -mtitle=lsd -mvolume='' \
${WRKBUILD}/lsd.md > ${PREFIX}/man/man1/lsd.1
- ${INSTALL_DATA_DIR} ${PREFIX}/share/fish/completions/
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/fish/vendor_completions.d/
${INSTALL_DATA} ${WRKSRC}/completions/lsd.fish \
- ${PREFIX}/share/fish/completions/
+ ${PREFIX}/share/fish/vendor_completions.d/
${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions/
${INSTALL_DATA} ${WRKSRC}/completions/_lsd \
${PREFIX}/share/zsh/site-functions/
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/lsd/pkg/PLIST,v
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 4 May 2023 19:42:01 -0000 1.1.1.1
+++ pkg/PLIST 22 Jan 2025 17:18:58 -0000
@@ -4,8 +4,8 @@ share/bash-completion/
share/bash-completion/completions/
share/bash-completion/completions/lsd
share/fish/
-share/fish/completions/
-share/fish/completions/lsd.fish
+share/fish/vendor_completions.d/
+share/fish/vendor_completions.d/lsd.fish
share/zsh/
share/zsh/site-functions/
share/zsh/site-functions/_lsd
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/lsd/Makefile,v
diff -u -p -r1.4 Makefile
--- Makefile 21 Jan 2025 19:23:58 -0000 1.4
+++ Makefile 22 Jan 2025 17:19:06 -0000
@@ -3,6 +3,7 @@ COMMENT = pretty ls alternative with sup
GH_ACCOUNT = lsd-rs
GH_PROJECT = lsd
GH_TAGNAME = v1.1.5
+REVISION = 0
CATEGORIES = sysutils
@@ -31,9 +32,9 @@ post-install:
lowdown -s -tman -m section=1 -mtitle=lsd -mvolume='' \
${WRKBUILD}/lsd.md > ${PREFIX}/man/man1/lsd.1
- ${INSTALL_DATA_DIR} ${PREFIX}/share/fish/completions/
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/fish/vendor_completions.d/
${INSTALL_DATA} ${WRKSRC}/completions/lsd.fish \
- ${PREFIX}/share/fish/completions/
+ ${PREFIX}/share/fish/vendor_completions.d/
${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions/
${INSTALL_DATA} ${WRKSRC}/completions/_lsd \
${PREFIX}/share/zsh/site-functions/
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/lsd/pkg/PLIST,v
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 4 May 2023 19:42:01 -0000 1.1.1.1
+++ pkg/PLIST 22 Jan 2025 17:19:06 -0000
@@ -4,8 +4,8 @@ share/bash-completion/
share/bash-completion/completions/
share/bash-completion/completions/lsd
share/fish/
-share/fish/completions/
-share/fish/completions/lsd.fish
+share/fish/vendor_completions.d/
+share/fish/vendor_completions.d/lsd.fish
share/zsh/
share/zsh/site-functions/
share/zsh/site-functions/_lsd
