Index: head/net/haproxy/Makefile
===================================================================
--- head/net/haproxy/Makefile	(revision 331260)
+++ head/net/haproxy/Makefile	(revision 331261)
@@ -1,58 +1,49 @@
 # Created by: Clement Laforet
 # $FreeBSD$
 
 PORTNAME=	haproxy
 PORTVERSION=	1.4.24
 CATEGORIES=	net www
 MASTER_SITES=	http://haproxy.1wt.eu/download/1.4/src/
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	The Reliable, High Performance TCP/HTTP Load Balancer
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 CONFLICTS=	haproxy-devel-[0-9]*
 
 USES=		gmake
 USE_RC_SUBR=	haproxy
 SUB_FILES=	pkg-message
-MAN1=		haproxy.1
 
 OPTIONS_DEFINE=	PCRE
 OPTIONS_SINGLE=		PCRE
 OPTIONS_SINGLE_PCRE=	DPCRE SPCRE
 DPCRE_DESC=	Link dynamically
 SPCRE_DESC=	Link statically
 OPTIONS_DEFAULT=PCRE DPCRE
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEBSD_PORTS CC=${CC}
 
 .if ${PORT_OPTIONS:MDPCRE}
 LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
 MAKE_ARGS+=	"USE_PCRE=1"
 .endif
 .if ${PORT_OPTIONS:MSPCRE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
 MAKE_ARGS+=	"USE_STATIC_PCRE=1"
 .endif
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin/
-	@${INSTALL_MAN} ${WRKSRC}/doc/haproxy.1 ${MAN1PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${STAGEDIR}${PREFIX}/sbin/
+	${INSTALL_MAN} ${WRKSRC}/doc/haproxy.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
Index: head/net/haproxy/pkg-plist
===================================================================
--- head/net/haproxy/pkg-plist	(revision 331260)
+++ head/net/haproxy/pkg-plist	(revision 331261)
@@ -1,71 +1,72 @@
+man/man1/haproxy.1.gz
 sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/acl.fig
 %%PORTDOCS%%%%DOCSDIR%%/architecture.txt
 %%PORTDOCS%%%%DOCSDIR%%/configuration.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%%/gpl.txt
 %%PORTDOCS%%%%DOCSDIR%%/haproxy-en.txt
 %%PORTDOCS%%%%DOCSDIR%%/haproxy-fr.txt
 %%PORTDOCS%%%%DOCSDIR%%/haproxy.1
 %%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/connection-header.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/header-parser-speed.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/header-tree.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/http-cookies.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/stream-sock-states.fig
 %%PORTDOCS%%%%DOCSDIR%%/internals/todo.cttproxy
 %%PORTDOCS%%%%DOCSDIR%%/lgpl.txt
 %%PORTDOCS%%%%DOCSDIR%%/queuing.fig
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl-content-sw.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/build.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/check
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/check.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.rc.haproxy
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/content-sw-sample.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cttproxy-src.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug2ansi
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug2html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/debugfind
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/400.http
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/403.http
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/408.http
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/500.http
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/502.http
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/503.http
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/504.http
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy-1.1.21-flx.1.pkg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.init
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.spec
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.vim
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/init.haproxy
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/init.haproxy.flx0
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/linux-2.4.21-40.EL-custom.diff
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/option-http_proxy.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rc.highsock
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stats_haproxy.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tarpit.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-section-kw.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/url-switching.cfg
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/errorfiles
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/internals
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/design-thoughts
 %%PORTDOCS%%@dirrm %%DOCSDIR%%