SF.net SVN: gar:[22505] csw/mgar/pkg/fish/trunk
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Thu Nov 14 17:31:01 CET 2013
Revision: 22505
http://gar.svn.sourceforge.net/gar/?rev=22505&view=rev
Author: guengel
Date: 2013-11-14 16:31:01 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
Some tweaks.
Modified Paths:
--------------
csw/mgar/pkg/fish/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/fish/trunk/files/0008-Use-gfind-instead-of-find.patch
csw/mgar/pkg/fish/trunk/files/0009-Use-default-man-path-instead-of-manpath-command.patch
csw/mgar/pkg/fish/trunk/files/README.CSW
csw/mgar/pkg/fish/trunk/files/changelog.CSW
Modified: csw/mgar/pkg/fish/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fish/trunk/Makefile 2013-11-14 14:41:16 UTC (rev 22504)
+++ csw/mgar/pkg/fish/trunk/Makefile 2013-11-14 16:31:01 UTC (rev 22505)
@@ -15,6 +15,8 @@
MASTER_SITES = http://fishshell.com/files/$(VERSION)/
DISTFILES = $(DISTNAME).tar.gz
+DISTFILES += changelog.CSW
+DISTFILES += README.CSW
ETCSHELLS = $(bindir)/fish
@@ -24,14 +26,19 @@
PATCHFILES += 0005-Include-strings.h-to-make-bzero-available.patch
PATCHFILES += 0006-Include-strings.h-to-make-bzero-available-2.patch
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
RUNTIME_DEP_PKGS_CSWfish += CSWlibintl8
RUNTIME_DEP_PKGS_CSWfish += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWfish += CSWlibstdc++6
RUNTIME_DEP_PKGS_CSWfish += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWfish += CSWlibncurses5
+# This is due to 0008-Use-gfind-instead-of-find.patch
+RUNTIME_DEP_PKGS_CSWfish += CSWfindutils
+CHECKPKG_OVERRIDES_CSWfish += surplus-dependency|CSWfindutils
-# That's fine, directory list has been adjusted to include /opt/csw/share
+# That's fine, directory list has been adjusted to include /opt/csw/*
CHECKPKG_OVERRIDES_CSWfish += file-with-bad-content|/usr/local|root/opt/csw/bin/mimedb
CHECKPKG_OVERRIDES_CSWfish += file-with-bad-content|/usr/share|root/opt/csw/bin/mimedb
Added: csw/mgar/pkg/fish/trunk/files/0008-Use-gfind-instead-of-find.patch
===================================================================
--- csw/mgar/pkg/fish/trunk/files/0008-Use-gfind-instead-of-find.patch (rev 0)
+++ csw/mgar/pkg/fish/trunk/files/0008-Use-gfind-instead-of-find.patch 2013-11-14 16:31:01 UTC (rev 22505)
@@ -0,0 +1,23 @@
+From a2cdea497552bed072b47133657f8adc34fe3ad1 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Thu, 14 Nov 2013 16:01:13 +0100
+Subject: [PATCH] Use gfind instead of find
+
+---
+ share/functions/__fish_print_commands.fish | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/share/functions/__fish_print_commands.fish b/share/functions/__fish_print_commands.fish
+index 21c0876..25507fb 100644
+--- a/share/functions/__fish_print_commands.fish
++++ b/share/functions/__fish_print_commands.fish
+@@ -1,5 +1,5 @@
+ function __fish_print_commands --description "Print a list of documented fish commands"
+ if test -d $__fish_datadir/man/man1/
+- find $__fish_datadir/man/man1/ -type f -name \*.1 -execdir basename '{}' .1 ';'
++ /opt/csw/bin/gfind $__fish_datadir/man/man1/ -type f -name \*.1 -execdir basename '{}' .1 ';'
+ end
+ end
+--
+1.8.4.1
+
Added: csw/mgar/pkg/fish/trunk/files/0009-Use-default-man-path-instead-of-manpath-command.patch
===================================================================
--- csw/mgar/pkg/fish/trunk/files/0009-Use-default-man-path-instead-of-manpath-command.patch (rev 0)
+++ csw/mgar/pkg/fish/trunk/files/0009-Use-default-man-path-instead-of-manpath-command.patch 2013-11-14 16:31:01 UTC (rev 22505)
@@ -0,0 +1,27 @@
+From c082b42e7d6c6acf4ae8969e21fc55cc4059bca5 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Thu, 14 Nov 2013 17:28:15 +0100
+Subject: [PATCH] Use default man path instead of manpath command.
+
+---
+ share/functions/man.fish | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/share/functions/man.fish b/share/functions/man.fish
+index 2b9bab5..abbe136 100644
+--- a/share/functions/man.fish
++++ b/share/functions/man.fish
+@@ -8,7 +8,9 @@ function man --description "Format and display the on-line manual pages"
+ set -l fish_manpath (dirname $__fish_datadir)/fish/man
+ if test -d "$fish_manpath"
+ # Notice local but exported variable
+- set -lx MANPATH "$fish_manpath":(command manpath)
++ #
++ # Solaris has no `manpath' command, so I stick with the default
++ set -lx MANPATH "$fish_manpath":/usr/share/man
+
+ # Invoke man with this manpath, and we're done
+ command man $argv
+--
+1.8.4.1
+
Added: csw/mgar/pkg/fish/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/fish/trunk/files/README.CSW (rev 0)
+++ csw/mgar/pkg/fish/trunk/files/README.CSW 2013-11-14 16:31:01 UTC (rev 22505)
@@ -0,0 +1,12 @@
+Fish
+====
+
+ * If you have set MANPATH, consider adding /opt/csw/share/fish/man at
+ first position, before everything else, e.g.
+
+ set -x MANPATH /opt/csw/share/fish/man:$MANPATH
+
+
+
+
+
\ No newline at end of file
Added: csw/mgar/pkg/fish/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/fish/trunk/files/changelog.CSW (rev 0)
+++ csw/mgar/pkg/fish/trunk/files/changelog.CSW 2013-11-14 16:31:01 UTC (rev 22505)
@@ -0,0 +1,5 @@
+fish (2.1.0,REV=2013.11.14)
+
+ * Initial release.
+
+ -- Rafael Ostertag <raos at opencsw.org> Thu, 14 Nov 2013 16:11:02 +0100
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list