From c8f016682e891c46a96d67b6395d34108bd6b0b9 Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Sat, 10 May 2014 11:43:30 +0000
Subject: 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.

---
 www/gitweb/Makefile | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'www')

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:
-- 
cgit v1.2.3