6 files changed, 174 insertions, 18 deletions

diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index de52b16fe9fc..78cff85ea703 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	haproxy
-PORTVERSION=	1.1.34
+PORTVERSION=	1.2.15
 CATEGORIES=	net www
-MASTER_SITES=	http://haproxy.1wt.eu/download/1.1/src/
+MASTER_SITES=	http://haproxy.1wt.eu/download/1.2/src/
 
 MAINTAINER=	clement@FreeBSD.org
 COMMENT=	High-performance and highly-robust TCP/HTTP load balancer
@@ -26,15 +26,23 @@ CFLAGS+=	-DTPROXY
 .if defined(WITH_PCRE)
 PKGNAMESUFFIX=	-pcre
 LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
+MAKE_ENV+=	"REGEX=pcre"
 CFLAGS+=	-DUSE_PCRE -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lpcreposix -lpcre
 .endif
 
+.if defined(WITH_SMALLOPTS)
+CFLAGS+=	-DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024
+.endif
+
+MAKEFILE=	Makefile.bsd
+
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Available options:"
 	@${ECHO_MSG} "WITH_PCRE:            Use pcre regex engine"
 	@${ECHO_MSG} "WITH_TPROXY:         Enable Transparent proxy support"
+	@${ECHO_MSG} "WITH_SMALLOPTS:         Enable low memory footprint support"
 	@${ECHO_MSG} "STATS_INTERVAL=###:   Statistics interval in milliseconds,"
 	@${ECHO_MSG} "                         (default to 0, disabled)"
 	@${ECHO_MSG} ""
@@ -44,10 +52,6 @@ post-patch:
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/haproxy.sh > ${WRKDIR}/haproxy.sh
 
-do-build:
-	cd ${WRKSRC} && \
-		${CC} ${CFLAGS} ${LDFLAGS} ${PORTNAME}.c -o ${PORTNAME}
-
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin
 	@${INSTALL_SCRIPT} ${WRKDIR}/haproxy.sh \
diff --git a/net/haproxy-devel/distinfo b/net/haproxy-devel/distinfo
index 36738999960c..4473cf674fd5 100644
--- a/net/haproxy-devel/distinfo
+++ b/net/haproxy-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (haproxy-1.1.34.tar.gz) = b1b7eb8811e76a5c760f603496c84d1f
-SHA256 (haproxy-1.1.34.tar.gz) = f9c7eef3071dcd879156f655cd052c1514bd8b246da28654a947f63da5fbda48
-SIZE (haproxy-1.1.34.tar.gz) = 133349
+MD5 (haproxy-1.2.15.tar.gz) = 7461a3deeda099a6ee190f99e9763fea
+SHA256 (haproxy-1.2.15.tar.gz) = 196fa8762dc644cbe97f9abf16c260d342b4a0f1e90446a413b839c6aae4db77
+SIZE (haproxy-1.2.15.tar.gz) = 248300
diff --git a/net/haproxy-devel/files/patch-Makefile.bsd b/net/haproxy-devel/files/patch-Makefile.bsd
new file mode 100644
index 000000000000..4f27d99fbe7e
--- /dev/null
+++ b/net/haproxy-devel/files/patch-Makefile.bsd
@@ -0,0 +1,74 @@
+--- Makefile.bsd.orig	Sun May 21 21:32:29 2006
++++ Makefile.bsd	Sun Sep 24 10:06:30 2006
+@@ -5,22 +5,22 @@
+ TARGET = openbsd
+ 
+ # pass CPU=<cpu_name> to make to optimize for a particular CPU
+-CPU = generic
++#CPU = generic
+ #CPU = i586
+ #CPU = i686
+ #CPU = ultrasparc
+ 
+ # By default, we use libc's regex. WARNING! On Solaris 8/Sparc, group
+ # references seem broken using libc ! Use pcre instead.
+-REGEX=libc
++REGEX?=libc
+ #REGEX=pcre
+ #REGEX=static-pcre
+ 
+ # tools options
+-CC = gcc
+-LD = gcc
++CC?= gcc
++LD?= gcc
+ 
+-PCREDIR=/usr/local
++PCREDIR=${LOCALBASE}
+ 
+ # This is for OpenBSD 3.0
+ COPTS.openbsd = -DENABLE_POLL
+@@ -46,7 +46,7 @@
+ 
+ # you can enable debug arguments with "DEBUG=-g" or disable them with "DEBUG="
+ #DEBUG = -g -DDEBUG_MEMORY -DDEBUG_FULL
+-DEBUG = -g
++#DEBUG = -g
+ 
+ # 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
+@@ -54,7 +54,7 @@
+ # will avoid the additionnal paramters to overflow a page. 8030 bytes is
+ # exactly 5.5 TCP segments of 1460 bytes.
+ #SMALL_OPTS =
+-SMALL_OPTS = -DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024
++#SMALL_OPTS = -DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024
+ 
+ # redefine this if you want to add some special PATH to include/libs
+ ADDINC =
+@@ -65,7 +65,7 @@
+ # - use -DSTATTIME=0 to disable statistics, else specify an interval in
+ #   milliseconds.
+ # - use -DTPROXY to compile with transparent proxy support.
+-DEFINE = -DSTATTIME=0 -DTPROXY
++#DEFINE = -DSTATTIME=0 -DTPROXY
+ 
+ # global options
+ TARGET_OPTS=$(COPTS.$(TARGET))
+@@ -75,13 +75,13 @@
+ COPTS=-I. $(ADDINC) $(CPU_OPTS) $(TARGET_OPTS) $(REGEX_OPTS) $(SMALL_OPTS) $(DEFINE)
+ LIBS=$(LIBS.$(TARGET)) $(LIBS.$(REGEX)) $(ADDLIB)
+ 
+-CFLAGS = -Wall $(COPTS) $(DEBUG)
+-LDFLAGS = -g
++CFLAGS+= -Wall $(COPTS)
++LDFLAGS+= #-g /lib/crt0.o  -lc 
+ 
+ all: haproxy
+ 
+ haproxy: src/list.o src/chtbl.o src/hashpjw.o haproxy.o src/base64.o src/uri_auth.o
+-	$(LD) $(LDFLAGS) -o $@ $> $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $> $(LIBS)
+ 
+ src/base64.o:	src/base64.c
+ 	$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index de52b16fe9fc..78cff85ea703 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	haproxy
-PORTVERSION=	1.1.34
+PORTVERSION=	1.2.15
 CATEGORIES=	net www
-MASTER_SITES=	http://haproxy.1wt.eu/download/1.1/src/
+MASTER_SITES=	http://haproxy.1wt.eu/download/1.2/src/
 
 MAINTAINER=	clement@FreeBSD.org
 COMMENT=	High-performance and highly-robust TCP/HTTP load balancer
@@ -26,15 +26,23 @@ CFLAGS+=	-DTPROXY
 .if defined(WITH_PCRE)
 PKGNAMESUFFIX=	-pcre
 LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
+MAKE_ENV+=	"REGEX=pcre"
 CFLAGS+=	-DUSE_PCRE -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lpcreposix -lpcre
 .endif
 
+.if defined(WITH_SMALLOPTS)
+CFLAGS+=	-DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024
+.endif
+
+MAKEFILE=	Makefile.bsd
+
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Available options:"
 	@${ECHO_MSG} "WITH_PCRE:            Use pcre regex engine"
 	@${ECHO_MSG} "WITH_TPROXY:         Enable Transparent proxy support"
+	@${ECHO_MSG} "WITH_SMALLOPTS:         Enable low memory footprint support"
 	@${ECHO_MSG} "STATS_INTERVAL=###:   Statistics interval in milliseconds,"
 	@${ECHO_MSG} "                         (default to 0, disabled)"
 	@${ECHO_MSG} ""
@@ -44,10 +52,6 @@ post-patch:
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/haproxy.sh > ${WRKDIR}/haproxy.sh
 
-do-build:
-	cd ${WRKSRC} && \
-		${CC} ${CFLAGS} ${LDFLAGS} ${PORTNAME}.c -o ${PORTNAME}
-
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin
 	@${INSTALL_SCRIPT} ${WRKDIR}/haproxy.sh \
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index 36738999960c..4473cf674fd5 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,3 +1,3 @@
-MD5 (haproxy-1.1.34.tar.gz) = b1b7eb8811e76a5c760f603496c84d1f
-SHA256 (haproxy-1.1.34.tar.gz) = f9c7eef3071dcd879156f655cd052c1514bd8b246da28654a947f63da5fbda48
-SIZE (haproxy-1.1.34.tar.gz) = 133349
+MD5 (haproxy-1.2.15.tar.gz) = 7461a3deeda099a6ee190f99e9763fea
+SHA256 (haproxy-1.2.15.tar.gz) = 196fa8762dc644cbe97f9abf16c260d342b4a0f1e90446a413b839c6aae4db77
+SIZE (haproxy-1.2.15.tar.gz) = 248300
diff --git a/net/haproxy/files/patch-Makefile.bsd b/net/haproxy/files/patch-Makefile.bsd
new file mode 100644
index 000000000000..4f27d99fbe7e
--- /dev/null
+++ b/net/haproxy/files/patch-Makefile.bsd
@@ -0,0 +1,74 @@
+--- Makefile.bsd.orig	Sun May 21 21:32:29 2006
++++ Makefile.bsd	Sun Sep 24 10:06:30 2006
+@@ -5,22 +5,22 @@
+ TARGET = openbsd
+ 
+ # pass CPU=<cpu_name> to make to optimize for a particular CPU
+-CPU = generic
++#CPU = generic
+ #CPU = i586
+ #CPU = i686
+ #CPU = ultrasparc
+ 
+ # By default, we use libc's regex. WARNING! On Solaris 8/Sparc, group
+ # references seem broken using libc ! Use pcre instead.
+-REGEX=libc
++REGEX?=libc
+ #REGEX=pcre
+ #REGEX=static-pcre
+ 
+ # tools options
+-CC = gcc
+-LD = gcc
++CC?= gcc
++LD?= gcc
+ 
+-PCREDIR=/usr/local
++PCREDIR=${LOCALBASE}
+ 
+ # This is for OpenBSD 3.0
+ COPTS.openbsd = -DENABLE_POLL
+@@ -46,7 +46,7 @@
+ 
+ # you can enable debug arguments with "DEBUG=-g" or disable them with "DEBUG="
+ #DEBUG = -g -DDEBUG_MEMORY -DDEBUG_FULL
+-DEBUG = -g
++#DEBUG = -g
+ 
+ # 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
+@@ -54,7 +54,7 @@
+ # will avoid the additionnal paramters to overflow a page. 8030 bytes is
+ # exactly 5.5 TCP segments of 1460 bytes.
+ #SMALL_OPTS =
+-SMALL_OPTS = -DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024
++#SMALL_OPTS = -DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024
+ 
+ # redefine this if you want to add some special PATH to include/libs
+ ADDINC =
+@@ -65,7 +65,7 @@
+ # - use -DSTATTIME=0 to disable statistics, else specify an interval in
+ #   milliseconds.
+ # - use -DTPROXY to compile with transparent proxy support.
+-DEFINE = -DSTATTIME=0 -DTPROXY
++#DEFINE = -DSTATTIME=0 -DTPROXY
+ 
+ # global options
+ TARGET_OPTS=$(COPTS.$(TARGET))
+@@ -75,13 +75,13 @@
+ COPTS=-I. $(ADDINC) $(CPU_OPTS) $(TARGET_OPTS) $(REGEX_OPTS) $(SMALL_OPTS) $(DEFINE)
+ LIBS=$(LIBS.$(TARGET)) $(LIBS.$(REGEX)) $(ADDLIB)
+ 
+-CFLAGS = -Wall $(COPTS) $(DEBUG)
+-LDFLAGS = -g
++CFLAGS+= -Wall $(COPTS)
++LDFLAGS+= #-g /lib/crt0.o  -lc 
+ 
+ all: haproxy
+ 
+ haproxy: src/list.o src/chtbl.o src/hashpjw.o haproxy.o src/base64.o src/uri_auth.o
+-	$(LD) $(LDFLAGS) -o $@ $> $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $> $(LIBS)
+ 
+ src/base64.o:	src/base64.c
+ 	$(CC) $(CFLAGS) -c -o $@ $<