3 files changed, 4 insertions, 15 deletions
diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index 1f13764f9420..1ec9d64c6e2b 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	haproxy
-DISTVERSION=	1.5-dev3
+DISTVERSION=	1.5-dev4
 CATEGORIES=	net
 MASTER_SITES=	http://haproxy.1wt.eu/download/1.5/src/devel/
 PKGNAMESUFFIX=	-devel
@@ -17,7 +17,7 @@ COMMENT=	The Reliable, High Performance TCP/HTTP Load Balancer
 LICENSE_COMB=	multi
 LICENSE=	GPLv2 LGPL21
 
-CONFLICTS=	haproxy-1.[24]\.*
+CONFLICTS=	haproxy-[1234567890]\*
 USE_RC_SUBR=	haproxy
 USE_GMAKE=	YES
 SUB_FILES=	pkg-message
diff --git a/net/haproxy-devel/distinfo b/net/haproxy-devel/distinfo
index 31a829f263e7..362a776ec3b4 100644
--- a/net/haproxy-devel/distinfo
+++ b/net/haproxy-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (haproxy-1.5-dev3.tar.gz) = c5dbaad0d9f668ba63f60a7cd6cc20eda2d09ae262782ea74c8b68c315457103
-SIZE (haproxy-1.5-dev3.tar.gz) = 861620
+SHA256 (haproxy-1.5-dev4.tar.gz) = be5d7794fd0570fcd62c0baa9c4b767eec6e89156c25108fd50810d11876e238
+SIZE (haproxy-1.5-dev4.tar.gz) = 873321
diff --git a/net/haproxy-devel/files/patch-include-types-pattern.h b/net/haproxy-devel/files/patch-include-types-pattern.h
deleted file mode 100644
index 5566fca4c014..000000000000
--- a/net/haproxy-devel/files/patch-include-types-pattern.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/types/pattern.h.orig	2010-11-15 14:46:53.000000000 -0500
-+++ include/types/pattern.h	2010-11-15 14:48:07.000000000 -0500
-@@ -54,7 +54,7 @@
- union pattern_arg_data {
- 	struct in_addr ip;        /* used for ipv4 type */
- 	uint32_t integer;         /* used for unsigned 32bits integer type */
--	int32_t sinteger;         /* used for signed 32bits integer type */
-+	int sinteger;             /* used for signed 32bits integer type */
- 	struct chunk str;
- };
-