diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2016-11-20 20:41:33 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2016-11-20 20:41:33 +0000 |
| commit | 540149ab0f5f75c95067265b4eca3283e1230577 (patch) | |
| tree | 915370d30342bd20d6edff9c5d399ad4a555de28 /www/nginx-devel | |
| parent | 742a14d92367214e4dbe9657b5913d505016c8b8 (diff) | |
| download | ports-540149ab0f5f75c95067265b4eca3283e1230577.tar.gz ports-540149ab0f5f75c95067265b4eca3283e1230577.zip | |
Remove IGNORE for drizzle and postgres third-party modules.
Notes
Notes:
svn path=/head/; revision=426625
Diffstat (limited to 'www/nginx-devel')
| -rw-r--r-- | www/nginx-devel/Makefile | 8 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-ngx_http_drizzle_upstream.c | 17 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-ngx_postgres_module.c | 17 |
3 files changed, 38 insertions, 4 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 08fb57388947..d576f02eb4d3 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -788,8 +788,8 @@ GH_ACCOUNT+= openresty:drizzle GH_PROJECT+= drizzle-nginx-module:drizzle GH_TAGNAME+= v${NGINX_DRIZZLE_VERSION}:drizzle CONFIGURE_ARGS+=--add-module=${WRKSRC_drizzle} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config -IGNORE= DRIZZLE: a patch requires +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config \ + ${PATCHDIR}/extra-patch-ngx_http_drizzle_upstream.c .endif .if ${PORT_OPTIONS:MDYNAMIC_UPSTREAM} @@ -917,8 +917,8 @@ GH_ACCOUNT+= FRiCKLE:postgres GH_PROJECT+= ngx_postgres:postgres GH_TAGNAME+= ${NGINX_POSTGRES_VERSION}:postgres CONFIGURE_ARGS+=--add-module=${WRKSRC_postgres} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_postgres-config -IGNORE= POSTGRES: a patch requires +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_postgres-config \ + ${PATCHDIR}/extra-patch-ngx_postgres_module.c .endif .if ${PORT_OPTIONS:MRDS_CSV} diff --git a/www/nginx-devel/files/extra-patch-ngx_http_drizzle_upstream.c b/www/nginx-devel/files/extra-patch-ngx_http_drizzle_upstream.c new file mode 100644 index 000000000000..614613c9ec8a --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_http_drizzle_upstream.c @@ -0,0 +1,17 @@ +--- ../drizzle-nginx-module-0.1.9/src/ngx_http_drizzle_upstream.c.orig 2016-11-20 15:32:37.264746000 -0500 ++++ ../drizzle-nginx-module-0.1.9/src/ngx_http_drizzle_upstream.c 2016-11-20 15:33:20.909836000 -0500 +@@ -1027,12 +1027,14 @@ + continue; + } + ++#if (nginx_version < 1011006) + if (uscfp[i]->default_port && url->default_port + && uscfp[i]->default_port != url->default_port) + { + dd("upstream_add: default_port not match"); + continue; + } ++#endif + + return uscfp[i]; + } diff --git a/www/nginx-devel/files/extra-patch-ngx_postgres_module.c b/www/nginx-devel/files/extra-patch-ngx_postgres_module.c new file mode 100644 index 000000000000..dd8e302d1fd4 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_postgres_module.c @@ -0,0 +1,17 @@ +--- ../ngx_postgres-1.0rc7/src/ngx_postgres_module.c.orig 2016-11-20 15:34:25.763542000 -0500 ++++ ../ngx_postgres-1.0rc7/src/ngx_postgres_module.c 2016-11-20 15:34:41.023867000 -0500 +@@ -1320,12 +1320,14 @@ + continue; + } + ++#if (nginx_version < 1011006) + if (uscfp[i]->default_port && url->default_port + && (uscfp[i]->default_port != url->default_port)) + { + dd("default_port doesn't match"); + continue; + } ++#endif + + dd("returning"); + return uscfp[i]; |