[pkgsrc/trunk]: pkgsrc/www/nginx Added ngx_set_misc http://wiki.nginx.org/Htt...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8f21bec044ca
branches:  trunk
changeset: 632228:8f21bec044ca
user:      imil <imil%pkgsrc.org@localhost>
date:      Thu Mar 20 22:19:35 2014 +0000

description:
Added ngx_set_misc http://wiki.nginx.org/HttpSetMiscModule and ngx_headers_more
http://wiki.nginx.org/HttpHeadersMoreModule

diffstat:

 www/nginx/Makefile   |   4 ++--
 www/nginx/distinfo   |   8 +++++++-
 www/nginx/options.mk |  44 +++++++++++++++++++++++++++++++++++++-------
 3 files changed, 46 insertions(+), 10 deletions(-)

diffs (114 lines):

diff -r e84e88b45cd9 -r 8f21bec044ca www/nginx/Makefile
--- a/www/nginx/Makefile        Thu Mar 20 21:13:45 2014 +0000
+++ b/www/nginx/Makefile        Thu Mar 20 22:19:35 2014 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2014/03/19 18:01:18 imil Exp $
+# $NetBSD: Makefile,v 1.51 2014/03/20 22:19:35 imil Exp $
 
 DISTNAME=              nginx-1.4.7
-PKGREVISION=           1
+PKGREVISION=           2
 MAINTAINER=            joerg%NetBSD.org@localhost
 
 .include "../../www/nginx/Makefile.common"
diff -r e84e88b45cd9 -r 8f21bec044ca www/nginx/distinfo
--- a/www/nginx/distinfo        Thu Mar 20 21:13:45 2014 +0000
+++ b/www/nginx/distinfo        Thu Mar 20 22:19:35 2014 +0000
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.37 2014/03/19 18:01:18 imil Exp $
+$NetBSD: distinfo,v 1.38 2014/03/20 22:19:35 imil Exp $
 
 SHA1 (echo-nginx-module-0.51.tar.gz) = 127d011f146a7e611f328cd4f2f29cdde1227f07
 RMD160 (echo-nginx-module-0.51.tar.gz) = 79bb11c34735381a5a90176eb4d07dec8b469ab4
 Size (echo-nginx-module-0.51.tar.gz) = 63460 bytes
+SHA1 (headers-more-nginx-module-0.25.tar.gz) = 514bc3df30b24eb0a06533f1ebaa579b898990f5
+RMD160 (headers-more-nginx-module-0.25.tar.gz) = 8270edae05b2cf24f1d46fb1b217d4943bf56372
+Size (headers-more-nginx-module-0.25.tar.gz) = 27973 bytes
 SHA1 (lua-nginx-module-0.9.5.tar.gz) = c9c752461f407ccae40870d4cabfbf2bd8c81bac
 RMD160 (lua-nginx-module-0.9.5.tar.gz) = 180331a69680278bac26f0a9ccd0de52fd88a7ea
 Size (lua-nginx-module-0.9.5.tar.gz) = 476124 bytes
@@ -21,5 +24,8 @@
 SHA1 (ngx_devel_kit-0.2.19.tar.gz) = 888635e80a8a0e6242b8e9b684ff60ffa70845a2
 RMD160 (ngx_devel_kit-0.2.19.tar.gz) = 64d3737bc4cc948c1363cce80d70e5260878811e
 Size (ngx_devel_kit-0.2.19.tar.gz) = 65029 bytes
+SHA1 (set-misc-nginx-module-0.24.tar.gz) = da404a7dac5fa4a0a86f42b4ec7648b607f4cd66
+RMD160 (set-misc-nginx-module-0.24.tar.gz) = 07d0bb8f2a0840534a82a2d18394163342393cef
+Size (set-misc-nginx-module-0.24.tar.gz) = 40397 bytes
 SHA1 (patch-aa) = adf433d1b56a88c6c2ed09c4bd54fdb1a336582f
 SHA1 (patch-ab) = 6f20ef8ac9a042faf7e22770de7c16b351cb1191
diff -r e84e88b45cd9 -r 8f21bec044ca www/nginx/options.mk
--- a/www/nginx/options.mk      Thu Mar 20 21:13:45 2014 +0000
+++ b/www/nginx/options.mk      Thu Mar 20 22:19:35 2014 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.25 2014/03/19 18:01:18 imil Exp $
+# $NetBSD: options.mk,v 1.26 2014/03/20 22:19:35 imil Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 luajit mail-proxy memcache naxsi \
                        pcre push realip ssl sub uwsgi image-filter upload \
-                       debug status nginx-autodetect-cflags spdy echo
+                       debug status nginx-autodetect-cflags spdy echo \
+                       set-misc headers-more
 PKG_SUGGESTED_OPTIONS= inet6 pcre ssl
 
 PLIST_VARS+=           naxsi uwsgi
@@ -77,18 +78,20 @@
 CONFIGURE_ARGS+=       --with-ipv6
 .endif
 
+# NDK must be added once and before 3rd party modules needing it
+.if !empty(PKG_OPTIONS:Mluajit) || !empty(PKG_OPTIONS:Mset-misc)
+CONFIGURE_ARGS+=       --add-module=../${NDK}
+NEED_NDK=              yes
+.endif
+
 .if !empty(PKG_OPTIONS:Mluajit)
-CONFIGURE_ARGS+=       --add-module=../${NDK}
 CONFIGURE_ARGS+=       --add-module=../${LUA}
 .endif
 .if !empty(PKG_OPTIONS:Mluajit) || make(makesum)
-NDK=                   ngx_devel_kit-0.2.19
-NDK_DISTFILE=          ${NDK}.tar.gz
-SITES.${NDK_DISTFILE}= http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
 LUA=                   lua-nginx-module-0.9.5
 LUA_DISTFILE=          ${LUA}.tar.gz
 SITES.${LUA_DISTFILE}= http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
-DISTFILES+=            ${NDK_DISTFILE} ${LUA_DISTFILE}
+DISTFILES+=            ${LUA_DISTFILE}
 
 DEPENDS+=              LuaJIT2>=2.0.3:../../lang/LuaJIT2
 .endif
@@ -103,6 +106,33 @@
 DISTFILES+=            ${ECHOMOD_DISTFILE}
 .endif
 
+.if !empty(PKG_OPTIONS:Mset-misc)
+CONFIGURE_ARGS+=       --add-module=../${SETMISC}
+.endif
+.if !empty(PKG_OPTIONS:Mset-misc) || make(makesum)
+SETMISC=               set-misc-nginx-module-0.24
+SETMISC_DISTFILE=      ${SETMISC}.tar.gz
+SITES.${SETMISC_DISTFILE}=     http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
+DISTFILES+=            ${SETMISC_DISTFILE}
+.endif
+
+.if defined(NEED_NDK) || make(makesum)
+NDK=                   ngx_devel_kit-0.2.19
+NDK_DISTFILE=          ${NDK}.tar.gz
+SITES.${NDK_DISTFILE}= http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
+DISTFILES+=            ${NDK_DISTFILE}
+.endif
+
+.if !empty(PKG_OPTIONS:Mheaders-more)
+CONFIGURE_ARGS+=       --add-module=../${HEADMORE}
+.endif
+.if !empty(PKG_OPTIONS:Mheaders-more) || make(makesum)
+HEADMORE=              headers-more-nginx-module-0.25
+HEADMORE_DISTFILE=     ${HEADMORE}.tar.gz
+SITES.${HEADMORE_DISTFILE}=    http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
+DISTFILES+=            ${HEADMORE_DISTFILE}
+.endif
+
 .if !empty(PKG_OPTIONS:Muwsgi)
 EGFILES+=              uwsgi_params
 PLIST.uwsgi=           yes