shells/fish: Update to 3.2.1

While here, appease both portclippy/portfmt and simplify port.

Changes:		https://github.com/fish-shell/fish-shell/releases/tag/3.2.0
			https://github.com/fish-shell/fish-shell/releases/tag/3.2.1
PR:			254388
Reviewed by: 		asomers (maintainer)
Approved by:		fernape (mentor)
Differential Revision:	https://reviews.freebsd.org/D29395
This commit is contained in:
Lewis Cook 2021-03-24 11:29:40 +00:00
parent 6bee2d4a13
commit 7789398d16
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=569108
4 changed files with 215 additions and 47 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= fish
PORTVERSION= 3.1.2
DISTVERSION= 3.2.1
CATEGORIES= shells
MASTER_SITES= https://github.com/fish-shell/fish-shell/releases/download/${PORTVERSION}/
@ -10,36 +10,40 @@ MAINTAINER= asomers@FreeBSD.org
COMMENT= User friendly command line shell
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS+= libpcre2-32.so:devel/pcre2
LIB_DEPENDS= libpcre2-32.so:devel/pcre2
# The python dependency is only needed by shebangfix. At runtime python is
# only needed by some optional scripts that aren't in PATH.
USES= cmake cpe ncurses python:3.4+,build \
localbase compiler:c++11-lang shebangfix
USES= cmake compiler:c++11-lang cpe localbase ncurses python:3.6+,env \
shebangfix tar:xz
CPE_VENDOR= fishshell
SHEBANG_FILES= share/tools/*.py share/tools/web_config/webconfig.py
# sphinx stuff seems to be racy
MAKE_JOBS_UNSAFE= yes
CONFLICTS_INSTALL= comms/mlan3
CPE_VENDOR= fishshell
MANDIRS= ${DATADIR}/man/man1
OPTIONS_DEFAULT= MANPAGES DOCS NLS
OPTIONS_DEFINE= MANPAGES DOCS NLS
OPTIONS_SUB= yes
MAKE_JOBS_UNSAFE=yes # sphinx stuff seems to be racy
DOCS_BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx
MANPAGES_BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx
NLS_USES= gettext
NLS_CMAKE_BOOL= WITH_GETTEXT
PORTDOCS= *
OPTIONS_DEFINE= DOCS MANPAGES NLS
OPTIONS_DEFAULT= DOCS MANPAGES NLS
OPTIONS_SUB= yes
NLS_USES= gettext
NLS_CMAKE_BOOL= WITH_GETTEXT
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
CMAKE_ARGS+= -DBUILD_DOCS=TRUE
BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx
.endif
.if ${NCURSESBASE:M${LOCALBASE}}
CMAKE_ARGS+= -DCURSES_NEED_NCURSES=TRUE
.endif

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1590245573
SHA256 (fish-3.1.2.tar.gz) = d5b927203b5ca95da16f514969e2a91a537b2f75bec9b21a584c4cd1c7aa74ed
SIZE (fish-3.1.2.tar.gz) = 6816214
TIMESTAMP = 1616090214
SHA256 (fish-3.2.1.tar.xz) = d8e49f4090d3778df17dd825e4a2a80192015682423cd9dd02b6675d65c3af5b
SIZE (fish-3.2.1.tar.xz) = 3409808

View file

@ -1,20 +1,20 @@
--- cmake/Install.cmake.orig 2020-02-23 21:32:06 UTC
--- cmake/Install.cmake.orig 2021-03-18 18:04:54 UTC
+++ cmake/Install.cmake
@@ -119,7 +119,7 @@ FISH_CREATE_DIRS(${rel_datadir}/fish/vendor_completion
@@ -102,7 +102,7 @@ install(FILES share/config.fish
fish_create_dirs(${rel_datadir}/fish/vendor_completions.d ${rel_datadir}/fish/vendor_functions.d
${rel_datadir}/fish/vendor_conf.d)
# @echo "Installing pkgconfig file"
# $v $(INSTALL) -m 644 fish.pc $(DESTDIR)$(datadir)/pkgconfig
-FISH_TRY_CREATE_DIRS(${rel_datadir}/pkgconfig)
+FISH_TRY_CREATE_DIRS(${rel_datadir}/../libdata/pkgconfig)
CONFIGURE_FILE(fish.pc.in fish.pc.noversion)
-fish_try_create_dirs(${rel_datadir}/pkgconfig)
+fish_try_create_dirs(${rel_datadir}/../libdata/pkgconfig)
configure_file(fish.pc.in fish.pc.noversion @ONLY)
ADD_CUSTOM_COMMAND(OUTPUT fish.pc
@@ -132,7 +132,7 @@ ADD_CUSTOM_COMMAND(OUTPUT fish.pc
ADD_CUSTOM_TARGET(build_fish_pc ALL DEPENDS fish.pc)
add_custom_command(OUTPUT fish.pc
@@ -115,7 +115,7 @@ add_custom_command(OUTPUT fish.pc
add_custom_target(build_fish_pc ALL DEPENDS fish.pc)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/fish.pc
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fish.pc
- DESTINATION ${rel_datadir}/pkgconfig)
+ DESTINATION ${rel_datadir}/../libdata/pkgconfig)
# @echo "Installing the $(bo)fish completion library$(sgr0)...";
# $v $(INSTALL) -m 644 $(COMPLETIONS_DIR_FILES:%='%') $(DESTDIR)$(datadir)/fish/completions/
install(DIRECTORY share/completions/
DESTINATION ${rel_datadir}/fish/completions

View file

@ -1,12 +1,18 @@
@shell bin/fish
bin/fish_indent
bin/fish_key_reader
share/applications/fish.desktop
share/pixmaps/fish.png
%%ETCDIR%%/config.fish
libdata/pkgconfig/fish.pc
%%MANPAGES%%man/man1/fish.1.gz
%%MANPAGES%%man/man1/fish_indent.1.gz
%%MANPAGES%%man/man1/fish_key_reader.1.gz
%%DATADIR%%/__fish_build_paths.fish
%%DATADIR%%/completions/..fish
%%DATADIR%%/completions/7z.fish
%%DATADIR%%/completions/7za.fish
%%DATADIR%%/completions/7zr.fish
%%DATADIR%%/completions/VBoxHeadless.fish
%%DATADIR%%/completions/VBoxSDL.fish
%%DATADIR%%/completions/a2disconf.fish
@ -24,9 +30,11 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/adb.fish
%%DATADIR%%/completions/adduser.fish
%%DATADIR%%/completions/adiff.fish
%%DATADIR%%/completions/alias.fish
%%DATADIR%%/completions/als.fish
%%DATADIR%%/completions/alsactl.fish
%%DATADIR%%/completions/alsamixer.fish
%%DATADIR%%/completions/alternatives.fish
%%DATADIR%%/completions/amixer.fish
%%DATADIR%%/completions/and.fish
%%DATADIR%%/completions/animate.fish
@ -36,6 +44,7 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/ansible.fish
%%DATADIR%%/completions/ant.fish
%%DATADIR%%/completions/apack.fish
%%DATADIR%%/completions/apk.fish
%%DATADIR%%/completions/apm.fish
%%DATADIR%%/completions/apropos.fish
%%DATADIR%%/completions/apt-build.fish
@ -67,6 +76,7 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/arepack.fish
%%DATADIR%%/completions/arp.fish
%%DATADIR%%/completions/as.fish
%%DATADIR%%/completions/asciidoctor.fish
%%DATADIR%%/completions/asp.fish
%%DATADIR%%/completions/at.fish
%%DATADIR%%/completions/atd.fish
@ -76,6 +86,8 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/atrm.fish
%%DATADIR%%/completions/aunpack.fish
%%DATADIR%%/completions/aura.fish
%%DATADIR%%/completions/avifdec.fish
%%DATADIR%%/completions/avifenc.fish
%%DATADIR%%/completions/awk.fish
%%DATADIR%%/completions/aws.fish
%%DATADIR%%/completions/badblocks.fish
@ -88,6 +100,8 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/bind.fish
%%DATADIR%%/completions/bison.fish
%%DATADIR%%/completions/block.fish
%%DATADIR%%/completions/bluetoothctl.fish
%%DATADIR%%/completions/bootctl.fish
%%DATADIR%%/completions/bosh.fish
%%DATADIR%%/completions/bower.fish
%%DATADIR%%/completions/break.fish
@ -122,9 +136,11 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/chown.fish
%%DATADIR%%/completions/chronyc.fish
%%DATADIR%%/completions/chsh.fish
%%DATADIR%%/completions/cjxl.fish
%%DATADIR%%/completions/clang++.fish
%%DATADIR%%/completions/clang.fish
%%DATADIR%%/completions/climate.fish
%%DATADIR%%/completions/cmark.fish
%%DATADIR%%/completions/code.fish
%%DATADIR%%/completions/colordiff.fish
%%DATADIR%%/completions/colorsvn.fish
@ -142,9 +158,12 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/connmanctl.fish
%%DATADIR%%/completions/continue.fish
%%DATADIR%%/completions/convert.fish
%%DATADIR%%/completions/coredumpctl.fish
%%DATADIR%%/completions/cowsay.fish
%%DATADIR%%/completions/cowthink.fish
%%DATADIR%%/completions/cp.fish
%%DATADIR%%/completions/create_ap.fish
%%DATADIR%%/completions/createdb.fish
%%DATADIR%%/completions/cryptsetup.fish
%%DATADIR%%/completions/csc.fish
%%DATADIR%%/completions/csi.fish
@ -164,7 +183,9 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/dconf.fish
%%DATADIR%%/completions/dd.fish
%%DATADIR%%/completions/defaults.fish
%%DATADIR%%/completions/deno.fish
%%DATADIR%%/completions/df.fish
%%DATADIR%%/completions/dhclient.fish
%%DATADIR%%/completions/dhcpcd.fish
%%DATADIR%%/completions/diff.fish
%%DATADIR%%/completions/dig.fish
@ -172,14 +193,20 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/display.fish
%%DATADIR%%/completions/djview.fish
%%DATADIR%%/completions/djview4.fish
%%DATADIR%%/completions/djxl.fish
%%DATADIR%%/completions/dlocate.fish
%%DATADIR%%/completions/dm-tool.fish
%%DATADIR%%/completions/dmesg.fish
%%DATADIR%%/completions/dnf.fish
%%DATADIR%%/completions/doas.fish
%%DATADIR%%/completions/docker.fish
%%DATADIR%%/completions/dotnet.fish
%%DATADIR%%/completions/downgrade.fish
%%DATADIR%%/completions/dpkg-reconfigure.fish
%%DATADIR%%/completions/dpkg.fish
%%DATADIR%%/completions/dropdb.fish
%%DATADIR%%/completions/du.fish
%%DATADIR%%/completions/dumpcap.fish
%%DATADIR%%/completions/duply.fish
%%DATADIR%%/completions/dvipdf.fish
%%DATADIR%%/completions/dvipdfm.fish
@ -219,7 +246,9 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/file.fish
%%DATADIR%%/completions/find.fish
%%DATADIR%%/completions/fish.fish
%%DATADIR%%/completions/fish_add_path.fish
%%DATADIR%%/completions/fish_indent.fish
%%DATADIR%%/completions/fish_key_reader.fish
%%DATADIR%%/completions/flac.fish
%%DATADIR%%/completions/flatpak.fish
%%DATADIR%%/completions/fluxbox-remote.fish
@ -236,10 +265,15 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/fusermount.fish
%%DATADIR%%/completions/fzf.fish
%%DATADIR%%/completions/g++.fish
%%DATADIR%%/completions/gapplication.fish
%%DATADIR%%/completions/gcc.fish
%%DATADIR%%/completions/gdb.fish
%%DATADIR%%/completions/gdbus.fish
%%DATADIR%%/completions/gem.fish
%%DATADIR%%/completions/gh.fish
%%DATADIR%%/completions/gio.fish
%%DATADIR%%/completions/git.fish
%%DATADIR%%/completions/gitk.fish
%%DATADIR%%/completions/go.fish
%%DATADIR%%/completions/godoc.fish
%%DATADIR%%/completions/gofmt.fish
@ -254,7 +288,9 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/gprof.fish
%%DATADIR%%/completions/gradle.fish
%%DATADIR%%/completions/grep.fish
%%DATADIR%%/completions/gresource.fish
%%DATADIR%%/completions/groupadd.fish
%%DATADIR%%/completions/groups.fish
%%DATADIR%%/completions/grub-file.fish
%%DATADIR%%/completions/grub-install.fish
%%DATADIR%%/completions/grub-mkrescue.fish
@ -265,19 +301,24 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/gvim.fish
%%DATADIR%%/completions/gvimdiff.fish
%%DATADIR%%/completions/gzip.fish
%%DATADIR%%/completions/hashcat.fish
%%DATADIR%%/completions/head.fish
%%DATADIR%%/completions/helm.fish
%%DATADIR%%/completions/help.fish
%%DATADIR%%/completions/heroku.fish
%%DATADIR%%/completions/hg.fish
%%DATADIR%%/completions/highlight.fish
%%DATADIR%%/completions/hikari.fish
%%DATADIR%%/completions/history.fish
%%DATADIR%%/completions/hjson.fish
%%DATADIR%%/completions/hledger.fish
%%DATADIR%%/completions/homectl.fish
%%DATADIR%%/completions/hostnamectl.fish
%%DATADIR%%/completions/htop.fish
%%DATADIR%%/completions/hugo.fish
%%DATADIR%%/completions/hwinfo.fish
%%DATADIR%%/completions/i3-msg.fish
%%DATADIR%%/completions/icdiff.fish
%%DATADIR%%/completions/iconv.fish
%%DATADIR%%/completions/id.fish
%%DATADIR%%/completions/identify.fish
@ -288,6 +329,7 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/ifdown.fish
%%DATADIR%%/completions/ifup.fish
%%DATADIR%%/completions/import.fish
%%DATADIR%%/completions/imv.fish
%%DATADIR%%/completions/invoke-rc.d.fish
%%DATADIR%%/completions/ip.fish
%%DATADIR%%/completions/ipset.fish
@ -299,8 +341,11 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/jest.fish
%%DATADIR%%/completions/jhipster.fish
%%DATADIR%%/completions/jobs.fish
%%DATADIR%%/completions/john.fish
%%DATADIR%%/completions/journalctl.fish
%%DATADIR%%/completions/jq.fish
%%DATADIR%%/completions/julia.fish
%%DATADIR%%/completions/k3d.fish
%%DATADIR%%/completions/kak.fish
%%DATADIR%%/completions/kcmshell5.fish
%%DATADIR%%/completions/kdeconnect-cli.fish
@ -316,15 +361,18 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/latex.fish
%%DATADIR%%/completions/latexmk.fish
%%DATADIR%%/completions/launchctl.fish
%%DATADIR%%/completions/ldapsearch.fish
%%DATADIR%%/completions/lein.fish
%%DATADIR%%/completions/less.fish
%%DATADIR%%/completions/light.fish
%%DATADIR%%/completions/lightdm.fish
%%DATADIR%%/completions/ll.fish
%%DATADIR%%/completions/ln.fish
%%DATADIR%%/completions/localectl.fish
%%DATADIR%%/completions/locate.fish
%%DATADIR%%/completions/loginctl.fish
%%DATADIR%%/completions/logkeys.fish
%%DATADIR%%/completions/losetup.fish
%%DATADIR%%/completions/lp.fish
%%DATADIR%%/completions/lpadmin.fish
%%DATADIR%%/completions/lpinfo.fish
@ -368,6 +416,7 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/mdls.fish
%%DATADIR%%/completions/mdutil.fish
%%DATADIR%%/completions/meson.fish
%%DATADIR%%/completions/micro.fish
%%DATADIR%%/completions/minikube.fish
%%DATADIR%%/completions/mix.fish
%%DATADIR%%/completions/mkdir.fish
@ -376,6 +425,7 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/mkfs.fat.fish
%%DATADIR%%/completions/mkfs.vfat.fish
%%DATADIR%%/completions/mkinitcpio.fish
%%DATADIR%%/completions/mkpasswd.fish
%%DATADIR%%/completions/mktemp.fish
%%DATADIR%%/completions/mkvextract.fish
%%DATADIR%%/completions/mocha.fish
@ -386,16 +436,28 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/montage.fish
%%DATADIR%%/completions/mosh.fish
%%DATADIR%%/completions/mount.fish
%%DATADIR%%/completions/mpc.fish
%%DATADIR%%/completions/mplayer.fish
%%DATADIR%%/completions/mpv.fish
%%DATADIR%%/completions/msfconsole.fish
%%DATADIR%%/completions/msfdb.fish
%%DATADIR%%/completions/msfvenom.fish
%%DATADIR%%/completions/msgfmt.fish
%%DATADIR%%/completions/mtr.fish
%%DATADIR%%/completions/mupdf.fish
%%DATADIR%%/completions/mutt.fish
%%DATADIR%%/completions/mv.fish
%%DATADIR%%/completions/mvn.fish
%%DATADIR%%/completions/mysql.fish
%%DATADIR%%/completions/mysqldump.fish
%%DATADIR%%/completions/namei.fish
%%DATADIR%%/completions/native2ascii.fish
%%DATADIR%%/completions/nc.fish
%%DATADIR%%/completions/nc.openbsd.fish
%%DATADIR%%/completions/nc.traditional.fish
%%DATADIR%%/completions/ncat.fish
%%DATADIR%%/completions/ncdu.fish
%%DATADIR%%/completions/netcat.fish
%%DATADIR%%/completions/netctl-auto.fish
%%DATADIR%%/completions/netctl.fish
%%DATADIR%%/completions/nethack.fish
@ -406,6 +468,7 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/ninja.fish
%%DATADIR%%/completions/nl.fish
%%DATADIR%%/completions/nm.fish
%%DATADIR%%/completions/nmap.fish
%%DATADIR%%/completions/nmcli.fish
%%DATADIR%%/completions/node.fish
%%DATADIR%%/completions/not.fish
@ -419,6 +482,7 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/opam.fish
%%DATADIR%%/completions/open.fish
%%DATADIR%%/completions/openocd.fish
%%DATADIR%%/completions/openssl.fish
%%DATADIR%%/completions/opkg.fish
%%DATADIR%%/completions/optipng.fish
%%DATADIR%%/completions/or.fish
@ -444,8 +508,12 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/perl.fish
%%DATADIR%%/completions/pfctl.fish
%%DATADIR%%/completions/pftp.fish
%%DATADIR%%/completions/pg_dump.fish
%%DATADIR%%/completions/pg_dumpall.fish
%%DATADIR%%/completions/pg_restore.fish
%%DATADIR%%/completions/pgrep.fish
%%DATADIR%%/completions/phpunit.fish
%%DATADIR%%/completions/pidof.fish
%%DATADIR%%/completions/pine.fish
%%DATADIR%%/completions/ping.fish
%%DATADIR%%/completions/pinky.fish
@ -473,15 +541,21 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/poweroff.fish
%%DATADIR%%/completions/powerpill.fish
%%DATADIR%%/completions/prevd.fish
%%DATADIR%%/completions/prime-run.fish
%%DATADIR%%/completions/prt-get.fish
%%DATADIR%%/completions/ps.fish
%%DATADIR%%/completions/ps2pdf.fish
%%DATADIR%%/completions/ps2pdf12.fish
%%DATADIR%%/completions/ps2pdf13.fish
%%DATADIR%%/completions/ps2pdf14.fish
%%DATADIR%%/completions/ps2pdfwr.fish
%%DATADIR%%/completions/psql.fish
%%DATADIR%%/completions/pstack.fish
%%DATADIR%%/completions/psub.fish
%%DATADIR%%/completions/pushd.fish
%%DATADIR%%/completions/pv.fish
%%DATADIR%%/completions/pydf.fish
%%DATADIR%%/completions/pyenv.fish
%%DATADIR%%/completions/pygmentize.fish
%%DATADIR%%/completions/python.fish
%%DATADIR%%/completions/python2.fish
@ -510,6 +584,17 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/rmmod.fish
%%DATADIR%%/completions/root.fish
%%DATADIR%%/completions/rpm.fish
%%DATADIR%%/completions/rst2html.fish
%%DATADIR%%/completions/rst2html4.fish
%%DATADIR%%/completions/rst2html5.fish
%%DATADIR%%/completions/rst2latex.fish
%%DATADIR%%/completions/rst2man.fish
%%DATADIR%%/completions/rst2odt.fish
%%DATADIR%%/completions/rst2pseudoxml.fish
%%DATADIR%%/completions/rst2s5.fish
%%DATADIR%%/completions/rst2xetex.fish
%%DATADIR%%/completions/rst2xml.fish
%%DATADIR%%/completions/rstpep2html.fish
%%DATADIR%%/completions/rsync.fish
%%DATADIR%%/completions/ruby-build.fish
%%DATADIR%%/completions/ruby.fish
@ -535,6 +620,7 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/setsid.fish
%%DATADIR%%/completions/setxkbmap.fish
%%DATADIR%%/completions/sfdx.fish
%%DATADIR%%/completions/sftp.fish
%%DATADIR%%/completions/sha1sum.fish
%%DATADIR%%/completions/sha224sum.fish
%%DATADIR%%/completions/sha256sum.fish
@ -543,14 +629,21 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/signify.fish
%%DATADIR%%/completions/snap.fish
%%DATADIR%%/completions/sort.fish
%%DATADIR%%/completions/source.fish
%%DATADIR%%/completions/spago.fish
%%DATADIR%%/completions/speedtest-cli.fish
%%DATADIR%%/completions/speedtest.fish
%%DATADIR%%/completions/sphinx-apidoc.fish
%%DATADIR%%/completions/sphinx-autogen.fish
%%DATADIR%%/completions/sphinx-build.fish
%%DATADIR%%/completions/sphinx-quickstart.fish
%%DATADIR%%/completions/src.fish
%%DATADIR%%/completions/ssh.fish
%%DATADIR%%/completions/sshfs.fish
%%DATADIR%%/completions/stack.fish
%%DATADIR%%/completions/stat.fish
%%DATADIR%%/completions/status.fish
%%DATADIR%%/completions/strace.fish
%%DATADIR%%/completions/stream.fish
%%DATADIR%%/completions/string.fish
%%DATADIR%%/completions/su.fish
@ -558,6 +651,7 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/sudo.fish
%%DATADIR%%/completions/svn.fish
%%DATADIR%%/completions/sylpheed.fish
%%DATADIR%%/completions/synclient.fish
%%DATADIR%%/completions/sysbench.fish
%%DATADIR%%/completions/sysctl.fish
%%DATADIR%%/completions/systemctl.fish
@ -565,12 +659,14 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/systemd-nspawn.fish
%%DATADIR%%/completions/tail.fish
%%DATADIR%%/completions/tar.fish
%%DATADIR%%/completions/tcpdump.fish
%%DATADIR%%/completions/tee.fish
%%DATADIR%%/completions/telnet.fish
%%DATADIR%%/completions/termite.fish
%%DATADIR%%/completions/terraform.fish
%%DATADIR%%/completions/test.fish
%%DATADIR%%/completions/tex.fish
%%DATADIR%%/completions/tig.fish
%%DATADIR%%/completions/time.fish
%%DATADIR%%/completions/timedatectl.fish
%%DATADIR%%/completions/timeout.fish
@ -582,13 +678,17 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/totem.fish
%%DATADIR%%/completions/touch.fish
%%DATADIR%%/completions/tr.fish
%%DATADIR%%/completions/tracepath.fish
%%DATADIR%%/completions/traceroute.fish
%%DATADIR%%/completions/transmission-remote.fish
%%DATADIR%%/completions/trap.fish
%%DATADIR%%/completions/travis.fish
%%DATADIR%%/completions/tree.fish
%%DATADIR%%/completions/tsc.fish
%%DATADIR%%/completions/tshark.fish
%%DATADIR%%/completions/ttx.fish
%%DATADIR%%/completions/type.fish
%%DATADIR%%/completions/udevadm.fish
%%DATADIR%%/completions/udisksctl.fish
%%DATADIR%%/completions/ulimit.fish
%%DATADIR%%/completions/umask.fish
@ -603,6 +703,7 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/update-eix-remote.fish
%%DATADIR%%/completions/update-eix.fish
%%DATADIR%%/completions/useradd.fish
%%DATADIR%%/completions/userdbctl.fish
%%DATADIR%%/completions/usermod.fish
%%DATADIR%%/completions/vagrant.fish
%%DATADIR%%/completions/valgrind.fish
@ -612,9 +713,11 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/vim-addons.fish
%%DATADIR%%/completions/vim.fish
%%DATADIR%%/completions/vimdiff.fish
%%DATADIR%%/completions/vips.fish
%%DATADIR%%/completions/virsh.fish
%%DATADIR%%/completions/vmctl.fish
%%DATADIR%%/completions/w.fish
%%DATADIR%%/completions/wait.fish
%%DATADIR%%/completions/wajig.fish
%%DATADIR%%/completions/watch.fish
%%DATADIR%%/completions/wc.fish
@ -627,9 +730,26 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/wicd-cli.fish
%%DATADIR%%/completions/wicd-client.fish
%%DATADIR%%/completions/wicd-gtk.fish
%%DATADIR%%/completions/windscribe.fish
%%DATADIR%%/completions/wireshark.fish
%%DATADIR%%/completions/wpa_cli.fish
%%DATADIR%%/completions/wvdial.fish
%%DATADIR%%/completions/xargs.fish
%%DATADIR%%/completions/xbps-alternatives.fish
%%DATADIR%%/completions/xbps-checkvers.fish
%%DATADIR%%/completions/xbps-create.fish
%%DATADIR%%/completions/xbps-dgraph.fish
%%DATADIR%%/completions/xbps-digest.fish
%%DATADIR%%/completions/xbps-fbulk.fish
%%DATADIR%%/completions/xbps-fetch.fish
%%DATADIR%%/completions/xbps-install.fish
%%DATADIR%%/completions/xbps-pkgdb.fish
%%DATADIR%%/completions/xbps-query.fish
%%DATADIR%%/completions/xbps-reconfigure.fish
%%DATADIR%%/completions/xbps-remove.fish
%%DATADIR%%/completions/xbps-rindex.fish
%%DATADIR%%/completions/xbps-uchroot.fish
%%DATADIR%%/completions/xbps-uhelper.fish
%%DATADIR%%/completions/xclip.fish
%%DATADIR%%/completions/xdg-mime.fish
%%DATADIR%%/completions/xdvi.fish
@ -644,7 +764,12 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/xsel.fish
%%DATADIR%%/completions/xsv.fish
%%DATADIR%%/completions/xterm.fish
%%DATADIR%%/completions/xxh128sum.fish
%%DATADIR%%/completions/xxh32sum.fish
%%DATADIR%%/completions/xxh64sum.fish
%%DATADIR%%/completions/xxhsum.fish
%%DATADIR%%/completions/xz.fish
%%DATADIR%%/completions/yadm.fish
%%DATADIR%%/completions/yaourt.fish
%%DATADIR%%/completions/yarn.fish
%%DATADIR%%/completions/yast2.fish
@ -652,6 +777,8 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/zcat.fish
%%DATADIR%%/completions/zfs.fish
%%DATADIR%%/completions/zip.fish
%%DATADIR%%/completions/zopfli.fish
%%DATADIR%%/completions/zopflipng.fish
%%DATADIR%%/completions/zpaq.fish
%%DATADIR%%/completions/zpool.fish
%%DATADIR%%/completions/zstd.fish
@ -662,26 +789,27 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/completions/zypper.fish
%%DATADIR%%/config.fish
%%DATADIR%%/functions/N_.fish
%%DATADIR%%/functions/_.fish
%%DATADIR%%/functions/__fish_abbr_old.fish
%%DATADIR%%/functions/__fish_any_arg_in.fish
%%DATADIR%%/functions/__fish_anypython.fish
%%DATADIR%%/functions/__fish_append.fish
%%DATADIR%%/functions/__fish_apropos.fish
%%DATADIR%%/functions/__fish_cancel_commandline.fish
%%DATADIR%%/functions/__fish_clang_complete.fish
%%DATADIR%%/functions/__fish_commandline_is_singlequoted.fish
%%DATADIR%%/functions/__fish_complete_atool_archive_contents.fish
%%DATADIR%%/functions/__fish_complete_bittorrent.fish
%%DATADIR%%/functions/__fish_complete_blockdevice.fish
%%DATADIR%%/functions/__fish_complete_cd.fish
%%DATADIR%%/functions/__fish_complete_clang.fish
%%DATADIR%%/functions/__fish_complete_command.fish
%%DATADIR%%/functions/__fish_complete_convert_options.fish
%%DATADIR%%/functions/__fish_complete_directories.fish
%%DATADIR%%/functions/__fish_complete_external_command.fish
%%DATADIR%%/functions/__fish_complete_docutils.fish
%%DATADIR%%/functions/__fish_complete_ftp.fish
%%DATADIR%%/functions/__fish_complete_gpg.fish
%%DATADIR%%/functions/__fish_complete_gpg_key_id.fish
%%DATADIR%%/functions/__fish_complete_gpg_user_id.fish
%%DATADIR%%/functions/__fish_complete_group_ids.fish
%%DATADIR%%/functions/__fish_complete_groups.fish
%%DATADIR%%/functions/__fish_complete_job_pids.fish
%%DATADIR%%/functions/__fish_complete_list.fish
@ -689,7 +817,11 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/functions/__fish_complete_lpr_option.fish
%%DATADIR%%/functions/__fish_complete_man.fish
%%DATADIR%%/functions/__fish_complete_mount_opts.fish
%%DATADIR%%/functions/__fish_complete_mysql.fish
%%DATADIR%%/functions/__fish_complete_netcat.fish
%%DATADIR%%/functions/__fish_complete_path.fish
%%DATADIR%%/functions/__fish_complete_pg_database.fish
%%DATADIR%%/functions/__fish_complete_pg_user.fish
%%DATADIR%%/functions/__fish_complete_pgrep.fish
%%DATADIR%%/functions/__fish_complete_pids.fish
%%DATADIR%%/functions/__fish_complete_ppp_peer.fish
@ -698,7 +830,9 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/functions/__fish_complete_subcommand.fish
%%DATADIR%%/functions/__fish_complete_suffix.fish
%%DATADIR%%/functions/__fish_complete_user_at_hosts.fish
%%DATADIR%%/functions/__fish_complete_user_ids.fish
%%DATADIR%%/functions/__fish_complete_users.fish
%%DATADIR%%/functions/__fish_complete_wireshark.fish
%%DATADIR%%/functions/__fish_complete_zfs_mountpoint_properties.fish
%%DATADIR%%/functions/__fish_complete_zfs_pools.fish
%%DATADIR%%/functions/__fish_complete_zfs_ro_properties.fish
@ -718,26 +852,28 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/functions/__fish_is_first_arg.fish
%%DATADIR%%/functions/__fish_is_first_token.fish
%%DATADIR%%/functions/__fish_is_git_repository.fish
%%DATADIR%%/functions/__fish_is_nth_token.fish
%%DATADIR%%/functions/__fish_is_switch.fish
%%DATADIR%%/functions/__fish_is_token_n.fish
%%DATADIR%%/functions/__fish_is_zfs_feature_enabled.fish
%%DATADIR%%/functions/__fish_list_current_token.fish
%%DATADIR%%/functions/__fish_make_cache_dir.fish
%%DATADIR%%/functions/__fish_make_completion_signals.fish
%%DATADIR%%/functions/__fish_man_page.fish
%%DATADIR%%/functions/__fish_md5.fish
%%DATADIR%%/functions/__fish_move_last.fish
%%DATADIR%%/functions/__fish_no_arguments.fish
%%DATADIR%%/functions/__fish_not_contain_opt.fish
%%DATADIR%%/functions/__fish_npm_helper.fish
%%DATADIR%%/functions/__fish_number_of_cmd_args_wo_opts.fish
%%DATADIR%%/functions/__fish_paginate.fish
%%DATADIR%%/functions/__fish_parent_directories.fish
%%DATADIR%%/functions/__fish_pipestatus_with_signal.fish
%%DATADIR%%/functions/__fish_portage_print_available_pkgs.fish
%%DATADIR%%/functions/__fish_portage_print_installed_pkgs.fish
%%DATADIR%%/functions/__fish_portage_print_repository_paths.fish
%%DATADIR%%/functions/__fish_prepend_sudo.fish
%%DATADIR%%/functions/__fish_prev_arg_in.fish
%%DATADIR%%/functions/__fish_preview_current_file.fish
%%DATADIR%%/functions/__fish_print_VBox_vms.fish
%%DATADIR%%/functions/__fish_print_addresses.fish
%%DATADIR%%/functions/__fish_print_apt_packages.fish
%%DATADIR%%/functions/__fish_print_cmd_args.fish
%%DATADIR%%/functions/__fish_print_cmd_args_without_options.fish
%%DATADIR%%/functions/__fish_print_commands.fish
@ -745,6 +881,7 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/functions/__fish_print_debian_apache_mods.fish
%%DATADIR%%/functions/__fish_print_debian_apache_sites.fish
%%DATADIR%%/functions/__fish_print_encodings.fish
%%DATADIR%%/functions/__fish_print_eopkg_packages.fish
%%DATADIR%%/functions/__fish_print_filesystems.fish
%%DATADIR%%/functions/__fish_print_gpg_algo.fish
%%DATADIR%%/functions/__fish_print_groups.fish
@ -755,34 +892,46 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/functions/__fish_print_lpr_printers.fish
%%DATADIR%%/functions/__fish_print_modules.fish
%%DATADIR%%/functions/__fish_print_mounted.fish
%%DATADIR%%/functions/__fish_print_opkg_packages.fish
%%DATADIR%%/functions/__fish_print_packages.fish
%%DATADIR%%/functions/__fish_print_pacman_packages.fish
%%DATADIR%%/functions/__fish_print_pacman_repos.fish
%%DATADIR%%/functions/__fish_print_pipestatus.fish
%%DATADIR%%/functions/__fish_print_pkg_add_packages.fish
%%DATADIR%%/functions/__fish_print_pkg_packages.fish
%%DATADIR%%/functions/__fish_print_port_packages.fish
%%DATADIR%%/functions/__fish_print_portage_available_pkgs.fish
%%DATADIR%%/functions/__fish_print_portage_installed_pkgs.fish
%%DATADIR%%/functions/__fish_print_portage_packages.fish
%%DATADIR%%/functions/__fish_print_portage_repository_paths.fish
%%DATADIR%%/functions/__fish_print_rpm_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_xbps_packages.fish
%%DATADIR%%/functions/__fish_print_xdg_applications_directories.fish
%%DATADIR%%/functions/__fish_print_xdg_mimetypes.fish
%%DATADIR%%/functions/__fish_print_xwindows.fish
%%DATADIR%%/functions/__fish_print_zfs_snapshots.fish
%%DATADIR%%/functions/__fish_ps.fish
%%DATADIR%%/functions/__fish_pwd.fish
%%DATADIR%%/functions/__fish_seen_argument.fish
%%DATADIR%%/functions/__fish_seen_subcommand_from.fish
%%DATADIR%%/functions/__fish_set_locale.fish
%%DATADIR%%/functions/__fish_shared_key_bindings.fish
%%DATADIR%%/functions/__fish_should_complete_switches.fish
%%DATADIR%%/functions/__fish_status_to_signal.fish
%%DATADIR%%/functions/__fish_svn_prompt.fish
%%DATADIR%%/functions/__fish_systemctl.fish
%%DATADIR%%/functions/__fish_systemctl_services.fish
%%DATADIR%%/functions/__fish_systemd_machine_images.fish
%%DATADIR%%/functions/__fish_systemd_machines.fish
%%DATADIR%%/functions/__fish_toggle_comment_commandline.fish
%%DATADIR%%/functions/__fish_tokenizer_state.fish
%%DATADIR%%/functions/__fish_use_subcommand.fish
%%DATADIR%%/functions/__fish_vcs_prompt.fish
%%DATADIR%%/functions/__fish_whatis.fish
%%DATADIR%%/functions/__fish_whatis_current_token.fish
%%DATADIR%%/functions/__terlar_git_prompt.fish
%%DATADIR%%/functions/_fish_systemctl.fish
%%DATADIR%%/functions/_validate_int.fish
%%DATADIR%%/functions/abbr.fish
%%DATADIR%%/functions/alias.fish
@ -790,29 +939,34 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/functions/cdh.fish
%%DATADIR%%/functions/contains_seq.fish
%%DATADIR%%/functions/delete-or-exit.fish
%%DATADIR%%/functions/diff.fish
%%DATADIR%%/functions/dirh.fish
%%DATADIR%%/functions/dirs.fish
%%DATADIR%%/functions/down-or-search.fish
%%DATADIR%%/functions/edit_command_buffer.fish
%%DATADIR%%/functions/export.fish
%%DATADIR%%/functions/fish_add_path.fish
%%DATADIR%%/functions/fish_breakpoint_prompt.fish
%%DATADIR%%/functions/fish_clipboard_copy.fish
%%DATADIR%%/functions/fish_clipboard_paste.fish
%%DATADIR%%/functions/fish_command_not_found.fish
%%DATADIR%%/functions/fish_config.fish
%%DATADIR%%/functions/fish_default_key_bindings.fish
%%DATADIR%%/functions/fish_default_mode_prompt.fish
%%DATADIR%%/functions/fish_git_prompt.fish
%%DATADIR%%/functions/fish_greeting.fish
%%DATADIR%%/functions/fish_hg_prompt.fish
%%DATADIR%%/functions/fish_hybrid_key_bindings.fish
%%DATADIR%%/functions/fish_indent.fish
%%DATADIR%%/functions/fish_is_root_user.fish
%%DATADIR%%/functions/fish_job_summary.fish
%%DATADIR%%/functions/fish_key_reader.fish
%%DATADIR%%/functions/fish_md5.fish
%%DATADIR%%/functions/fish_mode_prompt.fish
%%DATADIR%%/functions/fish_npm_helper.fish
%%DATADIR%%/functions/fish_opt.fish
%%DATADIR%%/functions/fish_print_git_action.fish
%%DATADIR%%/functions/fish_print_hg_root.fish
%%DATADIR%%/functions/fish_prompt.fish
%%DATADIR%%/functions/fish_status_to_signal.fish
%%DATADIR%%/functions/fish_svn_prompt.fish
%%DATADIR%%/functions/fish_title.fish
%%DATADIR%%/functions/fish_update_completions.fish
@ -824,7 +978,6 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/functions/grep.fish
%%DATADIR%%/functions/help.fish
%%DATADIR%%/functions/history.fish
%%DATADIR%%/functions/hostname.fish
%%DATADIR%%/functions/isatty.fish
%%DATADIR%%/functions/la.fish
%%DATADIR%%/functions/ll.fish
@ -845,12 +998,12 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/functions/setenv.fish
%%DATADIR%%/functions/suspend.fish
%%DATADIR%%/functions/trap.fish
%%DATADIR%%/functions/type.fish
%%DATADIR%%/functions/umask.fish
%%DATADIR%%/functions/up-or-search.fish
%%DATADIR%%/functions/vared.fish
%%DATADIR%%/groff/fish.tmac
%%DATADIR%%/lynx.lss
%%MANPAGES%%%%DATADIR%%/man/man1/_.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/abbr.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/alias.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/and.1.gz
@ -861,7 +1014,7 @@ libdata/pkgconfig/fish.pc
%%MANPAGES%%%%DATADIR%%/man/man1/block.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/break.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/breakpoint.1.gz
%%MANPAGES%%%%MANPAGES%%%%DATADIR%%/man/man1/builtin.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/builtin.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/case.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/cd.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/cdh.1.gz
@ -883,21 +1036,30 @@ libdata/pkgconfig/fish.pc
%%MANPAGES%%%%DATADIR%%/man/man1/exit.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/false.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fg.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish-%%CMAKE_BUILD_TYPE%%notes.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish-completions.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish-doc.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish-faq.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish-for-bash-users.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish-tutorial.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_add_path.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_breakpoint_prompt.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_command_not_found.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_config.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_git_prompt.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_greeting.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_hg_prompt.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_indent.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_is_root_user.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_key_reader.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_mode_prompt.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_opt.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_prompt.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_right_prompt.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_status_to_signal.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_svn_prompt.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_title.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_update_completions.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/fish_vcs_prompt.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/for.1.gz
@ -936,6 +1098,7 @@ libdata/pkgconfig/fish.pc
%%MANPAGES%%%%DATADIR%%/man/man1/string-length.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/string-lower.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/string-match.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/string-pad.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/string-repeat.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/string-replace.1.gz
%%MANPAGES%%%%DATADIR%%/man/man1/string-split.1.gz
@ -963,6 +1126,7 @@ libdata/pkgconfig/fish.pc
%%DATADIR%%/tools/web_config/favicon.png
%%DATADIR%%/tools/web_config/fishconfig.css
%%DATADIR%%/tools/web_config/index.html
%%DATADIR%%/tools/web_config/js/angular-route.js
%%DATADIR%%/tools/web_config/js/angular-sanitize.js
%%DATADIR%%/tools/web_config/js/angular.js
%%DATADIR%%/tools/web_config/js/app.js