CVS commit: pkgsrc/www

["Sergey A. Osokin" <osa%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   osa
Date:           Thu Dec 25 19:01:15 UTC 2025

Modified Files:
        pkgsrc/www/nginx: Makefile
        pkgsrc/www/nginx-devel: Makefile

Log Message:
www/nginx*: update CONFLICTS


To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.163 -r1.164 pkgsrc/www/nginx-devel/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/nginx/Makefile
diff -u pkgsrc/www/nginx/Makefile:1.186 pkgsrc/www/nginx/Makefile:1.187
--- pkgsrc/www/nginx/Makefile:1.186     Fri Nov 21 17:26:46 2025
+++ pkgsrc/www/nginx/Makefile   Thu Dec 25 19:01:14 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.186 2025/11/21 17:26:46 osa Exp $
+# $NetBSD: Makefile,v 1.187 2025/12/25 19:01:14 osa Exp $
 
 DISTNAME=      nginx-1.28.0
 PKGREVISION=   10
@@ -15,7 +15,7 @@ HOMEPAGE=     https://nginx.org/
 COMMENT=       Lightweight HTTP server and mail proxy server
 LICENSE=       2-clause-bsd
 
-CONFLICTS=     freenginx-devel-[0-9]* nginx-devel-[0-9]*
+CONFLICTS=     freenginx-[0-9]* freenginx-devel-[0-9]* nginx-devel-[0-9]*
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/www/nginx-devel/Makefile
diff -u pkgsrc/www/nginx-devel/Makefile:1.163 pkgsrc/www/nginx-devel/Makefile:1.164
--- pkgsrc/www/nginx-devel/Makefile:1.163       Fri Nov 21 17:27:32 2025
+++ pkgsrc/www/nginx-devel/Makefile     Thu Dec 25 19:01:14 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.163 2025/11/21 17:27:32 osa Exp $
+# $NetBSD: Makefile,v 1.164 2025/12/25 19:01:14 osa Exp $
 
 DISTNAME=      nginx-1.29.1
 PKGNAME=       ${DISTNAME:S/-/-devel-/1}
@@ -12,7 +12,7 @@ HOMEPAGE=     https://nginx.org/
 COMMENT=       Lightweight HTTP server and mail proxy server
 LICENSE=       2-clause-bsd
 
-CONFLICTS=     freenginx-devel-[0-9]* nginx-[0-9]*
+CONFLICTS=     freenginx-[0-9]* freenginx-devel-[0-9]* nginx-[0-9]*
 
 .include "../../mk/bsd.prefs.mk"