Update to git-1.5.4. Remove stray Makefile.common in scmgit-docs.

There are quite a few changes and (welcomed) fixes:  please see
the release notes in ${WRKSRC}/Documentation/RelNotes-1.5.4.
A small subset of the changes are included here.

Added
-----

 * i18n support for gitk.

Removal
-------

 * "git svnimport" was removed in favor of "git svn".  It is still there
   in the source tree (contrib/examples) but unsupported.

 * As git-commit and git-status have been rewritten, "git runstatus"
   helper script lost all its users and has been removed.


Fixes since v1.5.3 (unique to the 1.5.4 branch)
------------------

These fixes are only in v1.5.4 and not backported to v1.5.3 maintenance
series.

 * The way "git diff --check" behaves is much more consistent with the way
   "git apply --whitespace=warn" works.

 * "git svn" talking with the SVN over HTTP will correctly quote branch
   and project names.

 * "git config" did not work correctly on platforms that define
   REG_NOMATCH to an even number.

 * Recent versions of AsciiDoc 8 has a change to break our
   documentation; a workaround has been implemented.

 * "git diff --color-words" colored context lines in a wrong color.

3 files changed, 7 insertions, 35 deletions

diff --git a/devel/scmgit-docs/Makefile b/devel/scmgit-docs/Makefile
index a68e33ad1ed..984df6e0324 100644
--- a/devel/scmgit-docs/Makefile
+++ b/devel/scmgit-docs/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2007/12/22 01:07:01 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/02/06 07:53:32 bjs Exp $
 #
 
 PKGNAME=		scmgit-docs-${GIT_VERSION}
 COMMENT=		GIT Tree History Storage Tool (documentation)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DISTINFO_FILE=		${.CURDIR}/../scmgit-base/distinfo
 
 BUILD_DEPENDS+=		asciidoc-[0-9]*:../../textproc/asciidoc
diff --git a/devel/scmgit-docs/Makefile.common b/devel/scmgit-docs/Makefile.common
deleted file mode 100644
index 41a05419333..00000000000
--- a/devel/scmgit-docs/Makefile.common
+++ /dev/null
@@ -1,27 +0,0 @@
-# $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
index 77f0865f18c..070a61b5fef 100644
--- a/devel/scmgit-docs/PLIST
+++ b/devel/scmgit-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/12/12 04:22:45 bjs Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/02/06 07:53:33 bjs Exp $
 man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
@@ -22,7 +22,6 @@ 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
@@ -33,6 +32,7 @@ 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-export.1
 man/man1/git-fast-import.1
 man/man1/git-fetch-pack.1
 man/man1/git-fetch.1
@@ -47,6 +47,7 @@ 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-help.1
 man/man1/git-http-fetch.1
 man/man1/git-http-push.1
 man/man1/git-imap-send.1
@@ -54,7 +55,6 @@ 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
@@ -99,7 +99,6 @@ 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
@@ -109,14 +108,11 @@ 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
@@ -134,6 +130,7 @@ man/man1/git-whatchanged.1
 man/man1/git-write-tree.1
 man/man1/gitk.1
 man/man5/gitattributes.5
+man/man5/gitcli.5
 man/man5/gitignore.5
 man/man5/gitmodules.5
 man/man7/git.7