[csw-devel] SF.net SVN: gar:[11733] csw/mgar/pkg/git/trunk

[bdwalton at users.sourceforge.net]

Revision: 11733
          http://gar.svn.sourceforge.net/gar/?rev=11733&view=rev
Author:   bdwalton
Date:     2010-11-27 14:16:55 +0000 (Sat, 27 Nov 2010)

Log Message:
-----------
git: patch the default value of _PATH_DEFPATH

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

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2010-11-27 13:44:06 UTC (rev 11732)
+++ csw/mgar/pkg/git/trunk/Makefile	2010-11-27 14:16:55 UTC (rev 11733)
@@ -87,6 +87,7 @@
 DISTFILES = CSWgit.postinstall
 
 PATCHFILES += 0001-Update-path-in-documentation-to-be-CSW-proper.patch
+PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files

Added: csw/mgar/pkg/git/trunk/files/0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch	2010-11-27 14:16:55 UTC (rev 11733)
@@ -0,0 +1,31 @@
+From 937605b8ae8eac2bf669af619f60eed3b3b42d23 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sat, 27 Nov 2010 15:11:49 +0100
+Subject: [PATCH 3/3] Alter the value of _PATH_DEFPATH when paths.h not present
+
+Since solaris doesn't provide paths.h, we won't get a system value
+for _PATH_DEFPATH.  This is handled by conditionally setting it, but
+the value includes /usr/local/bin as the first item.  We'll swap that
+out for /opt/csw/bin instead.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ git-compat-util.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/git-compat-util.h b/git-compat-util.h
+index 2af8d3e..762f620 100644
+--- a/git-compat-util.h
++++ b/git-compat-util.h
+@@ -184,7 +184,7 @@ extern char *gitbasename(char *);
+ #include <paths.h>
+ #endif
+ #ifndef _PATH_DEFPATH
+-#define _PATH_DEFPATH "/usr/local/bin:/usr/bin:/bin"
++#define _PATH_DEFPATH "/opt/csw/bin:/usr/bin:/bin"
+ #endif
+ 
+ #ifndef STRIP_EXTENSION
+-- 
+1.7.3
+


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