svn commit: r376242 - in head/www: nginx nginx-devel nginx-devel/files nginx/files
Sergey A. Osokin
osa at FreeBSD.org
Sun Jan 4 16:38:30 UTC 2015
Author: osa
Date: Sun Jan 4 16:38:27 2015
New Revision: 376242
URL: https://svnweb.freebsd.org/changeset/ports/376242
QAT: https://qat.redports.org/buildarchive/r376242/
Log:
Upgrade third-party drizzle module from 0.1.7 to 0.1.8.
Rename extra patch for the module.
Added:
head/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config
- copied, changed from r376124, head/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module-config
head/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config
- copied, changed from r376177, head/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module-config
Deleted:
head/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module-config
head/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module-config
Modified:
head/www/nginx-devel/Makefile
head/www/nginx-devel/distinfo
head/www/nginx/Makefile
head/www/nginx/distinfo
Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile Sun Jan 4 16:03:29 2015 (r376241)
+++ head/www/nginx-devel/Makefile Sun Jan 4 16:38:27 2015 (r376242)
@@ -548,12 +548,12 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/m
.if ${PORT_OPTIONS:MDRIZZLE}
LIB_DEPENDS+= libdrizzle.so:${PORTSDIR}/databases/libdrizzle
-NGINX_DRIZZLE_VERSION= 0.1.7
-GIT_DRIZZLE_VERSION= 0-gb83a8a9
-MASTER_SITES+= https://github.com/chaoslawful/drizzle-nginx-module/tarball/v${NGINX_DRIZZLE_VERSION}/:drizzle
-DISTFILES+= chaoslawful-drizzle-nginx-module-v${NGINX_DRIZZLE_VERSION}-${GIT_DRIZZLE_VERSION}.tar.gz:drizzle
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-chaoslawful-drizzle-nginx-module-config
+NGINX_DRIZZLE_VERSION= 0.1.8
+GIT_DRIZZLE_VERSION= 0-gfba80cf
+MASTER_SITES+= https://github.com/openresty/drizzle-nginx-module/tarball/v${NGINX_DRIZZLE_VERSION}/:drizzle
+DISTFILES+= drizzle-nginx-module-v${NGINX_DRIZZLE_VERSION}-${GIT_DRIZZLE_VERSION}.tar.gz:drizzle
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config
.endif
.if ${PORT_OPTIONS:MARRAYVAR} || ${PORT_OPTIONS:MENCRYPTSESSION} || ${PORT_OPTIONS:MFORMINPUT} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MSET_MISC}
@@ -889,7 +889,7 @@ post-patch:
.if ${PORT_OPTIONS:MDRIZZLE}
@${REINPLACE_CMD} \
's!%%PREFIX%%!${LOCALBASE}!g' \
- ${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}/config
+ ${WRKDIR}/openresty-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}/config
.endif
# Respect CFLAGS by remove needless --std=c99 flag
.if ${PORT_OPTIONS:MGRIDFS}
@@ -924,10 +924,6 @@ post-patch:
${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION}/ngx_http_sflow_config.h
.endif
.if ${PORT_OPTIONS:MSPDY}
-.if ${PORT_OPTIONS:MDRIZZLE}
- @${REINPLACE_CMD} '589d' \
- ${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}/src/ngx_http_drizzle_util.c
-.endif
.if ${PORT_OPTIONS:MLUA}
@${REINPLACE_CMD} '464d' \
${WRKDIR}/openresty-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}/src/ngx_http_lua_socket_tcp.c
Modified: head/www/nginx-devel/distinfo
==============================================================================
--- head/www/nginx-devel/distinfo Sun Jan 4 16:03:29 2015 (r376241)
+++ head/www/nginx-devel/distinfo Sun Jan 4 16:38:27 2015 (r376242)
@@ -52,8 +52,8 @@ SHA256 (nginx-sticky-module-1.1.tar.gz)
SIZE (nginx-sticky-module-1.1.tar.gz) = 115412
SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1
SIZE (mod_zip-1.1.6.tar.gz) = 21991
-SHA256 (chaoslawful-drizzle-nginx-module-v0.1.7-0-gb83a8a9.tar.gz) = 7687f119343b2246257ad7269a940e7ca03a1939b8032b444317037f6417fec7
-SIZE (chaoslawful-drizzle-nginx-module-v0.1.7-0-gb83a8a9.tar.gz) = 58730
+SHA256 (drizzle-nginx-module-v0.1.8-0-gfba80cf.tar.gz) = daab1199aef03111cdbfe682a7e81123e8f93698de2ff6a0a2a57b3f1785a982
+SIZE (drizzle-nginx-module-v0.1.8-0-gfba80cf.tar.gz) = 58862
SHA256 (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 9a8c372f8e750d33018d9587d288c17f755e8da38592bca8ef9bf9ea4bab59a7
SIZE (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 65033
SHA256 (openresty-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 0c8b74f2fbe6114f6d59fecbf3539f5d13944f40895d1c379fdb5dfb0838c1e3
Copied and modified: head/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config (from r376124, head/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module-config)
==============================================================================
--- head/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module-config Sat Jan 3 16:12:00 2015 (r376124, copy source)
+++ head/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config Sun Jan 4 16:38:27 2015 (r376242)
@@ -1,5 +1,5 @@
---- ../chaoslawful-drizzle-nginx-module-b83a8a9/config.orig 2011-12-30 10:26:53.000000000 +0400
-+++ ../chaoslawful-drizzle-nginx-module-b83a8a9/config 2011-12-30 10:28:20.000000000 +0400
+--- ../openresty-drizzle-nginx-module-fba80cf/config.orig 2011-12-30 10:26:53.000000000 +0400
++++ ../openresty-drizzle-nginx-module-fba80cf/config 2011-12-30 10:28:20.000000000 +0400
@@ -22,12 +22,12 @@
if [ $ngx_found = no ]; then
Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile Sun Jan 4 16:03:29 2015 (r376241)
+++ head/www/nginx/Makefile Sun Jan 4 16:38:27 2015 (r376242)
@@ -561,12 +561,12 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/m
.if ${PORT_OPTIONS:MDRIZZLE}
LIB_DEPENDS+= libdrizzle.so:${PORTSDIR}/databases/libdrizzle
-NGINX_DRIZZLE_VERSION= 0.1.7
-GIT_DRIZZLE_VERSION= 0-gb83a8a9
-MASTER_SITES+= https://github.com/chaoslawful/drizzle-nginx-module/tarball/v${NGINX_DRIZZLE_VERSION}/:drizzle
-DISTFILES+= chaoslawful-drizzle-nginx-module-v${NGINX_DRIZZLE_VERSION}-${GIT_DRIZZLE_VERSION}.tar.gz:drizzle
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-chaoslawful-drizzle-nginx-module-config
+NGINX_DRIZZLE_VERSION= 0.1.8
+GIT_DRIZZLE_VERSION= 0-gfba80cf
+MASTER_SITES+= https://github.com/openresty/drizzle-nginx-module/tarball/v${NGINX_DRIZZLE_VERSION}/:drizzle
+DISTFILES+= drizzle-nginx-module-v${NGINX_DRIZZLE_VERSION}-${GIT_DRIZZLE_VERSION}.tar.gz:drizzle
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config
.endif
.if ${PORT_OPTIONS:MARRAYVAR} || ${PORT_OPTIONS:MENCRYPTSESSION} || ${PORT_OPTIONS:MFORMINPUT} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MSET_MISC}
@@ -902,7 +902,7 @@ post-patch:
.if ${PORT_OPTIONS:MDRIZZLE}
@${REINPLACE_CMD} \
's!%%PREFIX%%!${LOCALBASE}!g' \
- ${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}/config
+ ${WRKDIR}/openresty-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}/config
.endif
# Respect CFLAGS by remove needless --std=c99 flag
.if ${PORT_OPTIONS:MGRIDFS}
Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo Sun Jan 4 16:03:29 2015 (r376241)
+++ head/www/nginx/distinfo Sun Jan 4 16:38:27 2015 (r376242)
@@ -54,8 +54,8 @@ SHA256 (nginx-sticky-module-1.1.tar.gz)
SIZE (nginx-sticky-module-1.1.tar.gz) = 115412
SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1
SIZE (mod_zip-1.1.6.tar.gz) = 21991
-SHA256 (chaoslawful-drizzle-nginx-module-v0.1.7-0-gb83a8a9.tar.gz) = 7687f119343b2246257ad7269a940e7ca03a1939b8032b444317037f6417fec7
-SIZE (chaoslawful-drizzle-nginx-module-v0.1.7-0-gb83a8a9.tar.gz) = 58730
+SHA256 (drizzle-nginx-module-v0.1.8-0-gfba80cf.tar.gz) = daab1199aef03111cdbfe682a7e81123e8f93698de2ff6a0a2a57b3f1785a982
+SIZE (drizzle-nginx-module-v0.1.8-0-gfba80cf.tar.gz) = 58862
SHA256 (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 9a8c372f8e750d33018d9587d288c17f755e8da38592bca8ef9bf9ea4bab59a7
SIZE (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 65033
SHA256 (openresty-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 0c8b74f2fbe6114f6d59fecbf3539f5d13944f40895d1c379fdb5dfb0838c1e3
Copied and modified: head/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config (from r376177, head/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module-config)
==============================================================================
--- head/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module-config Sat Jan 3 23:49:22 2015 (r376177, copy source)
+++ head/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config Sun Jan 4 16:38:27 2015 (r376242)
@@ -1,5 +1,5 @@
---- ../chaoslawful-drizzle-nginx-module-b83a8a9/config.orig 2011-12-30 10:26:53.000000000 +0400
-+++ ../chaoslawful-drizzle-nginx-module-b83a8a9/config 2011-12-30 10:28:20.000000000 +0400
+--- ../openresty-drizzle-nginx-module-fba80cf/config.orig 2011-12-30 10:26:53.000000000 +0400
++++ ../openresty-drizzle-nginx-module-fba80cf/config 2011-12-30 10:28:20.000000000 +0400
@@ -22,12 +22,12 @@
if [ $ngx_found = no ]; then
More information about the svn-ports-all
mailing list