CVS commit: pkgsrc/shells/fish

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Feb 18 22:00:49 UTC 2020

Modified Files:
        pkgsrc/shells/fish: Makefile PLIST distinfo
        pkgsrc/shells/fish/patches: patch-src_fallback.cpp patch-src_wutil.cpp
Added Files:
        pkgsrc/shells/fish/patches: patch-cmake_ConfigureChecks.cmake
            patch-config__cmake.h.in patch-src_common.cpp
Removed Files:
        pkgsrc/shells/fish: options.mk
        pkgsrc/shells/fish/patches: patch-Makefile.in patch-configure.ac
            patch-share_functions_man.fish patch-src_builtin.cpp
            patch-src_fallback.h patch-src_output.cpp patch-src_output.h
            patch-src_screen.cpp

Log Message:
fish: update to 3.1.0

>From Jonathan Schleifer in PR pkg/54965,
lightly changed by myself for netbsd support.

fish 3.1.0 (released February 12, 2020)

Compared to the beta release of fish 3.1b1, fish version 3.1.0:

* fixes a regression where spaces after a brace were removed despite
  brace expansion not occurring (#6564)
* fixes a number of problems in compiling and testing on Cygwin (#6549)
  and Solaris-derived systems such as Illumos (#6553, #6554, #6555,
  #6556, and #6558);
* fixes the process for building macOS packages;
* fixes a regression where excessive error messages are printed if
  Unicode characters are emitted in non-Unicode-capable locales
  (#6584); and
* contains some improvements to the documentation and a small number of
  completions.

If you are upgrading from version 3.0.0 or before, please also review
the release notes for 3.1b1 (included below).

Release notes for fish 3.1b1 (released January 26, 2020)

Notable improvements and fixes

* A new $pipestatus variable contains a list of exit statuses of the
  previous job, for each of the separate commands in a pipeline
  (#5632).
* fish no longer buffers pipes to the last function in a pipeline,
  improving many cases where pipes appeared to block or hang (#1396).
* An overhaul of error messages for builtin commands, including a
  removal of the overwhelming usage summary, more readable stack traces
  (#3404, #5434), and stack traces for test (aka [) (#5771).
* fish's debugging arguments have been significantly improved. The
  --debug-level option has been removed, and a new --debug option
  replaces it. This option accepts various categories, which may be listed
  via fish --print-debug-categories (#5879). A new --debug-output option
  allows for redirection of debug output.
* string has a new collect subcommand for use in command substitutions,
  producing a single output instead of splitting on new lines (similar
  to "$(cmd)" in other shells) (#159).
* The fish manual, tutorial and FAQ are now available in man format as
  fish-doc, fish-tutorial and fish-faq respectively (#5521).
* Like other shells, cd now always looks for its argument in the
  current directory as a last resort, even if the CDPATH variable does
  not include it or "." (#4484).
* fish now correctly handles CDPATH entries that start with .. (#6220)
  or contain ./ (#5887).
* The fish_trace variable may be set to trace execution (#3427). This
  performs a similar role as set -x in other shells.
* fish uses the temporary directory determined by the system, rather
  than relying on /tmp (#3845).
* The fish Web configuration tool (fish_config) prints a list of
  commands it is executing, to help understanding and debugging
  (#5584).
* Major performance improvements when pasting (#5866), executing lots
  of commands (#5905), importing history from bash (#6295), and when
  completing variables that might match $history (#6288).

    Syntax changes and new commands

* A new builtin command, time, which allows timing of fish functions
  and builtins as well as external commands (#117).
* Brace expansion now only takes place if the braces include a "," or a
  variable expansion, meaning common commands such as git reset
  HEAD@{0} do not require escaping (#5869).
* New redirections &> and &| may be used to redirect or pipe stdout,
  and also redirect stderr to stdout (#6192).
* switch now allows arguments that expand to nothing, like empty
  variables (#5677).
* The VAR=val cmd syntax can now be used to run a command in a modified
  environment (#6287).
* and is no longer recognised as a command, so that nonsensical
  constructs like and and and produce a syntax error (#6089).
* math's exponent operator, '^', was previously left-associative, but
  now uses the more commonly-used right-associative behaviour (#6280).
  This means that math '3^0.5^2' was previously calculated as
  '(3^0.5)^2', but is now calculated as '3^(0.5^2)'.
* In fish 3.0, the variable used with for loops inside command
  substitutions could leak into enclosing scopes; this was an
  inadvertent behaviour change and has been reverted (#6480).

    Scripting improvements

* string split0 now returns 0 if it split something (#5701).
* In the interest of consistency, builtin -q and command -q can now be
  used to query if a builtin or command exists (#5631).
* math now accepts --scale=max for the maximum scale (#5579).
* builtin $var now works correctly, allowing a variable as the builtin
  name (#5639).
* cd understands the -- argument to make it possible to change to
  directories starting with a hyphen (#6071).
* complete --do-complete now also does fuzzy matches (#5467).
* complete --do-complete can be used inside completions, allowing
  limited recursion (#3474).
* count now also counts lines fed on standard input (#5744).
* eval produces an exit status of 0 when given no arguments, like other
  shells (#5692).
* printf prints what it can when input hasn't been fully converted to a
  number, but still prints an error (#5532).
* complete -C foo now works as expected, rather than requiring complete
  -Cfoo.
* complete has a new --force-files option, to re-enable file
  completions. This allows sudo -E and pacman -Qo to complete correctly
  (#5646).
* argparse now defaults to showing the current function name (instead
  of argparse) in its errors, making --name often superfluous (#5835).
* argparse has a new --ignore-unknown option to keep unrecognized
  options, allowing multiple argparse passes to parse options (#5367).
* argparse correctly handles flag value validation of options that only
  have short names (#5864).
* read -S (short option of --shell) is recognised correctly (#5660).
* read understands --list, which acts like --array in reading all
  arguments into a list inside a single variable, but is better named
  (#5846).
* read has a new option, --tokenize, which splits a string into
  variables according to the shell's tokenization rules, considering
  quoting, escaping, and so on (#3823).
* read interacts more correctly with the deprecated $IFS variable, in
  particular removing multiple separators when splitting a variable
  into a list (#6406), matching other shells.
* fish_indent now handles semicolons better, including leaving them in
  place for ; and and ; or instead of breaking the line (#5859).
* fish_indent --write now supports multiple file arguments, indenting
  them in turn.
* The default read limit has been increased to 100MiB (#5267).
* math now also understands x for multiplication, provided it is
  followed by whitespace (#5906).
* math reports the right error when incorrect syntax is used inside
  parentheses (#6063), and warns when unsupported logical operations
  are used (#6096).
* functions --erase now also prevents fish from autoloading a function
  for the first time (#5951).
* jobs --last returns 0 to indicate success when a job is found
  (#6104).
* commandline -p and commandline -j now split on && and || in addition
  to ; and & (#6214).
* A bug where string split would drop empty strings if the output was
  only empty strings has been fixed (#5987).
* eval no long creates a new local variable scope, but affects
  variables in the scope it is called from (#4443). source still
  creates a new local scope.
* abbr has a new --query option to check for the existence of an
  abbreviation.
* Local values for fish_complete_path and fish_function_path are now
  ignored; only their global values are respected.
* Syntax error reports now display a marker in the correct position
  (#5812).
* Empty universal variables may now be exported (#5992).
* Exported universal variables are no longer imported into the global
  scope, preventing shadowing. This makes it easier to change such
  variables for all fish sessions and avoids breakage when the value is
  a list of multiple elements (#5258).
* A bug where for could use invalid variable names has been fixed
  (#5800).
* A bug where local variables would not be exported to functions has
  been fixed (#6153).
* The null command (:) now always exits successfully, rather than
  passing through the previous exit status (#6022).
* The output of functions FUNCTION matches the declaration of the
  function, correctly including comments or blank lines (#5285), and
  correctly includes any --wraps flags (#1625).
* type supports a new option, --short, which suppress function
  expansion (#6403).
* type --path with a function argument will now output the path to the
  file containing the definition of that function, if it exists.
* type --force-path with an argument that cannot be found now correctly
  outputs nothing, as documented (#6411).
* The $hostname variable is no longer truncated to 32 characters
  (#5758).
* Line numbers in function backtraces are calculated correctly (#6350).
* A new fish_cancel event is emitted when the command line is
  cancelled, which is useful for terminal integration (#5973).

    Interactive improvements

* New Base16 color options are available through the Web-based
  configuration (#6504).
* fish only parses /etc/paths on macOS in login shells, matching the
  bash implementation (#5637) and avoiding changes to path ordering in
  child shells (#5456). It now ignores blank lines like the bash
  implementation (#5809).
* The locale is now reloaded when the LOCPATH variable is changed
  (#5815).
* read no longer keeps a history, making it suitable for operations
  that shouldn't end up there, like password entry (#5904).
* dirh outputs its stack in the correct order (#5477), and behaves as
  documented when universal variables are used for its stack (#5797).
* funced and the edit-commandline-in-buffer bindings did not work in
  fish 3.0 when the $EDITOR variable contained spaces; this has been
  corrected (#5625).
* Builtins now pipe their help output to a pager automatically (#6227).
* set_color now colors the --print-colors output in the matching colors
  if it is going to a terminal.
* fish now underlines every valid entered path instead of just the last
  one (#5872).
* When syntax highlighting a string with an unclosed quote, only the
  quote itself will be shown as an error, instead of the whole
  argument.
* Syntax highlighting works correctly with variables as commands
  (#5658) and redirections to close file descriptors (#6092).
* help works properly on Windows Subsytem for Linux (#5759, #6338).
* A bug where disown could crash the shell has been fixed (#5720).
* fish will not autosuggest files ending with ~ unless there are no
  other candidates, as these are generally backup files (#985).
* Escape in the pager works correctly (#5818).
* Key bindings that call fg no longer leave the terminal in a broken
  state (#2114).
* Brackets (#5831) and filenames containing $ (#6060) are completed
  with appropriate escaping.
* The output of complete and functions is now colorized in interactive
  terminals.
* The Web-based configuration handles aliases that include single
  quotes correctly (#6120), and launches correctly under Termux (#6248)
  and OpenBSD (#6522).
* function now correctly validates parameters for --argument-names as
  valid variable names (#6147) and correctly parses options following
  --argument-names, as in "--argument-names foo --description bar"
  (#6186).
* History newly imported from bash includes command lines using && or
  ||.
* The automatic generation of completions from manual pages is better
  described in job and process listings, and no longer produces a
  warning when exiting fish (#6269).
* In private mode, setting $fish_greeting to an empty string before
  starting the private session will prevent the warning about history
  not being saved from being printed (#6299).
* In the interactive editor, a line break (Enter) inside unclosed
  brackets will insert a new line, rather than executing the command
  and producing an error (#6316).
* Ctrl-C always repaints the prompt (#6394).
* When run interactively from another program (such as Python), fish
  will correctly start a new process group, like other shells (#5909).
* Job identifiers (for example, for background jobs) are assigned more
  logically (#6053).
* A bug where history would appear truncated if an empty command was
  executed was fixed (#6032).

    New or improved bindings

* Pasting strips leading spaces to avoid pasted commands being omitted
  from the history (#4327).
* Shift-Left and Shift-Right now default to moving backwards and
  forwards by one bigword (words separated by whitespace) (#1505).
* The default escape delay (to differentiate between the escape key and
  an alt-combination) has been reduced to 30ms, down from 300ms for the
  default mode and 100ms for Vi mode (#3904).
* The forward-bigword binding now interacts correctly with
  autosuggestions (#5336).
* The fish_clipboard_* functions support Wayland by using
  [wl-clipboard](https://github.com/bugaevc/wl-clipboard) (#5450).
* The nextd and prevd functions no longer print "Hit end of history",
  instead using a bell. They correctly store working directories
  containing symbolic links (#6395).
* If a fish_mode_prompt function exists, Vi mode will only execute it
  on mode-switch instead of the entire prompt. This should make it much
  more responsive with slow prompts (#5783).
* The path-component bindings (like Ctrl-w) now also stop at ":" and
  "@", because those are used to denote user and host in commands such
  as ssh (#5841).
* The NULL character can now be bound via bind -k nul. Terminals often
  generate this character via control-space. (#3189).
* A new readline command expand-abbr can be used to trigger
  abbreviation expansion (#5762).
* A new readline command, delete-or-exit, removes a character to the
  right of the cursor or exits the shell if the command line is empty
  (moving this functionality out of the delete-or-exit function).
* The self-insert readline command will now insert the binding
  sequence, if not empty.
* A new binding to prepend sudo, bound to Alt-S by default (#6140).
* The Alt-W binding to describe a command should now work better with
  multiline prompts (#6110)
* The Alt-H binding to open a command's man page now tries to ignore
  sudo (#6122).
* A new pair of bind functions, history-prefix-search-backward (and
  forward), was introduced (#6143).
* Vi mode now supports R to enter replace mode (#6342), and d0 to
  delete the current line (#6292).
* In Vi mode, hitting Enter in replace-one mode no longer erases the
  prompt (#6298).
* Selections in Vi mode are inclusive, matching the actual behaviour of
  Vi (#5770).

    Improved prompts

* The Git prompt in informative mode now shows the number of stashes if
  enabled.
* The Git prompt now has an option
  ($__fish_git_prompt_use_informative_chars) to use the (more modern)
  informative characters without enabling informative mode.
* The default prompt now also features VCS integration and will color
  the host if running via SSH (#6375).
* The default and example prompts print the pipe status if an earlier
  command in the pipe fails.
* The default and example prompts try to resolve exit statuses to
  signal names when appropriate.

    Improved terminal output

* New fish_pager_color_ options have been added to control more
  elements of the pager's colors (#5524).
* Better detection and support for using fish from various system
  consoles, where limited colors and special characters are supported
  (#5552).
* fish now tries to guess if the system supports Unicode 9 (and
  displays emoji as wide), eliminating the need to set
  $fish_emoji_width in most cases (#5722).
* Improvements to the display of wide characters, particularly Korean
  characters and emoji (#5583, #5729).
* The Vi mode cursor is correctly redrawn when regaining focus under
  terminals that report focus (eg tmux) (#4788).
* Variables that control background colors (such as
  fish_pager_color_search_match) can now use --reverse.

    Completions

* Added completions for
* aws
* bat (#6052)
* bosh (#5700)
* btrfs
* camcontrol
* cf (#5700)
* chronyc (#6496)
* code (#6205)
* cryptsetup (#6488)
* csc and csi (#6016)
* cwebp (#6034)
* cygpath and cygstart (#6239)
* epkginfo (#5829)
* ffmpeg, ffplay, and ffprobe (#5922)
* fsharpc and fsharpi (#6016)
* fzf (#6178)
* g++ (#6217)
* gpg1 (#6139)
* gpg2 (#6062)
* grub-mkrescue (#6182)
* hledger (#6043)
* hwinfo (#6496)
* irb (#6260)
* iw (#6232)
* kak
* keepassxc-cli (#6505)
* keybase (#6410)
* loginctl (#6501)
* lz4, lz4c and lz4cat (#6364)
* mariner (#5718)
* nethack (#6240)
* patool (#6083)
* phpunit (#6197)
* plutil (#6301)
* pzstd (#6364)
* qubes-gpg-client (#6067)
* resolvectl (#6501)
* rg
* rustup
* sfdx (#6149)
* speedtest and speedtest-cli (#5840)
* src (#6026)
* tokei (#6085)
* tsc (#6016)
* unlz4 (#6364)
* unzstd (#6364)
* vbc (#6016)
* zpaq (#6245)
* zstd, zstdcat, zstdgrep, zstdless and zstdmt (#6364)
* Lots of improvements to completions.
* Selecting short options which also have a long name from the
  completion pager is possible (#5634).
* Tab completion will no longer add trailing spaces if they already
  exist (#6107).
* Completion of subcommands to builtins like and or not now works
  correctly (#6249).
* Completion of arguments to short options works correctly when
  multiple short options are used together (#332).
* Activating completion in the middle of an invalid completion does not
  move the cursor any more, making it easier to fix a mistake (#4124).
* Completion in empty commandlines now lists all available commands.
* Functions listed as completions could previously leak parts of the
  function as other completions; this has been fixed.

    Deprecations and removed features

* The vcs-prompt functions have been promoted to names without
  double-underscore, so __fish_git_prompt is now fish_git_prompt,
  __fish_vcs_prompt is now fish_vcs_prompt, __fish_hg_prompt is now
  fish_hg_prompt and __fish_svn_prompt is now fish_svn_prompt. Shims at
  the old names have been added, and the variables have kept their old
  names (#5586).
* string replace has an additional round of escaping in the replacement
  expression, so escaping backslashes requires many escapes (eg string
  replace -ra '([ab])' '\\\\\\\$1' a). The new feature flag
  regex-easyesc can be used to disable this, so that the same effect
  can be achieved with string replace -ra '([ab])' '\\\\$1' a (#5556).
  As a reminder, the intention behind feature flags is that this will
  eventually become the default and then only option, so scripts should
  be updated.
* The fish_vi_mode function, deprecated in fish 2.3, has been removed.
  Use fish_vi_key_bindings instead (#6372).

    For distributors and developers

* fish 3.0 introduced a CMake-based build system. In fish 3.1, both the
  Autotools-based build and legacy Xcode build system have been
  removed, leaving only the CMake build system. All distributors and
  developers must install CMake.
* fish now depends on the common tee external command, for the psub
  process substitution function.
* The documentation is now built with Sphinx. The old Doxygen-based
  documentation system has been removed. Developers, and distributors
  who wish to rebuild the documentation, must install Sphinx.
* The INTERNAL_WCWIDTH build option has been removed, as fish now
  always uses an internal wcwidth function. It has a number of
  configuration options that make it more suitable for general use
  (#5777).
* mandoc can now be used to format the output from --help if nroff is
  not installed, reducing the number of external dependencies on
  systems with mandoc installed (#5489).
* Some bugs preventing building on Solaris-derived systems such as
  Illumos were fixed (#5458, #5461, #5611).
* Completions for npm, bower and yarn no longer require the jq utility
  for full functionality, but will use Python instead if it is
  available.
* The paths for completions, functions and configuration snippets have
  been extended. On systems that define XDG_DATA_DIRS, each of the
  directories in this variable are searched in the subdirectories
  fish/vendor_completions.d, fish/vendor_functions.d, and
  fish/vendor_conf.d respectively. On systems that do not define this
  variable in the environment, the vendor directories are searched for
  in both the installation prefix and the default "extra" directory,
  which now defaults to /usr/local (#5029).


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/shells/fish/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/shells/fish/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/shells/fish/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/shells/fish/options.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/shells/fish/patches/patch-Makefile.in
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/shells/fish/patches/patch-cmake_ConfigureChecks.cmake \
    pkgsrc/shells/fish/patches/patch-config__cmake.h.in \
    pkgsrc/shells/fish/patches/patch-src_common.cpp
cvs rdiff -u -r1.3 -r0 pkgsrc/shells/fish/patches/patch-configure.ac \
    pkgsrc/shells/fish/patches/patch-src_fallback.h \
    pkgsrc/shells/fish/patches/patch-src_output.cpp \
    pkgsrc/shells/fish/patches/patch-src_output.h \
    pkgsrc/shells/fish/patches/patch-src_screen.cpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/shells/fish/patches/patch-share_functions_man.fish \
    pkgsrc/shells/fish/patches/patch-src_builtin.cpp
cvs rdiff -u -r1.2 -r1.3 pkgsrc/shells/fish/patches/patch-src_fallback.cpp
cvs rdiff -u -r1.3 -r1.4 pkgsrc/shells/fish/patches/patch-src_wutil.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/shells/fish/Makefile
diff -u pkgsrc/shells/fish/Makefile:1.21 pkgsrc/shells/fish/Makefile:1.22
--- pkgsrc/shells/fish/Makefile:1.21    Sat Nov  9 12:02:29 2019
+++ pkgsrc/shells/fish/Makefile Tue Feb 18 22:00:49 2020
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2019/11/09 12:02:29 nia Exp $
+# $NetBSD: Makefile,v 1.22 2020/02/18 22:00:49 maya Exp $
 
-DISTNAME=              fish-3.0.2
+DISTNAME=              fish-3.1.0
 CATEGORIES=            shells
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=fish-shell/}
 GITHUB_PROJECT=                fish-shell
+GITHUB_RELEASE=                3.1.0
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.fishshell.com/
@@ -12,17 +13,10 @@ LICENSE=            gnu-gpl-v2
 
 EXTRACT_USING=         gtar
 
-WRKSRC=                        ${WRKDIR}/fish-shell-${PKGVERSION_NOREV}
-
 USE_LANGUAGES+=                c c++03
-USE_LIBTOOL=           yes
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-USE_TOOLS+=            gmake autoreconf autoconf automake
+USE_CMAKE=             yes
 USE_TOOLS+=            msgfmt
-
-EGDIR=                 ${PREFIX}/share/examples
-INSTALL_ENV+=          EGDIR=${EGDIR}
+CMAKE_ARGS+=           -DIntl_INCLUDE_DIR=${PREFIX}/include
 
 PKG_SHELL=             bin/fish
 
@@ -40,17 +34,14 @@ CXXFLAGS.NetBSD+=   -fpermissive
 LDFLAGS+=              -lexecinfo
 .endif
 
-# Upstream intentionally omits open.1 on Darwin
-PLIST_VARS+=   open
-.if ${OPSYS} != "Darwin"
+# Upstream intentionally omits open.1 on Darwin, but adds realpath.1
+PLIST_VARS+=   open realpath
+.if ${OPSYS} == "Darwin"
+PLIST.realpath= yes
+.else
 PLIST.open=    yes
 .endif
 
-pre-configure:
-       ${RUN} cd ${WRKSRC} && autoreconf -fiv
-
-.include "options.mk"
-
 .include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gettext-tools/buildlink3.mk"

Index: pkgsrc/shells/fish/PLIST
diff -u pkgsrc/shells/fish/PLIST:1.7 pkgsrc/shells/fish/PLIST:1.8
--- pkgsrc/shells/fish/PLIST:1.7        Tue Feb 12 16:49:31 2019
+++ pkgsrc/shells/fish/PLIST    Tue Feb 18 22:00:49 2020
@@ -1,20 +1,259 @@
-@comment $NetBSD: PLIST,v 1.7 2019/02/12 16:49:31 maya Exp $
+@comment $NetBSD: PLIST,v 1.8 2020/02/18 22:00:49 maya Exp $
 bin/fish
 bin/fish_indent
 bin/fish_key_reader
-${PLIST.doc}man/man1/fish.1
-${PLIST.doc}man/man1/fish_indent.1
-${PLIST.doc}man/man1/fish_key_reader.1
+etc/fish/config.fish
+man/man1/fish.1
+man/man1/fish_indent.1
+man/man1/fish_key_reader.1
+share/doc/fish/.buildinfo
 share/doc/fish/CHANGELOG.md
-${PLIST.doc}share/doc/fish/ascii_fish.png
-${PLIST.doc}share/doc/fish/commands.html
-${PLIST.doc}share/doc/fish/design.html
-${PLIST.doc}share/doc/fish/faq.html
-${PLIST.doc}share/doc/fish/index.html
-${PLIST.doc}share/doc/fish/license.html
-${PLIST.doc}share/doc/fish/tutorial.html
-${PLIST.doc}share/doc/fish/user_doc.css
-share/examples/fish/config.fish
+share/doc/fish/_sources/cmds/abbr.rst.txt
+share/doc/fish/_sources/cmds/alias.rst.txt
+share/doc/fish/_sources/cmds/and.rst.txt
+share/doc/fish/_sources/cmds/argparse.rst.txt
+share/doc/fish/_sources/cmds/begin.rst.txt
+share/doc/fish/_sources/cmds/bg.rst.txt
+share/doc/fish/_sources/cmds/bind.rst.txt
+share/doc/fish/_sources/cmds/block.rst.txt
+share/doc/fish/_sources/cmds/break.rst.txt
+share/doc/fish/_sources/cmds/breakpoint.rst.txt
+share/doc/fish/_sources/cmds/builtin.rst.txt
+share/doc/fish/_sources/cmds/case.rst.txt
+share/doc/fish/_sources/cmds/cd.rst.txt
+share/doc/fish/_sources/cmds/cdh.rst.txt
+share/doc/fish/_sources/cmds/command.rst.txt
+share/doc/fish/_sources/cmds/commandline.rst.txt
+share/doc/fish/_sources/cmds/complete.rst.txt
+share/doc/fish/_sources/cmds/contains.rst.txt
+share/doc/fish/_sources/cmds/continue.rst.txt
+share/doc/fish/_sources/cmds/count.rst.txt
+share/doc/fish/_sources/cmds/dirh.rst.txt
+share/doc/fish/_sources/cmds/dirs.rst.txt
+share/doc/fish/_sources/cmds/disown.rst.txt
+share/doc/fish/_sources/cmds/echo.rst.txt
+share/doc/fish/_sources/cmds/else.rst.txt
+share/doc/fish/_sources/cmds/emit.rst.txt
+share/doc/fish/_sources/cmds/end.rst.txt
+share/doc/fish/_sources/cmds/eval.rst.txt
+share/doc/fish/_sources/cmds/exec.rst.txt
+share/doc/fish/_sources/cmds/exit.rst.txt
+share/doc/fish/_sources/cmds/false.rst.txt
+share/doc/fish/_sources/cmds/fg.rst.txt
+share/doc/fish/_sources/cmds/fish.rst.txt
+share/doc/fish/_sources/cmds/fish_breakpoint_prompt.rst.txt
+share/doc/fish/_sources/cmds/fish_config.rst.txt
+share/doc/fish/_sources/cmds/fish_git_prompt.rst.txt
+share/doc/fish/_sources/cmds/fish_hg_prompt.rst.txt
+share/doc/fish/_sources/cmds/fish_indent.rst.txt
+share/doc/fish/_sources/cmds/fish_key_reader.rst.txt
+share/doc/fish/_sources/cmds/fish_mode_prompt.rst.txt
+share/doc/fish/_sources/cmds/fish_opt.rst.txt
+share/doc/fish/_sources/cmds/fish_prompt.rst.txt
+share/doc/fish/_sources/cmds/fish_right_prompt.rst.txt
+share/doc/fish/_sources/cmds/fish_svn_prompt.rst.txt
+share/doc/fish/_sources/cmds/fish_update_completions.rst.txt
+share/doc/fish/_sources/cmds/fish_vcs_prompt.rst.txt
+share/doc/fish/_sources/cmds/for.rst.txt
+share/doc/fish/_sources/cmds/funced.rst.txt
+share/doc/fish/_sources/cmds/funcsave.rst.txt
+share/doc/fish/_sources/cmds/function.rst.txt
+share/doc/fish/_sources/cmds/functions.rst.txt
+share/doc/fish/_sources/cmds/help.rst.txt
+share/doc/fish/_sources/cmds/history.rst.txt
+share/doc/fish/_sources/cmds/if.rst.txt
+share/doc/fish/_sources/cmds/isatty.rst.txt
+share/doc/fish/_sources/cmds/jobs.rst.txt
+share/doc/fish/_sources/cmds/math.rst.txt
+share/doc/fish/_sources/cmds/nextd.rst.txt
+share/doc/fish/_sources/cmds/not.rst.txt
+share/doc/fish/_sources/cmds/open.rst.txt
+share/doc/fish/_sources/cmds/or.rst.txt
+share/doc/fish/_sources/cmds/popd.rst.txt
+share/doc/fish/_sources/cmds/prevd.rst.txt
+share/doc/fish/_sources/cmds/printf.rst.txt
+share/doc/fish/_sources/cmds/prompt_pwd.rst.txt
+share/doc/fish/_sources/cmds/psub.rst.txt
+share/doc/fish/_sources/cmds/pushd.rst.txt
+share/doc/fish/_sources/cmds/pwd.rst.txt
+share/doc/fish/_sources/cmds/random.rst.txt
+share/doc/fish/_sources/cmds/read.rst.txt
+share/doc/fish/_sources/cmds/realpath.rst.txt
+share/doc/fish/_sources/cmds/return.rst.txt
+share/doc/fish/_sources/cmds/set.rst.txt
+share/doc/fish/_sources/cmds/set_color.rst.txt
+share/doc/fish/_sources/cmds/source.rst.txt
+share/doc/fish/_sources/cmds/status.rst.txt
+share/doc/fish/_sources/cmds/string-collect.rst.txt
+share/doc/fish/_sources/cmds/string-escape.rst.txt
+share/doc/fish/_sources/cmds/string-join.rst.txt
+share/doc/fish/_sources/cmds/string-join0.rst.txt
+share/doc/fish/_sources/cmds/string-length.rst.txt
+share/doc/fish/_sources/cmds/string-lower.rst.txt
+share/doc/fish/_sources/cmds/string-match.rst.txt
+share/doc/fish/_sources/cmds/string-repeat.rst.txt
+share/doc/fish/_sources/cmds/string-replace.rst.txt
+share/doc/fish/_sources/cmds/string-split.rst.txt
+share/doc/fish/_sources/cmds/string-split0.rst.txt
+share/doc/fish/_sources/cmds/string-sub.rst.txt
+share/doc/fish/_sources/cmds/string-trim.rst.txt
+share/doc/fish/_sources/cmds/string-unescape.rst.txt
+share/doc/fish/_sources/cmds/string-upper.rst.txt
+share/doc/fish/_sources/cmds/string.rst.txt
+share/doc/fish/_sources/cmds/suspend.rst.txt
+share/doc/fish/_sources/cmds/switch.rst.txt
+share/doc/fish/_sources/cmds/test.rst.txt
+share/doc/fish/_sources/cmds/time.rst.txt
+share/doc/fish/_sources/cmds/trap.rst.txt
+share/doc/fish/_sources/cmds/true.rst.txt
+share/doc/fish/_sources/cmds/type.rst.txt
+share/doc/fish/_sources/cmds/ulimit.rst.txt
+share/doc/fish/_sources/cmds/umask.rst.txt
+share/doc/fish/_sources/cmds/vared.rst.txt
+share/doc/fish/_sources/cmds/wait.rst.txt
+share/doc/fish/_sources/cmds/while.rst.txt
+share/doc/fish/_sources/commands.rst.txt
+share/doc/fish/_sources/design.rst.txt
+share/doc/fish/_sources/faq.rst.txt
+share/doc/fish/_sources/index.rst.txt
+share/doc/fish/_sources/license.rst.txt
+share/doc/fish/_sources/tutorial.rst.txt
+share/doc/fish/_static/ajax-loader.gif
+share/doc/fish/_static/basic.css
+share/doc/fish/_static/comment-bright.png
+share/doc/fish/_static/comment-close.png
+share/doc/fish/_static/comment.png
+share/doc/fish/_static/custom.css
+share/doc/fish/_static/doctools.js
+share/doc/fish/_static/documentation_options.js
+share/doc/fish/_static/down-pressed.png
+share/doc/fish/_static/down.png
+share/doc/fish/_static/file.png
+share/doc/fish/_static/jquery.js
+share/doc/fish/_static/language_data.js
+share/doc/fish/_static/minus.png
+share/doc/fish/_static/nature.css
+share/doc/fish/_static/plus.png
+share/doc/fish/_static/pygments.css
+share/doc/fish/_static/searchtools.js
+share/doc/fish/_static/underscore.js
+share/doc/fish/_static/up-pressed.png
+share/doc/fish/_static/up.png
+share/doc/fish/_static/websupport.js
+share/doc/fish/cmds/abbr.html
+share/doc/fish/cmds/alias.html
+share/doc/fish/cmds/and.html
+share/doc/fish/cmds/argparse.html
+share/doc/fish/cmds/begin.html
+share/doc/fish/cmds/bg.html
+share/doc/fish/cmds/bind.html
+share/doc/fish/cmds/block.html
+share/doc/fish/cmds/break.html
+share/doc/fish/cmds/breakpoint.html
+share/doc/fish/cmds/builtin.html
+share/doc/fish/cmds/case.html
+share/doc/fish/cmds/cd.html
+share/doc/fish/cmds/cdh.html
+share/doc/fish/cmds/command.html
+share/doc/fish/cmds/commandline.html
+share/doc/fish/cmds/complete.html
+share/doc/fish/cmds/contains.html
+share/doc/fish/cmds/continue.html
+share/doc/fish/cmds/count.html
+share/doc/fish/cmds/dirh.html
+share/doc/fish/cmds/dirs.html
+share/doc/fish/cmds/disown.html
+share/doc/fish/cmds/echo.html
+share/doc/fish/cmds/else.html
+share/doc/fish/cmds/emit.html
+share/doc/fish/cmds/end.html
+share/doc/fish/cmds/eval.html
+share/doc/fish/cmds/exec.html
+share/doc/fish/cmds/exit.html
+share/doc/fish/cmds/false.html
+share/doc/fish/cmds/fg.html
+share/doc/fish/cmds/fish.html
+share/doc/fish/cmds/fish_breakpoint_prompt.html
+share/doc/fish/cmds/fish_config.html
+share/doc/fish/cmds/fish_git_prompt.html
+share/doc/fish/cmds/fish_hg_prompt.html
+share/doc/fish/cmds/fish_indent.html
+share/doc/fish/cmds/fish_key_reader.html
+share/doc/fish/cmds/fish_mode_prompt.html
+share/doc/fish/cmds/fish_opt.html
+share/doc/fish/cmds/fish_prompt.html
+share/doc/fish/cmds/fish_right_prompt.html
+share/doc/fish/cmds/fish_svn_prompt.html
+share/doc/fish/cmds/fish_update_completions.html
+share/doc/fish/cmds/fish_vcs_prompt.html
+share/doc/fish/cmds/for.html
+share/doc/fish/cmds/funced.html
+share/doc/fish/cmds/funcsave.html
+share/doc/fish/cmds/function.html
+share/doc/fish/cmds/functions.html
+share/doc/fish/cmds/help.html
+share/doc/fish/cmds/history.html
+share/doc/fish/cmds/if.html
+share/doc/fish/cmds/isatty.html
+share/doc/fish/cmds/jobs.html
+share/doc/fish/cmds/math.html
+share/doc/fish/cmds/nextd.html
+share/doc/fish/cmds/not.html
+share/doc/fish/cmds/open.html
+share/doc/fish/cmds/or.html
+share/doc/fish/cmds/popd.html
+share/doc/fish/cmds/prevd.html
+share/doc/fish/cmds/printf.html
+share/doc/fish/cmds/prompt_pwd.html
+share/doc/fish/cmds/psub.html
+share/doc/fish/cmds/pushd.html
+share/doc/fish/cmds/pwd.html
+share/doc/fish/cmds/random.html
+share/doc/fish/cmds/read.html
+share/doc/fish/cmds/realpath.html
+share/doc/fish/cmds/return.html
+share/doc/fish/cmds/set.html
+share/doc/fish/cmds/set_color.html
+share/doc/fish/cmds/source.html
+share/doc/fish/cmds/status.html
+share/doc/fish/cmds/string-collect.html
+share/doc/fish/cmds/string-escape.html
+share/doc/fish/cmds/string-join.html
+share/doc/fish/cmds/string-join0.html
+share/doc/fish/cmds/string-length.html
+share/doc/fish/cmds/string-lower.html
+share/doc/fish/cmds/string-match.html
+share/doc/fish/cmds/string-repeat.html
+share/doc/fish/cmds/string-replace.html
+share/doc/fish/cmds/string-split.html
+share/doc/fish/cmds/string-split0.html
+share/doc/fish/cmds/string-sub.html
+share/doc/fish/cmds/string-trim.html
+share/doc/fish/cmds/string-unescape.html
+share/doc/fish/cmds/string-upper.html
+share/doc/fish/cmds/string.html
+share/doc/fish/cmds/suspend.html
+share/doc/fish/cmds/switch.html
+share/doc/fish/cmds/test.html
+share/doc/fish/cmds/time.html
+share/doc/fish/cmds/trap.html
+share/doc/fish/cmds/true.html
+share/doc/fish/cmds/type.html
+share/doc/fish/cmds/ulimit.html
+share/doc/fish/cmds/umask.html
+share/doc/fish/cmds/vared.html
+share/doc/fish/cmds/wait.html
+share/doc/fish/cmds/while.html
+share/doc/fish/commands.html
+share/doc/fish/design.html
+share/doc/fish/faq.html
+share/doc/fish/genindex.html
+share/doc/fish/index.html
+share/doc/fish/license.html
+share/doc/fish/objects.inv
+share/doc/fish/search.html
+share/doc/fish/searchindex.js
+share/doc/fish/tutorial.html
 share/fish/__fish_build_paths.fish
 share/fish/completions/VBoxHeadless.fish
 share/fish/completions/VBoxSDL.fish
@@ -86,20 +325,25 @@ share/fish/completions/atrm.fish
 share/fish/completions/aunpack.fish
 share/fish/completions/aura.fish
 share/fish/completions/awk.fish
+share/fish/completions/aws.fish
 share/fish/completions/badblocks.fish
 share/fish/completions/base64.fish
+share/fish/completions/bat.fish
 share/fish/completions/bb-wrapper.fish
 share/fish/completions/bc.fish
 share/fish/completions/bd.fish
+share/fish/completions/begin.fish
 share/fish/completions/bg.fish
 share/fish/completions/bind.fish
 share/fish/completions/bison.fish
 share/fish/completions/block.fish
+share/fish/completions/bosh.fish
 share/fish/completions/bower.fish
 share/fish/completions/break.fish
 share/fish/completions/brew.fish
 share/fish/completions/btdownloadcurses.py.fish
 share/fish/completions/btdownloadheadless.py.fish
+share/fish/completions/btrfs.fish
 share/fish/completions/builtin.fish
 share/fish/completions/bundle.fish
 share/fish/completions/bunzip2.fish
@@ -112,6 +356,7 @@ share/fish/completions/cabal-dev.fish
 share/fish/completions/cabal.fish
 share/fish/completions/caddy.fish
 share/fish/completions/caffeinate.fish
+share/fish/completions/camcontrol.fish
 share/fish/completions/cancel.fish
 share/fish/completions/canto.fish
 share/fish/completions/cargo.fish
@@ -120,13 +365,16 @@ share/fish/completions/cat.fish
 share/fish/completions/cd.fish
 share/fish/completions/cdh.fish
 share/fish/completions/cdrecord.fish
+share/fish/completions/cf.fish
 share/fish/completions/chgrp.fish
 share/fish/completions/chmod.fish
 share/fish/completions/chown.fish
+share/fish/completions/chronyc.fish
 share/fish/completions/chsh.fish
 share/fish/completions/clang++.fish
 share/fish/completions/clang.fish
 share/fish/completions/climate.fish
+share/fish/completions/code.fish
 share/fish/completions/colordiff.fish
 share/fish/completions/colorsvn.fish
 share/fish/completions/combine.fish
@@ -143,10 +391,12 @@ share/fish/completions/conjure.fish
 share/fish/completions/connmanctl.fish
 share/fish/completions/continue.fish
 share/fish/completions/convert.fish
-share/fish/completions/cower.fish
 share/fish/completions/cowsay.fish
 share/fish/completions/cowthink.fish
 share/fish/completions/cp.fish
+share/fish/completions/cryptsetup.fish
+share/fish/completions/csc.fish
+share/fish/completions/csi.fish
 share/fish/completions/cupsaccept.fish
 share/fish/completions/cupsdisable.fish
 share/fish/completions/cupsenable.fish
@@ -154,7 +404,10 @@ share/fish/completions/cupsreject.fish
 share/fish/completions/curl.fish
 share/fish/completions/cut.fish
 share/fish/completions/cvs.fish
+share/fish/completions/cwebp.fish
+share/fish/completions/cygpath.fish
 share/fish/completions/cygport.fish
+share/fish/completions/cygstart.fish
 share/fish/completions/darcs.fish
 share/fish/completions/date.fish
 share/fish/completions/dconf.fish
@@ -175,7 +428,6 @@ share/fish/completions/doas.fish
 share/fish/completions/docker.fish
 share/fish/completions/dpkg-reconfigure.fish
 share/fish/completions/dpkg.fish
-share/fish/completions/dropbox.fish
 share/fish/completions/du.fish
 share/fish/completions/duply.fish
 share/fish/completions/dvipdf.fish
@@ -194,6 +446,7 @@ share/fish/completions/encfs.fish
 share/fish/completions/entr.fish
 share/fish/completions/env.fish
 share/fish/completions/eopkg.fish
+share/fish/completions/epkginfo.fish
 share/fish/completions/equery.fish
 share/fish/completions/eselect.fish
 share/fish/completions/etex.fish
@@ -206,6 +459,9 @@ share/fish/completions/expand.fish
 share/fish/completions/ezjail-admin.fish
 share/fish/completions/fab.fish
 share/fish/completions/feh.fish
+share/fish/completions/ffmpeg.fish
+share/fish/completions/ffplay.fish
+share/fish/completions/ffprobe.fish
 share/fish/completions/fg.fish
 share/fish/completions/fgrep.fish
 share/fish/completions/figlet.fish
@@ -216,7 +472,10 @@ share/fish/completions/fish_indent.fish
 share/fish/completions/flac.fish
 share/fish/completions/flatpak.fish
 share/fish/completions/fluxbox-remote.fish
+share/fish/completions/for.fish
 share/fish/completions/fossil.fish
+share/fish/completions/fsharpc.fish
+share/fish/completions/fsharpi.fish
 share/fish/completions/ftp.fish
 share/fish/completions/funced.fish
 share/fish/completions/funcsave.fish
@@ -224,6 +483,8 @@ share/fish/completions/function.fish
 share/fish/completions/functions.fish
 share/fish/completions/fuser.fish
 share/fish/completions/fusermount.fish
+share/fish/completions/fzf.fish
+share/fish/completions/g++.fish
 share/fish/completions/gcc.fish
 share/fish/completions/gdb.fish
 share/fish/completions/gem.fish
@@ -236,6 +497,8 @@ share/fish/completions/golint.fish
 share/fish/completions/gorename.fish
 share/fish/completions/gpasswd.fish
 share/fish/completions/gpg.fish
+share/fish/completions/gpg1.fish
+share/fish/completions/gpg2.fish
 share/fish/completions/gphoto2.fish
 share/fish/completions/gprof.fish
 share/fish/completions/gradle.fish
@@ -243,6 +506,7 @@ share/fish/completions/grep.fish
 share/fish/completions/groupadd.fish
 share/fish/completions/grub-file.fish
 share/fish/completions/grub-install.fish
+share/fish/completions/grub-mkrescue.fish
 share/fish/completions/grunt.fish
 share/fish/completions/gsettings.fish
 share/fish/completions/gunzip.fish
@@ -258,13 +522,16 @@ share/fish/completions/hg.fish
 share/fish/completions/highlight.fish
 share/fish/completions/history.fish
 share/fish/completions/hjson.fish
+share/fish/completions/hledger.fish
 share/fish/completions/htop.fish
 share/fish/completions/hugo.fish
+share/fish/completions/hwinfo.fish
 share/fish/completions/i3-msg.fish
 share/fish/completions/iconv.fish
 share/fish/completions/id.fish
 share/fish/completions/identify.fish
 share/fish/completions/iex.fish
+share/fish/completions/if.fish
 share/fish/completions/ifconfig.fish
 share/fish/completions/ifdata.fish
 share/fish/completions/ifdown.fish
@@ -274,6 +541,8 @@ share/fish/completions/invoke-rc.d.fish
 share/fish/completions/ip.fish
 share/fish/completions/ipset.fish
 share/fish/completions/iptables.fish
+share/fish/completions/irb.fish
+share/fish/completions/iw.fish
 share/fish/completions/j.fish
 share/fish/completions/jbake.fish
 share/fish/completions/jest.fish
@@ -281,8 +550,11 @@ share/fish/completions/jhipster.fish
 share/fish/completions/jobs.fish
 share/fish/completions/journalctl.fish
 share/fish/completions/jq.fish
+share/fish/completions/kak.fish
 share/fish/completions/kcmshell5.fish
 share/fish/completions/kdeconnect-cli.fish
+share/fish/completions/keepassxc-cli.fish
+share/fish/completions/keybase.fish
 share/fish/completions/kill.fish
 share/fish/completions/killall.fish
 share/fish/completions/kitchen.fish
@@ -300,6 +572,7 @@ share/fish/completions/ll.fish
 share/fish/completions/ln.fish
 share/fish/completions/localectl.fish
 share/fish/completions/locate.fish
+share/fish/completions/loginctl.fish
 share/fish/completions/logkeys.fish
 share/fish/completions/lp.fish
 share/fish/completions/lpadmin.fish
@@ -321,6 +594,9 @@ share/fish/completions/lualatex.fish
 share/fish/completions/lunchy.fish
 share/fish/completions/lxc.fish
 share/fish/completions/lxpanel.fish
+share/fish/completions/lz4.fish
+share/fish/completions/lz4c.fish
+share/fish/completions/lz4cat.fish
 share/fish/completions/m4.fish
 share/fish/completions/machinectl.fish
 share/fish/completions/magento.fish
@@ -329,6 +605,7 @@ share/fish/completions/makedepend.fish
 share/fish/completions/makensis.fish
 share/fish/completions/makepkg.fish
 share/fish/completions/man.fish
+share/fish/completions/mariner.fish
 share/fish/completions/math.fish
 share/fish/completions/mc.fish
 share/fish/completions/md5sum.fish
@@ -366,10 +643,11 @@ share/fish/completions/mv.fish
 share/fish/completions/mvn.fish
 share/fish/completions/namei.fish
 share/fish/completions/native2ascii.fish
+share/fish/completions/nc.fish
 share/fish/completions/ncdu.fish
-share/fish/completions/netcat.fish
 share/fish/completions/netctl-auto.fish
 share/fish/completions/netctl.fish
+share/fish/completions/nethack.fish
 share/fish/completions/networkctl.fish
 share/fish/completions/nextd.fish
 share/fish/completions/ngrok.fish
@@ -400,12 +678,12 @@ share/fish/completions/pacman-key.fish
 share/fish/completions/pacman.fish
 share/fish/completions/pacmatic.fish
 share/fish/completions/pacmd.fish
-share/fish/completions/pacsrv.fish
 share/fish/completions/pactl.fish
 share/fish/completions/pactree.fish
 share/fish/completions/pandoc.fish
 share/fish/completions/passwd.fish
 share/fish/completions/patch.fish
+share/fish/completions/patool.fish
 share/fish/completions/pbget.fish
 share/fish/completions/pdfelatex.fish
 share/fish/completions/pdfetex.fish
@@ -416,6 +694,7 @@ share/fish/completions/perl.fish
 share/fish/completions/pfctl.fish
 share/fish/completions/pftp.fish
 share/fish/completions/pgrep.fish
+share/fish/completions/phpunit.fish
 share/fish/completions/pine.fish
 share/fish/completions/ping.fish
 share/fish/completions/pinky.fish
@@ -434,6 +713,7 @@ share/fish/completions/pkginfo.fish
 share/fish/completions/pkgmk.fish
 share/fish/completions/pkgrm.fish
 share/fish/completions/pkill.fish
+share/fish/completions/plutil.fish
 share/fish/completions/poff.fish
 share/fish/completions/pon.fish
 share/fish/completions/port.fish
@@ -455,13 +735,14 @@ share/fish/completions/pygmentize.fish
 share/fish/completions/python.fish
 share/fish/completions/python2.fish
 share/fish/completions/python3.fish
+share/fish/completions/pzstd.fish
+share/fish/completions/qubes-gpg-client.fish
 share/fish/completions/quilt.fish
 share/fish/completions/random.fish
 share/fish/completions/ranger.fish
 share/fish/completions/rbenv.fish
 share/fish/completions/rc-service.fish
 share/fish/completions/rc-update.fish
-share/fish/completions/rc.d.fish
 share/fish/completions/rcctl.fish
 share/fish/completions/read.fish
 share/fish/completions/readlink.fish
@@ -469,8 +750,10 @@ share/fish/completions/realpath.fish
 share/fish/completions/reject.fish
 share/fish/completions/rejmerge.fish
 share/fish/completions/renice.fish
+share/fish/completions/resolvectl.fish
 share/fish/completions/return.fish
 share/fish/completions/rfkill.fish
+share/fish/completions/rg.fish
 share/fish/completions/rgrep.fish
 share/fish/completions/rm.fish
 share/fish/completions/rmdir.fish
@@ -481,6 +764,7 @@ share/fish/completions/rsync.fish
 share/fish/completions/ruby-build.fish
 share/fish/completions/ruby.fish
 share/fish/completions/rustc.fish
+share/fish/completions/rustup.fish
 share/fish/completions/s3cmd.fish
 share/fish/completions/sass-convert.fish
 share/fish/completions/sass.fish
@@ -500,6 +784,7 @@ share/fish/completions/set_color.fish
 share/fish/completions/setfacl.fish
 share/fish/completions/setsid.fish
 share/fish/completions/setxkbmap.fish
+share/fish/completions/sfdx.fish
 share/fish/completions/sha1sum.fish
 share/fish/completions/sha224sum.fish
 share/fish/completions/sha256sum.fish
@@ -508,6 +793,9 @@ share/fish/completions/sha512sum.fish
 share/fish/completions/signify.fish
 share/fish/completions/snap.fish
 share/fish/completions/sort.fish
+share/fish/completions/speedtest-cli.fish
+share/fish/completions/speedtest.fish
+share/fish/completions/src.fish
 share/fish/completions/ssh.fish
 share/fish/completions/sshfs.fish
 share/fish/completions/stack.fish
@@ -539,6 +827,7 @@ share/fish/completions/timeout.fish
 share/fish/completions/tmutil.fish
 share/fish/completions/tmux.fish
 share/fish/completions/tmuxinator.fish
+share/fish/completions/tokei.fish
 share/fish/completions/top.fish
 share/fish/completions/totem.fish
 share/fish/completions/touch.fish
@@ -547,6 +836,7 @@ share/fish/completions/transmission-remo
 share/fish/completions/trap.fish
 share/fish/completions/travis.fish
 share/fish/completions/tree.fish
+share/fish/completions/tsc.fish
 share/fish/completions/ttx.fish
 share/fish/completions/type.fish
 share/fish/completions/udisksctl.fish
@@ -556,8 +846,10 @@ share/fish/completions/umount.fish
 share/fish/completions/uname.fish
 share/fish/completions/unexpand.fish
 share/fish/completions/uniq.fish
+share/fish/completions/unlz4.fish
 share/fish/completions/unrar.fish
 share/fish/completions/unzip.fish
+share/fish/completions/unzstd.fish
 share/fish/completions/update-eix-remote.fish
 share/fish/completions/update-eix.fish
 share/fish/completions/useradd.fish
@@ -565,6 +857,7 @@ share/fish/completions/usermod.fish
 share/fish/completions/vagrant.fish
 share/fish/completions/valgrind.fish
 share/fish/completions/vared.fish
+share/fish/completions/vbc.fish
 share/fish/completions/vi.fish
 share/fish/completions/vim-addons.fish
 share/fish/completions/vim.fish
@@ -579,6 +872,7 @@ share/fish/completions/wesnoth.fish
 share/fish/completions/wget.fish
 share/fish/completions/whatis.fish
 share/fish/completions/which.fish
+share/fish/completions/while.fish
 share/fish/completions/who.fish
 share/fish/completions/wicd-cli.fish
 share/fish/completions/wicd-client.fish
@@ -608,22 +902,24 @@ share/fish/completions/yum.fish
 share/fish/completions/zcat.fish
 share/fish/completions/zfs.fish
 share/fish/completions/zip.fish
+share/fish/completions/zpaq.fish
 share/fish/completions/zpool.fish
+share/fish/completions/zstd.fish
+share/fish/completions/zstdcat.fish
+share/fish/completions/zstdgrep.fish
+share/fish/completions/zstdless.fish
+share/fish/completions/zstdmt.fish
 share/fish/completions/zypper.fish
 share/fish/config.fish
 share/fish/functions/N_.fish
 share/fish/functions/_.fish
 share/fish/functions/__fish_abbr_old.fish
+share/fish/functions/__fish_any_arg_in.fish
+share/fish/functions/__fish_anypython.fish
 share/fish/functions/__fish_append.fish
-share/fish/functions/__fish_bind_test1.fish
-share/fish/functions/__fish_bind_test2.fish
-share/fish/functions/__fish_can_complete_switches.fish
 share/fish/functions/__fish_cancel_commandline.fish
 share/fish/functions/__fish_clang_complete.fish
 share/fish/functions/__fish_commandline_is_singlequoted.fish
-share/fish/functions/__fish_commandline_test.fish
-share/fish/functions/__fish_complete_abook_formats.fish
-share/fish/functions/__fish_complete_ant_targets.fish
 share/fish/functions/__fish_complete_atool_archive_contents.fish
 share/fish/functions/__fish_complete_bittorrent.fish
 share/fish/functions/__fish_complete_blockdevice.fish
@@ -631,14 +927,16 @@ share/fish/functions/__fish_complete_cd.
 share/fish/functions/__fish_complete_command.fish
 share/fish/functions/__fish_complete_convert_options.fish
 share/fish/functions/__fish_complete_directories.fish
-share/fish/functions/__fish_complete_file_url.fish
+share/fish/functions/__fish_complete_external_command.fish
 share/fish/functions/__fish_complete_ftp.fish
+share/fish/functions/__fish_complete_gpg.fish
+share/fish/functions/__fish_complete_gpg_key_id.fish
+share/fish/functions/__fish_complete_gpg_user_id.fish
 share/fish/functions/__fish_complete_groups.fish
 share/fish/functions/__fish_complete_job_pids.fish
 share/fish/functions/__fish_complete_list.fish
 share/fish/functions/__fish_complete_lpr.fish
 share/fish/functions/__fish_complete_lpr_option.fish
-share/fish/functions/__fish_complete_lsusb.fish
 share/fish/functions/__fish_complete_man.fish
 share/fish/functions/__fish_complete_mount_opts.fish
 share/fish/functions/__fish_complete_path.fish
@@ -646,17 +944,11 @@ share/fish/functions/__fish_complete_pgr
 share/fish/functions/__fish_complete_pids.fish
 share/fish/functions/__fish_complete_ppp_peer.fish
 share/fish/functions/__fish_complete_proc.fish
-share/fish/functions/__fish_complete_setxkbmap.fish
 share/fish/functions/__fish_complete_ssh.fish
 share/fish/functions/__fish_complete_subcommand.fish
-share/fish/functions/__fish_complete_subcommand_root.fish
 share/fish/functions/__fish_complete_suffix.fish
-share/fish/functions/__fish_complete_svn_diff.fish
-share/fish/functions/__fish_complete_tar.fish
-share/fish/functions/__fish_complete_unrar.fish
 share/fish/functions/__fish_complete_user_at_hosts.fish
 share/fish/functions/__fish_complete_users.fish
-share/fish/functions/__fish_complete_wvdial_peers.fish
 share/fish/functions/__fish_complete_zfs_mountpoint_properties.fish
 share/fish/functions/__fish_complete_zfs_pools.fish
 share/fish/functions/__fish_complete_zfs_ro_properties.fish
@@ -669,7 +961,6 @@ share/fish/functions/__fish_cursor_1337.
 share/fish/functions/__fish_cursor_konsole.fish
 share/fish/functions/__fish_cursor_xterm.fish
 share/fish/functions/__fish_describe_command.fish
-share/fish/functions/__fish_filter_ant_targets.fish
 share/fish/functions/__fish_first_token.fish
 share/fish/functions/__fish_git_prompt.fish
 share/fish/functions/__fish_gnu_complete.fish
@@ -689,75 +980,57 @@ share/fish/functions/__fish_not_contain_
 share/fish/functions/__fish_number_of_cmd_args_wo_opts.fish
 share/fish/functions/__fish_paginate.fish
 share/fish/functions/__fish_parent_directories.fish
-share/fish/functions/__fish_parse_configure.fish
+share/fish/functions/__fish_pipestatus_with_signal.fish
 share/fish/functions/__fish_portage_print_available_pkgs.fish
 share/fish/functions/__fish_portage_print_installed_pkgs.fish
-share/fish/functions/__fish_portage_print_repository_names.fish
 share/fish/functions/__fish_portage_print_repository_paths.fish
-share/fish/functions/__fish_ports_dirs.fish
+share/fish/functions/__fish_prepend_sudo.fish
 share/fish/functions/__fish_prev_arg_in.fish
 share/fish/functions/__fish_print_VBox_vms.fish
-share/fish/functions/__fish_print_abook_emails.fish
 share/fish/functions/__fish_print_addresses.fish
-share/fish/functions/__fish_print_arch_daemons.fish
 share/fish/functions/__fish_print_cmd_args.fish
 share/fish/functions/__fish_print_cmd_args_without_options.fish
 share/fish/functions/__fish_print_commands.fish
 share/fish/functions/__fish_print_debian_apache_confs.fish
 share/fish/functions/__fish_print_debian_apache_mods.fish
 share/fish/functions/__fish_print_debian_apache_sites.fish
-share/fish/functions/__fish_print_debian_services.fish
 share/fish/functions/__fish_print_encodings.fish
 share/fish/functions/__fish_print_filesystems.fish
-share/fish/functions/__fish_print_function_prototypes.fish
+share/fish/functions/__fish_print_gpg_algo.fish
 share/fish/functions/__fish_print_groups.fish
 share/fish/functions/__fish_print_help.fish
 share/fish/functions/__fish_print_hostnames.fish
 share/fish/functions/__fish_print_interfaces.fish
 share/fish/functions/__fish_print_lpr_options.fish
 share/fish/functions/__fish_print_lpr_printers.fish
-share/fish/functions/__fish_print_lsblk_columns.fish
-share/fish/functions/__fish_print_make_targets.fish
 share/fish/functions/__fish_print_modules.fish
 share/fish/functions/__fish_print_mounted.fish
-share/fish/functions/__fish_print_ninja_targets.fish
-share/fish/functions/__fish_print_ninja_tools.fish
 share/fish/functions/__fish_print_packages.fish
 share/fish/functions/__fish_print_pacman_repos.fish
+share/fish/functions/__fish_print_pipestatus.fish
 share/fish/functions/__fish_print_service_names.fish
 share/fish/functions/__fish_print_svn_rev.fish
 share/fish/functions/__fish_print_users.fish
 share/fish/functions/__fish_print_xdg_applications_directories.fish
-share/fish/functions/__fish_print_xdg_desktop_file_ids.fish
 share/fish/functions/__fish_print_xdg_mimetypes.fish
-share/fish/functions/__fish_print_xrandr_modes.fish
-share/fish/functions/__fish_print_xrandr_outputs.fish
 share/fish/functions/__fish_print_xwindows.fish
-share/fish/functions/__fish_print_zfs_bookmarks.fish
-share/fish/functions/__fish_print_zfs_filesystems.fish
 share/fish/functions/__fish_print_zfs_snapshots.fish
-share/fish/functions/__fish_print_zfs_volumes.fish
-share/fish/functions/__fish_prt_no_subcommand.fish
-share/fish/functions/__fish_prt_packages.fish
-share/fish/functions/__fish_prt_ports.fish
-share/fish/functions/__fish_prt_use_package.fish
-share/fish/functions/__fish_prt_use_port.fish
 share/fish/functions/__fish_pwd.fish
 share/fish/functions/__fish_seen_argument.fish
 share/fish/functions/__fish_seen_subcommand_from.fish
 share/fish/functions/__fish_set_locale.fish
-share/fish/functions/__fish_sgrep.fish
 share/fish/functions/__fish_shared_key_bindings.fish
 share/fish/functions/__fish_should_complete_switches.fish
+share/fish/functions/__fish_status_to_signal.fish
 share/fish/functions/__fish_svn_prompt.fish
 share/fish/functions/__fish_systemctl_services.fish
 share/fish/functions/__fish_systemd_machine_images.fish
 share/fish/functions/__fish_systemd_machines.fish
-share/fish/functions/__fish_test_arg.fish
 share/fish/functions/__fish_toggle_comment_commandline.fish
 share/fish/functions/__fish_use_subcommand.fish
 share/fish/functions/__fish_vcs_prompt.fish
 share/fish/functions/__fish_whatis.fish
+share/fish/functions/__fish_whatis_current_token.fish
 share/fish/functions/__terlar_git_prompt.fish
 share/fish/functions/_fish_systemctl.fish
 share/fish/functions/_validate_int.fish
@@ -771,7 +1044,6 @@ share/fish/functions/dirh.fish
 share/fish/functions/dirs.fish
 share/fish/functions/down-or-search.fish
 share/fish/functions/edit_command_buffer.fish
-share/fish/functions/eval.fish
 share/fish/functions/export.fish
 share/fish/functions/fish_breakpoint_prompt.fish
 share/fish/functions/fish_clipboard_copy.fish
@@ -779,20 +1051,24 @@ share/fish/functions/fish_clipboard_past
 share/fish/functions/fish_config.fish
 share/fish/functions/fish_default_key_bindings.fish
 share/fish/functions/fish_default_mode_prompt.fish
-share/fish/functions/fish_fallback_prompt.fish
+share/fish/functions/fish_git_prompt.fish
+share/fish/functions/fish_hg_prompt.fish
 share/fish/functions/fish_hybrid_key_bindings.fish
 share/fish/functions/fish_indent.fish
 share/fish/functions/fish_key_reader.fish
 share/fish/functions/fish_md5.fish
 share/fish/functions/fish_mode_prompt.fish
+share/fish/functions/fish_npm_helper.fish
 share/fish/functions/fish_opt.fish
+share/fish/functions/fish_print_git_action.fish
 share/fish/functions/fish_print_hg_root.fish
 share/fish/functions/fish_prompt.fish
+share/fish/functions/fish_svn_prompt.fish
 share/fish/functions/fish_title.fish
 share/fish/functions/fish_update_completions.fish
+share/fish/functions/fish_vcs_prompt.fish
 share/fish/functions/fish_vi_cursor.fish
 share/fish/functions/fish_vi_key_bindings.fish
-share/fish/functions/fish_vi_mode.fish
 share/fish/functions/funced.fish
 share/fish/functions/funcsave.fish
 share/fish/functions/grep.fish
@@ -817,7 +1093,6 @@ share/fish/functions/pushd.fish
 share/fish/functions/realpath.fish
 share/fish/functions/seq.fish
 share/fish/functions/setenv.fish
-share/fish/functions/string.fish
 share/fish/functions/suspend.fish
 share/fish/functions/trap.fish
 share/fish/functions/type.fish
@@ -826,91 +1101,113 @@ share/fish/functions/up-or-search.fish
 share/fish/functions/vared.fish
 share/fish/groff/fish.tmac
 share/fish/lynx.lss
-${PLIST.doc}share/fish/man/man1/abbr.1
-${PLIST.doc}share/fish/man/man1/alias.1
-${PLIST.doc}share/fish/man/man1/and.1
-${PLIST.doc}share/fish/man/man1/argparse.1
-${PLIST.doc}share/fish/man/man1/begin.1
-${PLIST.doc}share/fish/man/man1/bg.1
-${PLIST.doc}share/fish/man/man1/bind.1
-${PLIST.doc}share/fish/man/man1/block.1
-${PLIST.doc}share/fish/man/man1/break.1
-${PLIST.doc}share/fish/man/man1/breakpoint.1
-${PLIST.doc}share/fish/man/man1/builtin.1
-${PLIST.doc}share/fish/man/man1/case.1
-${PLIST.doc}share/fish/man/man1/cd.1
-${PLIST.doc}share/fish/man/man1/cdh.1
-${PLIST.doc}share/fish/man/man1/command.1
-${PLIST.doc}share/fish/man/man1/commandline.1
-${PLIST.doc}share/fish/man/man1/complete.1
-${PLIST.doc}share/fish/man/man1/contains.1
-${PLIST.doc}share/fish/man/man1/continue.1
-${PLIST.doc}share/fish/man/man1/count.1
-${PLIST.doc}share/fish/man/man1/dirh.1
-${PLIST.doc}share/fish/man/man1/dirs.1
-${PLIST.doc}share/fish/man/man1/disown.1
-${PLIST.doc}share/fish/man/man1/echo.1
-${PLIST.doc}share/fish/man/man1/else.1
-${PLIST.doc}share/fish/man/man1/emit.1
-${PLIST.doc}share/fish/man/man1/end.1
-${PLIST.doc}share/fish/man/man1/eval.1
-${PLIST.doc}share/fish/man/man1/exec.1
-${PLIST.doc}share/fish/man/man1/exit.1
-${PLIST.doc}share/fish/man/man1/false.1
-${PLIST.doc}share/fish/man/man1/fg.1
-${PLIST.doc}share/fish/man/man1/fish.1
-${PLIST.doc}share/fish/man/man1/fish_breakpoint_prompt.1
-${PLIST.doc}share/fish/man/man1/fish_config.1
-${PLIST.doc}share/fish/man/man1/fish_indent.1
-${PLIST.doc}share/fish/man/man1/fish_key_reader.1
-${PLIST.doc}share/fish/man/man1/fish_mode_prompt.1
-${PLIST.doc}share/fish/man/man1/fish_opt.1
-${PLIST.doc}share/fish/man/man1/fish_prompt.1
-${PLIST.doc}share/fish/man/man1/fish_right_prompt.1
-${PLIST.doc}share/fish/man/man1/fish_update_completions.1
-${PLIST.doc}share/fish/man/man1/fish_vi_mode.1
-${PLIST.doc}share/fish/man/man1/for.1
-${PLIST.doc}share/fish/man/man1/funced.1
-${PLIST.doc}share/fish/man/man1/funcsave.1
-${PLIST.doc}share/fish/man/man1/function.1
-${PLIST.doc}share/fish/man/man1/functions.1
-${PLIST.doc}share/fish/man/man1/help.1
-${PLIST.doc}share/fish/man/man1/history.1
-${PLIST.doc}share/fish/man/man1/if.1
-${PLIST.doc}share/fish/man/man1/isatty.1
-${PLIST.doc}share/fish/man/man1/jobs.1
-${PLIST.doc}share/fish/man/man1/math.1
-${PLIST.doc}share/fish/man/man1/nextd.1
-${PLIST.doc}share/fish/man/man1/not.1
-${PLIST.doc}${PLIST.open}share/fish/man/man1/open.1
-${PLIST.doc}share/fish/man/man1/or.1
-${PLIST.doc}share/fish/man/man1/popd.1
-${PLIST.doc}share/fish/man/man1/prevd.1
-${PLIST.doc}share/fish/man/man1/printf.1
-${PLIST.doc}share/fish/man/man1/prompt_pwd.1
-${PLIST.doc}share/fish/man/man1/psub.1
-${PLIST.doc}share/fish/man/man1/pushd.1
-${PLIST.doc}share/fish/man/man1/pwd.1
-${PLIST.doc}share/fish/man/man1/random.1
-${PLIST.doc}share/fish/man/man1/read.1
-${PLIST.doc}share/fish/man/man1/realpath.1
-${PLIST.doc}share/fish/man/man1/return.1
-${PLIST.doc}share/fish/man/man1/set.1
-${PLIST.doc}share/fish/man/man1/set_color.1
-${PLIST.doc}share/fish/man/man1/source.1
-${PLIST.doc}share/fish/man/man1/status.1
-${PLIST.doc}share/fish/man/man1/string.1
-${PLIST.doc}share/fish/man/man1/suspend.1
-${PLIST.doc}share/fish/man/man1/switch.1
-${PLIST.doc}share/fish/man/man1/test.1
-${PLIST.doc}share/fish/man/man1/trap.1
-${PLIST.doc}share/fish/man/man1/true.1
-${PLIST.doc}share/fish/man/man1/type.1
-${PLIST.doc}share/fish/man/man1/ulimit.1
-${PLIST.doc}share/fish/man/man1/umask.1
-${PLIST.doc}share/fish/man/man1/vared.1
-${PLIST.doc}share/fish/man/man1/wait.1
-${PLIST.doc}share/fish/man/man1/while.1
+share/fish/man/man1/abbr.1
+share/fish/man/man1/alias.1
+share/fish/man/man1/and.1
+share/fish/man/man1/argparse.1
+share/fish/man/man1/begin.1
+share/fish/man/man1/bg.1
+share/fish/man/man1/bind.1
+share/fish/man/man1/block.1
+share/fish/man/man1/break.1
+share/fish/man/man1/breakpoint.1
+share/fish/man/man1/builtin.1
+share/fish/man/man1/case.1
+share/fish/man/man1/cd.1
+share/fish/man/man1/cdh.1
+share/fish/man/man1/command.1
+share/fish/man/man1/commandline.1
+share/fish/man/man1/complete.1
+share/fish/man/man1/contains.1
+share/fish/man/man1/continue.1
+share/fish/man/man1/count.1
+share/fish/man/man1/dirh.1
+share/fish/man/man1/dirs.1
+share/fish/man/man1/disown.1
+share/fish/man/man1/echo.1
+share/fish/man/man1/else.1
+share/fish/man/man1/emit.1
+share/fish/man/man1/end.1
+share/fish/man/man1/eval.1
+share/fish/man/man1/exec.1
+share/fish/man/man1/exit.1
+share/fish/man/man1/false.1
+share/fish/man/man1/fg.1
+share/fish/man/man1/fish-doc.1
+share/fish/man/man1/fish-faq.1
+share/fish/man/man1/fish-tutorial.1
+share/fish/man/man1/fish.1
+share/fish/man/man1/fish_breakpoint_prompt.1
+share/fish/man/man1/fish_config.1
+share/fish/man/man1/fish_git_prompt.1
+share/fish/man/man1/fish_hg_prompt.1
+share/fish/man/man1/fish_indent.1
+share/fish/man/man1/fish_key_reader.1
+share/fish/man/man1/fish_mode_prompt.1
+share/fish/man/man1/fish_opt.1
+share/fish/man/man1/fish_prompt.1
+share/fish/man/man1/fish_right_prompt.1
+share/fish/man/man1/fish_svn_prompt.1
+share/fish/man/man1/fish_update_completions.1
+share/fish/man/man1/fish_vcs_prompt.1
+share/fish/man/man1/for.1
+share/fish/man/man1/funced.1
+share/fish/man/man1/funcsave.1
+share/fish/man/man1/function.1
+share/fish/man/man1/functions.1
+share/fish/man/man1/help.1
+share/fish/man/man1/history.1
+share/fish/man/man1/if.1
+share/fish/man/man1/isatty.1
+share/fish/man/man1/jobs.1
+share/fish/man/man1/math.1
+share/fish/man/man1/nextd.1
+share/fish/man/man1/not.1
+share/fish/man/man1/or.1
+${PLIST.open}share/fish/man/man1/open.1
+share/fish/man/man1/popd.1
+share/fish/man/man1/prevd.1
+share/fish/man/man1/printf.1
+share/fish/man/man1/prompt_pwd.1
+share/fish/man/man1/psub.1
+share/fish/man/man1/pushd.1
+share/fish/man/man1/pwd.1
+share/fish/man/man1/random.1
+share/fish/man/man1/read.1
+${PLIST.realpath}share/fish/man/man1/realpath.1
+share/fish/man/man1/return.1
+share/fish/man/man1/set.1
+share/fish/man/man1/set_color.1
+share/fish/man/man1/source.1
+share/fish/man/man1/status.1
+share/fish/man/man1/string-collect.1
+share/fish/man/man1/string-escape.1
+share/fish/man/man1/string-join.1
+share/fish/man/man1/string-join0.1
+share/fish/man/man1/string-length.1
+share/fish/man/man1/string-lower.1
+share/fish/man/man1/string-match.1
+share/fish/man/man1/string-repeat.1
+share/fish/man/man1/string-replace.1
+share/fish/man/man1/string-split.1
+share/fish/man/man1/string-split0.1
+share/fish/man/man1/string-sub.1
+share/fish/man/man1/string-trim.1
+share/fish/man/man1/string-unescape.1
+share/fish/man/man1/string-upper.1
+share/fish/man/man1/string.1
+share/fish/man/man1/suspend.1
+share/fish/man/man1/switch.1
+share/fish/man/man1/test.1
+share/fish/man/man1/time.1
+share/fish/man/man1/trap.1
+share/fish/man/man1/true.1
+share/fish/man/man1/type.1
+share/fish/man/man1/ulimit.1
+share/fish/man/man1/umask.1
+share/fish/man/man1/vared.1
+share/fish/man/man1/wait.1
+share/fish/man/man1/while.1
 share/fish/tools/create_manpage_completions.py
 share/fish/tools/deroff.py
 share/fish/tools/web_config/delete.png
@@ -960,6 +1257,6 @@ share/pkgconfig/fish.pc
 @pkgdir share/fish/vendor_functions.d
 @pkgdir share/fish/vendor_conf.d
 @pkgdir share/fish/vendor_completions.d
-@pkgdir share/examples/fish/functions
-@pkgdir share/examples/fish/conf.d
-@pkgdir share/examples/fish/completions
+@pkgdir etc/fish/functions
+@pkgdir etc/fish/conf.d
+@pkgdir etc/fish/completions

Index: pkgsrc/shells/fish/distinfo
diff -u pkgsrc/shells/fish/distinfo:1.15 pkgsrc/shells/fish/distinfo:1.16
--- pkgsrc/shells/fish/distinfo:1.15    Sat Nov  9 12:02:29 2019
+++ pkgsrc/shells/fish/distinfo Tue Feb 18 22:00:49 2020
@@ -1,16 +1,11 @@
-$NetBSD: distinfo,v 1.15 2019/11/09 12:02:29 nia Exp $
+$NetBSD: distinfo,v 1.16 2020/02/18 22:00:49 maya Exp $
 
-SHA1 (fish-3.0.2.tar.gz) = cfd7f12e671be3b49070adc360c22873c8288d1d
-RMD160 (fish-3.0.2.tar.gz) = 95ec9e8ed70c07dd2cb057c127a1a98e2bb78036
-SHA512 (fish-3.0.2.tar.gz) = d3a24f85d4ada891ec4f6b14733edb236ae67f34868b0c9115fa5ebae99202a747ee9aeec7c6b04702f9a608019d5964b9cdc9abc4e3edfd7aaa9335093d8881
-Size (fish-3.0.2.tar.gz) = 6229935 bytes
-SHA1 (patch-Makefile.in) = 279d0a77ae52470150f4293a10c26e269fd25cee
-SHA1 (patch-configure.ac) = 05bad922ce93d5624f8c98a210e473ad702fbe8d
-SHA1 (patch-share_functions_man.fish) = c31cf77efe66a26d24f31ae005838799bb70746e
-SHA1 (patch-src_builtin.cpp) = b48a52d45ba545a92043e58dc554305670c7fcfc
-SHA1 (patch-src_fallback.cpp) = b6da274e326caa1f4c503874411dd1b1db224374
-SHA1 (patch-src_fallback.h) = e58b29135404211b841232d68e76facdfecc653b
-SHA1 (patch-src_output.cpp) = 1a05bc3db70f2ecf60789fe8972db37db7ae0b90
-SHA1 (patch-src_output.h) = 6d6266ea19436c3f24b8e097dfa36591a790b718
-SHA1 (patch-src_screen.cpp) = d0a60ff4e868383ebd086bc4bc724237c13f05ed
-SHA1 (patch-src_wutil.cpp) = b391552d02b8130070ddcdab7fb1c874a641b922
+SHA1 (fish-3.1.0.tar.gz) = ff863d58bcd5151f1235f8adaacebc2564f11fd4
+RMD160 (fish-3.1.0.tar.gz) = 75fbb9270035b6f172d3b1d7781430eb1e638c83
+SHA512 (fish-3.1.0.tar.gz) = 143e462b5329790fa9834e135109e1397c3525756a0209d0ec68a53f7d2a1f581cd45fbbdcde6a5b53dff447da18ed6a62277993d851e7b18ef7f1a6b6d49cff
+Size (fish-3.1.0.tar.gz) = 6810953 bytes
+SHA1 (patch-cmake_ConfigureChecks.cmake) = f673d726b42a60adff60b7e53783a1a2d0e76394
+SHA1 (patch-config__cmake.h.in) = 0d522168dceebb60a0e759df3e2b39595f64d156
+SHA1 (patch-src_common.cpp) = 130e632f41db5974aeec657f0830079b8d9c28ef
+SHA1 (patch-src_fallback.cpp) = 021d454b12e1b9ac45b5820236e5b0742f25e20d
+SHA1 (patch-src_wutil.cpp) = f016ef23b3e3ad7937e944bf341cc6ce0a3f0257

Index: pkgsrc/shells/fish/patches/patch-src_fallback.cpp
diff -u pkgsrc/shells/fish/patches/patch-src_fallback.cpp:1.2 pkgsrc/shells/fish/patches/patch-src_fallback.cpp:1.3
--- pkgsrc/shells/fish/patches/patch-src_fallback.cpp:1.2       Tue Feb 12 16:49:31 2019
+++ pkgsrc/shells/fish/patches/patch-src_fallback.cpp   Tue Feb 18 22:00:49 2020
@@ -1,15 +1,17 @@
-$NetBSD: patch-src_fallback.cpp,v 1.2 2019/02/12 16:49:31 maya Exp $
+$NetBSD: patch-src_fallback.cpp,v 1.3 2020/02/18 22:00:49 maya Exp $
 
 constify, for clang
 
---- src/fallback.cpp.orig      2018-12-28 13:01:03.000000000 +0000
+--- src/fallback.cpp.orig      2020-02-12 14:04:07.000000000 +0000
 +++ src/fallback.cpp
-@@ -46,7 +46,7 @@
- #ifdef TPARM_SOLARIS_KLUDGE
+@@ -47,8 +47,8 @@
+ #if defined(TPARM_SOLARIS_KLUDGE)
  #undef tparm
  
--char *tparm_solaris_kludge(char *str, long p1, long p2, long p3, long p4,
+-char *tparm_solaris_kludge(char *str, long p1, long p2, long p3, long p4, long p5, long p6, long p7,
+-                           long p8, long p9) {
 +char *tparm_solaris_kludge(const char *str, long p1, long p2, long p3, long p4,
-                            long p5, long p6, long p7, long p8, long p9) {
++                           long p5, long p6, long p7, long p8, long p9) {
      return tparm(str, p1, p2, p3, p4, p5, p6, p7, p8, p9);
  }
+ 

Index: pkgsrc/shells/fish/patches/patch-src_wutil.cpp
diff -u pkgsrc/shells/fish/patches/patch-src_wutil.cpp:1.3 pkgsrc/shells/fish/patches/patch-src_wutil.cpp:1.4
--- pkgsrc/shells/fish/patches/patch-src_wutil.cpp:1.3  Tue Feb 12 16:49:31 2019
+++ pkgsrc/shells/fish/patches/patch-src_wutil.cpp      Tue Feb 18 22:00:49 2020
@@ -1,17 +1,15 @@
-$NetBSD: patch-src_wutil.cpp,v 1.3 2019/02/12 16:49:31 maya Exp $
+$NetBSD: patch-src_wutil.cpp,v 1.4 2020/02/18 22:00:49 maya Exp $
 
 fstatfs appears to be linux-specific, let's not try it on non-linux
 
---- src/wutil.cpp.orig 2018-12-28 13:01:03.000000000 +0000
+--- src/wutil.cpp.orig 2020-02-12 14:04:07.000000000 +0000
 +++ src/wutil.cpp
-@@ -311,10 +311,6 @@ int fd_check_is_remote(int fd) {
-             // Other FSes are assumed local.
-             return 0;
-     }
+@@ -320,7 +320,7 @@ int fd_check_is_remote(int fd) {
+     struct statvfs buf {};
+     if (fstatvfs(fd, &buf) < 0) return -1;
+     return (buf.f_flag & ST_LOCAL) ? 0 : 1;
 -#elif defined(MNT_LOCAL)
--    struct statfs buf {};
--    if (fstatfs(fd, &buf) < 0) return -1;
--    return (buf.f_flags & MNT_LOCAL) ? 0 : 1;
- #else
-     return -1;
- #endif
++#elif defined(MNT_LOCAL) && defined(__linux__)
+     struct statfs buf {};
+     if (fstatfs(fd, &buf) < 0) return -1;
+     return (buf.f_flags & MNT_LOCAL) ? 0 : 1;

Added files:

Index: pkgsrc/shells/fish/patches/patch-cmake_ConfigureChecks.cmake
diff -u /dev/null pkgsrc/shells/fish/patches/patch-cmake_ConfigureChecks.cmake:1.1
--- /dev/null   Tue Feb 18 22:00:49 2020
+++ pkgsrc/shells/fish/patches/patch-cmake_ConfigureChecks.cmake        Tue Feb 18 22:00:49 2020
@@ -0,0 +1,48 @@
+$NetBSD: patch-cmake_ConfigureChecks.cmake,v 1.1 2020/02/18 22:00:49 maya Exp $
+
+put #define TPARM_VARARGS to get the varargs tparm.
+(For netbsd curses)
+
+Simply variadic tparm logic, and make sure it doesn't consider the
+"solaris (curses) kludge" necessary on netbsd.
+
+--- cmake/ConfigureChecks.cmake.orig   2020-02-12 14:04:07.000000000 +0000
++++ cmake/ConfigureChecks.cmake
+@@ -158,25 +158,26 @@ int main () {
+ "
+   TPARM_TAKES_VARARGS
+ )
+-IF(NOT TPARM_TAKES_VARARGS)
+-  CHECK_CXX_SOURCE_COMPILES("
+-${TPARM_INCLUDES}
++
++CHECK_CXX_SOURCE_COMPILES("
+ #define TPARM_VARARGS
++${TPARM_INCLUDES}
+ 
+ int main () {
+   tparm( \"\" );
+ }
+ "
+-    TPARM_TAKES_VARARGS_WITH_VARARGS
+-    )
+-  IF(NOT TPARM_TAKES_VARARGS)
+-    SET(TPARM_SOLARIS_KLUDGE 1)
+-  ELSE()
+-    SET(TPARM_VARARGS 1)
+-  ENDIF()
+-ENDIF()
++  TPARM_TAKES_VARARGS_WITH_VARARGS
++)
+ CMAKE_POP_CHECK_STATE()
+ 
++IF(TPARM_TAKES_VARARGS)
++ELSEIF(TPARM_TAKES_VARARGS_WITH_VARARGS)
++  SET(TPARM_VARARGS 1)
++ELSE()
++  SET(TPARM_SOLARIS_KLUDGE 1)
++ENDIF()
++
+ # Work around the fact that cmake does not propagate the language standard flag into
+ # the CHECK_CXX_SOURCE_COMPILES function. See CMake issue #16456.
+ # Ensure we do this after the FIND_PACKAGE calls which use C, and will error on a C++
Index: pkgsrc/shells/fish/patches/patch-config__cmake.h.in
diff -u /dev/null pkgsrc/shells/fish/patches/patch-config__cmake.h.in:1.1
--- /dev/null   Tue Feb 18 22:00:49 2020
+++ pkgsrc/shells/fish/patches/patch-config__cmake.h.in Tue Feb 18 22:00:49 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-config__cmake.h.in,v 1.1 2020/02/18 22:00:49 maya Exp $
+
+--- config_cmake.h.in.orig     2020-02-12 14:04:07.000000000 +0000
++++ config_cmake.h.in
+@@ -144,6 +144,9 @@
+ 
+ /* Define to the full name of this package. */
+ #define PACKAGE_NAME "fish"
++#
++/* Define to 1 if tparm accepts a fixed amount of parameters. */
++#cmakedefine TPARM_VARARGS 1
+ 
+ /* Define to 1 if tparm accepts a fixed amount of parameters. */
+ #cmakedefine TPARM_SOLARIS_KLUDGE 1
Index: pkgsrc/shells/fish/patches/patch-src_common.cpp
diff -u /dev/null pkgsrc/shells/fish/patches/patch-src_common.cpp:1.1
--- /dev/null   Tue Feb 18 22:00:49 2020
+++ pkgsrc/shells/fish/patches/patch-src_common.cpp     Tue Feb 18 22:00:49 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_common.cpp,v 1.1 2020/02/18 22:00:49 maya Exp $
+
+Cast to const char*, makes netbsd (const void* dli_saddr) happier.
+
+--- src/common.cpp.orig        2020-02-12 14:04:07.000000000 +0000
++++ src/common.cpp
+@@ -225,7 +225,7 @@ bool is_windows_subsystem_for_linux() {
+             swprintf(
+                 text, sizeof(text) / sizeof(wchar_t), L"%-3d %s + %td", i - skip_levels,
+                 status == 0 ? demangled : info.dli_sname == nullptr ? symbols[i] : info.dli_sname,
+-                static_cast<char *>(callstack[i]) - static_cast<char *>(info.dli_saddr));
++                static_cast<char *>(callstack[i]) - static_cast<const char *>(info.dli_saddr));
+             free(demangled);
+         } else {
+             swprintf(text, sizeof(text) / sizeof(wchar_t), L"%-3d %s", i - skip_levels, symbols[i]);