From fd519d207acb644d38a30785ed1eedbdcf46da83 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 2 Nov 2015 17:50:40 +0000
Subject: [PATCH] haproxy: split patch in two commits.

---
 .../patches/haproxy-1.7.0.git.patchset        | 44 ++++++++++++-------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/net-proxy/haproxy/patches/haproxy-1.7.0.git.patchset b/net-proxy/haproxy/patches/haproxy-1.7.0.git.patchset
index 6bf6941f2..85b74fa58 100644
--- a/net-proxy/haproxy/patches/haproxy-1.7.0.git.patchset
+++ b/net-proxy/haproxy/patches/haproxy-1.7.0.git.patchset
@@ -1,4 +1,4 @@
-From 03f8a016d469e11ffc2b67dba9a78048255b5c8e Mon Sep 17 00:00:00 2001
+From eba61b839d441f8c69e05fe22c0f530f8118a670 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 19 Oct 2015 23:01:16 +0000
 Subject: [BUILD] add Haiku as supported target.
@@ -6,7 +6,7 @@ Subject: [BUILD] add Haiku as supported target.
 * also replace haproxy-systemd-wrapper with $(EXTRA) in install-bin.
 
 diff --git a/Makefile b/Makefile
-index 4f0aa8a..3af735e 100644
+index 4f0aa8a..e154521 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -98,7 +98,7 @@ DOCDIR = $(PREFIX)/doc/haproxy
@@ -39,7 +39,33 @@ index 4f0aa8a..3af735e 100644
  endif # generic
  
  
-@@ -805,10 +812,9 @@ install-doc:
+diff --git a/README b/README
+index cf97605..72144d9 100644
+--- a/README
++++ b/README
+@@ -47,6 +47,7 @@ and assign it to the TARGET variable :
+   - aix51       for AIX 5.1
+   - aix52       for AIX 5.2
+   - cygwin      for Cygwin
++  - haiku       for Haiku
+   - generic     for any other OS or version.
+   - custom      to manually adjust every setting
+ 
+-- 
+2.2.2
+
+
+From f367d3b4b88f46cae1b6a5c25342d7077f225baf Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 2 Nov 2015 17:47:43 +0000
+Subject: [BUILD] replace haproxy-systemd-wrapper with $(EXTRA) in install-bin.
+
+
+diff --git a/Makefile b/Makefile
+index e154521..3af735e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -812,10 +812,9 @@ install-doc:
  		install -m 644 doc/$$x.txt "$(DESTDIR)$(DOCDIR)" ; \
  	done
  
@@ -52,18 +78,6 @@ index 4f0aa8a..3af735e 100644
  
  install: install-bin install-man install-doc
  
-diff --git a/README b/README
-index d376fbf..76e6ed5 100644
---- a/README
-+++ b/README
-@@ -48,6 +48,7 @@ and assign it to the TARGET variable :
-   - aix51       for AIX 5.1
-   - aix52       for AIX 5.2
-   - cygwin      for Cygwin
-+  - haiku       for Haiku
-   - generic     for any other OS or version.
-   - custom      to manually adjust every setting
- 
 -- 
 2.2.2