[pkgsrc/trunk]: pkgsrc/www/nginx nginx: fix two inconsistent paths and remove...

[triaxx <triaxx%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b29a723d9bdc
branches:  trunk
changeset: 385886:b29a723d9bdc
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Mon Oct 01 20:55:36 2018 +0000

description:
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:

 www/nginx/Makefile.common |  3 ++-
 www/nginx/options.mk      |  7 ++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r 8ebe230d4895 -r b29a723d9bdc www/nginx/Makefile.common
--- a/www/nginx/Makefile.common Mon Oct 01 20:07:23 2018 +0000
+++ b/www/nginx/Makefile.common Mon Oct 01 20:55:36 2018 +0000
@@ -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-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 -r 8ebe230d4895 -r b29a723d9bdc www/nginx/options.mk
--- a/www/nginx/options.mk      Mon Oct 01 20:07:23 2018 +0000
+++ b/www/nginx/options.mk      Mon Oct 01 20:55:36 2018 +0000
@@ -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+=       --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 @@
 .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