Attachment #170746 for bug #195916





PORTNAME=	nginx
PORTVERSION=	1.10.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

.endif

.if ${PORT_OPTIONS:MHTTP_JSON_STATUS}
NGINX_JSON_STATUS_VERSION=	1d2f303
GH_ACCOUNT+=	nginx-modules:json_status
GH_PROJECT+=	ngx_http_json_status_module:json_status
GH_TAGNAME+=	${NGINX_JSON_STATUS_VERSION}:json_status

.endif

.if ${PORT_OPTIONS:MHTTP_UPLOAD}
GIT_UPLOAD_VERSION=	aba1e3f34c
GH_ACCOUNT+=	vkholodkov:upload
GH_PROJECT+=	nginx-upload-module:upload
GH_TAGNAME+=	${GIT_UPLOAD_VERSION}:upload

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}

	${MKDIR} ${STAGEDIR}${MODULESDIR}
.endif
	${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 15-18 Link Here

(-)www/nginx/pkg-plist (+1 lines)
15	%%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi	15	%%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
16	sbin/nginx	16	sbin/nginx
17	@dir %%NGINX_TMPDIR%%	17	@dir %%NGINX_TMPDIR%%
		18	@dir %%NGINX_LOGDIR%%
18	man/man8/nginx.8.gz	19	man/man8/nginx.8.gz

Return to bug 195916

Lines 3-9 Link Here

(-)www/nginx/Makefile (-7 / +8 lines)
3		3
4	PORTNAME= nginx	4	PORTNAME= nginx
5	PORTVERSION= 1.10.0	5	PORTVERSION= 1.10.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 245-257 Link Here
245	.endif	245	.endif
246		246
247	NGINX_VARDIR?= /var	247	NGINX_VARDIR?= /var
248	NGINX_LOGDIR?= ${NGINX_VARDIR}/log	248	NGINX_LOGDIR?= ${NGINX_VARDIR}/log/nginx
249	NGINX_RUNDIR?= ${NGINX_VARDIR}/run	249	NGINX_RUNDIR?= ${NGINX_VARDIR}/run
250	NGINX_TMPDIR?= ${NGINX_VARDIR}/tmp/nginx	250	NGINX_TMPDIR?= ${NGINX_VARDIR}/tmp/nginx
251	HTTP_PORT?= 80	251	HTTP_PORT?= 80
252		252
253	NGINX_ACCESSLOG?= ${NGINX_LOGDIR}/nginx-access.log	253	NGINX_ACCESSLOG?= ${NGINX_LOGDIR}/access.log
254	NGINX_ERRORLOG?= ${NGINX_LOGDIR}/nginx-error.log	254	NGINX_ERRORLOG?= ${NGINX_LOGDIR}/error.log
255		255
256	CONFLICTS?= nginx-devel-1.*	256	CONFLICTS?= nginx-devel-1.*
257	USE_RC_SUBR= nginx	257	USE_RC_SUBR= nginx
Lines 499-505 Link Here
499	.endif	499	.endif
500		500
501	.if ${PORT_OPTIONS:MHTTP_JSON_STATUS}	501	.if ${PORT_OPTIONS:MHTTP_JSON_STATUS}
502	NGINX_JSON_STATUS_VERSION= 1d2f303	502	NGINX_JSON_STATUS_VERSION= 1d2f303
503	GH_ACCOUNT+= nginx-modules:json_status	503	GH_ACCOUNT+= nginx-modules:json_status
504	GH_PROJECT+= ngx_http_json_status_module:json_status	504	GH_PROJECT+= ngx_http_json_status_module:json_status
505	GH_TAGNAME+= ${NGINX_JSON_STATUS_VERSION}:json_status	505	GH_TAGNAME+= ${NGINX_JSON_STATUS_VERSION}:json_status
Lines 649-655 Link Here
649	.endif	649	.endif
650		650
651	.if ${PORT_OPTIONS:MHTTP_UPLOAD}	651	.if ${PORT_OPTIONS:MHTTP_UPLOAD}
652	GIT_UPLOAD_VERSION= aba1e3f34c	652	GIT_UPLOAD_VERSION= aba1e3f34c
653	GH_ACCOUNT+= vkholodkov:upload	653	GH_ACCOUNT+= vkholodkov:upload
654	GH_PROJECT+= nginx-upload-module:upload	654	GH_PROJECT+= nginx-upload-module:upload
655	GH_TAGNAME+= ${GIT_UPLOAD_VERSION}:upload	655	GH_TAGNAME+= ${GIT_UPLOAD_VERSION}:upload
Lines 1099-1105 Link Here
1099	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config	1099	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
1100	.endif	1100	.endif
1101		1101
1102	PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}	1102	PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} NGINX_LOGDIR=${NGINX_LOGDIR}
1103		1103
1104	USERS?= ${WWWOWN}	1104	USERS?= ${WWWOWN}
1105	GROUPS?=${WWWGRP}	1105	GROUPS?=${WWWGRP}
Lines 1235-1240 Link Here
1235	${MKDIR} ${STAGEDIR}${MODULESDIR}	1235	${MKDIR} ${STAGEDIR}${MODULESDIR}
1236	.endif	1236	.endif
1237	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}	1237	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
		1238	${MKDIR} ${STAGEDIR}${NGINX_LOGDIR}
1238	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin	1239	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
1239	.for i in koi-utf koi-win win-utf	1240	.for i in koi-utf koi-win win-utf
1240	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}	1241	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}