www/nginx*: implement dynamic modules build

It's possible now to build an additional module as a dynamic module.
Bump PKGREVISION.

While I'm here take over the maintainership for www/nginx (*).

Approved by:	joerg (*)

8 files changed, 129 insertions, 39 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 42f9733330e..3b4aa052e0a 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.71 2022/03/09 18:48:17 osa Exp $
+# $NetBSD: Makefile,v 1.72 2022/03/10 03:40:30 osa Exp $
 
 DISTNAME=	nginx-1.21.6
 
 MAINTAINER=	osa@NetBSD.org
 
-PKGREVISION=	1 
+PKGREVISION=	2 
 .include "../../www/nginx/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/nginx-devel/PLIST b/www/nginx-devel/PLIST
index b0366eb81d5..fb0f51cddeb 100644
--- a/www/nginx-devel/PLIST
+++ b/www/nginx-devel/PLIST
@@ -1,4 +1,25 @@
-@comment $NetBSD: PLIST,v 1.5 2017/10/28 10:57:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2022/03/10 03:40:30 osa Exp $
+${PLIST.dso}${PLIST.arrayvar}libexec/nginx/ngx_http_array_var_module.so
+${PLIST.dso}${PLIST.cprg}libexec/nginx/ngx_http_cache_purge_module.so
+${PLIST.dso}${PLIST.dav}libexec/nginx/ngx_http_dav_ext_module.so
+${PLIST.dso}${PLIST.echo}libexec/nginx/ngx_http_echo_module.so
+${PLIST.dso}${PLIST.encses}libexec/nginx/ngx_http_encrypted_session_module.so
+${PLIST.dso}${PLIST.forminput}libexec/nginx/ngx_http_form_input_module.so
+${PLIST.dso}${PLIST.geoip2}libexec/nginx/ngx_http_geoip2_module.so
+${PLIST.dso}${PLIST.geoip2}libexec/nginx/ngx_stream_geoip2_module.so
+${PLIST.dso}${PLIST.headmore}libexec/nginx/ngx_http_headers_more_filter_module.so
+${PLIST.dso}${PLIST.imagefilter}libexec/nginx/ngx_http_image_filter_module.so
+${PLIST.dso}${PLIST.lua}libexec/nginx/ngx_http_lua_module.so
+${PLIST.dso}${PLIST.mail}libexec/nginx/ngx_mail_module.so
+${PLIST.dso}${PLIST.naxsi}libexec/nginx/ngx_http_naxsi_module.so
+${PLIST.dso}${PLIST.nchan}libexec/nginx/ngx_nchan_module.so
+${PLIST.dso}${PLIST.ndk}libexec/nginx/ndk_http_module.so
+${PLIST.dso}${PLIST.njs}libexec/nginx/ngx_http_js_module.so
+${PLIST.dso}${PLIST.njs}libexec/nginx/ngx_stream_js_module.so
+${PLIST.dso}${PLIST.perl}libexec/nginx/ngx_http_perl_module.so
+${PLIST.dso}${PLIST.rtmp}libexec/nginx/ngx_rtmp_module.so
+${PLIST.dso}${PLIST.setmisc}libexec/nginx/ngx_http_set_misc_module.so
+${PLIST.dso}${PLIST.stream}libexec/nginx/ngx_stream_module.so
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.${SOEXT}
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm
 man/man8/nginx.8
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 7d931396f07..441c66556f6 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.74 2022/03/09 14:10:34 osa Exp $
+$NetBSD: distinfo,v 1.75 2022/03/10 03:40:30 osa Exp $
 
 BLAKE2s (array-var-nginx-module-0.05.tar.gz) = 2f9af1e0eb209b7c20aa58cd8ec2afb1eb1cc122c5f4ea169e34131c463c1c26
 SHA512 (array-var-nginx-module-0.05.tar.gz) = 7c9fa9b76bc7cd2473ceae6d5ffb8de26993be9293ea967908d6c4550e086affa7016df4c936fb0b79f1142dc0aa1a5f2058d417e6433b5a3497a45d7e866e84
@@ -21,6 +21,9 @@ Size (lua-nginx-module-0.10.20.tar.gz) = 668516 bytes
 BLAKE2s (naxsi-1.3.tar.gz) = d3c819d8fbd2a896c56138f028b92fa4b26a51168ff24334f76e3d1d07626927
 SHA512 (naxsi-1.3.tar.gz) = d7aac69b5eceeb1b0db4741201159ade1e0e7f6f7c3e8c4afa2f8959c6c00c3b5285d5185747c2fb0b1400efda02e96799836315e7e492bb4a059b14acb2142d
 Size (naxsi-1.3.tar.gz) = 235626 bytes
+BLAKE2s (nchan-1.2.12.tar.gz) = 1505dd8fa8562643e0b7cfb1c34e12c6044bd604eced52eb6d968ebca9b39d75
+SHA512 (nchan-1.2.12.tar.gz) = 1378ecf7499603319f432a8ea4693f0bc7a18713cd02b7ed9eecd8dfa76b54dcef475b7b028ddfd2750dcb01e2ac73f8605a96950398fbea31ffa8b22fcacfc0
+Size (nchan-1.2.12.tar.gz) = 716150 bytes
 BLAKE2s (nginx-1.21.6.tar.gz) = cc9128aaf36be8c2d678588db95cd623b67746683364729f13e645a0192ed4dd
 SHA512 (nginx-1.21.6.tar.gz) = 10b0cdd13b26687104bf11e6b850fd851e9d8881bdf67f72c062d956e661da4d70482e6ec3123405b324ad7ed821a8bcc67b742dce9f59e972407fa437ddcad4
 Size (nginx-1.21.6.tar.gz) = 1073364 bytes
@@ -30,9 +33,6 @@ Size (nginx-dav-ext-module-3.0.0.tar.gz) = 14558 bytes
 BLAKE2s (nginx-rtmp-module-1.2.2.tar.gz) = 5de03b71bb16b4129f1a2a99446f65ef6eeb3fd48bfc925e94fc27e99da3c069
 SHA512 (nginx-rtmp-module-1.2.2.tar.gz) = 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81
 Size (nginx-rtmp-module-1.2.2.tar.gz) = 519934 bytes
-BLAKE2s (nginx_http_push_module-1.2.12.tar.gz) = 1505dd8fa8562643e0b7cfb1c34e12c6044bd604eced52eb6d968ebca9b39d75
-SHA512 (nginx_http_push_module-1.2.12.tar.gz) = 1378ecf7499603319f432a8ea4693f0bc7a18713cd02b7ed9eecd8dfa76b54dcef475b7b028ddfd2750dcb01e2ac73f8605a96950398fbea31ffa8b22fcacfc0
-Size (nginx_http_push_module-1.2.12.tar.gz) = 716150 bytes
 BLAKE2s (ngx_cache_purge-2.5.1.tar.gz) = f89badfa0dbc3c338129291d7c56f978d6db0348d5aaa0d723000881ae9b7b8d
 SHA512 (ngx_cache_purge-2.5.1.tar.gz) = 3ad37b4a251fb85a9a384f87fea5ca640166e3d7173c6ed9a857b191ae5f2e93819483b5d423fcafe8a10239b571677b342cc2d2d5d62315816f1316d7d5bb76
 Size (ngx_cache_purge-2.5.1.tar.gz) = 16614 bytes
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 778fbf994b1..f3add874a8f 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.106 2022/03/09 18:48:17 osa Exp $
+# $NetBSD: Makefile,v 1.107 2022/03/10 03:40:30 osa Exp $
 
 DISTNAME=	nginx-1.20.2
 
-MAINTAINER=	joerg@NetBSD.org
+MAINTAINER=	osa@NetBSD.org
 
-PKGREVISION=	2
+PKGREVISION=	3
 .include "../../www/nginx/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/nginx/Makefile.common b/www/nginx/Makefile.common
index 48152e4a40e..b92862a0d14 100644
--- a/www/nginx/Makefile.common
+++ b/www/nginx/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2020/11/25 11:40:06 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.21 2022/03/10 03:40:30 osa Exp $
 # used by www/nginx/Makefile
 # used by www/nginx-devel/Makefile
 
@@ -114,5 +114,10 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
 		${DESTDIR}${PERL5_INSTALLVENDORARCH}
 .endif
+.if !empty(PKG_OPTIONS:Mdso)
+	${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/libexec/nginx
+	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
+		-exec ${INSTALL_PROGRAM} {} ${DESTDIR}${PREFIX}/libexec/nginx \;)
+.endif
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/www/nginx/PLIST b/www/nginx/PLIST
index 9bdf8f5c9d3..2fc5f01c6a2 100644
--- a/www/nginx/PLIST
+++ b/www/nginx/PLIST
@@ -1,4 +1,25 @@
-@comment $NetBSD: PLIST,v 1.11 2020/06/01 06:18:51 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2022/03/10 03:40:30 osa Exp $
+${PLIST.dso}${PLIST.arrayvar}libexec/nginx/ngx_http_array_var_module.so
+${PLIST.dso}${PLIST.cprg}libexec/nginx/ngx_http_cache_purge_module.so
+${PLIST.dso}${PLIST.dav}libexec/nginx/ngx_http_dav_ext_module.so
+${PLIST.dso}${PLIST.echo}libexec/nginx/ngx_http_echo_module.so
+${PLIST.dso}${PLIST.encses}libexec/nginx/ngx_http_encrypted_session_module.so
+${PLIST.dso}${PLIST.forminput}libexec/nginx/ngx_http_form_input_module.so
+${PLIST.dso}${PLIST.geoip2}libexec/nginx/ngx_http_geoip2_module.so
+${PLIST.dso}${PLIST.geoip2}libexec/nginx/ngx_stream_geoip2_module.so
+${PLIST.dso}${PLIST.headmore}libexec/nginx/ngx_http_headers_more_filter_module.so
+${PLIST.dso}${PLIST.imagefilter}libexec/nginx/ngx_http_image_filter_module.so
+${PLIST.dso}${PLIST.lua}libexec/nginx/ngx_http_lua_module.so
+${PLIST.dso}${PLIST.mail}libexec/nginx/ngx_mail_module.so
+${PLIST.dso}${PLIST.naxsi}libexec/nginx/ngx_http_naxsi_module.so
+${PLIST.dso}${PLIST.nchan}libexec/nginx/ngx_nchan_module.so
+${PLIST.dso}${PLIST.ndk}libexec/nginx/ndk_http_module.so
+${PLIST.dso}${PLIST.njs}libexec/nginx/ngx_http_js_module.so
+${PLIST.dso}${PLIST.njs}libexec/nginx/ngx_stream_js_module.so
+${PLIST.dso}${PLIST.perl}libexec/nginx/ngx_http_perl_module.so
+${PLIST.dso}${PLIST.rtmp}libexec/nginx/ngx_rtmp_module.so
+${PLIST.dso}${PLIST.setmisc}libexec/nginx/ngx_http_set_misc_module.so
+${PLIST.dso}${PLIST.stream}libexec/nginx/ngx_stream_module.so
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.${SOEXT}
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm
 man/man8/nginx.8
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 4c39623b487..04b1f0f85f0 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.92 2022/03/09 14:10:34 osa Exp $
+$NetBSD: distinfo,v 1.93 2022/03/10 03:40:30 osa Exp $
 
 BLAKE2s (array-var-nginx-module-0.05.tar.gz) = 2f9af1e0eb209b7c20aa58cd8ec2afb1eb1cc122c5f4ea169e34131c463c1c26
 SHA512 (array-var-nginx-module-0.05.tar.gz) = 7c9fa9b76bc7cd2473ceae6d5ffb8de26993be9293ea967908d6c4550e086affa7016df4c936fb0b79f1142dc0aa1a5f2058d417e6433b5a3497a45d7e866e84
@@ -21,6 +21,9 @@ Size (lua-nginx-module-0.10.20.tar.gz) = 668516 bytes
 BLAKE2s (naxsi-1.3.tar.gz) = d3c819d8fbd2a896c56138f028b92fa4b26a51168ff24334f76e3d1d07626927
 SHA512 (naxsi-1.3.tar.gz) = d7aac69b5eceeb1b0db4741201159ade1e0e7f6f7c3e8c4afa2f8959c6c00c3b5285d5185747c2fb0b1400efda02e96799836315e7e492bb4a059b14acb2142d
 Size (naxsi-1.3.tar.gz) = 235626 bytes
+BLAKE2s (nchan-1.2.12.tar.gz) = 1505dd8fa8562643e0b7cfb1c34e12c6044bd604eced52eb6d968ebca9b39d75
+SHA512 (nchan-1.2.12.tar.gz) = 1378ecf7499603319f432a8ea4693f0bc7a18713cd02b7ed9eecd8dfa76b54dcef475b7b028ddfd2750dcb01e2ac73f8605a96950398fbea31ffa8b22fcacfc0
+Size (nchan-1.2.12.tar.gz) = 716150 bytes
 BLAKE2s (nginx-1.20.2.tar.gz) = 6b437b200e57db3988bd6737740c11833e5091e3b84eef1fbd95168a4f5914b2
 SHA512 (nginx-1.20.2.tar.gz) = 8b65e881ea4ac6162cbf32e5e95cf47a6d5418819f8763ca4a781cffa38187dd7886d4bc195d000a7046111a27121ff25800f8645405174995247e6738b4279a
 Size (nginx-1.20.2.tar.gz) = 1062124 bytes
@@ -30,9 +33,6 @@ Size (nginx-dav-ext-module-3.0.0.tar.gz) = 14558 bytes
 BLAKE2s (nginx-rtmp-module-1.2.2.tar.gz) = 5de03b71bb16b4129f1a2a99446f65ef6eeb3fd48bfc925e94fc27e99da3c069
 SHA512 (nginx-rtmp-module-1.2.2.tar.gz) = 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81
 Size (nginx-rtmp-module-1.2.2.tar.gz) = 519934 bytes
-BLAKE2s (nginx_http_push_module-1.2.12.tar.gz) = 1505dd8fa8562643e0b7cfb1c34e12c6044bd604eced52eb6d968ebca9b39d75
-SHA512 (nginx_http_push_module-1.2.12.tar.gz) = 1378ecf7499603319f432a8ea4693f0bc7a18713cd02b7ed9eecd8dfa76b54dcef475b7b028ddfd2750dcb01e2ac73f8605a96950398fbea31ffa8b22fcacfc0
-Size (nginx_http_push_module-1.2.12.tar.gz) = 716150 bytes
 BLAKE2s (ngx_cache_purge-2.5.1.tar.gz) = f89badfa0dbc3c338129291d7c56f978d6db0348d5aaa0d723000881ae9b7b8d
 SHA512 (ngx_cache_purge-2.5.1.tar.gz) = 3ad37b4a251fb85a9a384f87fea5ca640166e3d7173c6ed9a857b191ae5f2e93819483b5d423fcafe8a10239b571677b342cc2d2d5d62315816f1316d7d5bb76
 Size (ngx_cache_purge-2.5.1.tar.gz) = 16614 bytes
diff --git a/www/nginx/options.mk b/www/nginx/options.mk
index 7dfd681f3a9..a1601469ab1 100644
--- a/www/nginx/options.mk
+++ b/www/nginx/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.72 2022/03/09 14:10:34 osa Exp $
+# $NetBSD: options.mk,v 1.73 2022/03/10 03:40:30 osa Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS=	array-var auth-request cache-purge dav debug
-PKG_SUPPORTED_OPTIONS+=	echo encrypted-session flv form-input
+PKG_SUPPORTED_OPTIONS+=	dso echo encrypted-session flv form-input
 PKG_SUPPORTED_OPTIONS+=	geoip geoip2 gtools gzip headers-more http2
 PKG_SUPPORTED_OPTIONS+=	image-filter luajit mail-proxy memcache
 PKG_SUPPORTED_OPTIONS+=	naxsi njs pcre perl push realip rtmp
@@ -12,10 +12,21 @@ PKG_SUGGESTED_OPTIONS=	pcre ssl
 
 PKG_OPTIONS_LEGACY_OPTS+=	v2:http2
 
-PLIST_VARS+=		naxsi perl uwsgi
+PLIST_VARS+=		arrayvar cprg dav dso echo encses forminput geoip2
+PLIST_VARS+=		headmore imagefilter lua mail naxsi nchan ndk njs
+PLIST_VARS+=		perl rtmp setmisc stream uwsgi
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mdso)
+CONFIGURE_ARGS+=	--modules-path=${PREFIX}/libexec/nginx
+_addbasemod=		=dynamic
+_addextmod=		add-dynamic-module
+PLIST.dso=		yes
+.else
+_addextmod=		add-module
+.endif
+
 # documentation says naxsi must be the first module
 .if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum) || make(mdi) || make(distclean)
 NAXSI_VERSION=			1.3
@@ -24,7 +35,8 @@ NAXSI_DISTFILE=			${NAXSI_DISTNAME}.tar.gz
 SITES.${NAXSI_DISTFILE}=	-${MASTER_SITE_GITHUB:=nbs-system/naxsi/archive/}${NAXSI_VERSION}.tar.gz
 DISTFILES+=			${NAXSI_DISTFILE}
 PLIST.naxsi=			yes
-CONFIGURE_ARGS+=		--add-module=../${NAXSI_DISTNAME}/naxsi_src
+DSO_EXTMODS+=			naxsi
+NAXSI_SUBDIR=			/naxsi_src
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
@@ -62,7 +74,8 @@ DAV_DISTFILE=		${DAV_DISTNAME}.tar.gz
 SITES.${DAV_DISTFILE}=	-${MASTER_SITE_GITHUB:=arut/nginx-dav-ext-module/archive/}v${DAV_VERSION}.tar.gz
 DISTFILES+=		${DAV_DISTFILE}
 CONFIGURE_ARGS+=	--with-http_dav_module
-CONFIGURE_ARGS+=	--add-module=../${DAV_DISTNAME}
+DSO_EXTMODS+=		dav
+PLIST.dav=		yes
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 SUBST_CLASSES+=		fix-xslt
@@ -100,7 +113,8 @@ CONFIGURE_ARGS+=	--with-google_perftools_module
 .endif
 
 .if !empty(PKG_OPTIONS:Mmail-proxy)
-CONFIGURE_ARGS+=	--with-mail
+DSO_BASEMODS+=		mail
+PLIST.mail=		yes
 .endif
 
 .if empty(PKG_OPTIONS:Mmemcache)
@@ -114,8 +128,9 @@ CONFIGURE_ARGS+=	--with-http_realip_module
 # NDK must be added once and before 3rd party modules needing it
 .for mod in luajit set-misc array-var form-input encrypted-session
 .  if !defined(NEED_NDK) && !empty(PKG_OPTIONS:M${mod}:O)
-CONFIGURE_ARGS+=	--add-module=../${NDK_DISTNAME}
+FIRST_DSO_EXTMODS+=	ndk
 NEED_NDK=		yes
+PLIST.ndk=		yes
 .  endif
 .endfor
 .if defined(NEED_NDK) || make(makesum) || make(mdi) || make(distclean)
@@ -135,7 +150,8 @@ DISTFILES+=		${LUA_DISTFILE}
 .include "../../lang/LuaJIT2/buildlink3.mk"
 CONFIGURE_ENV+=		LUAJIT_LIB=${PREFIX}/lib
 CONFIGURE_ENV+=		LUAJIT_INC=${PREFIX}/include/luajit-2.0
-CONFIGURE_ARGS+=	--add-module=../${LUA_DISTNAME}
+DSO_EXTMODS+=		lua
+PLIST.lua=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mecho) || make(makesum) || make(mdi) || make(distclean)
@@ -144,7 +160,8 @@ ECHOMOD_DISTNAME=		echo-nginx-module-${ECHOMOD_VERSION}
 ECHOMOD_DISTFILE=		${ECHOMOD_DISTNAME}.tar.gz
 SITES.${ECHOMOD_DISTFILE}=	-${MASTER_SITE_GITHUB:=openresty/echo-nginx-module/archive/}v${ECHOMOD_VERSION}.tar.gz
 DISTFILES+=			${ECHOMOD_DISTFILE}
-CONFIGURE_ARGS+=		--add-module=../${ECHOMOD_DISTNAME}
+DSO_EXTMODS+=			echomod
+PLIST.echo=			yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mset-misc) || make(makesum) || make(mdi) || make(distclean)
@@ -153,7 +170,8 @@ SETMISC_DISTNAME=		set-misc-nginx-module-${SETMISC_VERSION}
 SETMISC_DISTFILE=		${SETMISC_DISTNAME}.tar.gz
 SITES.${SETMISC_DISTFILE}=	-${MASTER_SITE_GITHUB:=openresty/set-misc-nginx-module/archive/}v${SETMISC_VERSION}.tar.gz
 DISTFILES+=			${SETMISC_DISTFILE}
-CONFIGURE_ARGS+=		--add-module=../${SETMISC_DISTNAME}
+DSO_EXTMODS+=			setmisc
+PLIST.setmisc=			yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mgeoip2) || make(makesum) || make(mdi) || make(distclean)
@@ -162,7 +180,8 @@ GEOIP2_DISTNAME=		ngx_http_geoip2_module-${GEOIP2_VERSION}
 GEOIP2_DISTFILE=		${GEOIP2_DISTNAME}.tar.gz
 SITES.${GEOIP2_DISTFILE}=	-${MASTER_SITE_GITHUB:=leev/ngx_http_geoip2_module/archive/}${GEOIP2_VERSION}.tar.gz
 DISTFILES+=			${GEOIP2_DISTFILE}
-CONFIGURE_ARGS+=		--add-module=../${GEOIP2_DISTNAME}
+DSO_EXTMODS+=			geoip2
+PLIST.geoip2=			yes
 .include "../../geography/libmaxminddb/buildlink3.mk"
 .endif
 
@@ -172,7 +191,8 @@ ARRAYVAR_DISTNAME=		array-var-nginx-module-${ARRAYVAR_VERSION}
 ARRAYVAR_DISTFILE=		${ARRAYVAR_DISTNAME}.tar.gz
 SITES.${ARRAYVAR_DISTFILE}=	-${MASTER_SITE_GITHUB:=openresty/array-var-nginx-module/archive/}v${ARRAYVAR_VERSION}.tar.gz
 DISTFILES+=			${ARRAYVAR_DISTFILE}
-CONFIGURE_ARGS+=		--add-module=../${ARRAYVAR_DISTNAME}
+DSO_EXTMODS+=			arrayvar
+PLIST.arrayvar=			yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mencrypted-session) || make(makesum) || make(mdi) || make(distclean)
@@ -181,7 +201,8 @@ ENCSESS_DISTNAME=		encrypted-session-nginx-module-${ENCSESS_VERSION}
 ENCSESS_DISTFILE=		${ENCSESS_DISTNAME}.tar.gz
 SITES.${ENCSESS_DISTFILE}=	-${MASTER_SITE_GITHUB:=openresty/encrypted-session-nginx-module/archive/}v${ENCSESS_VERSION}.tar.gz
 DISTFILES+=			${ENCSESS_DISTFILE}
-CONFIGURE_ARGS+=		--add-module=../${ENCSESS_DISTNAME}
+DSO_EXTMODS+=			encsess
+PLIST.encses=			yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mform-input) || make(makesum) || make(mdi) || make(distclean)
@@ -190,7 +211,8 @@ FORMINPUT_DISTNAME=		form-input-nginx-module-${FORMINPUT_VERSION}
 FORMINPUT_DISTFILE=		${FORMINPUT_DISTNAME}.tar.gz
 SITES.${FORMINPUT_DISTFILE}=	-${MASTER_SITE_GITHUB:=calio/form-input-nginx-module/archive/}v${FORMINPUT_VERSION}.tar.gz
 DISTFILES+=			${FORMINPUT_DISTFILE}
-CONFIGURE_ARGS+=		--add-module=../${FORMINPUT_DISTNAME}
+DSO_EXTMODS+=			forminput
+PLIST.forminput=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mheaders-more) || make(makesum) || make(mdi) || make(distclean)
@@ -199,7 +221,8 @@ HEADMORE_DISTNAME=		headers-more-nginx-module-${HEADMORE_VERSION}
 HEADMORE_DISTFILE=		${HEADMORE_DISTNAME}.tar.gz
 SITES.${HEADMORE_DISTFILE}=	-${MASTER_SITE_GITHUB:=openresty/headers-more-nginx-module/archive/}v${HEADMORE_VERSION}.tar.gz
 DISTFILES+=			${HEADMORE_DISTFILE}
-CONFIGURE_ARGS+=		--add-module=../${HEADMORE_DISTNAME}
+DSO_EXTMODS+=			headmore
+PLIST.headmore=			yes
 .endif
 
 .if !empty(PKG_OPTIONS:Muwsgi)
@@ -212,21 +235,23 @@ CONFIGURE_ARGS+=	--without-http_uwsgi_module
 
 .if !empty(PKG_OPTIONS:Mpush) || make(makesum) || make(mdi) || make(distclean)
 PUSH_VERSION=		1.2.12
-PUSH_DISTNAME=		nginx_http_push_module-${PUSH_VERSION}
+PUSH_DISTNAME=		nchan-${PUSH_VERSION}
 PUSH_DISTFILE=		${PUSH_DISTNAME}.tar.gz
 SITES.${PUSH_DISTFILE}=	-${MASTER_SITE_GITHUB:=slact/nchan/archive/}v${PUSH_VERSION}.tar.gz
 DISTFILES+=		${PUSH_DISTFILE}
-CONFIGURE_ARGS+=	--add-module=../nchan-${PUSH_VERSION}
+DSO_EXTMODS+=		push
+PLIST.nchan=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mimage-filter)
 .include "../../graphics/gd/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-http_image_filter_module
+DSO_BASEMODS+=		http_image_filter_module
 SUBST_CLASSES+=		fix-gd
 SUBST_STAGE.fix-gd=	pre-configure
 SUBST_FILES.fix-gd=	auto/lib/libgd/conf
 SUBST_SED.fix-gd=	-e 's,/usr/pkg,${BUILDLINK_PREFIX.gd},g'
 SUBST_NOOP_OK.fix-gd=	yes
+PLIST.imagefilter=	yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mslice)
@@ -238,7 +263,7 @@ CONFIGURE_ARGS+=	--with-http_stub_status_module
 .endif
 
 .if !empty(PKG_OPTIONS:Mperl)
-CONFIGURE_ARGS+=	--with-http_perl_module
+DSO_BASEMODS+=		http_perl_module
 CONFIGURE_ARGS+=	--with-perl=${PERL5:Q}
 INSTALLATION_DIRS+=	${PERL5_INSTALLVENDORARCH}/auto/nginx
 PLIST.perl=		yes
@@ -260,7 +285,8 @@ CPRG_DISTNAME=		ngx_cache_purge-${CPRG_VERSION}
 CPRG_DISTFILE=		${CPRG_DISTNAME}.tar.gz
 SITES.${CPRG_DISTFILE}=	-${MASTER_SITE_GITHUB:=nginx-modules/ngx_cache_purge/archive/}${CPRG_VERSION}.tar.gz
 DISTFILES+=		${CPRG_DISTFILE}
-CONFIGURE_ARGS+=	--add-module=../${CPRG_DISTNAME}
+DSO_EXTMODS+=		cprg
+PLIST.cprg=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Msecure-link)
@@ -268,7 +294,9 @@ CONFIGURE_ARGS+=	--with-http_secure_link_module
 .endif
 
 .if !empty(PKG_OPTIONS:Mstream-ssl-preread)
-CONFIGURE_ARGS+=	--with-stream --with-stream_ssl_preread_module
+DSO_BASEMODS+=		stream
+CONFIGURE_ARGS+=	--with-stream_ssl_preread_module
+PLIST.stream=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mrtmp) || make(makesum) || make(mdi) || make(distclean)
@@ -277,7 +305,8 @@ RTMP_DISTNAME=		nginx-rtmp-module-${RTMP_VERSION}
 RTMP_DISTFILE=		${RTMP_DISTNAME}.tar.gz
 SITES.${RTMP_DISTFILE}=	-${MASTER_SITE_GITHUB:=arut/nginx-rtmp-module/archive/}v${RTMP_VERSION}.tar.gz
 DISTFILES+=		${RTMP_DISTFILE}
-CONFIGURE_ARGS+=	--add-module=../${RTMP_DISTNAME}
+DSO_EXTMODS+=		rtmp
+PLIST.rtmp=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mnjs) || make(makesum) || make(mdi) || make(distclean)
@@ -286,5 +315,19 @@ NJS_DISTNAME=		njs-${NJS_VERSION}
 NJS_DISTFILE=		${NJS_DISTNAME}.tar.gz
 SITES.${NJS_DISTFILE}=	-${MASTER_SITE_GITHUB:=nginx/njs/archive/}${NJS_VERSION}.tar.gz
 DISTFILES+=		${NJS_DISTFILE}
-CONFIGURE_ARGS+=	--add-module=../${NJS_DISTNAME}/nginx
+DSO_EXTMODS+=		njs
+NJS_SUBDIR=		/nginx
+PLIST.njs=		yes
 .endif
+
+.for mod in ${DSO_BASEMODS}
+CONFIGURE_ARGS+=	--with-${mod}${_addbasemod}
+.endfor
+
+.for mod in ${FIRST_DSO_EXTMODS}
+CONFIGURE_ARGS+=	--${_addextmod}=../${${mod:tu}_DISTNAME}${${mod:tu}_SUBDIR}
+.endfor
+
+.for mod in ${DSO_EXTMODS}
+CONFIGURE_ARGS+=	--${_addextmod}=../${${mod:tu}_DISTNAME}${${mod:tu}_SUBDIR}
+.endfor