svn commit: r440062 - in head/www: nginx nginx-devel nginx-devel/files nginx/files

[Sergey A. Osokin]

Author: osa
Date: Wed May  3 22:03:09 2017
New Revision: 440062
URL: https://svnweb.freebsd.org/changeset/ports/440062

Log:
  Upgrade third-party memc module from 0.17 to 0.18.
  Remove the needless patch (incorporated into upstream).
  
  Do not bump PORTREVISION.

Deleted:
  head/www/nginx-devel/files/extra-patch-ngx_http_memc_util.c
  head/www/nginx/files/extra-patch-ngx_http_memc_util.c
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	Wed May  3 21:58:16 2017	(r440061)
+++ head/www/nginx-devel/Makefile	Wed May  3 22:03:09 2017	(r440062)
@@ -862,12 +862,15 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-
 .endif
 
 .if ${PORT_OPTIONS:MMEMC}
-NGINX_MEMC_VERSION=	0.17
+NGINX_MEMC_VERSION=	0.18
 GH_ACCOUNT+=	openresty:memc
 GH_PROJECT+=	memc-nginx-module:memc
 GH_TAGNAME+=	v${NGINX_MEMC_VERSION}:memc
+.if !empty(PORT_OPTIONS:MDSO)
+CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_memc}
+.else
 CONFIGURE_ARGS+=--add-module=${WRKSRC_memc}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_memc_util.c
+.endif
 .endif
 
 .if ${PORT_OPTIONS:MMODSECURITY}

Modified: head/www/nginx-devel/distinfo
==============================================================================
--- head/www/nginx-devel/distinfo	Wed May  3 21:58:16 2017	(r440061)
+++ head/www/nginx-devel/distinfo	Wed May  3 22:03:09 2017	(r440062)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1493826932
+TIMESTAMP = 1493848307
 SHA256 (nginx-1.13.0.tar.gz) = 79f52ab6550f854e14439369808105b5780079769d7b8db3856be03c683605d7
 SIZE (nginx-1.13.0.tar.gz) = 982592
 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9
@@ -93,8 +93,8 @@ SHA256 (arut-nginx-let-module-v0.0.4_GH0
 SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534
 SHA256 (openresty-lua-nginx-module-v0.10.8_GH0.tar.gz) = d67449c71051b3cc2d6dd60df0ae0d21fca08aa19c9b30c5b95ee21ff38ef8dd
 SIZE (openresty-lua-nginx-module-v0.10.8_GH0.tar.gz) = 606643
-SHA256 (openresty-memc-nginx-module-v0.17_GH0.tar.gz) = 25cbe3ff4931283a681260607bc91ae4a922075345d5770b293c6cd7f1e3bdcc
-SIZE (openresty-memc-nginx-module-v0.17_GH0.tar.gz) = 36369
+SHA256 (openresty-memc-nginx-module-v0.18_GH0.tar.gz) = 4e280d1dcb8b312bc7875604c1e35b17879279126d3d5fbf482aa9cc7c11276d
+SIZE (openresty-memc-nginx-module-v0.18_GH0.tar.gz) = 37113
 SHA256 (nbs-system-naxsi-0.54_GH0.tar.gz) = 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5
 SIZE (nbs-system-naxsi-0.54_GH0.tar.gz) = 163809
 SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Wed May  3 21:58:16 2017	(r440061)
+++ head/www/nginx/Makefile	Wed May  3 22:03:09 2017	(r440062)
@@ -862,12 +862,15 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-
 .endif
 
 .if ${PORT_OPTIONS:MMEMC}
-NGINX_MEMC_VERSION=	0.17
+NGINX_MEMC_VERSION=	0.18
 GH_ACCOUNT+=	openresty:memc
 GH_PROJECT+=	memc-nginx-module:memc
 GH_TAGNAME+=	v${NGINX_MEMC_VERSION}:memc
+.if !empty(PORT_OPTIONS:MDSO)
+CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_memc}
+.else
 CONFIGURE_ARGS+=--add-module=${WRKSRC_memc}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_memc_util.c
+.endif
 .endif
 
 .if ${PORT_OPTIONS:MMODSECURITY}

Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo	Wed May  3 21:58:16 2017	(r440061)
+++ head/www/nginx/distinfo	Wed May  3 22:03:09 2017	(r440062)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1493826932
+TIMESTAMP = 1493848307
 SHA256 (nginx-1.12.0.tar.gz) = b4222e26fdb620a8d3c3a3a8b955e08b713672e1bc5198d1e4f462308a795b30
 SIZE (nginx-1.12.0.tar.gz) = 980831
 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9
@@ -93,8 +93,8 @@ SHA256 (arut-nginx-let-module-v0.0.4_GH0
 SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534
 SHA256 (openresty-lua-nginx-module-v0.10.8_GH0.tar.gz) = d67449c71051b3cc2d6dd60df0ae0d21fca08aa19c9b30c5b95ee21ff38ef8dd
 SIZE (openresty-lua-nginx-module-v0.10.8_GH0.tar.gz) = 606643
-SHA256 (openresty-memc-nginx-module-v0.17_GH0.tar.gz) = 25cbe3ff4931283a681260607bc91ae4a922075345d5770b293c6cd7f1e3bdcc
-SIZE (openresty-memc-nginx-module-v0.17_GH0.tar.gz) = 36369
+SHA256 (openresty-memc-nginx-module-v0.18_GH0.tar.gz) = 4e280d1dcb8b312bc7875604c1e35b17879279126d3d5fbf482aa9cc7c11276d
+SIZE (openresty-memc-nginx-module-v0.18_GH0.tar.gz) = 37113
 SHA256 (nbs-system-naxsi-0.54_GH0.tar.gz) = 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5
 SIZE (nbs-system-naxsi-0.54_GH0.tar.gz) = 163809
 SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9