- Complete repo-copy by updating to the devel 1.3.12.

PR:		ports/112934
Submitted by:	Hugo Saro <hugo@barafranca.com> (maintainer)
Approved by:	pav (portmgr, in mentor's absence)

4 files changed, 56 insertions, 53 deletions

diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index 113004520a49..9466147c86dd 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -1,63 +1,43 @@
-# New ports collection Makefile for:	haproxy
-# Date created:				Apr 30, 2003
-# Whom:					Clement Laforet
+# New ports collection makefile for:    haproxy-devel
+# Date created:         Thu May  3 16:30:19 WEST 2007
+# Whom:                 Hugo Saro <hugo@barafranca.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	haproxy
-PORTVERSION=	1.2.16
-PORTREVISION=	1
-CATEGORIES=	net www
-MASTER_SITES=	http://haproxy.1wt.eu/download/1.2/src/
+PORTVERSION=	1.3.12
+CATEGORIES=	net
+MASTER_SITES=	http://haproxy.1wt.eu/download/1.3/src/
+PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	clement@FreeBSD.org
-COMMENT=	High-performance and highly-robust TCP/HTTP load balancer
+MAINTAINER=	hugo@barafranca.com
+COMMENT=	The Reliable, High Performance TCP/HTTP Load Balancer
 
-USE_RC_SUBR=	haproxy.sh
-
-STATS_INTERVAL?=	0
-CFLAGS+=	-DSTATTIME=${STATS_INTERVAL}
-
-.if defined(WITH_TPROXY)
-CFLAGS+=	-DTPROXY
-.endif
-
-.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
+CONFLICTS=	haproxy-1.2*
+USE_RC_SUBR=	haproxy
 
 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} ""
-
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
+	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} design-thoughts ${DOCSDIR}/)
+	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} internals ${DOCSDIR}/)
 	@${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg \
-			${EXAMPLESDIR}/haproxy.cfg
+				${LOCALBASE}/etc/haproxy.conf-dist
 .endif
 
 post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "haproxy ${PORTVERSION} is now installed."
+	@${ECHO_MSG} "To configure it, rename ${LOCALBASE}/etc/haproxy.conf-dist"
+	@${ECHO_MSG} "and add haproxy_enable=\"YES\" to /etc/rc.conf"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/net/haproxy-devel/distinfo b/net/haproxy-devel/distinfo
index 1a06fc6b8296..2ab25fa550e0 100644
--- a/net/haproxy-devel/distinfo
+++ b/net/haproxy-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (haproxy-1.2.16.tar.gz) = f72c44bcddf868edf4000503be09a12d
-SHA256 (haproxy-1.2.16.tar.gz) = c8635aaf761f3bb74676d6cbc1ebb415cdcebebcdb46261a737a7d69c4251f2f
-SIZE (haproxy-1.2.16.tar.gz) = 197867
+MD5 (haproxy-1.3.12.tar.gz) = cdff6845362b29f9b2be4c207aa1fbb1
+SHA256 (haproxy-1.3.12.tar.gz) = 6fc6a48ed67ef10ba860f8a16a27d7de1d8499c331aa8037ea129c230caf141b
+SIZE (haproxy-1.3.12.tar.gz) = 355376
diff --git a/net/haproxy-devel/pkg-descr b/net/haproxy-devel/pkg-descr
index 4da1ab8c8502..cb0bb8d9e0d3 100644
--- a/net/haproxy-devel/pkg-descr
+++ b/net/haproxy-devel/pkg-descr
@@ -1,8 +1,8 @@
-HAproxy is a high-performance and highly-robust TCP/HTTP load balancer which 
-provides cookie-based persistence, automatic failover, header insertion, 
-deletion, modification on the fly, advanced logging contents to help trouble- 
-shooting buggy applications and/or networks, and a few other features. It uses 
-its own state machine to achieve up to ten thousands hits per second on modern 
+HAproxy is a high-performance and highly-robust TCP/HTTP load balancer which
+provides cookie-based persistence, automatic failover, header insertion,
+deletion, modification on the fly, advanced logging contents to help trouble-
+shooting buggy applications and/or networks, and a few other features. It uses
+its own state machine to achieve up to ten thousands hits per second on modern
 hardware, even with thousands simultaneous connections.
 
 WWW: http://haproxy.1wt.eu/
diff --git a/net/haproxy-devel/pkg-plist b/net/haproxy-devel/pkg-plist
index 6431f584ff60..b6620605f7ed 100644
--- a/net/haproxy-devel/pkg-plist
+++ b/net/haproxy-devel/pkg-plist
@@ -1,7 +1,30 @@
 sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/architecture.txt
+%%PORTDOCS%%%%DOCSDIR%%/gpl.txt
+%%PORTDOCS%%%%DOCSDIR%%/lgpl.txt
 %%PORTDOCS%%%%DOCSDIR%%/haproxy-en.txt
 %%PORTDOCS%%%%DOCSDIR%%/haproxy-fr.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/haproxy.cfg
+%%PORTDOCS%%%%DOCSDIR%%/tcp-splicing.txt
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends-v0.txt
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends.txt
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/be-fe-changes.txt
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/buffers.fig
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/config-language.txt
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/cttproxy-changes.txt
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/how-it-works.txt
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http_load_time.url
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/sess_par_sec.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/header-parser-speed.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/header-tree.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/http-docs.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/http-parsing.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/naming.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/repartition-be-fe-fi.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/stats-v2.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/todo.cttproxy
+etc/haproxy.conf-dist
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/design-thoughts
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/internals
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%