SF.net SVN: gar:[22507] csw/mgar/pkg/fish/trunk

[guengel at users.sourceforge.net]

Revision: 22507
          http://gar.svn.sourceforge.net/gar/?rev=22507&view=rev
Author:   guengel
Date:     2013-11-14 17:04:52 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
fish/trunk: When `help' invokes man, do it the Solaris way.

Modified Paths:
--------------
    csw/mgar/pkg/fish/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/fish/trunk/files/0010-Invoke-man-solaris-style.patch

Modified: csw/mgar/pkg/fish/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fish/trunk/Makefile	2013-11-14 16:38:44 UTC (rev 22506)
+++ csw/mgar/pkg/fish/trunk/Makefile	2013-11-14 17:04:52 UTC (rev 22507)
@@ -28,6 +28,7 @@
 PATCHFILES += 0007-Add-opt-csw-where-deemed-neccessary.patch
 PATCHFILES += 0008-Use-gfind-instead-of-find.patch
 PATCHFILES += 0009-Use-default-man-path-instead-of-manpath-command.patch
+PATCHFILES += 0010-Invoke-man-solaris-style.patch
 
 RUNTIME_DEP_PKGS_CSWfish += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWfish += CSWlibgcc-s1

Added: csw/mgar/pkg/fish/trunk/files/0010-Invoke-man-solaris-style.patch
===================================================================
--- csw/mgar/pkg/fish/trunk/files/0010-Invoke-man-solaris-style.patch	                        (rev 0)
+++ csw/mgar/pkg/fish/trunk/files/0010-Invoke-man-solaris-style.patch	2013-11-14 17:04:52 UTC (rev 22507)
@@ -0,0 +1,27 @@
+From ed358a79a7dbdf83bd1400bb3f4586d7581d0895 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Thu, 14 Nov 2013 18:02:25 +0100
+Subject: [PATCH] Invoke man solaris-style
+
+---
+ share/functions/help.fish | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/share/functions/help.fish b/share/functions/help.fish
+index 04992e3..632951d 100644
+--- a/share/functions/help.fish
++++ b/share/functions/help.fish
+@@ -98,7 +98,9 @@ function help --description 'Show help for the fish shell'
+ 				# installs on OS X
+ 				set -l man_arg "$__fish_datadir/man/man1/$fish_help_item.1"
+ 				if test -f "$man_arg"
+-					man $man_arg
++					# That doesn't work with Solaris' man
++					# man $man_arg
++					man -M "$__fish_datadir/man" "$fish_help_item"
+ 					return
+ 				end
+ 			end
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.