diff options
| author | triaxx <triaxx@pkgsrc.org> | 2018-10-01 20:55:36 +0000 |
|---|---|---|
| committer | triaxx <triaxx@pkgsrc.org> | 2018-10-01 20:55:36 +0000 |
| commit | 76bd026513af866cb09bda083ce1663a46b8a8d0 (patch) | |
| tree | 1d3963f12d19fca34d86a5b0587b5fe96b0d9dd4 /www | |
| parent | f64fbd8d1017c69b69ea31b20db3b0b6f5ab98a6 (diff) | |
| download | pkgsrc-76bd026513af866cb09bda083ce1663a46b8a8d0.tar.gz | |
nginx: fix two inconsistent paths and remove a deprecated option
* Fix scgi temp path
* Fix uwsgi temp path (if option is activated)
* Remove ipv6 option (./configure: warning: the "--with-ipv6"
option is deprecated)
Diffstat (limited to 'www')
| -rw-r--r-- | www/nginx/Makefile.common | 3 | ||||
| -rw-r--r-- | www/nginx/options.mk | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/www/nginx/Makefile.common b/www/nginx/Makefile.common index b08741d69cd..4f1353f9c8d 100644 --- a/www/nginx/Makefile.common +++ b/www/nginx/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2018/01/26 14:47:47 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.14 2018/10/01 20:55:36 triaxx Exp $ # used by www/nginx/Makefile # used by www/nginx-devel/Makefile @@ -48,6 +48,7 @@ CONFIGURE_ARGS+= --http-log-path=${NGINX_LOGDIR}/access.log CONFIGURE_ARGS+= --http-client-body-temp-path=${NGINX_DATADIR}/client_body_temp CONFIGURE_ARGS+= --http-proxy-temp-path=${NGINX_DATADIR}/proxy_temp CONFIGURE_ARGS+= --http-fastcgi-temp-path=${NGINX_DATADIR}/fstcgi_temp +CONFIGURE_ARGS+= --http-scgi-temp-path=${NGINX_DATADIR}/scgi_temp PKG_SYSCONFSUBDIR= nginx diff --git a/www/nginx/options.mk b/www/nginx/options.mk index d943ecd5a49..f5e9db1e03d 100644 --- a/www/nginx/options.mk +++ b/www/nginx/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.46 2018/08/24 18:27:07 adam Exp $ +# $NetBSD: options.mk,v 1.47 2018/10/01 20:55:36 triaxx Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.nginx PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 luajit mail-proxy memcache naxsi \ @@ -78,10 +78,6 @@ CONFIGURE_ARGS+= --without-http_memcached_module CONFIGURE_ARGS+= --with-http_realip_module .endif -.if !empty(PKG_OPTIONS:Minet6) -CONFIGURE_ARGS+= --with-ipv6 -.endif - # NDK must be added once and before 3rd party modules needing it .for _ngx_mod in luajit set-misc array-var form-input encrypted-session . if !defined(NEED_NDK) && !empty(PKG_OPTIONS:M${_ngx_mod}:O) @@ -180,6 +176,7 @@ DISTFILES+= ${HEADMORE_DISTFILE} .if !empty(PKG_OPTIONS:Muwsgi) EGFILES+= uwsgi_params PLIST.uwsgi= yes +CONFIGURE_ARGS+= --http-uwsgi-temp-path=${NGINX_DATADIR}/uwsgi_temp .else CONFIGURE_ARGS+= --without-http_uwsgi_module .endif |