4 files changed, 30 insertions, 80 deletions

diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index 8d0116ff012e..2ecbdf625d62 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	haproxy
-PORTVERSION=	1.1.21
-PORTREVISION=	0
+PORTVERSION=	1.1.24
 CATEGORIES=	net www
 MASTER_SITES=	http://w.ods.org/tools/haproxy/ \
 		http://w.ods.org/tools/haproxy/old/
@@ -15,30 +14,49 @@ MASTER_SITES=	http://w.ods.org/tools/haproxy/ \
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	High-performance and highly-robust TCP/HTTP load balancer
 
+USE_REINPLACE=	yes
+
 STATS_INTERVAL?= 0
-REGEX_TYPE?=	libc
+CFLAGS+=	-DSTATTIME=${STATS_INTERVAL}
 
-MAKE_ENV+=	REGEX=${REGEX_TYPE} INTERVAL=${STATS_INTERVAL}
+.if defined(WITH_TPROXY)
+CFLAGS+=	-DTPROXY
+.endif
 
 .if defined(WITH_PCRE)
-REGEX_TYPE=	pcre
 PKGNAMESUFFIX=	-pcre
 LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
+CFLAGS+=	-DUSE_PCRE -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lpcreposix -lpcre
 .endif
 
 pre-fetch:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Available options:"
 	@${ECHO_MSG} "WITH_PCRE:            Use pcre regex engine"
+	@${ECHO_MSG} "WITH_DTPROXY:         Enable Transparent proxy support"
 	@${ECHO_MSG} "STATS_INTERVAL=###:   Statistics interval in milliseconds,"
 	@${ECHO_MSG} "                         (default to 0, disabled)"
 	@${ECHO_MSG} ""
 
+post-patch:
+	@${REINPLACE_CMD} -e 's!localtime(!localtime((time_t *)!' ${WRKSRC}/haproxy.c
+
+do-build:
+	@(cd ${WRKSRC} ;\
+	echo "Compiling haproxy:" ; \
+	echo "${CC} ${CFLAGS} ${LDFLAGS} ${PORTNAME}.c -o ${PORTNAME}" ;\
+	${CC} ${CFLAGS} ${LDFLAGS} ${PORTNAME}.c -o ${PORTNAME} )
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg \
+	@${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin
+	@${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg \
 			${PREFIX}/etc/haproxy.cfg.sample
-	${INSTALL_SCRIPT} ${FILESDIR}/haproxy.sh \
+	@${INSTALL_SCRIPT} ${FILESDIR}/haproxy.sh \
 			${PREFIX}/etc/rc.d/haproxy.sh.sample
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/net/haproxy-devel/distinfo b/net/haproxy-devel/distinfo
index 29d53b11d553..dab721a97a69 100644
--- a/net/haproxy-devel/distinfo
+++ b/net/haproxy-devel/distinfo
@@ -1 +1 @@
-MD5 (haproxy-1.1.21.tar.gz) = 181d68471dd02c63c5a3dc65e9d6cdfe
+MD5 (haproxy-1.1.24.tar.gz) = 3ddd10a8bf6e415eaa32851c39c2b67c
diff --git a/net/haproxy-devel/files/patch-Makefile b/net/haproxy-devel/files/patch-Makefile
index dba4715d5658..e69de29bb2d1 100644
--- a/net/haproxy-devel/files/patch-Makefile
+++ b/net/haproxy-devel/files/patch-Makefile
@@ -1,71 +0,0 @@
---- Makefile.orig	Tue May  6 00:11:59 2003
-+++ Makefile	Tue Jun  3 16:22:55 2003
-@@ -1,22 +1,21 @@
- # Select target OS. TARGET must match a system for which COPTS and LIBS are
- # correctly defined below.
- # You can set it on make's command line. eg: make TARGET=solaris
--TARGET = linux24
-+#TARGET = linux24
- #TARGET = linux22
- #TARGET = solaris
- #TARGET = solarisv9
- #TARGET = openbsd
--
--CC = gcc
--LD = gcc
-+TARGET = FreeBSD
- 
- # By default, we use libc's regex.
--REGEX=libc
-+#REGEX=libc
- #REGEX=pcre
- 
- # This is the directory hosting include/pcre.h and lib/libpcre.* when REGEX=pcre
--PCREDIR	:= $(shell pcre-config --prefix 2>/dev/null || :)
-+#PCREDIR	:= $(shell pcre-config --prefix 2>/dev/null || :)
- #PCREDIR=/usr/local
-+PCREDIR=${LOCALBASE}
- 
- # This is for Linux 2.4 with netfilter
- COPTS.linux24 = -O2 -DNETFILTER
-@@ -38,14 +37,17 @@
- COPTS.openbsd = -O2
- LIBS.openbsd =
- 
-+COPTS.FreeBSD = -O2
-+LIBS.FreeBSD =
-+
- COPTS.libc=
- LIBS.libs=
- 
- COPTS.pcre=-DUSE_PCRE -I$(PCREDIR)/include
- LIBS.pcre=-L$(PCREDIR)/lib -lpcreposix -lpcre
- 
--#DEBUG =
--DEBUG = -g
-+DEBUG =
-+#DEBUG = -g
- 
- COPTS=$(COPTS.$(TARGET)) $(COPTS.$(REGEX))
- LIBS=$(LIBS.$(TARGET)) $(LIBS.$(REGEX))
-@@ -53,16 +55,13 @@
- # - use -DSTATTIME=0 to disable statistics, else specify an interval in
- #   milliseconds.
- # - use -DTPROXY to compile with transparent proxy support.
--CFLAGS = -Wall $(COPTS) $(DEBUG) -DSTATTIME=0 -DTPROXY
--LDFLAGS = -g
-+CFLAGS+= -Wall $(COPTS) $(DEBUG) -DSTATTIME=$(INTERVAL)
-+LDFLAGS+= 
- 
- all: haproxy
- 
--haproxy: haproxy.o
--	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
--
--%.o:	%.c
--	$(CC) $(CFLAGS) -c -o $@ $<
-+haproxy: 
-+	$(CC) $(CFLAGS) haproxy.c $(LIBS) $(LDFLAGS) -o haproxy
- 
- clean:
- 	rm -f *.[oas] *~ core haproxy test nohup.out gmon.out
diff --git a/net/haproxy-devel/pkg-plist b/net/haproxy-devel/pkg-plist
index 06889061006d..fd8b17619ca1 100644
--- a/net/haproxy-devel/pkg-plist
+++ b/net/haproxy-devel/pkg-plist
@@ -1,3 +1,6 @@
 sbin/haproxy
 etc/haproxy.cfg.sample
 etc/rc.d/haproxy.sh.sample
+%%PORTDOCS%%%%DOCSDIR%%/haproxy-en.txt
+%%PORTDOCS%%%%DOCSDIR%%/haproxy-fr.txt
+@dirrm %%DOCSDIR%%