summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/nginx-devel/distinfo5
-rw-r--r--www/nginx/distinfo5
-rw-r--r--www/nginx/options.mk16
3 files changed, 4 insertions, 22 deletions
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 9ba39a7b5bd..b688db377d6 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2015/09/03 09:15:18 fhajny Exp $
+$NetBSD: distinfo,v 1.15 2015/09/24 06:13:50 wiz Exp $
SHA1 (array-var-nginx-module-0.03.tar.gz) = b2666aa3c092060fcd3931a6d45798a5745c1ad6
RMD160 (array-var-nginx-module-0.03.tar.gz) = 171c2d9bd02d7a7ede9f87ab348ef035cea14aec
@@ -27,9 +27,6 @@ Size (nginx-1.9.4.tar.gz) = 866423 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 (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
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 9b811fb62ba..48380b84e85 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2015/06/30 07:38:08 nils Exp $
+$NetBSD: distinfo,v 1.47 2015/09/24 06:13:50 wiz Exp $
SHA1 (array-var-nginx-module-0.03.tar.gz) = b2666aa3c092060fcd3931a6d45798a5745c1ad6
RMD160 (array-var-nginx-module-0.03.tar.gz) = 171c2d9bd02d7a7ede9f87ab348ef035cea14aec
@@ -24,9 +24,6 @@ Size (naxsi-0.53-2.tar.gz) = 165690 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 (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
diff --git a/www/nginx/options.mk b/www/nginx/options.mk
index 94e75d38bca..7ac5ed2598d 100644
--- a/www/nginx/options.mk
+++ b/www/nginx/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.31 2015/06/04 10:25:17 fhajny Exp $
+# $NetBSD: options.mk,v 1.32 2015/09/24 06:13:50 wiz 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 \
+ pcre push realip ssl sub uwsgi image-filter \
debug status nginx-autodetect-cflags spdy echo \
set-misc headers-more array-var encrypted-session \
form-input perl gzip
@@ -184,18 +184,6 @@ 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