From 8939f1b9dceaeda85414b657fc6cb3f6dd6661a8 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Wed, 30 May 2018 01:09:07 +0000
Subject: [PATCH] git: bump to 2.16.4.

---
 dev-vcs/git/{git-2.16.2.recipe => git-2.16.4.recipe}      | 8 ++++----
 .../patches/{git-2.16.2.patchset => git-2.16.4.patchset}  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename dev-vcs/git/{git-2.16.2.recipe => git-2.16.4.recipe} (95%)
 rename dev-vcs/git/patches/{git-2.16.2.patchset => git-2.16.4.patchset} (98%)

diff --git a/dev-vcs/git/git-2.16.2.recipe b/dev-vcs/git/git-2.16.4.recipe
similarity index 95%
rename from dev-vcs/git/git-2.16.2.recipe
rename to dev-vcs/git/git-2.16.4.recipe
index c5627b277..8ecf6bf44 100644
--- a/dev-vcs/git/git-2.16.2.recipe
+++ b/dev-vcs/git/git-2.16.4.recipe
@@ -10,16 +10,16 @@ workflows."
 HOMEPAGE="https://git-scm.com/"
 COPYRIGHT="2005-2018 Git Authors (see git web site for list)"
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="1"
 
 SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz"
-CHECKSUM_SHA256="5560578bd21468d98637f41515c165d32f69caff0838b8989dee5ce10022c717"
+CHECKSUM_SHA256="6e69b0e9c487e5da52a14d4829f0b6a28b2c18a0bb6fb67c0dc8b5b5658bd532"
 
 SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz"
-CHECKSUM_SHA256_2="42eee5134cc8b3b64c736025edfbfee86c2ecb76e37980a0aff26c86b5abcb05"
+CHECKSUM_SHA256_2="482bf4ca717c4b5fccfcf4ced156bb0536c15b3e9bfb505638275d799d2321cf"
 
 SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz"
-CHECKSUM_SHA256_3="dbaf94de882e6ad6827a79935e6982021f0908bd7cccf984d3130fc77ecccb19"
+CHECKSUM_SHA256_3="a3f4a3434f376600b77a753442e7d17bdd217b188cebd8cc269ae7ee07d27606"
 
 PATCHES="git-$portVersion.patchset"
 
diff --git a/dev-vcs/git/patches/git-2.16.2.patchset b/dev-vcs/git/patches/git-2.16.4.patchset
similarity index 98%
rename from dev-vcs/git/patches/git-2.16.2.patchset
rename to dev-vcs/git/patches/git-2.16.4.patchset
index 2b00fdf0c..6246514cc 100644
--- a/dev-vcs/git/patches/git-2.16.2.patchset
+++ b/dev-vcs/git/patches/git-2.16.4.patchset
@@ -31,7 +31,7 @@ Subject: On Haiku use the user settings directory instead of HOME
 
 
 diff --git a/path.c b/path.c
-index da8b655..ec3d6c2 100644
+index 4c4a751..9129188 100644
 --- a/path.c
 +++ b/path.c
 @@ -11,6 +11,11 @@
@@ -46,7 +46,7 @@ index da8b655..ec3d6c2 100644
  static int get_st_mode_bits(const char *path, int *mode)
  {
  	struct stat st;
-@@ -1331,10 +1336,19 @@ char *xdg_config_home(const char *filename)
+@@ -1415,10 +1420,19 @@ char *xdg_config_home(const char *filename)
  {
  	const char *home, *config_home;