svn commit: r546072 - in head/www/nginx: . files

[Jochen Neumeister]

Author: joneum
Date: Mon Aug 24 12:25:07 2020
New Revision: 546072
URL: https://svnweb.freebsd.org/changeset/ports/546072

Log:
  Partially revert back r538085 cause upstream_check third-party
  dynamic module can't work as expected, so let's keep it static for now.
  
  PR:		247523
  Sponsored by:	Netzkommune GmbH

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

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Mon Aug 24 12:19:10 2020	(r546071)
+++ head/www/nginx/Makefile	Mon Aug 24 12:25:07 2020	(r546072)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.18.0
-PORTREVISION?=	23
+PORTREVISION?=	24
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \

Modified: head/www/nginx/Makefile.extmod
==============================================================================
--- head/www/nginx/Makefile.extmod	Mon Aug 24 12:19:10 2020	(r546071)
+++ head/www/nginx/Makefile.extmod	Mon Aug 24 12:25:07 2020	(r546072)
@@ -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/pkg-plist
==============================================================================
--- head/www/nginx/pkg-plist	Mon Aug 24 12:19:10 2020	(r546071)
+++ head/www/nginx/pkg-plist	Mon Aug 24 12:25:07 2020	(r546072)
@@ -51,7 +51,6 @@
 %%DSO%%%%HTTP_TARANTOOL%%libexec/nginx/ngx_http_tnt_module.so
 %%DSO%%%%HTTP_UPLOAD%%libexec/nginx/ngx_http_upload_module.so
 %%DSO%%%%HTTP_UPLOAD_PROGRESS%%libexec/nginx/ngx_http_uploadprogress_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