Commit cce46310 authored by asomers's avatar asomers
Browse files

shells/fish: Upgrade to 2.6.0

PR:		220068
parent 509ba897
......@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= fish
PORTVERSION= 2.5.0
PORTVERSION= 2.6.0
CATEGORIES= shells
MASTER_SITES= http://fishshell.com/files/${PORTVERSION}/
......@@ -11,8 +11,11 @@ COMMENT= User friendly command line shell
LICENSE= GPLv2
LIB_DEPENDS+= libpcre2-32.so:devel/pcre2
USES= autoreconf cpe gmake libtool ncurses pkgconfig pathfix python:3 \
localbase compiler:c++11-lang
localbase compiler:c++11-lang shebangfix
SHEBANG_FILES= share/tools/*.py share/tools/web_config/webconfig.py
GNU_CONFIGURE= yes
......
TIMESTAMP = 1486791004
SHA256 (fish-2.5.0.tar.gz) = f8c0edadca2de379ccf305aeace660a9255fa2180c72e85e97705a24c256b2a5
SIZE (fish-2.5.0.tar.gz) = 3496831
TIMESTAMP = 1497402776
SHA256 (fish-2.6.0.tar.gz) = 7ee5bbd671c73e5323778982109241685d58a836e52013e18ee5d9f2e638fdfb
SIZE (fish-2.6.0.tar.gz) = 3575346
--- share/completions/python.fish.orig 2017-02-11 04:56:23 UTC
+++ share/completions/python.fish
@@ -16,15 +16,3 @@ complete -c python -s W -x --description
complete -c python -s x -d 'Skip first line of source, allowing use of non-Unix forms of #!cmd'
complete -c python -a "(__fish_complete_suffix .py)"
complete -c python -a '-' -d 'Read program from stdin'
-
-switch (python -V 2>&1 | string replace -r '^.*\s([23])..*' '$1')[1]
- case 2
- complete -c python -s 3 -d 'Warn about Python 3.x incompatibilities that 2to3 cannot trivially fix'
- complete -c python -s t --description "Warn on mixed tabs and spaces"
- complete -c python -s Q -x -a "old new warn warnall" --description "Division control"
- case 3
- complete -c python -s q --description 'Don\'t print version and copyright messages on interactive startup'
- complete -c python -s X -x -d 'Set implementation-specific option'
- complete -c python -s b -d 'Issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str'
- complete -c python -o bb -d 'Issue errors'
-end
--- share/functions/__fish_print_filesystems.fish.orig 2017-02-03 01:46:58 UTC
+++ share/functions/__fish_print_filesystems.fish
@@ -4,6 +4,6 @@ function __fish_print_filesystems -d "Pr
set fs $fs hfs hpfs iso9660 jfs minix msdos ncpfs nfs ntfs proc qnx4 ramfs
set fs $fs reiserfs romfs smbfs sysv tmpfs udf ufs umsdos vfat xenix xfs xiafs
# Mount has helper binaries to mount filesystems
- # These are called mount.* and are placed somewhere in $PATH
- printf "%s\n" $fs (string replace -ra ".*/mount." "" -- $PATH/mount.*)
+ # These are called mount_* and are placed somewhere in $PATH
+ printf "%s\n" $fs (string replace -ra ".*/mount_" "" -- $PATH/mount_*)
end
--- src/common.cpp.orig 2017-06-16 23:56:48 UTC
+++ src/common.cpp
@@ -1986,7 +1986,7 @@ void redirect_tty_output() {
}
/// Display a failed assertion message, dump a stack trace if possible, then die.
-[[noreturn]] void __assert(const char *msg, const char *file, size_t line, int error) {
+[[noreturn]] void __fish_assert(const char *msg, const char *file, size_t line, int error) {
if (error) {
debug(0, L"%s:%zu: failed assertion: %s: errno %d (%s)", file, line, msg, error,
strerror(error));
--- src/common.h.orig 2017-06-16 23:55:11 UTC
+++ src/common.h
@@ -213,23 +213,21 @@ extern bool has_working_tty_timestamps;
/// stdio functions and should be writing the message to stderr rather than stdout. Second, if
/// possible it is useful to provide additional context such as a stack backtrace.
#undef assert
-#undef __assert
-//#define assert(e) do {(void)((e) ? ((void)0) : __assert(#e, __FILE__, __LINE__)); } while(false)
-#define assert(e) (e) ? ((void)0) : __assert(#e, __FILE__, __LINE__, 0)
-#define assert_with_errno(e) (e) ? ((void)0) : __assert(#e, __FILE__, __LINE__, errno)
-#define DIE(msg) __assert(msg, __FILE__, __LINE__, 0)
-#define DIE_WITH_ERRNO(msg) __assert(msg, __FILE__, __LINE__, errno)
+#define assert(e) (e) ? ((void)0) : __fish_assert(#e, __FILE__, __LINE__, 0)
+#define assert_with_errno(e) (e) ? ((void)0) : __fish_assert(#e, __FILE__, __LINE__, errno)
+#define DIE(msg) __fish_assert(msg, __FILE__, __LINE__, 0)
+#define DIE_WITH_ERRNO(msg) __fish_assert(msg, __FILE__, __LINE__, errno)
/// This macro is meant to be used with functions that return zero on success otherwise return an
/// errno value. Most notably the pthread family of functions which we never expect to fail.
#define DIE_ON_FAILURE(e) \
do { \
int status = e; \
if (status != 0) { \
- __assert(#e, __FILE__, __LINE__, status); \
+ __fish_assert(#e, __FILE__, __LINE__, status); \
} \
} while (0)
-[[noreturn]] void __assert(const char *msg, const char *file, size_t line, int error);
+[[noreturn]] void __fish_assert(const char *msg, const char *file, size_t line, int error);
/// Check if signals are blocked. If so, print an error message and return from the function
/// performing this check.
......@@ -69,7 +69,6 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/alsactl.fish
%%DATADIR%%/completions/alsamixer.fish
%%DATADIR%%/completions/amixer.fish
%%DATADIR%%/completions/anamnesis.fish
%%DATADIR%%/completions/and.fish
%%DATADIR%%/completions/animate.fish
%%DATADIR%%/completions/ant.fish
......@@ -128,7 +127,6 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/builtin.fish
%%DATADIR%%/completions/bundle.fish
%%DATADIR%%/completions/bunzip2.fish
%%DATADIR%%/completions/burp.fish
%%DATADIR%%/completions/busctl.fish
%%DATADIR%%/completions/bzcat.fish
%%DATADIR%%/completions/bzip2.fish
......@@ -136,10 +134,12 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/bzr.fish
%%DATADIR%%/completions/cabal-dev.fish
%%DATADIR%%/completions/cabal.fish
%%DATADIR%%/completions/caddy.fish
%%DATADIR%%/completions/caffeinate.fish
%%DATADIR%%/completions/cancel.fish
%%DATADIR%%/completions/canto.fish
%%DATADIR%%/completions/cargo.fish
%%DATADIR%%/completions/castnow.fish
%%DATADIR%%/completions/cat.fish
%%DATADIR%%/completions/cd.fish
%%DATADIR%%/completions/cdrecord.fish
......@@ -147,6 +147,7 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/chmod.fish
%%DATADIR%%/completions/chown.fish
%%DATADIR%%/completions/chsh.fish
%%DATADIR%%/completions/climate.fish
%%DATADIR%%/completions/colordiff.fish
%%DATADIR%%/completions/colorsvn.fish
%%DATADIR%%/completions/combine.fish
......@@ -176,7 +177,6 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/darcs.fish
%%DATADIR%%/completions/date.fish
%%DATADIR%%/completions/dconf.fish
%%DATADIR%%/completions/dcop.fish
%%DATADIR%%/completions/dd.fish
%%DATADIR%%/completions/defaults.fish
%%DATADIR%%/completions/df.fish
......@@ -185,7 +185,6 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/diskutil.fish
%%DATADIR%%/completions/display.fish
%%DATADIR%%/completions/djview.fish
%%DATADIR%%/completions/djview3.fish
%%DATADIR%%/completions/djview4.fish
%%DATADIR%%/completions/dlocate.fish
%%DATADIR%%/completions/dmesg.fish
......@@ -198,7 +197,6 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/dvipdf.fish
%%DATADIR%%/completions/dvipdfm.fish
%%DATADIR%%/completions/echo.fish
%%DATADIR%%/completions/effectv.fish
%%DATADIR%%/completions/egrep.fish
%%DATADIR%%/completions/eix-sync.fish
%%DATADIR%%/completions/eix.fish
......@@ -217,7 +215,6 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/exec.fish
%%DATADIR%%/completions/exit.fish
%%DATADIR%%/completions/expand.fish
%%DATADIR%%/completions/fcrontab.fish
%%DATADIR%%/completions/feh.fish
%%DATADIR%%/completions/fg.fish
%%DATADIR%%/completions/fgrep.fish
......@@ -227,6 +224,7 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/fish.fish
%%DATADIR%%/completions/fish_indent.fish
%%DATADIR%%/completions/flac.fish
%%DATADIR%%/completions/flatpak.fish
%%DATADIR%%/completions/fluxbox-remote.fish
%%DATADIR%%/completions/fossil.fish
%%DATADIR%%/completions/ftp.fish
......@@ -250,21 +248,25 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/gpg.fish
%%DATADIR%%/completions/gphoto2.fish
%%DATADIR%%/completions/gprof.fish
%%DATADIR%%/completions/gradle.fish
%%DATADIR%%/completions/grep.fish
%%DATADIR%%/completions/groupadd.fish
%%DATADIR%%/completions/grunt.fish
%%DATADIR%%/completions/gsettings.fish
%%DATADIR%%/completions/gunzip.fish
%%DATADIR%%/completions/gv.fish
%%DATADIR%%/completions/gvim.fish
%%DATADIR%%/completions/gvimdiff.fish
%%DATADIR%%/completions/gzip.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/history.fish
%%DATADIR%%/completions/htop.fish
%%DATADIR%%/completions/i3-msg.fish
%%DATADIR%%/completions/iconv.fish
%%DATADIR%%/completions/id.fish
%%DATADIR%%/completions/identify.fish
......@@ -276,9 +278,11 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/import.fish
%%DATADIR%%/completions/invoke-rc.d.fish
%%DATADIR%%/completions/ip.fish
%%DATADIR%%/completions/ipset.fish
%%DATADIR%%/completions/iptables.fish
%%DATADIR%%/completions/jobs.fish
%%DATADIR%%/completions/journalctl.fish
%%DATADIR%%/completions/jq.fish
%%DATADIR%%/completions/kcmshell5.fish
%%DATADIR%%/completions/kill.fish
%%DATADIR%%/completions/killall.fish
......@@ -289,6 +293,7 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/launchctl.fish
%%DATADIR%%/completions/lein.fish
%%DATADIR%%/completions/less.fish
%%DATADIR%%/completions/light.fish
%%DATADIR%%/completions/ll.fish
%%DATADIR%%/completions/ln.fish
%%DATADIR%%/completions/localectl.fish
......@@ -316,6 +321,7 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/lxpanel.fish
%%DATADIR%%/completions/m4.fish
%%DATADIR%%/completions/machinectl.fish
%%DATADIR%%/completions/magento.fish
%%DATADIR%%/completions/make.fish
%%DATADIR%%/completions/makedepend.fish
%%DATADIR%%/completions/makepkg.fish
......@@ -328,12 +334,16 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/mdimport.fish
%%DATADIR%%/completions/mdls.fish
%%DATADIR%%/completions/mdutil.fish
%%DATADIR%%/completions/meat.fish
%%DATADIR%%/completions/minikube.fish
%%DATADIR%%/completions/mix.fish
%%DATADIR%%/completions/mkdir.fish
%%DATADIR%%/completions/mkdosfs.fish
%%DATADIR%%/completions/mkfs.fat.fish
%%DATADIR%%/completions/mkfs.vfat.fish
%%DATADIR%%/completions/mkinitcpio.fish
%%DATADIR%%/completions/mktemp.fish
%%DATADIR%%/completions/mkvextract.fish
%%DATADIR%%/completions/mocha.fish
%%DATADIR%%/completions/mocp.fish
%%DATADIR%%/completions/modinfo.fish
%%DATADIR%%/completions/modprobe.fish
......@@ -415,6 +425,7 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/psql.fish
%%DATADIR%%/completions/psub.fish
%%DATADIR%%/completions/pushd.fish
%%DATADIR%%/completions/pv.fish
%%DATADIR%%/completions/pydf.fish
%%DATADIR%%/completions/pygmentize.fish
%%DATADIR%%/completions/python.fish
......@@ -459,6 +470,7 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/set.fish
%%DATADIR%%/completions/set_color.fish
%%DATADIR%%/completions/setfacl.fish
%%DATADIR%%/completions/setsid.fish
%%DATADIR%%/completions/setxkbmap.fish
%%DATADIR%%/completions/sha1sum.fish
%%DATADIR%%/completions/sha224sum.fish
......@@ -488,6 +500,7 @@ man/man1/fish_key_reader.1.gz
%%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/time.fish
......@@ -515,6 +528,7 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/update-eix-remote.fish
%%DATADIR%%/completions/update-eix.fish
%%DATADIR%%/completions/useradd.fish
%%DATADIR%%/completions/usermod.fish
%%DATADIR%%/completions/vagrant.fish
%%DATADIR%%/completions/valgrind.fish
%%DATADIR%%/completions/vared.fish
......@@ -541,6 +555,7 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/xdvi.fish
%%DATADIR%%/completions/xelatex.fish
%%DATADIR%%/completions/xgettext.fish
%%DATADIR%%/completions/xinput.fish
%%DATADIR%%/completions/xmms.fish
%%DATADIR%%/completions/xpdf.fish
%%DATADIR%%/completions/xprop.fish
......@@ -550,6 +565,7 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/completions/xterm.fish
%%DATADIR%%/completions/xz.fish
%%DATADIR%%/completions/yaourt.fish
%%DATADIR%%/completions/yarn.fish
%%DATADIR%%/completions/yast2.fish
%%DATADIR%%/completions/yum.fish
%%DATADIR%%/completions/zcat.fish
......@@ -562,6 +578,7 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/functions/__fish_bind_test1.fish
%%DATADIR%%/functions/__fish_bind_test2.fish
%%DATADIR%%/functions/__fish_cancel_commandline.fish
%%DATADIR%%/functions/__fish_commandline_is_singlequoted.fish
%%DATADIR%%/functions/__fish_commandline_test.fish
%%DATADIR%%/functions/__fish_complete_abook_formats.fish
%%DATADIR%%/functions/__fish_complete_ant_targets.fish
......@@ -581,6 +598,7 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/functions/__fish_complete_lpr_option.fish
%%DATADIR%%/functions/__fish_complete_lsusb.fish
%%DATADIR%%/functions/__fish_complete_man.fish
%%DATADIR%%/functions/__fish_complete_mount_opts.fish
%%DATADIR%%/functions/__fish_complete_path.fish
%%DATADIR%%/functions/__fish_complete_pgrep.fish
%%DATADIR%%/functions/__fish_complete_pids.fish
......@@ -608,6 +626,7 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/functions/__fish_gnu_complete.fish
%%DATADIR%%/functions/__fish_hg_prompt.fish
%%DATADIR%%/functions/__fish_is_first_token.fish
%%DATADIR%%/functions/__fish_is_git_repository.fish
%%DATADIR%%/functions/__fish_is_token_n.fish
%%DATADIR%%/functions/__fish_list_current_token.fish
%%DATADIR%%/functions/__fish_make_completion_signals.fish
......@@ -704,6 +723,7 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/functions/fish_hybrid_key_bindings.fish
%%DATADIR%%/functions/fish_indent.fish
%%DATADIR%%/functions/fish_key_reader.fish
%%DATADIR%%/functions/fish_md5.fish
%%DATADIR%%/functions/fish_mode_prompt.fish
%%DATADIR%%/functions/fish_prompt.fish
%%DATADIR%%/functions/fish_update_completions.fish
......@@ -763,6 +783,7 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/man/man1/count.1.gz
%%DATADIR%%/man/man1/dirh.1.gz
%%DATADIR%%/man/man1/dirs.1.gz
%%DATADIR%%/man/man1/disown.1.gz
%%DATADIR%%/man/man1/echo.1.gz
%%DATADIR%%/man/man1/else.1.gz
%%DATADIR%%/man/man1/emit.1.gz
......@@ -828,6 +849,7 @@ man/man1/fish_key_reader.1.gz
%%DATADIR%%/tools/web_config/favicon.png
%%DATADIR%%/tools/web_config/fishconfig.css
%%DATADIR%%/tools/web_config/index.html
%%DATADIR%%/tools/web_config/js/angular-sanitize.js
%%DATADIR%%/tools/web_config/js/angular.js
%%DATADIR%%/tools/web_config/js/app.js
%%DATADIR%%/tools/web_config/js/colorutils.js
......@@ -861,6 +883,8 @@ man/man1/fish_key_reader.1.gz
%%NLS%%share/locale/de/LC_MESSAGES/fish.mo
%%NLS%%share/locale/en/LC_MESSAGES/fish.mo
%%NLS%%share/locale/fr/LC_MESSAGES/fish.mo
%%NLS%%share/locale/nb/LC_MESSAGES/fish.mo
%%NLS%%share/locale/nn/LC_MESSAGES/fish.mo
%%NLS%%share/locale/pl/LC_MESSAGES/fish.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/fish.mo
%%NLS%%share/locale/sv/LC_MESSAGES/fish.mo
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment