shells/fish: Update to 3.6.1

While here do some minor housekeeping;

* Remove superfluous `post-stage-MANPAGES-off` target, cleanup is already
  handled with PLIST substitutions.

* Collapse the `PORT_OPTIONS` conditional pre-checks back into `DOCS`.  We
  only need sphinx when building the documentation, not `MANPAGES`, as such
  disallow multiple jobs if `DOCS` is enabled.

Changes:	https://github.com/fish-shell/fish-shell/releases/3.6.1
PR:		271558
Approved by:	asomers (maintainer)

3 files changed, 22 insertions, 18 deletions

diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index f39fb1c076fd..2784c5a4e8d7 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	fish
-DISTVERSION=	3.6.0
+DISTVERSION=	3.6.1
 CATEGORIES=	shells
 MASTER_SITES=	https://github.com/fish-shell/fish-shell/releases/download/${PORTVERSION}/
 
@@ -19,9 +19,6 @@ USES=		cmake compiler:c++11-lang cpe localbase ncurses python:3.6+,env \
 CPE_VENDOR=	fishshell
 SHEBANG_FILES=	share/tools/*.py share/tools/web_config/webconfig.py
 
-# sphinx stuff seems to be racy
-MAKE_JOBS_UNSAFE=	yes
-
 CONFLICTS_INSTALL=	comms/mlan3
 
 MANDIRS=	${DATADIR}/man/man1
@@ -32,16 +29,15 @@ OPTIONS_DEFINE=		DOCS MANPAGES NLS
 OPTIONS_DEFAULT=	MANPAGES NLS
 OPTIONS_SUB=		yes
 
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_CMAKE_BOOL=	BUILD_DOCS
+DOCS_VARS=		MAKE_JOBS_UNSAFE=yes
+
 NLS_USES=	gettext
 NLS_CMAKE_BOOL=	WITH_GETTEXT
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
-CMAKE_ARGS+=	-DBUILD_DOCS=TRUE
-BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
-.endif
-
 .if ${NCURSESBASE:M${LOCALBASE}}
 CMAKE_ARGS+=	-DCURSES_NEED_NCURSES=TRUE
 .endif
@@ -55,8 +51,4 @@ post-install:
 post-stage-DOCS-on:
 	@${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo
 
-post-stage-MANPAGES-off:
-	@${RM} -rf ${STAGEDIR}${MANPREFIX}/man/man1
-	@${RM} -rf ${STAGEDIR}${DATADIR}/man
-
 .include <bsd.port.post.mk>
diff --git a/shells/fish/distinfo b/shells/fish/distinfo
index 69f82e5934cf..4297df8737bb 100644
--- a/shells/fish/distinfo
+++ b/shells/fish/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674153299
-SHA256 (fish-3.6.0.tar.xz) = 97044d57773ee7ca15634f693d917ed1c3dc0fa7fde1017f1626d60b83ea6181
-SIZE (fish-3.6.0.tar.xz) = 2892296
+TIMESTAMP = 1684723601
+SHA256 (fish-3.6.1.tar.xz) = 55402bb47ca6739d8aba25e41780905b5ce1bce0a5e0dd17dca908b5bc0b49b2
+SIZE (fish-3.6.1.tar.xz) = 2866100
diff --git a/shells/fish/pkg-plist b/shells/fish/pkg-plist
index 61024c1537cb..0a487b6cae8d 100644
--- a/shells/fish/pkg-plist
+++ b/shells/fish/pkg-plist
@@ -42,6 +42,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/ant.fish
 %%DATADIR%%/completions/apack.fish
 %%DATADIR%%/completions/apk.fish
+%%DATADIR%%/completions/apkanalyzer.fish
 %%DATADIR%%/completions/apm.fish
 %%DATADIR%%/completions/apropos.fish
 %%DATADIR%%/completions/apt-build.fish
@@ -275,6 +276,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/expect.fish
 %%DATADIR%%/completions/ezjail-admin.fish
 %%DATADIR%%/completions/fab.fish
+%%DATADIR%%/completions/fail2ban-client.fish
 %%DATADIR%%/completions/fastboot.fish
 %%DATADIR%%/completions/feh.fish
 %%DATADIR%%/completions/ffmpeg.fish
@@ -564,6 +566,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/optimus-manager.fish
 %%DATADIR%%/completions/optipng.fish
 %%DATADIR%%/completions/or.fish
+%%DATADIR%%/completions/otool.fish
 %%DATADIR%%/completions/ouch.fish
 %%DATADIR%%/completions/p4.fish
 %%DATADIR%%/completions/pabcnetcclear.fish
@@ -623,8 +626,10 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/poweroff.fish
 %%DATADIR%%/completions/powerpill.fish
 %%DATADIR%%/completions/powershell.fish
+%%DATADIR%%/completions/pre-commit.fish
 %%DATADIR%%/completions/prevd.fish
 %%DATADIR%%/completions/prime-run.fish
+%%DATADIR%%/completions/proxychains.fish
 %%DATADIR%%/completions/prt-get.fish
 %%DATADIR%%/completions/ps.fish
 %%DATADIR%%/completions/ps2pdf.fish
@@ -707,6 +712,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/scp.fish
 %%DATADIR%%/completions/screen.fish
 %%DATADIR%%/completions/scrot.fish
+%%DATADIR%%/completions/scrypt.fish
 %%DATADIR%%/completions/scss.fish
 %%DATADIR%%/completions/sed.fish
 %%DATADIR%%/completions/seq.fish
@@ -740,12 +746,14 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/sphinx-quickstart.fish
 %%DATADIR%%/completions/sqlsharp.fish
 %%DATADIR%%/completions/src.fish
+%%DATADIR%%/completions/ssh-copy-id.fish
 %%DATADIR%%/completions/ssh.fish
 %%DATADIR%%/completions/sshfs.fish
 %%DATADIR%%/completions/stack.fish
 %%DATADIR%%/completions/starship.fish
 %%DATADIR%%/completions/stat.fish
 %%DATADIR%%/completions/status.fish
+%%DATADIR%%/completions/stow.fish
 %%DATADIR%%/completions/strace.fish
 %%DATADIR%%/completions/stream.fish
 %%DATADIR%%/completions/string.fish
@@ -791,6 +799,11 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/completions/traceroute.fish
 %%DATADIR%%/completions/transmission-remote.fish
 %%DATADIR%%/completions/trap.fish
+%%DATADIR%%/completions/trash-empty.fish
+%%DATADIR%%/completions/trash-list.fish
+%%DATADIR%%/completions/trash-put.fish
+%%DATADIR%%/completions/trash-restore.fish
+%%DATADIR%%/completions/trash.fish
 %%DATADIR%%/completions/travis.fish
 %%DATADIR%%/completions/tree.fish
 %%DATADIR%%/completions/tsc.fish
@@ -1060,6 +1073,7 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/functions/__fish_vcs_prompt.fish
 %%DATADIR%%/functions/__fish_whatis.fish
 %%DATADIR%%/functions/__fish_whatis_current_token.fish
+%%DATADIR%%/functions/__ssh_history_completions.fish
 %%DATADIR%%/functions/__terlar_git_prompt.fish
 %%DATADIR%%/functions/_validate_int.fish
 %%DATADIR%%/functions/abbr.fish
@@ -1130,7 +1144,6 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/functions/up-or-search.fish
 %%DATADIR%%/functions/vared.fish
 %%DATADIR%%/groff/fish.tmac
-%%DATADIR%%/lynx.lss
 %%DATADIR%%/tools/create_manpage_completions.py
 %%DATADIR%%/tools/deroff.py
 %%DATADIR%%/tools/web_config/delete.png
@@ -1144,7 +1157,6 @@ libdata/pkgconfig/fish.pc
 %%DATADIR%%/tools/web_config/js/colorutils.js
 %%DATADIR%%/tools/web_config/js/controllers.js
 %%DATADIR%%/tools/web_config/js/filters.js
-%%DATADIR%%/tools/web_config/partials/abbreviations.html
 %%DATADIR%%/tools/web_config/partials/bindings.html
 %%DATADIR%%/tools/web_config/partials/colors.html
 %%DATADIR%%/tools/web_config/partials/functions.html