CVS commit: pkgsrc/shells/fish

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Feb 13 22:03:53 UTC 2019

Modified Files:
        pkgsrc/shells/fish: Makefile distinfo
Added Files:
        pkgsrc/shells/fish/patches: patch-share_functions_man.fish

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/shells/fish/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/shells/fish/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/shells/fish/patches/patch-share_functions_man.fish

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.18 pkgsrc/shells/fish/Makefile:1.19
--- pkgsrc/shells/fish/Makefile:1.18    Tue Feb 12 16:49:31 2019
+++ pkgsrc/shells/fish/Makefile Wed Feb 13 22:03:53 2019
@@ -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

Index: pkgsrc/shells/fish/distinfo
diff -u pkgsrc/shells/fish/distinfo:1.13 pkgsrc/shells/fish/distinfo:1.14
--- pkgsrc/shells/fish/distinfo:1.13    Tue Feb 12 16:49:31 2019
+++ pkgsrc/shells/fish/distinfo Wed Feb 13 22:03:53 2019
@@ -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) = 97efb67c348
 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

Added files:

Index: pkgsrc/shells/fish/patches/patch-share_functions_man.fish
diff -u /dev/null pkgsrc/shells/fish/patches/patch-share_functions_man.fish:1.1
--- /dev/null   Wed Feb 13 22:03:53 2019
+++ pkgsrc/shells/fish/patches/patch-share_functions_man.fish   Wed Feb 13 22:03:53 2019
@@ -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