ports/183589: [PATCH] www/nginx: STAGEDIR support

[Ilya Bakulin]

>Number:         183589
>Category:       ports
>Synopsis:       [PATCH] www/nginx: STAGEDIR support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 02 12:30:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Ilya Bakulin
>Release:        FreeBSD 9.1-RELEASE-p7 amd64
>Organization:
Deglitch Networks
>Environment:
System: FreeBSD olymp.kibab.com 9.1-RELEASE-p7 FreeBSD 9.1-RELEASE-p7 #0: Mon Sep  9 21:34:37 UTC
>Description:
Support STAGEDIR to build a package without installing the port in the system.

Port maintainer (osa at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- nginx-1.4.3,1.patch begins here ---
diff -ruN /stor0/jails/basejail/usr/ports//www/nginx/Makefile ./Makefile
--- /stor0/jails/basejail/usr/ports//www/nginx/Makefile	2013-10-26 15:39:37.000000000 +0200
+++ ./Makefile	2013-11-02 12:51:45.000000000 +0100
@@ -193,7 +193,6 @@
 
 WANT_GNOME=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPASSENGER}
@@ -987,40 +986,40 @@
 	@cd ${WRKSRC} && ${MAKE}
 
 do-install:
-	${MKDIR} ${ETCDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${PREFIX}/sbin
+	${MKDIR} ${STAGEDIR}/${ETCDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}/${PREFIX}/sbin
 .for i in koi-utf koi-win win-utf
-	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}/${ETCDIR}
 .endfor
 .for i in fastcgi_params mime.types nginx.conf scgi_params uwsgi_params
-	[ -f ${ETCDIR}/${i} ] || \
-		${INSTALL_DATA} ${WRKSRC}/conf/${i} ${ETCDIR}
-	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${ETCDIR}/${i}-dist
+	[ -f ${STAGEDIR}/${ETCDIR}/${i} ] || \
+		${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}/${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}/${ETCDIR}/${i}-dist
 .endfor
 .if !empty(PORT_OPTIONS:MHTTP) && !empty(PORT_OPTIONS:MWWW)
-	${MKDIR} ${PREFIX}/www/nginx-dist
+	${MKDIR} ${STAGEDIR}/${PREFIX}/www/nginx-dist
 .for i in index.html 50x.html
-	${INSTALL_DATA} ${WRKSRC}/html/${i} ${PREFIX}/www/nginx-dist
+	${INSTALL_DATA} ${WRKSRC}/html/${i} ${STAGEDIR}/${PREFIX}/www/nginx-dist
 .endfor
-	${ECHO_CMD} "" >>${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
-	[ -e ${PREFIX}/www/nginx ] || \
-		${LN} -sf ${PREFIX}/www/nginx-dist ${PREFIX}/www/nginx
+	${ECHO_CMD} "" >>${STAGEDIR}/${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
+	[ -e ${STAGEDIR}/${PREFIX}/www/nginx ] || \
+		${LN} -sf ${STAGEDIR}/${PREFIX}/www/nginx-dist ${STAGEDIR}/${PREFIX}/www/nginx
 .endif
 
 .if !empty(PORT_OPTIONS:MHTTP) && !empty(PORT_OPTIONS:MHTTP_PERL)
-	${MKDIR} ${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx
+	${MKDIR} ${STAGEDIR}/${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \
-		${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx
+		${STAGEDIR}/${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx
 	${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.bs \
-		${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx
+		${STAGEDIR}/${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx
 	${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
-		${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/
+		${STAGEDIR}/${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/
 .endif
 
 .if ${PORT_OPTIONS:MNAXSI}
 	${INSTALL_DATA} \
 	${WRKDIR}/naxsi-core-${NGINX_NAXSI_VERSION}/naxsi_config/naxsi_core.rules \
-	${ETCDIR}
+	${STAGEDIR}/${ETCDIR}
 .endif
 
 post-install:
@@ -1031,7 +1030,7 @@
 	${ECHO_CMD} @dirrm ${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx >> ${TMPPLIST}
 .endif
 .if !defined(NO_INSTALL_MANPAGES)
-	@${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${MAN8PREFIX}/man/man8
+	@${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}/${MAN8PREFIX}/man/man8
 .endif
 
 .if ${PORT_OPTIONS:MNAXSI}
--- nginx-1.4.3,1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: