Date: Sun, 7 Aug 2016 23:20:36 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419789 - in head/www: nginx nginx-devel nginx-devel/files nginx/files Message-ID: <201608072320.u77NKaxl062402@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Sun Aug 7 23:20:36 2016 New Revision: 419789 URL: https://svnweb.freebsd.org/changeset/ports/419789 Log: Upgrade third-party tarantool module from b852195 to 1278ee5. Now it's possible to build it as dynamic module. Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo head/www/nginx-devel/files/extra-patch-ngx_http_tarantool-config head/www/nginx/Makefile head/www/nginx/distinfo head/www/nginx/files/extra-patch-ngx_http_tarantool-config Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Sun Aug 7 23:19:39 2016 (r419788) +++ head/www/nginx-devel/Makefile Sun Aug 7 23:20:36 2016 (r419789) @@ -632,9 +632,12 @@ LIB_DEPENDS+= libmsgpuck.so:devel/msgpuc libyajl.so:devel/yajl GH_ACCOUNT+= tarantool:nginx_tarantool GH_PROJECT+= nginx_upstream_module:nginx_tarantool -GH_TAGNAME+= b852195:nginx_tarantool -CFLAGS+= -I${LOCALBASE}/include/msgpuck +GH_TAGNAME+= 1278ee5:nginx_tarantool +.if !empty(PORT_OPTIONS:MDSO) +CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_nginx_tarantool} +.else CONFIGURE_ARGS+=--add-module=${WRKSRC_nginx_tarantool} +.endif EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config .endif Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Sun Aug 7 23:19:39 2016 (r419788) +++ head/www/nginx-devel/distinfo Sun Aug 7 23:20:36 2016 (r419789) @@ -1,4 +1,4 @@ -TIMESTAMP = 1470533467 +TIMESTAMP = 1470600877 SHA256 (nginx-1.11.3.tar.gz) = 4a667f40f9f3917069db1dea1f2d5baa612f1fa19378aadf71502e846a424610 SIZE (nginx-1.11.3.tar.gz) = 938045 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1 @@ -67,8 +67,8 @@ SHA256 (wandenberg-nginx-push-stream-mod SIZE (wandenberg-nginx-push-stream-module-0.5.1_GH0.tar.gz) = 175263 SHA256 (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = ed4ddbcf0c434f4a1e97b61251a63ace759792764bd5cb79ff20efe348db8db3 SIZE (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = 92230 -SHA256 (tarantool-nginx_upstream_module-b852195_GH0.tar.gz) = 8ffc6cb91ab663e2ec04ae9bbbc436e3c0b2743fb600d8babb4a124408cceadb -SIZE (tarantool-nginx_upstream_module-b852195_GH0.tar.gz) = 40361 +SHA256 (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 34d51afcd464582e6011a5d3abe6829c5690ddb9b50c993dfdafb4c725a4803a +SIZE (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 48378 SHA256 (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 62a2c4388585aec463a1cee30bc84953593a93f341dc1df61b42b452594d2a05 SIZE (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 28296 SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1 Modified: head/www/nginx-devel/files/extra-patch-ngx_http_tarantool-config ============================================================================== --- head/www/nginx-devel/files/extra-patch-ngx_http_tarantool-config Sun Aug 7 23:19:39 2016 (r419788) +++ head/www/nginx-devel/files/extra-patch-ngx_http_tarantool-config Sun Aug 7 23:20:36 2016 (r419789) @@ -1,11 +1,20 @@ ---- ../nginx_upstream_module-b852195/config.orig 2015-08-20 23:33:02.000000000 +0300 -+++ ../nginx_upstream_module-b852195/config 2015-08-23 16:04:59.572045669 +0300 -@@ -4,7 +4,7 @@ - " +--- ../nginx_upstream_module-1278ee5/config.orig 2016-08-07 15:39:47.000000000 -0400 ++++ ../nginx_upstream_module-1278ee5/config 2016-08-07 16:38:59.298414000 -0400 +@@ -1,14 +1,14 @@ + ngx_addon_name="ngx_http_tnt_module" + +-__lib_yajl="$ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a" ++__lib_yajl="%%PREFIX%%/lib/libyajl.so" - CORE_LIBS="$CORE_LIBS $ngx_feature_libs \ -- $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a \ -+ %%PREFIX%%/lib/libyajl_s.a \ - " + __module_src_dir="$ngx_addon_dir/src" + + __include_paths=" \ + $ngx_addon_dir/src \ + $ngx_addon_dir/third_party \ +- $ngx_addon_dir/third_party/msgpuck \ +- $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/include \ ++ %%PREFIX%%/include/msgpuck \ ++ %%PREFIX%%/include/yajl \ + " - HTTP_MODULES="$HTTP_MODULES \ + __sources=" \ Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Sun Aug 7 23:19:39 2016 (r419788) +++ head/www/nginx/Makefile Sun Aug 7 23:20:36 2016 (r419789) @@ -631,9 +631,12 @@ LIB_DEPENDS+= libmsgpuck.so:devel/msgpuc libyajl.so:devel/yajl GH_ACCOUNT+= tarantool:nginx_tarantool GH_PROJECT+= nginx_upstream_module:nginx_tarantool -GH_TAGNAME+= b852195:nginx_tarantool -CFLAGS+= -I${LOCALBASE}/include/msgpuck +GH_TAGNAME+= 1278ee5:nginx_tarantool +.if !empty(PORT_OPTIONS:MDSO) +CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_nginx_tarantool} +.else CONFIGURE_ARGS+=--add-module=${WRKSRC_nginx_tarantool} +.endif EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config .endif Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Sun Aug 7 23:19:39 2016 (r419788) +++ head/www/nginx/distinfo Sun Aug 7 23:20:36 2016 (r419789) @@ -1,4 +1,4 @@ -TIMESTAMP = 1470533467 +TIMESTAMP = 1470600877 SHA256 (nginx-1.10.1.tar.gz) = 1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801 SIZE (nginx-1.10.1.tar.gz) = 909077 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1 @@ -67,8 +67,8 @@ SHA256 (wandenberg-nginx-push-stream-mod SIZE (wandenberg-nginx-push-stream-module-0.5.1_GH0.tar.gz) = 175263 SHA256 (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = ed4ddbcf0c434f4a1e97b61251a63ace759792764bd5cb79ff20efe348db8db3 SIZE (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = 92230 -SHA256 (tarantool-nginx_upstream_module-b852195_GH0.tar.gz) = 8ffc6cb91ab663e2ec04ae9bbbc436e3c0b2743fb600d8babb4a124408cceadb -SIZE (tarantool-nginx_upstream_module-b852195_GH0.tar.gz) = 40361 +SHA256 (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 34d51afcd464582e6011a5d3abe6829c5690ddb9b50c993dfdafb4c725a4803a +SIZE (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 48378 SHA256 (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 62a2c4388585aec463a1cee30bc84953593a93f341dc1df61b42b452594d2a05 SIZE (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 28296 SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1 Modified: head/www/nginx/files/extra-patch-ngx_http_tarantool-config ============================================================================== --- head/www/nginx/files/extra-patch-ngx_http_tarantool-config Sun Aug 7 23:19:39 2016 (r419788) +++ head/www/nginx/files/extra-patch-ngx_http_tarantool-config Sun Aug 7 23:20:36 2016 (r419789) @@ -1,11 +1,20 @@ ---- ../nginx_upstream_module-b852195/config.orig 2015-08-20 23:33:02.000000000 +0300 -+++ ../nginx_upstream_module-b852195/config 2015-08-23 16:04:59.572045669 +0300 -@@ -4,7 +4,7 @@ - " +--- ../nginx_upstream_module-1278ee5/config.orig 2016-08-07 15:39:47.000000000 -0400 ++++ ../nginx_upstream_module-1278ee5/config 2016-08-07 16:38:59.298414000 -0400 +@@ -1,14 +1,14 @@ + ngx_addon_name="ngx_http_tnt_module" + +-__lib_yajl="$ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a" ++__lib_yajl="%%PREFIX%%/lib/libyajl.so" - CORE_LIBS="$CORE_LIBS $ngx_feature_libs \ -- $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a \ -+ %%PREFIX%%/lib/libyajl_s.a \ - " + __module_src_dir="$ngx_addon_dir/src" + + __include_paths=" \ + $ngx_addon_dir/src \ + $ngx_addon_dir/third_party \ +- $ngx_addon_dir/third_party/msgpuck \ +- $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/include \ ++ %%PREFIX%%/include/msgpuck \ ++ %%PREFIX%%/include/yajl \ + " - HTTP_MODULES="$HTTP_MODULES \ + __sources=" \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608072320.u77NKaxl062402>