pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

zabbix50: Update CONFLICTS



Module Name:	pkgsrc-wip
Committed By:	Juraj Lutter <otis%NetBSD.org@localhost>
Pushed By:	otis
Date:		Sat Sep 12 23:21:41 2020 +0000
Changeset:	ab5cf9e30912b746fdb498f51c59f7ee4e95d15a

Modified Files:
	zabbix50-proxy/Makefile
	zabbix50-server/Makefile

Log Message:
zabbix50: Update CONFLICTS

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ab5cf9e30912b746fdb498f51c59f7ee4e95d15a

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

diffstat:
 zabbix50-proxy/Makefile  | 1 -
 zabbix50-server/Makefile | 1 -
 2 files changed, 2 deletions(-)

diffs:
diff --git a/zabbix50-proxy/Makefile b/zabbix50-proxy/Makefile
index da347341bd..135a106a1b 100644
--- a/zabbix50-proxy/Makefile
+++ b/zabbix50-proxy/Makefile
@@ -5,7 +5,6 @@
 PKGNAME=	${DISTNAME:S/-/-proxy-/}
 COMMENT=	Enterprise-class Monitoring Solution for Everyone
 
-CONFLICTS+=	zabbix-server-[0-9]*
 CONFLICTS+=	zabbix-proxy-[0-9]*
 
 USE_TOOLS+=		pax pkg-config
diff --git a/zabbix50-server/Makefile b/zabbix50-server/Makefile
index 05430f3947..fe6fe0fdcf 100644
--- a/zabbix50-server/Makefile
+++ b/zabbix50-server/Makefile
@@ -8,7 +8,6 @@ PKGNAME=	${DISTNAME:S/-/-server-/}
 COMMENT=	Enterprise-class Monitoring Solution for Everyone
 
 CONFLICTS+=	zabbix-server-[0-9]*
-CONFLICTS+=	zabbix-proxy-[0-9]*
 
 DEPENDS+=	fping-[0-9]*:../../net/fping
 


Home | Main Index | Thread Index | Old Index