Index: UIDs
===================================================================
--- UIDs	(revision 383645)
+++ UIDs	(working copy)
@@ -317,5 +317,6 @@
 emby:*:989:989::0:0:Emby:/nonexistent:/usr/sbin/nologin
 oozie:*:990:990::0:0:Apache Oozie user:/nonexistent:/usr/sbin/nologin
 sguil:*:991:991::0:0:Sguil:/nonexistent:/usr/sbin/nologin
+haproxy:*:992:992::0:0:HAProxy:/nonexistent:/usr/sbin/nologin
 ebnetd:*:999:999::0:0:EBNETD:/nonexistent:/usr/sbin/nologin
 nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin
Index: GIDs
===================================================================
--- GIDs	(revision 383645)
+++ GIDs	(working copy)
@@ -308,6 +308,7 @@
 emby:*:989:
 oozie:*:990:
 sguil:*:991:
+haproxy:*:992:
 ebnetd:*:999:
 nogroup:*:65533:
 nobody:*:65534:
Index: net/haproxy/Makefile
===================================================================
--- net/haproxy/Makefile	(revision 383424)
+++ net/haproxy/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	haproxy
 PORTVERSION=	1.5.11
+PORTREVISION=	1
 CATEGORIES=	net www
 MASTER_SITES=	http://www.haproxy.org/download/1.5/src/
 
@@ -17,6 +18,9 @@
 USES=		cpe gmake
 USE_RC_SUBR=	haproxy
 
+USERS=	haproxy
+GROUPS=	haproxy
+
 OPTIONS_DEFINE=		DOCS EXAMPLES OPENSSL
 OPTIONS_RADIO=		PCRE
 OPTIONS_RADIO_PCRE=	DPCRE SPCRE
@@ -43,6 +47,10 @@
 MAKE_ARGS+=	USE_OPENSSL=1
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -i "" -e "s|uid 99|uid 992|" -e "s|gid 99|gid 992|" \
+		-e "s|/usr/share/haproxy|/var/empty|" ${WRKSRC}/examples/haproxy.cfg
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${STAGEDIR}${PREFIX}/sbin/
 	${INSTALL_MAN} ${WRKSRC}/doc/haproxy.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
@@ -50,5 +58,6 @@
 	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
+	${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg ${STAGEDIR}${PREFIX}/etc/haproxy.conf.sample
 
 .include <bsd.port.mk>
Index: net/haproxy/pkg-plist
===================================================================
--- net/haproxy/pkg-plist	(revision 383424)
+++ net/haproxy/pkg-plist	(working copy)
@@ -1,3 +1,4 @@
+@sample etc/haproxy.conf.sample
 man/man1/haproxy.1.gz
 sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/acl.fig