From bad5811ddc8958e260c8a5557fb662a3a9c5d50c Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 30 Jul 2015 03:50:39 -0400
Subject: [PATCH] git: Update from 2.4.6 to 2.5.0

---
 packages/git/build.sh       |  2 +-
 packages/git/makefile.patch | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/git/build.sh b/packages/git/build.sh
index 8aa2b5a6..f78f1d28 100755
--- a/packages/git/build.sh
+++ b/packages/git/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://git-scm.com/
 TERMUX_PKG_DESCRIPTION="Distributed version control system designed to handle everything from small to very large projects with speed and efficiency"
 TERMUX_PKG_DEPENDS="openssl, libcurl"
-TERMUX_PKG_VERSION=2.4.6
+TERMUX_PKG_VERSION=2.5.0
 TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
 ## This requires a /system/bin/sh on the host building:
diff --git a/packages/git/makefile.patch b/packages/git/makefile.patch
index dd272e26..d8e91dba 100644
--- a/packages/git/makefile.patch
+++ b/packages/git/makefile.patch
@@ -1,11 +1,20 @@
-diff -u -r ../git-2.1.0/Makefile ./Makefile
---- ../git-2.1.0/Makefile	2014-08-16 00:26:55.000000000 +0200
-+++ ./Makefile	2014-08-20 18:23:54.348764528 +0200
-@@ -1504,7 +1504,6 @@
+diff -u -r ../git-2.5.0/Makefile ./Makefile
+--- ../git-2.5.0/Makefile	2015-07-27 16:34:56.000000000 -0400
++++ ./Makefile	2015-07-30 03:43:04.011455306 -0400
+@@ -1431,7 +1431,6 @@
  
  ifdef HAVE_CLOCK_GETTIME
  	BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME
 -	EXTLIBS += -lrt
  endif
  
- ifeq ($(TCLTK_PATH),)
+ ifdef HAVE_CLOCK_MONOTONIC
+@@ -1699,7 +1698,7 @@
+ common-cmds.h: generate-cmdlist.perl command-list.txt
+ 
+ common-cmds.h: $(wildcard Documentation/git-*.txt)
+-	$(QUIET_GEN)$(PERL_PATH) generate-cmdlist.perl command-list.txt > $@+ && mv $@+ $@
++	$(QUIET_GEN)perl generate-cmdlist.perl command-list.txt > $@+ && mv $@+ $@
+ 
+ SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
+ 	$(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
-- 
2.11.0