[29158] trunk/dports/devel/git-core

[source_changes at macosforge.org]

Revision: 29158
          http://trac.macosforge.org/projects/macports/changeset/29158
Author:   mgrimes at macports.org
Date:     2007-09-16 09:30:25 -0700 (Sun, 16 Sep 2007)

Log Message:
-----------
Added instaweb patch reported by Jay Soffian and patched by Bryan Larsen. Thanks guys! Fixes #12712

Modified Paths:
--------------
    trunk/dports/devel/git-core/Portfile

Added Paths:
-----------
    trunk/dports/devel/git-core/files/patch-git-instaweb.sh

Modified: trunk/dports/devel/git-core/Portfile
===================================================================
--- trunk/dports/devel/git-core/Portfile	2007-09-16 16:11:05 UTC (rev 29157)
+++ trunk/dports/devel/git-core/Portfile	2007-09-16 16:30:25 UTC (rev 29158)
@@ -3,6 +3,7 @@
 PortSystem        1.0
 name              git-core
 version           1.5.3.1
+revision          1
 description       The stupid content tracker.
 long_description  A stupid (but extremely fast) directory content manager. \
                   It doesn't do a whole lot, but what it _does_ do is track \
@@ -23,7 +24,7 @@
 depends_run  port:curl port:openssh port:rsync port:perl port:p5-error
 depends_lib  port:curl port:zlib port:openssl port:expat port:libiconv
 
-patchfiles   patch-Makefile patch-http.h
+patchfiles   patch-Makefile patch-http.h patch-git-instaweb.sh
 
 extract.only   git-${version}${extract.suffix} \
                git-manpages-${version}${extract.suffix}

Added: trunk/dports/devel/git-core/files/patch-git-instaweb.sh
===================================================================
--- trunk/dports/devel/git-core/files/patch-git-instaweb.sh	                        (rev 0)
+++ trunk/dports/devel/git-core/files/patch-git-instaweb.sh	2007-09-16 16:30:25 UTC (rev 29158)
@@ -0,0 +1,33 @@
+diff --git git-instaweb.sh.orig git-instaweb.sh
+index b79c6b6..9e9253a 100755
+--- git-instaweb.sh.orig
++++ git-instaweb.sh
+@@ -30,8 +30,7 @@ test -z "$port" && port=1234
+ 
+ start_httpd () {
+ 	httpd_only="`echo $httpd | cut -f1 -d' '`"
+-	if test "`expr index $httpd_only /`" -eq '1' || \
+-				which $httpd_only >/dev/null
++	if test echo $http_only | grep ^/ || which $httpd_only >/dev/null
+ 	then
+ 		$httpd $fqgitdir/gitweb/httpd.conf
+ 	else
+@@ -207,10 +206,14 @@ EOF
+ }
+ 
+ script='
+-s#^\(my\|our\) $projectroot =.*#\1 $projectroot = "'`dirname $fqgitdir`'";#
+-s#\(my\|our\) $gitbin =.*#\1 $gitbin = "'$GIT_EXEC_PATH'";#
+-s#\(my\|our\) $projects_list =.*#\1 $projects_list = $projectroot;#
+-s#\(my\|our\) $git_temp =.*#\1 $git_temp = "'$fqgitdir/gitweb/tmp'";#'
++s#^my $projectroot =.*#my $projectroot = "'`dirname $fqgitdir`'";#
++s#^our $projectroot =.*#our $projectroot = "'`dirname $fqgitdir`'";#
++s#my $gitbin =.*#my $gitbin = "'$GIT_EXEC_PATH'";#
++s#our $gitbin =.*#our $gitbin = "'$GIT_EXEC_PATH'";#
++s#my $projects_list =.*#my $projects_list = $projectroot;#
++s#our $projects_list =.*#our $projects_list = $projectroot;#
++s#my $git_temp =.*#my $git_temp = "'$fqgitdir/gitweb/tmp'";#
++s#our $git_temp =.*#our $git_temp = "'$fqgitdir/gitweb/tmp'";#'
+ 
+ gitweb_cgi () {
+ 	cat > "$1.tmp" <<\EOFGITWEB

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070916/982b9f42/attachment.html