git: 36f20b63acf3 - main - www/{nginx,nginx-devel,freenginx}: 3rd-party modules management
Jochen Neumeister <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.ports |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=36f20b63acf3d05ffc2203998c77d995b51e0b4a commit 36f20b63acf3d05ffc2203998c77d995b51e0b4a Author: Jochen Neumeister <[email protected]> AuthorDate: 2026-08-14 14:32:01 +0000 Commit: Jochen Neumeister <[email protected]> CommitDate: 2026-08-14 14:32:43 +0000 www/{nginx,nginx-devel,freenginx}: 3rd-party modules management Rename www/lua-stream-nginx-module to www/nginx-module-lua-stream to follow the nginx-module-* naming scheme for dedicated 3rd-party module ports and adjust the consumers. Relax the BUILD_DEPENDS to an unversioned dependency while here, matching the LUA option. While here, rename the internal NJS_QJS_CFLAGS variable to _NJS_QJS_CFLAGS so it is no longer treated as an option helper. Sponsored by: Netzkommune GmbH --- MOVED | 1 + www/Makefile | 2 +- www/freenginx/Makefile | 8 +- www/freenginx/Makefile.extmod | 2 +- www/lua-stream-nginx-module/pkg-plist | 89 ---------------------- www/nginx-devel/Makefile | 8 +- www/nginx-devel/Makefile.extmod | 2 +- .../Makefile | 2 +- .../distinfo | 0 .../files/patch-src_ngx__stream__lua__module.c | 0 .../patch-src_ngx__stream__lua__ssl__certby.c | 0 .../files/patch-src_ngx__stream__lua__time.c | 0 .../pkg-descr | 0 www/nginx-module-lua-stream/pkg-plist | 89 ++++++++++++++++++++++ www/nginx/Makefile | 8 +- www/nginx/Makefile.extmod | 2 +- 16 files changed, 107 insertions(+), 106 deletions(-) diff --git a/MOVED b/MOVED index a7e871124508..27d01e59dc23 100644 --- a/MOVED +++ b/MOVED @@ -5550,3 +5550,4 @@ science/py-pubchempy|science/py-PubChemPy|2026-08-05|Remove duplicate port textproc/lucene5|textproc/lucene9|2026-08-09|Recent Scilab uses this version www/py-flask-limiter3||2026-08-09|No need to keep v3 as www/py-calibreweb now supports v4 biology/py-macs2||2026-08-11|Upstream end of life, depends on expired lang/cython0, switch to biology/py-macs3 +www/lua-stream-nginx-module|www/nginx-module-lua-stream|2026-08-14|Renamed to follow the nginx-module-* naming scheme diff --git a/www/Makefile b/www/Makefile index c804b26affb2..115d96a1d85a 100644 --- a/www/Makefile +++ b/www/Makefile @@ -385,7 +385,6 @@ SUBDIR += lua-resty-lrucache SUBDIR += lua-resty-session SUBDIR += lua-resty-session3 - SUBDIR += lua-stream-nginx-module SUBDIR += luakit SUBDIR += luakit-devel SUBDIR += lubelogger @@ -527,6 +526,7 @@ SUBDIR += nginx-full SUBDIR += nginx-lite SUBDIR += nginx-module-lua + SUBDIR += nginx-module-lua-stream SUBDIR += nginx-naxsi SUBDIR += nginx-prometheus-exporter SUBDIR += nginx-ultimate-bad-bot-blocker diff --git a/www/freenginx/Makefile b/www/freenginx/Makefile index de6f5725ac6f..a3cfe740d382 100644 --- a/www/freenginx/Makefile +++ b/www/freenginx/Makefile @@ -48,7 +48,7 @@ SUB_LIST+= WWWOWN=${WWWOWN} \ HAS_CONFIGURE= yes CONFIGURE_ARGS+=--prefix=${ETCDIR} \ - --with-cc-opt="-I ${LOCALBASE}/include ${NJS_QJS_CFLAGS}" \ + --with-cc-opt="-I ${LOCALBASE}/include ${_NJS_QJS_CFLAGS}" \ --conf-path=${ETCDIR}/nginx.conf \ --sbin-path=${PREFIX}/sbin/nginx \ --pid-path=${NGINX_RUNDIR}/nginx.pid \ @@ -125,7 +125,7 @@ DEBUGLOG_CONFIGURE_ON= --with-debug DSO_CONFIGURE_ON= --modules-path=${MODULESDIR} DSO_VARS= MODULESDIR=${PREFIX}/libexec/${PORTNAME} FILE_AIO_CONFIGURE_ON= --with-file-aio -IPV6_CONFIGURE_OFF= --with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include ${NJS_QJS_CFLAGS}" +IPV6_CONFIGURE_OFF= --with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include ${_NJS_QJS_CFLAGS}" THREADS_CONFIGURE_ON= --with-threads # Bundled modules @@ -254,7 +254,7 @@ NJS_CONFIGURE_ARGS= --no-libxml2 .endif .if ${PORT_OPTIONS:MNJS_QJS} -NJS_QJS_CFLAGS= -I ${LOCALBASE}/include/quickjs +_NJS_QJS_CFLAGS= -I ${LOCALBASE}/include/quickjs NJS_CONFIGURE_ARGS+= --cc-opt="${CFLAGS} -I${LOCALBASE}/include/quickjs" \ --ld-opt="-L${LOCALBASE}/lib" \ --with-quickjs @@ -341,7 +341,7 @@ pre-configure-LUA-on: pre-configure-LUASTREAM-on: @${RM} -rf ${WRKSRC_luastream} - @cd ${LOCALBASE}/share/nginx/modules/lua-stream-nginx-module && \ + @cd ${LOCALBASE}/share/nginx/modules/nginx-module-lua-stream && \ ${COPYTREE_SHARE} . ${WRKSRC_luastream} do-configure-NJS-on: diff --git a/www/freenginx/Makefile.extmod b/www/freenginx/Makefile.extmod index 0d62cad50497..906bba343cc8 100644 --- a/www/freenginx/Makefile.extmod +++ b/www/freenginx/Makefile.extmod @@ -224,7 +224,7 @@ LUASTREAM_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty LUASTREAM_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core LUASTREAM_CONFIGURE_ENV=LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \ LUAJIT_LIB=${LOCALBASE}/lib -LUASTREAM_BUILD_DEPENDS=lua-stream-nginx-module>=0.0.17:www/lua-stream-nginx-module +LUASTREAM_BUILD_DEPENDS=nginx-module-lua-stream>0:www/nginx-module-lua-stream WRKSRC_luastream= ${WRKDIR}/lua-stream-nginx-module LUASTREAM_VARS= DSO_EXTMODS+=luastream diff --git a/www/lua-stream-nginx-module/pkg-plist b/www/lua-stream-nginx-module/pkg-plist deleted file mode 100644 index a4fc1359e842..000000000000 --- a/www/lua-stream-nginx-module/pkg-plist +++ /dev/null @@ -1,89 +0,0 @@ -share/nginx/modules/lua-stream-nginx-module/config -share/nginx/modules/lua-stream-nginx-module/src/api/ngx_stream_lua_api.h -share/nginx/modules/lua-stream-nginx-module/src/ddebug.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_api.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_args.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_args.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_balancer.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_balancer.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_cache.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_cache.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_clfactory.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_clfactory.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_common.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_config.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_config.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_consts.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_consts.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_contentby.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_contentby.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_control.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_control.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_coroutine.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_coroutine.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_ctx.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_ctx.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_directive.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_directive.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_exception.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_exception.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_initby.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_initby.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_initworkerby.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_initworkerby.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_input_filters.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_input_filters.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_lex.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_lex.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_log.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_log.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_log_ringbuf.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_log_ringbuf.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_logby.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_logby.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_misc.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_misc.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_module.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_output.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_output.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_pcrefix.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_pcrefix.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_phase.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_phase.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_prereadby.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_prereadby.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_probe.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_proxy_ssl_verifyby.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_proxy_ssl_verifyby.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_regex.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_request.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_request.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_script.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_script.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_semaphore.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_semaphore.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_shdict.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_shdict.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_sleep.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_sleep.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_socket_tcp.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_socket_tcp.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_socket_udp.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_socket_udp.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_ssl.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_ssl.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_ssl_certby.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_ssl_certby.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_ssl_client_helloby.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_ssl_client_helloby.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_string.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_string.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_time.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_timer.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_timer.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_uthread.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_uthread.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_util.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_util.h -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_variable.c -share/nginx/modules/lua-stream-nginx-module/src/ngx_stream_lua_worker.c diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index c5ade37cbb2b..bf32dd2b60e4 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -48,7 +48,7 @@ SUB_LIST+= WWWOWN=${WWWOWN} \ HAS_CONFIGURE= yes CONFIGURE_ARGS+=--prefix=${ETCDIR} \ - --with-cc-opt="-I ${LOCALBASE}/include ${NJS_QJS_CFLAGS}" \ + --with-cc-opt="-I ${LOCALBASE}/include ${_NJS_QJS_CFLAGS}" \ --with-ld-opt="-L ${LOCALBASE}/lib" \ --conf-path=${ETCDIR}/nginx.conf \ --sbin-path=${PREFIX}/sbin/nginx \ @@ -127,7 +127,7 @@ DEBUGLOG_CONFIGURE_ON= --with-debug DSO_CONFIGURE_ON= --modules-path=${MODULESDIR} DSO_VARS= MODULESDIR=${PREFIX}/libexec/${PORTNAME} FILE_AIO_CONFIGURE_ON= --with-file-aio -IPV6_CONFIGURE_OFF= --with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include ${NJS_QJS_CFLAGS}" +IPV6_CONFIGURE_OFF= --with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include ${_NJS_QJS_CFLAGS}" THREADS_CONFIGURE_ON= --with-threads # Bundled modules @@ -256,7 +256,7 @@ LIB_DEPENDS+= libpcre.so:devel/pcre .endif .if ${PORT_OPTIONS:MNJS} -NJS_QJS_CFLAGS= -I ${LOCALBASE}/include/quickjs +_NJS_QJS_CFLAGS= -I ${LOCALBASE}/include/quickjs NJS_CONFIGURE_ARGS= --cc-opt="${CFLAGS} -I${LOCALBASE}/include/quickjs" \ --ld-opt="-L${LOCALBASE}/lib" \ --with-quickjs @@ -340,7 +340,7 @@ pre-configure-LUA-on: pre-configure-LUASTREAM-on: @${RM} -rf ${WRKSRC_luastream} - @cd ${LOCALBASE}/share/nginx/modules/lua-stream-nginx-module && \ + @cd ${LOCALBASE}/share/nginx/modules/nginx-module-lua-stream && \ ${COPYTREE_SHARE} . ${WRKSRC_luastream} do-configure-NJS-on: diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 31e738be9b67..e980197201da 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -218,7 +218,7 @@ LUASTREAM_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty LUASTREAM_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core LUASTREAM_CONFIGURE_ENV=LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \ LUAJIT_LIB=${LOCALBASE}/lib -LUASTREAM_BUILD_DEPENDS=lua-stream-nginx-module>=0.0.17:www/lua-stream-nginx-module +LUASTREAM_BUILD_DEPENDS=nginx-module-lua-stream>0:www/nginx-module-lua-stream WRKSRC_luastream= ${WRKDIR}/lua-stream-nginx-module LUASTREAM_VARS= DSO_EXTMODS+=luastream diff --git a/www/lua-stream-nginx-module/Makefile b/www/nginx-module-lua-stream/Makefile similarity index 95% rename from www/lua-stream-nginx-module/Makefile rename to www/nginx-module-lua-stream/Makefile index 1a58e0577583..24948c0a713d 100644 --- a/www/lua-stream-nginx-module/Makefile +++ b/www/nginx-module-lua-stream/Makefile @@ -1,4 +1,4 @@ -PORTNAME= lua-stream-nginx-module +PORTNAME= nginx-module-lua-stream DISTVERSIONPREFIX= v DISTVERSION= 0.0.17 CATEGORIES= www diff --git a/www/lua-stream-nginx-module/distinfo b/www/nginx-module-lua-stream/distinfo similarity index 100% rename from www/lua-stream-nginx-module/distinfo rename to www/nginx-module-lua-stream/distinfo diff --git a/www/lua-stream-nginx-module/files/patch-src_ngx__stream__lua__module.c b/www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__module.c similarity index 100% rename from www/lua-stream-nginx-module/files/patch-src_ngx__stream__lua__module.c rename to www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__module.c diff --git a/www/lua-stream-nginx-module/files/patch-src_ngx__stream__lua__ssl__certby.c b/www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__ssl__certby.c similarity index 100% rename from www/lua-stream-nginx-module/files/patch-src_ngx__stream__lua__ssl__certby.c rename to www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__ssl__certby.c diff --git a/www/lua-stream-nginx-module/files/patch-src_ngx__stream__lua__time.c b/www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__time.c similarity index 100% rename from www/lua-stream-nginx-module/files/patch-src_ngx__stream__lua__time.c rename to www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__time.c diff --git a/www/lua-stream-nginx-module/pkg-descr b/www/nginx-module-lua-stream/pkg-descr similarity index 100% rename from www/lua-stream-nginx-module/pkg-descr rename to www/nginx-module-lua-stream/pkg-descr diff --git a/www/nginx-module-lua-stream/pkg-plist b/www/nginx-module-lua-stream/pkg-plist new file mode 100644 index 000000000000..f33f5bfb4e12 --- /dev/null +++ b/www/nginx-module-lua-stream/pkg-plist @@ -0,0 +1,89 @@ +share/nginx/modules/nginx-module-lua-stream/config +share/nginx/modules/nginx-module-lua-stream/src/api/ngx_stream_lua_api.h +share/nginx/modules/nginx-module-lua-stream/src/ddebug.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_api.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_args.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_args.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_balancer.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_balancer.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_cache.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_cache.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_clfactory.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_clfactory.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_common.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_config.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_config.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_consts.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_consts.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_contentby.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_contentby.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_control.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_control.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_coroutine.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_coroutine.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_ctx.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_ctx.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_directive.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_directive.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_exception.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_exception.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_initby.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_initby.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_initworkerby.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_initworkerby.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_input_filters.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_input_filters.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_lex.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_lex.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_log.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_log.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_log_ringbuf.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_log_ringbuf.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_logby.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_logby.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_misc.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_misc.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_module.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_output.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_output.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_pcrefix.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_pcrefix.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_phase.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_phase.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_prereadby.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_prereadby.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_probe.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_proxy_ssl_verifyby.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_proxy_ssl_verifyby.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_regex.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_request.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_request.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_script.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_script.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_semaphore.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_semaphore.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_shdict.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_shdict.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_sleep.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_sleep.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_socket_tcp.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_socket_tcp.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_socket_udp.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_socket_udp.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_ssl.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_ssl.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_ssl_certby.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_ssl_certby.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_ssl_client_helloby.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_ssl_client_helloby.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_string.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_string.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_time.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_timer.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_timer.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_uthread.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_uthread.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_util.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_util.h +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_variable.c +share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_worker.c diff --git a/www/nginx/Makefile b/www/nginx/Makefile index dea6690c0520..010a8638b11c 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -48,7 +48,7 @@ SUB_LIST+= WWWOWN=${WWWOWN} \ HAS_CONFIGURE= yes CONFIGURE_ARGS+=--prefix=${ETCDIR} \ - --with-cc-opt="-I ${LOCALBASE}/include ${NJS_QJS_CFLAGS}" \ + --with-cc-opt="-I ${LOCALBASE}/include ${_NJS_QJS_CFLAGS}" \ --conf-path=${ETCDIR}/nginx.conf \ --sbin-path=${PREFIX}/sbin/nginx \ --pid-path=${NGINX_RUNDIR}/nginx.pid \ @@ -125,7 +125,7 @@ DEBUGLOG_CONFIGURE_ON= --with-debug DSO_CONFIGURE_ON= --modules-path=${MODULESDIR} DSO_VARS= MODULESDIR=${PREFIX}/libexec/${PORTNAME} FILE_AIO_CONFIGURE_ON= --with-file-aio -IPV6_CONFIGURE_OFF= --with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include ${NJS_QJS_CFLAGS}" +IPV6_CONFIGURE_OFF= --with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include ${_NJS_QJS_CFLAGS}" THREADS_CONFIGURE_ON= --with-threads # Bundled modules @@ -253,7 +253,7 @@ NJS_CONFIGURE_ARGS= --no-libxml2 .endif .if ${PORT_OPTIONS:MNJS_QJS} -NJS_QJS_CFLAGS= -I ${LOCALBASE}/include/quickjs +_NJS_QJS_CFLAGS= -I ${LOCALBASE}/include/quickjs NJS_CONFIGURE_ARGS+= --cc-opt="${CFLAGS} -I${LOCALBASE}/include/quickjs" \ --ld-opt="-L${LOCALBASE}/lib" \ --with-quickjs @@ -337,7 +337,7 @@ pre-configure-LUA-on: pre-configure-LUASTREAM-on: @${RM} -rf ${WRKSRC_luastream} - @cd ${LOCALBASE}/share/nginx/modules/lua-stream-nginx-module && \ + @cd ${LOCALBASE}/share/nginx/modules/nginx-module-lua-stream && \ ${COPYTREE_SHARE} . ${WRKSRC_luastream} do-configure-NJS-on: diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index b329059face5..34e050e71b7c 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -216,7 +216,7 @@ LUASTREAM_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty LUASTREAM_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core LUASTREAM_CONFIGURE_ENV=LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \ LUAJIT_LIB=${LOCALBASE}/lib -LUASTREAM_BUILD_DEPENDS=lua-stream-nginx-module>=0.0.17:www/lua-stream-nginx-module +LUASTREAM_BUILD_DEPENDS=nginx-module-lua-stream>0:www/nginx-module-lua-stream WRKSRC_luastream= ${WRKDIR}/lua-stream-nginx-module LUASTREAM_VARS= DSO_EXTMODS+=luastream