git: 65bc907e5cec - 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, 09 Sep 2026 06:03:19 UTC
The branch main has been updated by joneum:

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

commit 65bc907e5cece356e3e2b05436854e5d2d10ea83
Author:     Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2026-09-09 06:00:05 +0000
Commit:     Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2026-09-09 06:03:08 +0000

    www/{nginx,nginx-devel,freenginx}: 3rd-party modules management
    
    Use the new www/nginx-module-form-input source port instead of fetching
    form-input-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 b1997a99fc2c..208c1fcff01a 100644
--- a/www/freenginx/Makefile
+++ b/www/freenginx/Makefile
@@ -348,6 +348,11 @@ pre-configure-DEVEL_KIT-on:
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-ndk ${WRKSRC_devel_kit}
 	@${CHMOD} -R u+w ${WRKSRC_devel_kit}
 
+pre-configure-FORMINPUT-on:
+	@${RM} -rf ${WRKSRC_forminput}
+	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-form-input ${WRKSRC_forminput}
+	@${CHMOD} -R u+w ${WRKSRC_forminput}
+
 pre-configure-LUA-on:
 	@${RM} -rf ${WRKSRC_lua}
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-lua ${WRKSRC_lua}
diff --git a/www/freenginx/Makefile.extmod b/www/freenginx/Makefile.extmod
index 6f8b0d36f688..113f7b9b9ce7 100644
--- a/www/freenginx/Makefile.extmod
+++ b/www/freenginx/Makefile.extmod
@@ -68,7 +68,8 @@ FIPS_CHECK_GH_TUPLE=	ogarrett:nginx-fips-check-module:6cb4270:fipscheck
 FIPS_CHECK_VARS=	DSO_EXTMODS+=fipscheck
 
 FORMINPUT_IMPLIES=	DEVEL_KIT
-FORMINPUT_GH_TUPLE=	calio:form-input-nginx-module:v0.12:forminput
+FORMINPUT_BUILD_DEPENDS=	nginx-module-form-input>0:www/nginx-module-form-input
+WRKSRC_forminput=	${WRKDIR}/form-input-nginx-module
 FORMINPUT_VARS=		DSO_EXTMODS+=forminput
 
 GRIDFS_GH_TUPLE=	nieoding:nginx-gridfs:059bdc3:gridfs
diff --git a/www/freenginx/distinfo b/www/freenginx/distinfo
index 68a90a0ced0e..9d476d739ddc 100644
--- a/www/freenginx/distinfo
+++ b/www/freenginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1788743593
+TIMESTAMP = 1788898571
 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
@@ -25,8 +25,6 @@ SHA256 (openresty-encrypted-session-nginx-module-v0.09_GH0.tar.gz) = fe9b95acf97
 SIZE (openresty-encrypted-session-nginx-module-v0.09_GH0.tar.gz) = 11847
 SHA256 (ogarrett-nginx-fips-check-module-6cb4270_GH0.tar.gz) = d52fbb0f2819cd91b710ad85e6c8b452fdca6a5d81b0694d6637adba3fc2382c
 SIZE (ogarrett-nginx-fips-check-module-6cb4270_GH0.tar.gz) = 6494
-SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106
-SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
 SHA256 (nieoding-nginx-gridfs-059bdc3_GH0.tar.gz) = 9b059b5ae7b602d12d32d5ebe2700827ea625f22c0fb3b9956242e11de63845b
 SIZE (nieoding-nginx-gridfs-059bdc3_GH0.tar.gz) = 4674
 SHA256 (openresty-headers-more-nginx-module-06dc0be_GH0.tar.gz) = 883b1e31d59f3eb1e76b34259711ad65a3443102973dcf22df329397f3d5eaa4
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 9abd2e5c9d19..8e52fe9ff7b8 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -346,6 +346,11 @@ pre-configure-DEVEL_KIT-on:
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-ndk ${WRKSRC_devel_kit}
 	@${CHMOD} -R u+w ${WRKSRC_devel_kit}
 
+pre-configure-FORMINPUT-on:
+	@${RM} -rf ${WRKSRC_forminput}
+	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-form-input ${WRKSRC_forminput}
+	@${CHMOD} -R u+w ${WRKSRC_forminput}
+
 pre-configure-LUA-on:
 	@${RM} -rf ${WRKSRC_lua}
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-lua ${WRKSRC_lua}
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 3def7f782e8f..9d5f0166570f 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -61,7 +61,8 @@ FIPS_CHECK_GH_TUPLE=	ogarrett:nginx-fips-check-module:6cb4270:fipscheck
 FIPS_CHECK_VARS=	DSO_EXTMODS+=fipscheck
 
 FORMINPUT_IMPLIES=	DEVEL_KIT
-FORMINPUT_GH_TUPLE=	calio:form-input-nginx-module:v0.12:forminput
+FORMINPUT_BUILD_DEPENDS=	nginx-module-form-input>0:www/nginx-module-form-input
+WRKSRC_forminput=	${WRKDIR}/form-input-nginx-module
 FORMINPUT_VARS=		DSO_EXTMODS+=forminput
 
 GRIDFS_GH_TUPLE=	nieoding:nginx-gridfs:059bdc3:gridfs
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index fff0e10387aa..a35342da9658 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1788743591
+TIMESTAMP = 1788898569
 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
@@ -21,8 +21,6 @@ SHA256 (openresty-encrypted-session-nginx-module-7ffe4ec_GH0.tar.gz) = 1848ee88b
 SIZE (openresty-encrypted-session-nginx-module-7ffe4ec_GH0.tar.gz) = 11899
 SHA256 (ogarrett-nginx-fips-check-module-6cb4270_GH0.tar.gz) = d52fbb0f2819cd91b710ad85e6c8b452fdca6a5d81b0694d6637adba3fc2382c
 SIZE (ogarrett-nginx-fips-check-module-6cb4270_GH0.tar.gz) = 6494
-SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106
-SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
 SHA256 (nieoding-nginx-gridfs-059bdc3_GH0.tar.gz) = 9b059b5ae7b602d12d32d5ebe2700827ea625f22c0fb3b9956242e11de63845b
 SIZE (nieoding-nginx-gridfs-059bdc3_GH0.tar.gz) = 4674
 SHA256 (openresty-headers-more-nginx-module-v0.39_GH0.tar.gz) = dde68d3fa2a9fc7f52e436d2edc53c6d703dcd911283965d889102d3a877c778
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 86f4cd1ac244..0ee00fa0e4d7 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -345,6 +345,11 @@ pre-configure-DEVEL_KIT-on:
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-ndk ${WRKSRC_devel_kit}
 	@${CHMOD} -R u+w ${WRKSRC_devel_kit}
 
+pre-configure-FORMINPUT-on:
+	@${RM} -rf ${WRKSRC_forminput}
+	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-form-input ${WRKSRC_forminput}
+	@${CHMOD} -R u+w ${WRKSRC_forminput}
+
 pre-configure-LUA-on:
 	@${RM} -rf ${WRKSRC_lua}
 	@${CP} -R ${LOCALBASE}/share/nginx/modules/nginx-module-lua ${WRKSRC_lua}
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index 3d3ab18516ab..c9d3c9fc0c60 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -61,7 +61,8 @@ FIPS_CHECK_GH_TUPLE=	ogarrett:nginx-fips-check-module:6cb4270:fipscheck
 FIPS_CHECK_VARS=	DSO_EXTMODS+=fipscheck
 
 FORMINPUT_IMPLIES=	DEVEL_KIT
-FORMINPUT_GH_TUPLE=	calio:form-input-nginx-module:v0.12:forminput
+FORMINPUT_BUILD_DEPENDS=	nginx-module-form-input>0:www/nginx-module-form-input
+WRKSRC_forminput=	${WRKDIR}/form-input-nginx-module
 FORMINPUT_VARS=		DSO_EXTMODS+=forminput
 
 GRIDFS_GH_TUPLE=	nieoding:nginx-gridfs:059bdc3:gridfs
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index c8bf3cbe2d23..dd5dc99503ed 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1788743590
+TIMESTAMP = 1788898567
 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
@@ -23,8 +23,6 @@ SHA256 (openresty-encrypted-session-nginx-module-v0.09_GH0.tar.gz) = fe9b95acf97
 SIZE (openresty-encrypted-session-nginx-module-v0.09_GH0.tar.gz) = 11847
 SHA256 (ogarrett-nginx-fips-check-module-6cb4270_GH0.tar.gz) = d52fbb0f2819cd91b710ad85e6c8b452fdca6a5d81b0694d6637adba3fc2382c
 SIZE (ogarrett-nginx-fips-check-module-6cb4270_GH0.tar.gz) = 6494
-SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106
-SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
 SHA256 (nieoding-nginx-gridfs-059bdc3_GH0.tar.gz) = 9b059b5ae7b602d12d32d5ebe2700827ea625f22c0fb3b9956242e11de63845b
 SIZE (nieoding-nginx-gridfs-059bdc3_GH0.tar.gz) = 4674
 SHA256 (openresty-headers-more-nginx-module-06dc0be_GH0.tar.gz) = 883b1e31d59f3eb1e76b34259711ad65a3443102973dcf22df329397f3d5eaa4