diff options
| author | joerg <joerg@pkgsrc.org> | 2011-12-13 22:00:47 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2011-12-13 22:00:47 +0000 |
| commit | 2e0d696a9085de6ac20f2ff1aacb6c8a4a90fba7 (patch) | |
| tree | 478ca1791fa2816a6d8e0c4c4c8006df5f4dacbd /www | |
| parent | 0a644bdd6b68a57cdf775bd09ceba73d7c20def4 (diff) | |
| download | pkgsrc-2e0d696a9085de6ac20f2ff1aacb6c8a4a90fba7.tar.gz | |
Add back distfile for push option and decouple it from uwsgi.
Adjust logic to generate the full distinfo if makesum is called.
Add image-filter, upload and debug options (PR 45612).
Diffstat (limited to 'www')
| -rw-r--r-- | www/nginx/distinfo | 8 | ||||
| -rw-r--r-- | www/nginx/options.mk | 42 |
2 files changed, 41 insertions, 9 deletions
diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 68a4f3d31f2..08e6030a9df 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,7 +1,13 @@ -$NetBSD: distinfo,v 1.14 2011/12/04 14:41:01 shattered Exp $ +$NetBSD: distinfo,v 1.15 2011/12/13 22:00:47 joerg Exp $ SHA1 (nginx-1.0.10.tar.gz) = 01304d44048aa57944e935dda8523afd5e5d1e23 RMD160 (nginx-1.0.10.tar.gz) = 875082ff6e9197cc26adf4ee51eeda34b9531e29 Size (nginx-1.0.10.tar.gz) = 686011 bytes +SHA1 (nginx_http_push_module-0.692.tar.gz) = 72103084cad8f4d3d9a49a6b04cf780e4541605d +RMD160 (nginx_http_push_module-0.692.tar.gz) = 9d2be16074cf28115af0f1d8f3646937cda649ad +Size (nginx_http_push_module-0.692.tar.gz) = 29119 bytes +SHA1 (nginx_upload_module-2.2.0.tar.gz) = 93d6e83e613a0ce2ed057a434b344fa1b6609b47 +RMD160 (nginx_upload_module-2.2.0.tar.gz) = 5734af837be3fe8ec444a7e5e7f6707118594098 +Size (nginx_upload_module-2.2.0.tar.gz) = 25796 bytes SHA1 (patch-aa) = adf433d1b56a88c6c2ed09c4bd54fdb1a336582f SHA1 (patch-ab) = 6f20ef8ac9a042faf7e22770de7c16b351cb1191 diff --git a/www/nginx/options.mk b/www/nginx/options.mk index d6aa44461ee..22411dac153 100644 --- a/www/nginx/options.mk +++ b/www/nginx/options.mk @@ -1,14 +1,18 @@ -# $NetBSD: options.mk,v 1.11 2011/10/04 20:55:35 shattered Exp $ +# $NetBSD: options.mk,v 1.12 2011/12/13 22:00:47 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.nginx PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 mail-proxy memcache pcre \ - push realip ssl sub uwsgi + push realip ssl sub uwsgi image-filter upload debug PKG_SUGGESTED_OPTIONS= pcre ssl PLIST_VARS+= uwsgi .include "../../mk/bsd.options.mk" +.if !empty(PKG_OPTIONS:Mdebug) +CONFIGURE_ARGS+= --with-debug +.endif + .if !empty(PKG_OPTIONS:Mssl) .include "../../security/openssl/buildlink3.mk" CONFIGURE_ARGS+= --with-mail_ssl_module @@ -58,11 +62,33 @@ CONFIGURE_ARGS+= --with-ipv6 EGFILES+= uwsgi_params PLIST.uwsgi= yes .else -. if !empty(PKG_OPTIONS:Mpush) -PUSH= nginx_http_push_module-0.692 -DISTFILES+= ${PUSH}.tar.gz -SITES.${PUSH}.tar.gz= http://pushmodule.slact.net/downloads/ -CONFIGURE_ARGS+= --add-module=../${PUSH} -. endif CONFIGURE_ARGS+= --without-http_uwsgi_module .endif + +.if !empty(PKG_OPTIONS:Mpush) +CONFIGURE_ARGS+= --add-module=../${PUSH} +.endif +.if !empty(PKG_OPTIONS:Mpush) || make(makesum) +PUSH= nginx_http_push_module-0.692 +PUSH_DISTFILE= ${PUSH}.tar.gz +SITES.${PUSH_DISTFILE}= http://pushmodule.slact.net/downloads/ + +DISTFILES+= ${PUSH_DISTFILE} +.endif + +.if !empty(PKG_OPTIONS:Mupload) +CONFIGURE_ARGS+= --add-module=../${NGX_UPLOAD} +.endif + +.if !empty(PKG_OPTIONS:Mupload) || make(makesum) +DISTFILES+= ${NGX_UPLOAD_DISTFILE} + +NGX_UPLOAD= nginx_upload_module-2.2.0 +NGX_UPLOAD_DISTFILE= ${NGX_UPLOAD}.tar.gz +SITES.${NGX_UPLOAD_DISTFILE}= http://www.grid.net.ru/nginx/download/ +.endif + +.if !empty(PKG_OPTIONS:Mimage-filter) +.include "../../graphics/gd/buildlink3.mk" +CONFIGURE_ARGS+= --with-http_image_filter_module +.endif |