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 unified 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,26 +1,28 @@ @@ -1,26 +1,28 @@
1# $NetBSD: Makefile,v 1.120 2022/07/14 16:09:42 osa Exp $ 1# $NetBSD: Makefile,v 1.121 2022/07/15 00:41:45 gutteridge Exp $
2 2
3DISTNAME= nginx-1.22.0 3DISTNAME= nginx-1.22.0
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://nginx.org/download/ 6MASTER_SITES= http://nginx.org/download/
7DISTFILES= ${DEFAULT_DISTFILES} 7DISTFILES= ${DEFAULT_DISTFILES}
8 8
9MAINTAINER= osa@NetBSD.org 9MAINTAINER= osa@NetBSD.org
10HOMEPAGE= https://nginx.org/ 10HOMEPAGE= https://nginx.org/
11COMMENT= Lightweight HTTP server and mail proxy server 11COMMENT= Lightweight HTTP server and mail proxy server
12LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
13 13
 14CONFLICTS= nginx-devel-[0-9]*
 15
14.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
15 17
16NGINX_USER?= nginx 18NGINX_USER?= nginx
17NGINX_GROUP?= nginx 19NGINX_GROUP?= nginx
18NGINX_DATADIR?= ${VARBASE}/db/nginx 20NGINX_DATADIR?= ${VARBASE}/db/nginx
19NGINX_LOGDIR?= ${VARBASE}/log/nginx 21NGINX_LOGDIR?= ${VARBASE}/log/nginx
20NGINX_PIDDIR?= ${VARBASE}/run 22NGINX_PIDDIR?= ${VARBASE}/run
21 23
22BUILD_DEFS+= NGINX_DATADIR NGINX_LOGDIR NGINX_PIDDIR VARBASE 24BUILD_DEFS+= NGINX_DATADIR NGINX_LOGDIR NGINX_PIDDIR VARBASE
23 25
24PKG_USERS_VARS+= NGINX_USER 26PKG_USERS_VARS+= NGINX_USER
25PKG_GROUPS_VARS+= NGINX_GROUP 27PKG_GROUPS_VARS+= NGINX_GROUP
26PKG_GROUPS= ${NGINX_GROUP} 28PKG_GROUPS= ${NGINX_GROUP}
cvs diff -r1.86 -r1.87 pkgsrc/www/nginx-devel/Makefile (expand / switch to unified 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,27 +1,29 @@ @@ -1,27 +1,29 @@
1# $NetBSD: Makefile,v 1.86 2022/07/14 15:13:22 osa Exp $ 1# $NetBSD: Makefile,v 1.87 2022/07/15 00:41:45 gutteridge Exp $
2 2
3DISTNAME= nginx-1.23.0 3DISTNAME= nginx-1.23.0
4PKGNAME= ${DISTNAME:S/-/-devel-/1} 4PKGNAME= ${DISTNAME:S/-/-devel-/1}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= https://nginx.org/download/ 7MASTER_SITES= https://nginx.org/download/
8DISTFILES= ${DEFAULT_DISTFILES} 8DISTFILES= ${DEFAULT_DISTFILES}
9 9
10MAINTAINER= osa@NetBSD.org 10MAINTAINER= osa@NetBSD.org
11HOMEPAGE= https://nginx.org/ 11HOMEPAGE= https://nginx.org/
12COMMENT= Lightweight HTTP server and mail proxy server 12COMMENT= Lightweight HTTP server and mail proxy server
13LICENSE= 2-clause-bsd 13LICENSE= 2-clause-bsd
14 14
 15CONFLICTS= nginx-[0-9]*
 16
15.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
16 18
17NGINX_USER?= nginx 19NGINX_USER?= nginx
18NGINX_GROUP?= nginx 20NGINX_GROUP?= nginx
19NGINX_DATADIR?= ${VARBASE}/db/nginx 21NGINX_DATADIR?= ${VARBASE}/db/nginx
20NGINX_LOGDIR?= ${VARBASE}/log/nginx 22NGINX_LOGDIR?= ${VARBASE}/log/nginx
21NGINX_PIDDIR?= ${VARBASE}/run 23NGINX_PIDDIR?= ${VARBASE}/run
22 24
23BUILD_DEFS+= NGINX_DATADIR NGINX_LOGDIR NGINX_PIDDIR VARBASE 25BUILD_DEFS+= NGINX_DATADIR NGINX_LOGDIR NGINX_PIDDIR VARBASE
24 26
25PKG_USERS_VARS+= NGINX_USER 27PKG_USERS_VARS+= NGINX_USER
26PKG_GROUPS_VARS+= NGINX_GROUP 28PKG_GROUPS_VARS+= NGINX_GROUP
27PKG_GROUPS= ${NGINX_GROUP} 29PKG_GROUPS= ${NGINX_GROUP}