git: 85d565c82a5a - 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: Sat, 05 Sep 2026 18:37:02 UTC
The branch main has been updated by joneum:

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

commit 85d565c82a5aa47a76029e1180f7853c6c7c1a55
Author:     Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2026-09-05 18:36:00 +0000
Commit:     Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2026-09-05 18:36:47 +0000

    www/{nginx,nginx-devel,freenginx}: 3rd-party modules management
    
    Use the new www/nginx-module-array-var source port instead of fetching
    array-var-nginx-module from GitHub.  The module version is now
    maintained in one place for these ports.
    
    Sponsored by:   Netzkommune GmbH
---
 www/freenginx/Makefile          | 5 +++++
 www/freenginx/Makefile.extmod   | 3 ++-
 www/freenginx/distinfo          | 4 +---
 www/nginx-devel/Makefile        | 5 +++++
 www/nginx-devel/Makefile.extmod | 3 ++-
 www/nginx-devel/distinfo        | 4 +---
 www/nginx/Makefile              | 5 +++++
 www/nginx/Makefile.extmod       | 3 ++-
 www/nginx/distinfo              | 4 +---
 9 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/www/freenginx/Makefile b/www/freenginx/Makefile
index 8ce7ba2e5394..759b1d9ddddb 100644
--- a/www/freenginx/Makefile
+++ b/www/freenginx/Makefile
@@ -333,6 +333,11 @@ post-patch-SFLOW-on:
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
+pre-configure-ARRAYVAR-on:
+	@${RM} -rf ${WRKSRC_arrayvar}
+	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-array-var ${WRKSRC_arrayvar}
+	@${CHMOD} -R u+w ${WRKSRC_arrayvar}
+
 pre-configure-DEVEL_KIT-on:
 	@${RM} -rf ${WRKSRC_devel_kit}
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-ndk ${WRKSRC_devel_kit}
diff --git a/www/freenginx/Makefile.extmod b/www/freenginx/Makefile.extmod
index b16392551eda..55dc21de79cf 100644
--- a/www/freenginx/Makefile.extmod
+++ b/www/freenginx/Makefile.extmod
@@ -19,7 +19,8 @@ AJP_GH_TUPLE=		msva:nginx_ajp_module:fcbb2cc:ajp
 AJP_VARS=		DSO_EXTMODS+=ajp
 
 ARRAYVAR_IMPLIES=	DEVEL_KIT
-ARRAYVAR_GH_TUPLE=	openresty:array-var-nginx-module:v0.06:arrayvar
+ARRAYVAR_BUILD_DEPENDS=	nginx-module-array-var>0:www/nginx-module-array-var
+WRKSRC_arrayvar=	${WRKDIR}/array-var-nginx-module
 ARRAYVAR_VARS=		DSO_EXTMODS+=arrayvar
 
 AWS_AUTH_GH_TUPLE=	anomalizer:ngx_aws_auth:f3d9862:aws_auth
diff --git a/www/freenginx/distinfo b/www/freenginx/distinfo
index c866b4957b42..a8866d54c974 100644
--- a/www/freenginx/distinfo
+++ b/www/freenginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1788084554
+TIMESTAMP = 1788629137
 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
@@ -9,8 +9,6 @@ SHA256 (passenger-6.1.2.tar.gz) = 94400a52e536cfdd8acf2accb47badb7a67dc309452f1b
 SIZE (passenger-6.1.2.tar.gz) = 7429067
 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 (anomalizer-ngx_aws_auth-f3d9862_GH0.tar.gz) = 3e8cbb594abccb84ce9660d31e9d623b615eab3720bca206cfddeeab9eb2383e
 SIZE (anomalizer-ngx_aws_auth-f3d9862_GH0.tar.gz) = 16080
 SHA256 (google-ngx_brotli-a71f931_GH0.tar.gz) = b3312a045d5303a40d02beb34711b8ca27f7b72d647e9ee2012a8eddd14d9b22
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index bb57a4251c1e..72b1aeffc320 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -331,6 +331,11 @@ post-patch-SFLOW-on:
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
+pre-configure-ARRAYVAR-on:
+	@${RM} -rf ${WRKSRC_arrayvar}
+	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-array-var ${WRKSRC_arrayvar}
+	@${CHMOD} -R u+w ${WRKSRC_arrayvar}
+
 pre-configure-DEVEL_KIT-on:
 	@${RM} -rf ${WRKSRC_devel_kit}
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-ndk ${WRKSRC_devel_kit}
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index d34a291f34bd..b282ba6802e2 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -19,7 +19,8 @@ AJP_GH_TUPLE=		msva:nginx_ajp_module:fcbb2cc:ajp
 AJP_VARS=		DSO_EXTMODS+=ajp
 
 ARRAYVAR_IMPLIES=	DEVEL_KIT
-ARRAYVAR_GH_TUPLE=	openresty:array-var-nginx-module:v0.06:arrayvar
+ARRAYVAR_BUILD_DEPENDS=	nginx-module-array-var>0:www/nginx-module-array-var
+WRKSRC_arrayvar=	${WRKDIR}/array-var-nginx-module
 ARRAYVAR_VARS=		DSO_EXTMODS+=arrayvar
 
 AWS_AUTH_GH_TUPLE=	anomalizer:ngx_aws_auth:f3d9862:aws_auth
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 77093742dd4b..177375446076 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1788452459
+TIMESTAMP = 1788629098
 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
@@ -7,8 +7,6 @@ SHA256 (passenger-6.1.2.tar.gz) = 94400a52e536cfdd8acf2accb47badb7a67dc309452f1b
 SIZE (passenger-6.1.2.tar.gz) = 7429067
 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 (anomalizer-ngx_aws_auth-f3d9862_GH0.tar.gz) = 3e8cbb594abccb84ce9660d31e9d623b615eab3720bca206cfddeeab9eb2383e
 SIZE (anomalizer-ngx_aws_auth-f3d9862_GH0.tar.gz) = 16080
 SHA256 (google-ngx_brotli-a71f931_GH0.tar.gz) = b3312a045d5303a40d02beb34711b8ca27f7b72d647e9ee2012a8eddd14d9b22
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index c3a152f2b0ab..757c5b856331 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -330,6 +330,11 @@ post-patch-SFLOW-on:
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
+pre-configure-ARRAYVAR-on:
+	@${RM} -rf ${WRKSRC_arrayvar}
+	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-array-var ${WRKSRC_arrayvar}
+	@${CHMOD} -R u+w ${WRKSRC_arrayvar}
+
 pre-configure-DEVEL_KIT-on:
 	@${RM} -rf ${WRKSRC_devel_kit}
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-ndk ${WRKSRC_devel_kit}
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index cd6bc8b4c650..b0e9c9c98038 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -19,7 +19,8 @@ AJP_GH_TUPLE=		msva:nginx_ajp_module:fcbb2cc:ajp
 AJP_VARS=		DSO_EXTMODS+=ajp
 
 ARRAYVAR_IMPLIES=	DEVEL_KIT
-ARRAYVAR_GH_TUPLE=	openresty:array-var-nginx-module:v0.06:arrayvar
+ARRAYVAR_BUILD_DEPENDS=	nginx-module-array-var>0:www/nginx-module-array-var
+WRKSRC_arrayvar=	${WRKDIR}/array-var-nginx-module
 ARRAYVAR_VARS=		DSO_EXTMODS+=arrayvar
 
 AWS_AUTH_GH_TUPLE=	anomalizer:ngx_aws_auth:f3d9862:aws_auth
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 20c383ca270b..72029d3fc686 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1788084549
+TIMESTAMP = 1788629091
 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
@@ -9,8 +9,6 @@ SHA256 (passenger-6.1.2.tar.gz) = 94400a52e536cfdd8acf2accb47badb7a67dc309452f1b
 SIZE (passenger-6.1.2.tar.gz) = 7429067
 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 (anomalizer-ngx_aws_auth-f3d9862_GH0.tar.gz) = 3e8cbb594abccb84ce9660d31e9d623b615eab3720bca206cfddeeab9eb2383e
 SIZE (anomalizer-ngx_aws_auth-f3d9862_GH0.tar.gz) = 16080
 SHA256 (google-ngx_brotli-a71f931_GH0.tar.gz) = b3312a045d5303a40d02beb34711b8ca27f7b72d647e9ee2012a8eddd14d9b22