diff --git a/www/angie-module-auth-jwt/Makefile b/www/angie-module-auth-jwt/Makefile
index d63edb1e6a57..6263d7ef3800 100644
--- a/www/angie-module-auth-jwt/Makefile
+++ b/www/angie-module-auth-jwt/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	angie-module-auth-jwt
 MODULE_VERSION=	0.9.0
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	kjdev:nginx-auth-jwt:${MODULE_VERSION}:module
 
 COMMENT=	Angie auth-jwt dynamic module
 WWW=		https://github.com/kjdev/nginx-auth-jwt/
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libjansson.so:devel/jansson
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 CONFLICTS=	www/angie-module-jwt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_auth_jwt_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ngx_http_auth_jwt_module.so \
 	    ${STAGEDIR}${MODDIR}/ngx_http_auth_jwt_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-auth-spnego/Makefile b/www/angie-module-auth-spnego/Makefile
index 3bb39ca48a35..165b0dd2bbf4 100644
--- a/www/angie-module-auth-spnego/Makefile
+++ b/www/angie-module-auth-spnego/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	angie-module-auth-spnego
 MODULE_VERSION=	1.1.3
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	stnoonan:spnego-http-auth-nginx-module:v${MODULE_VERSION}:module
 
 COMMENT=	Angie auth-spnego dynamic module
 WWW=		https://github.com/stnoonan/spnego-http-auth-nginx-module/
 
 USES=		gssapi:mit
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|lgssapi\"|lgssapi_krb5"|' \
 		${WRKSRC_module}/config
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_auth_spnego_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ngx_http_auth_spnego_module.so \
 	    ${STAGEDIR}${MODDIR}/ngx_http_auth_spnego_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-auth-totp/Makefile b/www/angie-module-auth-totp/Makefile
index a43a9d72e149..7afe3c9aadf9 100644
--- a/www/angie-module-auth-totp/Makefile
+++ b/www/angie-module-auth-totp/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	angie-module-auth-totp
 MODULE_VERSION=	1.1.0
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	61131:nginx-http-auth-totp:${MODULE_VERSION}:module
 
 COMMENT=	Angie auth-totp dynamic module
 WWW=		https://github.com/61131/nginx-http-auth-totp/
 
 LICENSE=	MIT
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_auth_totp_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ngx_http_auth_totp_module.so \
 	    ${STAGEDIR}${MODDIR}/ngx_http_auth_totp_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-brotli/Makefile b/www/angie-module-brotli/Makefile
index 87f5fa20dce6..5543c218001a 100644
--- a/www/angie-module-brotli/Makefile
+++ b/www/angie-module-brotli/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	angie-module-brotli
 MODULE_VERSION=	1.0.0rc
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	google:ngx_brotli:v${MODULE_VERSION}:module
 
 COMMENT=	Angie Brotli dynamic module
 WWW=		https://github.com/google/ngx_brotli/
 
 LIB_DEPENDS=	libbrotlienc.so:archivers/brotli
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 .for i in ngx_http_brotli_filter_module ngx_http_brotli_static_module
 	${INSTALL_LIB} ${WRKSRC}/objs/${i}.so ${STAGEDIR}${MODDIR}
 .endfor
 
 .for i in CONTRIBUTING README
 	${INSTALL_MAN} ${WRKSRC_module}/${i}.md ${STAGEDIR}${DOCSDIR}
 .endfor
 
 do-install-DEBUG-on:
 .for i in ngx_http_brotli_filter_module ngx_http_brotli_static_module
 	${INSTALL} ${COPY} -m ${_SHAREMODE} ${WRKSRC_DEBUG}/objs/${i}.so \
 	    ${STAGEDIR}${MODDIR}/${i}-debug.so
 .endfor
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-cache-purge/Makefile b/www/angie-module-cache-purge/Makefile
index ee49fc174c10..37bf53793b68 100644
--- a/www/angie-module-cache-purge/Makefile
+++ b/www/angie-module-cache-purge/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	angie-module-cache-purge
 MODULE_VERSION= 2.5.5
-MODULE_PORTREVISION=	0
+MODULE_PORTREVISION=	1
 GH_TUPLE=	nginx-modules:ngx_cache_purge:${MODULE_VERSION}:module
 
 COMMENT=	Angie cache_purge dynamic module
 WWW=		https://github.com/nginx-modules/ngx_cache_purge/
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_cache_purge_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ngx_http_cache_purge_module.so \
 	    ${STAGEDIR}${MODDIR}/ngx_http_cache_purge_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-dav-ext/Makefile b/www/angie-module-dav-ext/Makefile
index 98235208832f..6825fc3a1573 100644
--- a/www/angie-module-dav-ext/Makefile
+++ b/www/angie-module-dav-ext/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	angie-module-dav-ext
 MODULE_VERSION=	3.0.0
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	arut:nginx-dav-ext-module:v${MODULE_VERSION}:module
 
 COMMENT=	Angie dav-ext dynamic module
 WWW=		https://github.com/arut/nginx-dav-ext-module/
 
 LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
 		libxslt.so:textproc/libxslt
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_dav_ext_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.rst ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ngx_http_dav_ext_module.so \
 	    ${STAGEDIR}${MODDIR}/ngx_http_dav_ext_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-echo/Makefile b/www/angie-module-echo/Makefile
index 568fbdc99556..1208f7a8010f 100644
--- a/www/angie-module-echo/Makefile
+++ b/www/angie-module-echo/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	angie-module-echo
 MODULE_VERSION=	0.64
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	openresty:echo-nginx-module:v${MODULE_VERSION}:module
 
 COMMENT=	Angie echo dynamic module
 WWW=		https://github.com/openresty/echo-nginx-module/
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_echo_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ngx_http_echo_module.so \
 	    ${STAGEDIR}${MODDIR}/ngx_http_echo_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-enhanced-memcached/Makefile b/www/angie-module-enhanced-memcached/Makefile
index a7ba1f58d0c3..91b04687f77b 100644
--- a/www/angie-module-enhanced-memcached/Makefile
+++ b/www/angie-module-enhanced-memcached/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	angie-module-enhanced-memcached
 MODULE_VERSION=	0.3
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	bpaquet:ngx_http_enhanced_memcached_module:v${MODULE_VERSION}:module
 
 COMMENT=	Angie enhanced memcached dynamic module
 WWW=		https://github.com/bpaquet/ngx_http_enhanced_memcached_module/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC_module}/README.markdown
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_enhanced_memcached_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ngx_http_enhanced_memcached_module.so \
 	    ${STAGEDIR}${MODDIR}/ngx_http_enhanced_memcached_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-eval/Makefile b/www/angie-module-eval/Makefile
index 63bb06b113d8..e32cbbdebd80 100644
--- a/www/angie-module-eval/Makefile
+++ b/www/angie-module-eval/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	angie-module-eval
 MODULE_VERSION=	2016.06.10
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	openresty:nginx-eval-module:${MODULE_VERSION}:module
 
 COMMENT=	Angie eval dynamic module
 WWW=		https://github.com/openresty/nginx-eval-module/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC_module}/LICENCE
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_eval_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ngx_http_eval_module.so \
 	    ${STAGEDIR}${MODDIR}/ngx_http_eval_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-geoip2/Makefile b/www/angie-module-geoip2/Makefile
index b5eaa6074107..184183191e8f 100644
--- a/www/angie-module-geoip2/Makefile
+++ b/www/angie-module-geoip2/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	angie-module-geoip2
 MODULE_VERSION=	3.4
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	leev:ngx_http_geoip2_module:${MODULE_VERSION}:module
 
 COMMENT=	Angie GeoIP2 dynamic module
 WWW=		https://github.com/leev/ngx_http_geoip2_module/
 
 LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 .for i in ngx_http_geoip2_module ngx_stream_geoip2_module
 	${INSTALL_LIB} ${WRKSRC}/objs/${i}.so ${STAGEDIR}${MODDIR}
 .endfor
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 .for i in ngx_http_geoip2_module ngx_stream_geoip2_module
 	${INSTALL} ${COPY} -m ${_SHAREMODE} ${WRKSRC_DEBUG}/objs/${i}.so \
 	    ${STAGEDIR}${MODDIR}/${i}-debug.so
 .endfor
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-headers-more/Makefile b/www/angie-module-headers-more/Makefile
index 07157598af5b..0a3329af6616 100644
--- a/www/angie-module-headers-more/Makefile
+++ b/www/angie-module-headers-more/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	angie-module-headers-more
 MODULE_VERSION=	0.39
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	openresty:headers-more-nginx-module:v${MODULE_VERSION}:module
 
 COMMENT=	Angie headers-more dynamic module
 WWW=		https://github.com/openresty/headers-more-nginx-module/
 
 LICENSE_FILE=	${WRKSRC_module}/README.markdown
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_headers_more_filter_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ngx_http_headers_more_filter_module.so \
 	    ${STAGEDIR}${MODDIR}/ngx_http_headers_more_filter_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-jwt/Makefile b/www/angie-module-jwt/Makefile
index 158d45b42934..f4a2c96e87a9 100644
--- a/www/angie-module-jwt/Makefile
+++ b/www/angie-module-jwt/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	angie-module-jwt
 MODULE_VERSION=	3.4.4
-MODULE_PORTREVISION=	0
+MODULE_PORTREVISION=	1
 GH_TUPLE=	max-lt:nginx-jwt-module:v${MODULE_VERSION}:module
 
 COMMENT=	Angie JWT dynamic module
 WWW=		https://github.com/max-lt/nginx-jwt-module/
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libjansson.so:devel/jansson \
 		libjwt.so:www/libjwt
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 CONFLICTS=	www/angie-module-auth-jwt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_auth_jwt_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ngx_http_auth_jwt_module.so \
 	    ${STAGEDIR}${MODDIR}/ngx_http_auth_jwt_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-keyval/Makefile b/www/angie-module-keyval/Makefile
index 64973993556d..c7052a5d2fac 100644
--- a/www/angie-module-keyval/Makefile
+++ b/www/angie-module-keyval/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	angie-module-keyval
 MODULE_VERSION=	0.3.0
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	kjdev:nginx-keyval:${MODULE_VERSION}:module
 
 COMMENT=	Angie keyval dynamic module
 WWW=		https://github.com/kjdev/nginx-keyval/
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libhiredis.so:databases/hiredis
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_keyval_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ngx_http_keyval_module.so \
 	    ${STAGEDIR}${MODDIR}/ngx_http_keyval_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-lua/Makefile b/www/angie-module-lua/Makefile
index d464fae37f8a..9a14b0c3dc54 100644
--- a/www/angie-module-lua/Makefile
+++ b/www/angie-module-lua/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	angie-module-lua
 MODULE_VERSION=	0.10.29
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	openresty:lua-nginx-module:v${MODULE_VERSION}:lua
 GH_TUPLE+=	openresty:stream-lua-nginx-module:v0.0.16:lua_stream
 GH_TUPLE+=	vision5:ngx_devel_kit:v0.3.4:ndk
 
 COMMENT=	Angie Lua dynamic module
 WWW=		https://github.com/openresty/lua-nginx-module/
 
 LICENSE_FILE=	${WRKSRC_lua}/README.markdown
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 CONFIGURE_ADD=	--add-dynamic-module=${WRKSRC_lua} \
 		--add-dynamic-module=${WRKSRC_lua_stream} \
 		--add-dynamic-module=${WRKSRC_ndk}
 
 CONFIGURE_ENV=	LUAJIT_INC=${LUAJIT_INCDIR} \
 		LUAJIT_LIB=${LOCALBASE}/lib
 
 RUN_DEPENDS=	angie-module-ndk>=0.3.4,1:www/angie-module-ndk \
 		lua-resty-core>=0.1.31:www/lua-resty-core
 
 USES= 		luajit:luajit-openresty
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 .for i in ngx_http_lua_module ngx_stream_lua_module
 	${INSTALL_LIB} ${WRKSRC}/objs/${i}.so ${STAGEDIR}${MODDIR}
 .endfor
 
 	${INSTALL_MAN} ${WRKSRC_lua}/README.markdown \
 		${STAGEDIR}${DOCSDIR}/README.lua-nginx-module.markdown
 	${INSTALL_MAN} ${WRKSRC_lua_stream}/README.md \
 		${STAGEDIR}${DOCSDIR}/README.stream-lua-nginx-module.md
 
 do-install-DEBUG-on:
 .for i in ngx_http_lua_module ngx_stream_lua_module
 	${INSTALL} ${COPY} -m ${_SHAREMODE} ${WRKSRC_DEBUG}/objs/${i}.so \
 	    ${STAGEDIR}${MODDIR}/${i}-debug.so
 .endfor
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-ndk/Makefile b/www/angie-module-ndk/Makefile
index c8c7cf78ac59..5ff7e0ffd22c 100644
--- a/www/angie-module-ndk/Makefile
+++ b/www/angie-module-ndk/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	angie-module-ndk
 MODULE_VERSION=	0.3.4
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	vision5:ngx_devel_kit:v${MODULE_VERSION}:module
 
 COMMENT=	Angie NDK dynamic module
 WWW=		https://github.com/vision5/ngx_devel_kit/
 
 LICENSE=	BSD3CLAUSE
 
 CFLAGS+=	-DNDK_SET_VAR -DNDK_UPSTREAM_LIST
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ndk_http_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ndk_http_module.so \
 	    ${STAGEDIR}${MODDIR}/ndk_http_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-njs/Makefile b/www/angie-module-njs/Makefile
index 57f3af7ebc5f..6c0689db80fb 100644
--- a/www/angie-module-njs/Makefile
+++ b/www/angie-module-njs/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	angie-module-njs
 MODULE_VERSION=	0.9.5
-MODULE_PORTREVISION=	0
+MODULE_PORTREVISION=	1
 GH_TUPLE=	nginx:njs:${MODULE_VERSION}:module
 
 COMMENT=	Angie NJS dynamic module
 WWW=		https://github.com/nginx/njs/
 
 LIB_DEPENDS=	libxslt.so:textproc/libxslt
 
 USES=		gnome
 USE_GNOME=	libxml2
 
 CONFIGURE_ADD=	--add-dynamic-module=${WRKSRC_module}/nginx
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 .for i in ngx_http_js_module ngx_stream_js_module
 	${INSTALL_LIB} ${WRKSRC}/objs/${i}.so ${STAGEDIR}${MODDIR}
 .endfor
 
 .for i in CHANGES README.md SECURITY.md SUPPORT.md
 	${INSTALL_MAN} ${WRKSRC_module}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 do-install-DEBUG-on:
 .for i in ngx_http_js_module ngx_stream_js_module
 	${INSTALL} ${COPY} -m ${_SHAREMODE} ${WRKSRC_DEBUG}/objs/${i}.so \
 	    ${STAGEDIR}${MODDIR}/${i}-debug.so
 .endfor
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-postgres/Makefile b/www/angie-module-postgres/Makefile
index f043fdf7d404..0d5e659d6583 100644
--- a/www/angie-module-postgres/Makefile
+++ b/www/angie-module-postgres/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	angie-module-postgres
 MODULE_VERSION=	1.0rc7
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	FRiCKLE:ngx_postgres:${MODULE_VERSION}:module
 
 COMMENT=	Angie postgres dynamic module
 WWW=		https://github.com/FRiCKLE/ngx_postgres/
 
 USES=		pgsql
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_postgres_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ngx_postgres_module.so \
 	    ${STAGEDIR}${MODDIR}/ngx_postgres_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-redis2/Makefile b/www/angie-module-redis2/Makefile
index d840ea46871f..4723362ede4d 100644
--- a/www/angie-module-redis2/Makefile
+++ b/www/angie-module-redis2/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	angie-module-redis2
 MODULE_VERSION=	0.15
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	openresty:redis2-nginx-module:v${MODULE_VERSION}:module
 
 COMMENT=	Angie redis2 dynamic module
 WWW=		https://github.com/openresty/redis2-nginx-module/
 
 LICENSE_FILE=	${WRKSRC_module}/README.markdown
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_redis2_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ngx_http_redis2_module.so \
 	    ${STAGEDIR}${MODDIR}/ngx_http_redis2_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-set-misc/Makefile b/www/angie-module-set-misc/Makefile
index fdd90fe56e06..88842ab4d327 100644
--- a/www/angie-module-set-misc/Makefile
+++ b/www/angie-module-set-misc/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	angie-module-set-misc
 MODULE_VERSION=	0.3.4
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	vision5:ngx_devel_kit:v${MODULE_VERSION}:ndk
 GH_TUPLE+=	openresty:set-misc-nginx-module:v0.33:module
 
 COMMENT=	Angie set-misc dynamic module
 WWW=		https://github.com/openresty/set-misc-nginx-module/
 
 LICENSE_FILE=	${WRKSRC_module}/README.markdown
 
 CONFIGURE_ADD=	--add-dynamic-module=${WRKSRC_ndk} \
 		--add-dynamic-module=${WRKSRC_module}
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_set_misc_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ngx_http_set_misc_module.so \
 	    ${STAGEDIR}${MODDIR}/ngx_http_set_misc_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-upload/Makefile b/www/angie-module-upload/Makefile
index 624d54608439..0f76863e0800 100644
--- a/www/angie-module-upload/Makefile
+++ b/www/angie-module-upload/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	angie-module-upload
 MODULE_VERSION=	2.3.0
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	fdintino:nginx-upload-module:${MODULE_VERSION}:module
 
 COMMENT=	Angie upload dynamic module
 WWW=		https://github.com/fdintino/nginx-upload-module/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC_module}/LICENCE
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_upload_module.so \
 	    ${STAGEDIR}${MODDIR}
 
 	${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${_SHAREMODE} \
 	    ${WRKSRC_DEBUG}/objs/ngx_http_upload_module.so \
 	    ${STAGEDIR}${MODDIR}/ngx_http_upload_module-debug.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-vod/Makefile b/www/angie-module-vod/Makefile
index b8c1a32c3f01..1e987cbef36c 100644
--- a/www/angie-module-vod/Makefile
+++ b/www/angie-module-vod/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	angie-module-vod
 MODULE_VERSION=	1.33
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	kaltura:nginx-vod-module:${MODULE_VERSION}:module
 
 COMMENT=	VOD dynamic module for Angie
 WWW=		https://github.com/kaltura/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_MAN} ${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-zstd/Makefile b/www/angie-module-zstd/Makefile
index a396d65b47ae..6a0285e656a1 100644
--- a/www/angie-module-zstd/Makefile
+++ b/www/angie-module-zstd/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	angie-module-zstd
 MODULE_VERSION=	0.1.1
-MODULE_PORTREVISION=	1
+MODULE_PORTREVISION=	2
 GH_TUPLE=	tokers:zstd-nginx-module:${MODULE_VERSION}:module
 
 COMMENT=	Angie zstd dynamic module
 WWW=		https://github.com/tokers/zstd-nginx-module/
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 CONFIGURE_ADD=	--add-dynamic-module=${WRKSRC_module}
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 .for i in ngx_http_zstd_static_module ngx_http_zstd_filter_module
 	${INSTALL_LIB} ${WRKSRC}/objs/${i}.so ${STAGEDIR}${MODDIR}
 .endfor
 
 .for i in README.md
 	${INSTALL_MAN} ${WRKSRC_module}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie/Makefile b/www/angie/Makefile
index 02ae5e776535..6720a814558c 100644
--- a/www/angie/Makefile
+++ b/www/angie/Makefile
@@ -1,206 +1,214 @@
 PORTNAME?=	angie
 ANGIE_VERSION=	1.11.2
-ANGIE_PORTREVISION=	0
+ANGIE_PORTREVISION=	1
 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}
 PORTEPOCH=	1
 .  else
 DISTVERSION=	${ANGIE_VERSION}
 PORTREVISION=	${ANGIE_PORTREVISION}
 .  endif
 LICENSE_FILE?=	${WRKSRC_module}/LICENSE
 BUILD_DEPENDS+=	pcre2>=0:devel/pcre2
-RUN_DEPENDS+=	angie>=${ANGIE_VERSION}:www/angie
+# 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 defined(ANGIE_PORTREVISION)
+RUN_DEPENDS+=	angie==${ANGIE_VERSION}_${ANGIE_PORTREVISION}:www/angie
+.  else
+RUN_DEPENDS+=	angie==${ANGIE_VERSION}: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
 .  for i in CHANGES CHANGES.ru
 	${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .  endfor
 
 .  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
 .  for i in 50x.html index.html
 	${INSTALL_DATA} ${WRKSRC}/html/${i} ${STAGEDIR}${WWWDIR}/html/${i}
 .  endfor
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${BINMODE} ${WRKSRC_DEBUG}/objs/angie \
 	    ${STAGEDIR}${PREFIX}/sbin/angie-debug
 .endif # ${PORTNAME} == angie
 
 .include <bsd.port.mk>