Fri Jul 15 00:41:45 2022 UTC ()
nginx & nginx-devel: mark these packages conflict


(gutteridge)
diff -r1.120 -r1.121 pkgsrc/www/nginx/Makefile
diff -r1.86 -r1.87 pkgsrc/www/nginx-devel/Makefile
cvs diff -r1.120 -r1.121 pkgsrc/www/nginx/Makefile (expand / switch to context diff)
--- pkgsrc/www/nginx/Makefile 2022/07/14 16:09:42 1.120
+++ pkgsrc/www/nginx/Makefile 2022/07/15 00:41:45 1.121
@@ -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
@@ -10,6 +10,8 @@
 HOMEPAGE=	https://nginx.org/
 COMMENT=	Lightweight HTTP server and mail proxy server
 LICENSE=	2-clause-bsd
+
+CONFLICTS=	nginx-devel-[0-9]*
 
 .include "../../mk/bsd.prefs.mk"
cvs diff -r1.86 -r1.87 pkgsrc/www/nginx-devel/Makefile (expand / switch to context diff)
--- pkgsrc/www/nginx-devel/Makefile 2022/07/14 15:13:22 1.86
+++ pkgsrc/www/nginx-devel/Makefile 2022/07/15 00:41:45 1.87
@@ -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}
@@ -11,6 +11,8 @@
 HOMEPAGE=	https://nginx.org/
 COMMENT=	Lightweight HTTP server and mail proxy server
 LICENSE=	2-clause-bsd
+
+CONFLICTS=	nginx-[0-9]*
 
 .include "../../mk/bsd.prefs.mk"