Update to version 1.5.4.4. Fix warning on NetBSD with wrong type

being passed in struct to localtime_r (convert from timeval to timespec).

GIT v1.5.4.4 Release Notes
==========================

Fixes since v1.5.4.3
--------------------

 * Building and installing with an overtight umask such as 077 made
   installed templates unreadable by others, while the rest of the install
   are done in a way that is friendly to umask 022.

 * "git cvsexportcommit -w $cvsdir" misbehaved when GIT_DIR is set to a
   relative directory.

 * "git http-push" had an invalid memory access that could lead it to
   segfault.

 * When "git rebase -i" gave control back to the user for a commit that is
   marked to be edited, it just said "modify it with commit --amend",
   without saying what to do to continue after modifying it.  Give an
   explicit instruction to run "rebase --continue" to be more helpful.

 * "git send-email" in 1.5.4.3 issued a bogus empty In-Reply-To: header.

 * "git bisect" showed mysterious "won't bisect on seeked tree" error message.
   This was leftover from Cogito days to prevent "bisect" starting from a
   cg-seeked state.  We still keep the Cogito safety, but running "git bisect
   start" when another bisect was in effect will clean up and start over.

 * "git push" with an explicit PATH to receive-pack did not quite work if
   receive-pack was not on usual PATH.  We earlier fixed the same issue
   with "git fetch" and upload-pack, but somehow forgot to do so in the
   other direction.

 * git-gui's info dialog was not displayed correctly when the user tries
   to commit nothing (i.e. without staging anything).

 * "git revert" did not properly fail when attempting to run with a
   dirty index.

 * "git merge --no-commit --no-ff <other>" incorrectly made commits.

 * "git merge --squash --no-ff <other>", which is a nonsense combination
   of options, was not rejected.

 * "git ls-remote" and "git remote show" against an empty repository
   failed, instead of just giving an empty result (regression).

 * "git fast-import" did not handle a renamed path whose name needs to be
   quoted, due to a bug in unquote_c_style() function.

 * "git cvsexportcommit" was confused when multiple files with the same
   basename needed to be pushed out in the same commit.

 * "git daemon" did not send early errors to syslog.

 * "git log --merge" did not work well with --left-right option.

 * "git svn" promprted for client cert password every time it accessed the
   server.

 * The reset command in "git fast-import" data stream was documented to
   end with an optional LF, but it actually required one.

 * "git svn dcommit/rebase" did not honor --rewrite-root option.

Also included are a handful documentation updates.

5 files changed, 46 insertions, 12 deletions

diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index b4a47d3efbb..ac496f83032 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/02/28 15:11:29 bjs Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/15 05:09:07 bjs Exp $
 #
 
 .include "${.CURDIR}/../scmgit/Makefile.common"
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	--with-curl=${BUILDLINK_PREFIX.curl:Q}
 CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat:Q}
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv:Q}
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
-CONFIGURE_ARGS+=	--with-tcltk=${TOOLS_PREFIX.wish}
+CONFIGURE_ARGS+=	--with-tcltk=${WISH:Q}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib:Q}
 
 BUILD_TARGET=		all
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 04cd63de7fd..e1fe0b03608 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.4 2008/02/28 15:11:29 bjs Exp $
+$NetBSD: distinfo,v 1.5 2008/03/15 05:09:07 bjs Exp $
 
-SHA1 (git-1.5.4.3.tar.gz) = de9a68a6628465376a02b563d902dad05421c917
-RMD160 (git-1.5.4.3.tar.gz) = c3c3e8f15a0323ee3bcb9d8dfa2a58c23db14b85
-Size (git-1.5.4.3.tar.gz) = 1899555 bytes
+SHA1 (git-1.5.4.4.tar.gz) = 62595d686ab5f3c197b2ff1e2c2c9948a9273dcf
+RMD160 (git-1.5.4.4.tar.gz) = 5e93c452c279a71138ce062276adcfd064d18793
+Size (git-1.5.4.4.tar.gz) = 1903687 bytes
 SHA1 (patch-aa) = 5af7779f0ac99aa6694d2a4d87ed999ef21c9375
 SHA1 (patch-ab) = 746bcea15853cd78b14dc2916f5f02bf67e59751
 SHA1 (patch-ac) = b8b70fabbd2857d5b4962b94d2c852f8d092ef27
+SHA1 (patch-ad) = 1b5ea997ea60206857b385a670509897637d5078
 SHA1 (patch-ae) = 502cf80e047155a1302cbdafdd2a82e6077077e1
 SHA1 (patch-af) = 93b83ac35f3f48cbf9a8ee39db0709547bf9d6c3
-SHA1 (patch-ag) = 65e91df0ac4dfe977717b9c06cdf0511a7d12dca
+SHA1 (patch-ag) = 8918a23e50f4e1f9aa0bb5dda4404140cda3c5b5
 SHA1 (patch-ah) = 94947b3d79c43246388da9c434f9e71e6716c790
 SHA1 (patch-ai) = 95b2b0a41b8b6f0ee804b48a3f3686d2fdf164f5
diff --git a/devel/scmgit-base/patches/patch-ad b/devel/scmgit-base/patches/patch-ad
new file mode 100644
index 00000000000..d530b9b770a
--- /dev/null
+++ b/devel/scmgit-base/patches/patch-ad
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.1 2008/03/15 05:09:07 bjs Exp $
+
+--- date.c.orig	2008-03-09 06:18:13.000000000 -0400
++++ date.c
+@@ -831,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;
diff --git a/devel/scmgit-base/patches/patch-ag b/devel/scmgit-base/patches/patch-ag
index 528d583d3f4..06a66129918 100644
--- a/devel/scmgit-base/patches/patch-ag
+++ b/devel/scmgit-base/patches/patch-ag
@@ -1,7 +1,16 @@
-$NetBSD: patch-ag,v 1.2 2008/02/06 07:53:32 bjs Exp $
+$NetBSD: patch-ag,v 1.3 2008/03/15 05:09:07 bjs Exp $
 
---- templates/Makefile.orig	2008-02-01 23:09:01.000000000 -0500
+--- templates/Makefile.orig	2008-03-09 06:18:13.000000000 -0400
 +++ templates/Makefile
+@@ -29,7 +29,7 @@ boilerplates.made : $(bpsrc)
+ 		case "$$boilerplate" in *~) continue ;; esac && \
+ 		dst=`echo "$$boilerplate" | sed -e 's|^this|.|;s|--|/|g'` && \
+ 		dir=`expr "$$dst" : '\(.*\)/'` && \
+-		$(INSTALL) -d -m 755 blt/$$dir && \
++		$(BSD_INSTALL_DATA_DIR) blt/$$dir && \
+ 		case "$$boilerplate" in \
+ 		*--) ;; \
+ 		*) cp -p $$boilerplate blt/$$dst ;; \
 @@ -46,6 +46,6 @@ clean:
  	$(RM) -r blt boilerplates.made
  
@@ -9,4 +18,4 @@ $NetBSD: patch-ag,v 1.2 2008/02/06 07:53:32 bjs Exp $
 -	$(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 -)
+ 	(cd '$(DESTDIR_SQ)$(template_dir_SQ)' && umask 022 && $(TAR) xf -)
diff --git a/devel/scmgit/Makefile.common b/devel/scmgit/Makefile.common
index cc10b0b23b1..c87d64725c8 100644
--- a/devel/scmgit/Makefile.common
+++ b/devel/scmgit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2008/02/28 15:11:29 bjs Exp $
+# $NetBSD: Makefile.common,v 1.7 2008/03/15 05:09:07 bjs Exp $
 #
 # used by devel/scmgit-base/Makefile
 # used by devel/scmgit-docs/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE?=	http://git.or.cz/
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GIT_VERSION=	1.5.4.3
+GIT_VERSION=	1.5.4.4
 
 .include "../../mk/bsd.fast.prefs.mk"