- Update to 2.2.0

PR:		205102
Submitted by:	Randy Westlund
Approved by:	mat (mentor); maintainer timeout
Differential Revision:	D4568

4 files changed, 118 insertions, 50 deletions

diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index f9364eed757b..3c7753f5981b 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fish
-PORTVERSION=	2.1.1
-PORTREVISION=	4
+PORTVERSION=	2.2.0
 CATEGORIES=	shells
 MASTER_SITES=	http://fishshell.com/files/${PORTVERSION}/
 
@@ -12,7 +11,7 @@ COMMENT=	User friendly command line shell
 
 LICENSE=	GPLv2
 
-USES=		autoreconf cpe gmake iconv
+USES=		autoreconf cpe gmake iconv pkgconfig pathfix
 GNU_CONFIGURE=	yes
 
 CPE_VENDOR=	fishshell
@@ -46,7 +45,7 @@ post-patch:
 		 s|ncurses.h||' ${WRKSRC}/configure.ac
 
 post-install:
-.for i in fish fish_indent fish_pager fishd mimedb
+.for i in fish fish_indent mimedb
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
 
diff --git a/shells/fish/distinfo b/shells/fish/distinfo
index b40c72729fce..839b6b742a49 100644
--- a/shells/fish/distinfo
+++ b/shells/fish/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fish-2.1.1.tar.gz) = b7e4d3c3d55fc3859edcb20462fcf0d14ab26e920eddcd503072e8105284d924
-SIZE (fish-2.1.1.tar.gz) = 1681744
+SHA256 (fish-2.2.0.tar.gz) = a76339fd14ce2ec229283c53e805faac48c3e99d9e3ede9d82c0554acfc7b77a
+SIZE (fish-2.2.0.tar.gz) = 2213037
diff --git a/shells/fish/files/patch-env__universal__common.cpp b/shells/fish/files/patch-env__universal__common.cpp
deleted file mode 100644
index 741cbec49468..000000000000
--- a/shells/fish/files/patch-env__universal__common.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-# Description: Hangs on freebsd when starting shell
-# Issue ID: https://github.com/fish-shell/fish-shell/issues/1741
-# TODO: Remove after 2.1.2 update
-
---- env_universal_common.cpp.orig	2015-04-18 11:58:07 UTC
-+++ env_universal_common.cpp
-@@ -151,6 +151,7 @@ static const char *iconv_wide_names_4[]=
- {
-     "wchar_t", "WCHAR_T",
-     "wchar", "WCHAR",
-+    "UCS-4-INTERNAL", 
-     "ucs-4", "UCS-4",
-     "ucs4", "UCS4",
-     "utf-32", "UTF-32",
diff --git a/shells/fish/pkg-plist b/shells/fish/pkg-plist
index 3f658e3ffa2a..e2d20f1f731d 100644
--- a/shells/fish/pkg-plist
+++ b/shells/fish/pkg-plist
@@ -1,19 +1,18 @@
 @shell bin/fish
 bin/fish_indent
-bin/fish_pager
-bin/fishd
 bin/mimedb
 %%ETCDIR%%/config.fish
 man/man1/fish.1.gz
 man/man1/fish_indent.1.gz
-man/man1/fish_pager.1.gz
-man/man1/fishd.1.gz
 man/man1/mimedb.1.gz
+%%DATADIR%%/completions/..fish
+%%DATADIR%%/completions/abbr.fish
 %%DATADIR%%/completions/abook.fish
 %%DATADIR%%/completions/acat.fish
 %%DATADIR%%/completions/accept.fish
 %%DATADIR%%/completions/ack.fish
 %%DATADIR%%/completions/acpi.fish
+%%DATADIR%%/completions/adb.fish
 %%DATADIR%%/completions/adduser.fish
 %%DATADIR%%/completions/adiff.fish
 %%DATADIR%%/completions/als.fish
@@ -48,6 +47,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/apt-src.fish
 %%DATADIR%%/completions/apt-zip-inst.fish
 %%DATADIR%%/completions/apt-zip-list.fish
+%%DATADIR%%/completions/apt.fish
 %%DATADIR%%/completions/aptitude.fish
 %%DATADIR%%/completions/arepack.fish
 %%DATADIR%%/completions/arp.fish
@@ -57,6 +57,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/atq.fish
 %%DATADIR%%/completions/atrm.fish
 %%DATADIR%%/completions/aunpack.fish
+%%DATADIR%%/completions/aura.fish
 %%DATADIR%%/completions/awk.fish
 %%DATADIR%%/completions/badblocks.fish
 %%DATADIR%%/completions/bc.fish
@@ -71,6 +72,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/builtin.fish
 %%DATADIR%%/completions/bundle.fish
 %%DATADIR%%/completions/bunzip2.fish
+%%DATADIR%%/completions/burp.fish
 %%DATADIR%%/completions/bzcat.fish
 %%DATADIR%%/completions/bzip2.fish
 %%DATADIR%%/completions/bzip2recover.fish
@@ -94,6 +96,8 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/commandline.fish
 %%DATADIR%%/completions/compare.fish
 %%DATADIR%%/completions/complete.fish
+%%DATADIR%%/completions/composer.fish
+%%DATADIR%%/completions/composer.phar.fish
 %%DATADIR%%/completions/composite.fish
 %%DATADIR%%/completions/configure.fish
 %%DATADIR%%/completions/conjure.fish
@@ -109,6 +113,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/cupsreject.fish
 %%DATADIR%%/completions/cut.fish
 %%DATADIR%%/completions/cvs.fish
+%%DATADIR%%/completions/cygport.fish
 %%DATADIR%%/completions/darcs.fish
 %%DATADIR%%/completions/date.fish
 %%DATADIR%%/completions/dcop.fish
@@ -121,7 +126,9 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/djview4.fish
 %%DATADIR%%/completions/dlocate.fish
 %%DATADIR%%/completions/dmesg.fish
+%%DATADIR%%/completions/docker.fish
 %%DATADIR%%/completions/dpkg.fish
+%%DATADIR%%/completions/dropbox.fish
 %%DATADIR%%/completions/du.fish
 %%DATADIR%%/completions/duply.fish
 %%DATADIR%%/completions/dvipdf.fish
@@ -132,16 +139,20 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/eix-sync.fish
 %%DATADIR%%/completions/eix.fish
 %%DATADIR%%/completions/elatex.fish
+%%DATADIR%%/completions/elixir.fish
 %%DATADIR%%/completions/emacs.fish
 %%DATADIR%%/completions/emerge.fish
+%%DATADIR%%/completions/encfs.fish
 %%DATADIR%%/completions/env.fish
 %%DATADIR%%/completions/equery.fish
+%%DATADIR%%/completions/eselect.fish
 %%DATADIR%%/completions/etex.fish
 %%DATADIR%%/completions/eval.fish
 %%DATADIR%%/completions/evince.fish
 %%DATADIR%%/completions/exec.fish
 %%DATADIR%%/completions/exit.fish
 %%DATADIR%%/completions/expand.fish
+%%DATADIR%%/completions/fcrontab.fish
 %%DATADIR%%/completions/fg.fish
 %%DATADIR%%/completions/fgrep.fish
 %%DATADIR%%/completions/file.fish
@@ -150,6 +161,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/fish_indent.fish
 %%DATADIR%%/completions/flac.fish
 %%DATADIR%%/completions/fluxbox-remote.fish
+%%DATADIR%%/completions/fossil.fish
 %%DATADIR%%/completions/ftp.fish
 %%DATADIR%%/completions/funced.fish
 %%DATADIR%%/completions/funcsave.fish
@@ -168,6 +180,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/gprof.fish
 %%DATADIR%%/completions/grep.fish
 %%DATADIR%%/completions/groupadd.fish
+%%DATADIR%%/completions/grunt.fish
 %%DATADIR%%/completions/gunzip.fish
 %%DATADIR%%/completions/gv.fish
 %%DATADIR%%/completions/gvim.fish
@@ -175,6 +188,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/gzip.fish
 %%DATADIR%%/completions/head.fish
 %%DATADIR%%/completions/help.fish
+%%DATADIR%%/completions/heroku.fish
 %%DATADIR%%/completions/hg.fish
 %%DATADIR%%/completions/highlight.fish
 %%DATADIR%%/completions/history.fish
@@ -182,6 +196,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/iconv.fish
 %%DATADIR%%/completions/id.fish
 %%DATADIR%%/completions/identify.fish
+%%DATADIR%%/completions/iex.fish
 %%DATADIR%%/completions/ifconfig.fish
 %%DATADIR%%/completions/ifdata.fish
 %%DATADIR%%/completions/ifdown.fish
@@ -189,8 +204,10 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/import.fish
 %%DATADIR%%/completions/invoke-rc.d.fish
 %%DATADIR%%/completions/jobs.fish
+%%DATADIR%%/completions/journalctl.fish
 %%DATADIR%%/completions/kill.fish
 %%DATADIR%%/completions/killall.fish
+%%DATADIR%%/completions/kitchen.fish
 %%DATADIR%%/completions/la.fish
 %%DATADIR%%/completions/latex.fish
 %%DATADIR%%/completions/latexmk.fish
@@ -213,6 +230,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/ls.fish
 %%DATADIR%%/completions/lsblk.fish
 %%DATADIR%%/completions/lsof.fish
+%%DATADIR%%/completions/lsusb.fish
 %%DATADIR%%/completions/lua.fish
 %%DATADIR%%/completions/lualatex.fish
 %%DATADIR%%/completions/lunchy.fish
@@ -224,7 +242,9 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/man.fish
 %%DATADIR%%/completions/mc.fish
 %%DATADIR%%/completions/md5sum.fish
+%%DATADIR%%/completions/meat.fish
 %%DATADIR%%/completions/mimedb.fish
+%%DATADIR%%/completions/mix.fish
 %%DATADIR%%/completions/mktemp.fish
 %%DATADIR%%/completions/mocp.fish
 %%DATADIR%%/completions/modprobe.fish
@@ -238,6 +258,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/mutt.fish
 %%DATADIR%%/completions/mv.fish
 %%DATADIR%%/completions/namei.fish
+%%DATADIR%%/completions/native2ascii.fish
 %%DATADIR%%/completions/ncdu.fish
 %%DATADIR%%/completions/netcat.fish
 %%DATADIR%%/completions/netctl.fish
@@ -246,14 +267,19 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/nl.fish
 %%DATADIR%%/completions/nm.fish
 %%DATADIR%%/completions/nmcli.fish
+%%DATADIR%%/completions/node.fish
 %%DATADIR%%/completions/not.fish
+%%DATADIR%%/completions/npm.fish
+%%DATADIR%%/completions/obnam.fish
 %%DATADIR%%/completions/oggenc.fish
 %%DATADIR%%/completions/omega.fish
+%%DATADIR%%/completions/opam.fish
 %%DATADIR%%/completions/or.fish
 %%DATADIR%%/completions/pacman-color.fish
 %%DATADIR%%/completions/pacman-key.fish
 %%DATADIR%%/completions/pacman.fish
 %%DATADIR%%/completions/pacmatic.fish
+%%DATADIR%%/completions/pacsrv.fish
 %%DATADIR%%/completions/pactree.fish
 %%DATADIR%%/completions/patch.fish
 %%DATADIR%%/completions/pbget.fish
@@ -261,6 +287,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/pdfetex.fish
 %%DATADIR%%/completions/pdflatex.fish
 %%DATADIR%%/completions/pdftex.fish
+%%DATADIR%%/completions/pdftotext.fish
 %%DATADIR%%/completions/perl.fish
 %%DATADIR%%/completions/pftp.fish
 %%DATADIR%%/completions/pgrep.fish
@@ -291,6 +318,8 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/quilt.fish
 %%DATADIR%%/completions/random.fish
 %%DATADIR%%/completions/rbenv.fish
+%%DATADIR%%/completions/rc-service.fish
+%%DATADIR%%/completions/rc-update.fish
 %%DATADIR%%/completions/rc.d.fish
 %%DATADIR%%/completions/read.fish
 %%DATADIR%%/completions/readlink.fish
@@ -318,6 +347,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/service.fish
 %%DATADIR%%/completions/set.fish
 %%DATADIR%%/completions/set_color.fish
+%%DATADIR%%/completions/setfacl.fish
 %%DATADIR%%/completions/setxkbmap.fish
 %%DATADIR%%/completions/sha1sum.fish
 %%DATADIR%%/completions/sha224sum.fish
@@ -325,6 +355,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/sha384sum.fish
 %%DATADIR%%/completions/sha512sum.fish
 %%DATADIR%%/completions/sort.fish
+%%DATADIR%%/completions/source.fish
 %%DATADIR%%/completions/ssh.fish
 %%DATADIR%%/completions/sshfs.fish
 %%DATADIR%%/completions/stat.fish
@@ -344,10 +375,12 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/time.fish
 %%DATADIR%%/completions/timeout.fish
 %%DATADIR%%/completions/tmux.fish
+%%DATADIR%%/completions/tmuxinator.fish
 %%DATADIR%%/completions/top.fish
 %%DATADIR%%/completions/totem.fish
 %%DATADIR%%/completions/touch.fish
 %%DATADIR%%/completions/tr.fish
+%%DATADIR%%/completions/transmission-remote.fish
 %%DATADIR%%/completions/trap.fish
 %%DATADIR%%/completions/tree.fish
 %%DATADIR%%/completions/type.fish
@@ -394,6 +427,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/xsel.fish
 %%DATADIR%%/completions/xterm.fish
 %%DATADIR%%/completions/yaourt.fish
+%%DATADIR%%/completions/yast2.fish
 %%DATADIR%%/completions/yum.fish
 %%DATADIR%%/completions/zcat.fish
 %%DATADIR%%/completions/zip.fish
@@ -409,6 +443,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/functions/__fish_complete_ant_targets.fish
 %%DATADIR%%/functions/__fish_complete_atool.fish
 %%DATADIR%%/functions/__fish_complete_atool_archive_contents.fish
+%%DATADIR%%/functions/__fish_complete_aura.fish
 %%DATADIR%%/functions/__fish_complete_bittorrent.fish
 %%DATADIR%%/functions/__fish_complete_cabal.fish
 %%DATADIR%%/functions/__fish_complete_cd.fish
@@ -424,14 +459,17 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/functions/__fish_complete_lpr.fish
 %%DATADIR%%/functions/__fish_complete_lpr_option.fish
 %%DATADIR%%/functions/__fish_complete_ls.fish
+%%DATADIR%%/functions/__fish_complete_lsusb.fish
 %%DATADIR%%/functions/__fish_complete_man.fish
 %%DATADIR%%/functions/__fish_complete_mime.fish
 %%DATADIR%%/functions/__fish_complete_pacman.fish
+%%DATADIR%%/functions/__fish_complete_path.fish
 %%DATADIR%%/functions/__fish_complete_pgrep.fish
 %%DATADIR%%/functions/__fish_complete_pids.fish
 %%DATADIR%%/functions/__fish_complete_ppp_peer.fish
 %%DATADIR%%/functions/__fish_complete_proc.fish
 %%DATADIR%%/functions/__fish_complete_python.fish
+%%DATADIR%%/functions/__fish_complete_service_actions.fish
 %%DATADIR%%/functions/__fish_complete_setxkbmap.fish
 %%DATADIR%%/functions/__fish_complete_ssh.fish
 %%DATADIR%%/functions/__fish_complete_subcommand.fish
@@ -449,23 +487,30 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/functions/__fish_config_interactive.fish
 %%DATADIR%%/functions/__fish_contains_opt.fish
 %%DATADIR%%/functions/__fish_crux_packages.fish
+%%DATADIR%%/functions/__fish_cursor_konsole.fish
+%%DATADIR%%/functions/__fish_cursor_xterm.fish
 %%DATADIR%%/functions/__fish_describe_command.fish
 %%DATADIR%%/functions/__fish_filter_ant_targets.fish
 %%DATADIR%%/functions/__fish_filter_mime.fish
 %%DATADIR%%/functions/__fish_git_prompt.fish
 %%DATADIR%%/functions/__fish_gnu_complete.fish
+%%DATADIR%%/functions/__fish_hg_prompt.fish
 %%DATADIR%%/functions/__fish_is_first_token.fish
 %%DATADIR%%/functions/__fish_is_token_n.fish
 %%DATADIR%%/functions/__fish_list_current_token.fish
 %%DATADIR%%/functions/__fish_make_completion_signals.fish
+%%DATADIR%%/functions/__fish_man_page.fish
 %%DATADIR%%/functions/__fish_move_last.fish
 %%DATADIR%%/functions/__fish_no_arguments.fish
 %%DATADIR%%/functions/__fish_not_contain_opt.fish
+%%DATADIR%%/functions/__fish_number_of_cmd_args_wo_opts.fish
 %%DATADIR%%/functions/__fish_paginate.fish
 %%DATADIR%%/functions/__fish_ports_dirs.fish
 %%DATADIR%%/functions/__fish_print_abook_emails.fish
 %%DATADIR%%/functions/__fish_print_addresses.fish
 %%DATADIR%%/functions/__fish_print_arch_daemons.fish
+%%DATADIR%%/functions/__fish_print_cmd_args.fish
+%%DATADIR%%/functions/__fish_print_cmd_args_without_options.fish
 %%DATADIR%%/functions/__fish_print_commands.fish
 %%DATADIR%%/functions/__fish_print_debian_services.fish
 %%DATADIR%%/functions/__fish_print_encodings.fish
@@ -480,6 +525,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/functions/__fish_print_make_targets.fish
 %%DATADIR%%/functions/__fish_print_mounted.fish
 %%DATADIR%%/functions/__fish_print_packages.fish
+%%DATADIR%%/functions/__fish_print_service_names.fish
 %%DATADIR%%/functions/__fish_print_svn_rev.fish
 %%DATADIR%%/functions/__fish_print_users.fish
 %%DATADIR%%/functions/__fish_print_xdg_mimeapps.fish
@@ -494,10 +540,23 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/functions/__fish_prt_use_port.fish
 %%DATADIR%%/functions/__fish_pwd.fish
 %%DATADIR%%/functions/__fish_seen_subcommand_from.fish
+%%DATADIR%%/functions/__fish_systemctl_automounts.fish
+%%DATADIR%%/functions/__fish_systemctl_devices.fish
+%%DATADIR%%/functions/__fish_systemctl_mounts.fish
+%%DATADIR%%/functions/__fish_systemctl_scopes.fish
+%%DATADIR%%/functions/__fish_systemctl_service_paths.fish
+%%DATADIR%%/functions/__fish_systemctl_services.fish
+%%DATADIR%%/functions/__fish_systemctl_slices.fish
+%%DATADIR%%/functions/__fish_systemctl_snapshots.fish
+%%DATADIR%%/functions/__fish_systemctl_sockets.fish
+%%DATADIR%%/functions/__fish_systemctl_swaps.fish
+%%DATADIR%%/functions/__fish_systemctl_targets.fish
+%%DATADIR%%/functions/__fish_systemctl_timers.fish
 %%DATADIR%%/functions/__fish_test_arg.fish
 %%DATADIR%%/functions/__fish_urlencode.fish
 %%DATADIR%%/functions/__fish_use_subcommand.fish
 %%DATADIR%%/functions/__terlar_git_prompt.fish
+%%DATADIR%%/functions/abbr.fish
 %%DATADIR%%/functions/alias.fish
 %%DATADIR%%/functions/cd.fish
 %%DATADIR%%/functions/contains_seq.fish
@@ -506,11 +565,16 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/functions/dirs.fish
 %%DATADIR%%/functions/down-or-search.fish
 %%DATADIR%%/functions/eval.fish
+%%DATADIR%%/functions/export.fish
 %%DATADIR%%/functions/fish_config.fish
 %%DATADIR%%/functions/fish_default_key_bindings.fish
 %%DATADIR%%/functions/fish_indent.fish
+%%DATADIR%%/functions/fish_mode_prompt.fish
 %%DATADIR%%/functions/fish_prompt.fish
 %%DATADIR%%/functions/fish_update_completions.fish
+%%DATADIR%%/functions/fish_vi_cursor.fish
+%%DATADIR%%/functions/fish_vi_key_bindings.fish
+%%DATADIR%%/functions/fish_vi_mode.fish
 %%DATADIR%%/functions/funced.fish
 %%DATADIR%%/functions/funcsave.fish
 %%DATADIR%%/functions/grep.fish
@@ -541,30 +605,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/functions/umask.fish
 %%DATADIR%%/functions/up-or-search.fish
 %%DATADIR%%/functions/vared.fish
-%%DATADIR%%/tools/create_manpage_completions.py
-%%DATADIR%%/tools/deroff.py
-%%DATADIR%%/tools/web_config/delete.png
-%%DATADIR%%/tools/web_config/index.html
-%%DATADIR%%/tools/web_config/jquery.js
-%%DATADIR%%/tools/web_config/sample_prompts/classic.fish
-%%DATADIR%%/tools/web_config/sample_prompts/classic_git.fish
-%%DATADIR%%/tools/web_config/sample_prompts/classic_status.fish
-%%DATADIR%%/tools/web_config/sample_prompts/informative.fish
-%%DATADIR%%/tools/web_config/sample_prompts/informative_git.fish
-%%DATADIR%%/tools/web_config/sample_prompts/justadollar.fish
-%%DATADIR%%/tools/web_config/sample_prompts/lonetwin.fish
-%%DATADIR%%/tools/web_config/sample_prompts/minimalist.fish
-%%DATADIR%%/tools/web_config/sample_prompts/nim.fish
-%%DATADIR%%/tools/web_config/sample_prompts/pythonista.fish
-%%DATADIR%%/tools/web_config/sample_prompts/robbyrussell.fish
-%%DATADIR%%/tools/web_config/sample_prompts/screen_savvy.fish
-%%DATADIR%%/tools/web_config/sample_prompts/terlar.fish
-%%DATADIR%%/tools/web_config/sample_prompts/user_host_path.fish
-%%DATADIR%%/tools/web_config/webconfig.py
-%%NLS%%share/locale/de/LC_MESSAGES/fish.mo
-%%NLS%%share/locale/en/LC_MESSAGES/fish.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/fish.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/fish.mo
+%%DATADIR%%/man/man1/abbr.1.gz
 %%DATADIR%%/man/man1/alias.1.gz
 %%DATADIR%%/man/man1/and.1.gz
 %%DATADIR%%/man/man1/begin.1.gz
@@ -591,15 +632,15 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/man/man1/eval.1.gz
 %%DATADIR%%/man/man1/exec.1.gz
 %%DATADIR%%/man/man1/exit.1.gz
+%%DATADIR%%/man/man1/false.1.gz
 %%DATADIR%%/man/man1/fg.1.gz
 %%DATADIR%%/man/man1/fish.1.gz
 %%DATADIR%%/man/man1/fish_config.1.gz
 %%DATADIR%%/man/man1/fish_indent.1.gz
-%%DATADIR%%/man/man1/fish_pager.1.gz
 %%DATADIR%%/man/man1/fish_prompt.1.gz
 %%DATADIR%%/man/man1/fish_right_prompt.1.gz
 %%DATADIR%%/man/man1/fish_update_completions.1.gz
-%%DATADIR%%/man/man1/fishd.1.gz
+%%DATADIR%%/man/man1/fish_vi_mode.1.gz
 %%DATADIR%%/man/man1/for.1.gz
 %%DATADIR%%/man/man1/funced.1.gz
 %%DATADIR%%/man/man1/funcsave.1.gz
@@ -631,8 +672,50 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/man/man1/switch.1.gz
 %%DATADIR%%/man/man1/test.1.gz
 %%DATADIR%%/man/man1/trap.1.gz
+%%DATADIR%%/man/man1/true.1.gz
 %%DATADIR%%/man/man1/type.1.gz
 %%DATADIR%%/man/man1/ulimit.1.gz
 %%DATADIR%%/man/man1/umask.1.gz
 %%DATADIR%%/man/man1/vared.1.gz
 %%DATADIR%%/man/man1/while.1.gz
+%%DATADIR%%/tools/create_manpage_completions.py
+%%DATADIR%%/tools/deroff.py
+%%DATADIR%%/tools/web_config/delete.png
+%%DATADIR%%/tools/web_config/fishconfig.css
+%%DATADIR%%/tools/web_config/index.html
+%%DATADIR%%/tools/web_config/js/angular.js
+%%DATADIR%%/tools/web_config/js/app.js
+%%DATADIR%%/tools/web_config/js/colorutils.js
+%%DATADIR%%/tools/web_config/js/controllers.js
+%%DATADIR%%/tools/web_config/js/filters.js
+%%DATADIR%%/tools/web_config/partials/abbreviations.html
+%%DATADIR%%/tools/web_config/partials/bindings.html
+%%DATADIR%%/tools/web_config/partials/colors.html
+%%DATADIR%%/tools/web_config/partials/functions.html
+%%DATADIR%%/tools/web_config/partials/history.html
+%%DATADIR%%/tools/web_config/partials/prompt.html
+%%DATADIR%%/tools/web_config/partials/variables.html
+%%DATADIR%%/tools/web_config/sample_prompts/classic.fish
+%%DATADIR%%/tools/web_config/sample_prompts/classic_git.fish
+%%DATADIR%%/tools/web_config/sample_prompts/classic_status.fish
+%%DATADIR%%/tools/web_config/sample_prompts/debian_chroot.fish
+%%DATADIR%%/tools/web_config/sample_prompts/informative.fish
+%%DATADIR%%/tools/web_config/sample_prompts/informative_git.fish
+%%DATADIR%%/tools/web_config/sample_prompts/justadollar.fish
+%%DATADIR%%/tools/web_config/sample_prompts/lonetwin.fish
+%%DATADIR%%/tools/web_config/sample_prompts/minimalist.fish
+%%DATADIR%%/tools/web_config/sample_prompts/nim.fish
+%%DATADIR%%/tools/web_config/sample_prompts/pythonista.fish
+%%DATADIR%%/tools/web_config/sample_prompts/robbyrussell.fish
+%%DATADIR%%/tools/web_config/sample_prompts/screen_savvy.fish
+%%DATADIR%%/tools/web_config/sample_prompts/terlar.fish
+%%DATADIR%%/tools/web_config/sample_prompts/user_host_path.fish
+%%DATADIR%%/tools/web_config/webconfig.py
+%%NLS%%share/locale/de/LC_MESSAGES/fish.mo
+%%NLS%%share/locale/en/LC_MESSAGES/fish.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/fish.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/fish.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/fish.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/fish.mo
+libdata/pkgconfig/fish.pc
+@dir %%DATADIR%%/vendor_completions.d