Update scmgit to 1.6.3.3.

This version fixes the remote DoS problem in
http://secunia.com/advisories/35437/.

Major changes between 1.6.2 and 1.6.3:
* various git-svn updates.
* git-gui updates, including an update to Russian translation, and a
  fix to an infinite loop when showing an empty diff.
* gitk updates, including an update to Russian translation and
  improved Windows support.
* many uses of lstat(2) in the codepath for "git checkout" have been
  optimized out.
* usuability improvements.
* bug fixes.

4 files changed, 21 insertions, 41 deletions

diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index a30fbf6795e..98163b47099 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:48:17 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2009/07/19 01:29:33 minskim Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -14,6 +14,7 @@ libexec/git-core/git-apply
 libexec/git-core/git-archimport
 libexec/git-core/git-archive
 libexec/git-core/git-bisect
+libexec/git-core/git-bisect--helper
 libexec/git-core/git-blame
 libexec/git-core/git-branch
 libexec/git-core/git-bundle
@@ -40,6 +41,8 @@ libexec/git-core/git-diff
 libexec/git-core/git-diff-files
 libexec/git-core/git-diff-index
 libexec/git-core/git-diff-tree
+libexec/git-core/git-difftool
+libexec/git-core/git-difftool--helper
 libexec/git-core/git-fast-export
 libexec/git-core/git-fast-import
 libexec/git-core/git-fetch
@@ -84,6 +87,7 @@ libexec/git-core/git-merge-resolve
 libexec/git-core/git-merge-subtree
 libexec/git-core/git-merge-tree
 libexec/git-core/git-mergetool
+libexec/git-core/git-mergetool--lib
 libexec/git-core/git-mktag
 libexec/git-core/git-mktree
 libexec/git-core/git-mv
@@ -215,5 +219,6 @@ ${PLIST.gui}share/git-gui/lib/win32_shortcut.js
 ${PLIST.gui}share/gitk/lib/msgs/de.msg
 ${PLIST.gui}share/gitk/lib/msgs/es.msg
 ${PLIST.gui}share/gitk/lib/msgs/it.msg
+${PLIST.gui}share/gitk/lib/msgs/ru.msg
 ${PLIST.gui}share/gitk/lib/msgs/sv.msg
 @pkgdir share/examples/scmgit/templates/branches
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 56a55176267..1e1ae5c2aa1 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.17 2009/05/05 06:21:16 minskim Exp $
+$NetBSD: distinfo,v 1.18 2009/07/19 01:29:33 minskim Exp $
 
-SHA1 (git-1.6.2.5.tar.gz) = f5214606f19c070b1163b8050efb98cf763dfa8c
-RMD160 (git-1.6.2.5.tar.gz) = c0882a36ddea53899ec215606d563f9937ddac84
-Size (git-1.6.2.5.tar.gz) = 2450744 bytes
-SHA1 (patch-aa) = dd10721b1c0ba6faab248114ea46ed801ad9d009
+SHA1 (git-1.6.3.3.tar.gz) = 8eb22cafe085d3297872f817106fc00ad1c7ea0b
+RMD160 (git-1.6.3.3.tar.gz) = ac31ab58c2ab138ad3cb9c6044547b62ae4b3f31
+Size (git-1.6.3.3.tar.gz) = 2517144 bytes
+SHA1 (patch-aa) = 3d7f65f3f0f7e473ad969e98ae628c4df36b5e62
 SHA1 (patch-ab) = b8cbeacd7d44791a5151deaa97d1d283ac9296d1
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
-SHA1 (patch-ad) = 50def978931bd72c0ad86cebcafc2dd68a06f578
 SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
 SHA1 (patch-af) = ea0ac503103429f32d26bd42c37a9ed563ff17b8
 SHA1 (patch-ag) = a6c586cdfbad923a3497fa4ab0c73840dc035737
diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa
index f9009372063..d21bdce91cc 100644
--- a/devel/scmgit-base/patches/patch-aa
+++ b/devel/scmgit-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2009/05/05 06:21:16 minskim Exp $
+$NetBSD: patch-aa,v 1.8 2009/07/19 01:29:33 minskim Exp $
 
---- Makefile.orig	2009-03-04 08:18:50.000000000 +0000
+--- Makefile.orig	2009-06-21 23:24:25.000000000 -0700
 +++ Makefile
-@@ -230,12 +230,8 @@ GITWEB_SITE_FOOTER =
+@@ -249,12 +249,8 @@ GITWEB_SITE_FOOTER =
  
  export prefix bindir sharedir sysconfdir
  
@@ -15,8 +15,8 @@ $NetBSD: patch-aa,v 1.7 2009/05/05 06:21:16 minskim Exp $
  RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -659,9 +655,10 @@ ifeq ($(uname_S),Darwin)
- 	THREADED_DELTA_SEARCH = YesPlease
+@@ -694,9 +690,10 @@ ifeq ($(uname_S),Darwin)
+ 	USE_ST_TIMESPEC = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
 +	NEEDS_LIBICONV = YesPlease
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.7 2009/05/05 06:21:16 minskim Exp $
  	NO_STRCASESTR = YesPlease
  	NO_MEMMEM = YesPlease
  	NO_HSTRERROR = YesPlease
-@@ -679,8 +676,6 @@ ifeq ($(uname_S),SunOS)
+@@ -714,8 +711,6 @@ ifeq ($(uname_S),SunOS)
  		NO_C99_FORMAT = YesPlease
  		NO_STRTOUMAX = YesPlease
  	endif
@@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.7 2009/05/05 06:21:16 minskim Exp $
  	BASIC_CFLAGS += -D__EXTENSIONS__
  endif
  ifeq ($(uname_O),Cygwin)
-@@ -722,9 +717,7 @@ ifeq ($(uname_S),OpenBSD)
+@@ -759,9 +754,7 @@ ifeq ($(uname_S),OpenBSD)
  	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),NetBSD)
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.7 2009/05/05 06:21:16 minskim Exp $
  	BASIC_CFLAGS += -I/usr/pkg/include
  	BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib
  	THREADED_DELTA_SEARCH = YesPlease
-@@ -1116,7 +1109,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
+@@ -1183,7 +1176,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
  PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
  TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
  
@@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.7 2009/05/05 06:21:16 minskim Exp $
  
  BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
  	$(COMPAT_CFLAGS)
-@@ -1452,10 +1445,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi
+@@ -1535,10 +1528,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi
  export gitexec_instdir
  
  install: all
@@ -69,5 +69,5 @@ $NetBSD: patch-aa,v 1.7 2009/05/05 06:21:16 minskim Exp $
 +	$(BSD_INSTALL_SCRIPT) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 +	$(BSD_INSTALL_SCRIPT) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
  	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
+ ifndef NO_PERL
  	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
- ifndef NO_TCLTK
diff --git a/devel/scmgit-base/patches/patch-ad b/devel/scmgit-base/patches/patch-ad
deleted file mode 100644
index 72a9cbe9361..00000000000
--- a/devel/scmgit-base/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2008/08/20 03:04:20 bjs Exp $
-
---- date.c.orig	2008-08-17 16:43:06.000000000 -0400
-+++ date.c
-@@ -832,13 +832,19 @@ unsigned long approxidate(const char *da
- 	int number = 0;
- 	struct tm tm, now;
- 	struct timeval tv;
-+	struct timespec ts;
- 	char buffer[50];
- 
- 	if (parse_date(date, buffer, sizeof(buffer)) > 0)
- 		return strtoul(buffer, NULL, 10);
- 
- 	gettimeofday(&tv, NULL);
-+#ifdef __NetBSD__
-+	TIMEVAL_TO_TIMESPEC(&tv, &ts);
-+	localtime_r(&ts.tv_sec, &tm);
-+#else
- 	localtime_r(&tv.tv_sec, &tm);
-+#endif
- 	now = tm;
- 	for (;;) {
- 		unsigned char c = *date;