Update to 1.3.14. [1]

Add a 'reload' subcommand to rc.d startup script. [2]

Submitted by:	p.rybicki cadera.com.pl [2]
		delphij [1]
PR:		ports/119755 [1]
Approved by:	maintainer

5 files changed, 28 insertions, 26 deletions

diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index 43cbef64758..0d44e7b7207 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -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
diff --git a/net/haproxy-devel/distinfo b/net/haproxy-devel/distinfo
index bdc0f3ce52a..49f1ac4e34c 100644
--- a/net/haproxy-devel/distinfo
+++ b/net/haproxy-devel/distinfo
@@ -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
diff --git a/net/haproxy-devel/files/haproxy.in b/net/haproxy-devel/files/haproxy.in
index 244bddfbd7e..6c5edebd00c 100644
--- a/net/haproxy-devel/files/haproxy.in
+++ b/net/haproxy-devel/files/haproxy.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: 
+# $FreeBSD$
 #
 
 # PROVIDE: haproxy
@@ -46,5 +46,7 @@ haproxy_gracefulstop() {
 	kill -${sig_gracefulstop} ${rc_pid}
 	}
 
-extra_commands="gracefulstop"
+reload_cmd="$command $haproxy_flags -sf $(cat $pidfile)"
+
+extra_commands="reload gracefulstop"
 run_rc_command "$1"
diff --git a/net/haproxy-devel/files/patch-Makefile.bsd b/net/haproxy-devel/files/patch-Makefile.bsd
index 691188ee7e7..622be4168cf 100644
--- a/net/haproxy-devel/files/patch-Makefile.bsd
+++ b/net/haproxy-devel/files/patch-Makefile.bsd
@@ -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
  
diff --git a/net/haproxy-devel/pkg-plist b/net/haproxy-devel/pkg-plist
index 94b91efb6ef..7d32b980ac0 100644
--- a/net/haproxy-devel/pkg-plist
+++ b/net/haproxy-devel/pkg-plist
@@ -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