svn commit: r546038 - in head/www/nginx-devel: . files

[Sergey A. Osokin]

Author: osa
Date: Mon Aug 24 02:58:55 2020
New Revision: 546038
URL: https://svnweb.freebsd.org/changeset/ports/546038

Log:
  Partially revert back r533146 cause upstream_check third-party
  dynamic module can't work as expected, so let's keep it static
  for now.
  
  Bump PORTREVISION.
  
  PR:	247523

Deleted:
  head/www/nginx-devel/files/extra-patch-nginx_upstream_check_module-config
Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/Makefile.extmod
  head/www/nginx-devel/pkg-plist

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Mon Aug 24 02:57:38 2020	(r546037)
+++ head/www/nginx-devel/Makefile	Mon Aug 24 02:58:55 2020	(r546038)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	nginx
 PORTVERSION=	1.19.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa

Modified: head/www/nginx-devel/Makefile.extmod
==============================================================================
--- head/www/nginx-devel/Makefile.extmod	Mon Aug 24 02:57:38 2020	(r546037)
+++ head/www/nginx-devel/Makefile.extmod	Mon Aug 24 02:58:55 2020	(r546038)
@@ -169,13 +169,12 @@ HTTP_UPLOAD_PROGRESS_GH_TUPLE=	masterzen:nginx-upload-
 HTTP_UPLOAD_PROGRESS_VARS=	DSO_EXTMODS+=uploadprogress
 
 HTTP_UPSTREAM_CHECK_GH_TUPLE=		yaoweibin:nginx_upstream_check_module:9aecf15:upstreamcheck
+HTTP_UPSTREAM_CHECK_CONFIGURE_ON=	--add-module=${WRKSRC_upstreamcheck}
 HTTP_UPSTREAM_CHECK_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_hash_module.c \
 					${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_ip_hash_module.c \
 					${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_least_conn_module.c \
 					${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.c \
-					${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.h \
-					${PATCHDIR}/extra-patch-nginx_upstream_check_module-config
-HTTP_UPSTREAM_CHECK_VARS=		DSO_EXTMODS+=upstreamcheck
+					${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.h
 
 HTTP_UPSTREAM_FAIR_GH_TUPLE=		jaygooby:nginx-upstream-fair:10ecdcf:upstreamfair
 HTTP_UPSTREAM_FAIR_VARS=		DSO_EXTMODS+=upstreamfair

Modified: head/www/nginx-devel/pkg-plist
==============================================================================
--- head/www/nginx-devel/pkg-plist	Mon Aug 24 02:57:38 2020	(r546037)
+++ head/www/nginx-devel/pkg-plist	Mon Aug 24 02:58:55 2020	(r546038)
@@ -52,7 +52,6 @@
 %%DSO%%%%HTTP_TARANTOOL%%libexec/nginx/ngx_http_tnt_module.so
 %%DSO%%%%HTTP_UPLOAD_PROGRESS%%libexec/nginx/ngx_http_uploadprogress_module.so
 %%DSO%%%%HTTP_UPLOAD%%libexec/nginx/ngx_http_upload_module.so
-%%DSO%%%%HTTP_UPSTREAM_CHECK%%libexec/nginx/ngx_http_upstream_check_module.so
 %%DSO%%%%HTTP_UPSTREAM_FAIR%%libexec/nginx/ngx_http_upstream_fair_module.so
 %%DSO%%%%HTTP_UPSTREAM_STICKY%%libexec/nginx/ngx_http_sticky_module.so
 %%DSO%%%%HTTP_VIDEO_THUMBEXTRACTOR%%libexec/nginx/ngx_http_video_thumbextractor_module.so