From 07acd9ea417897900d46df626cb715a2f1cd9237 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 10 Jan 2016 10:24:50 +0000
Subject: [PATCH] haproxy: bump version.

* remove upstreamed patch.
---
 ...roxy-1.6.1.recipe => haproxy-1.6.3.recipe} |  4 ++--
 ...-1.6.1.patchset => haproxy-1.6.3.patchset} | 21 ++++---------------
 2 files changed, 6 insertions(+), 19 deletions(-)
 rename net-proxy/haproxy/{haproxy-1.6.1.recipe => haproxy-1.6.3.recipe} (88%)
 rename net-proxy/haproxy/patches/{haproxy-1.6.1.patchset => haproxy-1.6.3.patchset} (70%)

diff --git a/net-proxy/haproxy/haproxy-1.6.1.recipe b/net-proxy/haproxy/haproxy-1.6.3.recipe
similarity index 88%
rename from net-proxy/haproxy/haproxy-1.6.1.recipe
rename to net-proxy/haproxy/haproxy-1.6.3.recipe
index ae0f4aa9b..84ffb5bed 100644
--- a/net-proxy/haproxy/haproxy-1.6.1.recipe
+++ b/net-proxy/haproxy/haproxy-1.6.3.recipe
@@ -7,13 +7,13 @@ persistence or Layer7 processing.
 "
 HOMEPAGE="http://www.haproxy.org/"
 SOURCE_URI="http://www.haproxy.org/download/1.6/src/haproxy-$portVersion.tar.gz"
-CHECKSUM_SHA256="71da2abe610ed42afd6678c2e95321db5f3c416fe2803235f75fc459d8246289"
+CHECKSUM_SHA256="fd06b45054cde2c69cb3322dfdd8a4bcfc46eb9d0c4b36d20d3ea19d84e338a7"
 REVISION="1"
 
 LICENSE="GNU GPL v2"
 COPYRIGHT="2012 Willy Tarreau"
 
-ARCHITECTURES="x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	haproxy = $portVersion
diff --git a/net-proxy/haproxy/patches/haproxy-1.6.1.patchset b/net-proxy/haproxy/patches/haproxy-1.6.3.patchset
similarity index 70%
rename from net-proxy/haproxy/patches/haproxy-1.6.1.patchset
rename to net-proxy/haproxy/patches/haproxy-1.6.3.patchset
index 6bf6941f2..5e386014c 100644
--- a/net-proxy/haproxy/patches/haproxy-1.6.1.patchset
+++ b/net-proxy/haproxy/patches/haproxy-1.6.3.patchset
@@ -1,12 +1,12 @@
-From 03f8a016d469e11ffc2b67dba9a78048255b5c8e Mon Sep 17 00:00:00 2001
+From 8964d6b3c98a96ac0bf11983d4513201a2a2b5eb 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.
+Subject: 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 d15be04..d42d5fb 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -98,7 +98,7 @@ DOCDIR = $(PREFIX)/doc/haproxy
@@ -39,21 +39,8 @@ index 4f0aa8a..3af735e 100644
  endif # generic
  
  
-@@ -805,10 +812,9 @@ install-doc:
- 		install -m 644 doc/$$x.txt "$(DESTDIR)$(DOCDIR)" ; \
- 	done
- 
--install-bin: haproxy haproxy-systemd-wrapper
-+install-bin: haproxy $(EXTRA)
- 	install -d "$(DESTDIR)$(SBINDIR)"
--	install haproxy "$(DESTDIR)$(SBINDIR)"
--	install haproxy-systemd-wrapper "$(DESTDIR)$(SBINDIR)"
-+	install haproxy $(EXTRA) "$(DESTDIR)$(SBINDIR)"
- 
- install: install-bin install-man install-doc
- 
 diff --git a/README b/README
-index d376fbf..76e6ed5 100644
+index 6d341d3..5bc5f04 100644
 --- a/README
 +++ b/README
 @@ -48,6 +48,7 @@ and assign it to the TARGET variable :