6 files changed, 50 insertions, 6 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index dc1b989ca000..51b26ac07def 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.18.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index f6d467d54e93..968d52c7730f 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -118,12 +118,14 @@ HTTP_IP2PROXY_LIB_DEPENDS=	libIP2Proxy.so:net/ip2proxy
 HTTP_IP2PROXY_VARS=		DSO_EXTMODS+=ip2proxy
 
 HTTP_JSON_STATUS_GH_TUPLE=	nginx-modules:ngx_http_json_status_module:1d2f303:json_status
-HTTP_JSON_STATUS_CONFIGURE_ON=	--add-module=${WRKSRC_json_status}
+HTTP_JSON_STATUS_VARS=		DSO_EXTMODS+=json_status
+HTTP_JSON_STATUS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_json_status_module-config
 
 HTTP_MOGILEFS_MASTER_SITES=	http://www.grid.net.ru/nginx/download/:mogilefs
 HTTP_MOGILEFS_DISTFILES=	nginx_mogilefs_module-1.0.4.tar.gz:mogilefs
-HTTP_MOGILEFS_CONFIGURE_ON=	--add-module=${WRKDIR}/nginx_mogilefs_module-1.0.4
-HTTP_MOGILEFS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_http_mogilefs_module.c
+HTTP_MOGILEFS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_http_mogilefs_module.c \
+				${PATCHDIR}/extra-patch-nginx_mogilefs_module-config
+HTTP_MOGILEFS_VARS=		DSO_EXTDIRS+=nginx_mogilefs_module-1.0.4
 
 HTTP_MP4_H264_MASTER_SITES=	http://h264.code-shop.com/download/:mp4streaming
 HTTP_MP4_H264_DISTFILES=	nginx_mod_h264_streaming-2.2.7.tar.gz:mp4streaming
@@ -131,8 +133,9 @@ HTTP_MP4_H264_CONFIGURE_ON=	--add-module=${WRKDIR}/nginx_mod_h264_streaming-2.2.
 HTTP_MP4_H264_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_http_streaming_module.c
 
 HTTP_NOTICE_GH_TUPLE=		kr:nginx-notice:3c95966:notice
-HTTP_NOTICE_CONFIGURE_ON=	--add-module=${WRKSRC_notice}
-HTTP_NOTICE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_http_notice_module.c
+HTTP_NOTICE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_http_notice_module.c \
+				${PATCHDIR}/extra-patch-nginx-notice-config
+HTTP_NOTICE_VARS=		DSO_EXTMODS+=notice
 
 HTTP_PUSH_GH_TUPLE=		slact:nchan:v1.2.6:push
 HTTP_PUSH_VARS=			DSO_EXTMODS+=push
diff --git a/www/nginx-devel/files/extra-patch-nginx-notice-config b/www/nginx-devel/files/extra-patch-nginx-notice-config
new file mode 100644
index 000000000000..cd333a115624
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-nginx-notice-config
@@ -0,0 +1,13 @@
+--- ../nginx-notice-3c95966/config.orig	2020-04-25 18:03:28.543102000 -0400
++++ ../nginx-notice-3c95966/config	2020-04-25 18:04:14.387235000 -0400
+@@ -1,3 +1,8 @@
+ ngx_addon_name=ngx_http_notice_module
+-HTTP_MODULES="$HTTP_MODULES ngx_http_notice_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_notice_module.c"
++
++ngx_module_name="$ngx_addon_name"
++ngx_module_type=HTTP
++
++ngx_module_srcs="$ngx_addon_dir/ngx_http_notice_module.c"
++
++. auto/module
diff --git a/www/nginx-devel/files/extra-patch-nginx_mogilefs_module-config b/www/nginx-devel/files/extra-patch-nginx_mogilefs_module-config
new file mode 100644
index 000000000000..48a67fffb608
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-nginx_mogilefs_module-config
@@ -0,0 +1,13 @@
+--- ../nginx_mogilefs_module-1.0.4/config.orig	2020-04-25 17:51:45.544308000 -0400
++++ ../nginx_mogilefs_module-1.0.4/config	2020-04-25 17:54:01.862958000 -0400
+@@ -1,3 +1,8 @@
+ ngx_addon_name=ngx_http_mogilefs_module
+-HTTP_MODULES="$HTTP_MODULES ngx_http_mogilefs_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_mogilefs_module.c"
++
++ngx_module_name="$ngx_addon_name"
++ngx_module_type=HTTP
++
++ngx_module_srcs="$ngx_addon_dir/ngx_http_mogilefs_module.c"
++
++. auto/module
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_json_status_module-config b/www/nginx-devel/files/extra-patch-ngx_http_json_status_module-config
new file mode 100644
index 000000000000..84c4a62ef6cf
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-ngx_http_json_status_module-config
@@ -0,0 +1,12 @@
+--- ../ngx_http_json_status_module-1d2f303/config.orig	2020-04-25 16:16:47.024292000 -0400
++++ ../ngx_http_json_status_module-1d2f303/config	2020-04-25 16:18:39.461340000 -0400
+@@ -1,4 +1,6 @@
+ ngx_addon_name=ngx_http_json_status_module
+-HTTP_MODULES="$HTTP_MODULES ngx_http_json_status_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_json_status_module.c"
+-NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/ngx_http_json_status_module.h"
++ngx_module_name="$ngx_addon_name"
++ngx_module_type=HTTP
++ngx_module_srcs="$ngx_addon_dir/ngx_http_json_status_module.c"
++ngx_module_deps="$ngx_addon_dir/ngx_http_json_status_module.h"
++. auto/module
diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist
index 6c17b154d7be..9944d8f6d7a2 100644
--- a/www/nginx-devel/pkg-plist
+++ b/www/nginx-devel/pkg-plist
@@ -40,6 +40,9 @@
 %%DSO%%%%HTTP_IMAGE_FILTER%%libexec/nginx/ngx_http_image_filter_module.so
 %%DSO%%%%HTTP_IP2LOCATION%%libexec/nginx/ngx_http_ip2location_module.so
 %%DSO%%%%HTTP_IP2PROXY%%libexec/nginx/ngx_http_ip2proxy_module.so
+%%DSO%%%%HTTP_JSON_STATUS%%libexec/nginx/ngx_http_json_status_module.so
+%%DSO%%%%HTTP_MOGILEFS%%libexec/nginx/ngx_http_mogilefs_module.so
+%%DSO%%%%HTTP_NOTICE%%libexec/nginx/ngx_http_notice_module.so
 %%DSO%%%%HTTP_PERL%%libexec/nginx/ngx_http_perl_module.so
 %%DSO%%%%HTTP_PUSH%%libexec/nginx/ngx_nchan_module.so
 %%DSO%%%%HTTP_PUSH_STREAM%%libexec/nginx/ngx_http_push_stream_module.so