From 2aae89f05f52ce48c80764944ae15c424072188f Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 10 Jan 2016 10:06:51 +0100
Subject: [PATCH] git: fix doc install dir and make "web" the default format

- git help --web actually works now
- git help will use the HTML docs by default (configurable if you prefer
  manpages)
---
 dev-vcs/git/git-2.7.0.recipe | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/dev-vcs/git/git-2.7.0.recipe b/dev-vcs/git/git-2.7.0.recipe
index 02686c936..71d02772b 100644
--- a/dev-vcs/git/git-2.7.0.recipe
+++ b/dev-vcs/git/git-2.7.0.recipe
@@ -21,7 +21,7 @@ CHECKSUM_SHA256_2="b7f255aa17a5d06b9b71f6e3957f65e8f15789b2d31f09b1c2bf697a21458
 SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz"
 CHECKSUM_SHA256_3="a9d30a744eb07392ba3ffe389cca7e57a2bdd718c9ffccdf2d525eeafac548a9"
 
-REVISION="1"
+REVISION="2"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
@@ -151,6 +151,7 @@ makeGit()
 		NO_INSTALL_HARDLINKS=YesPlease \
 		HAVE_DEV_TTY=YesPlease \
 		DEFAULT_EDITOR=nano \
+		DEFAULT_HELP_FORMAT=web \
 		BASIC_LDFLAGS="-lnetwork -lbsd" \
 		"$@"
 }
@@ -170,7 +171,7 @@ INSTALL()
 	cp -rd $sourceDir2/* $manDir/
 
 	# copy html documentation
-	htmlDir=$docDir/html
+	htmlDir=$docDir
 	mkdir -p $htmlDir
 	cp -rd $sourceDir3/*.html $htmlDir/
 	rm $htmlDir/git-gui.html
@@ -182,15 +183,15 @@ INSTALL()
 	done
 
 	packageEntries arch \
-		documentation/packages/git/html/git-archimport.html \
+		documentation/packages/git/git-archimport.html \
 		documentation/man/man1/git-archimport.1 \
 		lib/git-core/git-archimport
 
 	packageEntries cvs \
 		bin/git-cvsserver \
-		documentation/packages/git/html/git-cvsexportcommit.html \
-		documentation/packages/git/html/git-cvsimport.html \
-		documentation/packages/git/html/git-cvsserver.html \
+		documentation/packages/git/git-cvsexportcommit.html \
+		documentation/packages/git/git-cvsimport.html \
+		documentation/packages/git/git-cvsserver.html \
 		documentation/man/man1/git-cvsexportcommit.1 \
 		documentation/man/man1/git-cvsimport.1 \
 		documentation/man/man1/git-cvsserver.1 \
@@ -200,9 +201,9 @@ INSTALL()
 		lib/git-core/git-cvsserver
 
 	packageEntries daemon \
-		documentation/packages/git/html/git-credential-cache--daemon.html \
-		documentation/packages/git/html/git-credential-cache.html \
-		documentation/packages/git/html/git-daemon.html \
+		documentation/packages/git/git-credential-cache--daemon.html \
+		documentation/packages/git/git-credential-cache.html \
+		documentation/packages/git/git-daemon.html \
 		documentation/man/man1/git-credential-cache--daemon.1 \
 		documentation/man/man1/git-credential-cache.1 \
 		documentation/man/man1/git-daemon.1 \
@@ -211,12 +212,12 @@ INSTALL()
 		lib/git-core/git-daemon
 
 	packageEntries email \
-		documentation/packages/git/html/git-send-email.html \
+		documentation/packages/git/git-send-email.html \
 		documentation/man/man1/git-send-email.1 \
 		lib/git-core/git-send-email
 
 	packageEntries svn \
-		documentation/packages/git/html/git-svn.html \
+		documentation/packages/git/git-svn.html \
 		documentation/man/man1/git-svn.1 \
 		lib/git-core/git-svn
 }