shells/fish: 2.2.0 -> 2.3.1

PR:		211688
Changes:	https://github.com/fish-shell/fish-shell/releases/tag/2.3.1
Submitted by:	Walter Schwarzenfeld <w.schwarzenfeld@utanet.at>
Requested by:	Stefan Tatschner <rumpelsepp@sevenbyte.org>
Reviewed by:	Aaron Gyes <me@aaron.gy>
Approved by:	freebsd.users@gmail.com (maintainer timeout)

3 files changed, 112 insertions, 41 deletions

diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index 7daeb0be2c5b..193924953b5f 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fish
-PORTVERSION=	2.2.0
+PORTVERSION=	2.3.1
 CATEGORIES=	shells
 MASTER_SITES=	http://fishshell.com/files/${PORTVERSION}/
 
@@ -11,15 +11,13 @@ COMMENT=	User friendly command line shell
 
 LICENSE=	GPLv2
 
-USES=		autoreconf cpe gmake iconv ncurses pkgconfig pathfix
+USES=		autoreconf cpe gmake libtool ncurses pkgconfig pathfix python:3 localbase
+
 GNU_CONFIGURE=	yes
 
 CPE_VENDOR=	fishshell
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -pthread ${ICONV_LIB}
-
-PORTDOCS=	*
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 MANDIRS=	${DATADIR}/man/man1
 
 OPTIONS_DEFINE=	DOCS NLS
@@ -45,7 +43,7 @@ post-patch:
 		 s|ncurses.h||' ${WRKSRC}/configure.ac
 
 post-install:
-.for i in fish fish_indent mimedb
+.for i in fish fish_indent fish_key_reader
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
 
diff --git a/shells/fish/distinfo b/shells/fish/distinfo
index 839b6b742a49..7964ead481ba 100644
--- a/shells/fish/distinfo
+++ b/shells/fish/distinfo
@@ -1,2 +1,3 @@
-SHA256 (fish-2.2.0.tar.gz) = a76339fd14ce2ec229283c53e805faac48c3e99d9e3ede9d82c0554acfc7b77a
-SIZE (fish-2.2.0.tar.gz) = 2213037
+TIMESTAMP = 1470731809
+SHA256 (fish-2.3.1.tar.gz) = 328acad35d131c94118c1e187ff3689300ba757c4469c8cc1eaa994789b98664
+SIZE (fish-2.3.1.tar.gz) = 4502836
diff --git a/shells/fish/pkg-plist b/shells/fish/pkg-plist
index e2d20f1f731d..13e02fcf44a2 100644
--- a/shells/fish/pkg-plist
+++ b/shells/fish/pkg-plist
@@ -1,11 +1,28 @@
-@shell bin/fish
+bin/fish
 bin/fish_indent
-bin/mimedb
+bin/fish_key_reader
 %%ETCDIR%%/config.fish
+libdata/pkgconfig/fish.pc
 man/man1/fish.1.gz
 man/man1/fish_indent.1.gz
-man/man1/mimedb.1.gz
+man/man1/fish_key_reader.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/ascii_fish.png
+%%PORTDOCS%%%%DOCSDIR%%/commands.html
+%%PORTDOCS%%%%DOCSDIR%%/design.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/license.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/user_doc.css
+%%DATADIR%%/__fish_build_paths.fish
 %%DATADIR%%/completions/..fish
+%%DATADIR%%/completions/a2disconf.fish
+%%DATADIR%%/completions/a2dismod.fish
+%%DATADIR%%/completions/a2dissite.fish
+%%DATADIR%%/completions/a2enconf.fish
+%%DATADIR%%/completions/a2enmod.fish
+%%DATADIR%%/completions/a2ensite.fish
 %%DATADIR%%/completions/abbr.fish
 %%DATADIR%%/completions/abook.fish
 %%DATADIR%%/completions/acat.fish
@@ -16,6 +33,8 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/adduser.fish
 %%DATADIR%%/completions/adiff.fish
 %%DATADIR%%/completions/als.fish
+%%DATADIR%%/completions/alsactl.fish
+%%DATADIR%%/completions/alsamixer.fish
 %%DATADIR%%/completions/amixer.fish
 %%DATADIR%%/completions/anamnesis.fish
 %%DATADIR%%/completions/and.fish
@@ -51,8 +70,10 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/aptitude.fish
 %%DATADIR%%/completions/arepack.fish
 %%DATADIR%%/completions/arp.fish
+%%DATADIR%%/completions/asp.fish
 %%DATADIR%%/completions/at.fish
 %%DATADIR%%/completions/atd.fish
+%%DATADIR%%/completions/atom.fish
 %%DATADIR%%/completions/atool.fish
 %%DATADIR%%/completions/atq.fish
 %%DATADIR%%/completions/atrm.fish
@@ -73,6 +94,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/bundle.fish
 %%DATADIR%%/completions/bunzip2.fish
 %%DATADIR%%/completions/burp.fish
+%%DATADIR%%/completions/busctl.fish
 %%DATADIR%%/completions/bzcat.fish
 %%DATADIR%%/completions/bzip2.fish
 %%DATADIR%%/completions/bzip2recover.fish
@@ -81,6 +103,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/cabal.fish
 %%DATADIR%%/completions/cancel.fish
 %%DATADIR%%/completions/canto.fish
+%%DATADIR%%/completions/cargo.fish
 %%DATADIR%%/completions/case.fish
 %%DATADIR%%/completions/cat.fish
 %%DATADIR%%/completions/cd.fish
@@ -120,13 +143,14 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/dd.fish
 %%DATADIR%%/completions/df.fish
 %%DATADIR%%/completions/diff.fish
+%%DATADIR%%/completions/diskutil.fish
 %%DATADIR%%/completions/display.fish
 %%DATADIR%%/completions/djview.fish
 %%DATADIR%%/completions/djview3.fish
 %%DATADIR%%/completions/djview4.fish
 %%DATADIR%%/completions/dlocate.fish
 %%DATADIR%%/completions/dmesg.fish
-%%DATADIR%%/completions/docker.fish
+%%DATADIR%%/completions/dnf.fish
 %%DATADIR%%/completions/dpkg.fish
 %%DATADIR%%/completions/dropbox.fish
 %%DATADIR%%/completions/du.fish
@@ -143,6 +167,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/emacs.fish
 %%DATADIR%%/completions/emerge.fish
 %%DATADIR%%/completions/encfs.fish
+%%DATADIR%%/completions/entr.fish
 %%DATADIR%%/completions/env.fish
 %%DATADIR%%/completions/equery.fish
 %%DATADIR%%/completions/eselect.fish
@@ -174,6 +199,11 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/gem.fish
 %%DATADIR%%/completions/git.fish
 %%DATADIR%%/completions/go.fish
+%%DATADIR%%/completions/godoc.fish
+%%DATADIR%%/completions/gofmt.fish
+%%DATADIR%%/completions/goimports.fish
+%%DATADIR%%/completions/golint.fish
+%%DATADIR%%/completions/gorename.fish
 %%DATADIR%%/completions/gpasswd.fish
 %%DATADIR%%/completions/gpg.fish
 %%DATADIR%%/completions/gphoto2.fish
@@ -203,8 +233,10 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/ifup.fish
 %%DATADIR%%/completions/import.fish
 %%DATADIR%%/completions/invoke-rc.d.fish
+%%DATADIR%%/completions/iptables.fish
 %%DATADIR%%/completions/jobs.fish
 %%DATADIR%%/completions/journalctl.fish
+%%DATADIR%%/completions/kcmshell5.fish
 %%DATADIR%%/completions/kill.fish
 %%DATADIR%%/completions/killall.fish
 %%DATADIR%%/completions/kitchen.fish
@@ -215,6 +247,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/less.fish
 %%DATADIR%%/completions/ll.fish
 %%DATADIR%%/completions/ln.fish
+%%DATADIR%%/completions/localectl.fish
 %%DATADIR%%/completions/locate.fish
 %%DATADIR%%/completions/logkeys.fish
 %%DATADIR%%/completions/lp.fish
@@ -229,6 +262,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/lpstat.fish
 %%DATADIR%%/completions/ls.fish
 %%DATADIR%%/completions/lsblk.fish
+%%DATADIR%%/completions/lscpu.fish
 %%DATADIR%%/completions/lsof.fish
 %%DATADIR%%/completions/lsusb.fish
 %%DATADIR%%/completions/lua.fish
@@ -236,6 +270,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/lunchy.fish
 %%DATADIR%%/completions/lxpanel.fish
 %%DATADIR%%/completions/m4.fish
+%%DATADIR%%/completions/machinectl.fish
 %%DATADIR%%/completions/make.fish
 %%DATADIR%%/completions/makedepend.fish
 %%DATADIR%%/completions/makepkg.fish
@@ -243,10 +278,12 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/mc.fish
 %%DATADIR%%/completions/md5sum.fish
 %%DATADIR%%/completions/meat.fish
-%%DATADIR%%/completions/mimedb.fish
 %%DATADIR%%/completions/mix.fish
+%%DATADIR%%/completions/mkdir.fish
+%%DATADIR%%/completions/mkinitcpio.fish
 %%DATADIR%%/completions/mktemp.fish
 %%DATADIR%%/completions/mocp.fish
+%%DATADIR%%/completions/modinfo.fish
 %%DATADIR%%/completions/modprobe.fish
 %%DATADIR%%/completions/mogrify.fish
 %%DATADIR%%/completions/montage.fish
@@ -257,10 +294,12 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/mupdf.fish
 %%DATADIR%%/completions/mutt.fish
 %%DATADIR%%/completions/mv.fish
+%%DATADIR%%/completions/mvn.fish
 %%DATADIR%%/completions/namei.fish
 %%DATADIR%%/completions/native2ascii.fish
 %%DATADIR%%/completions/ncdu.fish
 %%DATADIR%%/completions/netcat.fish
+%%DATADIR%%/completions/netctl-auto.fish
 %%DATADIR%%/completions/netctl.fish
 %%DATADIR%%/completions/nextd.fish
 %%DATADIR%%/completions/nice.fish
@@ -270,16 +309,21 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/node.fish
 %%DATADIR%%/completions/not.fish
 %%DATADIR%%/completions/npm.fish
+%%DATADIR%%/completions/nvim.fish
 %%DATADIR%%/completions/obnam.fish
 %%DATADIR%%/completions/oggenc.fish
 %%DATADIR%%/completions/omega.fish
 %%DATADIR%%/completions/opam.fish
+%%DATADIR%%/completions/open.fish
 %%DATADIR%%/completions/or.fish
+%%DATADIR%%/completions/pacaur.fish
 %%DATADIR%%/completions/pacman-color.fish
 %%DATADIR%%/completions/pacman-key.fish
 %%DATADIR%%/completions/pacman.fish
 %%DATADIR%%/completions/pacmatic.fish
+%%DATADIR%%/completions/pacmd.fish
 %%DATADIR%%/completions/pacsrv.fish
+%%DATADIR%%/completions/pactl.fish
 %%DATADIR%%/completions/pactree.fish
 %%DATADIR%%/completions/patch.fish
 %%DATADIR%%/completions/pbget.fish
@@ -294,6 +338,8 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/pine.fish
 %%DATADIR%%/completions/ping.fish
 %%DATADIR%%/completions/pinky.fish
+%%DATADIR%%/completions/pkg-config.fish
+%%DATADIR%%/completions/pkg.fish
 %%DATADIR%%/completions/pkgadd.fish
 %%DATADIR%%/completions/pkgfile.fish
 %%DATADIR%%/completions/pkginfo.fish
@@ -304,6 +350,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/pon.fish
 %%DATADIR%%/completions/portmaster.fish
 %%DATADIR%%/completions/ports.fish
+%%DATADIR%%/completions/poweroff.fish
 %%DATADIR%%/completions/prevd.fish
 %%DATADIR%%/completions/prt-get.fish
 %%DATADIR%%/completions/ps.fish
@@ -332,16 +379,21 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/rgrep.fish
 %%DATADIR%%/completions/rm.fish
 %%DATADIR%%/completions/rmdir.fish
+%%DATADIR%%/completions/rmmod.fish
 %%DATADIR%%/completions/root.fish
 %%DATADIR%%/completions/rpm.fish
 %%DATADIR%%/completions/rsync.fish
 %%DATADIR%%/completions/ruby-build.fish
 %%DATADIR%%/completions/ruby.fish
+%%DATADIR%%/completions/rustc.fish
+%%DATADIR%%/completions/sass-convert.fish
+%%DATADIR%%/completions/sass.fish
 %%DATADIR%%/completions/scanimage.fish
 %%DATADIR%%/completions/scons.fish
 %%DATADIR%%/completions/scp.fish
 %%DATADIR%%/completions/screen.fish
 %%DATADIR%%/completions/scrot.fish
+%%DATADIR%%/completions/scss.fish
 %%DATADIR%%/completions/sed.fish
 %%DATADIR%%/completions/seq.fish
 %%DATADIR%%/completions/service.fish
@@ -358,21 +410,28 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/source.fish
 %%DATADIR%%/completions/ssh.fish
 %%DATADIR%%/completions/sshfs.fish
+%%DATADIR%%/completions/stack.fish
 %%DATADIR%%/completions/stat.fish
 %%DATADIR%%/completions/status.fish
 %%DATADIR%%/completions/stream.fish
+%%DATADIR%%/completions/string.fish
 %%DATADIR%%/completions/su.fish
 %%DATADIR%%/completions/sudo.fish
 %%DATADIR%%/completions/svn.fish
 %%DATADIR%%/completions/sylpheed.fish
+%%DATADIR%%/completions/sysctl.fish
 %%DATADIR%%/completions/systemctl.fish
+%%DATADIR%%/completions/systemd-analyze.fish
+%%DATADIR%%/completions/systemd-nspawn.fish
 %%DATADIR%%/completions/tail.fish
 %%DATADIR%%/completions/tar.fish
 %%DATADIR%%/completions/tee.fish
 %%DATADIR%%/completions/telnet.fish
+%%DATADIR%%/completions/termite.fish
 %%DATADIR%%/completions/test.fish
 %%DATADIR%%/completions/tex.fish
 %%DATADIR%%/completions/time.fish
+%%DATADIR%%/completions/timedatectl.fish
 %%DATADIR%%/completions/timeout.fish
 %%DATADIR%%/completions/tmux.fish
 %%DATADIR%%/completions/tmuxinator.fish
@@ -382,8 +441,10 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/tr.fish
 %%DATADIR%%/completions/transmission-remote.fish
 %%DATADIR%%/completions/trap.fish
+%%DATADIR%%/completions/travis.fish
 %%DATADIR%%/completions/tree.fish
 %%DATADIR%%/completions/type.fish
+%%DATADIR%%/completions/udisksctl.fish
 %%DATADIR%%/completions/ulimit.fish
 %%DATADIR%%/completions/umount.fish
 %%DATADIR%%/completions/uname.fish
@@ -426,6 +487,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/completions/xrdb.fish
 %%DATADIR%%/completions/xsel.fish
 %%DATADIR%%/completions/xterm.fish
+%%DATADIR%%/completions/xz.fish
 %%DATADIR%%/completions/yaourt.fish
 %%DATADIR%%/completions/yast2.fish
 %%DATADIR%%/completions/yum.fish
@@ -438,52 +500,40 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/functions/__fish_append.fish
 %%DATADIR%%/functions/__fish_bind_test1.fish
 %%DATADIR%%/functions/__fish_bind_test2.fish
+%%DATADIR%%/functions/__fish_cancel_commandline.fish
 %%DATADIR%%/functions/__fish_commandline_test.fish
 %%DATADIR%%/functions/__fish_complete_abook_formats.fish
 %%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
 %%DATADIR%%/functions/__fish_complete_command.fish
 %%DATADIR%%/functions/__fish_complete_convert_options.fish
-%%DATADIR%%/functions/__fish_complete_diff.fish
 %%DATADIR%%/functions/__fish_complete_directories.fish
 %%DATADIR%%/functions/__fish_complete_file_url.fish
 %%DATADIR%%/functions/__fish_complete_ftp.fish
-%%DATADIR%%/functions/__fish_complete_grep.fish
 %%DATADIR%%/functions/__fish_complete_groups.fish
+%%DATADIR%%/functions/__fish_complete_job_pids.fish
 %%DATADIR%%/functions/__fish_complete_list.fish
 %%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
 %%DATADIR%%/functions/__fish_complete_subcommand_root.fish
 %%DATADIR%%/functions/__fish_complete_suffix.fish
-%%DATADIR%%/functions/__fish_complete_svn.fish
 %%DATADIR%%/functions/__fish_complete_svn_diff.fish
 %%DATADIR%%/functions/__fish_complete_tar.fish
-%%DATADIR%%/functions/__fish_complete_tex.fish
 %%DATADIR%%/functions/__fish_complete_unrar.fish
 %%DATADIR%%/functions/__fish_complete_users.fish
-%%DATADIR%%/functions/__fish_complete_vi.fish
 %%DATADIR%%/functions/__fish_complete_wvdial_peers.fish
-%%DATADIR%%/functions/__fish_complete_xsum.fish
 %%DATADIR%%/functions/__fish_config_interactive.fish
 %%DATADIR%%/functions/__fish_contains_opt.fish
 %%DATADIR%%/functions/__fish_crux_packages.fish
@@ -491,7 +541,6 @@ man/man1/mimedb.1.gz
 %%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
@@ -512,6 +561,9 @@ man/man1/mimedb.1.gz
 %%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_apache_confs.fish
+%%DATADIR%%/functions/__fish_print_debian_apache_mods.fish
+%%DATADIR%%/functions/__fish_print_debian_apache_sites.fish
 %%DATADIR%%/functions/__fish_print_debian_services.fish
 %%DATADIR%%/functions/__fish_print_encodings.fish
 %%DATADIR%%/functions/__fish_print_filesystems.fish
@@ -523,8 +575,10 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/functions/__fish_print_lpr_printers.fish
 %%DATADIR%%/functions/__fish_print_lsblk_columns.fish
 %%DATADIR%%/functions/__fish_print_make_targets.fish
+%%DATADIR%%/functions/__fish_print_modules.fish
 %%DATADIR%%/functions/__fish_print_mounted.fish
 %%DATADIR%%/functions/__fish_print_packages.fish
+%%DATADIR%%/functions/__fish_print_pacman_repos.fish
 %%DATADIR%%/functions/__fish_print_service_names.fish
 %%DATADIR%%/functions/__fish_print_svn_rev.fish
 %%DATADIR%%/functions/__fish_print_users.fish
@@ -540,6 +594,8 @@ 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_sgrep.fish
+%%DATADIR%%/functions/__fish_svn_prompt.fish
 %%DATADIR%%/functions/__fish_systemctl_automounts.fish
 %%DATADIR%%/functions/__fish_systemctl_devices.fish
 %%DATADIR%%/functions/__fish_systemctl_mounts.fish
@@ -552,9 +608,13 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/functions/__fish_systemctl_swaps.fish
 %%DATADIR%%/functions/__fish_systemctl_targets.fish
 %%DATADIR%%/functions/__fish_systemctl_timers.fish
+%%DATADIR%%/functions/__fish_systemd_machine_images.fish
+%%DATADIR%%/functions/__fish_systemd_machines.fish
 %%DATADIR%%/functions/__fish_test_arg.fish
+%%DATADIR%%/functions/__fish_toggle_comment_commandline.fish
 %%DATADIR%%/functions/__fish_urlencode.fish
 %%DATADIR%%/functions/__fish_use_subcommand.fish
+%%DATADIR%%/functions/__fish_vcs_prompt.fish
 %%DATADIR%%/functions/__terlar_git_prompt.fish
 %%DATADIR%%/functions/abbr.fish
 %%DATADIR%%/functions/alias.fish
@@ -568,6 +628,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/functions/export.fish
 %%DATADIR%%/functions/fish_config.fish
 %%DATADIR%%/functions/fish_default_key_bindings.fish
+%%DATADIR%%/functions/fish_fallback_prompt.fish
 %%DATADIR%%/functions/fish_indent.fish
 %%DATADIR%%/functions/fish_mode_prompt.fish
 %%DATADIR%%/functions/fish_prompt.fish
@@ -587,7 +648,6 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/functions/ls.fish
 %%DATADIR%%/functions/man.fish
 %%DATADIR%%/functions/math.fish
-%%DATADIR%%/functions/mimedb.fish
 %%DATADIR%%/functions/nextd-or-forward-word.fish
 %%DATADIR%%/functions/nextd.fish
 %%DATADIR%%/functions/open.fish
@@ -597,9 +657,11 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/functions/prompt_pwd.fish
 %%DATADIR%%/functions/psub.fish
 %%DATADIR%%/functions/pushd.fish
+%%DATADIR%%/functions/realpath.fish
 %%DATADIR%%/functions/seq.fish
 %%DATADIR%%/functions/setenv.fish
-%%DATADIR%%/functions/sgrep.fish
+%%DATADIR%%/functions/string.fish
+%%DATADIR%%/functions/suspend.fish
 %%DATADIR%%/functions/trap.fish
 %%DATADIR%%/functions/type.fish
 %%DATADIR%%/functions/umask.fish
@@ -637,7 +699,9 @@ man/man1/mimedb.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_key_reader.1.gz
 %%DATADIR%%/man/man1/fish_prompt.1.gz
+%%DATADIR%%/man/man1/fish_realpath.1.gz
 %%DATADIR%%/man/man1/fish_right_prompt.1.gz
 %%DATADIR%%/man/man1/fish_update_completions.1.gz
 %%DATADIR%%/man/man1/fish_vi_mode.1.gz
@@ -652,13 +716,14 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/man/man1/isatty.1.gz
 %%DATADIR%%/man/man1/jobs.1.gz
 %%DATADIR%%/man/man1/math.1.gz
-%%DATADIR%%/man/man1/mimedb.1.gz
 %%DATADIR%%/man/man1/nextd.1.gz
 %%DATADIR%%/man/man1/not.1.gz
 %%DATADIR%%/man/man1/open.1.gz
 %%DATADIR%%/man/man1/or.1.gz
 %%DATADIR%%/man/man1/popd.1.gz
 %%DATADIR%%/man/man1/prevd.1.gz
+%%DATADIR%%/man/man1/printf.1.gz
+%%DATADIR%%/man/man1/prompt_pwd.1.gz
 %%DATADIR%%/man/man1/psub.1.gz
 %%DATADIR%%/man/man1/pushd.1.gz
 %%DATADIR%%/man/man1/pwd.1.gz
@@ -669,6 +734,8 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/man/man1/set_color.1.gz
 %%DATADIR%%/man/man1/source.1.gz
 %%DATADIR%%/man/man1/status.1.gz
+%%DATADIR%%/man/man1/string.1.gz
+%%DATADIR%%/man/man1/suspend.1.gz
 %%DATADIR%%/man/man1/switch.1.gz
 %%DATADIR%%/man/man1/test.1.gz
 %%DATADIR%%/man/man1/trap.1.gz
@@ -681,6 +748,7 @@ man/man1/mimedb.1.gz
 %%DATADIR%%/tools/create_manpage_completions.py
 %%DATADIR%%/tools/deroff.py
 %%DATADIR%%/tools/web_config/delete.png
+%%DATADIR%%/tools/web_config/favicon.png
 %%DATADIR%%/tools/web_config/fishconfig.css
 %%DATADIR%%/tools/web_config/index.html
 %%DATADIR%%/tools/web_config/js/angular.js
@@ -695,12 +763,13 @@ man/man1/mimedb.1.gz
 %%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/acidhub.fish
 %%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/classic_vcs.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/informative_vcs.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
@@ -708,14 +777,17 @@ man/man1/mimedb.1.gz
 %%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/sorin.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
+share/locale/de/LC_MESSAGES/fish.mo
+share/locale/en/LC_MESSAGES/fish.mo
+share/locale/fr/LC_MESSAGES/fish.mo
+share/locale/pt_BR/LC_MESSAGES/fish.mo
+share/locale/sv/LC_MESSAGES/fish.mo
+share/locale/zh_CN/LC_MESSAGES/fish.mo
+@dir %%ETCDIR%%/conf.d
 @dir %%DATADIR%%/vendor_completions.d
+@dir %%DATADIR%%/vendor_conf.d
+@dir %%DATADIR%%/vendor_functions.d