diff options
| author | imil <imil> | 2014-03-21 11:36:47 +0000 |
|---|---|---|
| committer | imil <imil> | 2014-03-21 11:36:47 +0000 |
| commit | 101aab6cac8080a4caa8d837d330b4343c3ebf87 (patch) | |
| tree | 3095f01500e498d359a758e8509fd3efb7a64348 /www/nginx | |
| parent | 88ee8fa67b8edd2499fb7b2a12825d27a1a45ab5 (diff) | |
| download | pkgsrc-101aab6cac8080a4caa8d837d330b4343c3ebf87.tar.gz | |
Added array-var-nginx-module https://github.com/agentzh/array-var-nginx-module
Diffstat (limited to 'www/nginx')
| -rw-r--r-- | www/nginx/Makefile | 4 | ||||
| -rw-r--r-- | www/nginx/distinfo | 5 | ||||
| -rw-r--r-- | www/nginx/options.mk | 27 |
3 files changed, 25 insertions, 11 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 89716096cc0..1d2518169ce 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.51 2014/03/20 22:19:35 imil Exp $ +# $NetBSD: Makefile,v 1.52 2014/03/21 11:36:47 imil Exp $ DISTNAME= nginx-1.4.7 -PKGREVISION= 2 +PKGREVISION= 3 MAINTAINER= joerg@NetBSD.org .include "../../www/nginx/Makefile.common" diff --git a/www/nginx/distinfo b/www/nginx/distinfo index eaf11bc95a1..56f477f9507 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,5 +1,8 @@ -$NetBSD: distinfo,v 1.38 2014/03/20 22:19:35 imil Exp $ +$NetBSD: distinfo,v 1.39 2014/03/21 11:36:47 imil Exp $ +SHA1 (array-var-nginx-module-0.03.tar.gz) = b2666aa3c092060fcd3931a6d45798a5745c1ad6 +RMD160 (array-var-nginx-module-0.03.tar.gz) = 171c2d9bd02d7a7ede9f87ab348ef035cea14aec +Size (array-var-nginx-module-0.03.tar.gz) = 9520 bytes 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 diff --git a/www/nginx/options.mk b/www/nginx/options.mk index 6ac01999bc6..783a8dd4f7f 100644 --- a/www/nginx/options.mk +++ b/www/nginx/options.mk @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.26 2014/03/20 22:19:35 imil Exp $ +# $NetBSD: options.mk,v 1.27 2014/03/21 11:36:47 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 \ - set-misc headers-more + set-misc headers-more array-var PKG_SUGGESTED_OPTIONS= inet6 pcre ssl PLIST_VARS+= naxsi uwsgi @@ -79,9 +79,17 @@ 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) +.for _ngx_mod in luajit set-misc array-var +. if !defined(NEED_NDK) && !empty(PKG_OPTIONS:M${_ngx_mod}:O) CONFIGURE_ARGS+= --add-module=../${NDK} NEED_NDK= yes +. endif +.endfor +.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:Mluajit) @@ -116,11 +124,14 @@ 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} +.if !empty(PKG_OPTIONS:Marray-var) +CONFIGURE_ARGS+= --add-module=../${ARRAYVAR} +.endif +.if !empty(PKG_OPTIONS:Marray-var) || make(makesum) +ARRAYVAR= array-var-nginx-module-0.03 +ARRAYVAR_DISTFILE= ${ARRAYVAR}.tar.gz +SITES.${ARRAYVAR_DISTFILE}= http://ftp.NetBSD.org/pub/pkgsrc/distfiles/ +DISTFILES+= ${ARRAYVAR_DISTFILE} .endif .if !empty(PKG_OPTIONS:Mheaders-more) |