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.

15 files changed, 125 insertions, 134 deletions

diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index 85b7631f73a..ea2ff629201 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/18 05:14:39 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/02/06 07:53:31 bjs Exp $
 #
 
 .include "${.CURDIR}/../scmgit/Makefile.common"
 
 PKGNAME=		scmgit-base-${GIT_VERSION}
-PKGREVISION=		1
 COMMENT=		GIT Tree History Storage Tool (base package)
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -12,7 +11,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS+=		git-[0-9]*		# misc/git
 
 USE_LANGUAGES=		c99
-USE_TOOLS+=		perl:run sh:run wish:run
+USE_TOOLS+=		perl:run sh:run wish:run msgfmt
 
 MAKE_ENV+=		CURLDIR=${BUILDLINK_PREFIX.curl:Q}
 MAKE_ENV+=		PYTHON_PATH=${PYTHONBIN:Q}
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index 752af8b20a9..5a517db0c16 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/02/06 07:53:31 bjs Exp $
 bin/git
 bin/git-add
 bin/git-add--interactive
@@ -24,7 +24,6 @@ bin/git-clone
 bin/git-commit
 bin/git-commit-tree
 bin/git-config
-bin/git-convert-objects
 bin/git-count-objects
 bin/git-cvsexportcommit
 bin/git-cvsimport
@@ -35,6 +34,7 @@ bin/git-diff
 bin/git-diff-files
 bin/git-diff-index
 bin/git-diff-tree
+bin/git-fast-export
 bin/git-fast-import
 bin/git-fetch
 bin/git-fetch--tool
@@ -50,6 +50,7 @@ bin/git-get-tar-commit-id
 bin/git-grep
 bin/git-gui
 bin/git-hash-object
+bin/git-help--browse
 bin/git-http-fetch
 bin/git-http-push
 bin/git-imap-send
@@ -57,7 +58,6 @@ bin/git-index-pack
 bin/git-init
 bin/git-init-db
 bin/git-instaweb
-bin/git-local-fetch
 bin/git-log
 bin/git-lost-found
 bin/git-ls-files
@@ -109,7 +109,6 @@ bin/git-rev-list
 bin/git-rev-parse
 bin/git-revert
 bin/git-rm
-bin/git-runstatus
 bin/git-send-email
 bin/git-send-pack
 bin/git-sh-setup
@@ -119,16 +118,11 @@ bin/git-show
 bin/git-show-branch
 bin/git-show-index
 bin/git-show-ref
-bin/git-ssh-fetch
-bin/git-ssh-pull
-bin/git-ssh-push
-bin/git-ssh-upload
 bin/git-stash
 bin/git-status
 bin/git-stripspace
 bin/git-submodule
 bin/git-svn
-bin/git-svnimport
 bin/git-symbolic-ref
 bin/git-tag
 bin/git-tar-tree
@@ -156,6 +150,7 @@ share/git-core/templates/hooks/pre-commit
 share/git-core/templates/hooks/pre-rebase
 share/git-core/templates/hooks/update
 share/git-core/templates/info/exclude
+share/git-gui/lib/about.tcl
 share/git-gui/lib/blame.tcl
 share/git-gui/lib/branch.tcl
 share/git-gui/lib/branch_checkout.tcl
@@ -165,16 +160,28 @@ share/git-gui/lib/branch_rename.tcl
 share/git-gui/lib/browser.tcl
 share/git-gui/lib/checkout_op.tcl
 share/git-gui/lib/choose_font.tcl
+share/git-gui/lib/choose_repository.tcl
 share/git-gui/lib/choose_rev.tcl
 share/git-gui/lib/class.tcl
 share/git-gui/lib/commit.tcl
 share/git-gui/lib/console.tcl
 share/git-gui/lib/database.tcl
+share/git-gui/lib/date.tcl
 share/git-gui/lib/diff.tcl
 share/git-gui/lib/encoding.tcl
 share/git-gui/lib/error.tcl
+share/git-gui/lib/git-gui.ico
 share/git-gui/lib/index.tcl
+share/git-gui/lib/logo.tcl
 share/git-gui/lib/merge.tcl
+share/git-gui/lib/msgs/de.msg
+share/git-gui/lib/msgs/fr.msg
+share/git-gui/lib/msgs/hu.msg
+share/git-gui/lib/msgs/it.msg
+share/git-gui/lib/msgs/ja.msg
+share/git-gui/lib/msgs/ru.msg
+share/git-gui/lib/msgs/sv.msg
+share/git-gui/lib/msgs/zh_cn.msg
 share/git-gui/lib/option.tcl
 share/git-gui/lib/remote.tcl
 share/git-gui/lib/remote_branch_delete.tcl
@@ -182,6 +189,13 @@ share/git-gui/lib/shortcut.tcl
 share/git-gui/lib/status_bar.tcl
 share/git-gui/lib/tclIndex
 share/git-gui/lib/transport.tcl
+share/git-gui/lib/win32.tcl
+share/git-gui/lib/win32_shortcut.js
+share/gitk/lib/msgs/de.msg
+@dirrm share/gitk/lib/msgs
+@dirrm share/gitk/lib
+@dirrm share/gitk
+@dirrm share/git-gui/lib/msgs
 @dirrm share/git-gui/lib
 @dirrm share/git-gui
 @dirrm share/git-core/templates/info
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 5106d418f41..2a80de1ce26 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+$NetBSD: distinfo,v 1.2 2008/02/06 07:53:31 bjs Exp $
 
-SHA1 (git-1.5.3.7.tar.gz) = 8a6b7f130f39765e8de8f32bb23d4799747ee190
-RMD160 (git-1.5.3.7.tar.gz) = 52ac1fb55341140abd18a226e8dd34654c79be61
-Size (git-1.5.3.7.tar.gz) = 1612748 bytes
-SHA1 (patch-aa) = 77ab1eaf9206534d2103e5481bcdc278ffb351d9
-SHA1 (patch-ab) = 6d9b08b20b3bbee931c8aa5842b03953e7cd2a7d
-SHA1 (patch-ae) = 44f30c796c922b028773668e80d71c0a48606f5c
-SHA1 (patch-af) = d2b6fff88913d89f37bf5453babc65027a6a5a54
-SHA1 (patch-ag) = feb17b439e0e4e89c25985f2e14e300d698c8dcf
-SHA1 (patch-ah) = 4cf802facbc3dd9f78e923427c4b5f455f954722
-SHA1 (patch-ai) = 569ca315a6ed73f8d06fa265945af3e2d920556a
+SHA1 (git-1.5.4.tar.gz) = e4114d06231a038e70bd3f3ff0abedd0c94c3e7f
+RMD160 (git-1.5.4.tar.gz) = 7211e87c82b56fc9a94baa83df232b27fbce11fa
+Size (git-1.5.4.tar.gz) = 1894329 bytes
+SHA1 (patch-aa) = 95952036a346a816cbf6d880f89db31b1113e312
+SHA1 (patch-ab) = 746bcea15853cd78b14dc2916f5f02bf67e59751
+SHA1 (patch-ac) = b8b70fabbd2857d5b4962b94d2c852f8d092ef27
+SHA1 (patch-ae) = 502cf80e047155a1302cbdafdd2a82e6077077e1
+SHA1 (patch-af) = 93b83ac35f3f48cbf9a8ee39db0709547bf9d6c3
+SHA1 (patch-ag) = 65e91df0ac4dfe977717b9c06cdf0511a7d12dca
+SHA1 (patch-ah) = 94947b3d79c43246388da9c434f9e71e6716c790
+SHA1 (patch-ai) = 95b2b0a41b8b6f0ee804b48a3f3686d2fdf164f5
diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa
index 8f0e2cb6be3..303a8c8e160 100644
--- a/devel/scmgit-base/patches/patch-aa
+++ b/devel/scmgit-base/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+$NetBSD: patch-aa,v 1.2 2008/02/06 07:53:31 bjs Exp $
 
 NetBSD 3.0 needs -liconv, too.
 
 AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
 
---- Makefile.orig	2007-12-01 16:21:12.000000000 -0500
+--- Makefile.orig	2008-02-01 23:09:01.000000000 -0500
 +++ Makefile
-@@ -139,8 +139,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
+@@ -150,8 +150,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -15,9 +15,9 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  ALL_CFLAGS = $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -177,12 +175,8 @@ GITWEB_SITE_FOOTER =
+@@ -192,12 +190,8 @@ GITWEB_SITE_FOOTER =
  
- export prefix bindir gitexecdir sharedir template_dir sysconfdir
+ export prefix bindir gitexecdir sharedir template_dir htmldir sysconfdir
  
 -CC = gcc
 -AR = ar
@@ -28,8 +28,8 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -402,9 +396,10 @@ ifeq ($(uname_S),Darwin)
- 	NO_STRLCPY = YesPlease
+@@ -421,9 +415,10 @@ ifeq ($(uname_S),Darwin)
+ 	NO_MEMMEM = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
 +	NEEDS_LIBICONV = YesPlease
@@ -38,9 +38,9 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
 -	SHELL_PATH = /bin/bash
 +	SHELL_PATH = ${BASH}
  	NO_STRCASESTR = YesPlease
+ 	NO_MEMMEM = YesPlease
  	NO_HSTRERROR = YesPlease
- 	ifeq ($(uname_R),5.8)
-@@ -420,8 +415,6 @@ ifeq ($(uname_S),SunOS)
+@@ -441,8 +436,6 @@ ifeq ($(uname_S),SunOS)
  		NO_C99_FORMAT = YesPlease
  		NO_STRTOUMAX = YesPlease
  	endif
@@ -49,7 +49,7 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  	BASIC_CFLAGS += -D__EXTENSIONS__
  endif
  ifeq ($(uname_O),Cygwin)
-@@ -451,9 +444,7 @@ ifeq ($(uname_S),OpenBSD)
+@@ -476,9 +469,7 @@ ifeq ($(uname_S),OpenBSD)
  	BASIC_LDFLAGS += -L/usr/local/lib
  endif
  ifeq ($(uname_S),NetBSD)
@@ -60,7 +60,7 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  	BASIC_CFLAGS += -I/usr/pkg/include
  	BASIC_LDFLAGS += -L/usr/pkg/lib
  	ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
-@@ -718,7 +709,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
+@@ -779,7 +770,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
  PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
  TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
  
@@ -68,24 +68,19 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
 +LIBS += $(GITLIBS) $(EXTLIBS)
  
  BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
- 	-DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $(COMPAT_CFLAGS)
-@@ -991,14 +982,14 @@ remove-dashes:
+ 	$(COMPAT_CFLAGS)
+@@ -1047,10 +1038,10 @@ remove-dashes:
  ### Installation rules
  
  install: all
--	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(bindir_SQ)'
--	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
+-	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
+-	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 -	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 -	$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
 +	$(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(bindir_SQ)'
-+	$(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
++	$(BSD_INSTALL_SCRIPT_DIR) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +	$(BSD_INSTALL_SCRIPT) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +	$(BSD_INSTALL_SCRIPT) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
  	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
- 	$(MAKE) -C perl prefix='$(prefix_SQ)' install
+ 	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
  ifndef NO_TCLTK
--	$(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
-+	$(BSD_INSTALL_SCRIPT) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
- 	$(MAKE) -C git-gui install
- endif
- 	if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
diff --git a/devel/scmgit-base/patches/patch-ab b/devel/scmgit-base/patches/patch-ab
index 8d8c3594943..a6d41d86aac 100644
--- a/devel/scmgit-base/patches/patch-ab
+++ b/devel/scmgit-base/patches/patch-ab
@@ -1,17 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+$NetBSD: patch-ab,v 1.2 2008/02/06 07:53:32 bjs Exp $
 
---- git-compat-util.h.orig	2007-10-31 21:04:37.000000000 +0100
-+++ git-compat-util.h	2007-11-29 16:24:57.810134000 +0100
-@@ -6,6 +6,8 @@
- #ifndef FLEX_ARRAY
- #if defined(__GNUC__) && (__GNUC__ < 3)
- #define FLEX_ARRAY 0
-+#elif defined(__SUNPRO_C)
-+#define FLEX_ARRAY 1
- #else
- #define FLEX_ARRAY /* empty */
- #endif
-@@ -24,7 +26,7 @@
+--- git-compat-util.h.orig	2008-02-01 23:09:01.000000000 -0500
++++ git-compat-util.h
+@@ -39,7 +39,7 @@
  /* Approximation of the length of the decimal representation of this type. */
  #define decimal_length(x)	((int)(sizeof(x) * 2.56 + 0.5) + 1)
  
diff --git a/devel/scmgit-base/patches/patch-ac b/devel/scmgit-base/patches/patch-ac
new file mode 100644
index 00000000000..c042023910a
--- /dev/null
+++ b/devel/scmgit-base/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2008/02/06 07:53:32 bjs Exp $
+
+--- gitk-git/Makefile.orig	2008-02-01 23:09:01.000000000 -0500
++++ gitk-git/Makefile
+@@ -36,9 +36,9 @@ endif
+ all:: gitk-wish $(ALL_MSGFILES)
+ 
+ install:: all
+-	$(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
+-	$(INSTALL) -d '$(DESTDIR_SQ)$(msgsdir_SQ)'
+-	$(foreach p,$(ALL_MSGFILES), $(INSTALL) $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
++	$(BSD_INSTALL_SCRIPT) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
++	$(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(msgsdir_SQ)'
++	$(foreach p,$(ALL_MSGFILES), $(BSD_INSTALL_DATA) $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
+ 
+ uninstall::
+ 	$(foreach p,$(ALL_MSGFILES), $(RM) '$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) &&) true
diff --git a/devel/scmgit-base/patches/patch-ae b/devel/scmgit-base/patches/patch-ae
index 62e875da05f..722ba108ac7 100644
--- a/devel/scmgit-base/patches/patch-ae
+++ b/devel/scmgit-base/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+$NetBSD: patch-ae,v 1.2 2008/02/06 07:53:32 bjs Exp $
 
 In pkgsrc, all Perl modules are installed into vendor_perl, not
 site_perl.
 
---- perl/Makefile.orig	2007-09-02 01:57:44.000000000 -0400
+--- perl/Makefile.orig	2008-02-01 23:09:01.000000000 -0500
 +++ perl/Makefile
 @@ -11,7 +11,7 @@ ifndef V
  endif
diff --git a/devel/scmgit-base/patches/patch-af b/devel/scmgit-base/patches/patch-af
index 0daf103be28..79a92de4624 100644
--- a/devel/scmgit-base/patches/patch-af
+++ b/devel/scmgit-base/patches/patch-af
@@ -1,17 +1,17 @@
-$NetBSD: patch-af,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+$NetBSD: patch-af,v 1.2 2008/02/06 07:53:32 bjs Exp $
 
---- Documentation/Makefile.orig	2007-09-02 01:57:44.000000000 -0400
+--- Documentation/Makefile.orig	2008-02-01 23:09:01.000000000 -0500
 +++ Documentation/Makefile
-@@ -75,16 +75,16 @@ man7: $(DOC_MAN7)
- info: git.info
+@@ -90,16 +90,16 @@ man7: $(DOC_MAN7)
+ info: git.info gitman.info
  
  install: man
--	$(INSTALL) -d -m755 $(DESTDIR)$(man1dir)
--	$(INSTALL) -d -m755 $(DESTDIR)$(man5dir)
--	$(INSTALL) -d -m755 $(DESTDIR)$(man7dir)
--	$(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir)
--	$(INSTALL) -m644 $(DOC_MAN5) $(DESTDIR)$(man5dir)
--	$(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir)
+-	$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
+-	$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
+-	$(INSTALL) -d -m 755 $(DESTDIR)$(man7dir)
+-	$(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir)
+-	$(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir)
+-	$(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir)
 +	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man1dir)
 +	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man5dir)
 +	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man7dir)
@@ -20,10 +20,10 @@ $NetBSD: patch-af,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
 +	$(BSD_INSTALL_MAN) $(DOC_MAN7) $(DESTDIR)$(man7dir)
  
  install-info: info
--	$(INSTALL) -d -m755 $(DESTDIR)$(infodir)
--	$(INSTALL) -m644 git.info $(DESTDIR)$(infodir)
+-	$(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
+-	$(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir)
 +	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(infodir)
-+	$(BSD_INSTALL_DATA) git.info $(DESTDIR)$(infodir)
++	$(BSD_INSTALL_DATA) git.info gitman.info $(DESTDIR)$(infodir)
  	if test -r $(DESTDIR)$(infodir)/dir; then \
  	  $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\
- 	else \
+ 	  $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\
diff --git a/devel/scmgit-base/patches/patch-ag b/devel/scmgit-base/patches/patch-ag
index aa860e7be61..528d583d3f4 100644
--- a/devel/scmgit-base/patches/patch-ag
+++ b/devel/scmgit-base/patches/patch-ag
@@ -1,12 +1,12 @@
-$NetBSD: patch-ag,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+$NetBSD: patch-ag,v 1.2 2008/02/06 07:53:32 bjs Exp $
 
---- templates/Makefile.orig	2007-09-19 14:02:17.000000000 -0400
+--- templates/Makefile.orig	2008-02-01 23:09:01.000000000 -0500
 +++ templates/Makefile
 @@ -46,6 +46,6 @@ clean:
  	$(RM) -r blt boilerplates.made
  
  install: all
--	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(template_dir_SQ)'
+-	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_dir_SQ)'
 +	$(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(template_dir_SQ)'
  	(cd blt && $(TAR) cf - .) | \
  	(cd '$(DESTDIR_SQ)$(template_dir_SQ)' && $(TAR) xf -)
diff --git a/devel/scmgit-base/patches/patch-ah b/devel/scmgit-base/patches/patch-ah
index 9f5b5d15fc3..b52b437924f 100644
--- a/devel/scmgit-base/patches/patch-ah
+++ b/devel/scmgit-base/patches/patch-ah
@@ -1,34 +1,34 @@
-$NetBSD: patch-ah,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+$NetBSD: patch-ah,v 1.2 2008/02/06 07:53:32 bjs Exp $
 
---- git-gui/Makefile.orig	2007-09-19 14:02:17.000000000 -0400
+--- git-gui/Makefile.orig	2008-02-01 23:09:01.000000000 -0500
 +++ git-gui/Makefile
-@@ -34,11 +34,11 @@ endif
- RM_F      ?= rm -f
+@@ -43,11 +43,11 @@ endif
+ RM_RF     ?= rm -rf
  RMDIR     ?= rmdir
  
--INSTALL_D0 = $(INSTALL) -d -m755 # space is required here
-+INSTALL_D0 = ${BSD_INSTALL_DATA_DIR} # space is required here
+-INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here
++INSTALL_D0 = $(BSD_INSTALL_DATA_DIR) # space is required here
  INSTALL_D1 =
--INSTALL_R0 = $(INSTALL) -m644 # space is required here
-+INSTALL_R0 = ${BSD_INSTALL_DATA} # space is required here
+-INSTALL_R0 = $(INSTALL) -m 644 # space is required here
++INSTALL_R0 = $(BSD_INSATLL_DATA)  # space is required here
  INSTALL_R1 =
--INSTALL_X0 = $(INSTALL) -m755 # space is required here
-+INSTALL_X0 = ${BSD_INSTALL_SCRIPT} # space is required here
+-INSTALL_X0 = $(INSTALL) -m 755 # space is required here
++INSTALL_X0 = $(BSD_INSTALL_SCRIPT) # space is required here
  INSTALL_X1 =
- INSTALL_L0 = rm -f # space is required here
- INSTALL_L1 = && ln # space is required here
-@@ -59,11 +59,11 @@ ifndef V
+ INSTALL_A0 = find # space is required here
+ INSTALL_A1 = | cpio -pud
+@@ -71,11 +71,11 @@ ifndef V
  	QUIET_2DEVNULL = 2>/dev/null
  
  	INSTALL_D0 = dir=
--	INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir"
+-	INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir"
 +	INSTALL_D1 = && echo ' ' DEST $$dir && $(BSD_INSTALL_DATA_DIR) "$$dir"
  	INSTALL_R0 = src=
--	INSTALL_R1 = && echo '   ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src
+-	INSTALL_R1 = && echo '   ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src
 +	INSTALL_R1 = && echo '   ' INSTALL 644 `basename $$src` && $(BSD_INSTALL_DATA) $$src
  	INSTALL_X0 = src=
--	INSTALL_X1 = && echo '   ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src
+-	INSTALL_X1 = && echo '   ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src
 +	INSTALL_X1 = && echo '   ' INSTALL 755 `basename $$src` && $(BSD_INSTALL_SCRIPT) $$src
+ 	INSTALL_A0 = src=
+ 	INSTALL_A1 = && echo '   ' INSTALL '   ' `basename "$$src"` && find "$$src" | cpio -pud
  
- 	INSTALL_L0 = dst=
- 	INSTALL_L1 = && src=
diff --git a/devel/scmgit-base/patches/patch-ai b/devel/scmgit-base/patches/patch-ai
index 553ada8ef7f..c9829a9da09 100644
--- a/devel/scmgit-base/patches/patch-ai
+++ b/devel/scmgit-base/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+$NetBSD: patch-ai,v 1.2 2008/02/06 07:53:32 bjs Exp $
 
 Beginnings of emacs support, not enabled yet.  We must use mk/emacs.mk.
 
---- contrib/emacs/Makefile.orig	2007-09-19 14:02:17.000000000 -0400
+--- contrib/emacs/Makefile.orig	2008-02-01 23:09:01.000000000 -0500
 +++ contrib/emacs/Makefile
 @@ -12,8 +12,8 @@ RM ?= rm -f
  all: $(ELC)
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
diff --git a/devel/scmgit/Makefile.common b/devel/scmgit/Makefile.common
index 9fe0a12d22c..c04be41aa75 100644
--- a/devel/scmgit/Makefile.common
+++ b/devel/scmgit/Makefile.common
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile.common,v 1.3 2007/12/30 13:34:19 joerg Exp $
+# $NetBSD: Makefile.common,v 1.4 2008/02/06 07:53:31 bjs Exp $
 #
+# used by devel/scmgit-base/Makefile
+# used by devel/scmgit-docs/Makefile
 
 DISTNAME=	git-${GIT_VERSION}
 CATEGORIES=	devel scm
@@ -11,7 +13,7 @@ HOMEPAGE?=	http://git.or.cz/
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GIT_VERSION=	1.5.3.7
+GIT_VERSION=	1.5.4
 
 .include "../../mk/bsd.fast.prefs.mk"