diff --git a/www/freenginx-devel/Makefile b/www/freenginx-devel/Makefile
index ad12b4dfeffe..d79c410c2168 100644
--- a/www/freenginx-devel/Makefile
+++ b/www/freenginx-devel/Makefile
@@ -1,396 +1,402 @@
 PORTNAME=	freenginx
 PORTVERSION=	${NGINX_VERSION}
 .include "version.mk"
 PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	https://freenginx.org/download/ \
 		LOCAL/osa
 PKGNAMESUFFIX=	-devel
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	osa@FreeBSD.org
 COMMENT?=	Robust and small WWW server
 WWW=		https://freenginx.org/
 
 LICENSE?=	BSD2CLAUSE
 LICENSE_FILE?=	${WRKSRC}/LICENSE
 
 CONFLICTS_INSTALL=	nginx
 
 PORTSCOUT=	limit:^1\.29\.[0-9]*
 
 USES=		cpe compiler:env
 
 CPE_VENDOR=	freenginx
 CPE_PRODUCT=	freenginx
 USE_GITHUB=	nodefault
 
 NGINX_VARDIR?=	/var
 NGINX_LOGDIR?=	${NGINX_VARDIR}/log/nginx
 NGINX_RUNDIR?=	${NGINX_VARDIR}/run
 NGINX_TMPDIR?=	${NGINX_VARDIR}/tmp/nginx
 HTTP_PORT?=	80
 
 NGINX_ACCESSLOG?=	${NGINX_LOGDIR}/access.log
 NGINX_ERRORLOG?=	${NGINX_LOGDIR}/error.log
 
 CONFLICTS?=	nginx-1.* \
 		nginx-full-1.* \
 		nginx-lite-1.* \
 		nginx-naxsi-1.*
 USE_RC_SUBR?=	nginx
 SUB_FILES?=	pkg-message
 SUB_LIST+=	WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP} \
 		NGINX_RUNDIR=${NGINX_RUNDIR} \
 		NGINX_TMPDIR=${NGINX_TMPDIR} \
 		PREFIX=${PREFIX}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--prefix=${ETCDIR} \
 		--with-cc-opt="-I ${LOCALBASE}/include" \
 		--with-ld-opt="-L ${LOCALBASE}/lib" \
 		--conf-path=${ETCDIR}/nginx.conf \
 		--sbin-path=${PREFIX}/sbin/nginx \
 		--pid-path=${NGINX_RUNDIR}/nginx.pid \
 		--error-log-path=${NGINX_ERRORLOG} \
 		--user=${WWWOWN} --group=${WWWGRP} \
 		--with-compat \
 		--with-pcre
 ALL_TARGET=
 
 PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} NGINX_LOGDIR=${NGINX_LOGDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 USERS?=	${WWWOWN}
 GROUPS?=${WWWGRP}
 
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_GROUP=	HTTPGRP MAILGRP STREAMGRP
 # Modules that are part of the base nginx distribution
 OPTIONS_GROUP_HTTPGRP=	GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
-	HTTP_CACHE HTTP_DAV HTTP_DEGRADATION HTTP_FLV HTTP_GUNZIP_FILTER \
+	HTTP_CACHE HTTP_DAV HTTP_DEGRADATION HTTP_FLV HTTP_GEOIP HTTP_GUNZIP_FILTER \
 	HTTP_GZIP_STATIC HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL \
 	HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
 	HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV3 HTTPV3_BORING HTTPV3_LSSL \
 	HTTPV3_OSSL35
 
 OPTIONS_GROUP_MAILGRP=	MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
 
-OPTIONS_GROUP_STREAMGRP=	STREAM STREAM_REALIP STREAM_SSL \
+OPTIONS_GROUP_STREAMGRP=	STREAM STREAM_GEOIP STREAM_REALIP STREAM_SSL \
 	STREAM_SSL_PREREAD
 
 OPTIONS_DEFINE=		DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS OTEL THREADS WWW
 OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
 		HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC HTTP_MP4 \
 		HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
 		HTTP_STATUS HTTP_SUB HTTPV2 HTTPV3 MAIL MAIL_SSL STREAM \
 		STREAM_REALIP STREAM_SSL STREAM_SSL_PREREAD THREADS WWW
 
 LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2
 
 OPTIONS_RADIO+=		GSSAPI
 OPTIONS_RADIO_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
 GSSAPI_MIT_USES=	gssapi:mit
 
 OPTIONS_SUB=	yes
 
 .include "Makefile.options.desc"
 
 .for opt in ${OPTIONS_GROUP_MAILGRP:NMAIL}
 ${opt}_IMPLIES=	MAIL
 .endfor
 
 .for opt in ${OPTIONS_GROUP_HTTPGRP:NHTTP} WWW
 ${opt}_IMPLIES=	HTTP
 .endfor
 
 .for opt in ${OPTIONS_GROUP_STREAMGRP:NSTREAM}
 ${opt}_IMPLIES=	STREAM
 .endfor
 
 GSSAPI_HEIMDAL_IMPLIES=	HTTP_AUTH_KRB5
 GSSAPI_MIT_IMPLIES=	HTTP_AUTH_KRB5
 
 # If the target is makesum, make sure that every distfile is fetched.
 .if ${.TARGETS:Mmakesum}
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE} ${OPTIONS_GROUP_HTTPGRP} \
 	${OPTIONS_GROUP_MAILGRP} ${OPTIONS_GROUP_STREAMGRP} \
 	${OPTIONS_GROUP_THIRDPARTYGRP}
 .endif
 
 # Non-module options handling
 DEBUG_CFLAGS=		-g
 DEBUG_VARS=		STRIP=#do not strip if nginx with debug information
 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"
 THREADS_CONFIGURE_ON=	--with-threads
 
 # Bundled modules
 GOOGLE_PERFTOOLS_LIB_DEPENDS=	libprofiler.so:devel/google-perftools
 GOOGLE_PERFTOOLS_CONFIGURE_ON=	--with-google_perftools_module
 HTTP_CONFIGURE_ON=		--http-client-body-temp-path=${NGINX_TMPDIR}/client_body_temp \
 				--http-fastcgi-temp-path=${NGINX_TMPDIR}/fastcgi_temp \
 				--http-proxy-temp-path=${NGINX_TMPDIR}/proxy_temp \
 				--http-scgi-temp-path=${NGINX_TMPDIR}/scgi_temp \
 				--http-uwsgi-temp-path=${NGINX_TMPDIR}/uwsgi_temp \
 				--http-log-path=${NGINX_ACCESSLOG}
 HTTP_CONFIGURE_OFF=		--without-http
 HTTP_ADDITION_CONFIGURE_ON=	--with-http_addition_module
 HTTP_AUTH_REQ_CONFIGURE_ON=	--with-http_auth_request_module
 HTTP_CACHE_CONFIGURE_OFF=	--without-http-cache
 HTTP_DAV_CONFIGURE_ON=		--with-http_dav_module
 HTTP_DEGRADATION_CONFIGURE_ON=	--with-http_degradation_module
 HTTP_FLV_CONFIGURE_ON=		--with-http_flv_module
+HTTP_GEOIP_CONFIGURE_ON=	--with-http_geoip_module
+HTTP_GEOIP_LIB_DEPENDS=		libmaxmind.so:net/libmaxminddb
+HTTP_GEOIP_VARS=		DSO_BASEMODS+=http_geoip_module
 HTTP_GZIP_STATIC_CONFIGURE_ON=	--with-http_gzip_static_module
 HTTP_GUNZIP_FILTER_CONFIGURE_ON=--with-http_gunzip_module
 HTTP_IMAGE_FILTER_LIB_DEPENDS=	libgd.so:graphics/gd
 HTTP_IMAGE_FILTER_VARS=		DSO_BASEMODS+=http_image_filter_module
 HTTP_MP4_CONFIGURE_ON=		--with-http_mp4_module
 HTTP_PERL_CATEGORIES=		perl5
 HTTP_PERL_USES=			perl5
 # Fix build failure on clang >= 12
 HTTP_PERL_CFLAGS=		-Wno-compound-token-split-by-macro
 HTTP_PERL_VARS=			DSO_BASEMODS+=http_perl_module
 HTTP_RANDOM_INDEX_CONFIGURE_ON=	--with-http_random_index_module
 HTTP_REALIP_CONFIGURE_ON=	--with-http_realip_module
 HTTP_SECURE_LINK_CONFIGURE_ON=	--with-http_secure_link_module
 HTTP_SLICE_CONFIGURE_ON=	--with-http_slice_module
 HTTP_SSL_CONFIGURE_ON=		--with-http_ssl_module
 HTTP_SSL_USES=			ssl
 HTTP_STATUS_CONFIGURE_ON=	--with-http_stub_status_module
 HTTP_SUB_CONFIGURE_ON=		--with-http_sub_module
 HTTP_XSLT_CONFIGURE_ON=		--with-http_xslt_module
 HTTP_XSLT_LIB_DEPENDS=		libxml2.so:textproc/libxml2 \
 				libxslt.so:textproc/libxslt
 HTTP_XSLT_VARS=			DSO_BASEMODS+=http_xslt_module
 HTTPV2_IMPLIES=			HTTP_SSL
 HTTPV2_CONFIGURE_ON=		--with-http_v2_module
 HTTPV3_CONFIGURE_ON=		--with-http_v3_module
 HTTPV3_BORING_BUILD_DEPENDS=	${LOCALBASE}/bin/bssl:security/boringssl
 HTTPV3_BORING_RUN_DEPENDS=	${LOCALBASE}/bin/bssl:security/boringssl
 HTTPV3_BORING_IMPLIES=		HTTPV3
 HTTPV3_BORING_PREVENTS=		HTTPV3_LSSL HTTPV3_OSSL35
 HTTPV3_LSSL_BUILD_DEPENDS=	${LOCALBASE}/include/tls.h:security/libressl-devel
 HTTPV3_LSSL_RUN_DEPENDS=	${LOCALBASE}/include/tls.h:security/libressl-devel
 HTTPV3_LSSL_IMPLIES=		HTTPV3
 HTTPV3_LSSL_PREVENTS=		HTTPV3_BORING HTTPV3_OSSL35
 HTTPV3_OSSL35_BUILD_DEPENDS=	${LOCALBASE}/include/openssl/quic.h:security/openssl35
 HTTPV3_OSSL35_RUN_DEPENDS=	${LOCALBASE}/include/openssl/quic.h:security/openssl35
 HTTPV3_OSSL35_IMPLIES=		HTTPV3
 HTTPV3_OSSL35_PREVENTS=		HTTPV3_BORING HTTPV3_LSSL
 MAIL_VARS=			DSO_BASEMODS+=mail
 MAIL_IMAP_CONFIGURE_OFF=	--without-mail_imap_module
 MAIL_POP3_CONFIGURE_OFF=	--without-mail_pop3_module
 MAIL_SMTP_CONFIGURE_OFF=	--without-mail_smtp_module
 MAIL_SSL_USES=			ssl
 MAIL_SSL_CONFIGURE_ON=		--with-mail_ssl_module
 STREAM_VARS=			DSO_BASEMODS+=stream
 STREAM_CONFIGURE_ON=		--with-stream
+STREAM_GEOIP_CONFIGURE_ON=	--with-stream_geoip_module
+STREAM_GEOIP_LIB_DEPENDS=	libmaxmind.so:net/libmaxminddb
+STREAM_GEOIP_VARS=		DSO_BASEMODS+=stream_geoip_module
 STREAM_REALIP_CONFIGURE_ON=	--with-stream_realip_module
 STREAM_SSL_USES=		ssl
 STREAM_SSL_CONFIGURE_ON=	--with-stream_ssl_module
 STREAM_SSL_PREREAD_CONFIGURE_ON=--with-stream_ssl_preread_module
 
 ### External modules
 .include "Makefile.extmod"
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDSO}
 _addbasemod=	=dynamic
 _addextmod=	add-dynamic-module
 .else
 _addextmod=	add-module
 .endif
 
 .for mod in ${DSO_BASEMODS}
 CONFIGURE_ARGS+=	--with-${mod}${_addbasemod}
 .endfor
 
 # Some modules depend on other being there before, for example, devel_kit needs
 # to be there before a few other.
 .for mod in ${FIRST_DSO_EXTMODS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR}
 .endfor
 
 .for mod in ${DSO_EXTMODS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR}
 .endfor
 # For non-GitHub hosted modules
 .for moddir in ${DSO_EXTDIRS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKDIR}/${moddir}
 .endfor
 
 .if empty(PORT_OPTIONS:MHTTP) && empty(PORT_OPTIONS:MMAIL)
 IGNORE=		requires at least HTTP or MAIL to \
 		be defined.  Please do 'make config' again
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5} && (empty(PORT_OPTIONS:MGSSAPI_HEIMDAL) && empty(PORT_OPTIONS:MGSSAPI_MIT))
 IGNORE=		required at least GSSAPI_HEIMDAL or \
 		GSSAPI_MIT to be defined. Please do \
 		'make config' again
 .endif
 
 .include "Makefile.ignore"
 
 .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 191
 CFLAGS+=	-Wno-error=cast-function-type-mismatch
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER} && empty(PORT_OPTIONS:MDEBUG)
 CONFIGURE_ENV+=	OPTIMIZE="yes"
 CFLAGS+=	-DNDEBUG
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
 CONFIGURE_ENV+=	EXTRA_PRE_CXXFLAGS="-std=c++14"
 .endif
 
 .if (PORT_OPTIONS:MMODSECURITY3)
 CONFIGURE_ARGS+=	--with-ld-opt="-L ${LOCALBASE}/lib -lpcre"
 LIB_DEPENDS+=		libpcre.so:devel/pcre
 .endif
 
 .if ${PORT_OPTIONS:MNJS}
 NJS_CONFIGURE_ARGS=	--cc-opt="${CFLAGS} -I${LOCALBASE}/include/quickjs" \
 			--ld-opt="-L${LOCALBASE}/lib" \
 			--with-quickjs
 .endif
 
 pre-everything::
 	@${ECHO_MSG}
 .if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR}
 	@${ECHO_MSG} "Enable http_ssl module to build upstream_fair with SSL support"
 .endif
 .if ${PORT_OPTIONS:MPASSENGER}
 	@${ECHO_MSG} "This port install Passenger module only"
 .endif
 	@${ECHO_MSG}
 
 post-extract-NAXSI-on:
 	@${RMDIR} ${WRKSRC_naxsi}/naxsi_src/libinjection
 	@${LN} -s ${WRKSRC_libinjection} ${WRKSRC_naxsi}/naxsi_src/libinjection
 
 post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
 		s!%%PREFIX%%!${PREFIX}!; \
 		s!%%NGINX_ERRORLOG%%!${NGINX_ERRORLOG}!' \
 		${WRKSRC}/conf/nginx.conf
 
 post-patch-BROTLI-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_brotli}/filter/config
 
 post-patch-DRIZZLE-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_drizzle}/config
 
 post-patch-FASTDFS-on:
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${PREFIX}!g;s!%%LOCALBASE%%!${LOCALBASE}!g' \
 		${WRKSRC_fastdfs}/src/config
 
 post-patch-GRIDFS-on:
 	@${REINPLACE_CMD} 's!\/usr!${LOCALBASE}!g' \
 		${WRKSRC_gridfs}/nginx-gridfs/config
 
 post-patch-HTTP_AUTH_KRB5-on:
 	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \
 		s!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!g; \
 		s!%%GSSAPILIBDIR%%!${GSSAPILIBDIR}!g' ${WRKSRC_auth_krb5}/config
 
 post-patch-HTTP_TARANTOOL-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config
 
 post-patch-ICONV-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_iconv}/config
 
 post-patch-NJS_QJS-on:
 	@${REINPLACE_CMD} 's!%%LOCALBASE%%!${LOCALBASE}!g' ${WRKSRC_njs}/auto/quickjs \
 		${WRKSRC_njs}/nginx/config
 
 post-patch-PASSENGER-on:
 	@${REINPLACE_CMD} \
 		'176,178s!true!false!' \
 		${WRKSRC_PASSENGER}/build/basics.rb
 	@${REINPLACE_CMD} \
 		's!-I/usr/include/libev!!; \
 		s!-lev!!; \
 		s!-Iext/libev!!; \
 		s!-I/usr/include/libeio!!; \
 		s!-leio!!; \
 		s!-Iext/libeio!!' \
 		${WRKSRC_PASSENGER}/build/common_library.rb
 
 post-patch-POSTGRES-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_postgres}/config
 
 post-patch-SFLOW-on:
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${LOCALBASE}!g' \
 		${WRKSRC_sflow}/ngx_http_sflow_config.h
 
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
 do-configure-NJS-on:
 	( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} )
 
 .if !target(do-install)
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
 	${MKDIR} ${STAGEDIR}${NGINX_LOGDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
 .for i in koi-utf koi-win win-utf
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}
 .endfor
 .for i in fastcgi_params mime.types scgi_params uwsgi_params
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}/${i}-dist
 .endfor
 
 do-install-HTTP_PERL-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \
 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
 
 # Install dynamic modules
 do-install-DSO-on:
 	${MKDIR} ${STAGEDIR}${MODULESDIR}
 	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
 		-exec ${INSTALL_PROGRAM} {} ${STAGEDIR}${MODULESDIR} \;)
 
 do-install-LINK-on:
 	${INSTALL_DATA} ${WRKSRC_link}/src/ngx_link_func_module.h ${STAGEDIR}${PREFIX}/include
 
 do-install-LUA-on:
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/share/lua/5.1
 	(cd ${WRKSRC_luarc}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${LOCALBASE}/share/lua/5.1 "-name *\.lua")
 	(cd ${WRKSRC_luarl}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${LOCALBASE}/share/lua/5.1 "-name *\.lua")
 
 do-install-NAXSI-on:
 	${INSTALL_DATA} \
 	${WRKDIR}/naxsi-${NAXSI_NGINX_VER}/naxsi_rules/naxsi_core.rules \
 	${STAGEDIR}${ETCDIR}
 .endif
 
 .if !target(post-install)
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 	cd ${WRKSRC}/contrib/vim && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 	${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	${CAT} ${WRKSRC}/conf/nginx.conf >> ${STAGEDIR}${ETCDIR}/nginx.conf-dist
 
 post-install-WWW-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/freenginx-dist
 	(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/freenginx-dist && \
 	${TOUCH} ${STAGEDIR}${PREFIX}/www/freenginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING)
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/freenginx-devel/Makefile.options.desc b/www/freenginx-devel/Makefile.options.desc
index 88cfd36a84f2..6ed452818660 100644
--- a/www/freenginx-devel/Makefile.options.desc
+++ b/www/freenginx-devel/Makefile.options.desc
@@ -1,117 +1,119 @@
 AJP_DESC=			3rd party ajp module
 ARRAYVAR_DESC=			3rd party array_var module
 BROTLI_DESC=			3rd party brotli module
 CACHE_PURGE_DESC=		3rd party cache_purge module
 DEBUGLOG_DESC=			Enable debug log (--with-debug)
 DEVEL_KIT_DESC=			3rd party Nginx Development Kit module
 DRIZZLE_DESC=			3rd party drizzle module
 DSO_DESC=			Enable dynamic modules support
 DYNAMIC_UPSTREAM_DESC=		3rd party dynamic_upstream module
 ECHO_DESC=			3rd party echo module
 ENCRYPTSESSION_DESC=		3rd party encrypted_session module
 FILE_AIO_DESC=			Enable file aio
 FIPS_CHECK_DESC=		3rd party fips_check module
 FORMINPUT_DESC=			3rd party form_input module
 GOOGLE_PERFTOOLS_DESC=		Enable google perftools module
 GRIDFS_DESC=			3rd party gridfs module
 GSSAPI_DESC=			GSSAPI implementation (imply HTTP_AUTH_KRB5)
 HEADERS_MORE_DESC=		3rd party headers_more module
 HTTPGRP_DESC=			Modules that require HTTP module
 HTTPV2_DESC=			Enable HTTP/2 protocol support (SSL req.)
 HTTPV3_DESC=			Enable HTTP/3 protocol support
 HTTPV3_BORING_DESC=		Use security/boringssl
 HTTPV3_LSSL_DESC=		Use security/libressl-devel
 HTTPV3_OSSL35_DESC=		Use security/openssl35
 HTTP_ACCEPT_LANGUAGE_DESC=	3rd party accept_language module
 HTTP_ADDITION_DESC=		Enable http_addition module
 HTTP_AUTH_DIGEST_DESC=		3rd party http_authdigest module
 HTTP_AUTH_JWT_DESC=		3rd party http_auth_jwt module
 HTTP_AUTH_KRB5_DESC=		3rd party http_auth_gss module
 HTTP_AUTH_LDAP_DESC=		3rd party http_auth_ldap module
 HTTP_AUTH_PAM_DESC=		3rd party http_auth_pam module
 HTTP_AUTH_REQ_DESC=		Enable http_auth_request module
 HTTP_CACHE_DESC=		Enable http_cache module
 HTTP_DAV_DESC=			Enable http_webdav module
 HTTP_DAV_EXT_DESC=		3rd party webdav_ext module
 HTTP_DEGRADATION_DESC=		Enable http_degradation module
 HTTP_DESC=			Enable HTTP module
 HTTP_EVAL_DESC=			3rd party eval module
 HTTP_FANCYINDEX_DESC=		3rd party http_fancyindex module
 HTTP_FLV_DESC=			Enable http_flv module
 HTTP_FOOTER_DESC=		3rd party http_footer module
+HTTP_GEOIP_DESC=		Enable http_geoip module
 HTTP_GEOIP2_DESC=		3rd party geoip2 module
 HTTP_GUNZIP_FILTER_DESC=	Enable http_gunzip_filter module
 HTTP_GZIP_STATIC_DESC=		Enable http_gzip_static module
 HTTP_IMAGE_FILTER_DESC=		Enable http_image_filter module
 HTTP_IP2LOCATION_DESC=		3rd party ip2location-nginx module
 HTTP_IP2PROXY_DESC=		3rd party ip2proxy-nginx module
 HTTP_JSON_STATUS_DESC=		3rd party http_json_status module
 HTTP_MOGILEFS_DESC=		3rd party mogilefs module
 HTTP_MP4_DESC=			Enable http_mp4 module
 HTTP_NOTICE_DESC=		3rd party notice module
 HTTP_PERL_DESC=			Enable http_perl module
 HTTP_PUSH_DESC=			3rd party push module
 HTTP_PUSH_STREAM_DESC=		3rd party push stream module
 HTTP_RANDOM_INDEX_DESC=		Enable http_random_index module
 HTTP_REALIP_DESC=		Enable http_realip module
 HTTP_REDIS_DESC=		3rd party http_redis module
 HTTP_SECURE_LINK_DESC=		Enable http_secure_link module
 HTTP_SLICE_DESC=		Enable http_slice module
 HTTP_SLICE_AHEAD_DESC=		3rd party http_slice_ahead module
 HTTP_SSL_DESC=			Enable http_ssl module
 HTTP_STATUS_DESC=		Enable http_stub_status module
 HTTP_SUBS_FILTER_DESC=		3rd party subs filter module
 HTTP_SUB_DESC=			Enable http_sub module
 HTTP_TARANTOOL_DESC=		3rd party tarantool upstream module
 HTTP_UPLOAD_DESC=		3rd party upload module
 HTTP_UPLOAD_PROGRESS_DESC=	3rd party uploadprogress module
 HTTP_UPSTREAM_FAIR_DESC=	3rd party upstream fair module
 HTTP_UPSTREAM_STICKY_DESC=	3rd party upstream sticky module
 HTTP_VIDEO_DESC=		3rd party video module support
 HTTP_VIDEO_THUMBEXTRACTOR_DESC=	3rd party video_thumbextractor module
 HTTP_XSLT_DESC=			Enable http_xslt module
 HTTP_ZIP_DESC=			3rd party http_zip module
 ICONV_DESC=			3rd party iconv module
 IPV6_DESC=			Enable IPv6 support
 KEYVAL_DESC=			3rd party keyval module
 LET_DESC=			3rd party let module
 LINK_DESC=			3rd party link function module
 LUA_DESC=			3rd party lua module
 LUASTREAM_DESC=			3rd party lua stream module
 MAILGRP_DESC=			Modules that require MAIL module
 MAIL_DESC=			Enable IMAP4/POP3/SMTP proxy module
 MAIL_IMAP_DESC=			Enable IMAP4 proxy module
 MAIL_POP3_DESC=			Enable POP3 proxy module
 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
 PASSENGER_DESC=			3rd party passenger module
 POSTGRES_DESC=			3rd party postgres module
 RDS_CSV_DESC=			3rd party rds_csv module
 RDS_JSON_DESC=			3rd party rds_json module
 REDIS2_DESC=			3rd party redis2 module
 RTMP_DESC=			3rd party rtmp module
 SET_MISC_DESC=			3rd party set_misc module
 SFLOW_DESC=			3rd party sflow module
 SHIBBOLETH_DESC=		3rd party shibboleth module
 SLOWFS_CACHE_DESC=		3rd party slowfs_cache module
 SRCACHE_DESC=			3rd party srcache module
 STREAMGRP_DESC=			Modules that require STREAM module
 STREAM_DESC=			Enable stream module
+STREAM_GEOIP_DESC=		Enable stream_geoip module
 STREAM_REALIP_DESC=		Enable stream_realip module
 STREAM_SSL_DESC=		Enable stream_ssl module (SSL req.)
 STREAM_SSL_PREREAD_DESC=	Enable stream_ssl_preread module (SSL req.)
 STS_DESC=			3rd party sts module
 THREADS_DESC=			Enable threads support
 THIRDPARTYGRP_DESC=		Third-party modules
 VOD_DESC=			3rd party vod module
 VTS_DESC=			3rd party vts module
 WWW_DESC=			Enable html sample files
 XSS_DESC=			3rd party xss module
 WEBSOCKIFY_DESC=		3rd party websockify module
 ZSTD_DESC=			3rd party zstd module
diff --git a/www/freenginx-devel/distinfo b/www/freenginx-devel/distinfo
index f8071e336c30..d403f3deb326 100644
--- a/www/freenginx-devel/distinfo
+++ b/www/freenginx-devel/distinfo
@@ -1,147 +1,147 @@
-TIMESTAMP = 1763942092
-SHA256 (freenginx-1.29.3.tar.gz) = 55989cea3352d937d6d96c9af8b943f3a3f3a0220f35ede7a5b605a3d86b029a
-SIZE (freenginx-1.29.3.tar.gz) = 1243956
+TIMESTAMP = 1765911692
+SHA256 (freenginx-1.29.4.tar.gz) = 51a596451e334b51ce8cef1291b576ed601ed557e1b500e6c1a77a469d603e27
+SIZE (freenginx-1.29.4.tar.gz) = 1249883
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
 SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208
 SHA256 (passenger-6.0.27.tar.gz) = 82c830aee98feece09e84309c2d0c6bb3f7b22a3c8e33cfe93b5e0d498615d0f
 SIZE (passenger-6.0.27.tar.gz) = 7548637
 SHA256 (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 522e94c59f5783f281d868ede2adf325bf2f8ffb9e62cf8451d4b9ac0516916c
 SIZE (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 110807
 SHA256 (openresty-array-var-nginx-module-v0.06_GH0.tar.gz) = 2c3577265d1d51a2d0646311b9c651520a74455253b6f7a5776af79e9bff5cb1
 SIZE (openresty-array-var-nginx-module-v0.06_GH0.tar.gz) = 12005
 SHA256 (google-ngx_brotli-a71f931_GH0.tar.gz) = b3312a045d5303a40d02beb34711b8ca27f7b72d647e9ee2012a8eddd14d9b22
 SIZE (google-ngx_brotli-a71f931_GH0.tar.gz) = 16376
 SHA256 (nginx-modules-ngx_cache_purge-a84b0f3_GH0.tar.gz) = ddfd4fdd99075d906b7b75c49f56ec96b76df7951dfa54502e0f83890447031f
 SIZE (nginx-modules-ngx_cache_purge-a84b0f3_GH0.tar.gz) = 17162
 SHA256 (vision5-ngx_devel_kit-v0.3.4_GH0.tar.gz) = 14a28063294f645d457b1eb10e3c23bbba44398f1c5f021421b58b6f8ab31662
 SIZE (vision5-ngx_devel_kit-v0.3.4_GH0.tar.gz) = 66474
 SHA256 (openresty-drizzle-nginx-module-c631276_GH0.tar.gz) = 215ebeb3bad3a907f13fbdae66a25939b6820bdba2f339394cbb9c8b8557308a
 SIZE (openresty-drizzle-nginx-module-c631276_GH0.tar.gz) = 51675
 SHA256 (ZigzagAK-ngx_dynamic_upstream-ab67fe7_GH0.tar.gz) = 4610da3ce9c35e3eef0e6d12a6285b9c8020f6d44fb094b4af94c1275bc01156
 SIZE (ZigzagAK-ngx_dynamic_upstream-ab67fe7_GH0.tar.gz) = 22991
 SHA256 (openresty-echo-nginx-module-b0f344b_GH0.tar.gz) = d10b5b2e58065e79e28b1c4e572196f0b8b53acc2e1ee6902a667faec72d7885
 SIZE (openresty-echo-nginx-module-b0f344b_GH0.tar.gz) = 53548
 SHA256 (openresty-encrypted-session-nginx-module-7ffe4ec_GH0.tar.gz) = 1848ee88be81350326918930463e0f2be2013ab76ae589d01f00fd81c5da0c07
 SIZE (openresty-encrypted-session-nginx-module-7ffe4ec_GH0.tar.gz) = 11899
 SHA256 (ogarrett-nginx-fips-check-module-6cb4270_GH0.tar.gz) = d52fbb0f2819cd91b710ad85e6c8b452fdca6a5d81b0694d6637adba3fc2382c
 SIZE (ogarrett-nginx-fips-check-module-6cb4270_GH0.tar.gz) = 6494
 SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106
 SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
 SHA256 (nieoding-nginx-gridfs-059bdc3_GH0.tar.gz) = 9b059b5ae7b602d12d32d5ebe2700827ea625f22c0fb3b9956242e11de63845b
 SIZE (nieoding-nginx-gridfs-059bdc3_GH0.tar.gz) = 4674
 SHA256 (openresty-headers-more-nginx-module-v0.39_GH0.tar.gz) = dde68d3fa2a9fc7f52e436d2edc53c6d703dcd911283965d889102d3a877c778
 SIZE (openresty-headers-more-nginx-module-v0.39_GH0.tar.gz) = 29616
 SHA256 (dvershinin-nginx_accept_language_module-5683967_GH0.tar.gz) = a58feb576f2231498b8a3863d3c6fba45c7d48bc48735fa714e07a7bfbedb6e3
 SIZE (dvershinin-nginx_accept_language_module-5683967_GH0.tar.gz) = 3425
 SHA256 (atomx-nginx-http-auth-digest-ac91c88_GH0.tar.gz) = 31b2a737d3d5d118a286a0b8a6e2637eda313dba07a9a5824e4c6e33ea6e2b80
 SIZE (atomx-nginx-http-auth-digest-ac91c88_GH0.tar.gz) = 17890
 SHA256 (TeslaGov-ngx-http-auth-jwt-module-2.3.1_GH0.tar.gz) = a3865859a1476bd5e8a1468d9dee23d46c716b6b932649fde04238748eafe6d5
 SIZE (TeslaGov-ngx-http-auth-jwt-module-2.3.1_GH0.tar.gz) = 32459
 SHA256 (stnoonan-spnego-http-auth-nginx-module-v1.1.3_GH0.tar.gz) = 0e1e54f8ab7d76f922881f13d870edf8b820ef645b19013774c825110d011640
 SIZE (stnoonan-spnego-http-auth-nginx-module-v1.1.3_GH0.tar.gz) = 32975
 SHA256 (kvspb-nginx-auth-ldap-241200e_GH0.tar.gz) = d3aa3a5ead311b34059d6ab1b6d2cf3ac8269c47a87b768523c07381229db470
 SIZE (kvspb-nginx-auth-ldap-241200e_GH0.tar.gz) = 18541
 SHA256 (sto-ngx_http_auth_pam_module-v1.5.5_GH0.tar.gz) = 98a71617d9119ae784993e3789ce8766fdf2ff2479691f3dc6cf8d8763f8d364
 SIZE (sto-ngx_http_auth_pam_module-v1.5.5_GH0.tar.gz) = 7233
 SHA256 (arut-nginx-dav-ext-module-v3.0.0_GH0.tar.gz) = d2499d94d82d4e4eac8425d799e52883131ae86a956524040ff2fd230ef9f859
 SIZE (arut-nginx-dav-ext-module-v3.0.0_GH0.tar.gz) = 14558
 SHA256 (openresty-nginx-eval-module-13425e8_GH0.tar.gz) = 48664ecd18041633829fc66b5e339ca7e75f44648c7bcbdd18e8cf8691a100bd
 SIZE (openresty-nginx-eval-module-13425e8_GH0.tar.gz) = 14936
 SHA256 (aperezdc-ngx-fancyindex-cbc0d3f_GH0.tar.gz) = ded74515205e1e7a3a0175214bbe62ac3a13c21bd428084783d6345520bed782
 SIZE (aperezdc-ngx-fancyindex-cbc0d3f_GH0.tar.gz) = 30334
 SHA256 (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3493b54460c59370f9f60c6e662862752f1920fc6e684f7a66bb2b3260692813
 SIZE (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3934
 SHA256 (leev-ngx_http_geoip2_module-445df24_GH0.tar.gz) = f19985b13e4095168a60aab5a1b29940ff586bf7571c61aa70ca7cd2f807850c
 SIZE (leev-ngx_http_geoip2_module-445df24_GH0.tar.gz) = 8889
 SHA256 (ip2location-ip2location-nginx-5f2c59a_GH0.tar.gz) = 3eb29b516d80afcc5267ef436bd527b0810257437bce48bdfd6070dd10f1b767
 SIZE (ip2location-ip2location-nginx-5f2c59a_GH0.tar.gz) = 5506
 SHA256 (ip2location-ip2proxy-nginx-f3e7e7d_GH0.tar.gz) = 90dc4a10dd8fc4af3ffdd2cf451368eca1d3b90261ec1944ad629b2302932638
 SIZE (ip2location-ip2proxy-nginx-f3e7e7d_GH0.tar.gz) = 5253
 SHA256 (nginx-modules-ngx_http_json_status_module-c77dff4_GH0.tar.gz) = a071c50834142dc094a2915a5ac7bd80765d76bbe736fe291e40f593c8278f16
 SIZE (nginx-modules-ngx_http_json_status_module-c77dff4_GH0.tar.gz) = 6753
 SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885
 SIZE (kr-nginx-notice-3c95966_GH0.tar.gz) = 3343
 SHA256 (slact-nchan-v1.3.7_GH0.tar.gz) = 6e82c673cedc7d33ee48ea1c198964fdcf6853bf851de797002199a496f08263
 SIZE (slact-nchan-v1.3.7_GH0.tar.gz) = 665133
 SHA256 (wandenberg-nginx-push-stream-module-0.6.0_GH0.tar.gz) = 84f6ad280c5eaf34e145bae3b835ef826b6e4aa490a94fed7350c8093be67d61
 SIZE (wandenberg-nginx-push-stream-module-0.6.0_GH0.tar.gz) = 210766
 SHA256 (osokin-ngx_http_redis-0.4.0_GH0.tar.gz) = e5b699243035575cb8ffcd26fc3a8287bcd11ff414e30fd0a52c96729fd22d0d
 SIZE (osokin-ngx_http_redis-0.4.0_GH0.tar.gz) = 11858
 SHA256 (yaoweibin-ngx_http_substitutions_filter_module-e12e965_GH0.tar.gz) = 40f9d43fdb39f4a8c60697e366469a42e229b12f1993376f33431e700bd9a50f
 SIZE (yaoweibin-ngx_http_substitutions_filter_module-e12e965_GH0.tar.gz) = 94055
 SHA256 (tarantool-nginx_upstream_module-aeb8696_GH0.tar.gz) = 514aa57155c73c2e3f7bdfe00c580183df343f2fa4b34e77f040cf6557caffae
 SIZE (tarantool-nginx_upstream_module-aeb8696_GH0.tar.gz) = 75708
 SHA256 (fdintino-nginx-upload-module-96e6460_GH0.tar.gz) = 7643e724edc3e3ffb70b1685312f4e2f405b9b6cc186621b947a640ead6fcc0d
 SIZE (fdintino-nginx-upload-module-96e6460_GH0.tar.gz) = 42561
 SHA256 (masterzen-nginx-upload-progress-module-v0.9.3_GH0.tar.gz) = 7d810069f6f3e26f3b00989448fceb891a934c2a2f7eb55e0358b70291c23942
 SIZE (masterzen-nginx-upload-progress-module-v0.9.3_GH0.tar.gz) = 17303
 SHA256 (jaygooby-nginx-upstream-fair-10ecdcf_GH0.tar.gz) = 93f71b7cf0db9c6dbf97e3ee11cf8efbc149946c0949d7abd19c74c7620eea50
 SIZE (jaygooby-nginx-upstream-fair-10ecdcf_GH0.tar.gz) = 10433
 SHA256 (gdongca-nginx-sticky-module-ng-a3263ad_GH0.tar.gz) = 610bd7fa83d6f8fdb17cf689f36b2dfc5e5638869dcd225528eb69d8a0a40ac8
 SIZE (gdongca-nginx-sticky-module-ng-a3263ad_GH0.tar.gz) = 122022
 SHA256 (wandenberg-nginx-video-thumbextractor-module-e81f850_GH0.tar.gz) = 9113f887a8740fe72614ee32f481177d33e9542c3b0625627da19a1c4f3da2cb
 SIZE (wandenberg-nginx-video-thumbextractor-module-e81f850_GH0.tar.gz) = 2710072
 SHA256 (vince2678-mod_zip-39dc908_GH0.tar.gz) = bc5c3d725268abbe1c5c38de5b18a4ad9dbe5821c4afeaccabd3eec38b272be4
 SIZE (vince2678-mod_zip-39dc908_GH0.tar.gz) = 30275
 SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
 SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133
 SHA256 (kjdev-nginx-keyval-bb04325_GH0.tar.gz) = 7b941fcdba02aed9b69497e93e1954fe570d73362f4867a478b6f97fe518e554
 SIZE (kjdev-nginx-keyval-bb04325_GH0.tar.gz) = 24551
 SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5fbd1d8b00bc85e71f2f387c344f007773e49050
 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-de02114_GH0.tar.gz) = b5db3168855df3dc9b65510e1e2e0da7d7cff29c81d1de7796a799042180ccc5
 SIZE (openresty-lua-nginx-module-de02114_GH0.tar.gz) = 892583
 SHA256 (openresty-lua-resty-core-0b61f61_GH0.tar.gz) = 4454559a871381561d21692db96fc2ed317a5ab5f531c8193d73c6b627953525
 SIZE (openresty-lua-resty-core-0b61f61_GH0.tar.gz) = 253494
 SHA256 (openresty-lua-resty-lrucache-1759068_GH0.tar.gz) = ab73a5f99eff239f90bd4bfea7cc34304795990d6f5530c6be072a11921807de
 SIZE (openresty-lua-resty-lrucache-1759068_GH0.tar.gz) = 17838
 SHA256 (openresty-stream-lua-nginx-module-v0.0.17_GH0.tar.gz) = 09cf5b90904a575b90c16d5cf861b978ef2dbe6d5340e5eb3707e2d2a3ac5cdc
 SIZE (openresty-stream-lua-nginx-module-v0.0.17_GH0.tar.gz) = 413563
 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
 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
 SIZE (libinjection-libinjection-b9fcaaf_GH0.tar.gz) = 2218207
 SHA256 (nginx-njs-0.9.4_GH0.tar.gz) = 7b3a9f14b0f09311d9031c2a252cb0e23c06baac2e586a7d12c75aa6cba4ca0e
 SIZE (nginx-njs-0.9.4_GH0.tar.gz) = 939082
 SHA256 (osokin-nginx-otel-51273ec_GH0.tar.gz) = a2107ba0be94c8561ae50773163c7946a58e508be46920f588d05a347c867d9c
 SIZE (osokin-nginx-otel-51273ec_GH0.tar.gz) = 28076
 SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b
 SIZE (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = 48544
 SHA256 (openresty-rds-csv-nginx-module-6a90686_GH0.tar.gz) = 92068b96a9cf152e8f10db2b661a031adbb2a29db4b075773c2495846d4c926c
 SIZE (openresty-rds-csv-nginx-module-6a90686_GH0.tar.gz) = 20631
 SHA256 (openresty-rds-json-nginx-module-e6517b9_GH0.tar.gz) = 93dc271ff64d9dcbd48e494b72ac7af7a169c58ce4d4a98d732fb71b07e6bf1c
 SIZE (openresty-rds-json-nginx-module-e6517b9_GH0.tar.gz) = 35794
 SHA256 (openresty-redis2-nginx-module-454c223_GH0.tar.gz) = dd27c5c1766d67518c42f51c11ca2f74b2db8a71946f90b4fadf5d868fbede65
 SIZE (openresty-redis2-nginx-module-454c223_GH0.tar.gz) = 25731
 SHA256 (arut-nginx-rtmp-module-6c7719d_GH0.tar.gz) = af459cb16d276cf76a73adba55bc063330136090f7ce9279b851c35eea8c57da
 SIZE (arut-nginx-rtmp-module-6c7719d_GH0.tar.gz) = 520109
 SHA256 (openresty-set-misc-nginx-module-eb223c9_GH0.tar.gz) = 1eeea5ea1df3531e5a1fafde1464b3bb688a7ef1451875017dc25f72c733244b
 SIZE (openresty-set-misc-nginx-module-eb223c9_GH0.tar.gz) = 30088
 SHA256 (sflow-nginx-sflow-module-f15c87f_GH0.tar.gz) = 251de3a5b588a4721effe88f3dbc632706321b7cd1af5fae7aa4f38ca50d2637
 SIZE (sflow-nginx-sflow-module-f15c87f_GH0.tar.gz) = 29515
 SHA256 (nginx-shib-nginx-http-shibboleth-629ae1f_GH0.tar.gz) = 79d3d8330c58254605e569bb34371c030122ad2f52e0191cbf06df3bc316952c
 SIZE (nginx-shib-nginx-http-shibboleth-629ae1f_GH0.tar.gz) = 23907
 SHA256 (baysao-ngx_slowfs_cache-d011a18_GH0.tar.gz) = 6ae8abb01a2aff788e75ec68621cb0159148a6f73730a84b30b0bdbc6cdc1758
 SIZE (baysao-ngx_slowfs_cache-d011a18_GH0.tar.gz) = 11186
 SHA256 (openresty-srcache-nginx-module-bcdcfdc_GH0.tar.gz) = fbe15bc0c2d52f778b04d4433e220f219bde0660d19c6acedf67aa194049b130
 SIZE (openresty-srcache-nginx-module-bcdcfdc_GH0.tar.gz) = 50848
 SHA256 (vozlt-nginx-module-sts-3c10d42_GH0.tar.gz) = 748b67ceb82b3b843ae915bf7863fd08b7c2427c045e5ec540242d050f7b30d0
 SIZE (vozlt-nginx-module-sts-3c10d42_GH0.tar.gz) = 352431
 SHA256 (kaltura-nginx-vod-module-26f0687_GH0.tar.gz) = 7c098d4b1c0f0a3d694ece364fa190d5c88a920352e4c3e9377ae3b38904a08b
 SIZE (kaltura-nginx-vod-module-26f0687_GH0.tar.gz) = 475372
 SHA256 (vozlt-nginx-module-vts-c382342_GH0.tar.gz) = 1252c7fe0636d658172055d7e2598487479a54adc00e90af6b23ddb4b6641952
 SIZE (vozlt-nginx-module-vts-c382342_GH0.tar.gz) = 184988
 SHA256 (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = aca454bffcee2476dc92682ebfb8c0378a271fda178be7e945d648419d220758
 SIZE (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = 14646
 SHA256 (openresty-xss-nginx-module-de2d87a_GH0.tar.gz) = f830c9300d751046e2592c74d09f39ac4b4b4567078c96c24951de5554861b5e
 SIZE (openresty-xss-nginx-module-de2d87a_GH0.tar.gz) = 12779
 SHA256 (tokers-zstd-nginx-module-f4ba115_GH0.tar.gz) = 20045e8ac80e2cc9fd3659573153cb1f22d98a653a10fe939a4be0e90160826a
 SIZE (tokers-zstd-nginx-module-f4ba115_GH0.tar.gz) = 55848
diff --git a/www/freenginx-devel/pkg-plist b/www/freenginx-devel/pkg-plist
index e608ba17dd11..65d236edc4e8 100644
--- a/www/freenginx-devel/pkg-plist
+++ b/www/freenginx-devel/pkg-plist
@@ -1,142 +1,144 @@
 %%ETCDIR%%/koi-utf
 %%ETCDIR%%/koi-win
 %%ETCDIR%%/win-utf
 %%LINK%%include/ngx_link_func_module.h
 %%NAXSI%%%%ETCDIR%%/naxsi_core.rules
 @sample %%ETCDIR%%/fastcgi_params-dist %%ETCDIR%%/fastcgi_params
 @sample %%ETCDIR%%/mime.types-dist %%ETCDIR%%/mime.types
 @sample %%ETCDIR%%/nginx.conf-dist %%ETCDIR%%/nginx.conf
 @sample %%ETCDIR%%/scgi_params-dist %%ETCDIR%%/scgi_params
 @sample %%ETCDIR%%/uwsgi_params-dist %%ETCDIR%%/uwsgi_params
 %%DSO%%%%AJP%%libexec/freenginx/ngx_http_ajp_module.so
 %%DSO%%%%ARRAYVAR%%libexec/freenginx/ngx_http_array_var_module.so
 %%DSO%%%%BROTLI%%libexec/freenginx/ngx_http_brotli_filter_module.so
 %%DSO%%%%BROTLI%%libexec/freenginx/ngx_http_brotli_static_module.so
 %%DSO%%%%CACHE_PURGE%%libexec/freenginx/ngx_http_cache_purge_module.so
 %%DSO%%%%DEVEL_KIT%%libexec/freenginx/ndk_http_module.so
 %%DSO%%%%DRIZZLE%%libexec/freenginx/ngx_http_drizzle_module.so
 %%DSO%%%%DYNAMIC_UPSTREAM%%libexec/freenginx/ngx_http_dynamic_upstream_module.so
 %%DSO%%%%ECHO%%libexec/freenginx/ngx_http_echo_module.so
 %%DSO%%%%ENCRYPTSESSION%%libexec/freenginx/ngx_http_encrypted_session_module.so
 %%DSO%%%%FIPS_CHECK%%libexec/freenginx/ngx_fips_check_module.so
 %%DSO%%%%FORMINPUT%%libexec/freenginx/ngx_http_form_input_module.so
 %%DSO%%%%GRIDFS%%libexec/freenginx/ngx_http_gridfs_module.so
 %%DSO%%%%HEADERS_MORE%%libexec/freenginx/ngx_http_headers_more_filter_module.so
 %%DSO%%%%HTTP_ACCEPT_LANGUAGE%%libexec/freenginx/ngx_http_accept_language_module.so
 %%DSO%%%%HTTP_AUTH_DIGEST%%libexec/freenginx/ngx_http_auth_digest_module.so
 %%DSO%%%%HTTP_AUTH_JWT%%libexec/freenginx/ngx_http_auth_jwt_module.so
 %%DSO%%%%HTTP_AUTH_KRB5%%libexec/freenginx/ngx_http_auth_spnego_module.so
 %%DSO%%%%HTTP_AUTH_LDAP%%libexec/freenginx/ngx_http_auth_ldap_module.so
 %%DSO%%%%HTTP_AUTH_PAM%%libexec/freenginx/ngx_http_auth_pam_module.so
 %%DSO%%%%HTTP_DAV_EXT%%libexec/freenginx/ngx_http_dav_ext_module.so
 %%DSO%%%%HTTP_EVAL%%libexec/freenginx/ngx_http_eval_module.so
 %%DSO%%%%HTTP_FANCYINDEX%%libexec/freenginx/ngx_http_fancyindex_module.so
 %%DSO%%%%HTTP_FOOTER%%libexec/freenginx/ngx_http_footer_filter_module.so
+%%DSO%%%%HTTP_GEOIP%%libexec/freenginx/ngx_http_geoip_module.so
 %%DSO%%%%HTTP_IMAGE_FILTER%%libexec/freenginx/ngx_http_image_filter_module.so
 %%DSO%%%%HTTP_IP2LOCATION%%libexec/freenginx/ngx_http_ip2location_module.so
 %%DSO%%%%HTTP_IP2PROXY%%libexec/freenginx/ngx_http_ip2proxy_module.so
 %%DSO%%%%HTTP_JSON_STATUS%%libexec/freenginx/ngx_http_json_status_module.so
 %%DSO%%%%HTTP_MOGILEFS%%libexec/freenginx/ngx_http_mogilefs_module.so
 %%DSO%%%%HTTP_NOTICE%%libexec/freenginx/ngx_http_notice_module.so
 %%DSO%%%%HTTP_PERL%%libexec/freenginx/ngx_http_perl_module.so
 %%DSO%%%%HTTP_PUSH_STREAM%%libexec/freenginx/ngx_http_push_stream_module.so
 %%DSO%%%%HTTP_PUSH%%libexec/freenginx/ngx_nchan_module.so
 %%DSO%%%%HTTP_REDIS%%libexec/freenginx/ngx_http_redis_module.so
 %%DSO%%%%HTTP_SUBS_FILTER%%libexec/freenginx/ngx_http_subs_filter_module.so
 %%DSO%%%%HTTP_TARANTOOL%%libexec/freenginx/ngx_http_tnt_module.so
 %%DSO%%%%HTTP_UPLOAD_PROGRESS%%libexec/freenginx/ngx_http_uploadprogress_module.so
 %%DSO%%%%HTTP_UPLOAD%%libexec/freenginx/ngx_http_upload_module.so
 %%DSO%%%%HTTP_UPSTREAM_FAIR%%libexec/freenginx/ngx_http_upstream_fair_module.so
 %%DSO%%%%HTTP_UPSTREAM_STICKY%%libexec/freenginx/ngx_http_sticky_module.so
 %%DSO%%%%HTTP_VIDEO_THUMBEXTRACTOR%%libexec/freenginx/ngx_http_video_thumbextractor_module.so
 %%DSO%%%%HTTP_XSLT%%libexec/freenginx/ngx_http_xslt_filter_module.so
 %%DSO%%%%HTTP_ZIP%%libexec/freenginx/ngx_http_zip_module.so
 %%DSO%%%%HTTP%%%%HTTP_GEOIP2%%libexec/freenginx/ngx_http_geoip2_module.so
 %%DSO%%%%HTTP%%%%NJS%%libexec/freenginx/ngx_http_js_module.so
 %%DSO%%%%ICONV%%libexec/freenginx/ngx_http_iconv_module.so
 %%DSO%%%%KEYVAL%%libexec/freenginx/ngx_http_keyval_module.so
 %%DSO%%%%KEYVAL%%libexec/freenginx/ngx_stream_keyval_module.so
 %%DSO%%%%LET%%libexec/freenginx/ngx_http_let_module.so
 %%DSO%%%%LINK%%libexec/freenginx/ngx_http_link_func_module.so
 %%DSO%%%%LUA%%libexec/freenginx/ngx_http_lua_module.so
 %%DSO%%%%LUA%%share/lua/5.1/ngx/balancer.lua
 %%DSO%%%%LUA%%share/lua/5.1/ngx/base64.lua
 %%DSO%%%%LUA%%share/lua/5.1/ngx/errlog.lua
 %%DSO%%%%LUA%%share/lua/5.1/ngx/ocsp.lua
 %%DSO%%%%LUA%%share/lua/5.1/ngx/pipe.lua
 %%DSO%%%%LUA%%share/lua/5.1/ngx/process.lua
 %%DSO%%%%LUA%%share/lua/5.1/ngx/re.lua
 %%DSO%%%%LUA%%share/lua/5.1/ngx/req.lua
 %%DSO%%%%LUA%%share/lua/5.1/ngx/resp.lua
 %%DSO%%%%LUA%%share/lua/5.1/ngx/semaphore.lua
 %%DSO%%%%LUA%%share/lua/5.1/ngx/ssl.lua
 %%DSO%%%%LUA%%share/lua/5.1/ngx/ssl/clienthello.lua
 %%DSO%%%%LUA%%share/lua/5.1/ngx/ssl/proxysslverify.lua
 %%DSO%%%%LUA%%share/lua/5.1/ngx/ssl/session.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/base.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/base64.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/coroutine.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/ctx.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/exit.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/hash.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/misc.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/ndk.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/param.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/phase.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/regex.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/request.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/response.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/shdict.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/socket.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/time.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/uri.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/utils.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/var.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/core/worker.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/lrucache.lua
 %%DSO%%%%LUA%%share/lua/5.1/resty/lrucache/pureffi.lua
 %%DSO%%%%LUASTREAM%%libexec/freenginx/ngx_stream_lua_module.so
 %%DSO%%%%MAIL%%libexec/freenginx/ngx_mail_module.so
 %%DSO%%%%MEMC%%libexec/freenginx/ngx_http_memc_module.so
 %%DSO%%%%MODSECURITY3%%libexec/freenginx/ngx_http_modsecurity_module.so
 %%DSO%%%%NATS%%libexec/freenginx/ngx_nats_module.so
 %%DSO%%%%NAXSI%%libexec/freenginx/ngx_http_naxsi_module.so
 %%DSO%%%%OTEL%%libexec/freenginx/ngx_otel_module.so
 %%DSO%%%%PASSENGER%%libexec/freenginx/ngx_http_passenger_module.so
 %%DSO%%%%POSTGRES%%libexec/freenginx/ngx_postgres_module.so
 %%DSO%%%%RDS_CSV%%libexec/freenginx/ngx_http_rds_csv_filter_module.so
 %%DSO%%%%RDS_JSON%%libexec/freenginx/ngx_http_rds_json_filter_module.so
 %%DSO%%%%REDIS2%%libexec/freenginx/ngx_http_redis2_module.so
 %%DSO%%%%RTMP%%libexec/freenginx/ngx_rtmp_module.so
 %%DSO%%%%SET_MISC%%libexec/freenginx/ngx_http_set_misc_module.so
 %%DSO%%%%SHIBBOLETH%%libexec/freenginx/ngx_http_shibboleth_module.so
 %%DSO%%%%SLOWFS_CACHE%%libexec/freenginx/ngx_http_slowfs_module.so
 %%DSO%%%%SRCACHE%%libexec/freenginx/ngx_http_srcache_filter_module.so
+%%DSO%%%%STREAM%%libexec/freenginx/ngx_stream_module.so
 %%DSO%%%%STREAM%%%%HTTP_GEOIP2%%libexec/freenginx/ngx_stream_geoip2_module.so
 %%DSO%%%%STREAM%%%%NJS%%libexec/freenginx/ngx_stream_js_module.so
-%%DSO%%%%STREAM%%libexec/freenginx/ngx_stream_module.so
+%%DSO%%%%STREAM%%%%STREAM_GEOIP%%libexec/freenginx/ngx_stream_geoip_module.so
 %%DSO%%%%STS%%libexec/freenginx/ngx_http_stream_server_traffic_status_module.so
 %%DSO%%%%VOD%%libexec/freenginx/ngx_http_vod_module.so
 %%DSO%%%%VTS%%libexec/freenginx/ngx_http_vhost_traffic_status_module.so
 %%DSO%%%%WEBSOCKIFY%%libexec/freenginx/ngx_http_websockify_module.so
 %%DSO%%%%XSS%%libexec/freenginx/ngx_http_xss_filter_module.so
 %%DSO%%%%ZSTD%%libexec/freenginx/ngx_http_zstd_filter_module.so
 %%DSO%%%%ZSTD%%libexec/freenginx/ngx_http_zstd_static_module.so
 %%HTTP_PERL%%%%SITE_ARCH%%/auto/nginx/nginx.so
 %%HTTP_PERL%%%%SITE_ARCH%%/nginx.pm
 sbin/nginx
 share/vim/vimfiles/ftdetect/nginx.vim
 share/vim/vimfiles/ftplugin/nginx.vim
 share/vim/vimfiles/indent/nginx.vim
 share/vim/vimfiles/syntax/nginx.vim
 %%WWW%%@postexec mkdir -p -m 755 %D/www/freenginx-dist
 %%WWW%%@postexec if [ ! -d %D/www/freenginx/ ] ; then ln -fs %D/www/freenginx-dist %D/www/freenginx; fi
 %%WWW%%www/freenginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
 %%WWW%%www/freenginx-dist/index.html
 %%WWW%%www/freenginx-dist/50x.html
 %%WWW%%@postexec chmod a-w %D/www/freenginx-dist
 %%WWW%%@postunexec if [ -L %D/www/freenginx ]; then rm -f %D/www/freenginx; fi
 @dir %%NGINX_TMPDIR%%
 @dir %%NGINX_LOGDIR%%
 share/man/man8/nginx.8.gz
diff --git a/www/freenginx-devel/version.mk b/www/freenginx-devel/version.mk
index 118d35007e58..456897405932 100644
--- a/www/freenginx-devel/version.mk
+++ b/www/freenginx-devel/version.mk
@@ -1 +1 @@
-NGINX_VERSION=	1.29.3
+NGINX_VERSION=	1.29.4