diff --git a/www/angie-module-vod/Makefile b/www/angie-module-vod/Makefile
index af621f2763f3..f58a1e120fff 100644
--- a/www/angie-module-vod/Makefile
+++ b/www/angie-module-vod/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	angie-module-vod
-MODULE_VERSION=	1.33
-MODULE_PORTREVISION=	5
-GH_TUPLE=	kaltura:nginx-vod-module:${MODULE_VERSION}:module
+MODULE_VERSION=		1.8.1
+MODULE_PORTREVISION=	0
+MODULE_PORTEPOCH=	2
+GH_TUPLE=	dio-az:nginx-vod-module:v${MODULE_VERSION}:module
 
 COMMENT=	VOD dynamic module for Angie
-WWW=		https://github.com/kaltura/nginx-vod-module/
+WWW=		https://github.com/dio-az/nginx-vod-module/
 
 LICENSE= AGPLv3
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libswscale.so:multimedia/ffmpeg
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_vod_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_DATA} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ngx_http_vod_module.so \
 	    ${STAGEDIR}${MODDIR}/ngx_http_vod_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-vod/files/pkg-message.in b/www/angie-module-vod/files/pkg-message.in
index 598333e9a38a..b5ba5fc693e7 100644
--- a/www/angie-module-vod/files/pkg-message.in
+++ b/www/angie-module-vod/files/pkg-message.in
@@ -1,15 +1,15 @@
 [
 { type: install
   message: <<EOM
 
 The VOD dynamic module for Angie has been installed.
 To enable this module, add the following to %%PREFIX%%/etc/angie/angie.conf
 and reload angie:
 
     load_module modules/ngx_http_vod_module.so;
 
 Please refer to the module documentation for further details:
-https://github.com/kaltura/nginx-vod-module
+https://github.com/dio-az/nginx-vod-module
 EOM
 }
 ]
diff --git a/www/angie-module-vod/pkg-descr b/www/angie-module-vod/pkg-descr
index e164f1cad005..fd7736d48abe 100644
--- a/www/angie-module-vod/pkg-descr
+++ b/www/angie-module-vod/pkg-descr
@@ -1,5 +1,5 @@
-Module allows on-the-fly repackaging of MP4 files to DASH, HDS, HLS, MSS.
+Module allows on-the-fly repackaging of MP4 files to DASH, HLS.
 It provides following working modes:
 - local: serve locally accessible files (local disk/NFS mounted)
 - remote: serve files accessible via HTTP using range requests
 - mapped - serve files according to a specification encoded in JSON format
diff --git a/www/angie/Makefile b/www/angie/Makefile
index dee681e43a70..0ed1c321345a 100644
--- a/www/angie/Makefile
+++ b/www/angie/Makefile
@@ -1,210 +1,214 @@
 PORTNAME?=	angie
 ANGIE_VERSION=	1.11.8
 ANGIE_PORTREVISION=	0
 CATEGORIES+=	www
 MASTER_SITES+=	https://download.angie.software/files/:angie
 DISTNAME=	angie-${ANGIE_VERSION}
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}:angie
 
 MAINTAINER?=	sko@rostwald.de
 COMMENT?=	Efficient, powerful and scalable reverse proxy and web server
 WWW?=		https://angie.software/en/
 
 LICENSE?=	BSD2CLAUSE
 
 .if ${PORTNAME} == angie
 DISTVERSION=	${ANGIE_VERSION}
 PORTREVISION=	${ANGIE_PORTREVISION}
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 USE_RC_SUBR=	angie
 ALL_TARGET=	build
 SUB_FILES=	angie.conf.sample \
 		default.conf.sample \
 		example.conf.sample \
 		pkg-message
 
 .else
 .  if defined(MODULE_VERSION)
 DISTVERSION=	${MODULE_VERSION}
 PORTREVISION=	${MODULE_PORTREVISION}
+.    if defined(MODULE_PORTEPOCH)
+PORTEPOCH=	${MODULE_PORTEPOCH}
+.    else
 PORTEPOCH=	1
+.    endif
 .  else
 DISTVERSION=	${ANGIE_VERSION}
 PORTREVISION=	${ANGIE_PORTREVISION}
 .  endif
 LICENSE_FILE?=	${WRKSRC_module}/LICENSE
 BUILD_DEPENDS+=	pcre2>=0:devel/pcre2
 # The following makes sure module ports are rebuild if angie gets updated.
 # However, pkg does not obey RUN_DEPENDS on updates, therefore we need to
 # also bump MODULE_PORTREVISION for every single www/angie-module* port.
 .  if ${ANGIE_PORTREVISION} == 0
 RUN_DEPENDS+=	angie==${ANGIE_VERSION}:www/angie
 .  else
 RUN_DEPENDS+=	angie==${ANGIE_VERSION}_${ANGIE_PORTREVISION}:www/angie
 .  endif
 ALL_TARGET?=	modules
 CONFIGURE_ADD?=	--add-dynamic-module=${WRKSRC_module}
 .endif
 
 USES+=		localbase:ldflags ssl
 USE_GITHUB=	nodefault
 
 HAS_CONFIGURE?=	yes
 CONFIGURE_ARGS=	--prefix=${ETCDIR} \
 		--conf-path=${ETCDIR}/angie.conf \
 		--error-log-path=${LOGDIR}/error.log \
 		--http-log-path=${LOGDIR}/access.log \
 		--lock-path=${RUNDIR}/angie.lock \
 		--modules-path=${MODDIR} \
 		--pid-path=${RUNDIR}/angie.pid \
 		--sbin-path=${PREFIX}/sbin/angie \
 		--http-client-body-temp-path=${CACHEDIR}/client_temp \
 		--http-fastcgi-temp-path=${CACHEDIR}/fastcgi_temp \
 		--http-proxy-temp-path=${CACHEDIR}/proxy_temp \
 		--http-scgi-temp-path=${CACHEDIR}/scgi_temp \
 		--http-uwsgi-temp-path=${CACHEDIR}/uwsgi_temp \
 		--user=${WWWOWN} \
 		--group=${WWWGRP} \
 		--with-file-aio \
 		--with-http_addition_module \
 		--with-http_auth_request_module \
 		--with-http_dav_module \
 		--with-http_flv_module \
 		--with-http_gunzip_module \
 		--with-http_gzip_static_module \
 		--with-http_mp4_module \
 		--with-http_random_index_module \
 		--with-http_realip_module \
 		--with-http_secure_link_module \
 		--with-http_slice_module \
 		--with-http_ssl_module \
 		--with-http_stub_status_module \
 		--with-http_sub_module \
 		--with-http_v2_module \
 		--with-http_v3_module \
 		--with-mail \
 		--with-mail_ssl_module \
 		--with-stream \
 		--with-stream_realip_module \
 		--with-stream_ssl_module \
 		--with-stream_ssl_preread_module \
 		--with-threads \
 		--with-cc-opt="${CFLAGS}" \
 		--with-ld-opt="${LDFLAGS}" \
 		${CONFIGURE_ADD}
 
 # angie-specific variables
 CACHEDIR=	/var/cache/angie
 DBDIR=		/var/db/angie
 ETCDIR=		${PREFIX}/etc/angie
 LOGDIR=		/var/log/angie
 MODDIR=		${PREFIX}/libexec/angie
 RUNDIR=		/var/run
 WRKSRC_DEBUG=	${WRKSRC}-debug
 # modules always have their own assets
 FILESDIR?=	${.CURDIR}/files
 PATCHDIR?=	${.CURDIR}/files
 PKGDIR?=	${.CURDIR}
 SCRIPTDIR?=	${.CURDIR}/scripts
 
 SUB_FILES?=	pkg-message
 SUB_LIST+=	CACHEDIR=${CACHEDIR} \
 		DBDIR=${DBDIR} \
 		ETCDIR=${ETCDIR} \
 		LOGDIR=${LOGDIR} \
 		MODDIR=${MODDIR} \
 		RUNDIR=${RUNDIR} \
 		WWWGRP=${WWWGRP} \
 		WWWOWN=${WWWOWN}
 
 PLIST_SUB+=	CACHEDIR=${CACHEDIR} \
 		DBDIR=${DBDIR} \
 		LOGDIR=${LOGDIR} \
 		MODDIR=${MODDIR} \
 		RUNDIR=${RUNDIR} \
 		WWWGRP=${WWWGRP} \
 		WWWOWN=${WWWOWN}
 
 OPTIONS_DEFINE?=	DEBUG
 OPTIONS_DEFAULT?=	DEBUG
 OPTIONS_SUB=		yes
 DEBUG_DESC?=		Include debug version
 
 .if ${PORTNAME} == angie
 OPTIONS_DEFINE+=	ACME
 OPTIONS_DEFAULT+=	ACME
 ACME_DESC=		ACME client module
 ACME_CONFIGURE_ON=	--with-http_acme_module \
 			--http-acme-client-path=${ETCDIR}/acme-client
 .endif
 
 .include <bsd.port.options.mk>
 
 post-patch-DEBUG-on:
 	@${CP} -Rp ${WRKSRC} ${WRKSRC_DEBUG}
 
 post-configure-DEBUG-on:
 	@(cd ${WRKSRC_DEBUG} && \
 	    ${SET_LATE_CONFIGURE_ARGS} \
 	    if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
 		CFLAGS="${CFLAGS} -g" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
 		INSTALL="/usr/bin/install -c" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_LIB="${INSTALL_LIB}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} --with-debug; then \
 		${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
 		(${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT_80} ; \
 		${FALSE}; \
 	    fi \
 	)
 
 post-build-DEBUG-on:
 	@(cd ${WRKSRC_DEBUG} && ${DO_MAKE_BUILD} ${ALL_TARGET})
 
 .if ${PORTNAME} == angie
 do-install:
 	${MKDIR} ${STAGEDIR}${CACHEDIR} \
 		 ${STAGEDIR}${DBDIR} \
 		 ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${ETCDIR}/http.d \
 		 ${STAGEDIR}${ETCDIR}/stream.d \
 		 ${STAGEDIR}${MODDIR} \
 		 ${STAGEDIR}${WWWDIR}/html
 .  if ${PORT_OPTIONS:MACME}
 	${MKDIR} ${STAGEDIR}${ETCDIR}/acme-client
 .  endif
 
 	${RLN} ${STAGEDIR}${MODDIR} ${STAGEDIR}${ETCDIR}/modules
 
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/angie \
 	    ${STAGEDIR}${PREFIX}/sbin/angie-nodebug
 
 	${LN} -fs angie-nodebug ${STAGEDIR}${PREFIX}/sbin/angie
 
 	${INSTALL_MAN} ${WRKSRC}/objs/angie.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/CHANGES.ru ${STAGEDIR}${DOCSDIR}
 
 .  for i in fastcgi.conf fastcgi_params mime.types scgi_params uwsgi_params
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}/${i}.sample
 .  endfor
 	${INSTALL_DATA} ${WRKSRC}/conf/prometheus_all.conf \
 	    ${STAGEDIR}${ETCDIR}/prometheus_all.conf.sample
 	${INSTALL_DATA} ${WRKDIR}/angie.conf.sample \
 	    ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/default.conf.sample \
 	    ${STAGEDIR}${ETCDIR}/http.d
 	${INSTALL_DATA} ${WRKDIR}/example.conf.sample \
 	    ${STAGEDIR}${ETCDIR}/stream.d
 	${INSTALL_DATA} ${WRKSRC}/html/50x.html ${WRKSRC}/html/index.html \
 		${STAGEDIR}${WWWDIR}/html
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${BINMODE} ${WRKSRC_DEBUG}/objs/angie \
 	    ${STAGEDIR}${PREFIX}/sbin/angie-debug
 .endif # ${PORTNAME} == angie
 
 .include <bsd.port.mk>
diff --git a/www/angie/distinfo b/www/angie/distinfo
index c5d719645f5d..f0d4538d72da 100644
--- a/www/angie/distinfo
+++ b/www/angie/distinfo
@@ -1,59 +1,59 @@
 TIMESTAMP = 1782289193
 SHA256 (angie-1.11.8.tar.gz) = 849897c78f79c3b04d035778e34993a92188e6bd2c0c3ba8ce3ad5eb1505ebd3
 SIZE (angie-1.11.8.tar.gz) = 1889185
 SHA256 (61131-nginx-http-auth-totp-1.2.0_GH0.tar.gz) = 630e599c5ca16691689230a8b40a6db0d2878a1112be641fa50d68a7d8551651
 SIZE (61131-nginx-http-auth-totp-1.2.0_GH0.tar.gz) = 11426
 SHA256 (kjdev-nginx-auth-jwt-0.14.1_GH0.tar.gz) = 2fbb5823e546cea067f8cc8c2173986da79a0b10f8e9399623aac0234d6c02b8
 SIZE (kjdev-nginx-auth-jwt-0.14.1_GH0.tar.gz) = 84221
 SHA256 (kjdev-nxe-json-0.5.0_GH0.tar.gz) = 8636cebecade632f99911ebb497d33e1d89586e08ce69f5d5432d2b6fb793bd7
 SIZE (kjdev-nxe-json-0.5.0_GH0.tar.gz) = 27879
 SHA256 (kjdev-nxe-jwx-0.1.0_GH0.tar.gz) = ede1d2540472a768894921cc03fb811ebda57b681ade32e41b80ad060bf94719
 SIZE (kjdev-nxe-jwx-0.1.0_GH0.tar.gz) = 48489
 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 (google-ngx_brotli-v1.0.0rc_GH0.tar.gz) = c85cdcfd76703c95aa4204ee4c2e619aa5b075cac18f428202f65552104add3b
 SIZE (google-ngx_brotli-v1.0.0rc_GH0.tar.gz) = 16207
 SHA256 (nginx-modules-ngx_cache_purge-3.0.2_GH0.tar.gz) = 627f60bfd514bbe6de7af1bfcb4c69271d4588348d5e359cbd26679adf0f2fb0
 SIZE (nginx-modules-ngx_cache_purge-3.0.2_GH0.tar.gz) = 42151
 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-echo-nginx-module-v0.64_GH0.tar.gz) = 6f43f56d7e7e8526716bbda06b300f0119912eede47b3a48bb948252a1fb38c8
 SIZE (openresty-echo-nginx-module-v0.64_GH0.tar.gz) = 53549
 SHA256 (bpaquet-ngx_http_enhanced_memcached_module-v0.3_GH0.tar.gz) = 4071b2cc0baa9f403c124c0ef0cdfbde14dacc1ec9f0dbc92d7310ac530e3eeb
 SIZE (bpaquet-ngx_http_enhanced_memcached_module-v0.3_GH0.tar.gz) = 101136
 SHA256 (openresty-nginx-eval-module-2016.06.10_GH0.tar.gz) = 6b91d3c2c2f254ebb37eb3dd6dd41048dfb18320bb98a3afdd1ad38b47f6d609
 SIZE (openresty-nginx-eval-module-2016.06.10_GH0.tar.gz) = 14188
 SHA256 (leev-ngx_http_geoip2_module-3.4_GH0.tar.gz) = ad72fc23348d715a330994984531fab9b3606e160483236737f9a4a6957d9452
 SIZE (leev-ngx_http_geoip2_module-3.4_GH0.tar.gz) = 8877
 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 (max-lt-nginx-jwt-module-v3.4.4_GH0.tar.gz) = 7c3effa96936d87c3a8a0e07ff91d2d341a7f78f8bb3d6c9085b06f398684242
 SIZE (max-lt-nginx-jwt-module-v3.4.4_GH0.tar.gz) = 17300
 SHA256 (kjdev-nginx-keyval-0.5.0_GH0.tar.gz) = 893b59f121a959ddc84f8d26562cdcf9c63605c1e441b41ae01da37e28168f86
 SIZE (kjdev-nginx-keyval-0.5.0_GH0.tar.gz) = 36172
 SHA256 (openresty-lua-nginx-module-v0.10.29R2_GH0.tar.gz) = 2435bb65900d556a9175c77548ff0ef4cb507b786f57f7d1c4a7904a7f5063fd
 SIZE (openresty-lua-nginx-module-v0.10.29R2_GH0.tar.gz) = 892562
 SHA256 (openresty-stream-lua-nginx-module-v0.0.17R4_GH0.tar.gz) = 214927614eef96d5b1f26c0adaf94a8fd8c32f73dd17e494c217ca40f60e5910
 SIZE (openresty-stream-lua-nginx-module-v0.0.17R4_GH0.tar.gz) = 417131
 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 (nginx-njs-0.9.9_GH0.tar.gz) = a07f4cf0a2076bbabde23cab48aea68641ebf5d54ea69b415ce70a8da4153843
 SIZE (nginx-njs-0.9.9_GH0.tar.gz) = 994273
 SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9
 SIZE (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = 40742
 SHA256 (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = d255571bcfb9939b78099df39cb4d42f174d789aec8c8e5e47b93942b0299438
 SIZE (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = 25471
 SHA256 (arut-nginx-rtmp-module-v1.2.2_GH0.tar.gz) = 07f19b7bffec5e357bb8820c63e5281debd45f5a2e6d46b1636d9202c3e09d78
 SIZE (arut-nginx-rtmp-module-v1.2.2_GH0.tar.gz) = 519934
 SHA256 (openresty-set-misc-nginx-module-v0.33_GH0.tar.gz) = cd5e2cc834bcfa30149e7511f2b5a2183baf0b70dc091af717a89a64e44a2985
 SIZE (openresty-set-misc-nginx-module-v0.33_GH0.tar.gz) = 30084
 SHA256 (yaoweibin-ngx_http_substitutions_filter_module-e12e965ac1837ca709709f9a26f572a54d83430e_GH0.tar.gz) = da2a26aa75884e1216941c7291b6e8b7fc4dd7163700a04191b92060b61fabb3
 SIZE (yaoweibin-ngx_http_substitutions_filter_module-e12e965ac1837ca709709f9a26f572a54d83430e_GH0.tar.gz) = 94121
 SHA256 (kyprizel-testcookie-nginx-module-7d263d4322b7de6b99b486e5e10ecaf0295890ad_GH0.tar.gz) = 679dc915b464c791fe7ae27a610ca38f3a0b40a68c4b24fbcbb835d232224fc0
 SIZE (kyprizel-testcookie-nginx-module-7d263d4322b7de6b99b486e5e10ecaf0295890ad_GH0.tar.gz) = 21042
 SHA256 (fdintino-nginx-upload-module-2.3.0_GH0.tar.gz) = c86e318addb9c88d70fdbd58ff1f6ef6f404a93070f6db8017a1f880c97946c4
 SIZE (fdintino-nginx-upload-module-2.3.0_GH0.tar.gz) = 40139
-SHA256 (kaltura-nginx-vod-module-1.33_GH0.tar.gz) = 9c9600e5da4ee02ef6820d056da9eb5f3449f715468334ddab41727b76d478d8
-SIZE (kaltura-nginx-vod-module-1.33_GH0.tar.gz) = 471858
+SHA256 (dio-az-nginx-vod-module-v1.8.1_GH0.tar.gz) = 9785658b653a8f4ce67dec6ccdf4e8912c44a8ac2e9cea8f920aeac90288b62e
+SIZE (dio-az-nginx-vod-module-v1.8.1_GH0.tar.gz) = 457830
 SHA256 (tokers-zstd-nginx-module-0.1.1_GH0.tar.gz) = 707d534f8ca4263ff043066db15eac284632aea875f9fe98c96cea9529e15f41
 SIZE (tokers-zstd-nginx-module-0.1.1_GH0.tar.gz) = 55417