shells/fish: update to 3.7.1 and fix Makefile

- Update to fish 3.7.1.
- Remove zfs feature check patch; included upstream.
- Remove post install step to strip binaries; binaries are stripped
  durting install.
- Add post install steps to remove documentation and/or manual pages if
  DOCS and/or MANPAGES are not enabled. Be default fish always installs
  documentation and manual pages.

PR:		278468
Approved by:	asomers (maintainer)

3 files changed, 68 insertions, 17 deletions

diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index 48b796aced88..46eca7926d61 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -1,12 +1,8 @@
 PORTNAME=	fish
-DISTVERSION=	3.6.1
-PORTREVISION=	1
+DISTVERSION=	3.7.1
 CATEGORIES=	shells
 MASTER_SITES=	https://github.com/fish-shell/fish-shell/releases/download/${PORTVERSION}/
 
-PATCH_SITES=	https://github.com/fish-shell/fish-shell/commit/
-PATCHFILES+=	85504ca694ae099f023ae0febb363238d9c64e8d.patch:-p1
-
 MAINTAINER=	asomers@FreeBSD.org
 COMMENT=	User friendly command line shell
 WWW=		https://fishshell.com/
@@ -25,7 +21,7 @@ SHEBANG_FILES=	share/tools/*.py share/tools/web_config/webconfig.py
 
 CONFLICTS_INSTALL=	comms/mlan3
 
-MANDIRS=	${DATADIR}/man/man1
+MANDIRS=	${DATADIR}/man
 
 PORTDOCS=	*
 
@@ -47,12 +43,22 @@ CMAKE_ARGS+=	-DCURSES_NEED_NCURSES=TRUE
 .endif
 
 post-install:
-.for i in fish fish_indent fish_key_reader
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
-.endfor
 	@${MV} ${STAGEDIR}${ETCDIR}/config.fish ${STAGEDIR}${ETCDIR}/config.fish.sample
 
-post-stage-DOCS-on:
+post-install-DOCS-on:
 	@${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo
 
+post-install-DOCS-off:
+	# required because fish always installs documentation
+	@${ECHO_MSG} "====> DOCS disable; removing documentation"
+	@${RM} -r ${STAGEDIR}${DOCSDIR}
+
+post-install-MANPAGES-off:
+	# required because fish always installs manual pages
+	@${ECHO_MSG} "====> MANPAGES disable; removing manual pages"
+	for dir in ${MANDIRS:S/^/${STAGEDIR}/} ; do \
+		${FIND} $$dir -type f -delete ; \
+	done
+	@${RM} -r ${STAGEDIR}${DATADIR}/man
+
 .include <bsd.port.post.mk>
diff --git a/shells/fish/distinfo b/shells/fish/distinfo
index daa75ddae7d2..14eb4f7fb018 100644
--- a/shells/fish/distinfo
+++ b/shells/fish/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1693954987
-SHA256 (fish-3.6.1.tar.xz) = 55402bb47ca6739d8aba25e41780905b5ce1bce0a5e0dd17dca908b5bc0b49b2
-SIZE (fish-3.6.1.tar.xz) = 2866100
-SHA256 (85504ca694ae099f023ae0febb363238d9c64e8d.patch) = c8e3395463dab5d7b5a68fe8a16ef47b9aaef5a983ba909e9c132159290a5f08
-SIZE (85504ca694ae099f023ae0febb363238d9c64e8d.patch) = 1505
+TIMESTAMP = 1712678789
+SHA256 (fish-3.7.1.tar.xz) = 614c9f5643cd0799df391395fa6bbc3649427bb839722ce3b114d3bbc1a3b250
+SIZE (fish-3.7.1.tar.xz) = 2965756
diff --git a/shells/fish/pkg-plist b/shells/fish/pkg-plist
index 0a487b6cae8d..5e357787dc88 100644
--- a/shells/fish/pkg-plist
+++ b/shells/fish/pkg-plist
@@ -27,6 +27,9 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/adb.fish
 %%DATADIR%%/completions/adduser.fish
 %%DATADIR%%/completions/adiff.fish
+%%DATADIR%%/completions/age-keygen.fish
+%%DATADIR%%/completions/age.fish
+%%DATADIR%%/completions/airmon-ng.fish
 %%DATADIR%%/completions/alias.fish
 %%DATADIR%%/completions/als.fish
 %%DATADIR%%/completions/alsactl.fish
@@ -70,6 +73,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/apt-zip-list.fish
 %%DATADIR%%/completions/apt.fish
 %%DATADIR%%/completions/aptitude.fish
+%%DATADIR%%/completions/ar.fish
 %%DATADIR%%/completions/arc.fish
 %%DATADIR%%/completions/archlinux-java.fish
 %%DATADIR%%/completions/arepack.fish
@@ -107,6 +111,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/bind.fish
 %%DATADIR%%/completions/bison.fish
 %%DATADIR%%/completions/black.fish
+%%DATADIR%%/completions/blender.fish
 %%DATADIR%%/completions/block.fish
 %%DATADIR%%/completions/bluetoothctl.fish
 %%DATADIR%%/completions/bootctl.fish
@@ -122,6 +127,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/bundle.fish
 %%DATADIR%%/completions/bunzip2.fish
 %%DATADIR%%/completions/busctl.fish
+%%DATADIR%%/completions/bws.fish
 %%DATADIR%%/completions/bzcat.fish
 %%DATADIR%%/completions/bzip2.fish
 %%DATADIR%%/completions/bzip2recover.fish
@@ -130,6 +136,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/cabal.fish
 %%DATADIR%%/completions/caddy.fish
 %%DATADIR%%/completions/caffeinate.fish
+%%DATADIR%%/completions/calendar.fish
 %%DATADIR%%/completions/camcontrol.fish
 %%DATADIR%%/completions/cancel.fish
 %%DATADIR%%/completions/canto.fish
@@ -140,6 +147,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/cdh.fish
 %%DATADIR%%/completions/cdrecord.fish
 %%DATADIR%%/completions/cf.fish
+%%DATADIR%%/completions/checkinstall.fish
 %%DATADIR%%/completions/chgrp.fish
 %%DATADIR%%/completions/chmod.fish
 %%DATADIR%%/completions/choice.fish
@@ -159,6 +167,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/cmark.fish
 %%DATADIR%%/completions/cmd.fish
 %%DATADIR%%/completions/cmdkey.fish
+%%DATADIR%%/completions/cobra-cli.fish
 %%DATADIR%%/completions/code.fish
 %%DATADIR%%/completions/color.fish
 %%DATADIR%%/completions/colordiff.fish
@@ -184,6 +193,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/cowthink.fish
 %%DATADIR%%/completions/cp.fish
 %%DATADIR%%/completions/cpupower.fish
+%%DATADIR%%/completions/crc.fish
 %%DATADIR%%/completions/create_ap.fish
 %%DATADIR%%/completions/createdb.fish
 %%DATADIR%%/completions/cryptsetup.fish
@@ -225,9 +235,11 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/dlocate.fish
 %%DATADIR%%/completions/dm-tool.fish
 %%DATADIR%%/completions/dmesg.fish
+%%DATADIR%%/completions/dmidecode.fish
 %%DATADIR%%/completions/dnf.fish
 %%DATADIR%%/completions/doas.fish
 %%DATADIR%%/completions/docker.fish
+%%DATADIR%%/completions/doctl.fish
 %%DATADIR%%/completions/dolphin.fish
 %%DATADIR%%/completions/dotnet.fish
 %%DATADIR%%/completions/downgrade.fish
@@ -324,6 +336,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/gem.fish
 %%DATADIR%%/completions/gendarme.fish
 %%DATADIR%%/completions/gh.fish
+%%DATADIR%%/completions/gimp.fish
 %%DATADIR%%/completions/gio.fish
 %%DATADIR%%/completions/git-sizer.fish
 %%DATADIR%%/completions/git.fish
@@ -333,6 +346,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/godoc.fish
 %%DATADIR%%/completions/gofmt.fish
 %%DATADIR%%/completions/goimports.fish
+%%DATADIR%%/completions/gojq.fish
 %%DATADIR%%/completions/golint.fish
 %%DATADIR%%/completions/gorename.fish
 %%DATADIR%%/completions/gpasswd.fish
@@ -343,6 +357,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/gping.fish
 %%DATADIR%%/completions/gprof.fish
 %%DATADIR%%/completions/gradle.fish
+%%DATADIR%%/completions/gradlew.fish
 %%DATADIR%%/completions/grep.fish
 %%DATADIR%%/completions/gresource.fish
 %%DATADIR%%/completions/groupadd.fish
@@ -356,6 +371,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/gv.fish
 %%DATADIR%%/completions/gvim.fish
 %%DATADIR%%/completions/gvimdiff.fish
+%%DATADIR%%/completions/gw.fish
 %%DATADIR%%/completions/gzip.fish
 %%DATADIR%%/completions/hashcat.fish
 %%DATADIR%%/completions/head.fish
@@ -363,17 +379,18 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/help.fish
 %%DATADIR%%/completions/heroku.fish
 %%DATADIR%%/completions/hg.fish
-%%DATADIR%%/completions/highlight.fish
 %%DATADIR%%/completions/hikari.fish
 %%DATADIR%%/completions/history.fish
 %%DATADIR%%/completions/hjson.fish
 %%DATADIR%%/completions/hledger.fish
 %%DATADIR%%/completions/homectl.fish
+%%DATADIR%%/completions/horcrux.fish
 %%DATADIR%%/completions/hostnamectl.fish
 %%DATADIR%%/completions/htop.fish
 %%DATADIR%%/completions/hugo.fish
 %%DATADIR%%/completions/hwinfo.fish
 %%DATADIR%%/completions/i3-msg.fish
+%%DATADIR%%/completions/ibmcloud.fish
 %%DATADIR%%/completions/icdiff.fish
 %%DATADIR%%/completions/iconv.fish
 %%DATADIR%%/completions/id.fish
@@ -396,7 +413,9 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/isatty.fish
 %%DATADIR%%/completions/istioctl.fish
 %%DATADIR%%/completions/iw.fish
+%%DATADIR%%/completions/iwctl.fish
 %%DATADIR%%/completions/j.fish
+%%DATADIR%%/completions/java_home.fish
 %%DATADIR%%/completions/jbake.fish
 %%DATADIR%%/completions/jest.fish
 %%DATADIR%%/completions/jhipster.fish
@@ -416,11 +435,11 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/killall.fish
 %%DATADIR%%/completions/kind.fish
 %%DATADIR%%/completions/kitchen.fish
-%%DATADIR%%/completions/kitty.fish
 %%DATADIR%%/completions/kldload.fish
 %%DATADIR%%/completions/kldunload.fish
 %%DATADIR%%/completions/kmutil.fish
 %%DATADIR%%/completions/konsole.fish
+%%DATADIR%%/completions/krita.fish
 %%DATADIR%%/completions/ksh.fish
 %%DATADIR%%/completions/kubectl.fish
 %%DATADIR%%/completions/latex.fish
@@ -473,6 +492,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/math.fish
 %%DATADIR%%/completions/matlab.fish
 %%DATADIR%%/completions/mc.fish
+%%DATADIR%%/completions/md-to-clip.fish
 %%DATADIR%%/completions/md5sum.fish
 %%DATADIR%%/completions/mdadm.fish
 %%DATADIR%%/completions/mdbook.fish
@@ -518,6 +538,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/mutt.fish
 %%DATADIR%%/completions/mv.fish
 %%DATADIR%%/completions/mvn.fish
+%%DATADIR%%/completions/mycli.fish
 %%DATADIR%%/completions/mysql.fish
 %%DATADIR%%/completions/mysqldump.fish
 %%DATADIR%%/completions/namei.fish
@@ -552,10 +573,12 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/nvram.fish
 %%DATADIR%%/completions/objdump.fish
 %%DATADIR%%/completions/obnam.fish
+%%DATADIR%%/completions/oc.fish
 %%DATADIR%%/completions/octave.fish
 %%DATADIR%%/completions/oggenc.fish
 %%DATADIR%%/completions/oksh.fish
 %%DATADIR%%/completions/okular.fish
+%%DATADIR%%/completions/ollama.fish
 %%DATADIR%%/completions/omega.fish
 %%DATADIR%%/completions/op.fish
 %%DATADIR%%/completions/opam.fish
@@ -639,6 +662,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/ps2pdfwr.fish
 %%DATADIR%%/completions/psql.fish
 %%DATADIR%%/completions/pstack.fish
+%%DATADIR%%/completions/pstree.fish
 %%DATADIR%%/completions/psub.fish
 %%DATADIR%%/completions/pushd.fish
 %%DATADIR%%/completions/pv.fish
@@ -651,6 +675,8 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/python3.fish
 %%DATADIR%%/completions/pzstd.fish
 %%DATADIR%%/completions/qdbus.fish
+%%DATADIR%%/completions/qjs.fish
+%%DATADIR%%/completions/qjsc.fish
 %%DATADIR%%/completions/qmk.fish
 %%DATADIR%%/completions/qshell.fish
 %%DATADIR%%/completions/qubes-gpg-client.fish
@@ -673,6 +699,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/reg.fish
 %%DATADIR%%/completions/reject.fish
 %%DATADIR%%/completions/rejmerge.fish
+%%DATADIR%%/completions/rename.fish
 %%DATADIR%%/completions/renice.fish
 %%DATADIR%%/completions/resolvectl.fish
 %%DATADIR%%/completions/return.fish
@@ -683,6 +710,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/rmmod.fish
 %%DATADIR%%/completions/root.fish
 %%DATADIR%%/completions/roswell.fish
+%%DATADIR%%/completions/rpm-ostree.fish
 %%DATADIR%%/completions/rpm.fish
 %%DATADIR%%/completions/rst2html.fish
 %%DATADIR%%/completions/rst2html4.fish
@@ -733,6 +761,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/sha512sum.fish
 %%DATADIR%%/completions/shortcuts.fish
 %%DATADIR%%/completions/signify.fish
+%%DATADIR%%/completions/smerge.fish
 %%DATADIR%%/completions/snap.fish
 %%DATADIR%%/completions/sops.fish
 %%DATADIR%%/completions/sort.fish
@@ -828,6 +857,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/usbip.fish
 %%DATADIR%%/completions/useradd.fish
 %%DATADIR%%/completions/userdbctl.fish
+%%DATADIR%%/completions/userdel.fish
 %%DATADIR%%/completions/usermod.fish
 %%DATADIR%%/completions/vagrant.fish
 %%DATADIR%%/completions/valgrind.fish
@@ -844,6 +874,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/wait.fish
 %%DATADIR%%/completions/wajig.fish
 %%DATADIR%%/completions/watch.fish
+%%DATADIR%%/completions/watchexec.fish
 %%DATADIR%%/completions/wc.fish
 %%DATADIR%%/completions/wesnoth.fish
 %%DATADIR%%/completions/wg-quick.fish
@@ -862,6 +893,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/wireshark.fish
 %%DATADIR%%/completions/wish.fish
 %%DATADIR%%/completions/wpa_cli.fish
+%%DATADIR%%/completions/wpctl.fish
 %%DATADIR%%/completions/wslpath.fish
 %%DATADIR%%/completions/wvdial.fish
 %%DATADIR%%/completions/xargs.fish
@@ -900,6 +932,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/xsv.fish
 %%DATADIR%%/completions/xterm.fish
 %%DATADIR%%/completions/xviewer.fish
+%%DATADIR%%/completions/xxd.fish
 %%DATADIR%%/completions/xxh128sum.fish
 %%DATADIR%%/completions/xxh32sum.fish
 %%DATADIR%%/completions/xxh64sum.fish
@@ -912,6 +945,14 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/yast2.fish
 %%DATADIR%%/completions/ykman.fish
 %%DATADIR%%/completions/yum.fish
+%%DATADIR%%/completions/zabbix_agent2.fish
+%%DATADIR%%/completions/zabbix_agentd.fish
+%%DATADIR%%/completions/zabbix_get.fish
+%%DATADIR%%/completions/zabbix_js.fish
+%%DATADIR%%/completions/zabbix_proxy.fish
+%%DATADIR%%/completions/zabbix_sender.fish
+%%DATADIR%%/completions/zabbix_server.fish
+%%DATADIR%%/completions/zabbix_web_service.fish
 %%DATADIR%%/completions/zcat.fish
 %%DATADIR%%/completions/zef.fish
 %%DATADIR%%/completions/zfs.fish
@@ -930,6 +971,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/config.fish
 %%DATADIR%%/functions/N_.fish
 %%DATADIR%%/functions/__fish_any_arg_in.fish
+%%DATADIR%%/functions/__fish_anypager.fish
 %%DATADIR%%/functions/__fish_anypython.fish
 %%DATADIR%%/functions/__fish_append.fish
 %%DATADIR%%/functions/__fish_apropos.fish
@@ -1098,6 +1140,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/functions/fish_default_key_bindings.fish
 %%DATADIR%%/functions/fish_default_mode_prompt.fish
 %%DATADIR%%/functions/fish_delta.fish
+%%DATADIR%%/functions/fish_fossil_prompt.fish
 %%DATADIR%%/functions/fish_git_prompt.fish
 %%DATADIR%%/functions/fish_greeting.fish
 %%DATADIR%%/functions/fish_hg_prompt.fish
@@ -1148,6 +1191,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/tools/deroff.py
 %%DATADIR%%/tools/web_config/delete.png
 %%DATADIR%%/tools/web_config/favicon.png
+%%DATADIR%%/tools/web_config/fishconfig_print.css
 %%DATADIR%%/tools/web_config/fishconfig.css
 %%DATADIR%%/tools/web_config/index.html
 %%DATADIR%%/tools/web_config/js/angular-route.js
@@ -1235,12 +1279,14 @@ libdata/pkgconfig/fish.pc
 %%MANPAGES%%%%DATADIR%%/man/man1/exit.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/false.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fg.1.gz
+%%MANPAGES%%%%DATADIR%%/man/man1/fish_vi_key_bindings.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish-completions.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish-doc.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish-faq.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish-for-bash-users.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish-interactive.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish-language.1.gz
+%%MANPAGES%%%%DATADIR%%/man/man1/fish-prompt-tutorial.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish-releasenotes.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish-tutorial.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish.1.gz
@@ -1250,6 +1296,7 @@ libdata/pkgconfig/fish.pc
 %%MANPAGES%%%%DATADIR%%/man/man1/fish_clipboard_paste.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish_command_not_found.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish_config.1.gz
+%%MANPAGES%%%%DATADIR%%/man/man1/fish_default_key_bindings.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish_delta.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish_git_prompt.1.gz
 %%MANPAGES%%%%DATADIR%%/man/man1/fish_greeting.1.gz