- Update to 1.6.0.3

- Add options to support:
  - P4 support (on) [1]
  - CVS support (on) [1]
  - HTML documentation (off) [2]

[1]: Requested privately by multiple people.

PR:		ports/127754 [2]
Submitted by:	Ashish Shukla <wahjava@gmail.com> [2]

5 files changed, 408 insertions, 29 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 56a1dff99ba3..2a35ff009436 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.6.0.2
+PORTVERSION=	1.6.0.3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@@ -21,7 +21,6 @@ COMMENT=	Distributed source code management tool
 BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
 RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		cvsps:${PORTSDIR}/devel/cvsps \
 		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
 		${SITE_PERL}/Net/SMTP/SSL.pm:${PORTSDIR}/mail/p5-Net-SMTP-SSL
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
@@ -51,9 +50,6 @@ MAN1=		git-add.1 \
 		git-commit.1 \
 		git-config.1 \
 		git-count-objects.1 \
-		git-cvsexportcommit.1 \
-		git-cvsimport.1 \
-		git-cvsserver.1 \
 		git-daemon.1 \
 		git-describe.1 \
 		git-diff-files.1 \
@@ -139,7 +135,6 @@ MAN1=		git-add.1 \
 		git-status.1 \
 		git-stripspace.1 \
 		git-submodule.1 \
-		git-svn.1 \
 		git-symbolic-ref.1 \
 		git-tag.1 \
 		git-tar-tree.1 \
@@ -166,13 +161,11 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
-USE_PYTHON=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 MAKE_ENV+=	CURLDIR=${LOCALBASE} \
 		NEEDS_LIBICONV=yes \
-		PYTHON_PATH=${LOCALBASE}/bin/python \
 		PERL_PATH=${PERL} \
 		LIBMD_SHA1=yes
 MAKE_ARGS+=	prefix="${PREFIX}"
@@ -183,10 +176,21 @@ SHELLS=		/etc/shells
 
 OPTIONS=	GUI "Enable building of GUI tools" on \
 		SVN "Enable required dependencies for SVN tools" off \
-		GITWEB "Install gitweb" off
+		GITWEB "Install gitweb" off \
+		P4  "Enable Perforce support" on \
+		CVS "Enable CVS support" on \
+		HTMLDOCS "Install additional documentation" off
 
 .include <bsd.port.pre.mk>
 
+.ifdef (WITH_HTMLDOCS)
+RUN_DEPENDS+=	${LOCALBASE}/bin/asciidoc:${PORTSDIR}/textproc/asciidoc \
+		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
+PLIST_SUB+=	HTMLDOCS=""
+.else
+PLIST_SUB+=	HTMLDOCS="@comment "
+.endif
+
 .ifndef (WITHOUT_GUI)
 MAN1+=		git-citool.1 \
 		git-gui.1 \
@@ -203,6 +207,10 @@ MAKE_ENV+=	NO_TCLTK=yes
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
 		${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion \
 		svn:${PORTSDIR}/devel/subversion
+PLIST_SUB+=	SVN=""
+MAN1+=		git-svn.1
+.else
+PLIST_SUB+=	SVN="@comment "
 .endif
 
 .ifdef (WITH_GITWEB)
@@ -211,17 +219,50 @@ PLIST_SUB+=	GITWEB=""
 PLIST_SUB+=	GITWEB="@comment "
 .endif
 
+.ifdef (WITH_P4)
+#USE_PYTHON=	yes
+# Can't set USE_PYTHON here just yet.  See ports/89648.
+# Instead we will do it this way:
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+RUN_DEPENDS+=	python:${PORTSDIR}/lang/python
+MAKE_ENV+=	PYTHON_PATH=${LOCALBASE}/bin/python
+PLIST_SUB+=	P4=""
+.else
+PLIST_SUB+=	P4="@comment "
+.endif
+
+.ifdef (WITH_CVS)
+MAN1+=		git-cvsimport.1 git-cvsexportcommit.1 git-cvsserver.1
+PLIST_SUB+=	CVS=""
+RUN_DEPENDS+=	cvsps:${PORTSDIR}/devel/cvsps
+.else
+PLIST_SUB+=	CVS="@comment "
+.endif
+
 verify: checksum
 	gpg --verify ${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}.sign \
 		${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/man/man3|man/man3|' ${WRKSRC}/perl/Makefile.PL
+.ifndef (WITH_CVS)
+	@${REINPLACE_CMD} -e '/git-cvsexportcommit.perl/d; \
+		/git-cvsimport.perl/d; \
+		/git-cvsserver.perl/d; \
+		/documented,gitcvs-migration/d' \
+		${WRKSRC}/Makefile
+.endif
+
+.ifndef (WITH_SVN)
+	@${REINPLACE_CMD} -e '/git-svn.perl/d' ${WRKSRC}/Makefile
+.endif
 
 post-build:
-	@${SED} -e'1s|#!/usr/bin/python|#!${PYTHON_CMD}|' \
+.ifdef (WITH_P4)
+	@${REINPLACE_CMD} -e'1s|#!/usr/bin/python|#!${PYTHON_CMD}|' \
 		${WRKSRC}/contrib/p4import/git-p4import.py > \
 		${WRKSRC}/contrib/p4import/git-p4import
+.endif
 
 post-install:
 .for i in ${MAN1}
@@ -234,6 +275,10 @@ post-install:
 	${INSTALL_MAN} ${WRKDIR}/man7/${i} ${MANPREFIX}/man/man7/
 .endfor
 
+.ifdef (WITH_HTMLDOCS)
+	${GMAKE} -C ${WRKSRC} install-html ${MAKE_ENV} ${MAKE_ARGS}
+.endif
+
 	-${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod
 	${MKDIR} ${PREFIX}/share/emacs/site-lisp/git
 	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/git
@@ -246,10 +291,13 @@ post-install:
 	${LN} -sf ${PREFIX}/share/emacs/site-lisp/git/vc-git.el \
 		${PREFIX}/lib/xemacs/site-lisp/git/vc-git.el
 
+.ifdef (WITH_P4)
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/p4import/git-p4import \
 		${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/fast-import/git-p4 \
 		${PREFIX}/bin/
+.endif
+
 .ifdef (WITH_GITWEB)
 	@${ECHO_MSG} "===> Installing gitweb files"
 	${MKDIR} ${EXAMPLESDIR}/gitweb
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 4e08926837fe..0dec00ece40f 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,9 +1,9 @@
-MD5 (git-1.6.0.2.tar.bz2) = 1e4d9bfc1cb0abf165d4de93b5172324
-SHA256 (git-1.6.0.2.tar.bz2) = a332fbcb1c9cf8b1dc224135d5b14e99da4720fc8b082e595b4f20eaf640dad8
-SIZE (git-1.6.0.2.tar.bz2) = 1865485
-MD5 (git-manpages-1.6.0.2.tar.bz2) = 30bd29d96b4576ef8b7b48ad791f613e
-SHA256 (git-manpages-1.6.0.2.tar.bz2) = 198472533f9c8abe124ce93fda5639e07b6ee73e67d02d393648b20dd79476c7
-SIZE (git-manpages-1.6.0.2.tar.bz2) = 222534
-MD5 (git-1.6.0.2.tar.bz2.sign) = 4b8166895f67a159070a7b6f3c82d036
-SHA256 (git-1.6.0.2.tar.bz2.sign) = d644c056aadc169448ca76dc9e4e64fac6aa80cd50cec185ed71dff37479431d
-SIZE (git-1.6.0.2.tar.bz2.sign) = 248
+MD5 (git-1.6.0.3.tar.bz2) = d7178b0b0eaaa07538149bb231902796
+SHA256 (git-1.6.0.3.tar.bz2) = 4a15393da4059587a633686174b46aef3d1f1e4e0280c6352dbde517c01c300b
+SIZE (git-1.6.0.3.tar.bz2) = 1874309
+MD5 (git-manpages-1.6.0.3.tar.bz2) = 861283bbe1d8fcef8ee06dde3cd33328
+SHA256 (git-manpages-1.6.0.3.tar.bz2) = dac8386c601cd519824e89c159d26c6a80e6c4e9f8a4510e92b4323ed0593e6c
+SIZE (git-manpages-1.6.0.3.tar.bz2) = 224091
+MD5 (git-1.6.0.3.tar.bz2.sign) = 5a1f7c87415ebf13068decedf86ead09
+SHA256 (git-1.6.0.3.tar.bz2.sign) = 35a5bf80d494140e5e0343266cf6f1e11ea21066ce2620f826f8249955f3f4f7
+SIZE (git-1.6.0.3.tar.bz2.sign) = 248
diff --git a/devel/git/files/patch-Documentation__Makefile b/devel/git/files/patch-Documentation__Makefile
new file mode 100644
index 000000000000..3e4d7c410a04
--- /dev/null
+++ b/devel/git/files/patch-Documentation__Makefile
@@ -0,0 +1,32 @@
+--- ./Documentation/Makefile.orig	2008-10-22 00:19:18.000000000 -0400
++++ ./Documentation/Makefile	2008-10-24 10:06:25.561498942 -0400
+@@ -12,8 +12,6 @@
+ MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))
+ MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT))
+ 
+-DOC_HTML=$(MAN_HTML)
+-
+ ARTICLES = howto-index
+ ARTICLES += everyday
+ ARTICLES += git-tools
+@@ -29,9 +27,9 @@
+ DOC_MAN5=$(patsubst %.txt,%.5,$(MAN5_TXT))
+ DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
+ 
+-prefix?=$(HOME)
++prefix?=$(PREFIX)
+ bindir?=$(prefix)/bin
+-htmldir?=$(prefix)/share/doc/git-doc
++htmldir?=$(prefix)/share/doc/git
+ mandir?=$(prefix)/share/man
+ man1dir=$(mandir)/man1
+ man5dir=$(mandir)/man5
+@@ -73,7 +71,7 @@
+ # yourself - yes, all 6 characters of it!
+ #
+ 
+-all: html man
++all: html
+ 
+ html: $(DOC_HTML)
+ 
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
index 4c733573a948..2e170297aefd 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -1,5 +1,5 @@
---- ./Makefile.orig	2008-08-24 19:41:58.000000000 -0400
-+++ ./Makefile	2008-09-18 13:32:34.000000000 -0400
+--- ./Makefile.orig	2008-10-22 00:19:18.000000000 -0400
++++ ./Makefile	2008-10-24 10:06:40.855506700 -0400
 @@ -164,8 +164,8 @@
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
@@ -11,7 +11,7 @@
  ALL_CFLAGS = $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -182,8 +182,8 @@
+@@ -182,12 +182,12 @@
  
  prefix = $(HOME)
  bindir = $(prefix)/bin
@@ -22,6 +22,11 @@
  gitexecdir = $(prefix)/libexec/git-core
  sharedir = $(prefix)/share
  template_dir = $(sharedir)/git-core/templates
+-htmldir=$(sharedir)/doc/git-doc
++htmldir=$(sharedir)/doc/git
+ ifeq ($(prefix),/usr)
+ sysconfdir = /etc
+ else
 @@ -217,15 +217,15 @@
  
  export prefix bindir sharedir htmldir sysconfdir
@@ -47,7 +52,7 @@
  
  export TCL_PATH TCLTK_PATH
  
-@@ -827,9 +827,9 @@
+@@ -833,9 +833,9 @@
  endif
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 2ddc1bb8280b..6f6968d684bf 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -1,6 +1,6 @@
 bin/git
-bin/git-p4
-bin/git-p4import
+%%P4%%bin/git-p4
+%%P4%%bin/git-p4import
 bin/git-upload-pack
 bin/git-receive-pack
 bin/git-upload-archive
@@ -29,9 +29,9 @@ libexec/git-core/git-commit
 libexec/git-core/git-commit-tree
 libexec/git-core/git-config
 libexec/git-core/git-count-objects
-libexec/git-core/git-cvsexportcommit
-libexec/git-core/git-cvsimport
-libexec/git-core/git-cvsserver
+%%CVS%%libexec/git-core/git-cvsexportcommit
+%%CVS%%libexec/git-core/git-cvsimport
+%%CVS%%libexec/git-core/git-cvsserver
 libexec/git-core/git-daemon
 libexec/git-core/git-describe
 libexec/git-core/git-diff
@@ -126,7 +126,7 @@ libexec/git-core/git-stash
 libexec/git-core/git-status
 libexec/git-core/git-stripspace
 libexec/git-core/git-submodule
-libexec/git-core/git-svn
+%%SVN%%libexec/git-core/git-svn
 libexec/git-core/git-symbolic-ref
 libexec/git-core/git-tag
 libexec/git-core/git-tar-tree
@@ -208,6 +208,297 @@ share/git-core/templates/info/exclude
 %%GUI%%share/gitk/lib/msgs/de.msg
 %%GUI%%share/gitk/lib/msgs/it.msg
 %%GUI%%share/gitk/lib/msgs/sv.msg
+%%HTMLDOCS%%%%DOCSDIR%%/git-citool.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-hash-object.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-lost-found.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-commit-tree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-count-objects.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-quiltimport.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/index.html
+%%HTMLDOCS%%%%DOCSDIR%%/git-bundle.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitcore-tutorial.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-mv.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-blame.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-archimport.txt
+%%HTMLDOCS%%%%DOCSDIR%%/everyday.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitcli.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-shortlog.txt
+%%HTMLDOCS%%%%DOCSDIR%%/fetch-options.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-revert.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-stash.txt
+%%HTMLDOCS%%%%DOCSDIR%%/pretty-formats.txt
+%%HTMLDOCS%%%%DOCSDIR%%/diff-options.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-send-pack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/merge-options.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-tools.html
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-apply.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-fsck.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-config.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-cvsserver.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-checkout.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-mergetool.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-archive.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-verify-pack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-ls-tree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto-index.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-prune.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-am.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-web--browse.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-grep.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-ls-remote.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-receive-pack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/maintain-git.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/using-merge-subtree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/recover-corrupted-blob-object.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/setup-git-server-over-http.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/update-hook-example.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/rebuild-from-update-hook.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/revert-branch-rebase.html
+%%HTMLDOCS%%%%DOCSDIR%%/howto/rebase-and-edit.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/using-merge-subtree.html
+%%HTMLDOCS%%%%DOCSDIR%%/howto/revert-branch-rebase.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/separating-topic-branches.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/rebase-from-internal-branch.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/use-git-daemon.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-merge-one-file.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-fetch-pack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-branch.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-log.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-fast-import.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-fmt-merge-msg.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-merge-index.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-pack-refs.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-rev-parse.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-status.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-repack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-hash.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-setup.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/send-pack-pipeline.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-quote.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-run-command.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-strbuf.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/trivial-merge.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-parse-options.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-gitattributes.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-object-access.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-diff.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-remote.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-allocation-growing.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-format.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-protocol.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-index.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-hash.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-directory-listing.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-diff.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-in-core-index.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-in-core-index.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-quote.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-index.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-lockfile.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-decorate.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-lockfile.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-setup.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-revision-walking.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-allocation-growing.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-index-skel.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-gitattributes.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-strbuf.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-string-list.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-parse-options.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-remote.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-decorate.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-directory-listing.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-xdiff-interface.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-history-graph.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-object-access.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-revision-walking.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-builtin.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-string-list.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-xdiff-interface.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/shallow.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-grep.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/racy-git.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-tree-walking.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-grep.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-run-command.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-builtin.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-tree-walking.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-history-graph.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-heuristics.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gittutorial.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-help.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-remote.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gittutorial-2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-filter-branch.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-unpack-file.txt
+%%HTMLDOCS%%%%DOCSDIR%%/everyday.html
+%%HTMLDOCS%%%%DOCSDIR%%/git-format-patch.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-name-rev.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-symbolic-ref.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-reset.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-commit.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/urls-remotes.txt
+%%HTMLDOCS%%%%DOCSDIR%%/githooks.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-instaweb.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-upload-pack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/blame-options.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-describe.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-cvsexportcommit.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-mailsplit.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-reflog.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-diff-index.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-cvsimport.txt
+%%HTMLDOCS%%%%DOCSDIR%%/user-manual.html
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-gui.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-sh-setup.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-cherry-pick.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-fetch.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-clean.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/diff-format.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-pack-objects.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-add.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-repo-config.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-diff-files.txt
+%%HTMLDOCS%%%%DOCSDIR%%/pretty-options.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-show.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-imap-send.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-http-push.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-submodule.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-fsck-objects.txt
+%%HTMLDOCS%%%%DOCSDIR%%/merge-strategies.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-for-each-ref.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-merge-tree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-show-branch.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-parse-remote.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-whatchanged.txt
+%%HTMLDOCS%%%%DOCSDIR%%/docbook-xsl.css
+%%HTMLDOCS%%%%DOCSDIR%%/git-var.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-clone.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-rev-list.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-mailinfo.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.8.txt
+%%HTMLDOCS%%%%DOCSDIR%%/user-manual.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-init-db.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-pull.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-cat-file.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-pack-redundant.txt
+%%HTMLDOCS%%%%DOCSDIR%%/merge-config.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-init.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitk.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitrepository-layout.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-tar-tree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitglossary.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-relink.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-update-ref.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-push.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-request-pull.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-update-server-info.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-mktag.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-daemon.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-index-pack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/rev-list-options.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-rerere.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-fast-export.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-get-tar-commit-id.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/diff-generate-patch.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-patch-id.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitcvs-migration.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-cherry.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-show-index.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.7.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-upload-archive.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/glossary-content.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitignore.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-merge-base.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-checkout-index.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-diff-tree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-merge-file.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto-index.html
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-shell.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-mktree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-read-tree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-tag.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-write-tree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-svn.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-ls-files.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-stripspace.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-prune-packed.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-rm.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.7.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-check-attr.txt
+%%HTMLDOCS%%%%DOCSDIR%%/config.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-http-fetch.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-send-email.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-annotate.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitmodules.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/pull-fetch-param.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/urls.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-peek-remote.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-bisect.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-tools.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-show-ref.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-rebase.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-verify-tag.txt
+%%HTMLDOCS%%%%DOCSDIR%%/i18n.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-merge.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-gc.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitattributes.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-update-index.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitdiffcore.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-check-ref-format.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-unpack-objects.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-diff.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png
@@ -227,6 +518,9 @@ share/git-core/templates/info/exclude
 %%GUI%%@dirrm share/git-gui/lib/msgs
 %%GUI%%@dirrm share/git-gui/lib
 %%GUI%%@dirrm share/git-gui
+%%HTMLDOCS%%@dirrm %%DOCSDIR%%/technical
+%%HTMLDOCS%%@dirrm %%DOCSDIR%%/howto
+%%HTMLDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/git-core
 @dirrm share/git-core/templates/branches
 @dirrmtry share/git-core/templates/hooks