ports/155559: [Patch][Maintainer Update] net/haproxy-devel: v1.5.d3 -> v1.5.d4

[Ross West]

>Number:         155559
>Category:       ports
>Synopsis:       [Patch][Maintainer Update] net/haproxy-devel: v1.5.d3 -> v1.5.d4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 14 19:50:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Ross West
>Release:        FreeBSD 8.1-RELEASE amd64
>Organization:
>Environment:
>Description:
Update of haproxy (development branch) to v1.5-dev4

Includes many many updates (although mostly internal)
>How-To-Repeat:

>Fix:
diff -ruN --exclude=CVS /usr/ports/net/haproxy-devel.1.5.d3/Makefile /usr/ports/net/haproxy-devel/Makefile
--- /usr/ports/net/haproxy-devel.1.5.d3/Makefile        2010-11-16 10:01:10.000000000 -0500
+++ /usr/ports/net/haproxy-devel/Makefile       2011-03-14 15:45:23.000000000 -0400
@@ -1,12 +1,9 @@
-# New ports collection makefile for:    haproxy-devel
-# Date created:         Thu May  3 16:30:19 WEST 2007
-# Whom:                 Hugo Saro <hugo at barafranca.com>
 #
 # $FreeBSD: ports/net/haproxy-devel/Makefile,v 1.36 2010/11/15 21:26:16 sahil Exp $
 #

 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 +14,7 @@
 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 -ruN --exclude=CVS /usr/ports/net/haproxy-devel.1.5.d3/distinfo /usr/ports/net/haproxy-devel/distinfo
--- /usr/ports/net/haproxy-devel.1.5.d3/distinfo        2010-11-16 10:01:10.000000000 -0500
+++ /usr/ports/net/haproxy-devel/distinfo       2011-03-14 15:39:16.000000000 -0400
@@ -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 -ruN --exclude=CVS /usr/ports/net/haproxy-devel.1.5.d3/files/patch-include-types-pattern.h /usr/ports/net/haproxy-devel/files/patch-include-types-pattern.h
--- /usr/ports/net/haproxy-devel.1.5.d3/files/patch-include-types-pattern.h     2010-11-16 10:01:10.000000000 -0500
+++ /usr/ports/net/haproxy-devel/files/patch-include-types-pattern.h    1969-12-31 19:00:00.000000000 -0500
@@ -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;
- };
-


>Release-Note:
>Audit-Trail:
>Unformatted: