CVS commit: pkgsrc/shells/fish

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Feb 12 16:49:31 UTC 2019

Modified Files:
        pkgsrc/shells/fish: Makefile PLIST distinfo
        pkgsrc/shells/fish/patches: patch-Makefile.in patch-src_fallback.cpp
            patch-src_output.cpp patch-src_output.h patch-src_screen.cpp
Added Files:
        pkgsrc/shells/fish: options.mk
        pkgsrc/shells/fish/patches: patch-src_wutil.cpp

Log Message:
fish: update to 3.0.0

Add a "doc" option, default on, to avoid a doxygen dependency.
requested by martin & also in PR pkg/53934.

# fish 3.0.0 (released December 28, 2018)

fish 3 is a major release, which introduces some breaking changes alongside improved functionality. Although most existing scripts will continue to work, they should be reviewed against the list 
contained in the 3.0b1 release notes below.

Compared to the beta release of fish 3.0b1, fish version 3.0.0:

- builds correctly against musl libc (#5407)
- handles huge numeric arguments to `test` correctly (#5414)
- removes the history colouring introduced in 3.0b1, which did not always work correctly

There is one significant known issue which was not able to be corrected before the release:

- fish 3.0.0 builds on Cygwin (#5423), but does not run correctly (#5426) and will result in a hanging terminal when started. Cygwin users are encouraged to continue using 2.7.1 until a release which 
corrects this is available.

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

---

# fish 3.0b1 (released December 11, 2018)

fish 3 is a major release, which introduces some breaking changes alongside improved functionality. Although most existing scripts will continue to work, they should be reviewed against the list 
below.

## Notable non-backward compatible changes
-  Process and job expansion has largely been removed. `%` will no longer perform these expansions, except for `%self` for the PID of the current shell. Additionally, job management commands 
(`disown`, `wait`, `bg`, `fg` and `kill`) will expand job specifiers starting with `%` (#4230, #1202).
- `set x[1] x[2] a b`, to set multiple elements of an array at once, is no longer valid syntax (#4236).
- A literal `{}` now expands to itself, rather than nothing. This makes working with `find -exec` easier (#1109, #4632).
- Literally accessing a zero-index is now illegal syntax and is caught by the parser (#4862). (fish indices start at 1)
- Successive commas in brace expansions are handled in less surprising manner. For example, `{,,,}` expands to four empty strings rather than an empty string, a comma and an empty string again 
(#3002, #4632).
- `for` loop control variables are no longer local to the `for` block (#1935).
- Variables set in `if` and `while` conditions are available outside the block (#4820).
- Local exported (`set -lx`) vars are now visible to functions (#1091).
- The new `math` builtin (see below) does not support logical expressions; `test` should be used instead (#4777).
- Range expansion will now behave sensibly when given a single positive and negative index (`$foo[5..-1]` or `$foo[-1..5]`), clamping to the last valid index without changing direction if the list 
has fewer elements than expected.
- `read` now uses `-s` as short for `--silent` (à la `bash`); `--shell`'s abbreviation (formerly `-s`) is now `-S` instead (#4490).
- `cd` no longer resolves symlinks. fish now maintains a virtual path, matching other shells (#3350).
- `source` now requires an explicit `-` as the filename to read from the terminal (#2633).
- Arguments to `end` are now errors, instead of being silently ignored.
- The names `argparse`, `read`, `set`, `status`, `test` and `[` are now reserved and not allowed as function names. This prevents users unintentionally breaking stuff (#3000).
- The `fish_user_abbreviations` variable is no longer used; abbreviations will be migrated to the new storage format automatically.
- The `FISH_READ_BYTE_LIMIT` variable is now called `fish_byte_limit` (#4414).
- Environment variables are no longer split into arrays based on the record separator character on startup. Instead, variables are not split, unless their name ends in PATH, in which case they are 
split on colons (#436).
- The `history` builtin's `--with-time` option has been removed; this has been deprecated in favor of `--show-time` since 2.7.0 (#4403).
- The internal variables `__fish_datadir` and `__fish_sysconfdir` are now known as `__fish_data_dir` and `__fish_sysconf_dir` respectively.

## Deprecations

With the release of fish 3, a number of features have been marked for removal in the future. All users are encouraged to explore alternatives. A small number of these features are currently behind 
feature flags, which are turned on at present but may be turned off by default in the future.

A new feature flags mechanism is added for staging deprecations and breaking changes. Feature flags may be specified at launch with `fish --features ...` or by setting the universal `fish_features` 
variable. (#4940)

- The use of the `IFS` variable for `read` is deprecated; `IFS` will be ignored in the future (#4156). Use the `read --delimiter` option instead.
- The `function --on-process-exit` switch will be removed in future (#4700). Use the `fish_exit` event instead: `function --on-event fish_exit`.
- `$_` is deprecated and will removed in the future (#813). Use `status current-command` in a command substitution instead.
- `^` as a redirection deprecated and will be removed in the future. (#4394). Use `2>` to redirect stderr. This is controlled by the `stderr-nocaret` feature flag.
- `?` as a glob (wildcard) is deprecated and will be removed in the future (#4520). This is controlled by the `qmark-noglob` feature flag.

## Notable fixes and improvements
### Syntax changes and new commands
- fish now supports `&&` (like `and`), `||` (like `or`), and `!` (like `not`), for better migration from POSIX-compliant shells (#4620).
- Variables may be used as commands (#154).
- fish may be started in private mode via `fish --private`. Private mode fish sessions do not have access to the history file and any commands evaluated in private mode are not persisted for future 
sessions. A session variable `$fish_private_mode` can be queried to detect private mode and adjust the behavior of scripts accordingly to respect the user's wish for privacy.
- A new `wait` command for waiting on backgrounded processes (#4498).
- `math` is now a builtin rather than a wrapper around `bc` (#3157). Floating point computations is now used by default, and can be controlled with the new `--scale` option (#4478).
- Setting `$PATH` no longer warns on non-existent directories, allowing for a single $PATH to be shared across machines (eg via dotfiles) (#2969).
- `while` sets `$status` to a non-zero value if the loop is not executed (#4982).
- Command substitution output is now limited to 10 MB by default, controlled by the `fish_read_limit` variable (#3822). Notably, this is larger than most operating systems' argument size limit, so 
trying to pass argument lists this size to external commands has never worked.
- The machine hostname, where available, is now exposed as the `$hostname` reserved variable. This removes the dependency on the `hostname` executable (#4422).
- Bare `bind` invocations in config.fish now work. The `fish_user_key_bindings` function is no longer necessary, but will still be executed if it exists (#5191).
- `$fish_pid` and `$last_pid` are available as replacements for `%self` and `%last`.

### New features in commands
- `alias` has a new `--save` option to save the generated function immediately (#4878).
- `bind` has a new `--silent` option to ignore bind requests for named keys not available under the current terminal (#4188, #4431).
- `complete` has a new `--keep-order` option to show the provided or dynamically-generated argument list in the same order as specified, rather than alphabetically (#361).
- `exec` prompts for confirmation if background jobs are running.
- `funced` has a new `--save` option to automatically save the edited function after successfully editing (#4668).
- `functions` has a new ` --handlers` option to show functions registered as event handlers (#4694).
- `history search` supports globs for wildcard searching (#3136) and has a new `--reverse` option to show entries from oldest to newest (#4375).
- `jobs` has a new `--quiet` option to silence the output.
- `read` has a new `--delimiter` option for splitting input into arrays (#4256).
- `read` writes directly to stdout if called without arguments (#4407).
- `read` can now read individual lines into separate variables without consuming the input in its entirety via the new `/--line` option.
- `set` has new `--append` and `--prepend` options (#1326).
- `set` has a new `--show` option to show lots of information about variables (#4265).
- `string match` with an empty pattern and `--entire` in glob mode now matches everything instead of nothing (#4971).
- `string split` supports a new `--no-empty` option to exclude empty strings from the result (#4779).
- `string` has new subcommands `split0` and `join0` for working with NUL-delimited output.
- `string` no longer stops processing text after NUL characters (#4605)
- `string escape` has a new `--style regex` option for escaping strings to be matched literally in `string` regex operations.
- `test` now supports floating point values in numeric comparisons.

### Interactive improvements
- A pipe at the end of a line now allows the job to continue on the next line (#1285).
- Italics and dim support out of the box on macOS for Terminal.app and iTerm (#4436).
- `cd` tab completions no longer descend into the deepest unambiguous path (#4649).
- Pager navigation has been improved. Most notably, moving down now wraps around, moving up from the commandline now jumps to the last element and moving right and left now reverse each other even 
when wrapping around (#4680).
- Typing normal characters while the completion pager is active no longer shows the search field. Instead it enters them into the command line, and ends paging (#2249).
- A new input binding `pager-toggle-search` toggles the search field in the completions pager on and off. By default, this is bound to Ctrl-S.
- Searching in the pager now does a full fuzzy search (#5213).
- The pager will now show the full command instead of just its last line if the number of completions is large (#4702).
- Abbreviations can be tab-completed (#3233).
- Tildes in file names are now properly escaped in completions (#2274).
- Wrapping completions (from `complete --wraps` or `function --wraps`) can now inject arguments. For example, `complete gco --wraps 'git checkout'` now works properly (#1976). The `alias` function 
has been updated to respect this behavior.
- Path completions now support expansions, meaning expressions like `python ~/<TAB>` now provides file suggestions just like any other relative or absolute path. (This includes support for other 
expansions, too.)
- Autosuggestions try to avoid arguments that are already present in the command line.
- Notifications about crashed processes are now always shown, even in command substitutions (#4962).
- The screen is no longer reset after a BEL, fixing graphical glitches (#3693).
- vi-mode now supports ';' and ',' motions. This introduces new {forward,backward}-jump-till and repeat-jump{,-reverse} bind functions (#5140).
- The `*y` vi-mode binding now works (#5100).
- True color is now enabled in neovim by default (#2792).
- Terminal size variables (`$COLUMNS`/`$LINES`) are now updated before `fish_prompt` is called, allowing the prompt to react (#904).
- Multi-line prompts no longer repeat when the terminal is resized (#2320).
- `xclip` support has been added to the clipboard integration (#5020).
- The Alt-P keybinding paginates the last command if the command line is empty.
- `$cmd_duration` is no longer reset when no command is executed (#5011).
- Deleting a one-character word no longer erases the next word as well (#4747).
- Token history search (Alt-Up) omits duplicate entries (#4795).
- The `fish_escape_delay_ms` timeout, allowing the use of the escape key both on its own and as part of a control sequence, was applied to all control characters; this has been reduced to just the 
escape key.
- Completing a function shows the description properly (#5206).
- Added completions for
  - `ansible`, including `ansible-galaxy`, `ansible-playbook` and `ansible-vault` (#4697)
  - `bb-power` (#4800)
  - `bd` (#4472)
  - `bower`
  - `clang` and `clang++` (#4174)
  - `conda` (#4837)
  - `configure` (for autoconf-generated files only)
  - `curl`
  - `doas` (#5196)
  - `ebuild` (#4911)
  - `emaint` (#4758)
  - `eopkg` (#4600)
  - `exercism` (#4495)
  - `hjson`
  - `hugo` (#4529)
  - `j` (from autojump #4344)
  - `jbake` (#4814)
  - `jhipster` (#4472)
  - `kitty`
  - `kldload`
  - `kldunload`
  - `makensis` (#5242)
  - `meson`
  - `mkdocs` (#4906)
  - `ngrok` (#4642)
  - OpenBSD's `pkg_add`, `pkg_delete`, `pkg_info`, `pfctl`, `rcctl`, `signify`, and `vmctl` (#4584)
  - `openocd`
  - `optipng`
  - `opkg` (#5168)
  - `pandoc` (#2937)
  - `port` (#4737)
  - `powerpill` (#4800)
  - `pstack` (#5135)
  - `serve` (#5026)
  - `ttx`
  - `unzip`
  - `virsh` (#5113)
  - `xclip` (#5126)
  - `xsv`
  - `zfs` and `zpool` (#4608)
- Lots of improvements to completions (especially `darcs` (#5112), `git`, `hg` and `sudo`).
- Completions for `yarn` and `npm` now require the `all-the-package-names` NPM package for full functionality.
- Completions for `bower` and `yarn` now require the `jq` utility for full functionality.
- Improved French translations.

### Other fixes and improvements
- Significant performance improvements to `abbr` (#4048), setting variables (#4200, #4341), executing functions, globs (#4579), `string` reading from standard input (#4610), and slicing history (in 
particular, `$history[1]` for the last executed command).
- Fish's internal wcwidth function has been updated to deal with newer Unicode, and the width of some characters can be configured via the `fish_ambiguous_width` (#5149) and `fish_emoji_width` 
(#2652) variables. Alternatively, a new build-time option INTERNAL_WCWIDTH can be used to use the system's wcwidth instead (#4816).
- `functions` correctly supports `-d` as the short form of `--description`. (#5105)
- `/etc/paths` is now parsed like macOS' bash `path_helper`, fixing $PATH order (#4336, #4852) on macOS.
- Using a read-only variable in a `for` loop produces an error, rather than silently producing incorrect results (#4342).
- The universal variables filename no longer contains the hostname or MAC address. It is now at the fixed location `.config/fish/fish_variables` (#1912).
- Exported variables in the global or universal scope no longer have their exported status affected by local variables (#2611).
- Major rework of terminal and job handling to eliminate bugs (#3805, #3952, #4178, #4235, #4238, #4540, #4929, #5210).
- Improvements to the manual page completion generator (#2937, #4313).
- `suspend --force` now works correctly (#4672).
- Pressing Ctrl-C while running a script now reliably terminates fish (#5253).

### For distributors and developers
- fish ships with a new build system based on CMake. CMake 3.2 is the minimum required version. Although the autotools-based Makefile and the Xcode project are still shipped with this release, they 
will be removed in the near future. All distributors and developers are encouraged to migrate to the CMake build.
- Build scripts for most platforms no longer require bash, using the standard sh instead.
- The `hostname` command is no longer required for fish to operate.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/shells/fish/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/shells/fish/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/shells/fish/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/fish/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/shells/fish/patches/patch-Makefile.in
cvs rdiff -u -r1.1 -r1.2 pkgsrc/shells/fish/patches/patch-src_fallback.cpp
cvs rdiff -u -r1.2 -r1.3 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 -r0 -r1.3 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.17 pkgsrc/shells/fish/Makefile:1.18
--- pkgsrc/shells/fish/Makefile:1.17    Wed Jul 18 00:06:23 2018
+++ pkgsrc/shells/fish/Makefile Tue Feb 12 16:49:31 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2018/07/18 00:06:23 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2019/02/12 16:49:31 maya Exp $
 
-DISTNAME=              fish-2.7.1
+DISTNAME=              fish-3.0.0
 CATEGORIES=            shells
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=fish-shell/}
 GITHUB_PROJECT=                fish-shell
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=      --sysconfdir=${PKG_SYSC
 CONFIGURE_ARGS+=       --without-xsel
 USE_TOOLS+=            gmake autoreconf autoconf automake
 
-EGDIR=                 ${PREFIX}/share/examples/fish
+EGDIR=                 ${PREFIX}/share/examples
 INSTALL_ENV+=          EGDIR=${EGDIR}
 
 PKG_SHELL=             bin/fish
@@ -49,7 +49,7 @@ PLIST.open=   yes
 pre-configure:
        ${RUN} cd ${WRKSRC} && autoreconf -fiv
 
-BUILD_DEPENDS+=doxygen-[0-9]*:../../devel/doxygen
+.include "options.mk"
 
 .include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/shells/fish/PLIST
diff -u pkgsrc/shells/fish/PLIST:1.6 pkgsrc/shells/fish/PLIST:1.7
--- pkgsrc/shells/fish/PLIST:1.6        Sat Dec 30 05:35:54 2017
+++ pkgsrc/shells/fish/PLIST    Tue Feb 12 16:49:31 2019
@@ -1,19 +1,19 @@
-@comment $NetBSD: PLIST,v 1.6 2017/12/30 05:35:54 maya Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/02/12 16:49:31 maya Exp $
 bin/fish
 bin/fish_indent
 bin/fish_key_reader
-man/man1/fish.1
-man/man1/fish_indent.1
-man/man1/fish_key_reader.1
+${PLIST.doc}man/man1/fish.1
+${PLIST.doc}man/man1/fish_indent.1
+${PLIST.doc}man/man1/fish_key_reader.1
 share/doc/fish/CHANGELOG.md
-share/doc/fish/ascii_fish.png
-share/doc/fish/commands.html
-share/doc/fish/design.html
-share/doc/fish/faq.html
-share/doc/fish/index.html
-share/doc/fish/license.html
-share/doc/fish/tutorial.html
-share/doc/fish/user_doc.css
+${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/fish/__fish_build_paths.fish
 share/fish/completions/VBoxHeadless.fish
@@ -39,6 +39,10 @@ share/fish/completions/alsamixer.fish
 share/fish/completions/amixer.fish
 share/fish/completions/and.fish
 share/fish/completions/animate.fish
+share/fish/completions/ansible-galaxy.fish
+share/fish/completions/ansible-playbook.fish
+share/fish/completions/ansible-vault.fish
+share/fish/completions/ansible.fish
 share/fish/completions/ant.fish
 share/fish/completions/apack.fish
 share/fish/completions/apm.fish
@@ -84,11 +88,14 @@ share/fish/completions/aura.fish
 share/fish/completions/awk.fish
 share/fish/completions/badblocks.fish
 share/fish/completions/base64.fish
+share/fish/completions/bb-wrapper.fish
 share/fish/completions/bc.fish
+share/fish/completions/bd.fish
 share/fish/completions/bg.fish
 share/fish/completions/bind.fish
 share/fish/completions/bison.fish
 share/fish/completions/block.fish
+share/fish/completions/bower.fish
 share/fish/completions/break.fish
 share/fish/completions/brew.fish
 share/fish/completions/btdownloadcurses.py.fish
@@ -117,6 +124,8 @@ share/fish/completions/chgrp.fish
 share/fish/completions/chmod.fish
 share/fish/completions/chown.fish
 share/fish/completions/chsh.fish
+share/fish/completions/clang++.fish
+share/fish/completions/clang.fish
 share/fish/completions/climate.fish
 share/fish/completions/colordiff.fish
 share/fish/completions/colorsvn.fish
@@ -128,6 +137,7 @@ share/fish/completions/complete.fish
 share/fish/completions/composer.fish
 share/fish/completions/composer.phar.fish
 share/fish/completions/composite.fish
+share/fish/completions/conda.fish
 share/fish/completions/configure.fish
 share/fish/completions/conjure.fish
 share/fish/completions/connmanctl.fish
@@ -141,6 +151,7 @@ share/fish/completions/cupsaccept.fish
 share/fish/completions/cupsdisable.fish
 share/fish/completions/cupsenable.fish
 share/fish/completions/cupsreject.fish
+share/fish/completions/curl.fish
 share/fish/completions/cut.fish
 share/fish/completions/cvs.fish
 share/fish/completions/cygport.fish
@@ -160,6 +171,8 @@ share/fish/completions/djview4.fish
 share/fish/completions/dlocate.fish
 share/fish/completions/dmesg.fish
 share/fish/completions/dnf.fish
+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
@@ -167,6 +180,7 @@ share/fish/completions/du.fish
 share/fish/completions/duply.fish
 share/fish/completions/dvipdf.fish
 share/fish/completions/dvipdfm.fish
+share/fish/completions/ebuild.fish
 share/fish/completions/echo.fish
 share/fish/completions/egrep.fish
 share/fish/completions/eix-sync.fish
@@ -174,16 +188,19 @@ share/fish/completions/eix.fish
 share/fish/completions/elatex.fish
 share/fish/completions/elixir.fish
 share/fish/completions/emacs.fish
+share/fish/completions/emaint.fish
 share/fish/completions/emerge.fish
 share/fish/completions/encfs.fish
 share/fish/completions/entr.fish
 share/fish/completions/env.fish
+share/fish/completions/eopkg.fish
 share/fish/completions/equery.fish
 share/fish/completions/eselect.fish
 share/fish/completions/etex.fish
 share/fish/completions/eval.fish
 share/fish/completions/evince.fish
 share/fish/completions/exec.fish
+share/fish/completions/exercism.fish
 share/fish/completions/exit.fish
 share/fish/completions/expand.fish
 share/fish/completions/ezjail-admin.fish
@@ -240,7 +257,9 @@ share/fish/completions/heroku.fish
 share/fish/completions/hg.fish
 share/fish/completions/highlight.fish
 share/fish/completions/history.fish
+share/fish/completions/hjson.fish
 share/fish/completions/htop.fish
+share/fish/completions/hugo.fish
 share/fish/completions/i3-msg.fish
 share/fish/completions/iconv.fish
 share/fish/completions/id.fish
@@ -255,7 +274,10 @@ 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/j.fish
+share/fish/completions/jbake.fish
 share/fish/completions/jest.fish
+share/fish/completions/jhipster.fish
 share/fish/completions/jobs.fish
 share/fish/completions/journalctl.fish
 share/fish/completions/jq.fish
@@ -264,6 +286,9 @@ share/fish/completions/kdeconnect-cli.fi
 share/fish/completions/kill.fish
 share/fish/completions/killall.fish
 share/fish/completions/kitchen.fish
+share/fish/completions/kitty.fish
+share/fish/completions/kldload.fish
+share/fish/completions/kldunload.fish
 share/fish/completions/la.fish
 share/fish/completions/latex.fish
 share/fish/completions/latexmk.fish
@@ -301,8 +326,10 @@ share/fish/completions/machinectl.fish
 share/fish/completions/magento.fish
 share/fish/completions/make.fish
 share/fish/completions/makedepend.fish
+share/fish/completions/makensis.fish
 share/fish/completions/makepkg.fish
 share/fish/completions/man.fish
+share/fish/completions/math.fish
 share/fish/completions/mc.fish
 share/fish/completions/md5sum.fish
 share/fish/completions/mdadm.fish
@@ -312,9 +339,11 @@ share/fish/completions/mdfind.fish
 share/fish/completions/mdimport.fish
 share/fish/completions/mdls.fish
 share/fish/completions/mdutil.fish
+share/fish/completions/meson.fish
 share/fish/completions/minikube.fish
 share/fish/completions/mix.fish
 share/fish/completions/mkdir.fish
+share/fish/completions/mkdocs.fish
 share/fish/completions/mkdosfs.fish
 share/fish/completions/mkfs.fat.fish
 share/fish/completions/mkfs.vfat.fish
@@ -343,6 +372,7 @@ share/fish/completions/netctl-auto.fish
 share/fish/completions/netctl.fish
 share/fish/completions/networkctl.fish
 share/fish/completions/nextd.fish
+share/fish/completions/ngrok.fish
 share/fish/completions/nice.fish
 share/fish/completions/ninja.fish
 share/fish/completions/nl.fish
@@ -359,6 +389,9 @@ share/fish/completions/oggenc.fish
 share/fish/completions/omega.fish
 share/fish/completions/opam.fish
 share/fish/completions/open.fish
+share/fish/completions/openocd.fish
+share/fish/completions/opkg.fish
+share/fish/completions/optipng.fish
 share/fish/completions/or.fish
 share/fish/completions/p4.fish
 share/fish/completions/pacaur.fish
@@ -370,6 +403,7 @@ 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/pbget.fish
@@ -379,6 +413,7 @@ share/fish/completions/pdflatex.fish
 share/fish/completions/pdftex.fish
 share/fish/completions/pdftotext.fish
 share/fish/completions/perl.fish
+share/fish/completions/pfctl.fish
 share/fish/completions/pftp.fish
 share/fish/completions/pgrep.fish
 share/fish/completions/pine.fish
@@ -390,6 +425,9 @@ share/fish/completions/pip3.fish
 share/fish/completions/pipenv.fish
 share/fish/completions/pkg-config.fish
 share/fish/completions/pkg.fish
+share/fish/completions/pkg_add.fish
+share/fish/completions/pkg_delete.fish
+share/fish/completions/pkg_info.fish
 share/fish/completions/pkgadd.fish
 share/fish/completions/pkgfile.fish
 share/fish/completions/pkginfo.fish
@@ -398,14 +436,17 @@ share/fish/completions/pkgrm.fish
 share/fish/completions/pkill.fish
 share/fish/completions/poff.fish
 share/fish/completions/pon.fish
+share/fish/completions/port.fish
 share/fish/completions/portmaster.fish
 share/fish/completions/ports.fish
 share/fish/completions/poweroff.fish
+share/fish/completions/powerpill.fish
 share/fish/completions/prevd.fish
 share/fish/completions/prt-get.fish
 share/fish/completions/ps.fish
 share/fish/completions/ps2pdf.fish
 share/fish/completions/psql.fish
+share/fish/completions/pstack.fish
 share/fish/completions/psub.fish
 share/fish/completions/pushd.fish
 share/fish/completions/pv.fish
@@ -421,6 +462,7 @@ 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
 share/fish/completions/realpath.fish
@@ -451,6 +493,7 @@ share/fish/completions/scrot.fish
 share/fish/completions/scss.fish
 share/fish/completions/sed.fish
 share/fish/completions/seq.fish
+share/fish/completions/serve.fish
 share/fish/completions/service.fish
 share/fish/completions/set.fish
 share/fish/completions/set_color.fish
@@ -462,6 +505,7 @@ share/fish/completions/sha224sum.fish
 share/fish/completions/sha256sum.fish
 share/fish/completions/sha384sum.fish
 share/fish/completions/sha512sum.fish
+share/fish/completions/signify.fish
 share/fish/completions/snap.fish
 share/fish/completions/sort.fish
 share/fish/completions/ssh.fish
@@ -503,14 +547,17 @@ share/fish/completions/transmission-remo
 share/fish/completions/trap.fish
 share/fish/completions/travis.fish
 share/fish/completions/tree.fish
+share/fish/completions/ttx.fish
 share/fish/completions/type.fish
 share/fish/completions/udisksctl.fish
 share/fish/completions/ulimit.fish
+share/fish/completions/umask.fish
 share/fish/completions/umount.fish
 share/fish/completions/uname.fish
 share/fish/completions/unexpand.fish
 share/fish/completions/uniq.fish
 share/fish/completions/unrar.fish
+share/fish/completions/unzip.fish
 share/fish/completions/update-eix-remote.fish
 share/fish/completions/update-eix.fish
 share/fish/completions/useradd.fish
@@ -522,6 +569,8 @@ share/fish/completions/vi.fish
 share/fish/completions/vim-addons.fish
 share/fish/completions/vim.fish
 share/fish/completions/vimdiff.fish
+share/fish/completions/virsh.fish
+share/fish/completions/vmctl.fish
 share/fish/completions/w.fish
 share/fish/completions/wajig.fish
 share/fish/completions/watch.fish
@@ -537,6 +586,7 @@ share/fish/completions/wicd-gtk.fish
 share/fish/completions/wpa_cli.fish
 share/fish/completions/wvdial.fish
 share/fish/completions/xargs.fish
+share/fish/completions/xclip.fish
 share/fish/completions/xdg-mime.fish
 share/fish/completions/xdvi.fish
 share/fish/completions/xelatex.fish
@@ -548,6 +598,7 @@ share/fish/completions/xprop.fish
 share/fish/completions/xrandr.fish
 share/fish/completions/xrdb.fish
 share/fish/completions/xsel.fish
+share/fish/completions/xsv.fish
 share/fish/completions/xterm.fish
 share/fish/completions/xz.fish
 share/fish/completions/yaourt.fish
@@ -555,15 +606,20 @@ share/fish/completions/yarn.fish
 share/fish/completions/yast2.fish
 share/fish/completions/yum.fish
 share/fish/completions/zcat.fish
+share/fish/completions/zfs.fish
 share/fish/completions/zip.fish
+share/fish/completions/zpool.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_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
@@ -601,6 +657,11 @@ share/fish/functions/__fish_complete_unr
 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
+share/fish/functions/__fish_complete_zfs_rw_properties.fish
+share/fish/functions/__fish_complete_zfs_write_once_properties.fish
 share/fish/functions/__fish_config_interactive.fish
 share/fish/functions/__fish_contains_opt.fish
 share/fish/functions/__fish_crux_packages.fish
@@ -609,12 +670,16 @@ share/fish/functions/__fish_cursor_konso
 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
 share/fish/functions/__fish_hg_prompt.fish
+share/fish/functions/__fish_is_first_arg.fish
 share/fish/functions/__fish_is_first_token.fish
 share/fish/functions/__fish_is_git_repository.fish
+share/fish/functions/__fish_is_switch.fish
 share/fish/functions/__fish_is_token_n.fish
+share/fish/functions/__fish_is_zfs_feature_enabled.fish
 share/fish/functions/__fish_list_current_token.fish
 share/fish/functions/__fish_make_completion_signals.fish
 share/fish/functions/__fish_man_page.fish
@@ -623,7 +688,14 @@ share/fish/functions/__fish_no_arguments
 share/fish/functions/__fish_not_contain_opt.fish
 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_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_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
@@ -638,6 +710,7 @@ share/fish/functions/__fish_print_debian
 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_groups.fish
 share/fish/functions/__fish_print_help.fish
 share/fish/functions/__fish_print_hostnames.fish
 share/fish/functions/__fish_print_interfaces.fish
@@ -660,36 +733,33 @@ share/fish/functions/__fish_print_xdg_mi
 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_svn_prompt.fish
-share/fish/functions/__fish_systemctl_automounts.fish
-share/fish/functions/__fish_systemctl_devices.fish
-share/fish/functions/__fish_systemctl_mounts.fish
-share/fish/functions/__fish_systemctl_scopes.fish
-share/fish/functions/__fish_systemctl_service_paths.fish
 share/fish/functions/__fish_systemctl_services.fish
-share/fish/functions/__fish_systemctl_slices.fish
-share/fish/functions/__fish_systemctl_snapshots.fish
-share/fish/functions/__fish_systemctl_sockets.fish
-share/fish/functions/__fish_systemctl_swaps.fish
-share/fish/functions/__fish_systemctl_targets.fish
-share/fish/functions/__fish_systemctl_timers.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/__terlar_git_prompt.fish
+share/fish/functions/_fish_systemctl.fish
 share/fish/functions/_validate_int.fish
 share/fish/functions/abbr.fish
 share/fish/functions/alias.fish
@@ -716,7 +786,9 @@ share/fish/functions/fish_key_reader.fis
 share/fish/functions/fish_md5.fish
 share/fish/functions/fish_mode_prompt.fish
 share/fish/functions/fish_opt.fish
+share/fish/functions/fish_print_hg_root.fish
 share/fish/functions/fish_prompt.fish
+share/fish/functions/fish_title.fish
 share/fish/functions/fish_update_completions.fish
 share/fish/functions/fish_vi_cursor.fish
 share/fish/functions/fish_vi_key_bindings.fish
@@ -732,7 +804,6 @@ share/fish/functions/la.fish
 share/fish/functions/ll.fish
 share/fish/functions/ls.fish
 share/fish/functions/man.fish
-share/fish/functions/math.fish
 share/fish/functions/nextd-or-forward-word.fish
 share/fish/functions/nextd.fish
 share/fish/functions/open.fish
@@ -755,90 +826,91 @@ share/fish/functions/up-or-search.fish
 share/fish/functions/vared.fish
 share/fish/groff/fish.tmac
 share/fish/lynx.lss
-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.1
-share/fish/man/man1/fish_breakpoint_prompt.1
-share/fish/man/man1/fish_config.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_update_completions.1
-share/fish/man/man1/fish_vi_mode.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
-${PLIST.open}share/fish/man/man1/open.1
-share/fish/man/man1/or.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
-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.1
-share/fish/man/man1/suspend.1
-share/fish/man/man1/switch.1
-share/fish/man/man1/test.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/while.1
+${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/tools/create_manpage_completions.py
 share/fish/tools/deroff.py
 share/fish/tools/web_config/delete.png
@@ -874,7 +946,6 @@ share/fish/tools/web_config/sample_promp
 share/fish/tools/web_config/sample_prompts/screen_savvy.fish
 share/fish/tools/web_config/sample_prompts/sorin.fish
 share/fish/tools/web_config/sample_prompts/terlar.fish
-share/fish/tools/web_config/sample_prompts/user_host_path.fish
 share/fish/tools/web_config/webconfig.py
 share/locale/de/LC_MESSAGES/fish.mo
 share/locale/en/LC_MESSAGES/fish.mo
@@ -889,4 +960,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/fish/conf.d
+@pkgdir share/examples/fish/functions
+@pkgdir share/examples/fish/conf.d
+@pkgdir share/examples/fish/completions

Index: pkgsrc/shells/fish/distinfo
diff -u pkgsrc/shells/fish/distinfo:1.12 pkgsrc/shells/fish/distinfo:1.13
--- pkgsrc/shells/fish/distinfo:1.12    Sat Dec 30 05:35:54 2017
+++ pkgsrc/shells/fish/distinfo Tue Feb 12 16:49:31 2019
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.12 2017/12/30 05:35:54 maya Exp $
+$NetBSD: distinfo,v 1.13 2019/02/12 16:49:31 maya Exp $
 
-SHA1 (fish-2.7.1.tar.gz) = 09504034ab6e9590e5c0b62960577fec20da804f
-RMD160 (fish-2.7.1.tar.gz) = bdce0a484532cd3c9e2eb9733821e2d7575fec74
-SHA512 (fish-2.7.1.tar.gz) = 53eb8082812f28386b491ea18caa4a51ac66ead87fa78d5584275c66f1335b8705fad266170dc2ed6ee9e5d1febcdf0869c37ed2f95b58c10a74faf4ad95e610
-Size (fish-2.7.1.tar.gz) = 5445437 bytes
-SHA1 (patch-Makefile.in) = e2f5722d2e08e644e0813a662b64bbfe811a8ec6
+SHA1 (fish-3.0.0.tar.gz) = 8fde79d1721e33a46bffe19b66d23b5adbfec3bf
+RMD160 (fish-3.0.0.tar.gz) = 497da118e30a756a6068fef4707844ed92618fa0
+SHA512 (fish-3.0.0.tar.gz) = 97efb67c34860794787b44c04fbb8ebc1b7a8c37da00e7f6d93daab6707f198a2e0455e956a3b1c6a0c1711fa2d0f024ba42a3f82fbb17e857c518a858bb2ffb
+Size (fish-3.0.0.tar.gz) = 6224375 bytes
+SHA1 (patch-Makefile.in) = 279d0a77ae52470150f4293a10c26e269fd25cee
 SHA1 (patch-configure.ac) = 05bad922ce93d5624f8c98a210e473ad702fbe8d
 SHA1 (patch-src_builtin.cpp) = b48a52d45ba545a92043e58dc554305670c7fcfc
-SHA1 (patch-src_fallback.cpp) = 4a35401ed0d3c3a912e448d56c9375801c919fbc
+SHA1 (patch-src_fallback.cpp) = b6da274e326caa1f4c503874411dd1b1db224374
 SHA1 (patch-src_fallback.h) = e58b29135404211b841232d68e76facdfecc653b
-SHA1 (patch-src_output.cpp) = ce8a5043982b0f1dc28d56eaaf4ac2c1d4d1e0c6
-SHA1 (patch-src_output.h) = 971dfe5e137f46b52a56d808c32bf643750ad65a
-SHA1 (patch-src_screen.cpp) = acac708ab49a66daf7de274e5d3ed77bb73ab724
+SHA1 (patch-src_output.cpp) = 1a05bc3db70f2ecf60789fe8972db37db7ae0b90
+SHA1 (patch-src_output.h) = 6d6266ea19436c3f24b8e097dfa36591a790b718
+SHA1 (patch-src_screen.cpp) = d0a60ff4e868383ebd086bc4bc724237c13f05ed
+SHA1 (patch-src_wutil.cpp) = b391552d02b8130070ddcdab7fb1c874a641b922

Index: pkgsrc/shells/fish/patches/patch-Makefile.in
diff -u pkgsrc/shells/fish/patches/patch-Makefile.in:1.3 pkgsrc/shells/fish/patches/patch-Makefile.in:1.4
--- pkgsrc/shells/fish/patches/patch-Makefile.in:1.3    Sat May 13 01:19:05 2017
+++ pkgsrc/shells/fish/patches/patch-Makefile.in        Tue Feb 12 16:49:31 2019
@@ -1,19 +1,23 @@
-$NetBSD: patch-Makefile.in,v 1.3 2017/05/13 01:19:05 wen Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2019/02/12 16:49:31 maya Exp $
 
 Install configuration files to EGDIR
 
---- Makefile.in.orig   2017-04-29 23:37:12.000000000 +0000
+--- Makefile.in.orig   2018-12-28 13:01:03.000000000 +0000
 +++ Makefile.in
-@@ -653,9 +653,9 @@ install-force: all install-translations 
+@@ -610,11 +610,11 @@ install-force: all install-translations 
                true ;\
        done;
        @echo "Creating sysconfdir tree"
 -      $v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish
 -      $v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish/conf.d
+-      $v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish/completions
+-      $v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish/functions
 -      $v $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(sysconfdir)/fish/
 +      $v $(INSTALL) -m 755 -d $(DESTDIR)$(EGDIR)/fish
 +      $v $(INSTALL) -m 755 -d $(DESTDIR)$(EGDIR)/fish/conf.d
-+      $v $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(EGDIR)/
++      $v $(INSTALL) -m 755 -d $(DESTDIR)$(EGDIR)/fish/completions
++      $v $(INSTALL) -m 755 -d $(DESTDIR)$(EGDIR)/fish/functions
++      $v $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(EGDIR)/fish/
        @echo "Creating datadir tree"
        $v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish
        $v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/completions

Index: pkgsrc/shells/fish/patches/patch-src_fallback.cpp
diff -u pkgsrc/shells/fish/patches/patch-src_fallback.cpp:1.1 pkgsrc/shells/fish/patches/patch-src_fallback.cpp:1.2
--- pkgsrc/shells/fish/patches/patch-src_fallback.cpp:1.1       Tue Oct 24 03:51:41 2017
+++ pkgsrc/shells/fish/patches/patch-src_fallback.cpp   Tue Feb 12 16:49:31 2019
@@ -1,13 +1,15 @@
-$NetBSD: patch-src_fallback.cpp,v 1.1 2017/10/24 03:51:41 maya Exp $
+$NetBSD: patch-src_fallback.cpp,v 1.2 2019/02/12 16:49:31 maya Exp $
 
---- src/fallback.cpp.orig      2017-06-03 12:45:13.000000000 +0000
+constify, for clang
+
+--- src/fallback.cpp.orig      2018-12-28 13:01:03.000000000 +0000
 +++ src/fallback.cpp
 @@ -46,7 +46,7 @@
+ #ifdef TPARM_SOLARIS_KLUDGE
  #undef tparm
  
- /// Checks for known string values and maps to correct number of parameters.
--char *tparm_solaris_kludge(char *str, ...) {
-+char *tparm_solaris_kludge(const char *str, ...) {
-     long int param[9] = {};
- 
-     va_list ap;
+-char *tparm_solaris_kludge(char *str, long p1, long p2, long p3, long p4,
++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) {
+     return tparm(str, p1, p2, p3, p4, p5, p6, p7, p8, p9);
+ }

Index: pkgsrc/shells/fish/patches/patch-src_output.cpp
diff -u pkgsrc/shells/fish/patches/patch-src_output.cpp:1.2 pkgsrc/shells/fish/patches/patch-src_output.cpp:1.3
--- pkgsrc/shells/fish/patches/patch-src_output.cpp:1.2 Mon Oct 30 11:45:14 2017
+++ pkgsrc/shells/fish/patches/patch-src_output.cpp     Tue Feb 12 16:49:31 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_output.cpp,v 1.2 2017/10/30 11:45:14 jperkin Exp $
+$NetBSD: patch-src_output.cpp,v 1.3 2019/02/12 16:49:31 maya Exp $
 
 Work around NetBSD curses.
 
---- src/output.cpp.orig        2017-06-03 12:45:13.000000000 +0000
+--- src/output.cpp.orig        2018-12-28 13:01:03.000000000 +0000
 +++ src/output.cpp
 @@ -63,10 +63,14 @@ unsigned char index_for_color(rgb_color_
      return c.to_term256_index();
@@ -20,12 +20,12 @@ Work around NetBSD curses.
          return true;
      }
  
-@@ -550,7 +554,7 @@ rgb_color_t parse_color(const wcstring &
+@@ -550,7 +554,7 @@ rgb_color_t parse_color(const env_var_t 
  }
  
  /// Write specified multibyte string.
--void writembs_check(char *mbs, const char *mbs_name, const char *file, long line) {
-+void writembs_check(const char *mbs, const char *mbs_name, const char *file, long line) {
+-void writembs_check(char *mbs, const char *mbs_name, bool critical, const char *file, long line) {
++void writembs_check(const char *mbs, const char *mbs_name, bool critical, const char *file, long line) {
      if (mbs != NULL) {
          tputs(mbs, 1, &writeb);
-     } else {
+     } else if (critical) {
Index: pkgsrc/shells/fish/patches/patch-src_output.h
diff -u pkgsrc/shells/fish/patches/patch-src_output.h:1.2 pkgsrc/shells/fish/patches/patch-src_output.h:1.3
--- pkgsrc/shells/fish/patches/patch-src_output.h:1.2   Mon Oct 30 11:45:14 2017
+++ pkgsrc/shells/fish/patches/patch-src_output.h       Tue Feb 12 16:49:31 2019
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_output.h,v 1.2 2017/10/30 11:45:14 jperkin Exp $
+$NetBSD: patch-src_output.h,v 1.3 2019/02/12 16:49:31 maya Exp $
 
-Work around NetBSD curses.
+constify, for clang
 
---- src/output.h.orig  2017-06-03 12:45:13.000000000 +0000
+--- src/output.h.orig  2018-12-28 13:01:03.000000000 +0000
 +++ src/output.h
-@@ -29,7 +29,7 @@ enum {
+@@ -30,7 +30,7 @@ enum {
  
  void set_color(rgb_color_t c, rgb_color_t c2);
  
--void writembs_check(char *mbs, const char *mbs_name, const char *file, long line);
-+void writembs_check(const char *mbs, const char *mbs_name, const char *file, long line);
- #define writembs(mbs) writembs_check((mbs), #mbs, __FILE__, __LINE__)
+-void writembs_check(char *mbs, const char *mbs_name, bool critical, const char *file, long line);
++void writembs_check(const char *mbs, const char *mbs_name, bool critical, const char *file, long line);
+ #define writembs(mbs) writembs_check((mbs), #mbs, true, __FILE__, __LINE__)
+ #define writembs_nofail(mbs) writembs_check((mbs), #mbs, false, __FILE__, __LINE__)
  
- int writech(wint_t ch);
Index: pkgsrc/shells/fish/patches/patch-src_screen.cpp
diff -u pkgsrc/shells/fish/patches/patch-src_screen.cpp:1.2 pkgsrc/shells/fish/patches/patch-src_screen.cpp:1.3
--- pkgsrc/shells/fish/patches/patch-src_screen.cpp:1.2 Mon Oct 30 11:45:14 2017
+++ pkgsrc/shells/fish/patches/patch-src_screen.cpp     Tue Feb 12 16:49:31 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_screen.cpp,v 1.2 2017/10/30 11:45:14 jperkin Exp $
+$NetBSD: patch-src_screen.cpp,v 1.3 2019/02/12 16:49:31 maya Exp $
 
 Work around NetBSD curses.
 
---- src/screen.cpp.orig        2017-06-03 12:45:13.000000000 +0000
+--- src/screen.cpp.orig        2018-12-28 13:01:03.000000000 +0000
 +++ src/screen.cpp
-@@ -215,7 +215,7 @@ static bool is_color_escape_seq(const wc
+@@ -214,7 +214,7 @@ static bool is_color_escape_seq(const wc
  
      // Detect these terminfo color escapes with parameter value up to max_colors, all of which
      // don't move the cursor.
@@ -13,7 +13,7 @@ Work around NetBSD curses.
          set_a_foreground, set_a_background, set_foreground, set_background,
      };
  
-@@ -223,7 +223,11 @@ static bool is_color_escape_seq(const wc
+@@ -222,7 +222,11 @@ static bool is_color_escape_seq(const wc
          if (!esc[p]) continue;
  
          for (int k = 0; k < max_colors; k++) {
@@ -25,7 +25,7 @@ Work around NetBSD curses.
              if (esc_seq_len) {
                  *resulting_length = esc_seq_len;
                  return true;
-@@ -238,7 +242,7 @@ static bool is_color_escape_seq(const wc
+@@ -237,7 +241,7 @@ static bool is_color_escape_seq(const wc
  /// displayed other than the color.
  static bool is_visual_escape_seq(const wchar_t *code, size_t *resulting_length) {
      if (!cur_term) return false;
@@ -34,7 +34,7 @@ Work around NetBSD curses.
          enter_bold_mode,      exit_attribute_mode,    enter_underline_mode,  exit_underline_mode,
          enter_standout_mode,  exit_standout_mode,     flash_screen,          enter_subscript_mode,
          exit_subscript_mode,  enter_superscript_mode, exit_superscript_mode, enter_blink_mode,
-@@ -251,7 +255,11 @@ static bool is_visual_escape_seq(const w
+@@ -250,7 +254,11 @@ static bool is_visual_escape_seq(const w
          if (!esc2[p]) continue;
          // Test both padded and unpadded version, just to be safe. Most versions of tparm don't
          // actually seem to do anything these days.
@@ -46,16 +46,16 @@ Work around NetBSD curses.
          if (esc_seq_len) {
              *resulting_length = esc_seq_len;
              return true;
-@@ -506,7 +514,7 @@ static void s_move(screen_t *s, data_buf
+@@ -483,7 +491,7 @@ static void s_move(screen_t *s, data_buf
      int i;
      int x_steps, y_steps;
  
 -    char *str;
 +    const char *str;
-     /*
-       debug( 0, L"move from %d %d to %d %d",
-       s->screen_cursor[0], s->screen_cursor[1],
-@@ -540,7 +548,7 @@ static void s_move(screen_t *s, data_buf
+     scoped_buffer_t scoped_buffer(b);
+ 
+     y_steps = new_y - s->actual.cursor.y;
+@@ -512,7 +520,7 @@ static void s_move(screen_t *s, data_buf
          x_steps = 0;
      }
  
@@ -64,7 +64,7 @@ Work around NetBSD curses.
      if (x_steps < 0) {
          str = cursor_left;
          multi_str = parm_left_cursor;
-@@ -554,7 +562,11 @@ static void s_move(screen_t *s, data_buf
+@@ -526,7 +534,11 @@ static void s_move(screen_t *s, data_buf
      bool use_multi =
          multi_str != NULL && multi_str[0] != '\0' && abs(x_steps) * strlen(str) > strlen(multi_str);
      if (use_multi && cur_term) {
@@ -76,7 +76,7 @@ Work around NetBSD curses.
          writembs(multi_param);
      } else {
          for (i = 0; i < abs(x_steps); i++) {
-@@ -594,7 +606,7 @@ static void s_write_char(screen_t *s, da
+@@ -566,7 +578,7 @@ static void s_write_char(screen_t *s, da
  }
  
  /// Send the specified string through tputs and append the output to the specified buffer.

Added files:

Index: pkgsrc/shells/fish/options.mk
diff -u /dev/null pkgsrc/shells/fish/options.mk:1.1
--- /dev/null   Tue Feb 12 16:49:31 2019
+++ pkgsrc/shells/fish/options.mk       Tue Feb 12 16:49:31 2019
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2019/02/12 16:49:31 maya Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.fish
+PKG_SUPPORTED_OPTIONS=         doc
+PKG_SUGGESTED_OPTIONS=         doc
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=           doc
+.if !empty(PKG_OPTIONS:Mdoc)
+BUILD_DEPENDS+=                doxygen-[0-9]*:../../devel/doxygen
+PLIST.doc=             yes
+.else
+CONFIGURE_ARGS+=       --with-doxygen=no
+.endif

Index: pkgsrc/shells/fish/patches/patch-src_wutil.cpp
diff -u /dev/null pkgsrc/shells/fish/patches/patch-src_wutil.cpp:1.3
--- /dev/null   Tue Feb 12 16:49:31 2019
+++ pkgsrc/shells/fish/patches/patch-src_wutil.cpp      Tue Feb 12 16:49:31 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_wutil.cpp,v 1.3 2019/02/12 16:49:31 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
+@@ -311,10 +311,6 @@ int fd_check_is_remote(int fd) {
+             // Other FSes are assumed local.
+             return 0;
+     }
+-#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