ports/119755: [PATCH] Update net/haproxy-devel to 1.3.14

[Xin LI]

>Number:         119755
>Category:       ports
>Synopsis:       [PATCH] Update net/haproxy-devel to 1.3.14
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 17 19:40:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Xin LI
>Release:        FreeBSD 7.0-PRERELEASE i386
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD freefall.freebsd.org 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #32: Tue Jan 15 15:07:33 UTC 2008 simon at freefall.freebsd.org:/usr/src/sys/i386/compile/FREEFALL i386


>Description:
	This patch updates haproxy-devel to 1.3.14.

	Maintainer cc'ed.
>How-To-Repeat:
>Fix:

--- haproxy-devel.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/haproxy-devel/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile	13 Oct 2007 15:29:06 -0000	1.21
+++ Makefile	17 Jan 2008 18:37:48 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	haproxy
-PORTVERSION=	1.3.12.2
+PORTVERSION=	1.3.14
 CATEGORIES=	net
 MASTER_SITES=	http://haproxy.1wt.eu/download/1.3/src/
 PKGNAMESUFFIX=	-devel
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/haproxy-devel/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo	13 Oct 2007 15:29:06 -0000	1.19
+++ distinfo	17 Jan 2008 19:22:58 -0000
@@ -1,3 +1,3 @@
-MD5 (haproxy-1.3.12.2.tar.gz) = d299484c1bfcaacc360ee3adf2fb51ea
-SHA256 (haproxy-1.3.12.2.tar.gz) = 975786a16274a104fa269781322755314a3ec276dbeab3db94418d1dd7ee3547
-SIZE (haproxy-1.3.12.2.tar.gz) =  373552
+MD5 (haproxy-1.3.14.tar.gz) = baa977bbabc1ef0208748f475bf6bf3d
+SHA256 (haproxy-1.3.14.tar.gz) = 25c25ae068ed846f4650d4a53bd9ad06328ab182995a216deff9f2eec029d324
+SIZE (haproxy-1.3.14.tar.gz) = 434389
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/haproxy-devel/pkg-plist,v
retrieving revision 1.9
diff -u -p -r1.9 pkg-plist
--- pkg-plist	13 Oct 2007 15:29:06 -0000	1.9
+++ pkg-plist	17 Jan 2008 19:29:08 -0000
@@ -17,6 +17,7 @@ sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/sess_par_sec.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/ebtree
 %%PORTDOCS%%%%DOCSDIR%%/internals/header-parser-speed.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/header-tree.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/http-docs.txt
Index: files/patch-Makefile.bsd
===================================================================
RCS file: /home/ncvs/ports/net/haproxy-devel/files/patch-Makefile.bsd,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile.bsd
--- files/patch-Makefile.bsd	12 Sep 2007 05:20:13 -0000	1.3
+++ files/patch-Makefile.bsd	17 Jan 2008 19:26:52 -0000
@@ -1,12 +1,12 @@
---- Makefile.bsd.orig	Mon Apr 16 00:33:37 2007
-+++ Makefile.bsd	Fri May  4 04:05:12 2007
+--- ./Makefile.bsd.orig	2007-12-05 16:25:44.000000000 -0800
++++ ./Makefile.bsd	2008-01-17 11:26:47.695860700 -0800
 @@ -1,4 +1,4 @@
 -# This makefile is dedicated to OpenBSD (and possibly other BSDs)
 +# This makefile is dedicated to FreeBSD (and possibly other BSDs)
  # You should use it this way :
  #   make TARGET=os CPU=cpu
- 
-@@ -6,31 +6,31 @@
+ #
+@@ -9,31 +9,31 @@
  
  # Select target OS. TARGET must match a system for which COPTS and LIBS are
  # correctly defined below.
@@ -48,7 +48,7 @@
  
  # CPU dependant optimizations
  COPTS.generic = -O2
-@@ -52,7 +52,7 @@
+@@ -55,7 +55,7 @@
  
  # you can enable debug arguments with "DEBUG=-g" or disable them with "DEBUG="
  #DEBUG = -g -DDEBUG_MEMORY -DDEBUG_FULL
@@ -57,7 +57,7 @@
  
  # if small memory footprint is required, you can reduce the buffer size. There
  # are 2 buffers per concurrent session, so 16 kB buffers will eat 32 MB memory
-@@ -60,7 +60,7 @@
+@@ -63,7 +63,7 @@
  # will avoid the additionnal paramters to overflow a page. 8030 bytes is
  # exactly 5.5 TCP segments of 1460 bytes.
  #SMALL_OPTS =
@@ -66,32 +66,31 @@
  
  # redefine this if you want to add some special PATH to include/libs
  ADDINC =
-@@ -69,7 +69,7 @@
+@@ -75,7 +75,7 @@
  # set some defines when needed.
  # Known ones are -DENABLE_POLL
  # - use -DTPROXY to compile with transparent proxy support.
 -DEFINE = -DTPROXY
 +#DEFINE = -DTPROXY
  
- # global options
- TARGET_OPTS=$(COPTS.$(TARGET))
-@@ -79,7 +79,7 @@
- COPTS=-Iinclude $(ADDINC) $(CPU_OPTS) $(TARGET_OPTS) $(REGEX_OPTS) $(SMALL_OPTS) $(DEFINE)
- LIBS=$(LIBS.$(TARGET)) $(LIBS.$(REGEX)) $(ADDLIB)
- 
--CFLAGS = -Wall $(COPTS) $(DEBUG)
-+CFLAGS += -Wall $(COPTS)
+ # May be changed to patch PAGE_SIZE on every platform when using dlmalloc
+ DLMALLOC_THRES=4096
+@@ -95,7 +95,7 @@
+ COPTS   = -Iinclude $(ADDINC) $(CPU_OPTS) $(TARGET_OPTS) $(REGEX_OPTS) \
+           $(SMALL_OPTS) $(VER_OPTS) $(DEFINE)
+ LIBS    = $(LIBS.$(TARGET)) $(LIBS.$(REGEX)) $(ADDLIB)
+-CFLAGS  = -Wall $(COPTS) $(DEBUG)
++CFLAGS  = -Wall $(COPTS)
  LDFLAGS = -g
  
- OBJS = src/haproxy.o src/list.o src/chtbl.o src/hashpjw.o src/base64.o \
-@@ -93,7 +93,9 @@
+ OBJS = src/haproxy.o src/sessionhash.o src/base64.o src/protocols.o \
+@@ -112,7 +112,8 @@
  all: haproxy
  
- haproxy: $(OBJS)
+ haproxy: $(OBJS) $(OPT_OBJS)
 -	$(LD) $(LDFLAGS) -o $@ $> $(LIBS)
 +#	$(LD) $(LDFLAGS) -o $@ $> $(LIBS)
-+	 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $> $(LIBS)
-+
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $> $(LIBS)
  
  .SUFFIXES: .c.o
  
--- haproxy-devel.diff ends here ---


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