Attachment #158076 for bug #195916





PORTNAME=	nginx
PORTVERSION=	1.8.0
PORTREVISION=	3
PORTEPOCH=	2
CATEGORIES=	www
MASTER_SITES=	http://nginx.org/download/

.endif

NGINX_VARDIR?=	/var
NGINX_LOGDIR?=	${NGINX_VARDIR}/log/nginx
NGINX_RUNDIR?=	${NGINX_VARDIR}/run
NGINX_TMPDIR?=	${NGINX_VARDIR}/tmp/nginx
HTTP_PORT?=	80

NGINX_ACCESSLOG?=	${NGINX_LOGDIR}/access.log
NGINX_ERRORLOG?=	${NGINX_LOGDIR}/error.log

CONFLICTS?=	nginx-devel-1.*
USE_RC_SUBR=	nginx

EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
.endif

PLIST_SUB+=	NGINX_LOGDIR=${NGINX_LOGDIR} NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}

USERS?=	${WWWOWN}
GROUPS?=${WWWGRP}

do-install:
	${MKDIR} ${STAGEDIR}${ETCDIR}
	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
	${MKDIR} ${STAGEDIR}${NGINX_LOGDIR}
	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
.for i in koi-utf koi-win win-utf
	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}

Lines 25-28 Link Here

(-)www/nginx/pkg-plist (+1 lines)
25	%%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi	25	%%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
26	sbin/nginx	26	sbin/nginx
27	@dir %%NGINX_TMPDIR%%	27	@dir %%NGINX_TMPDIR%%
		28	@dir %%NGINX_LOGDIR%%
28	man/man8/nginx.8.gz	29	man/man8/nginx.8.gz

Return to bug 195916

Lines 3-9 Link Here

(-)www/nginx/Makefile (-5 / +6 lines)
3		3
4	PORTNAME= nginx	4	PORTNAME= nginx
5	PORTVERSION= 1.8.0	5	PORTVERSION= 1.8.0
6	PORTREVISION= 2	6	PORTREVISION= 3
7	PORTEPOCH= 2	7	PORTEPOCH= 2
8	CATEGORIES= www	8	CATEGORIES= www
9	MASTER_SITES= http://nginx.org/download/	9	MASTER_SITES= http://nginx.org/download/
Lines 212-224 Link Here
212	.endif	212	.endif
213		213
214	NGINX_VARDIR?= /var	214	NGINX_VARDIR?= /var
215	NGINX_LOGDIR?= ${NGINX_VARDIR}/log	215	NGINX_LOGDIR?= ${NGINX_VARDIR}/log/nginx
216	NGINX_RUNDIR?= ${NGINX_VARDIR}/run	216	NGINX_RUNDIR?= ${NGINX_VARDIR}/run
217	NGINX_TMPDIR?= ${NGINX_VARDIR}/tmp/nginx	217	NGINX_TMPDIR?= ${NGINX_VARDIR}/tmp/nginx
218	HTTP_PORT?= 80	218	HTTP_PORT?= 80
219		219
220	NGINX_ACCESSLOG?= ${NGINX_LOGDIR}/nginx-access.log	220	NGINX_ACCESSLOG?= ${NGINX_LOGDIR}/access.log
221	NGINX_ERRORLOG?= ${NGINX_LOGDIR}/nginx-error.log	221	NGINX_ERRORLOG?= ${NGINX_LOGDIR}/error.log
222		222
223	CONFLICTS?= nginx-devel-1.*	223	CONFLICTS?= nginx-devel-1.*
224	USE_RC_SUBR= nginx	224	USE_RC_SUBR= nginx
Lines 871-877 Link Here
871	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config	871	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
872	.endif	872	.endif
873		873
874	PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}	874	PLIST_SUB+= NGINX_LOGDIR=${NGINX_LOGDIR} NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
875		875
876	USERS?= ${WWWOWN}	876	USERS?= ${WWWOWN}
877	GROUPS?=${WWWGRP}	877	GROUPS?=${WWWGRP}
Lines 987-992 Link Here
987	do-install:	987	do-install:
988	${MKDIR} ${STAGEDIR}${ETCDIR}	988	${MKDIR} ${STAGEDIR}${ETCDIR}
989	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}	989	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
		990	${MKDIR} ${STAGEDIR}${NGINX_LOGDIR}
990	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin	991	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
991	.for i in koi-utf koi-win win-utf	992	.for i in koi-utf koi-win win-utf
992	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}	993	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}