Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Oct 2013 12:55:02 +0000 (UTC)
From:      Dmitry Sivachenko <demon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r331261 - head/net/haproxy
Message-ID:  <201310221255.r9MCt2kN078290@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: demon
Date: Tue Oct 22 12:55:01 2013
New Revision: 331261
URL: http://svnweb.freebsd.org/changeset/ports/331261

Log:
  Support staging.

Modified:
  head/net/haproxy/Makefile
  head/net/haproxy/pkg-plist

Modified: head/net/haproxy/Makefile
==============================================================================
--- head/net/haproxy/Makefile	Tue Oct 22 12:41:30 2013	(r331260)
+++ head/net/haproxy/Makefile	Tue Oct 22 12:55:01 2013	(r331261)
@@ -17,7 +17,6 @@ CONFLICTS=	haproxy-devel-[0-9]*
 USES=		gmake
 USE_RC_SUBR=	haproxy
 SUB_FILES=	pkg-message
-MAN1=		haproxy.1
 
 OPTIONS_DEFINE=	PCRE
 OPTIONS_SINGLE=		PCRE
@@ -26,7 +25,6 @@ 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}
@@ -41,18 +39,11 @@ 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>

Modified: head/net/haproxy/pkg-plist
==============================================================================
--- head/net/haproxy/pkg-plist	Tue Oct 22 12:41:30 2013	(r331260)
+++ head/net/haproxy/pkg-plist	Tue Oct 22 12:55:01 2013	(r331261)
@@ -1,3 +1,4 @@
+man/man1/haproxy.1.gz
 sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/acl.fig
 %%PORTDOCS%%%%DOCSDIR%%/architecture.txt



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310221255.r9MCt2kN078290>