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

[bdwalton at users.sourceforge.net]

Revision: 13165
          http://gar.svn.sourceforge.net/gar/?rev=13165&view=rev
Author:   bdwalton
Date:     2011-02-02 03:30:19 +0000 (Wed, 02 Feb 2011)

Log Message:
-----------
git/trunk: patch instaweb search path for httpd

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

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2011-02-02 03:23:00 UTC (rev 13164)
+++ csw/mgar/pkg/git/trunk/Makefile	2011-02-02 03:30:19 UTC (rev 13165)
@@ -90,6 +90,7 @@
 PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
 PATCHFILES += 0003-Update-path-in-sample-hook-file.patch
 PATCHFILES += 0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch
+PATCHFILES += 0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files

Added: csw/mgar/pkg/git/trunk/files/0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch	2011-02-02 03:30:19 UTC (rev 13165)
@@ -0,0 +1,31 @@
+From ff5bf85995a459ded56e68fb4c4edef05380550d Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Wed, 2 Feb 2011 04:26:57 +0100
+Subject: [PATCH] Add OpenCSW apache2 path to instaweb search path
+
+We make sure that git instaweb will prefer our own apache2 if it is
+available, but leave all the other options available to.  This will
+require a checkpkg override on the /usr/local path and a note at
+release time.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ git-instaweb.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/git-instaweb.sh b/git-instaweb.sh
+index 10fcebb..7fc62f7 100755
+--- a/git-instaweb.sh
++++ b/git-instaweb.sh
+@@ -75,7 +75,7 @@ resolve_full_httpd () {
+ 		# these days and those are not in most users $PATHs
+ 		# in addition, we may have generated a server script
+ 		# in $fqgitdir/gitweb.
+-		for i in /usr/local/sbin /usr/sbin "$root" "$fqgitdir/gitweb"
++		for i in /opt/csw/apache2/sbin /usr/local/sbin /usr/sbin "$root" "$fqgitdir/gitweb"
+ 		do
+ 			if test -x "$i/$httpd_only"
+ 			then
+-- 
+1.7.3.2
+


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