[pkgsrc/trunk]: pkgsrc/www nginx & nginx-devel: mark these packages conflict

[gutteridge <gutteridge%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/62b81ea13a1e
branches:  trunk
changeset: 381897:62b81ea13a1e
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Fri Jul 15 00:41:45 2022 +0000

description:
nginx & nginx-devel: mark these packages conflict

diffstat:

 www/nginx-devel/Makefile |  4 +++-
 www/nginx/Makefile       |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 0cb7eab97552 -r 62b81ea13a1e www/nginx-devel/Makefile
--- a/www/nginx-devel/Makefile  Fri Jul 15 00:37:54 2022 +0000
+++ b/www/nginx-devel/Makefile  Fri Jul 15 00:41:45 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2022/07/14 15:13:22 osa Exp $
+# $NetBSD: Makefile,v 1.87 2022/07/15 00:41:45 gutteridge Exp $
 
 DISTNAME=      nginx-1.23.0
 PKGNAME=       ${DISTNAME:S/-/-devel-/1}
@@ -12,6 +12,8 @@
 COMMENT=       Lightweight HTTP server and mail proxy server
 LICENSE=       2-clause-bsd
 
+CONFLICTS=     nginx-[0-9]*
+
 .include "../../mk/bsd.prefs.mk"
 
 NGINX_USER?=           nginx
diff -r 0cb7eab97552 -r 62b81ea13a1e www/nginx/Makefile
--- a/www/nginx/Makefile        Fri Jul 15 00:37:54 2022 +0000
+++ b/www/nginx/Makefile        Fri Jul 15 00:41:45 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2022/07/14 16:09:42 osa Exp $
+# $NetBSD: Makefile,v 1.121 2022/07/15 00:41:45 gutteridge Exp $
 
 DISTNAME=      nginx-1.22.0
 PKGREVISION=   4
@@ -11,6 +11,8 @@
 COMMENT=       Lightweight HTTP server and mail proxy server
 LICENSE=       2-clause-bsd
 
+CONFLICTS=     nginx-devel-[0-9]*
+
 .include "../../mk/bsd.prefs.mk"
 
 NGINX_USER?=           nginx