Attachment #171499 for bug #195916





PORTNAME=	nginx
PORTVERSION=	1.10.1
PORTREVISION=	1
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}


post-patch:
	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
		s!%%PREFIX%%!${PREFIX}!; \
		s!%%NGINX_ERRORLOG%%!${NGINX_ERRORLOG}!' \
		${WRKSRC}/conf/nginx.conf
.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
	@${REINPLACE_CMD} \

	${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}




--- conf/nginx.conf.orig	2016-05-31 13:47:01 UTC
+++ conf/nginx.conf
@@ -2,9 +2,14 @@
 #user  nobody;
 worker_processes  1;
 
-#error_log  logs/error.log;
-#error_log  logs/error.log  notice;
-#error_log  logs/error.log  info;
+# This default error log path is compiled-in to make sure configuration parsing
+# errors are logged somewhere, especially during unattended boot when stderr
+# isn't normally logged anywhere. This path will be touched on every nginx
+# start regardless of error log location configured here. See
+# https://trac.nginx.org/nginx/ticket/147 for more info. 
+#
+#error_log  %%NGINX_ERRORLOG%%;
+#
 
 #pid        logs/nginx.pid;
 
@@ -33,7 +38,7 @@ http {
     #gzip  on;
 
     server {

         server_name  localhost;
 
         #charset koi8-r;
@@ -41,7 +46,7 @@ http {
         #access_log  logs/host.access.log  main;
 
         location / {

             index  index.html index.htm;
         }
 
@@ -51,7 +56,7 @@ http {
         #
         error_page   500 502 503 504  /50x.html;
         location = /50x.html {

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-8 Link Here

(-)www/nginx/Makefile (-7 / +10 lines)
3		3
4	PORTNAME= nginx	4	PORTNAME= nginx
5	PORTVERSION= 1.10.1	5	PORTVERSION= 1.10.1
		6	PORTREVISION= 1
6	PORTEPOCH= 2	7	PORTEPOCH= 2
7	CATEGORIES= www	8	CATEGORIES= www
8	MASTER_SITES= http://nginx.org/download/	9	MASTER_SITES= http://nginx.org/download/
Lines 244-256 Link Here
244	.endif	245	.endif
245		246
246	NGINX_VARDIR?= /var	247	NGINX_VARDIR?= /var
247	NGINX_LOGDIR?= ${NGINX_VARDIR}/log	248	NGINX_LOGDIR?= ${NGINX_VARDIR}/log/nginx
248	NGINX_RUNDIR?= ${NGINX_VARDIR}/run	249	NGINX_RUNDIR?= ${NGINX_VARDIR}/run
249	NGINX_TMPDIR?= ${NGINX_VARDIR}/tmp/nginx	250	NGINX_TMPDIR?= ${NGINX_VARDIR}/tmp/nginx
250	HTTP_PORT?= 80	251	HTTP_PORT?= 80
251		252
252	NGINX_ACCESSLOG?= ${NGINX_LOGDIR}/nginx-access.log	253	NGINX_ACCESSLOG?= ${NGINX_LOGDIR}/access.log
253	NGINX_ERRORLOG?= ${NGINX_LOGDIR}/nginx-error.log	254	NGINX_ERRORLOG?= ${NGINX_LOGDIR}/error.log
254		255
255	CONFLICTS?= nginx-devel-1.*	256	CONFLICTS?= nginx-devel-1.*
256	USE_RC_SUBR= nginx	257	USE_RC_SUBR= nginx
Lines 503-509 Link Here
503	.endif	504	.endif
504		505
505	.if ${PORT_OPTIONS:MHTTP_JSON_STATUS}	506	.if ${PORT_OPTIONS:MHTTP_JSON_STATUS}
506	NGINX_JSON_STATUS_VERSION= 1d2f303	507	NGINX_JSON_STATUS_VERSION= 1d2f303
507	GH_ACCOUNT+= nginx-modules:json_status	508	GH_ACCOUNT+= nginx-modules:json_status
508	GH_PROJECT+= ngx_http_json_status_module:json_status	509	GH_PROJECT+= ngx_http_json_status_module:json_status
509	GH_TAGNAME+= ${NGINX_JSON_STATUS_VERSION}:json_status	510	GH_TAGNAME+= ${NGINX_JSON_STATUS_VERSION}:json_status
Lines 653-659 Link Here
653	.endif	654	.endif
654		655
655	.if ${PORT_OPTIONS:MHTTP_UPLOAD}	656	.if ${PORT_OPTIONS:MHTTP_UPLOAD}
656	GIT_UPLOAD_VERSION= aba1e3f34c	657	GIT_UPLOAD_VERSION= aba1e3f34c
657	GH_ACCOUNT+= vkholodkov:upload	658	GH_ACCOUNT+= vkholodkov:upload
658	GH_PROJECT+= nginx-upload-module:upload	659	GH_PROJECT+= nginx-upload-module:upload
659	GH_TAGNAME+= ${GIT_UPLOAD_VERSION}:upload	660	GH_TAGNAME+= ${GIT_UPLOAD_VERSION}:upload
Lines 1103-1109 Link Here
1103	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config	1104	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
1104	.endif	1105	.endif
1105		1106
1106	PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}	1107	PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} NGINX_LOGDIR=${NGINX_LOGDIR}
1107		1108
1108	USERS?= ${WWWOWN}	1109	USERS?= ${WWWOWN}
1109	GROUPS?=${WWWGRP}	1110	GROUPS?=${WWWGRP}
Lines 1133-1139 Link Here
1133		1134
1134	post-patch:	1135	post-patch:
1135	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \	1136	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
1136	s!%%PREFIX%%!${PREFIX}!' \	1137	s!%%PREFIX%%!${PREFIX}!; \
		1138	s!%%NGINX_ERRORLOG%%!${NGINX_ERRORLOG}!' \
1137	${WRKSRC}/conf/nginx.conf	1139	${WRKSRC}/conf/nginx.conf
1138	.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}	1140	.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
1139	@${REINPLACE_CMD} \	1141	@${REINPLACE_CMD} \
Lines 1239-1244 Link Here
1239	${MKDIR} ${STAGEDIR}${MODULESDIR}	1241	${MKDIR} ${STAGEDIR}${MODULESDIR}
1240	.endif	1242	.endif
1241	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}	1243	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
		1244	${MKDIR} ${STAGEDIR}${NGINX_LOGDIR}
1242	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin	1245	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
1243	.for i in koi-utf koi-win win-utf	1246	.for i in koi-utf koi-win win-utf
1244	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}	1247	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}

Lines 1-6 Link Here

(-)www/nginx/files/patch-conf-nginx.conf (-5 / +23 lines)
1	--- conf/nginx.conf.orig Thu Jan 18 10:08:18 2007	1	--- conf/nginx.conf.orig 2016-05-31 13:47:01 UTC
2	+++ conf/nginx.conf Thu Jun 14 12:57:52 2007	2	+++ conf/nginx.conf
3	@@ -33,7 +33,7 @@	3	@@ -2,9 +2,14 @@
		4	#user nobody;
		5	worker_processes 1;
		6
		7	-#error_log logs/error.log;
		8	-#error_log logs/error.log notice;
		9	-#error_log logs/error.log info;
		10	+# This default error log path is compiled-in to make sure configuration parsing
		11	+# errors are logged somewhere, especially during unattended boot when stderr
		12	+# isn't normally logged anywhere. This path will be touched on every nginx
		13	+# start regardless of error log location configured here. See
		14	+# https://trac.nginx.org/nginx/ticket/147 for more info.
		15	+#
		16	+#error_log %%NGINX_ERRORLOG%%;
		17	+#
		18
		19	#pid logs/nginx.pid;
		20
		21	@@ -33,7 +38,7 @@ http {
4	#gzip on;	22	#gzip on;
5		23
6	server {	24	server {
Lines 9-15 Link Here
9	server_name localhost;	27	server_name localhost;
10		28
11	#charset koi8-r;	29	#charset koi8-r;
12	@@ -41,7 +41,7 @@	30	@@ -41,7 +46,7 @@ http {
13	#access_log logs/host.access.log main;	31	#access_log logs/host.access.log main;
14		32
15	location / {	33	location / {
Lines 18-24 Link Here
18	index index.html index.htm;	36	index index.html index.htm;
19	}	37	}
20		38
21	@@ -51,7 +51,7 @@	39	@@ -51,7 +56,7 @@ http {
22	#	40	#
23	error_page 500 502 503 504 /50x.html;	41	error_page 500 502 503 504 /50x.html;
24	location = /50x.html {	42	location = /50x.html {