Attachment #163668 for bug #195916





PORTNAME=	nginx
PORTVERSION=	1.8.0
PORTREVISION=	4
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_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} NGINX_LOGDIR=${NGINX_LOGDIR}

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= 3	6	PORTREVISION= 4
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 216-228 Link Here
216	.endif	216	.endif
217		217
218	NGINX_VARDIR?= /var	218	NGINX_VARDIR?= /var
219	NGINX_LOGDIR?= ${NGINX_VARDIR}/log	219	NGINX_LOGDIR?= ${NGINX_VARDIR}/log/nginx
220	NGINX_RUNDIR?= ${NGINX_VARDIR}/run	220	NGINX_RUNDIR?= ${NGINX_VARDIR}/run
221	NGINX_TMPDIR?= ${NGINX_VARDIR}/tmp/nginx	221	NGINX_TMPDIR?= ${NGINX_VARDIR}/tmp/nginx
222	HTTP_PORT?= 80	222	HTTP_PORT?= 80
223		223
224	NGINX_ACCESSLOG?= ${NGINX_LOGDIR}/nginx-access.log	224	NGINX_ACCESSLOG?= ${NGINX_LOGDIR}/access.log
225	NGINX_ERRORLOG?= ${NGINX_LOGDIR}/nginx-error.log	225	NGINX_ERRORLOG?= ${NGINX_LOGDIR}/error.log
226		226
227	CONFLICTS?= nginx-devel-1.*	227	CONFLICTS?= nginx-devel-1.*
228	USE_RC_SUBR= nginx	228	USE_RC_SUBR= nginx
Lines 896-902 Link Here
896	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config	896	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
897	.endif	897	.endif
898		898
899	PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}	899	PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} NGINX_LOGDIR=${NGINX_LOGDIR}
900		900
901	USERS?= ${WWWOWN}	901	USERS?= ${WWWOWN}
902	GROUPS?=${WWWGRP}	902	GROUPS?=${WWWGRP}
Lines 1017-1022 Link Here
1017	do-install:	1017	do-install:
1018	${MKDIR} ${STAGEDIR}${ETCDIR}	1018	${MKDIR} ${STAGEDIR}${ETCDIR}
1019	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}	1019	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
		1020	${MKDIR} ${STAGEDIR}${NGINX_LOGDIR}
1020	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin	1021	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
1021	.for i in koi-utf koi-win win-utf	1022	.for i in koi-utf koi-win win-utf
1022	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}	1023	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}