git: 0c1bbe2c6646 - 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: Tue, 06 Oct 2026 15:04:43 UTC
The branch main has been updated by joneum:

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

commit 0c1bbe2c6646af66e2177b3e8912d26c66dbd0d9
Author:     Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2026-10-06 15:03:17 +0000
Commit:     Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2026-10-06 15:04:33 +0000

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

diff --git a/www/freenginx/Makefile b/www/freenginx/Makefile
index b106b905fea6..a873267c0840 100644
--- a/www/freenginx/Makefile
+++ b/www/freenginx/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	freenginx
 PORTVERSION=	${NGINX_VERSION}
 .include "version.mk"
-PORTREVISION?=	18
+PORTREVISION?=	19
 CATEGORIES=	www
 MASTER_SITES=	https://freenginx.org/download/ \
 		LOCAL/joneum
@@ -333,6 +333,11 @@ post-patch-SFLOW-on:
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
+pre-configure-AJP-on:
+	@${RM} -rf ${WRKSRC_ajp}
+	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-ajp ${WRKSRC_ajp}
+	@${CHMOD} -R u+w ${WRKSRC_ajp}
+
 pre-configure-ARRAYVAR-on:
 	@${RM} -rf ${WRKSRC_arrayvar}
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-array-var ${WRKSRC_arrayvar}
diff --git a/www/freenginx/Makefile.extmod b/www/freenginx/Makefile.extmod
index bb79d67190bf..96a38adad212 100644
--- a/www/freenginx/Makefile.extmod
+++ b/www/freenginx/Makefile.extmod
@@ -15,7 +15,8 @@ OPTIONS_GROUP_THIRDPARTYGRP=	AJP AWS_AUTH BROTLI CACHE_PURGE CT \
 	REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SRCACHE STS \
 	VOD VTS XSS WEBSOCKIFY ZSTD
 
-AJP_GH_TUPLE=		msva:nginx_ajp_module:fcbb2cc:ajp
+AJP_BUILD_DEPENDS=	nginx-module-ajp>0:www/nginx-module-ajp
+WRKSRC_ajp=		${WRKDIR}/nginx_ajp_module
 AJP_VARS=		DSO_EXTMODS+=ajp
 
 ARRAYVAR_IMPLIES=	DEVEL_KIT
diff --git a/www/freenginx/distinfo b/www/freenginx/distinfo
index ffdd0f2757a1..26749afae481 100644
--- a/www/freenginx/distinfo
+++ b/www/freenginx/distinfo
@@ -7,8 +7,6 @@ SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b25
 SIZE (ngx_http_redis-0.3.9.tar.gz) = 13051
 SHA256 (passenger-6.1.2.tar.gz) = 94400a52e536cfdd8acf2accb47badb7a67dc309452f1b05600da67343f25bf8
 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 (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 1004fdadea24..1b1483e723a1 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,7 +1,7 @@
 PORTNAME?=	nginx
 PORTVERSION=	${NGINX_VERSION}
 .include "version.mk"
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/
 PKGNAMESUFFIX?=	-devel
@@ -337,6 +337,11 @@ post-patch-SFLOW-on:
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
+pre-configure-AJP-on:
+	@${RM} -rf ${WRKSRC_ajp}
+	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-ajp ${WRKSRC_ajp}
+	@${CHMOD} -R u+w ${WRKSRC_ajp}
+
 pre-configure-ARRAYVAR-on:
 	@${RM} -rf ${WRKSRC_arrayvar}
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-array-var ${WRKSRC_arrayvar}
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 61f35028fb1e..6b21c2cfd3f5 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -15,7 +15,8 @@ OPTIONS_GROUP_THIRDPARTYGRP=	AJP AWS_AUTH BROTLI CACHE_PURGE \
 	REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SRCACHE STS \
 	VOD VTS XSS WEBSOCKIFY ZSTD
 
-AJP_GH_TUPLE=		msva:nginx_ajp_module:fcbb2cc:ajp
+AJP_BUILD_DEPENDS=	nginx-module-ajp>0:www/nginx-module-ajp
+WRKSRC_ajp=		${WRKDIR}/nginx_ajp_module
 AJP_VARS=		DSO_EXTMODS+=ajp
 
 ARRAYVAR_IMPLIES=	DEVEL_KIT
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 4d75c43b576a..ac439071e495 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -5,8 +5,6 @@ SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6
 SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208
 SHA256 (passenger-6.1.2.tar.gz) = 94400a52e536cfdd8acf2accb47badb7a67dc309452f1b05600da67343f25bf8
 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 (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 debf4ac3fed0..fba12b91ac42 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nginx
 PORTVERSION=	${NGINX_VERSION}
 .include "version.mk"
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	3
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
@@ -330,6 +330,11 @@ post-patch-SFLOW-on:
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
+pre-configure-AJP-on:
+	@${RM} -rf ${WRKSRC_ajp}
+	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-ajp ${WRKSRC_ajp}
+	@${CHMOD} -R u+w ${WRKSRC_ajp}
+
 pre-configure-ARRAYVAR-on:
 	@${RM} -rf ${WRKSRC_arrayvar}
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-array-var ${WRKSRC_arrayvar}
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index ed679120fe20..a7adaa8ecae1 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -15,7 +15,8 @@ OPTIONS_GROUP_THIRDPARTYGRP=	AJP AWS_AUTH BROTLI CACHE_PURGE \
 	REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SRCACHE STS \
 	VOD VTS XSS WEBSOCKIFY ZSTD
 
-AJP_GH_TUPLE=		msva:nginx_ajp_module:fcbb2cc:ajp
+AJP_BUILD_DEPENDS=	nginx-module-ajp>0:www/nginx-module-ajp
+WRKSRC_ajp=		${WRKDIR}/nginx_ajp_module
 AJP_VARS=		DSO_EXTMODS+=ajp
 
 ARRAYVAR_IMPLIES=	DEVEL_KIT
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 6d426bf5de01..068e9f570986 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -7,8 +7,6 @@ SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b25
 SIZE (ngx_http_redis-0.3.9.tar.gz) = 13051
 SHA256 (passenger-6.1.2.tar.gz) = 94400a52e536cfdd8acf2accb47badb7a67dc309452f1b05600da67343f25bf8
 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 (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