8 files changed, 35 insertions, 3 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 1761547744f6..ac2452c94c6f 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,5 +1,7 @@
 PORTNAME?=	nginx
-PORTVERSION=	1.29.1
+PORTVERSION=	${NGINX_VERSION}
+.include "version.mk"
+PORTREVISION=	2
 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 a85626300cbf..18273974c667 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -11,7 +11,7 @@ OPTIONS_GROUP_THIRDPARTYGRP=	AJP AWS_AUTH BROTLI CACHE_PURGE \
 	HTTP_PUSH_STREAM HTTP_REDIS HTTP_SLICE_AHEAD HTTP_SUBS_FILTER HTTP_TARANTOOL \
 	HTTP_UPLOAD HTTP_UPLOAD_PROGRESS HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR \
 	HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LINK LUA \
-	LUASTREAM MEMC MODSECURITY3 NAXSI PASSENGER POSTGRES RDS_CSV RDS_JSON \
+	LUASTREAM MEMC MODSECURITY3 NATS NAXSI PASSENGER POSTGRES RDS_CSV RDS_JSON \
 	REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SRCACHE STS \
 	VOD VTS XSS WEBSOCKIFY ZSTD
 
@@ -229,6 +229,10 @@ MODSECURITY3_LIB_DEPENDS=	libmodsecurity.so:security/modsecurity3
 MODSECURITY3_GH_TUPLE=		owasp-modsecurity:ModSecurity-nginx:fd28e6a:modsecurity3
 MODSECURITY3_VARS=		DSO_EXTMODS+=modsecurity3
 
+NATS_GH_TUPLE=		nats-io:nginx-nats:6f7adf1:nats
+NATS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_nats.c
+NATS_VARS=		DSO_EXTMODS+=nats NATS_SUBDIR=/src
+
 NAXSI_NGINX_VER=	1.7
 NAXSI_GH_TUPLE=		wargio:naxsi:${NAXSI_NGINX_VER}:naxsi \
 			libinjection:libinjection:b9fcaaf:libinjection
diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc
index 5e88c02b674e..1c64ea17938e 100644
--- a/www/nginx-devel/Makefile.options.desc
+++ b/www/nginx-devel/Makefile.options.desc
@@ -87,6 +87,7 @@ MAIL_SMTP_DESC=			Enable SMTP proxy module
 MAIL_SSL_DESC=			Enable mail_ssl module
 MEMC_DESC=			3rd party memc (memcached) module
 MODSECURITY3_DESC=		3rd party modsecurity3 module
+NATS_DESC=			3rd party nats module
 NAXSI_DESC=			3rd party naxsi module
 NJS_DESC=			Enable javascript (NJS) module
 OTEL_DESC=			Enable OpenTELemetry module
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 7e16c9cce58b..817f95e0210e 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1755187799
+TIMESTAMP = 1755472140
 SHA256 (nginx-1.29.1.tar.gz) = c589f7e7ed801ddbd904afbf3de26ae24eb0cce27c7717a2e94df7fb12d6ad27
 SIZE (nginx-1.29.1.tar.gz) = 1285529
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -101,6 +101,8 @@ SHA256 (openresty-memc-nginx-module-v0.20_GH0.tar.gz) = a42dd56dd6e2144755a127bc
 SIZE (openresty-memc-nginx-module-v0.20_GH0.tar.gz) = 34736
 SHA256 (owasp-modsecurity-ModSecurity-nginx-fd28e6a_GH0.tar.gz) = deafee4e4145a73b9369999e261368b34d4f7ff1be2596a559abd9e1d5df5526
 SIZE (owasp-modsecurity-ModSecurity-nginx-fd28e6a_GH0.tar.gz) = 1160686
+SHA256 (nats-io-nginx-nats-6f7adf1_GH0.tar.gz) = 2fc9489e85a6d871524dea36ae801b60cbfc2a9f332c91ef3843d5f8e6f79652
+SIZE (nats-io-nginx-nats-6f7adf1_GH0.tar.gz) = 31761
 SHA256 (wargio-naxsi-1.7_GH0.tar.gz) = adee817da71913f64a9fb0fca142d9520bb0e5014b1acc797841cd8e31273f4d
 SIZE (wargio-naxsi-1.7_GH0.tar.gz) = 1132392
 SHA256 (libinjection-libinjection-b9fcaaf_GH0.tar.gz) = 7812e1316b61a7a7d3a65a57a07c6d5235ac40fe35e6edda983f31a44661a38e
diff --git a/www/nginx-devel/files/extra-patch-ngx_nats.c b/www/nginx-devel/files/extra-patch-ngx_nats.c
new file mode 100644
index 000000000000..76c3f2be7864
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-ngx_nats.c
@@ -0,0 +1,20 @@
+--- ../nginx-nats-6f7adf1/src/ngx_nats.c.orig	2025-07-25 14:52:57.670444000 -0400
++++ ../nginx-nats-6f7adf1/src/ngx_nats.c	2025-07-25 14:53:04.538387000 -0400
+@@ -55,7 +55,7 @@
+  * we can use for uniqueness and to reach the router in testing.
+  */
+ 
+-#if (NGX_LINUX) || (NGX_DARWIN)
++#if (NGX_LINUX) || (NGX_DARWIN) || (NGX_FREEBSD)
+     #include <net/if.h>
+     #include <ifaddrs.h>
+ #elif (NGX_WIN32)
+@@ -585,7 +585,7 @@
+ {
+     /* TODO: port to Windows when need it, extend to other platforms. */
+ 
+-#if (NGX_LINUX) || (NGX_DARWIN)
++#if (NGX_LINUX) || (NGX_DARWIN) || (NGX_FREEBSD)
+ 
+     struct ifaddrs     *ifaddrs, *ifa;
+     int                 rc, family;
diff --git a/www/nginx-devel/files/nginx.in b/www/nginx-devel/files/nginx.in
index daba266d9192..5ec438dd7342 100644
--- a/www/nginx-devel/files/nginx.in
+++ b/www/nginx-devel/files/nginx.in
@@ -69,6 +69,7 @@ if [ -n "$2" ]; then
 		required_files="${nginx_configfile}"
 		eval nginx_enable="\${nginx_${profile}_enable:-${nginx_enable}}"
 		eval nginx_flags="\${nginx_${profile}_flags:-${nginx_flags}}"
+		eval nginx_svcj_options="\${nginx_${profile}_svcj_options:-${nginx_svcj_options}}"
 		eval nginxlimits_enable="\${nginxlimits_${profile}_enable:-${nginxlimits_enable}}"
 		eval nginxlimits_args="\${nginxlimits_${profile}_args:-${nginxlimits_args}}"
 		nginx_flags="-c ${nginx_configfile} -g \"pid ${pidfile};\" ${nginx_flags}"
diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist
index 906d67d94d7c..262046e775dd 100644
--- a/www/nginx-devel/pkg-plist
+++ b/www/nginx-devel/pkg-plist
@@ -62,6 +62,7 @@
 %%DSO%%%%MAIL%%libexec/nginx/ngx_mail_module.so
 %%DSO%%%%MEMC%%libexec/nginx/ngx_http_memc_module.so
 %%DSO%%%%MODSECURITY3%%libexec/nginx/ngx_http_modsecurity_module.so
+%%DSO%%%%NATS%%libexec/nginx/ngx_nats_module.so
 %%DSO%%%%NAXSI%%libexec/nginx/ngx_http_naxsi_module.so
 %%DSO%%%%OTEL%%libexec/nginx/ngx_otel_module.so
 %%DSO%%%%PASSENGER%%libexec/nginx/ngx_http_passenger_module.so
diff --git a/www/nginx-devel/version.mk b/www/nginx-devel/version.mk
new file mode 100644
index 000000000000..7b51e340f733
--- /dev/null
+++ b/www/nginx-devel/version.mk
@@ -0,0 +1 @@
+NGINX_VERSION=	1.29.1