From 40b2f470f505c263eea4e40b0f58a454e4db053d Mon Sep 17 00:00:00 2001
From: benoit <benoit@openbsd.org>
Date: Sat, 7 Nov 2015 08:28:22 +0000
Subject: [PATCH] Update to git-2.6.3.

---
 devel/git/Makefile               |  4 ++--
 devel/git/distinfo               |  8 ++++----
 devel/git/patches/patch-Makefile | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 9767f460428..90c65f49af0 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.141 2015/10/20 05:33:44 benoit Exp $
+# $OpenBSD: Makefile,v 1.142 2015/11/07 08:28:22 benoit Exp $
 
 COMMENT-main =	GIT - Tree History Storage Tool
 COMMENT-svn =	GIT - subversion interoperability tools
 COMMENT-x11 =	GIT - graphical tools
 
-V =		2.6.2
+V =		2.6.3
 DISTNAME =	git-${V}
 PKGNAME-main =	${DISTNAME}
 PKGNAME-svn =	git-svn-${V}
diff --git a/devel/git/distinfo b/devel/git/distinfo
index b8a862437e8..bd049c64f47 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,4 +1,4 @@
-SHA256 (git-2.6.2.tar.gz) = NN/Aa0SIDfkZQNwxii08g7eeZ7bwUxnHxx6U0wiTY20=
-SHA256 (git-manpages-2.6.2.tar.gz) = 6ZYgfNi5kJKWFAu49tkgnlgFIILpjt/pR81bPZJ9Qds=
-SIZE (git-2.6.2.tar.gz) = 5535091
-SIZE (git-manpages-2.6.2.tar.gz) = 608069
+SHA256 (git-2.6.3.tar.gz) = nIkt9n/sZPGXTpYEkXNOxp/8m+9nBkUUirM5titojZE=
+SHA256 (git-manpages-2.6.3.tar.gz) = 92cAo4PZMZeaoWDSRTHg6zG9zvrqwh6ivhpl+3dkGjw=
+SIZE (git-2.6.3.tar.gz) = 5545887
+SIZE (git-manpages-2.6.3.tar.gz) = 608244
diff --git a/devel/git/patches/patch-Makefile b/devel/git/patches/patch-Makefile
index fa5f59a4da3..e8658be7c28 100644
--- a/devel/git/patches/patch-Makefile
+++ b/devel/git/patches/patch-Makefile
@@ -1,12 +1,12 @@
-$OpenBSD: patch-Makefile,v 1.58 2015/10/20 05:33:44 benoit Exp $
+$OpenBSD: patch-Makefile,v 1.59 2015/11/07 08:28:22 benoit Exp $
 
 No need for librt on OpenBSD
 
 Workaround for ar(1) not having 's' on VAX by calling ranlib
 
---- Makefile.orig	Fri Oct 16 23:58:26 2015
-+++ Makefile	Sun Oct 18 16:48:35 2015
-@@ -1438,7 +1438,6 @@ endif
+--- Makefile.orig	Thu Nov  5 22:31:55 2015
++++ Makefile	Sat Nov  7 08:34:01 2015
+@@ -1443,7 +1443,6 @@ endif
  
  ifdef HAVE_CLOCK_GETTIME
  	BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME
@@ -14,8 +14,8 @@ Workaround for ar(1) not having 's' on VAX by calling ranlib
  endif
  
  ifdef HAVE_CLOCK_MONOTONIC
-@@ -1998,13 +1997,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
- 		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
+@@ -2003,13 +2002,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
+ 		$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
  
  $(LIB_FILE): $(LIB_OBJS)
 -	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
@@ -31,7 +31,7 @@ Workaround for ar(1) not having 's' on VAX by calling ranlib
  
  export DEFAULT_EDITOR DEFAULT_PAGER
  
-@@ -2187,7 +2186,7 @@ export TEST_NO_MALLOC_CHECK
+@@ -2192,7 +2191,7 @@ export TEST_NO_MALLOC_CHECK
  
  ### Testing rules