svn commit: r426625 - in head/www/nginx-devel: . files
Sergey A. Osokin
osa at FreeBSD.org
Sun Nov 20 20:41:35 UTC 2016
Author: osa
Date: Sun Nov 20 20:41:33 2016
New Revision: 426625
URL: https://svnweb.freebsd.org/changeset/ports/426625
Log:
Remove IGNORE for drizzle and postgres third-party modules.
Added:
head/www/nginx-devel/files/extra-patch-ngx_http_drizzle_upstream.c (contents, props changed)
head/www/nginx-devel/files/extra-patch-ngx_postgres_module.c (contents, props changed)
Modified:
head/www/nginx-devel/Makefile
Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile Sun Nov 20 20:34:38 2016 (r426624)
+++ head/www/nginx-devel/Makefile Sun Nov 20 20:41:33 2016 (r426625)
@@ -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}
Added: head/www/nginx-devel/files/extra-patch-ngx_http_drizzle_upstream.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-ngx_http_drizzle_upstream.c Sun Nov 20 20:41:33 2016 (r426625)
@@ -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];
+ }
Added: head/www/nginx-devel/files/extra-patch-ngx_postgres_module.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-ngx_postgres_module.c Sun Nov 20 20:41:33 2016 (r426625)
@@ -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];
More information about the svn-ports-all
mailing list