View | Details | Raw Unified | Return to bug 212416
Collapse All | Expand All

(-)www/nginx-devel/Makefile (-7 / +10 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	nginx
4
PORTNAME=	nginx
5
PORTVERSION=	1.11.3
5
PORTVERSION=	1.11.3
6
PORTREVISION=	1
6
CATEGORIES=	www
7
CATEGORIES=	www
7
MASTER_SITES=	http://nginx.org/download/
8
MASTER_SITES=	http://nginx.org/download/
8
MASTER_SITES+=	LOCAL/osa
9
MASTER_SITES+=	LOCAL/osa
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-1.*
256
CONFLICTS?=	nginx-1.*
256
USE_RC_SUBR=	nginx
257
USE_RC_SUBR=	nginx
Lines 505-511 Link Here
505
.endif
506
.endif
506
507
507
.if ${PORT_OPTIONS:MHTTP_JSON_STATUS}
508
.if ${PORT_OPTIONS:MHTTP_JSON_STATUS}
508
NGINX_JSON_STATUS_VERSION= 1d2f303
509
NGINX_JSON_STATUS_VERSION=	1d2f303
509
GH_ACCOUNT+=	nginx-modules:json_status
510
GH_ACCOUNT+=	nginx-modules:json_status
510
GH_PROJECT+=	ngx_http_json_status_module:json_status
511
GH_PROJECT+=	ngx_http_json_status_module:json_status
511
GH_TAGNAME+=	${NGINX_JSON_STATUS_VERSION}:json_status
512
GH_TAGNAME+=	${NGINX_JSON_STATUS_VERSION}:json_status
Lines 658-664 Link Here
658
.endif
659
.endif
659
660
660
.if ${PORT_OPTIONS:MHTTP_UPLOAD}
661
.if ${PORT_OPTIONS:MHTTP_UPLOAD}
661
GIT_UPLOAD_VERSION= aba1e3f34c
662
GIT_UPLOAD_VERSION=	aba1e3f34c
662
GH_ACCOUNT+=	vkholodkov:upload
663
GH_ACCOUNT+=	vkholodkov:upload
663
GH_PROJECT+=	nginx-upload-module:upload
664
GH_PROJECT+=	nginx-upload-module:upload
664
GH_TAGNAME+=	${GIT_UPLOAD_VERSION}:upload
665
GH_TAGNAME+=	${GIT_UPLOAD_VERSION}:upload
Lines 1110-1116 Link Here
1110
EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
1111
EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
1111
.endif
1112
.endif
1112
1113
1113
PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
1114
PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} NGINX_LOGDIR=${NGINX_LOGDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
1114
1115
1115
USERS?=	${WWWOWN}
1116
USERS?=	${WWWOWN}
1116
GROUPS?=${WWWGRP}
1117
GROUPS?=${WWWGRP}
Lines 1140-1146 Link Here
1140
1141
1141
post-patch:
1142
post-patch:
1142
	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
1143
	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
1143
		s!%%PREFIX%%!${PREFIX}!' \
1144
		s!%%PREFIX%%!${PREFIX}!; \
1145
		s!%%NGINX_ERRORLOG%%!${NGINX_ERRORLOG}!' \
1144
		${WRKSRC}/conf/nginx.conf
1146
		${WRKSRC}/conf/nginx.conf
1145
.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
1147
.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
1146
	@${REINPLACE_CMD} \
1148
	@${REINPLACE_CMD} \
Lines 1246-1251 Link Here
1246
	${MKDIR} ${STAGEDIR}${MODULESDIR}
1248
	${MKDIR} ${STAGEDIR}${MODULESDIR}
1247
.endif
1249
.endif
1248
	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
1250
	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
1251
	${MKDIR} ${STAGEDIR}${NGINX_LOGDIR}
1249
	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
1252
	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
1250
.for i in koi-utf koi-win win-utf
1253
.for i in koi-utf koi-win win-utf
1251
	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}
1254
	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}
(-)www/nginx-devel/files/patch-conf-nginx.conf (-5 / +23 lines)
Lines 1-6 Link Here
1
--- conf/nginx.conf.orig	Thu Jan 18 10:08:18 2007
1
--- conf/nginx.conf.orig	2016-09-06 14:56:32 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 {
(-)www/nginx-devel/pkg-plist (+1 lines)
Lines 15-18 Link Here
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 212416