pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/shells/fish



Module Name:    pkgsrc
Committed By:   wen
Date:           Sat May 13 01:19:05 UTC 2017

Modified Files:
        pkgsrc/shells/fish: Makefile PLIST distinfo
        pkgsrc/shells/fish/patches: patch-Makefile.in patch-configure
Added Files:
        pkgsrc/shells/fish/patches: patch-src_builtin.cpp
Removed Files:
        pkgsrc/shells/fish/patches: patch-builtin.cpp patch-common.cpp
            patch-common.h patch-env.cpp patch-exec.cpp patch-fallback.h
            patch-history.cpp patch-output.cpp patch-output.h patch-parser.cpp
            patch-parser__keywords.cpp patch-proc.h patch-screen.cpp

Log Message:
Update to 2.5.0
Reviewed by:    joerg@

Upstream changes:
Release Notes for fish 2.5.0 (released February 3, 2017)

    The Home, End, Insert, Delete, Page Up and Page Down keys work in Vi-style key bindings (#3731).

Platform Changes
Starting with version 2.5, fish requires a more up-to-date version of C++, specifically C++11 (from 2011). This affects some older platforms:
Linux
For users building from source, GCC's g++ 4.8 or later, or LLVM's clang 3.3 or later, are known to work. Older platforms may require a newer compiler installed. Unfortunately, because of the 
complexity of the toolchain, binary packages are no longer published by the fish-shell developers for the following platforms:

    Red Hat Enterprise Linux and CentOS 5 & 6 for 64-bit builds
    Ubuntu 12.04 (EoLTS April 2017)
    Debian 7 (EoLTS May 2018)

Installing newer version of fish on these systems will require building from source.
OS X SnowLeopard
Starting with version 2.5, fish requires a C++11 standard library on OS X 10.6 ("SnowLeopard"). If this library is not installed, you will see this error: dyld: Library not loaded: 
/usr/lib/libc++.1.dylib MacPorts is the easiest way to obtain this library. After installing the SnowLeopard MacPorts release from the install page, run: sudo port -v install libcxx Now fish should 
launch successfully. (Please open an issue if it does not.) This is only necessary on 10.6. OS X 10.7 and later include the required library by default.
Other significant changes

    Attempting to exit with running processes in the background produces a warning, then signals them to terminate if a second attempt to exit is made. This brings the behaviour for running 
background processes into line with stopped processes. (#3497)
    random can now have start, stop and step values specified, or the new choice subcommand can be used to pick an argument from a list (#3619).
    A new key bindings preset, fish_hybrid_key_bindings, including all the Emacs-style and Vi-style bindings, which behaves like fish_vi_key_bindings in fish 2.3.0 (#3556).
    function now returns an error when called with invalid options, rather than defining the function anyway (#3574). This was a regression present in fish 2.3 and 2.4.0.
    fish no longer prints a warning when it identifies a running instance of an old version (2.1.0 and earlier). Changes to universal variables may not propagate between these old versions and 2.5b1.
    Improved compatiblity with Android (#3585), MSYS/mingw (#2360), Solaris (#3456, #3340)
    Like other shells, the test builting now returns an error for numeric operations on invalid integers (#3346, #3581).
    complete no longer recognises --authoritative and --unauthoritative options, and they are marked as obsolete.
    status accepts subcommands, and should be used like status is-interactive. The old options continue to be supported for the foreseeable future (#3526), although only one subcommand or option can 
be specified at a time.
    Selection mode (used with "begin-selection") no longer selects a character the cursor does not move over (#3684).
    List indexes are handled better, and a bit more liberally in some cases (echo $PATH[1 .. 3] is now valid) (#3579).
    The fish_mode_prompt function is now simply a stub around fish_default_mode_prompt, which allows the mode prompt to be included more easily in customised prompt functions (#3641).

Notable fixes and improvements

    alias, run without options or arguments, lists all defined aliases, and aliases now include a description in the function signature that identifies them.
    complete accepts empty strings as descriptions (#3557).
    command accepts -q/--quiet in combination with --search (#3591), providing a simple way of checking whether a command exists in scripts.
    Abbreviations can now be renamed with abbr --rename OLD_KEY NEW_KEY (#3610).
    The command synopses printed by --help options work better with copying and pasting (#2673).
    help launches the browser specified by the $fish_help_browser variable if it is set (#3131).
    History merging could lose items under certain circumstances and is now fixed (#3496).
    The $status variable is now set to 123 when a syntactically invalid command is entered (#3616).
    Exiting fish now signals all background processes to terminate, not just stopped jobs (#3497).
    A new prompt_hostname function which prints a hostname suitable for use in prompts (#3482).
    The __fish_man_page function (bound to Alt-h by default) now tries to recognize subcommands (e.g. git add will now open the "git-add" man page) (#3678).
    A new function edit_command_buffer (bound to Alt-e & Alt-v by default) to edit the command buffer in an external editor (#1215, #3627).
    set_color now supports italics (--italics), dim (--dim) and reverse (--reverse) modes (#3650).
    Filesystems with very slow locking (eg incorrectly-configured NFS) will no longer slow fish down (#685).
    Improved completions for apt (#3695), fusermount (#3642), make (#3628), netctl-auto (#3378), nmcli (#3648), pygmentize (#3378), and tar (#3719).
    Added completions for:
    VBoxHeadless (#3378)
    VBoxSDL (#3378)
    base64 (#3378)
    caffeinate (#3524)
    dconf (#3638)
    dig (#3495)
    dpkg-reconfigure (#3521 & #3522)
    feh (#3378)
    launchctl (#3682)
    lxc (#3554 & #3564),
    mddiagnose (#3524)
    mdfind (#3524)
    mdimport (#3524)
    mdls (#3524)
    mdutil (#3524)
    mkvextract (#3492)
    nvram (#3524)
    objdump (#3378)
    sysbench (#3491)
    tmutil (#3524)

Release Notes for fish 2.4.0 (released November 8, 2016)
Significant changes

    The clipboard integration has been revamped with explicit bindings. The killring commands no longer copy from, or paste to, the X11 clipboard - use the new copy (C-x) and paste (C-v) bindings 
instead. The clipboard is now available on OS X as well as systems using X11 (e.g. Linux). (#3061)
    history uses subcommands (history delete) rather than options (history --delete) for its actions (#3367). You can no longer specify multiple actions via flags (e.g., history --delete --save 
something).
    New history options have been added, including --max=n to limit the number of history entries, --show-time option to show timestamps (#3175, #3244), and --null to null terminate history entries 
in the search output.
    history search is now case-insensitive by default (which also affects history delete) (#3236).
    history delete now correctly handles multiline commands (#31).
    Vi-style bindings no longer include all of the default emacs-style bindings; instead, they share some definitions (#3068).
    If there is no locale set in the environment, various known system configuration files will be checked for a default. If no locale can be found, en_US-UTF.8 will be used (#277).
    A number followed by a caret (e.g. 5^) is no longer treated as a redirection (#1873).
    The $version special variable can be overwritten, so that it can be used for other purposes if required.

Notable fixes and improvements

    The fish_realpath builtin has been renamed to realpath and made compatible with GNU realpath when run without arguments (#3400). It is used only for systems without a realpath or grealpath 
utility (#3374).
    Improved color handling on terminals/consoles with 8-16 colors, particularly the use of bright named color (#3176, #3260).
    fish_indent can now read from files given as arguments, rather than just standard input (#3037).
    Fuzzy tab completions behave in a less surprising manner (#3090, #3211).
    jobs should only print its header line once (#3127).
    Wildcards in redirections are highlighted appropriately (#2789).
    Suggestions will be offered more often, like after removing characters (#3069).
    history --merge now correctly interleaves items in chronological order (#2312).
    Options for fish_indent have been aligned with the other binaries - in particular, -d now means --debug. The --dump option has been renamed to --dump-parse-tree (#3191).
    The display of bindings in the Web-based configuration has been greatly improved (#3325), as has the rendering of prompts (#2924).
    fish should no longer hang using 100% CPU in the C locale (#3214).
    A bug in FreeBSD 11 & 12, Dragonfly BSD & illumos prevented fish from working correctly on these platforms under UTF-8 locales; fish now avoids the buggy behaviour (#3050).
    Prompts which show git repository information (via __fish_git_prompt) are faster in large repositories (#3294) and slow filesystems (#3083).
    fish 2.3.0 reintroduced a problem where the greeting was printed even when using read; this has been corrected again (#3261).
    Vi mode changes the cursor depending on the current mode (#3215).
    Command lines with escaped space characters at the end tab-complete correctly (#2447).
    Added completions for:
        arcanist (#3256)
        connmanctl (#3419)
        figlet (#3378)
        mdbook (#3378)
        ninja (#3415)
        p4, the Perforce client (#3314)
        pygmentize (#3378)
        ranger (#3378)
    Improved completions for aura (#3297), abbr (#3267), brew (#3309), chown (#3380, #3383),cygport (#3392), git (#3274, #3226, #3225, #3094, #3087, #3035, #3021, #2982, #3230), kill & pkill (#3200), 
screen (#3271), wget (#3470), and xz (#3378).
    Distributors, packagers and developers will notice that the build process produces more succinct output by default; use make V=1 to get verbose output (#3248).
    Improved compatibility with minor platforms including musl (#2988), Cygwin (#2993), Android (#3441, #3442), Haiku (#3322) and Solaris.
    Automatic cursor changes are now only enabled on the subset of XTerm versions known to support them, resolving a problem where older versions printed garbage to the terminal before and after 
every prompt (#3499).
    Improved the title set in Apple Terminal.app.
    Added completions for defaults and improved completions for diskutil (#3478).

Release Notes for fish 2.3.1 (released July 3, 2016)
This is a functionality and bugfix release. This release does not contain all the changes to fish since the last release, but fixes a number of issues directly affecting users at present and includes 
a small number of new features.
Significant changes

    A new fish_key_reader binary for decoding interactive keypresses (#2991).
    fish_mode_prompt has been updated to reflect the changes in the way the Vi input mode is set up (#3067), making this more reliable.
    fish_config can now properly be launched from the OS X app bundle (#3140).

Notable fixes and improvements

    Extra lines were sometimes inserted into the output under Windows (Cygwin and Microsoft Windows Subsystem for Linux) due to TTY timestamps not being updated (#2859).
    The string builtin's match mode now handles the combination of -rnv (match, invert and count) correctly (#3098).
    Improvements to TTY special character handling (#3064), locale handling (#3124) and terminal environment variable handling (#3060).
    Work towards handling the terminal modes for external commands launched from initialisation files (#2980).
    Ease the upgrade path from fish 2.2.0 and before by warning users to restart fish if the string builtin is not available (#3057).
    type -a now syntax-colorizes function source output.
    Added completions for alsamixer, godoc, gofmt, goimports, gorename, lscpu, mkdir, modinfo, netctl-auto, poweroff, termite, udisksctl and xz (#3123).
    Improved completions for apt (#3097), aura (#3102),git (#3114), npm (#3158), string and suspend (#3154).

Release Notes for fish 2.3.0 (released May 20, 2016)
Significant Changes

    A new string builtin to handle… strings! This builtin will measure, split, search and replace text strings, including using regular expressions. It can also be used to turn lists into plain 
strings using join. string can be used in place of sed, grep, tr, cut, and awk in many situations. (#2296)
    After seeing an escape character wait up to 300ms for an additional character. This is consistent with readline (e.g. bash) and can be configured via the fish_escape_delay_ms variable. This 
allows using escape as the Meta modifier. (#1356)
    Add new directories for vendor functions and configuration snippets (#2498)
    A new fish_realpath builtin and associated function to allow the use of realpath even on those platforms that don't ship an appropriate command. (#2932)
    Alt-# toggles the current command line between commented and uncommented states, making it easy to save a command in history without executing it.
    The fish_vi_mode function is now deprecated in favour of fish_vi_key_bindings

Backward-incompatible changes

    Unmatched globs will now cause an error, except when used with for, set or count (#2719, #2394)
    and and or will now bind to the closest if or while, allowing compound conditions without begin and end (#1428)
    set -ql now searches up to function scope for variables (#2502)
    status -f will now behave the same when run as the main script or using source (#2643)
    source no longer puts the file name in $argv if no arguments are given (#139)

Other Notable Fixes and Improvements

    Fish no longer silences errors in config.fish (#2702)
    Move the history file to $XDG_DATA_HOME/fish (or ~/.local/share if it has not been set)
    Directory autosuggestions will now descend as far as possible if there is only one child directory (#2531)
    Add support for bright colors (#1464)
    Allow Ctrl-J (\cj) to be bound separately from Ctrl-M (\cm) (#217)
    psub now has a "-s"/"-suffix" option to name the temporary file with that suffix
    Enable 24-bit colors on select terminals (#2495)
    Support for SVN status in the prompt (#2582)
    Mercurial and SVN support have been added to the Classic + Git (now Classic + VCS) prompt (via the new __fish_vcs_prompt function) (#2592)
    export now handles variables with a "=" in the value (#2403)
    Avoid confusing the terminal line driver with non-printing characters in fish_title(#2453)
    New completions for:
        alsactl
        Archlinux’s asp, makepkg
        Atom’s apm (#2390)
        entr - the "Event Notify Test Runner" (#2265)
        Fedora’s dnf (#2638)
        OSX diskutil (#2738)
        pkgng (#2395)
        pulseaudio’s pacmd and pactl
        rmmod (#3007)
        rust’s rustc and cargo (#2409)
        sysctl (#2214)
        systemd’s machinectl (#2158), busctl (#2144), systemd-nspawn, systemd-analyze, localectl, timedatectl
        and more
    Fish no longer has a function called sgrep, freeing it for user customization (#2245)
    A rewrite of the completions for cd, fixing a few bugs (#2299, #2300, #562)
    Linux VTs now run in a simplified mode to avoid issues (#2311)
    The vi-bindings now inherit from the emacs bindings
    Fish will also execute fish_user_key_bindings when in vi-mode
    funced will now also check $VISUAL (#2268)
    A new suspend function (#2269)
    Subcommand completion now works better with split /usr (#2141)
    The command-not-found-handler can now be overridden by defining a function called __fish_command_not_found_handler in config.fish (#2331)
    A few fixes to the Sorin theme
    PWD shortening in the prompt can now be configured via the fish_prompt_pwd_dir_length variable, set to the length per path component (#2473)
    fish now ships a skeleton file for /etc/fish/config.fish that only contains some documentation, the included code has been moved to the corresponding file in /usr (#2799)

Release Notes for fish 2.2.0 (released July 12, 2015)
Significant Changes

    Abbreviations: the new `abbr` command allows for interactively-expanded abbreviations, allowing quick access to frequently-used commands (#731).
    Vi mode: run `fish_vi_mode` to switch fish into the key bindings and prompt familiar to users of the Vi editor (#65).
    New inline and interactive pager, which will be familiar to users of zsh (#291).
    Underlying architectural changes: the `fishd` universal variable server has been removed as it was a source of many bugs and security problems. Notably, old fish sessions will not be able to 
communicate universal variable changes with new fish sessions. For best results, restart all running instances of `fish`.
    The web-based configuration tool has been redesigned, featuring a prompt theme chooser and other improvements.
    New German, Brazilian Portuguese, and Chinese translations.

Backward-incompatible changes
These are kept to a minimum, but either change undocumented features or are too hard to use in their existing forms. These changes may break existing scripts.

    `commandline` no longer interprets functions "in reverse", instead behaving as expected (#1567).
    The previously-undocumented `CMD_DURATION` variable is now set for all commands and contains the execution time of the last command in milliseconds (#1585). It is no longer exported to other 
commands (#1896).
    `if` / `else` conditional statements now return values consistent with the Single Unix Specification, like other shells (#1443).
    A new "top-level" local scope has been added, allowing local variables declared on the commandline to be visible to subsequent commands. (#206)

Other notable fixes and improvements

    New documentation design (#1662), which requires a Doxygen version 1.8.7 or newer to build.
    Fish now defines a default directory for other packages to provide completions. By default this is `/usr/share/fish/vendor-completions.d`; on systems with `pkgconfig` installed this path is 
discoverable with `pkg-config --variable completionsdir fish`.
    A new parser removes many bugs; all existing syntax should keep working.
    New `fish_preexec` and `fish_postexec` events are fired before and after job execution respectively (#1549).
    Unmatched wildcards no longer prevent a job from running. Wildcards used interactively will still print an error, but the job will proceed and the wildcard will expand to zero arguments (#1482).
    The `.` command is deprecated and the `source` command is preferred (#310).
    `bind` supports "bind modes", which allows bindings to be set for a particular named mode, to support the implementation of Vi mode.
    A new `export` alias, which behaves like other shells (#1833).
    `command` has a new `--search` option to print the name of the disk file that would be executed, like other shells' `command -v` (#1540).
    `commandline` has a new `--paging-mode` option to support the new pager.
    `complete` has a new `--wraps` option, which allows a command to (recursively) inherit the completions of a wrapped command (#393), and `complete -e` now correctly erases completions (#380).
    Completions are now generated from manual pages by default on the first run of fish (#997).
    `fish_indent` can now produce colorized (`--ansi`) and HTML (`--html`) output (#1827).
    `functions --erase` now prevents autoloaded functions from being reloaded in the current session.
    `history` has a new `--merge` option, to incorporate history from other sessions into the current session (#825).
    `jobs` returns 1 if there are no active jobs (#1484).
    `read` has several new options:
        `--array` to break input into an array (#1540)
        `--null` to break lines on NUL characters rather than newlines (#1694)
        `--nchars` to read a specific number of characters (#1616)
        `--right-prompt` to display a right-hand-side prompt during interactive read (#1698).
    `type` has a new `-q` option to suppress output (#1540 and, like other shells, `type -a` now prints all matches for a command (#261).
    Pressing F1 now shows the manual page for the current command (#1063).
    `fish_title` functions have access to the arguments of the currently running argument as `$argv[1]` (#1542).
    The OS command-not-found handler is used on Arch Linux (#1925), nixOS (#1852), openSUSE and Fedora (#1280).
    `Alt`+`.` searches backwards in the token history, mapping to the same behavior as inserting the last argument of the previous command, like other shells (#89).
    The `SHLVL` environment variable is incremented correctly (#1634 & #1693).
    Added completions for `adb` (#1165 & #1211), `apt` (#2018), `aura` (#1292), `composer` (#1607), `cygport` (#1841), `dropbox` (#1533), `elixir` (#1167), `fossil`, `heroku` (#1790), `iex` (#1167), 
`kitchen` (#2000), `nix` (#1167), `node`/`npm` (#1566), `opam` (#1615), `setfacl` (#1752), `tmuxinator` (#1863), and `yast2` (#1739).
    Improved completions for `brew` (#1090 & #1810), `bundler` (#1779), `cd` (#1135), `emerge` (#1840),`git` (#1680, #1834 & #1951), `man` (#960), `modprobe` (#1124), `pacman` (#1292), `rpm` (#1236), 
`rsync` (#1872), `scp` (#1145), `ssh` (#1234), `sshfs` (#1268), `systemctl` (#1462, #1950 & #1972), `tmux` (#1853), `vagrant` (#1748), `yum` (#1269), and `zypper` (#1787).


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/shells/fish/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/shells/fish/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/shells/fish/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/shells/fish/patches/patch-Makefile.in
cvs rdiff -u -r1.1 -r0 pkgsrc/shells/fish/patches/patch-builtin.cpp \
    pkgsrc/shells/fish/patches/patch-common.cpp \
    pkgsrc/shells/fish/patches/patch-common.h \
    pkgsrc/shells/fish/patches/patch-env.cpp \
    pkgsrc/shells/fish/patches/patch-exec.cpp \
    pkgsrc/shells/fish/patches/patch-fallback.h \
    pkgsrc/shells/fish/patches/patch-history.cpp \
    pkgsrc/shells/fish/patches/patch-output.cpp \
    pkgsrc/shells/fish/patches/patch-output.h \
    pkgsrc/shells/fish/patches/patch-parser.cpp \
    pkgsrc/shells/fish/patches/patch-parser__keywords.cpp
cvs rdiff -u -r1.3 -r1.4 pkgsrc/shells/fish/patches/patch-configure
cvs rdiff -u -r1.2 -r0 pkgsrc/shells/fish/patches/patch-proc.h \
    pkgsrc/shells/fish/patches/patch-screen.cpp
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/fish/patches/patch-src_builtin.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/shells/fish/Makefile
diff -u pkgsrc/shells/fish/Makefile:1.7 pkgsrc/shells/fish/Makefile:1.8
--- pkgsrc/shells/fish/Makefile:1.7     Tue Aug 18 07:31:17 2015
+++ pkgsrc/shells/fish/Makefile Sat May 13 01:19:05 2017
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2015/08/18 07:31:17 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2017/05/13 01:19:05 wen Exp $
 
-FISHVER=               2.1.2
+FISHVER=               2.5.0
 DISTNAME=              fish-${FISHVER}
-PKGREVISION=           1
 CATEGORIES=            shells
 MASTER_SITES=          http://fishshell.com/files/${FISHVER}/
 
@@ -11,7 +10,9 @@ HOMEPAGE=             http://www.fishshell.com/
 COMMENT=               User friendly command line shell for UNIX-like operating systems
 LICENSE=               gnu-gpl-v2
 
-USE_LANGUAGES+=                c++
+EXTRACT_USING=         gtar
+
+USE_LANGUAGES+=                c c++
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --without-xsel

Index: pkgsrc/shells/fish/PLIST
diff -u pkgsrc/shells/fish/PLIST:1.2 pkgsrc/shells/fish/PLIST:1.3
--- pkgsrc/shells/fish/PLIST:1.2        Fri Mar  6 21:03:20 2015
+++ pkgsrc/shells/fish/PLIST    Sat May 13 01:19:05 2017
@@ -1,39 +1,42 @@
-@comment $NetBSD: PLIST,v 1.2 2015/03/06 21:03:20 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/05/13 01:19:05 wen Exp $
 bin/fish
 bin/fish_indent
-bin/fish_pager
-bin/fishd
-bin/mimedb
+bin/fish_key_reader
+share/examples/fish/config.fish
 man/man1/fish.1
 man/man1/fish_indent.1
-man/man1/fish_pager.1
-man/man1/fishd.1
-man/man1/mimedb.1
-share/doc/fish/arrowdown.png
-share/doc/fish/arrowright.png
+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/doc.png
-share/doc/fish/doc_8h_source.html
 share/doc/fish/doxygen.css
 share/doc/fish/doxygen.png
 share/doc/fish/dynsections.js
 share/doc/fish/faq.html
-share/doc/fish/files.html
-share/doc/fish/folderclosed.png
-share/doc/fish/folderopen.png
+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/jquery.js
 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/splitbar.png
 share/doc/fish/sync_off.png
 share/doc/fish/sync_on.png
 share/doc/fish/tab_a.png
@@ -42,15 +45,29 @@ share/doc/fish/tab_h.png
 share/doc/fish/tab_s.png
 share/doc/fish/tabs.css
 share/doc/fish/tutorial.html
-share/examples/fish/fish/config.fish
+share/doc/fish/user_doc.css
+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
+share/fish/completions/a2dismod.fish
+share/fish/completions/a2dissite.fish
+share/fish/completions/a2enconf.fish
+share/fish/completions/a2enmod.fish
+share/fish/completions/a2ensite.fish
+share/fish/completions/abbr.fish
 share/fish/completions/abook.fish
 share/fish/completions/acat.fish
 share/fish/completions/accept.fish
 share/fish/completions/ack.fish
 share/fish/completions/acpi.fish
+share/fish/completions/adb.fish
 share/fish/completions/adduser.fish
 share/fish/completions/adiff.fish
 share/fish/completions/als.fish
+share/fish/completions/alsactl.fish
+share/fish/completions/alsamixer.fish
 share/fish/completions/amixer.fish
 share/fish/completions/anamnesis.fish
 share/fish/completions/and.fish
@@ -82,17 +99,23 @@ share/fish/completions/apt-spy.fish
 share/fish/completions/apt-src.fish
 share/fish/completions/apt-zip-inst.fish
 share/fish/completions/apt-zip-list.fish
+share/fish/completions/apt.fish
 share/fish/completions/aptitude.fish
+share/fish/completions/arc.fish
 share/fish/completions/arepack.fish
 share/fish/completions/arp.fish
+share/fish/completions/asp.fish
 share/fish/completions/at.fish
 share/fish/completions/atd.fish
+share/fish/completions/atom.fish
 share/fish/completions/atool.fish
 share/fish/completions/atq.fish
 share/fish/completions/atrm.fish
 share/fish/completions/aunpack.fish
+share/fish/completions/aura.fish
 share/fish/completions/awk.fish
 share/fish/completions/badblocks.fish
+share/fish/completions/base64.fish
 share/fish/completions/bc.fish
 share/fish/completions/bg.fish
 share/fish/completions/bind.fish
@@ -105,15 +128,18 @@ share/fish/completions/btdownloadheadles
 share/fish/completions/builtin.fish
 share/fish/completions/bundle.fish
 share/fish/completions/bunzip2.fish
+share/fish/completions/burp.fish
+share/fish/completions/busctl.fish
 share/fish/completions/bzcat.fish
 share/fish/completions/bzip2.fish
 share/fish/completions/bzip2recover.fish
 share/fish/completions/bzr.fish
 share/fish/completions/cabal-dev.fish
 share/fish/completions/cabal.fish
+share/fish/completions/caffeinate.fish
 share/fish/completions/cancel.fish
 share/fish/completions/canto.fish
-share/fish/completions/case.fish
+share/fish/completions/cargo.fish
 share/fish/completions/cat.fish
 share/fish/completions/cd.fish
 share/fish/completions/cdrecord.fish
@@ -128,9 +154,12 @@ share/fish/completions/command.fish
 share/fish/completions/commandline.fish
 share/fish/completions/compare.fish
 share/fish/completions/complete.fish
+share/fish/completions/composer.fish
+share/fish/completions/composer.phar.fish
 share/fish/completions/composite.fish
 share/fish/completions/configure.fish
 share/fish/completions/conjure.fish
+share/fish/completions/connmanctl.fish
 share/fish/completions/continue.fish
 share/fish/completions/convert.fish
 share/fish/completions/cower.fish
@@ -143,19 +172,27 @@ share/fish/completions/cupsenable.fish
 share/fish/completions/cupsreject.fish
 share/fish/completions/cut.fish
 share/fish/completions/cvs.fish
+share/fish/completions/cygport.fish
 share/fish/completions/darcs.fish
 share/fish/completions/date.fish
+share/fish/completions/dconf.fish
 share/fish/completions/dcop.fish
 share/fish/completions/dd.fish
+share/fish/completions/defaults.fish
 share/fish/completions/df.fish
 share/fish/completions/diff.fish
+share/fish/completions/dig.fish
+share/fish/completions/diskutil.fish
 share/fish/completions/display.fish
 share/fish/completions/djview.fish
 share/fish/completions/djview3.fish
 share/fish/completions/djview4.fish
 share/fish/completions/dlocate.fish
 share/fish/completions/dmesg.fish
+share/fish/completions/dnf.fish
+share/fish/completions/dpkg-reconfigure.fish
 share/fish/completions/dpkg.fish
+share/fish/completions/dropbox.fish
 share/fish/completions/du.fish
 share/fish/completions/duply.fish
 share/fish/completions/dvipdf.fish
@@ -166,24 +203,32 @@ share/fish/completions/egrep.fish
 share/fish/completions/eix-sync.fish
 share/fish/completions/eix.fish
 share/fish/completions/elatex.fish
+share/fish/completions/elixir.fish
 share/fish/completions/emacs.fish
 share/fish/completions/emerge.fish
+share/fish/completions/encfs.fish
+share/fish/completions/entr.fish
 share/fish/completions/env.fish
 share/fish/completions/equery.fish
+share/fish/completions/eselect.fish
 share/fish/completions/etex.fish
 share/fish/completions/eval.fish
 share/fish/completions/evince.fish
 share/fish/completions/exec.fish
 share/fish/completions/exit.fish
 share/fish/completions/expand.fish
+share/fish/completions/fcrontab.fish
+share/fish/completions/feh.fish
 share/fish/completions/fg.fish
 share/fish/completions/fgrep.fish
+share/fish/completions/figlet.fish
 share/fish/completions/file.fish
 share/fish/completions/find.fish
 share/fish/completions/fish.fish
 share/fish/completions/fish_indent.fish
 share/fish/completions/flac.fish
 share/fish/completions/fluxbox-remote.fish
+share/fish/completions/fossil.fish
 share/fish/completions/ftp.fish
 share/fish/completions/funced.fish
 share/fish/completions/funcsave.fish
@@ -196,12 +241,18 @@ share/fish/completions/gdb.fish
 share/fish/completions/gem.fish
 share/fish/completions/git.fish
 share/fish/completions/go.fish
+share/fish/completions/godoc.fish
+share/fish/completions/gofmt.fish
+share/fish/completions/goimports.fish
+share/fish/completions/golint.fish
+share/fish/completions/gorename.fish
 share/fish/completions/gpasswd.fish
 share/fish/completions/gpg.fish
 share/fish/completions/gphoto2.fish
 share/fish/completions/gprof.fish
 share/fish/completions/grep.fish
 share/fish/completions/groupadd.fish
+share/fish/completions/grunt.fish
 share/fish/completions/gunzip.fish
 share/fish/completions/gv.fish
 share/fish/completions/gvim.fish
@@ -209,6 +260,7 @@ share/fish/completions/gvimdiff.fish
 share/fish/completions/gzip.fish
 share/fish/completions/head.fish
 share/fish/completions/help.fish
+share/fish/completions/heroku.fish
 share/fish/completions/hg.fish
 share/fish/completions/highlight.fish
 share/fish/completions/history.fish
@@ -216,22 +268,30 @@ share/fish/completions/htop.fish
 share/fish/completions/iconv.fish
 share/fish/completions/id.fish
 share/fish/completions/identify.fish
+share/fish/completions/iex.fish
 share/fish/completions/ifconfig.fish
 share/fish/completions/ifdata.fish
 share/fish/completions/ifdown.fish
 share/fish/completions/ifup.fish
 share/fish/completions/import.fish
 share/fish/completions/invoke-rc.d.fish
+share/fish/completions/ip.fish
+share/fish/completions/iptables.fish
 share/fish/completions/jobs.fish
+share/fish/completions/journalctl.fish
+share/fish/completions/kcmshell5.fish
 share/fish/completions/kill.fish
 share/fish/completions/killall.fish
+share/fish/completions/kitchen.fish
 share/fish/completions/la.fish
 share/fish/completions/latex.fish
 share/fish/completions/latexmk.fish
+share/fish/completions/launchctl.fish
 share/fish/completions/lein.fish
 share/fish/completions/less.fish
 share/fish/completions/ll.fish
 share/fish/completions/ln.fish
+share/fish/completions/localectl.fish
 share/fish/completions/locate.fish
 share/fish/completions/logkeys.fish
 share/fish/completions/lp.fish
@@ -246,21 +306,36 @@ share/fish/completions/lprm.fish
 share/fish/completions/lpstat.fish
 share/fish/completions/ls.fish
 share/fish/completions/lsblk.fish
+share/fish/completions/lscpu.fish
 share/fish/completions/lsof.fish
+share/fish/completions/lsusb.fish
 share/fish/completions/lua.fish
 share/fish/completions/lualatex.fish
 share/fish/completions/lunchy.fish
+share/fish/completions/lxc.fish
 share/fish/completions/lxpanel.fish
 share/fish/completions/m4.fish
+share/fish/completions/machinectl.fish
 share/fish/completions/make.fish
 share/fish/completions/makedepend.fish
 share/fish/completions/makepkg.fish
 share/fish/completions/man.fish
 share/fish/completions/mc.fish
 share/fish/completions/md5sum.fish
-share/fish/completions/mimedb.fish
+share/fish/completions/mdbook.fish
+share/fish/completions/mddiagnose.fish
+share/fish/completions/mdfind.fish
+share/fish/completions/mdimport.fish
+share/fish/completions/mdls.fish
+share/fish/completions/mdutil.fish
+share/fish/completions/meat.fish
+share/fish/completions/mix.fish
+share/fish/completions/mkdir.fish
+share/fish/completions/mkinitcpio.fish
 share/fish/completions/mktemp.fish
+share/fish/completions/mkvextract.fish
 share/fish/completions/mocp.fish
+share/fish/completions/modinfo.fish
 share/fish/completions/modprobe.fish
 share/fish/completions/mogrify.fish
 share/fish/completions/montage.fish
@@ -271,23 +346,41 @@ share/fish/completions/msgfmt.fish
 share/fish/completions/mupdf.fish
 share/fish/completions/mutt.fish
 share/fish/completions/mv.fish
+share/fish/completions/mvn.fish
 share/fish/completions/namei.fish
+share/fish/completions/native2ascii.fish
 share/fish/completions/ncdu.fish
 share/fish/completions/netcat.fish
+share/fish/completions/netctl-auto.fish
 share/fish/completions/netctl.fish
+share/fish/completions/networkctl.fish
 share/fish/completions/nextd.fish
 share/fish/completions/nice.fish
+share/fish/completions/ninja.fish
 share/fish/completions/nl.fish
 share/fish/completions/nm.fish
 share/fish/completions/nmcli.fish
+share/fish/completions/node.fish
 share/fish/completions/not.fish
+share/fish/completions/npm.fish
+share/fish/completions/nvim.fish
+share/fish/completions/nvram.fish
+share/fish/completions/objdump.fish
+share/fish/completions/obnam.fish
 share/fish/completions/oggenc.fish
 share/fish/completions/omega.fish
+share/fish/completions/opam.fish
+share/fish/completions/open.fish
 share/fish/completions/or.fish
+share/fish/completions/p4.fish
+share/fish/completions/pacaur.fish
 share/fish/completions/pacman-color.fish
 share/fish/completions/pacman-key.fish
 share/fish/completions/pacman.fish
 share/fish/completions/pacmatic.fish
+share/fish/completions/pacmd.fish
+share/fish/completions/pacsrv.fish
+share/fish/completions/pactl.fish
 share/fish/completions/pactree.fish
 share/fish/completions/patch.fish
 share/fish/completions/pbget.fish
@@ -295,12 +388,15 @@ share/fish/completions/pdfelatex.fish
 share/fish/completions/pdfetex.fish
 share/fish/completions/pdflatex.fish
 share/fish/completions/pdftex.fish
+share/fish/completions/pdftotext.fish
 share/fish/completions/perl.fish
 share/fish/completions/pftp.fish
 share/fish/completions/pgrep.fish
 share/fish/completions/pine.fish
 share/fish/completions/ping.fish
 share/fish/completions/pinky.fish
+share/fish/completions/pkg-config.fish
+share/fish/completions/pkg.fish
 share/fish/completions/pkgadd.fish
 share/fish/completions/pkgfile.fish
 share/fish/completions/pkginfo.fish
@@ -311,6 +407,7 @@ share/fish/completions/poff.fish
 share/fish/completions/pon.fish
 share/fish/completions/portmaster.fish
 share/fish/completions/ports.fish
+share/fish/completions/poweroff.fish
 share/fish/completions/prevd.fish
 share/fish/completions/prt-get.fish
 share/fish/completions/ps.fish
@@ -319,12 +416,16 @@ share/fish/completions/psql.fish
 share/fish/completions/psub.fish
 share/fish/completions/pushd.fish
 share/fish/completions/pydf.fish
+share/fish/completions/pygmentize.fish
 share/fish/completions/python.fish
 share/fish/completions/python2.fish
 share/fish/completions/python3.fish
 share/fish/completions/quilt.fish
 share/fish/completions/random.fish
+share/fish/completions/ranger.fish
 share/fish/completions/rbenv.fish
+share/fish/completions/rc-service.fish
+share/fish/completions/rc-update.fish
 share/fish/completions/rc.d.fish
 share/fish/completions/read.fish
 share/fish/completions/readlink.fish
@@ -337,21 +438,27 @@ share/fish/completions/rfkill.fish
 share/fish/completions/rgrep.fish
 share/fish/completions/rm.fish
 share/fish/completions/rmdir.fish
+share/fish/completions/rmmod.fish
 share/fish/completions/root.fish
 share/fish/completions/rpm.fish
 share/fish/completions/rsync.fish
 share/fish/completions/ruby-build.fish
 share/fish/completions/ruby.fish
+share/fish/completions/rustc.fish
+share/fish/completions/sass-convert.fish
+share/fish/completions/sass.fish
 share/fish/completions/scanimage.fish
 share/fish/completions/scons.fish
 share/fish/completions/scp.fish
 share/fish/completions/screen.fish
 share/fish/completions/scrot.fish
+share/fish/completions/scss.fish
 share/fish/completions/sed.fish
 share/fish/completions/seq.fish
 share/fish/completions/service.fish
 share/fish/completions/set.fish
 share/fish/completions/set_color.fish
+share/fish/completions/setfacl.fish
 share/fish/completions/setxkbmap.fish
 share/fish/completions/sha1sum.fish
 share/fish/completions/sha224sum.fish
@@ -359,32 +466,46 @@ share/fish/completions/sha256sum.fish
 share/fish/completions/sha384sum.fish
 share/fish/completions/sha512sum.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
 share/fish/completions/stat.fish
 share/fish/completions/status.fish
 share/fish/completions/stream.fish
+share/fish/completions/string.fish
 share/fish/completions/su.fish
 share/fish/completions/sudo.fish
 share/fish/completions/svn.fish
 share/fish/completions/sylpheed.fish
+share/fish/completions/sysbench.fish
+share/fish/completions/sysctl.fish
 share/fish/completions/systemctl.fish
+share/fish/completions/systemd-analyze.fish
+share/fish/completions/systemd-nspawn.fish
 share/fish/completions/tail.fish
 share/fish/completions/tar.fish
 share/fish/completions/tee.fish
 share/fish/completions/telnet.fish
+share/fish/completions/termite.fish
 share/fish/completions/test.fish
 share/fish/completions/tex.fish
 share/fish/completions/time.fish
+share/fish/completions/timedatectl.fish
 share/fish/completions/timeout.fish
+share/fish/completions/tmutil.fish
 share/fish/completions/tmux.fish
+share/fish/completions/tmuxinator.fish
 share/fish/completions/top.fish
 share/fish/completions/totem.fish
 share/fish/completions/touch.fish
 share/fish/completions/tr.fish
+share/fish/completions/transmission-remote.fish
 share/fish/completions/trap.fish
+share/fish/completions/travis.fish
 share/fish/completions/tree.fish
 share/fish/completions/type.fish
+share/fish/completions/udisksctl.fish
 share/fish/completions/ulimit.fish
 share/fish/completions/umount.fish
 share/fish/completions/uname.fish
@@ -427,7 +548,9 @@ share/fish/completions/xrandr.fish
 share/fish/completions/xrdb.fish
 share/fish/completions/xsel.fish
 share/fish/completions/xterm.fish
+share/fish/completions/xz.fish
 share/fish/completions/yaourt.fish
+share/fish/completions/yast2.fish
 share/fish/completions/yum.fish
 share/fish/completions/zcat.fish
 share/fish/completions/zip.fish
@@ -438,69 +561,73 @@ share/fish/functions/_.fish
 share/fish/functions/__fish_append.fish
 share/fish/functions/__fish_bind_test1.fish
 share/fish/functions/__fish_bind_test2.fish
+share/fish/functions/__fish_cancel_commandline.fish
 share/fish/functions/__fish_commandline_test.fish
 share/fish/functions/__fish_complete_abook_formats.fish
 share/fish/functions/__fish_complete_ant_targets.fish
-share/fish/functions/__fish_complete_atool.fish
 share/fish/functions/__fish_complete_atool_archive_contents.fish
 share/fish/functions/__fish_complete_bittorrent.fish
-share/fish/functions/__fish_complete_cabal.fish
+share/fish/functions/__fish_complete_blockdevice.fish
 share/fish/functions/__fish_complete_cd.fish
 share/fish/functions/__fish_complete_command.fish
 share/fish/functions/__fish_complete_convert_options.fish
-share/fish/functions/__fish_complete_diff.fish
 share/fish/functions/__fish_complete_directories.fish
 share/fish/functions/__fish_complete_file_url.fish
 share/fish/functions/__fish_complete_ftp.fish
-share/fish/functions/__fish_complete_grep.fish
 share/fish/functions/__fish_complete_groups.fish
+share/fish/functions/__fish_complete_job_pids.fish
 share/fish/functions/__fish_complete_list.fish
 share/fish/functions/__fish_complete_lpr.fish
 share/fish/functions/__fish_complete_lpr_option.fish
-share/fish/functions/__fish_complete_ls.fish
+share/fish/functions/__fish_complete_lsusb.fish
 share/fish/functions/__fish_complete_man.fish
-share/fish/functions/__fish_complete_mime.fish
-share/fish/functions/__fish_complete_pacman.fish
+share/fish/functions/__fish_complete_path.fish
 share/fish/functions/__fish_complete_pgrep.fish
 share/fish/functions/__fish_complete_pids.fish
 share/fish/functions/__fish_complete_ppp_peer.fish
 share/fish/functions/__fish_complete_proc.fish
-share/fish/functions/__fish_complete_python.fish
 share/fish/functions/__fish_complete_setxkbmap.fish
 share/fish/functions/__fish_complete_ssh.fish
 share/fish/functions/__fish_complete_subcommand.fish
 share/fish/functions/__fish_complete_subcommand_root.fish
 share/fish/functions/__fish_complete_suffix.fish
-share/fish/functions/__fish_complete_svn.fish
 share/fish/functions/__fish_complete_svn_diff.fish
 share/fish/functions/__fish_complete_tar.fish
-share/fish/functions/__fish_complete_tex.fish
 share/fish/functions/__fish_complete_unrar.fish
 share/fish/functions/__fish_complete_users.fish
-share/fish/functions/__fish_complete_vi.fish
 share/fish/functions/__fish_complete_wvdial_peers.fish
-share/fish/functions/__fish_complete_xsum.fish
 share/fish/functions/__fish_config_interactive.fish
 share/fish/functions/__fish_contains_opt.fish
 share/fish/functions/__fish_crux_packages.fish
+share/fish/functions/__fish_cursor_1337.fish
+share/fish/functions/__fish_cursor_konsole.fish
+share/fish/functions/__fish_cursor_xterm.fish
 share/fish/functions/__fish_describe_command.fish
 share/fish/functions/__fish_filter_ant_targets.fish
-share/fish/functions/__fish_filter_mime.fish
 share/fish/functions/__fish_git_prompt.fish
 share/fish/functions/__fish_gnu_complete.fish
+share/fish/functions/__fish_hg_prompt.fish
 share/fish/functions/__fish_is_first_token.fish
 share/fish/functions/__fish_is_token_n.fish
 share/fish/functions/__fish_list_current_token.fish
 share/fish/functions/__fish_make_completion_signals.fish
+share/fish/functions/__fish_man_page.fish
 share/fish/functions/__fish_move_last.fish
 share/fish/functions/__fish_no_arguments.fish
 share/fish/functions/__fish_not_contain_opt.fish
+share/fish/functions/__fish_number_of_cmd_args_wo_opts.fish
 share/fish/functions/__fish_paginate.fish
 share/fish/functions/__fish_ports_dirs.fish
+share/fish/functions/__fish_print_VBox_vms.fish
 share/fish/functions/__fish_print_abook_emails.fish
 share/fish/functions/__fish_print_addresses.fish
 share/fish/functions/__fish_print_arch_daemons.fish
+share/fish/functions/__fish_print_cmd_args.fish
+share/fish/functions/__fish_print_cmd_args_without_options.fish
 share/fish/functions/__fish_print_commands.fish
+share/fish/functions/__fish_print_debian_apache_confs.fish
+share/fish/functions/__fish_print_debian_apache_mods.fish
+share/fish/functions/__fish_print_debian_apache_sites.fish
 share/fish/functions/__fish_print_debian_services.fish
 share/fish/functions/__fish_print_encodings.fish
 share/fish/functions/__fish_print_filesystems.fish
@@ -512,8 +639,13 @@ share/fish/functions/__fish_print_lpr_op
 share/fish/functions/__fish_print_lpr_printers.fish
 share/fish/functions/__fish_print_lsblk_columns.fish
 share/fish/functions/__fish_print_make_targets.fish
+share/fish/functions/__fish_print_modules.fish
 share/fish/functions/__fish_print_mounted.fish
+share/fish/functions/__fish_print_ninja_targets.fish
+share/fish/functions/__fish_print_ninja_tools.fish
 share/fish/functions/__fish_print_packages.fish
+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
@@ -528,10 +660,31 @@ share/fish/functions/__fish_prt_use_pack
 share/fish/functions/__fish_prt_use_port.fish
 share/fish/functions/__fish_pwd.fish
 share/fish/functions/__fish_seen_subcommand_from.fish
+share/fish/functions/__fish_set_locale.fish
+share/fish/functions/__fish_sgrep.fish
+share/fish/functions/__fish_shared_key_bindings.fish
+share/fish/functions/__fish_svn_prompt.fish
+share/fish/functions/__fish_systemctl_automounts.fish
+share/fish/functions/__fish_systemctl_devices.fish
+share/fish/functions/__fish_systemctl_mounts.fish
+share/fish/functions/__fish_systemctl_scopes.fish
+share/fish/functions/__fish_systemctl_service_paths.fish
+share/fish/functions/__fish_systemctl_services.fish
+share/fish/functions/__fish_systemctl_slices.fish
+share/fish/functions/__fish_systemctl_snapshots.fish
+share/fish/functions/__fish_systemctl_sockets.fish
+share/fish/functions/__fish_systemctl_swaps.fish
+share/fish/functions/__fish_systemctl_targets.fish
+share/fish/functions/__fish_systemctl_timers.fish
+share/fish/functions/__fish_systemd_machine_images.fish
+share/fish/functions/__fish_systemd_machines.fish
 share/fish/functions/__fish_test_arg.fish
+share/fish/functions/__fish_toggle_comment_commandline.fish
 share/fish/functions/__fish_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/abbr.fish
 share/fish/functions/alias.fish
 share/fish/functions/cd.fish
 share/fish/functions/contains_seq.fish
@@ -539,12 +692,24 @@ share/fish/functions/delete-or-exit.fish
 share/fish/functions/dirh.fish
 share/fish/functions/dirs.fish
 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_clipboard_copy.fish
+share/fish/functions/fish_clipboard_paste.fish
 share/fish/functions/fish_config.fish
 share/fish/functions/fish_default_key_bindings.fish
+share/fish/functions/fish_default_mode_prompt.fish
+share/fish/functions/fish_fallback_prompt.fish
+share/fish/functions/fish_hybrid_key_bindings.fish
 share/fish/functions/fish_indent.fish
+share/fish/functions/fish_key_reader.fish
+share/fish/functions/fish_mode_prompt.fish
 share/fish/functions/fish_prompt.fish
 share/fish/functions/fish_update_completions.fish
+share/fish/functions/fish_vi_cursor.fish
+share/fish/functions/fish_vi_key_bindings.fish
+share/fish/functions/fish_vi_mode.fish
 share/fish/functions/funced.fish
 share/fish/functions/funcsave.fish
 share/fish/functions/grep.fish
@@ -557,24 +722,28 @@ share/fish/functions/ll.fish
 share/fish/functions/ls.fish
 share/fish/functions/man.fish
 share/fish/functions/math.fish
-share/fish/functions/mimedb.fish
 share/fish/functions/nextd-or-forward-word.fish
 share/fish/functions/nextd.fish
 share/fish/functions/open.fish
 share/fish/functions/popd.fish
 share/fish/functions/prevd-or-backward-word.fish
 share/fish/functions/prevd.fish
+share/fish/functions/prompt_hostname.fish
 share/fish/functions/prompt_pwd.fish
 share/fish/functions/psub.fish
 share/fish/functions/pushd.fish
+share/fish/functions/realpath.fish
 share/fish/functions/seq.fish
 share/fish/functions/setenv.fish
-share/fish/functions/sgrep.fish
+share/fish/functions/string.fish
+share/fish/functions/suspend.fish
 share/fish/functions/trap.fish
 share/fish/functions/type.fish
 share/fish/functions/umask.fish
 share/fish/functions/up-or-search.fish
 share/fish/functions/vared.fish
+share/fish/groff/fish.tmac
+share/fish/man/man1/abbr.1
 share/fish/man/man1/alias.1
 share/fish/man/man1/and.1
 share/fish/man/man1/begin.1
@@ -601,15 +770,17 @@ share/fish/man/man1/end.1
 share/fish/man/man1/eval.1
 share/fish/man/man1/exec.1
 share/fish/man/man1/exit.1
+share/fish/man/man1/false.1
 share/fish/man/man1/fg.1
 share/fish/man/man1/fish.1
 share/fish/man/man1/fish_config.1
 share/fish/man/man1/fish_indent.1
-share/fish/man/man1/fish_pager.1
+share/fish/man/man1/fish_key_reader.1
+share/fish/man/man1/fish_mode_prompt.1
 share/fish/man/man1/fish_prompt.1
 share/fish/man/man1/fish_right_prompt.1
 share/fish/man/man1/fish_update_completions.1
-share/fish/man/man1/fishd.1
+share/fish/man/man1/fish_vi_mode.1
 share/fish/man/man1/for.1
 share/fish/man/man1/funced.1
 share/fish/man/man1/funcsave.1
@@ -621,25 +792,31 @@ share/fish/man/man1/if.1
 share/fish/man/man1/isatty.1
 share/fish/man/man1/jobs.1
 share/fish/man/man1/math.1
-share/fish/man/man1/mimedb.1
 share/fish/man/man1/nextd.1
 share/fish/man/man1/not.1
+share/fish/man/man1/open.1
 share/fish/man/man1/or.1
 share/fish/man/man1/popd.1
 share/fish/man/man1/prevd.1
+share/fish/man/man1/printf.1
+share/fish/man/man1/prompt_pwd.1
 share/fish/man/man1/psub.1
 share/fish/man/man1/pushd.1
 share/fish/man/man1/pwd.1
 share/fish/man/man1/random.1
 share/fish/man/man1/read.1
+share/fish/man/man1/realpath.1
 share/fish/man/man1/return.1
 share/fish/man/man1/set.1
 share/fish/man/man1/set_color.1
 share/fish/man/man1/source.1
 share/fish/man/man1/status.1
+share/fish/man/man1/string.1
+share/fish/man/man1/suspend.1
 share/fish/man/man1/switch.1
 share/fish/man/man1/test.1
 share/fish/man/man1/trap.1
+share/fish/man/man1/true.1
 share/fish/man/man1/type.1
 share/fish/man/man1/ulimit.1
 share/fish/man/man1/umask.1
@@ -648,13 +825,28 @@ share/fish/man/man1/while.1
 share/fish/tools/create_manpage_completions.py
 share/fish/tools/deroff.py
 share/fish/tools/web_config/delete.png
+share/fish/tools/web_config/favicon.png
+share/fish/tools/web_config/fishconfig.css
 share/fish/tools/web_config/index.html
-share/fish/tools/web_config/jquery.js
+share/fish/tools/web_config/js/angular.js
+share/fish/tools/web_config/js/app.js
+share/fish/tools/web_config/js/colorutils.js
+share/fish/tools/web_config/js/controllers.js
+share/fish/tools/web_config/js/filters.js
+share/fish/tools/web_config/partials/abbreviations.html
+share/fish/tools/web_config/partials/bindings.html
+share/fish/tools/web_config/partials/colors.html
+share/fish/tools/web_config/partials/functions.html
+share/fish/tools/web_config/partials/history.html
+share/fish/tools/web_config/partials/prompt.html
+share/fish/tools/web_config/partials/variables.html
+share/fish/tools/web_config/sample_prompts/acidhub.fish
 share/fish/tools/web_config/sample_prompts/classic.fish
-share/fish/tools/web_config/sample_prompts/classic_git.fish
 share/fish/tools/web_config/sample_prompts/classic_status.fish
+share/fish/tools/web_config/sample_prompts/classic_vcs.fish
+share/fish/tools/web_config/sample_prompts/debian_chroot.fish
 share/fish/tools/web_config/sample_prompts/informative.fish
-share/fish/tools/web_config/sample_prompts/informative_git.fish
+share/fish/tools/web_config/sample_prompts/informative_vcs.fish
 share/fish/tools/web_config/sample_prompts/justadollar.fish
 share/fish/tools/web_config/sample_prompts/lonetwin.fish
 share/fish/tools/web_config/sample_prompts/minimalist.fish
@@ -662,6 +854,19 @@ share/fish/tools/web_config/sample_promp
 share/fish/tools/web_config/sample_prompts/pythonista.fish
 share/fish/tools/web_config/sample_prompts/robbyrussell.fish
 share/fish/tools/web_config/sample_prompts/screen_savvy.fish
+share/fish/tools/web_config/sample_prompts/sorin.fish
 share/fish/tools/web_config/sample_prompts/terlar.fish
 share/fish/tools/web_config/sample_prompts/user_host_path.fish
 share/fish/tools/web_config/webconfig.py
+share/locale/de/LC_MESSAGES/fish.mo
+share/locale/en/LC_MESSAGES/fish.mo
+share/locale/fr/LC_MESSAGES/fish.mo
+share/locale/pl/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
+share/pkgconfig/fish.pc
+@pkgdir share/fish/vendor_functions.d
+@pkgdir share/fish/vendor_conf.d
+@pkgdir share/fish/vendor_completions.d
+@pkgdir etc/fish/conf.d

Index: pkgsrc/shells/fish/distinfo
diff -u pkgsrc/shells/fish/distinfo:1.5 pkgsrc/shells/fish/distinfo:1.6
--- pkgsrc/shells/fish/distinfo:1.5     Mon Nov  2 23:00:34 2015
+++ pkgsrc/shells/fish/distinfo Sat May 13 01:19:05 2017
@@ -1,21 +1,9 @@
-$NetBSD: distinfo,v 1.5 2015/11/02 23:00:34 agc Exp $
+$NetBSD: distinfo,v 1.6 2017/05/13 01:19:05 wen Exp $
 
-SHA1 (fish-2.1.2.tar.gz) = f7f8d8d26721833be3458b8113c74b747296ec0b
-RMD160 (fish-2.1.2.tar.gz) = 109e3fbb07e36a6cf2b651b148d3a60eca9f8930
-SHA512 (fish-2.1.2.tar.gz) = 4f8f0133094d4d2295546a5b96e044646de2266364610368210b0db529b2d865c1b389f01f311b9b6d6d6dcd2a29040b7a9499d491605ae52a765a76d83db2a5
-Size (fish-2.1.2.tar.gz) = 1730198 bytes
-SHA1 (patch-Makefile.in) = b7a62d30095fd58cade131ba800b3124ccad29f2
-SHA1 (patch-builtin.cpp) = 8fcc2f9a38aaff0c2994d53788b81e789cf05670
-SHA1 (patch-common.cpp) = 7ea4e2aa2fed5ddec0916ecdafb49bc16142c491
-SHA1 (patch-common.h) = 93082e43847f1f94e00dc6fa991b28f919674d8f
-SHA1 (patch-configure) = 9153240e4037fda4ef03412c65b7f3bb5bfb0cd2
-SHA1 (patch-env.cpp) = ac3c188de1b24d4a0433d2516c2afa0a8b6f137d
-SHA1 (patch-exec.cpp) = 711c2ca4a7c100e40e7e1a2a9235546105d36098
-SHA1 (patch-fallback.h) = d2c4edb11877c1b7cf97362bb61fe03d535caef5
-SHA1 (patch-history.cpp) = d4d874bd805f9d9e547aebeb780c855a67be079b
-SHA1 (patch-output.cpp) = 5c44bec667f4aac0d88e5825a76be893f9852295
-SHA1 (patch-output.h) = c40ae78baf08c69e67365c2f032178b0aa12e844
-SHA1 (patch-parser.cpp) = e0d2b127e205c23664aab60f6dc0c7872de82dee
-SHA1 (patch-parser__keywords.cpp) = 3f8589db528a7e970d5f1bb61104e7db27435571
-SHA1 (patch-proc.h) = 3eaf2c20ad0c3a228f20067b1218bdca039bdab6
-SHA1 (patch-screen.cpp) = 057d357e312fe55965ff0b92f9ae935b31dfcf4b
+SHA1 (fish-2.5.0.tar.gz) = ec52debe0a829b9df29f658697523af7c18ee778
+RMD160 (fish-2.5.0.tar.gz) = 7c206d612f4316900dfecfe46b9a3f95411c4d79
+SHA512 (fish-2.5.0.tar.gz) = 6d94bb70a5f1cefaada4d10ac845992f87c9bfc8c253f38bdfcc3a573a35503d825c9487d2ce8ef3819713594ab7b54ebf6c89fe3362c7010c63dbefc99b424d
+Size (fish-2.5.0.tar.gz) = 3496831 bytes
+SHA1 (patch-Makefile.in) = e2f5722d2e08e644e0813a662b64bbfe811a8ec6
+SHA1 (patch-configure) = 867ad2e2b93aa58fd93db05646efd9c0335c8bb8
+SHA1 (patch-src_builtin.cpp) = b48a52d45ba545a92043e58dc554305670c7fcfc

Index: pkgsrc/shells/fish/patches/patch-Makefile.in
diff -u pkgsrc/shells/fish/patches/patch-Makefile.in:1.2 pkgsrc/shells/fish/patches/patch-Makefile.in:1.3
--- pkgsrc/shells/fish/patches/patch-Makefile.in:1.2    Fri Mar  6 21:03:20 2015
+++ pkgsrc/shells/fish/patches/patch-Makefile.in        Sat May 13 01:19:05 2017
@@ -1,24 +1,19 @@
-$NetBSD: patch-Makefile.in,v 1.2 2015/03/06 21:03:20 ryoon Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2017/05/13 01:19:05 wen Exp $
 
 Install configuration files to EGDIR
 
---- Makefile.in.orig   2015-02-16 19:07:12.000000000 +0000
+--- Makefile.in.orig   2017-04-29 23:37:12.000000000 +0000
 +++ Makefile.in
-@@ -600,7 +600,7 @@ install-force: all install-translations
-               $(INSTALL) -m 755 $$i $(DESTDIR)$(bindir) ; \
+@@ -653,9 +653,9 @@ install-force: all install-translations 
                true ;\
        done;
--      $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish
-+      $(INSTALL) -m 755 -d $(DESTDIR)$(EGDIR)/fish
-       $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish
-       $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/completions
-       $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/functions
-@@ -608,7 +608,7 @@ install-force: all install-translations
-       $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools
-       $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config
-       $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config/sample_prompts
--      $(INSTALL) -m 644 etc/config.fish                  $(DESTDIR)$(sysconfdir)/fish/
-+      $(INSTALL) -m 644 etc/config.fish                  $(DESTDIR)$(EGDIR)/fish/
-       $(INSTALL) -m 644 share/config.fish                $(DESTDIR)$(datadir)/fish/
-       for i in $(COMPLETIONS_DIR_FILES:%='%'); do \
-               $(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/completions/; \
+       @echo "Creating sysconfdir tree"
+-      $v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish
+-      $v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish/conf.d
+-      $v $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(sysconfdir)/fish/
++      $v $(INSTALL) -m 755 -d $(DESTDIR)$(EGDIR)/fish
++      $v $(INSTALL) -m 755 -d $(DESTDIR)$(EGDIR)/fish/conf.d
++      $v $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(EGDIR)/
+       @echo "Creating datadir tree"
+       $v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish
+       $v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/completions

Index: pkgsrc/shells/fish/patches/patch-configure
diff -u pkgsrc/shells/fish/patches/patch-configure:1.3 pkgsrc/shells/fish/patches/patch-configure:1.4
--- pkgsrc/shells/fish/patches/patch-configure:1.3      Fri Mar  6 21:03:20 2015
+++ pkgsrc/shells/fish/patches/patch-configure  Sat May 13 01:19:05 2017
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.3 2015/03/06 21:03:20 ryoon Exp $
+$NetBSD: patch-configure,v 1.4 2017/05/13 01:19:05 wen Exp $
 
 Expand variable where it's defined
 
---- configure.orig     2015-02-24 18:17:38.000000000 +0000
+--- configure.orig     2017-04-30 00:11:48.000000000 +0000
 +++ configure
-@@ -814,7 +814,7 @@ sharedstatedir='${prefix}/com'
+@@ -827,7 +827,7 @@ sharedstatedir='${prefix}/com'
  localstatedir='${prefix}/var'
  includedir='${prefix}/include'
  oldincludedir='/usr/include'

Added files:

Index: pkgsrc/shells/fish/patches/patch-src_builtin.cpp
diff -u /dev/null pkgsrc/shells/fish/patches/patch-src_builtin.cpp:1.1
--- /dev/null   Sat May 13 01:19:05 2017
+++ pkgsrc/shells/fish/patches/patch-src_builtin.cpp    Sat May 13 01:19:05 2017
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_builtin.cpp,v 1.1 2017/05/13 01:19:05 wen Exp $
+
+--- src/builtin.cpp.orig       2017-04-29 23:41:45.000000000 +0000
++++ src/builtin.cpp
+@@ -190,11 +190,11 @@ void builtin_print_help(parser_t &parser
+         bool is_short = false;
+         if (is_stderr) {
+             // Interactive mode help to screen - only print synopsis if the rest won't fit.
+-            int screen_height, lines;
++            int screen_height, my_lines;
+ 
+             screen_height = common_get_height();
+-            lines = count_char(str, L'\n');
+-            if (!shell_is_interactive() || (lines > 2 * screen_height / 3)) {
++            my_lines = count_char(str, L'\n');
++            if (!shell_is_interactive() || (my_lines > 2 * screen_height / 3)) {
+                 wchar_t *pos;
+                 int cut = 0;
+                 int i;



Home | Main Index | Thread Index | Old Index