git: a2decf7280ba - main - www/{nginx,nginx-devel,freenginx}: 3rd-party modules management

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jochen Neumeister <joneum_at_FreeBSD.org>
Date: Wed, 16 Sep 2026 05:59:56 UTC
The branch main has been updated by joneum:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a2decf7280ba0a4f7230de03c81970caed5550d1

commit a2decf7280ba0a4f7230de03c81970caed5550d1
Author:     Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2026-09-16 05:59:02 +0000
Commit:     Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2026-09-16 05:59:45 +0000

    www/{nginx,nginx-devel,freenginx}: 3rd-party modules management
    
    Use the new www/nginx-module-vod source port instead of fetching
    nginx-vod-module from GitHub.
    
    Sponsored by:   Netzkommune GmbH
---
 www/freenginx/Makefile          | 7 ++++++-
 www/freenginx/Makefile.extmod   | 3 ++-
 www/freenginx/distinfo          | 4 +---
 www/nginx-devel/Makefile        | 7 ++++++-
 www/nginx-devel/Makefile.extmod | 3 ++-
 www/nginx-devel/distinfo        | 4 +---
 www/nginx/Makefile              | 7 ++++++-
 www/nginx/Makefile.extmod       | 3 ++-
 www/nginx/distinfo              | 4 +---
 9 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/www/freenginx/Makefile b/www/freenginx/Makefile
index 9b25df8d660d..3211c114eb6f 100644
--- a/www/freenginx/Makefile
+++ b/www/freenginx/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	freenginx
 PORTVERSION=	${NGINX_VERSION}
 .include "version.mk"
-PORTREVISION?=	15
+PORTREVISION?=	16
 CATEGORIES=	www
 MASTER_SITES=	https://freenginx.org/download/ \
 		LOCAL/joneum
@@ -369,6 +369,11 @@ pre-configure-NJS-on:
 	@${CHMOD} -R u+w ${WRKSRC_njs}
 	@${CHMOD} u+x ${WRKSRC_njs}/configure
 
+pre-configure-VOD-on:
+	@${RM} -rf ${WRKSRC_vod}
+	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-vod ${WRKSRC_vod}
+	@${CHMOD} -R u+w ${WRKSRC_vod}
+
 do-configure-NJS-on:
 	( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} )
 
diff --git a/www/freenginx/Makefile.extmod b/www/freenginx/Makefile.extmod
index 113f7b9b9ce7..ffc95be60609 100644
--- a/www/freenginx/Makefile.extmod
+++ b/www/freenginx/Makefile.extmod
@@ -334,10 +334,11 @@ STS_IMPLIES=		STREAM
 STS_GH_TUPLE=		vozlt:nginx-module-sts:3c10d42:sts
 STS_VARS=		DSO_EXTMODS+=sts
 
-VOD_GH_TUPLE=		diogoazevedos:nginx-vod-module:b9b4b44:vod
 VOD_LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
 			libavutil.so:multimedia/ffmpeg
 VOD_USES=		iconv
+VOD_BUILD_DEPENDS=	nginx-module-vod>0:www/nginx-module-vod
+WRKSRC_vod=		${WRKDIR}/nginx-vod-module
 VOD_VARS=		DSO_EXTMODS+=vod
 
 VTS_GH_TUPLE=		vozlt:nginx-module-vts:bf64dbf:vts
diff --git a/www/freenginx/distinfo b/www/freenginx/distinfo
index 9d476d739ddc..ffdd0f2757a1 100644
--- a/www/freenginx/distinfo
+++ b/www/freenginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1788898571
+TIMESTAMP = 1789412665
 SHA256 (freenginx-1.30.1.tar.gz) = 44f1df11967528631eb727a5ca28abd7e4e517e35757681c819e8f7c1d760be7
 SIZE (freenginx-1.30.1.tar.gz) = 1252835
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -117,8 +117,6 @@ SHA256 (openresty-srcache-nginx-module-be22ac0_GH0.tar.gz) = 5753d1ffe87b5d6f5b7
 SIZE (openresty-srcache-nginx-module-be22ac0_GH0.tar.gz) = 51029
 SHA256 (vozlt-nginx-module-sts-3c10d42_GH0.tar.gz) = 748b67ceb82b3b843ae915bf7863fd08b7c2427c045e5ec540242d050f7b30d0
 SIZE (vozlt-nginx-module-sts-3c10d42_GH0.tar.gz) = 352431
-SHA256 (diogoazevedos-nginx-vod-module-b9b4b44_GH0.tar.gz) = 6fb69766c735d271735192c324b28698659e65490c78561ac3bd20b52c0c90be
-SIZE (diogoazevedos-nginx-vod-module-b9b4b44_GH0.tar.gz) = 446738
 SHA256 (vozlt-nginx-module-vts-bf64dbf_GH0.tar.gz) = d2782c75e39cb2ecf68453922b43ab2295adb6a35fa6a0f9c14173f70d22d7b1
 SIZE (vozlt-nginx-module-vts-bf64dbf_GH0.tar.gz) = 180394
 SHA256 (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = aca454bffcee2476dc92682ebfb8c0378a271fda178be7e945d648419d220758
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 1f7c13104f81..1ba3f1699871 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,7 +1,7 @@
 PORTNAME?=	nginx
 PORTVERSION=	${NGINX_VERSION}
 .include "version.mk"
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/
 PKGNAMESUFFIX?=	-devel
@@ -368,6 +368,11 @@ pre-configure-NJS-on:
 	@${CHMOD} -R u+w ${WRKSRC_njs}
 	@${CHMOD} u+x ${WRKSRC_njs}/configure
 
+pre-configure-VOD-on:
+	@${RM} -rf ${WRKSRC_vod}
+	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-vod ${WRKSRC_vod}
+	@${CHMOD} -R u+w ${WRKSRC_vod}
+
 do-configure-NJS-on:
 	( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} )
 
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 9d5f0166570f..158bf4a9f082 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -324,10 +324,11 @@ STS_IMPLIES=		STREAM
 STS_GH_TUPLE=		vozlt:nginx-module-sts:3c10d42:sts
 STS_VARS=		DSO_EXTMODS+=sts
 
-VOD_GH_TUPLE=		diogoazevedos:nginx-vod-module:b9b4b44:vod
 VOD_LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
 			libavutil.so:multimedia/ffmpeg
 VOD_USES=		iconv
+VOD_BUILD_DEPENDS=	nginx-module-vod>0:www/nginx-module-vod
+WRKSRC_vod=		${WRKDIR}/nginx-vod-module
 VOD_VARS=		DSO_EXTMODS+=vod
 
 VTS_GH_TUPLE=		vozlt:nginx-module-vts:c382342:vts
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index a35342da9658..259707f52b20 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1788898569
+TIMESTAMP = 1789412673
 SHA256 (nginx-1.31.5.tar.gz) = e951607d534836624bd36b6b45a71dbfb055237deae3738da6bbf3270dada279
 SIZE (nginx-1.31.5.tar.gz) = 1371858
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -119,8 +119,6 @@ SHA256 (openresty-srcache-nginx-module-bcdcfdc_GH0.tar.gz) = fbe15bc0c2d52f778b0
 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 (diogoazevedos-nginx-vod-module-b9b4b44_GH0.tar.gz) = 6fb69766c735d271735192c324b28698659e65490c78561ac3bd20b52c0c90be
-SIZE (diogoazevedos-nginx-vod-module-b9b4b44_GH0.tar.gz) = 446738
 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
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index d221e57faad3..e2d71fd80266 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nginx
 PORTVERSION=	${NGINX_VERSION}
 .include "version.mk"
-PORTREVISION=	10
+PORTREVISION=	11
 PORTEPOCH=	3
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
@@ -366,6 +366,11 @@ pre-configure-NJS-on:
 	@${CHMOD} -R u+w ${WRKSRC_njs}
 	@${CHMOD} u+x ${WRKSRC_njs}/configure
 
+pre-configure-VOD-on:
+	@${RM} -rf ${WRKSRC_vod}
+	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-vod ${WRKSRC_vod}
+	@${CHMOD} -R u+w ${WRKSRC_vod}
+
 do-configure-NJS-on:
 	( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} )
 
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index c9d3c9fc0c60..e201f8dc6eeb 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -326,10 +326,11 @@ STS_IMPLIES=		STREAM
 STS_GH_TUPLE=		vozlt:nginx-module-sts:3c10d42:sts
 STS_VARS=		DSO_EXTMODS+=sts
 
-VOD_GH_TUPLE=		diogoazevedos:nginx-vod-module:b9b4b44:vod
 VOD_LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
 			libavutil.so:multimedia/ffmpeg
 VOD_USES=		iconv
+VOD_BUILD_DEPENDS=	nginx-module-vod>0:www/nginx-module-vod
+WRKSRC_vod=		${WRKDIR}/nginx-vod-module
 VOD_VARS=		DSO_EXTMODS+=vod
 
 VTS_GH_TUPLE=		vozlt:nginx-module-vts:bf64dbf:vts
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index dd5dc99503ed..379c340274f7 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1788898567
+TIMESTAMP = 1789412663
 SHA256 (nginx-1.30.4.tar.gz) = 4261dc90e9e47c1c4041276e9aaa3d48ebe2e664f728e14fa95ae6c67d57a08b
 SIZE (nginx-1.30.4.tar.gz) = 1328314
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -115,8 +115,6 @@ SHA256 (openresty-srcache-nginx-module-be22ac0_GH0.tar.gz) = 5753d1ffe87b5d6f5b7
 SIZE (openresty-srcache-nginx-module-be22ac0_GH0.tar.gz) = 51029
 SHA256 (vozlt-nginx-module-sts-3c10d42_GH0.tar.gz) = 748b67ceb82b3b843ae915bf7863fd08b7c2427c045e5ec540242d050f7b30d0
 SIZE (vozlt-nginx-module-sts-3c10d42_GH0.tar.gz) = 352431
-SHA256 (diogoazevedos-nginx-vod-module-b9b4b44_GH0.tar.gz) = 6fb69766c735d271735192c324b28698659e65490c78561ac3bd20b52c0c90be
-SIZE (diogoazevedos-nginx-vod-module-b9b4b44_GH0.tar.gz) = 446738
 SHA256 (vozlt-nginx-module-vts-bf64dbf_GH0.tar.gz) = d2782c75e39cb2ecf68453922b43ab2295adb6a35fa6a0f9c14173f70d22d7b1
 SIZE (vozlt-nginx-module-vts-bf64dbf_GH0.tar.gz) = 180394
 SHA256 (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = aca454bffcee2476dc92682ebfb8c0378a271fda178be7e945d648419d220758