git: 62a91023c0af - main - www/{nginx,nginx-devel,freenginx}: 3rd-party modules management

Jochen Neumeister <[email protected]> Thu, 13 Aug 2026 22:42:24 +0000
Newsgroups	gmane.os.freebsd.devel.cvs.ports
Message-ID	<6a7e4850.465f7.72573b89__40487.6361879118$1786660960$gmane$org@gitrepo.freebsd.org>
The branch main has been updated by joneum:

URL: https://cgit.FreeBSD.org/ports/commit/?id=62a91023c0af4894d9ab79dd906de2b283002cf6

commit 62a91023c0af4894d9ab79dd906de2b283002cf6
Author:     Jochen Neumeister <[email protected]>
AuthorDate: 2026-08-13 22:41:51 +0000
Commit:     Jochen Neumeister <[email protected]>
CommitDate: 2026-08-13 22:42:16 +0000

    www/{nginx,nginx-devel,freenginx}: 3rd-party modules management
    
    Start moving the bundled 3rd-party modules into dedicated
    nginx-module-* ports, so that module versions are maintained in a
    single place instead of the GH_TUPLE lists of the nginx ports.
    
    As a first step, convert www/nginx-module-lua into a hybrid port
    that installs the lua-nginx-module sources next to the prebuilt
    DSO and use them in the three nginx ports via an unversioned
    BUILD_DEPENDS instead of fetching from GitHub.
    
    Sponsored by:   Netzkommune GmbH
---
 www/freenginx/Makefile          |   5 ++
 www/freenginx/Makefile.extmod   |   3 +-
 www/freenginx/distinfo          |   4 +-
 www/nginx-devel/Makefile        |   5 ++
 www/nginx-devel/Makefile.extmod |   4 +-
 www/nginx-devel/distinfo        |   4 +-
 www/nginx-module-lua/Makefile   |  12 ++--
 www/nginx-module-lua/pkg-plist  | 128 ++++++++++++++++++++++++++++++++++++++++
 www/nginx/Makefile              |   5 ++
 www/nginx/Makefile.extmod       |   4 +-
 www/nginx/distinfo              |   4 +-
 11 files changed, 160 insertions(+), 18 deletions(-)

diff --git a/www/freenginx/Makefile b/www/freenginx/Makefile
index b75bfb4e0ceb..de6f5725ac6f 100644
--- a/www/freenginx/Makefile
+++ b/www/freenginx/Makefile
@@ -334,6 +334,11 @@ post-patch-SFLOW-on:
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
+pre-configure-LUA-on:
+	@${RM} -rf ${WRKSRC_lua}
+	@cd ${LOCALBASE}/share/nginx/modules/nginx-module-lua && \
+		${COPYTREE_SHARE} . ${WRKSRC_lua}
+
 pre-configure-LUASTREAM-on:
 	@${RM} -rf ${WRKSRC_luastream}
 	@cd ${LOCALBASE}/share/nginx/modules/lua-stream-nginx-module && \
diff --git a/www/freenginx/Makefile.extmod b/www/freenginx/Makefile.extmod
index e73d73f78240..0d62cad50497 100644
--- a/www/freenginx/Makefile.extmod
+++ b/www/freenginx/Makefile.extmod
@@ -215,7 +215,8 @@ LUA_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
 LUA_RUN_DEPENDS=	lua-resty-core>0:www/lua-resty-core
 LUA_CONFIGURE_ENV=	LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
 			LUAJIT_LIB=${LOCALBASE}/lib
-LUA_GH_TUPLE=		openresty:lua-nginx-module:v0.10.29:lua
+LUA_BUILD_DEPENDS=	nginx-module-lua>0:www/nginx-module-lua
+WRKSRC_lua=		${WRKDIR}/lua-nginx-module
 LUA_VARS=		DSO_EXTMODS+=lua
 
 LUASTREAM_IMPLIES=	DEVEL_KIT
diff --git a/www/freenginx/distinfo b/www/freenginx/distinfo
index f70241c5f9e6..5eb6cd7bac84 100644
--- a/www/freenginx/distinfo
+++ b/www/freenginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1786282996
+TIMESTAMP = 1786659676
 SHA256 (freenginx-1.30.1.tar.gz) = 44f1df11967528631eb727a5ca28abd7e4e517e35757681c819e8f7c1d760be7
 SIZE (freenginx-1.30.1.tar.gz) = 1252835
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -93,8 +93,6 @@ SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5f
 SIZE (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 20617
 SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f03b2fa0b13591226363c8dd7930d7f02702cd5abada
 SIZE (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 139656
-SHA256 (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = ca2c2122b909529bf9d1a89e9a5763835a2bd2629def8cb279c550f638f0a78f
-SIZE (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = 892502
 SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8
 SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654
 SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 32a42256616cc674dca24c8654397390adff15b888b77eb74e0687f023c8751b
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 4e16548ef32a..c5ade37cbb2b 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -333,6 +333,11 @@ post-patch-SFLOW-on:
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
+pre-configure-LUA-on:
+	@${RM} -rf ${WRKSRC_lua}
+	@cd ${LOCALBASE}/share/nginx/modules/nginx-module-lua && \
+		${COPYTREE_SHARE} . ${WRKSRC_lua}
+
 pre-configure-LUASTREAM-on:
 	@${RM} -rf ${WRKSRC_luastream}
 	@cd ${LOCALBASE}/share/nginx/modules/lua-stream-nginx-module && \
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index ac061ab178a3..31e738be9b67 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -204,13 +204,13 @@ ICONV_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
 LET_GH_TUPLE=		baysao:nginx-let-module:c1f23aa:let
 LET_VARS=		DSO_EXTMODS+=let
 
-# YOU MUST UPDATE www/lua-resty-core IF YOU UPDATE THIS MODULE
 LUA_IMPLIES=		DEVEL_KIT
 LUA_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
 LUA_RUN_DEPENDS=	lua-resty-core>0:www/lua-resty-core
 LUA_CONFIGURE_ENV=	LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
 			LUAJIT_LIB=${LOCALBASE}/lib
-LUA_GH_TUPLE=		openresty:lua-nginx-module:v0.10.29:lua
+LUA_BUILD_DEPENDS=	nginx-module-lua>0:www/nginx-module-lua
+WRKSRC_lua=		${WRKDIR}/lua-nginx-module
 LUA_VARS=		DSO_EXTMODS+=lua
 
 LUASTREAM_IMPLIES=	DEVEL_KIT
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index abfdb40ae1b2..d03199d41ff9 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1786277743
+TIMESTAMP = 1786659675
 SHA256 (nginx-1.31.3.tar.gz) = a7657c50811c2d92d9895395e8b873ef60398142c4db21eb647811c38f6dd525
 SIZE (nginx-1.31.3.tar.gz) = 1344885
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -93,8 +93,6 @@ SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5f
 SIZE (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 20617
 SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f03b2fa0b13591226363c8dd7930d7f02702cd5abada
 SIZE (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 139656
-SHA256 (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = ca2c2122b909529bf9d1a89e9a5763835a2bd2629def8cb279c550f638f0a78f
-SIZE (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = 892502
 SHA256 (openresty-memc-nginx-module-v0.20_GH0.tar.gz) = a42dd56dd6e2144755a127bcd2a6cc1a488258dc5cdb751d6a3e5dd5b6989239
 SIZE (openresty-memc-nginx-module-v0.20_GH0.tar.gz) = 34736
 SHA256 (owasp-modsecurity-ModSecurity-nginx-fd28e6a_GH0.tar.gz) = deafee4e4145a73b9369999e261368b34d4f7ff1be2596a559abd9e1d5df5526
diff --git a/www/nginx-module-lua/Makefile b/www/nginx-module-lua/Makefile
index af2faf76f861..9abb3fddccce 100644
--- a/www/nginx-module-lua/Makefile
+++ b/www/nginx-module-lua/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nginx-module-lua
 DISTVERSION=	0.10.29
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/:nginx
 DISTFILES=	nginx-${NGINX_VERSION}.tar.gz:nginx
@@ -11,7 +11,7 @@ WWW=		https://github.com/openresty/lua-nginx-module
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	nginx:www/nginx
+LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 RUN_DEPENDS=	lua-resty-core>=0.1.32:www/lua-resty-core
 
 USES=		compiler:c11 gmake luajit:luajit-openresty ssl
@@ -23,6 +23,8 @@ GH_TUPLE=	openresty:lua-nginx-module:v${DISTVERSION}:lua \
 NGINX_VERSION=	1.30.4
 WRKSRC=		${WRKDIR}/nginx-${NGINX_VERSION}
 
+MODULESDIR=	${LOCALBASE}/share/nginx/modules/${PORTNAME}
+
 CONFIGURE_ENV=	LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
 		LUAJIT_LIB=${LOCALBASE}/lib
 
@@ -32,8 +34,6 @@ CONFIGURE_ARGS=	--with-compat \
 		--add-dynamic-module=${WRKSRC_ndk} \
 		--add-dynamic-module=${WRKSRC_lua}
 
-PLIST_FILES=	libexec/nginx/ngx_http_lua_module.so
-
 do-configure:
 	cd ${WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}
@@ -46,6 +46,10 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nginx
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_lua_module.so \
 		${STAGEDIR}${PREFIX}/libexec/nginx/ngx_http_lua_module.so
+	@${MKDIR} ${STAGEDIR}${MODULESDIR}/src
+	${INSTALL_DATA} ${WRKSRC_lua}/config ${STAGEDIR}${MODULESDIR}
+	@cd ${WRKSRC_lua}/src && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${MODULESDIR}/src
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/nginx/ngx_http_lua_module.so
diff --git a/www/nginx-module-lua/pkg-plist b/www/nginx-module-lua/pkg-plist
new file mode 100644
index 000000000000..8888a35677a7
--- /dev/null
+++ b/www/nginx-module-lua/pkg-plist
@@ -0,0 +1,128 @@
+libexec/nginx/ngx_http_lua_module.so
+share/nginx/modules/nginx-module-lua/config
+share/nginx/modules/nginx-module-lua/src/api/ngx_http_lua_api.h
+share/nginx/modules/nginx-module-lua/src/ddebug.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_accessby.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_accessby.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_api.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_args.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_args.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_autoconf.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_balancer.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_balancer.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_bodyfilterby.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_bodyfilterby.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_cache.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_cache.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_capturefilter.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_capturefilter.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_clfactory.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_clfactory.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_common.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_config.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_config.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_consts.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_consts.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_contentby.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_contentby.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_control.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_control.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_coroutine.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_coroutine.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ctx.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ctx.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_directive.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_directive.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_exception.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_exception.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_exitworkerby.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_exitworkerby.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_headerfilterby.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_headerfilterby.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_headers_in.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_headers_in.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_headers_out.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_headers_out.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_headers.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_headers.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_initby.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_initby.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_initworkerby.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_initworkerby.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_input_filters.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_input_filters.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_lex.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_lex.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_log_ringbuf.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_log_ringbuf.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_log.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_log.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_logby.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_logby.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_misc.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_misc.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_module.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ndk.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ndk.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_output.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_output.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_pcrefix.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_pcrefix.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_phase.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_pipe.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_pipe.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_probe.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_proxy_ssl_verifyby.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_proxy_ssl_verifyby.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_regex.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_req_body.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_req_body.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_req_method.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_rewriteby.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_rewriteby.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_script.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_script.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_semaphore.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_semaphore.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_server_rewriteby.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_server_rewriteby.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_setby.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_setby.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_shdict.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_shdict.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_sleep.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_sleep.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_socket_tcp.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_socket_tcp.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_socket_udp.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_socket_udp.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ssl_certby.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ssl_certby.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ssl_client_helloby.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ssl_client_helloby.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ssl_export_keying_material.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ssl_export_keying_material.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ssl_ocsp.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ssl_session_fetchby.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ssl_session_fetchby.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ssl_session_storeby.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ssl_session_storeby.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ssl.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_ssl.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_string.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_string.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_subrequest.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_subrequest.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_time.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_timer.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_timer.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_uri.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_uri.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_uthread.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_uthread.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_util.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_util.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_variable.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_worker_thread.c
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_worker_thread.h
+share/nginx/modules/nginx-module-lua/src/ngx_http_lua_worker.c
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 7252bdde95c0..dea6690c0520 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -330,6 +330,11 @@ post-patch-SFLOW-on:
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
+pre-configure-LUA-on:
+	@${RM} -rf ${WRKSRC_lua}
+	@cd ${LOCALBASE}/share/nginx/modules/nginx-module-lua && \
+		${COPYTREE_SHARE} . ${WRKSRC_lua}
+
 pre-configure-LUASTREAM-on:
 	@${RM} -rf ${WRKSRC_luastream}
 	@cd ${LOCALBASE}/share/nginx/modules/lua-stream-nginx-module && \
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index 5cdaee2effc7..b329059face5 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -202,13 +202,13 @@ ICONV_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
 LET_GH_TUPLE=		baysao:nginx-let-module:c1f23aa:let
 LET_VARS=		DSO_EXTMODS+=let
 
-# YOU MUST UPDATE www/lua-resty-core IF YOU UPDATE THIS MODULE
 LUA_IMPLIES=		DEVEL_KIT
 LUA_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
 LUA_RUN_DEPENDS=	lua-resty-core>0:www/lua-resty-core
 LUA_CONFIGURE_ENV=	LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
 			LUAJIT_LIB=${LOCALBASE}/lib
-LUA_GH_TUPLE=		openresty:lua-nginx-module:v0.10.29:lua
+LUA_BUILD_DEPENDS=	nginx-module-lua>0:www/nginx-module-lua
+WRKSRC_lua=		${WRKDIR}/lua-nginx-module
 LUA_VARS=		DSO_EXTMODS+=lua
 
 LUASTREAM_IMPLIES=	DEVEL_KIT
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index b258f71c1293..99eb2ca0faa7 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1786277689
+TIMESTAMP = 1786659775
 SHA256 (nginx-1.30.4.tar.gz) = 4261dc90e9e47c1c4041276e9aaa3d48ebe2e664f728e14fa95ae6c67d57a08b
 SIZE (nginx-1.30.4.tar.gz) = 1328314
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -91,8 +91,6 @@ SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5f
 SIZE (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 20617
 SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f03b2fa0b13591226363c8dd7930d7f02702cd5abada
 SIZE (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 139656
-SHA256 (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = ca2c2122b909529bf9d1a89e9a5763835a2bd2629def8cb279c550f638f0a78f
-SIZE (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = 892502
 SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8
 SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654
 SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 32a42256616cc674dca24c8654397390adff15b888b77eb74e0687f023c8751b