git: 9e78c986414c - 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, 31 Oct 2026 19:48:50 UTC
The branch main has been updated by joneum:

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

commit 9e78c986414c9b2c68652f83db4fadb8296e4dca
Author:     Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2026-10-31 19:48:03 +0000
Commit:     Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2026-10-31 19:48:39 +0000

    www/{nginx,nginx-devel,freenginx}: 3rd-party modules management
    
    Build the footer module from its own source port.
    
    Sponsored by:   Netzkommune GmbH
---
 www/freenginx/Makefile                                       |  7 ++++++-
 www/freenginx/Makefile.extmod                                |  4 ++--
 .../files/extra-patch-nginx-http-footer-filter-config        | 12 ------------
 www/nginx-devel/Makefile                                     |  7 ++++++-
 www/nginx-devel/Makefile.extmod                              |  4 ++--
 .../files/extra-patch-nginx-http-footer-filter-config        | 12 ------------
 www/nginx/Makefile                                           |  7 ++++++-
 www/nginx/Makefile.extmod                                    |  4 ++--
 www/nginx/files/extra-patch-nginx-http-footer-filter-config  | 12 ------------
 9 files changed, 24 insertions(+), 45 deletions(-)

diff --git a/www/freenginx/Makefile b/www/freenginx/Makefile
index 273788adba9a..acd8e4241c0f 100644
--- a/www/freenginx/Makefile
+++ b/www/freenginx/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	freenginx
 PORTVERSION=	${NGINX_VERSION}
 .include "version.mk"
-PORTREVISION?=	26
+PORTREVISION?=	27
 CATEGORIES=	www
 MASTER_SITES=	https://freenginx.org/download/ \
 		LOCAL/joneum
@@ -364,6 +364,11 @@ pre-configure-HTTP_ACCEPT_LANGUAGE-on:
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-accept-language ${WRKSRC_accept_language}
 	@${CHMOD} -R u+w ${WRKSRC_accept_language}
 
+pre-configure-HTTP_FOOTER-on:
+	@${RM} -rf ${WRKSRC_footer}
+	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-footer ${WRKSRC_footer}
+	@${CHMOD} -R u+w ${WRKSRC_footer}
+
 pre-configure-ICONV-on:
 	@${RM} -rf ${WRKSRC_iconv}
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-iconv ${WRKSRC_iconv}
diff --git a/www/freenginx/Makefile.extmod b/www/freenginx/Makefile.extmod
index 529ffa57254c..78b6e44d255b 100644
--- a/www/freenginx/Makefile.extmod
+++ b/www/freenginx/Makefile.extmod
@@ -126,9 +126,9 @@ HTTP_FANCYINDEX_BUILD_DEPENDS=	nginx-module-fancyindex>0:www/nginx-module-fancyi
 WRKSRC_fancyindex=		${WRKDIR}/ngx-fancyindex
 HTTP_FANCYINDEX_VARS=		DSO_EXTMODS+=fancyindex
 
-HTTP_FOOTER_GH_TUPLE=		alibaba:nginx-http-footer-filter:1.2.2:footer
+HTTP_FOOTER_BUILD_DEPENDS=	nginx-module-footer>0:www/nginx-module-footer
+WRKSRC_footer=		${WRKDIR}/nginx-footer-module
 HTTP_FOOTER_VARS=		DSO_EXTMODS+=footer
-HTTP_FOOTER_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nginx-http-footer-filter-config
 
 HTTP_GEOIP2_BUILD_DEPENDS=	nginx-module-geoip2>0:www/nginx-module-geoip2
 WRKSRC_geoip2=			${WRKDIR}/ngx_http_geoip2_module
diff --git a/www/freenginx/files/extra-patch-nginx-http-footer-filter-config b/www/freenginx/files/extra-patch-nginx-http-footer-filter-config
deleted file mode 100644
index 880856c7292d..000000000000
--- a/www/freenginx/files/extra-patch-nginx-http-footer-filter-config
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../nginx-http-footer-filter-1.2.2/config.orig	2020-04-24 08:37:44.671689000 -0400
-+++ ../nginx-http-footer-filter-1.2.2/config	2020-04-24 08:44:41.868601000 -0400
-@@ -1,3 +1,7 @@
- ngx_addon_name=ngx_http_footer_filter_module
--HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES ngx_http_footer_filter_module"
--NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_footer_filter_module.c"
-+ngx_module_type=HTTP_FILTER
-+ngx_module_name="$ngx_addon_name"
-+
-+ngx_module_srcs="$ngx_addon_dir/ngx_http_footer_filter_module.c"
-+
-+. auto/module
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index adf42e1c7d97..a4b17a686ae1 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
@@ -378,6 +378,11 @@ pre-configure-HTTP_ACCEPT_LANGUAGE-on:
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-accept-language ${WRKSRC_accept_language}
 	@${CHMOD} -R u+w ${WRKSRC_accept_language}
 
+pre-configure-HTTP_FOOTER-on:
+	@${RM} -rf ${WRKSRC_footer}
+	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-footer ${WRKSRC_footer}
+	@${CHMOD} -R u+w ${WRKSRC_footer}
+
 pre-configure-ICONV-on:
 	@${RM} -rf ${WRKSRC_iconv}
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-iconv ${WRKSRC_iconv}
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index fdcc94b1027f..f59f1a30c522 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -124,9 +124,9 @@ HTTP_FANCYINDEX_BUILD_DEPENDS=	nginx-module-fancyindex>0:www/nginx-module-fancyi
 WRKSRC_fancyindex=		${WRKDIR}/ngx-fancyindex
 HTTP_FANCYINDEX_VARS=		DSO_EXTMODS+=fancyindex
 
-HTTP_FOOTER_GH_TUPLE=		alibaba:nginx-http-footer-filter:1.2.2:footer
+HTTP_FOOTER_BUILD_DEPENDS=	nginx-module-footer>0:www/nginx-module-footer
+WRKSRC_footer=		${WRKDIR}/nginx-footer-module
 HTTP_FOOTER_VARS=		DSO_EXTMODS+=footer
-HTTP_FOOTER_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nginx-http-footer-filter-config
 
 HTTP_GEOIP2_BUILD_DEPENDS=	nginx-module-geoip2>0:www/nginx-module-geoip2
 WRKSRC_geoip2=			${WRKDIR}/ngx_http_geoip2_module
diff --git a/www/nginx-devel/files/extra-patch-nginx-http-footer-filter-config b/www/nginx-devel/files/extra-patch-nginx-http-footer-filter-config
deleted file mode 100644
index 880856c7292d..000000000000
--- a/www/nginx-devel/files/extra-patch-nginx-http-footer-filter-config
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../nginx-http-footer-filter-1.2.2/config.orig	2020-04-24 08:37:44.671689000 -0400
-+++ ../nginx-http-footer-filter-1.2.2/config	2020-04-24 08:44:41.868601000 -0400
-@@ -1,3 +1,7 @@
- ngx_addon_name=ngx_http_footer_filter_module
--HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES ngx_http_footer_filter_module"
--NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_footer_filter_module.c"
-+ngx_module_type=HTTP_FILTER
-+ngx_module_name="$ngx_addon_name"
-+
-+ngx_module_srcs="$ngx_addon_dir/ngx_http_footer_filter_module.c"
-+
-+. auto/module
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index b053185d7cf1..6673f5b19041 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nginx
 PORTVERSION=	${NGINX_VERSION}
 .include "version.mk"
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	3
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
@@ -367,6 +367,11 @@ pre-configure-HTTP_ACCEPT_LANGUAGE-on:
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-accept-language ${WRKSRC_accept_language}
 	@${CHMOD} -R u+w ${WRKSRC_accept_language}
 
+pre-configure-HTTP_FOOTER-on:
+	@${RM} -rf ${WRKSRC_footer}
+	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-footer ${WRKSRC_footer}
+	@${CHMOD} -R u+w ${WRKSRC_footer}
+
 pre-configure-ICONV-on:
 	@${RM} -rf ${WRKSRC_iconv}
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-iconv ${WRKSRC_iconv}
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index 2c72244f5c38..7d8f5a41a66c 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -119,9 +119,9 @@ HTTP_FANCYINDEX_BUILD_DEPENDS=	nginx-module-fancyindex>0:www/nginx-module-fancyi
 WRKSRC_fancyindex=		${WRKDIR}/ngx-fancyindex
 HTTP_FANCYINDEX_VARS=		DSO_EXTMODS+=fancyindex
 
-HTTP_FOOTER_GH_TUPLE=		alibaba:nginx-http-footer-filter:1.2.2:footer
+HTTP_FOOTER_BUILD_DEPENDS=	nginx-module-footer>0:www/nginx-module-footer
+WRKSRC_footer=		${WRKDIR}/nginx-footer-module
 HTTP_FOOTER_VARS=		DSO_EXTMODS+=footer
-HTTP_FOOTER_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nginx-http-footer-filter-config
 
 HTTP_GEOIP2_BUILD_DEPENDS=	nginx-module-geoip2>0:www/nginx-module-geoip2
 WRKSRC_geoip2=			${WRKDIR}/ngx_http_geoip2_module
diff --git a/www/nginx/files/extra-patch-nginx-http-footer-filter-config b/www/nginx/files/extra-patch-nginx-http-footer-filter-config
deleted file mode 100644
index 880856c7292d..000000000000
--- a/www/nginx/files/extra-patch-nginx-http-footer-filter-config
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../nginx-http-footer-filter-1.2.2/config.orig	2020-04-24 08:37:44.671689000 -0400
-+++ ../nginx-http-footer-filter-1.2.2/config	2020-04-24 08:44:41.868601000 -0400
-@@ -1,3 +1,7 @@
- ngx_addon_name=ngx_http_footer_filter_module
--HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES ngx_http_footer_filter_module"
--NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_footer_filter_module.c"
-+ngx_module_type=HTTP_FILTER
-+ngx_module_name="$ngx_addon_name"
-+
-+ngx_module_srcs="$ngx_addon_dir/ngx_http_footer_filter_module.c"
-+
-+. auto/module