aboutsummaryrefslogtreecommitdiff
path: root/www/nginx-devel
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2013-01-16 03:38:22 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2013-01-16 03:38:22 +0000
commit4422fb2ded130b425eb45edf0994e9e634226d7b (patch)
tree9913b4332ef4f53870ac2267a0fba5b06625e093 /www/nginx-devel
parent155a5c6d8343dae177a6ee5965ca98b849d2e5da (diff)
downloadports-4422fb2ded130b425eb45edf0994e9e634226d7b.tar.gz
ports-4422fb2ded130b425eb45edf0994e9e634226d7b.zip
Update SPDY patch from version 54 to 58.
Notes
Notes: svn path=/head/; revision=310471
Diffstat (limited to 'www/nginx-devel')
-rw-r--r--www/nginx-devel/Makefile16
-rw-r--r--www/nginx-devel/distinfo4
2 files changed, 16 insertions, 4 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 3644ca8e7a9b..790b4a82c120 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -768,9 +768,11 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-xss-nginx-module-${GIT_XSS_VERSIO
.if ${PORT_OPTIONS:MSPDY}
USE_OPENSSL_PORT= yes
USE_HTTP_SSL= yes
-NGINX_SPDY_VERSION= 54
+NGINX_SPDY_VERSION= 58
PATCH_SITES= http://nginx.org/patches/spdy/:spdy
-PATCHFILES= patch.spdy-${NGINX_SPDY_VERSION}.txt:spdy
+PATCHFILES= patch.spdy-${NGINX_SPDY_VERSION}_${PORTVERSION}.txt:spdy
+PATCH_DIST_STRIP= -p1
+CONFIGURE_ARGS+=--with-http_spdy_module
.endif
.if ${PORT_OPTIONS:MWWW}
@@ -926,6 +928,16 @@ post-patch:
's!%%PREFIX%%!${LOCALBASE}!g' \
${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION}/ngx_http_sflow_config.h
.endif
+.if ${PORT_OPTIONS:MSPDY}
+.if ${PORT_OPTIONS:MDRIZZLE}
+ @${REINPLACE_CMD} '584d' \
+ ${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}/src/ngx_http_drizzle_util.c
+.endif
+.if ${PORT_OPTIONS:MLUA}
+ @${REINPLACE_CMD} '437d' \
+ ${WRKDIR}/chaoslawful-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}/src/ngx_http_lua_socket_tcp.c
+.endif
+.endif
.if ${PORT_OPTIONS:MSUPERVISORD}
( cd ${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} && \
${PATCH} -p0 < \
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index b7de65e31c95..17d491e8bdae 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -106,5 +106,5 @@ SHA256 (calio-form-input-nginx-module-v0.07rc5-0-gd41681d.tar.gz) = 831bb3fa3392
SIZE (calio-form-input-nginx-module-v0.07rc5-0-gd41681d.tar.gz) = 11048
SHA256 (calio-iconv-nginx-module-v0.10rc7-0-gabdac17.tar.gz) = bc35d461efccb29b7affda5a397d86d89f5c860fcd9d300ac2d6d7f7667c22b1
SIZE (calio-iconv-nginx-module-v0.10rc7-0-gabdac17.tar.gz) = 12060
-SHA256 (patch.spdy-54.txt) = 0b2f1933a07cc720ef5e6621c09e6253f601d32ac10184bca4f2dca176c9e904
-SIZE (patch.spdy-54.txt) = 148212
+SHA256 (patch.spdy-58_1.3.11.txt) = 63003a9fdc64c4c23926f1e8345f842e472495682fc9324f0ac2bd74d0774836
+SIZE (patch.spdy-58_1.3.11.txt) = 231885