diff options
| author | maya <maya@pkgsrc.org> | 2019-02-13 22:03:53 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2019-02-13 22:03:53 +0000 |
| commit | 6e4ae0dce5f65f34d7bdf3615f3e2c6a91af69af (patch) | |
| tree | 5ebf485f09c34a665070435094eb25b6f73f640e /shells | |
| parent | 9b4341d8a7511d940e5cb3bf53aa37f40add5fee (diff) | |
| download | pkgsrc-6e4ae0dce5f65f34d7bdf3615f3e2c6a91af69af.tar.gz | |
fish: temporarily disable the functionality of man.fish
if MANPATH is empty but the environment variable is respected, we won't
be able to find any man pages, because fish set it to PREFIX/share/fish/man
bump PKGREVISION
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/fish/Makefile | 3 | ||||
| -rw-r--r-- | shells/fish/distinfo | 3 | ||||
| -rw-r--r-- | shells/fish/patches/patch-share_functions_man.fish | 44 |
3 files changed, 48 insertions, 2 deletions
diff --git a/shells/fish/Makefile b/shells/fish/Makefile index 32cf38150fe..8f00eebf5db 100644 --- a/shells/fish/Makefile +++ b/shells/fish/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2019/02/12 16:49:31 maya Exp $ +# $NetBSD: Makefile,v 1.19 2019/02/13 22:03:53 maya Exp $ DISTNAME= fish-3.0.0 +PKGREVISION= 1 CATEGORIES= shells MASTER_SITES= ${MASTER_SITE_GITHUB:=fish-shell/} GITHUB_PROJECT= fish-shell diff --git a/shells/fish/distinfo b/shells/fish/distinfo index c56882899de..4916eb8efe3 100644 --- a/shells/fish/distinfo +++ b/shells/fish/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2019/02/12 16:49:31 maya Exp $ +$NetBSD: distinfo,v 1.14 2019/02/13 22:03:53 maya Exp $ SHA1 (fish-3.0.0.tar.gz) = 8fde79d1721e33a46bffe19b66d23b5adbfec3bf RMD160 (fish-3.0.0.tar.gz) = 497da118e30a756a6068fef4707844ed92618fa0 @@ -6,6 +6,7 @@ SHA512 (fish-3.0.0.tar.gz) = 97efb67c34860794787b44c04fbb8ebc1b7a8c37da00e7f6d93 Size (fish-3.0.0.tar.gz) = 6224375 bytes SHA1 (patch-Makefile.in) = 279d0a77ae52470150f4293a10c26e269fd25cee SHA1 (patch-configure.ac) = 05bad922ce93d5624f8c98a210e473ad702fbe8d +SHA1 (patch-share_functions_man.fish) = c31cf77efe66a26d24f31ae005838799bb70746e SHA1 (patch-src_builtin.cpp) = b48a52d45ba545a92043e58dc554305670c7fcfc SHA1 (patch-src_fallback.cpp) = b6da274e326caa1f4c503874411dd1b1db224374 SHA1 (patch-src_fallback.h) = e58b29135404211b841232d68e76facdfecc653b diff --git a/shells/fish/patches/patch-share_functions_man.fish b/shells/fish/patches/patch-share_functions_man.fish new file mode 100644 index 00000000000..5a140b3ed18 --- /dev/null +++ b/shells/fish/patches/patch-share_functions_man.fish @@ -0,0 +1,44 @@ +$NetBSD: patch-share_functions_man.fish,v 1.1 2019/02/13 22:03:53 maya Exp $ + +Avoid playing games with MANPATH. + +If MANPATH is empty, this sets MANPATH to PREFIX/share/fish/man. +This means that you won't be able to find normal man pages. + +--- share/functions/man.fish.orig 2018-12-28 13:01:03.000000000 +0000 ++++ share/functions/man.fish +@@ -9,20 +9,20 @@ function man --description "Format and d + # man pages priority, without having to put fish's bin directories first in $PATH. + + # Preserve the existing MANPATH, and default to the system path (the empty string). +- set -l manpath +- if set -q MANPATH +- set manpath $MANPATH +- else +- set manpath '' +- end +- # Notice the shadowing local exported copy of the variable. +- set -lx MANPATH $manpath +- +- # Prepend fish's man directory if available. +- set -l fish_manpath (dirname $__fish_data_dir)/fish/man +- if test -d $fish_manpath +- set MANPATH $fish_manpath $MANPATH +- end ++# set -l manpath ++# if set -q MANPATH ++# set manpath $MANPATH ++# else ++# set manpath '' ++# end ++# # Notice the shadowing local exported copy of the variable. ++# set -lx MANPATH $manpath ++# ++# # Prepend fish's man directory if available. ++# set -l fish_manpath (dirname $__fish_data_dir)/fish/man ++# if test -d $fish_manpath ++# set MANPATH $fish_manpath $MANPATH ++# END + + command man $argv + end |