Switch GIT to use a meta-pkg hierarchy like, for example, devel/subversion.

Also, update to 1.5.3.7.


Fixes since v1.5.3.6
--------------------

 * git-send-email added 8-bit contents to the payload without
   marking it as 8-bit in a CTE header.

 * "git-bundle create a.bndl HEAD" dereferenced the symref and
   did not record the ref as 'HEAD'; this prevented a bundle
   from being used as a normal source of git-clone.

 * The code to reject nonsense command line of the form
   "git-commit -a paths..." and "git-commit --interactive
   paths..." were broken.

 * Adding a signature that is not ASCII-only to an original
   commit that is ASCII-only would make the result non-ASCII.
   "git-format-patch -s" did not mark such a message correctly
   with MIME encoding header.

 * git-add sometimes did not mark the resulting index entry
   stat-clean.  This affected only cases when adding the
   contents with the same length as the previously staged
   contents, and the previous staging made the index entry
   "racily clean".

 * git-commit did not honor GIT_INDEX_FILE the user had in the
   environment.

 * When checking out a revision, git-checkout did not report where the
   updated HEAD is if you happened to have a file called HEAD in the
   work tree.

 * "git-rev-list --objects" mishandled a tree that points at a
   submodule.

 * "git cvsimport" was not ready for packed refs that "git gc" can
   produce and gave incorrect results.

 * Many scripted Porcelains were confused when you happened to have a
   file called "HEAD" in your work tree.

 * Miscellaneous updates to the user manual and documentation.

4 files changed, 201 insertions, 0 deletions

diff --git a/devel/scmgit-docs/DESCR b/devel/scmgit-docs/DESCR
new file mode 100644
index 00000000000..2e4840acf6f
--- /dev/null
+++ b/devel/scmgit-docs/DESCR
@@ -0,0 +1,2 @@
+This package installs documentation for the GIT distributed version control
+suite.
diff --git a/devel/scmgit-docs/Makefile b/devel/scmgit-docs/Makefile
new file mode 100644
index 00000000000..ec58a63da2a
--- /dev/null
+++ b/devel/scmgit-docs/Makefile
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.1.1.1 2007/12/12 04:22:45 bjs Exp $
+#
+
+PKGNAME=		scmgit-docs-${GIT_VERSION}
+COMMENT=		GIT Tree History Storage Tool (documentation)
+
+DISTINFO_FILE=		${.CURDIR}/../scmgit-base/distinfo
+
+BUILD_DEPENDS+=		asciidoc-[0-9]*:../../textproc/asciidoc
+BUILD_DEPENDS+=		xmlto-[0-9]*:../../textproc/xmlto
+
+BUILD_TARGET=		doc
+
+USE_LANGUAGES=		# none
+INSTALL_TARGET=		install-doc
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.for d in asciidoc docbook-xsl
+GITDOCDEP.${d}=	${${${PKG_INFO} -E ${d}:L:sh}:L:C/[^[0-9]]*/ /g:[1..3]:ts.}
+.endfor
+
+.if !empty(GITDOCDEP.asciidoc:M[8]*)
+MAKE_ENV+=	AsciiDoc8=YesPlease
+.endif
+
+.if !empty(GITDOCDEP.docbook-xsl:M1.7[2-9]*)
+MAKE_ENV+=	DOCBOOK_XSL_172=YesPlease
+.endif
+
+.include "${.CURDIR}/../scmgit/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/scmgit-docs/Makefile.common b/devel/scmgit-docs/Makefile.common
new file mode 100644
index 00000000000..41a05419333
--- /dev/null
+++ b/devel/scmgit-docs/Makefile.common
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile.common,v 1.1.1.1 2007/12/12 04:22:45 bjs Exp $
+#
+
+DISTNAME=	git-${GIT_VERSION}
+CATEGORIES=	devel scm
+MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
+
+MAINTAINER=	pancake@phreaker.net
+HOMEPAGE=	http://git.or.cz/
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GIT_VERSION=	1.5.3.7
+
+MAKE_ENV+=	HOME=${PREFIX:Q}
+#USE_TOOLS+=	gmake perl:run sh:run wish:run tar
+USE_TOOLS+=	gmake tar perl sh
+EXTRACT_USING=	gtar
+
+MAKE_ENV+=	PERL_PATH=${PERL5:Q}
+MAKE_ENV+=	SHELL_PATH=${SH:Q}
+MAKE_ENV+=	TAR=${TAR:Q}
+MAKE_FLAGS+=	mandir=${PREFIX}/${PKGMANDIR}
+
+LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib
+LIBS.SunOS+=	-liconv
+CFLAGS.NetBSD+=	-D_NETBSD_SOURCE
diff --git a/devel/scmgit-docs/PLIST b/devel/scmgit-docs/PLIST
new file mode 100644
index 00000000000..77f0865f18c
--- /dev/null
+++ b/devel/scmgit-docs/PLIST
@@ -0,0 +1,139 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2007/12/12 04:22:45 bjs Exp $
+man/man1/git-add.1
+man/man1/git-am.1
+man/man1/git-annotate.1
+man/man1/git-apply.1
+man/man1/git-archimport.1
+man/man1/git-archive.1
+man/man1/git-bisect.1
+man/man1/git-blame.1
+man/man1/git-branch.1
+man/man1/git-bundle.1
+man/man1/git-cat-file.1
+man/man1/git-check-attr.1
+man/man1/git-check-ref-format.1
+man/man1/git-checkout-index.1
+man/man1/git-checkout.1
+man/man1/git-cherry-pick.1
+man/man1/git-cherry.1
+man/man1/git-citool.1
+man/man1/git-clean.1
+man/man1/git-clone.1
+man/man1/git-commit-tree.1
+man/man1/git-commit.1
+man/man1/git-config.1
+man/man1/git-convert-objects.1
+man/man1/git-count-objects.1
+man/man1/git-cvsexportcommit.1
+man/man1/git-cvsimport.1
+man/man1/git-cvsserver.1
+man/man1/git-daemon.1
+man/man1/git-describe.1
+man/man1/git-diff-files.1
+man/man1/git-diff-index.1
+man/man1/git-diff-tree.1
+man/man1/git-diff.1
+man/man1/git-fast-import.1
+man/man1/git-fetch-pack.1
+man/man1/git-fetch.1
+man/man1/git-filter-branch.1
+man/man1/git-fmt-merge-msg.1
+man/man1/git-for-each-ref.1
+man/man1/git-format-patch.1
+man/man1/git-fsck-objects.1
+man/man1/git-fsck.1
+man/man1/git-gc.1
+man/man1/git-get-tar-commit-id.1
+man/man1/git-grep.1
+man/man1/git-gui.1
+man/man1/git-hash-object.1
+man/man1/git-http-fetch.1
+man/man1/git-http-push.1
+man/man1/git-imap-send.1
+man/man1/git-index-pack.1
+man/man1/git-init-db.1
+man/man1/git-init.1
+man/man1/git-instaweb.1
+man/man1/git-local-fetch.1
+man/man1/git-log.1
+man/man1/git-lost-found.1
+man/man1/git-ls-files.1
+man/man1/git-ls-remote.1
+man/man1/git-ls-tree.1
+man/man1/git-mailinfo.1
+man/man1/git-mailsplit.1
+man/man1/git-merge-base.1
+man/man1/git-merge-file.1
+man/man1/git-merge-index.1
+man/man1/git-merge-one-file.1
+man/man1/git-merge-tree.1
+man/man1/git-merge.1
+man/man1/git-mergetool.1
+man/man1/git-mktag.1
+man/man1/git-mktree.1
+man/man1/git-mv.1
+man/man1/git-name-rev.1
+man/man1/git-pack-objects.1
+man/man1/git-pack-redundant.1
+man/man1/git-pack-refs.1
+man/man1/git-parse-remote.1
+man/man1/git-patch-id.1
+man/man1/git-peek-remote.1
+man/man1/git-prune-packed.1
+man/man1/git-prune.1
+man/man1/git-pull.1
+man/man1/git-push.1
+man/man1/git-quiltimport.1
+man/man1/git-read-tree.1
+man/man1/git-rebase.1
+man/man1/git-receive-pack.1
+man/man1/git-reflog.1
+man/man1/git-relink.1
+man/man1/git-remote.1
+man/man1/git-repack.1
+man/man1/git-repo-config.1
+man/man1/git-request-pull.1
+man/man1/git-rerere.1
+man/man1/git-reset.1
+man/man1/git-rev-list.1
+man/man1/git-rev-parse.1
+man/man1/git-revert.1
+man/man1/git-rm.1
+man/man1/git-runstatus.1
+man/man1/git-send-email.1
+man/man1/git-send-pack.1
+man/man1/git-sh-setup.1
+man/man1/git-shell.1
+man/man1/git-shortlog.1
+man/man1/git-show-branch.1
+man/man1/git-show-index.1
+man/man1/git-show-ref.1
+man/man1/git-show.1
+man/man1/git-ssh-fetch.1
+man/man1/git-ssh-upload.1
+man/man1/git-stash.1
+man/man1/git-status.1
+man/man1/git-stripspace.1
+man/man1/git-submodule.1
+man/man1/git-svn.1
+man/man1/git-svnimport.1
+man/man1/git-symbolic-ref.1
+man/man1/git-tag.1
+man/man1/git-tar-tree.1
+man/man1/git-unpack-file.1
+man/man1/git-unpack-objects.1
+man/man1/git-update-index.1
+man/man1/git-update-ref.1
+man/man1/git-update-server-info.1
+man/man1/git-upload-archive.1
+man/man1/git-upload-pack.1
+man/man1/git-var.1
+man/man1/git-verify-pack.1
+man/man1/git-verify-tag.1
+man/man1/git-whatchanged.1
+man/man1/git-write-tree.1
+man/man1/gitk.1
+man/man5/gitattributes.5
+man/man5/gitignore.5
+man/man5/gitmodules.5
+man/man7/git.7