git: 0a4ec43bc73b - main - www/{nginx,nginx-devel,freenginx}: Mark the MODSECURITY3 conflict

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jochen Neumeister <joneum_at_FreeBSD.org>
Date: Wed, 14 Oct 2026 12:33:24 UTC
The branch main has been updated by joneum:

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

commit 0a4ec43bc73bbd3df352f8a5a25f24461153565b
Author:     Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2026-10-14 12:31:57 +0000
Commit:     Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2026-10-14 12:33:02 +0000

    www/{nginx,nginx-devel,freenginx}: Mark the MODSECURITY3 conflict
    
    The option builds the same module from the same source into the same path
    as security/modsecurity3-nginx.  A build now stops with the name of the
    package it collides with instead of overwriting its file.
    
    Sponsored by:   Netzkommune GmbH
---
 www/freenginx/Makefile.extmod   | 1 +
 www/nginx-devel/Makefile.extmod | 1 +
 www/nginx/Makefile.extmod       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/www/freenginx/Makefile.extmod b/www/freenginx/Makefile.extmod
index eca2717ae885..cb4f2b7ee5f2 100644
--- a/www/freenginx/Makefile.extmod
+++ b/www/freenginx/Makefile.extmod
@@ -246,6 +246,7 @@ MEMC_GH_TUPLE=		openresty:memc-nginx-module:v0.19:memc
 MEMC_VARS=		DSO_EXTMODS+=memc
 
 MODSECURITY3_IMPLIES=		HTTP_ADDITION HTTP_IMAGE_FILTER HTTP_GUNZIP_FILTER HTTP_XSLT
+MODSECURITY3_CONFLICTS_INSTALL=	modsecurity3-nginx
 MODSECURITY3_LIB_DEPENDS=	libmodsecurity.so:security/modsecurity3
 MODSECURITY3_BUILD_DEPENDS=	nginx-module-modsecurity3>0:www/nginx-module-modsecurity3
 WRKSRC_modsecurity3=		${WRKDIR}/ModSecurity-nginx
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 93260d48f39a..8599b681d251 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -240,6 +240,7 @@ MEMC_GH_TUPLE=		openresty:memc-nginx-module:v0.20:memc
 MEMC_VARS=		DSO_EXTMODS+=memc
 
 MODSECURITY3_IMPLIES=		HTTP_ADDITION HTTP_IMAGE_FILTER HTTP_GUNZIP_FILTER HTTP_XSLT
+MODSECURITY3_CONFLICTS_INSTALL=	modsecurity3-nginx
 MODSECURITY3_LIB_DEPENDS=	libmodsecurity.so:security/modsecurity3
 MODSECURITY3_BUILD_DEPENDS=	nginx-module-modsecurity3>0:www/nginx-module-modsecurity3
 WRKSRC_modsecurity3=		${WRKDIR}/ModSecurity-nginx
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index 851245198257..b3a3785bd8ae 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -238,6 +238,7 @@ MEMC_GH_TUPLE=		openresty:memc-nginx-module:v0.19:memc
 MEMC_VARS=		DSO_EXTMODS+=memc
 
 MODSECURITY3_IMPLIES=		HTTP_ADDITION HTTP_IMAGE_FILTER HTTP_GUNZIP_FILTER HTTP_XSLT
+MODSECURITY3_CONFLICTS_INSTALL=	modsecurity3-nginx
 MODSECURITY3_LIB_DEPENDS=	libmodsecurity.so:security/modsecurity3
 MODSECURITY3_BUILD_DEPENDS=	nginx-module-modsecurity3>0:www/nginx-module-modsecurity3
 WRKSRC_modsecurity3=		${WRKDIR}/ModSecurity-nginx