CVS commit: pkgsrc/www

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Jul 15 00:41:45 UTC 2022

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

Log Message:
nginx & nginx-devel: mark these packages conflict


To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.86 -r1.87 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.120 pkgsrc/www/nginx/Makefile:1.121
--- pkgsrc/www/nginx/Makefile:1.120     Thu Jul 14 16:09:42 2022
+++ pkgsrc/www/nginx/Makefile   Fri Jul 15 00:41:45 2022
@@ -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 @@ 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"
 
 NGINX_USER?=           nginx

Index: pkgsrc/www/nginx-devel/Makefile
diff -u pkgsrc/www/nginx-devel/Makefile:1.86 pkgsrc/www/nginx-devel/Makefile:1.87
--- pkgsrc/www/nginx-devel/Makefile:1.86        Thu Jul 14 15:13:22 2022
+++ pkgsrc/www/nginx-devel/Makefile     Fri Jul 15 00:41:45 2022
@@ -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 @@ 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"
 
 NGINX_USER?=           nginx