From 9da212edd9d590cf0840ae883de3c97f64a39ae3 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 5 Feb 2019 08:11:11 +0100 Subject: [PATCH] plugins: fix PLUGIN_CONFLICTS --- net-mgmt/zabbix-proxy/Makefile | 1 + net-mgmt/zabbix4-proxy/Makefile | 2 +- net/frr/Makefile | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-mgmt/zabbix-proxy/Makefile b/net-mgmt/zabbix-proxy/Makefile index 2db24d54d..089e297d7 100644 --- a/net-mgmt/zabbix-proxy/Makefile +++ b/net-mgmt/zabbix-proxy/Makefile @@ -2,6 +2,7 @@ PLUGIN_NAME= zabbix-proxy PLUGIN_VERSION= 1.1 PLUGIN_COMMENT= Zabbix Proxy enables decentralized monitoring PLUGIN_DEPENDS= zabbix3-proxy +PLUGIN_CONFLICTS= zabbix4-proxy PLUGIN_MAINTAINER= m.muenz@gmail.com .include "../../Mk/plugins.mk" diff --git a/net-mgmt/zabbix4-proxy/Makefile b/net-mgmt/zabbix4-proxy/Makefile index ff07b7859..82e336f5d 100644 --- a/net-mgmt/zabbix4-proxy/Makefile +++ b/net-mgmt/zabbix4-proxy/Makefile @@ -2,7 +2,7 @@ PLUGIN_NAME= zabbix4-proxy PLUGIN_VERSION= 0.1 PLUGIN_COMMENT= Zabbix Proxy enables decentralized monitoring PLUGIN_DEPENDS= zabbix4-proxy -PLUGIN_CONFLICTS= os-zabbix-proxy +PLUGIN_CONFLICTS= zabbix-proxy PLUGIN_MAINTAINER= m.muenz@gmail.com .include "../../Mk/plugins.mk" diff --git a/net/frr/Makefile b/net/frr/Makefile index 943a71a72..ecdcb73c4 100644 --- a/net/frr/Makefile +++ b/net/frr/Makefile @@ -2,7 +2,6 @@ PLUGIN_NAME= frr PLUGIN_VERSION= 1.7 PLUGIN_COMMENT= The FRRouting Protocol Suite PLUGIN_DEPENDS= frr5 ruby -PLUGIN_CONFLICTS= quagga PLUGIN_MAINTAINER= franz.fabian.94@gmail.com .include "../../Mk/plugins.mk"