Changes 1.9.3:

* "git p4" dealing with changes in binary files were broken by a
   change in 1.9 release.
* The shell prompt script (in contrib/), when using the PROMPT_COMMAND
  interface, used an unsafe construct when showing the branch name in
  $PS1.
* "git rebase" used a POSIX shell construct FreeBSD /bin/sh does not
  work well with.
* Some more Unicode codepoints defined in Unicode 6.3 as having
  zero width have been taught to our display column counting logic.
* Some tests used shell constructs that did not work well on
  FreeBSD.

4 files changed, 14 insertions, 20 deletions

diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
index 598bd7f6d6b..22850890d32 100644
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2014/02/23 10:00:27 adam Exp $
+$NetBSD: distinfo,v 1.13 2014/05/10 11:43:30 adam Exp $
 
-SHA1 (git-1.9.0.tar.gz) = e60667fc16e5a5f1cde46616b0458cc802707743
-RMD160 (git-1.9.0.tar.gz) = bc8d4046749bf256494d6fc8f3a92e9c4d57aba6
-Size (git-1.9.0.tar.gz) = 4839724 bytes
+SHA1 (git-1.9.3.tar.xz) = c986463630e23e13b36e45d83d0e23daf9387c82
+RMD160 (git-1.9.3.tar.xz) = 8594d536e4659fee9e643d24b0f9845f3490ab2e
+Size (git-1.9.3.tar.xz) = 3386364 bytes
 SHA1 (patch-aa) = 31f3759c6cf3bfd28d154b3abaa95d396b72502b
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
diff --git a/devel/git/Makefile.common b/devel/git/Makefile.common
index 3a6dfc36765..d5f2d05b912 100644
--- a/devel/git/Makefile.common
+++ b/devel/git/Makefile.common
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile.common,v 1.1 2013/09/09 13:56:27 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2014/05/10 11:43:30 adam Exp $
 #
 # used by devel/git-base/Makefile
 # used by devel/git-docs/Makefile
 # used by devel/git-gitk/Makefile
+# used by www/gitweb/Makefile
 
 .include "../../devel/git/Makefile.version"
 
 DISTNAME=	git-${GIT_VERSION}
 CATEGORIES=	devel scm
-MASTER_SITES?=	http://git-core.googlecode.com/files/
+MASTER_SITES?=	https://www.kernel.org/pub/software/scm/git/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE?=	http://git-scm.com/
diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version
index 3c079429f71..285783bb43e 100644
--- a/devel/git/Makefile.version
+++ b/devel/git/Makefile.version
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.version,v 1.10 2014/02/23 10:00:27 adam Exp $
+# $NetBSD: Makefile.version,v 1.11 2014/05/10 11:43:30 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-svn/Makefile
-# used by www/gitweb/Makefile
 
-GIT_VERSION=	1.9.0
+GIT_VERSION=	1.9.3
diff --git a/www/gitweb/Makefile b/www/gitweb/Makefile
index c6fde0819f7..408b845c116 100644
--- a/www/gitweb/Makefile
+++ b/www/gitweb/Makefile
@@ -1,23 +1,17 @@
-# $NetBSD: Makefile,v 1.21 2014/01/01 11:14:38 adam Exp $
+# $NetBSD: Makefile,v 1.22 2014/05/10 11:43:30 adam Exp $
 
-.include "../../devel/git/Makefile.version"
+.include "../../devel/git/Makefile.common"
 
-DISTNAME=	git-${GIT_VERSION}
 PKGNAME=	${DISTNAME:S/git/gitweb/}
 CATEGORIES=	www
-MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://git.or.cz/
 COMMENT=	Web interface for GIT repositories
 
 #DEPENDS+=	apache{,2,22}-[0-9]*:../../www/apache22
 DEPENDS+=	git-base>=${GIT_VERSION}:../../devel/git-base
 DEPENDS+=	{perl>=5.15.8,p5-Time-HiRes>=1.9725}:../../time/p5-Time-HiRes
 
-DISTINFO_FILE=	${.CURDIR}/../../devel/git-base/distinfo
-
-USE_TOOLS+=	gmake perl:run
+USE_TOOLS+=	perl:run
 
 BUILD_DIRS=	gitweb
 BUILD_TARGET=	gitweb.cgi
@@ -38,8 +32,7 @@ GITWEB_EGDIR=	${PREFIX}/share/examples/gitweb
 CONF_FILES=	${GITWEB_EGDIR}/gitweb.conf ${PKG_SYSCONFDIR}/gitweb.conf
 MESSAGE_SUBST+=	CONFFILE=${PKG_SYSCONFDIR}/gitweb.conf
 
-INSTALLATION_DIRS=	libexec/cgi-bin \
-			share/doc/gitweb \
+INSTALLATION_DIRS=	libexec/cgi-bin share/doc/gitweb \
 			${GITWEB_EGDIR} ${GITWEB_HTDOCS}
 
 do-install: