fish: update to 2.7.1

pkgsrc changes: add doxygen dependency for building docs.
this is unusual as doxygen is heavy, but fish is meant to
be beginner-friendly shell, so documentation is important.

remove now unneeded patch, that getcwd is called with a size
argument now.

# fish 2.7.1 (released December 23, 2017)

This release of fish fixes an issue where iTerm 2 on macOS would display a warning about paste bracketing being left on when starting a new fish session (#4521).

If you are upgrading from version 2.6.0 or before, please also review the release notes for 2.7.0 and 2.7b1 (included below).

--

# fish 2.7.0 (released November 23, 2017)

There are no major changes between 2.7b1 and 2.7.0. If you are upgrading from version 2.6.0 or before, please also review the release notes for 2.7b1 (included below).

Xcode builds and macOS packages could not be produced with 2.7b1, but this is fixed in 2.7.0.

--

# fish 2.7b1 (released October 31, 2017)

## Notable improvements
- A new `cdh` (change directory using recent history) command provides a more friendly alternative to prevd/nextd and pushd/popd (#2847).
- A new `argparse` command is available to allow fish script to parse arguments with the same behavior as builtin commands. This also includes the `fish_opt` helper command. (#4190).
- Invalid array indexes are now silently ignored (#826, #4127).
- Improvements to the debugging facility, including a prompt specific to the debugger (`fish_breakpoint_prompt`) and a `status is-breakpoint` subcommand (#1310).
- `string` supports new `lower` and `upper` subcommands, for altering the case of strings (#4080). The case changing is not locale-aware yet.
- `string escape` has a new `--style=xxx` flag where `xxx` can be `script`, `var`, or `url` (#4150), and can be reversed with `string unescape` (#3543).
- History can now be split into sessions with the `fish_history` variable, or not saved to disk at all (#102).
- Read history is now controlled by the `fish_history` variable rather than the `--mode-name` flag (#1504).
- `command` now supports an `--all` flag to report all directories with the command. `which` is no longer a runtime dependency (#2778).
- fish can run commands before starting an interactive session using the new `--init-command`/`-C` options (#4164).
- `set` has a new `--show` option to show lots of information about variables (#4265).

## Other significant changes
- The `COLUMNS` and `LINES` environment variables are now correctly set the first time `fish_prompt` is run (#4141).
- `complete`'s `--no-files` option works as intended (#112).
- `echo -h` now correctly echoes `-h` in line with other shells (#4120).
- The `export` compatibility function now returns zero on success, rather than always returning 1 (#4435).
- Stop converting empty elements in MANPATH to "." (#4158). The behavior being changed was introduced in fish 2.6.0.
- `count -h` and `count --help` now return 1 rather than produce command help output (#4189).
- An attempt to `read` which stops because too much data is available still defines the variables given as parameters (#4180).
- A regression in fish 2.4.0 which prevented `pushd +1` from working has been fixed (#4091).
- A regression in fish 2.6.0 where multiple `read` commands in non-interactive scripts were broken has been fixed (#4206).
- A regression in fish 2.6.0 involving universal variables with side-effects at startup such as `set -U fish_escape_delay_ms 10` has been fixed (#4196).
- Added completions for:
  - `as` (#4130)
  - `cdh` (#2847)
  - `dhcpd` (#4115)
  - `ezjail-admin` (#4324)
  - Fabric's `fab` (#4153)
  - `grub-file` (#4119)
  - `grub-install` (#4119)
  - `jest` (#4142)
  - `kdeconnect-cli`
  - `magneto` (#4043, #4108)
  - `mdadm` (#4198)
  - `passwd` (#4209)
  - `pip` and `pipenv` (#4448)
  - `s3cmd` (#4332)
  - `sbt` (#4347)
  - `snap` (#4215)
  - Sublime Text 3's `subl` (#4277)
- Lots of improvements to completions.
- Updated Chinese and French translations.

4 files changed, 49 insertions, 64 deletions

diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index 5bd8a148d57..3a598210bc1 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2017/10/30 10:48:22 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2017/12/30 05:35:54 maya Exp $
 
-DISTNAME=		fish-2.6.0
-PKGREVISION=		3
+DISTNAME=		fish-2.7.1
 CATEGORIES=		shells
-MASTER_SITES=		http://fishshell.com/files/${PKGVERSION_NOREV}/
+MASTER_SITES=		${MASTER_SITE_GITHUB:=fish-shell/}
+GITHUB_PROJECT=		fish-shell
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.fishshell.com/
@@ -12,6 +12,8 @@ LICENSE=		gnu-gpl-v2
 
 EXTRACT_USING=		gtar
 
+WRKSRC=			${WRKDIR}/fish-shell-${PKGVERSION_NOREV}
+
 USE_LANGUAGES+=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
@@ -47,6 +49,8 @@ PLIST.open=	yes
 pre-configure:
 	${RUN} cd ${WRKSRC} && autoreconf -fiv
 
+BUILD_DEPENDS+=doxygen-[0-9]*:../../devel/doxygen
+
 .include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gettext-tools/buildlink3.mk"
diff --git a/shells/fish/PLIST b/shells/fish/PLIST
index bb94fd0ab1b..bc27645c508 100644
--- a/shells/fish/PLIST
+++ b/shells/fish/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2017/08/19 09:28:38 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.6 2017/12/30 05:35:54 maya Exp $
 bin/fish
 bin/fish_indent
 bin/fish_key_reader
@@ -7,47 +7,15 @@ man/man1/fish_indent.1
 man/man1/fish_key_reader.1
 share/doc/fish/CHANGELOG.md
 share/doc/fish/ascii_fish.png
-share/doc/fish/bc_s.png
-share/doc/fish/bdwn.png
-share/doc/fish/closed.png
 share/doc/fish/commands.html
 share/doc/fish/design.html
-share/doc/fish/doxygen.css
-share/doc/fish/doxygen.png
-share/doc/fish/dynsections.js
 share/doc/fish/faq.html
-share/doc/fish/ftv2blank.png
-share/doc/fish/ftv2doc.png
-share/doc/fish/ftv2folderclosed.png
-share/doc/fish/ftv2folderopen.png
-share/doc/fish/ftv2lastnode.png
-share/doc/fish/ftv2link.png
-share/doc/fish/ftv2mlastnode.png
-share/doc/fish/ftv2mnode.png
-share/doc/fish/ftv2node.png
-share/doc/fish/ftv2plastnode.png
-share/doc/fish/ftv2pnode.png
-share/doc/fish/ftv2splitbar.png
-share/doc/fish/ftv2vertline.png
 share/doc/fish/index.html
 share/doc/fish/license.html
-share/doc/fish/nav_f.png
-share/doc/fish/nav_g.png
-share/doc/fish/nav_h.png
-share/doc/fish/open.png
-share/doc/fish/pages.html
-share/doc/fish/sync_off.png
-share/doc/fish/sync_on.png
-share/doc/fish/tab_a.png
-share/doc/fish/tab_b.png
-share/doc/fish/tab_h.png
-share/doc/fish/tab_s.png
-share/doc/fish/tabs.css
 share/doc/fish/tutorial.html
 share/doc/fish/user_doc.css
 share/examples/fish/config.fish
 share/fish/__fish_build_paths.fish
-share/fish/completions/..fish
 share/fish/completions/VBoxHeadless.fish
 share/fish/completions/VBoxSDL.fish
 share/fish/completions/a2disconf.fish
@@ -103,6 +71,7 @@ share/fish/completions/aptitude.fish
 share/fish/completions/arc.fish
 share/fish/completions/arepack.fish
 share/fish/completions/arp.fish
+share/fish/completions/as.fish
 share/fish/completions/asp.fish
 share/fish/completions/at.fish
 share/fish/completions/atd.fish
@@ -142,6 +111,7 @@ share/fish/completions/cargo.fish
 share/fish/completions/castnow.fish
 share/fish/completions/cat.fish
 share/fish/completions/cd.fish
+share/fish/completions/cdh.fish
 share/fish/completions/cdrecord.fish
 share/fish/completions/chgrp.fish
 share/fish/completions/chmod.fish
@@ -180,6 +150,7 @@ share/fish/completions/dconf.fish
 share/fish/completions/dd.fish
 share/fish/completions/defaults.fish
 share/fish/completions/df.fish
+share/fish/completions/dhcpcd.fish
 share/fish/completions/diff.fish
 share/fish/completions/dig.fish
 share/fish/completions/diskutil.fish
@@ -215,6 +186,8 @@ share/fish/completions/evince.fish
 share/fish/completions/exec.fish
 share/fish/completions/exit.fish
 share/fish/completions/expand.fish
+share/fish/completions/ezjail-admin.fish
+share/fish/completions/fab.fish
 share/fish/completions/feh.fish
 share/fish/completions/fg.fish
 share/fish/completions/fgrep.fish
@@ -251,6 +224,8 @@ share/fish/completions/gprof.fish
 share/fish/completions/gradle.fish
 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/grunt.fish
 share/fish/completions/gsettings.fish
 share/fish/completions/gunzip.fish
@@ -280,10 +255,12 @@ 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/jest.fish
 share/fish/completions/jobs.fish
 share/fish/completions/journalctl.fish
 share/fish/completions/jq.fish
 share/fish/completions/kcmshell5.fish
+share/fish/completions/kdeconnect-cli.fish
 share/fish/completions/kill.fish
 share/fish/completions/killall.fish
 share/fish/completions/kitchen.fish
@@ -328,6 +305,7 @@ share/fish/completions/makepkg.fish
 share/fish/completions/man.fish
 share/fish/completions/mc.fish
 share/fish/completions/md5sum.fish
+share/fish/completions/mdadm.fish
 share/fish/completions/mdbook.fish
 share/fish/completions/mddiagnose.fish
 share/fish/completions/mdfind.fish
@@ -392,6 +370,7 @@ share/fish/completions/pacmd.fish
 share/fish/completions/pacsrv.fish
 share/fish/completions/pactl.fish
 share/fish/completions/pactree.fish
+share/fish/completions/passwd.fish
 share/fish/completions/patch.fish
 share/fish/completions/pbget.fish
 share/fish/completions/pdfelatex.fish
@@ -405,6 +384,10 @@ share/fish/completions/pgrep.fish
 share/fish/completions/pine.fish
 share/fish/completions/ping.fish
 share/fish/completions/pinky.fish
+share/fish/completions/pip.fish
+share/fish/completions/pip2.fish
+share/fish/completions/pip3.fish
+share/fish/completions/pipenv.fish
 share/fish/completions/pkg-config.fish
 share/fish/completions/pkg.fish
 share/fish/completions/pkgadd.fish
@@ -456,8 +439,10 @@ share/fish/completions/rsync.fish
 share/fish/completions/ruby-build.fish
 share/fish/completions/ruby.fish
 share/fish/completions/rustc.fish
+share/fish/completions/s3cmd.fish
 share/fish/completions/sass-convert.fish
 share/fish/completions/sass.fish
+share/fish/completions/sbt.fish
 share/fish/completions/scanimage.fish
 share/fish/completions/scons.fish
 share/fish/completions/scp.fish
@@ -477,8 +462,8 @@ share/fish/completions/sha224sum.fish
 share/fish/completions/sha256sum.fish
 share/fish/completions/sha384sum.fish
 share/fish/completions/sha512sum.fish
+share/fish/completions/snap.fish
 share/fish/completions/sort.fish
-share/fish/completions/source.fish
 share/fish/completions/ssh.fish
 share/fish/completions/sshfs.fish
 share/fish/completions/stack.fish
@@ -487,6 +472,7 @@ share/fish/completions/status.fish
 share/fish/completions/stream.fish
 share/fish/completions/string.fish
 share/fish/completions/su.fish
+share/fish/completions/subl.fish
 share/fish/completions/sudo.fish
 share/fish/completions/svn.fish
 share/fish/completions/sylpheed.fish
@@ -612,6 +598,7 @@ 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_config_interactive.fish
@@ -667,7 +654,8 @@ share/fish/functions/__fish_print_pacman_repos.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_mimeapps.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
@@ -699,13 +687,14 @@ 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_urlencode.fish
 share/fish/functions/__fish_use_subcommand.fish
 share/fish/functions/__fish_vcs_prompt.fish
 share/fish/functions/__terlar_git_prompt.fish
+share/fish/functions/_validate_int.fish
 share/fish/functions/abbr.fish
 share/fish/functions/alias.fish
 share/fish/functions/cd.fish
+share/fish/functions/cdh.fish
 share/fish/functions/contains_seq.fish
 share/fish/functions/delete-or-exit.fish
 share/fish/functions/dirh.fish
@@ -714,6 +703,7 @@ 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
 share/fish/functions/fish_clipboard_paste.fish
 share/fish/functions/fish_config.fish
@@ -725,6 +715,7 @@ 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_opt.fish
 share/fish/functions/fish_prompt.fish
 share/fish/functions/fish_update_completions.fish
 share/fish/functions/fish_vi_cursor.fish
@@ -763,9 +754,11 @@ share/fish/functions/umask.fish
 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
@@ -775,6 +768,7 @@ 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
@@ -794,10 +788,12 @@ 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
@@ -890,3 +886,7 @@ share/locale/pt_BR/LC_MESSAGES/fish.mo
 share/locale/sv/LC_MESSAGES/fish.mo
 share/locale/zh_CN/LC_MESSAGES/fish.mo
 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
diff --git a/shells/fish/distinfo b/shells/fish/distinfo
index dde4371efac..9d6a09cf9b1 100644
--- a/shells/fish/distinfo
+++ b/shells/fish/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2017/10/30 11:45:13 jperkin Exp $
+$NetBSD: distinfo,v 1.12 2017/12/30 05:35:54 maya Exp $
 
-SHA1 (fish-2.6.0.tar.gz) = 16f6612747f8013cd04b3639fe504d4750f363ca
-RMD160 (fish-2.6.0.tar.gz) = f12093fef235487b7c02c245cbbd600750fff874
-SHA512 (fish-2.6.0.tar.gz) = d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1
-Size (fish-2.6.0.tar.gz) = 3575346 bytes
+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 (patch-configure.ac) = 05bad922ce93d5624f8c98a210e473ad702fbe8d
 SHA1 (patch-src_builtin.cpp) = b48a52d45ba545a92043e58dc554305670c7fcfc
@@ -12,4 +12,3 @@ 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_wutil.cpp) = dbb73cf81d850c4b73598d0c711f68b0d74cabd6
diff --git a/shells/fish/patches/patch-src_wutil.cpp b/shells/fish/patches/patch-src_wutil.cpp
deleted file mode 100644
index bc870026d02..00000000000
--- a/shells/fish/patches/patch-src_wutil.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_wutil.cpp,v 1.1 2017/05/15 13:46:47 jperkin Exp $
-
-SunOS needs an explicit size to getcwd().
-
---- src/wutil.cpp.orig	2017-02-03 01:46:58.000000000 +0000
-+++ src/wutil.cpp
-@@ -129,7 +129,11 @@ bool wreaddir_for_dirs(DIR *dir, wcstrin
- const wcstring wgetcwd() {
-     wcstring retval;
- 
-+#ifdef __sun
-+    char *res = getcwd(NULL, PATH_MAX);
-+#else
-     char *res = getcwd(NULL, 0);
-+#endif
-     if (res) {
-         retval = str2wcstring(res);
-         free(res);