svn commit: r443044 - in head/net-mgmt: zabbix2-server zabbix22-server zabbix3-server zabbix32-server

[Mark Felder]

Author: feld
Date: Fri Jun  9 22:04:52 2017
New Revision: 443044
URL: https://svnweb.freebsd.org/changeset/ports/443044

Log:
  net-mgmt/zabbix*-server: Update CONFLICTS
  
  Rework conflicts to correctly match the other zabbix packages.
  
  PR:		208025

Modified:
  head/net-mgmt/zabbix2-server/Makefile
  head/net-mgmt/zabbix22-server/Makefile
  head/net-mgmt/zabbix3-server/Makefile
  head/net-mgmt/zabbix32-server/Makefile

Modified: head/net-mgmt/zabbix2-server/Makefile
==============================================================================
--- head/net-mgmt/zabbix2-server/Makefile	Fri Jun  9 21:42:08 2017	(r443043)
+++ head/net-mgmt/zabbix2-server/Makefile	Fri Jun  9 22:04:52 2017	(r443044)
@@ -20,11 +20,7 @@ LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
 LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
-CONFLICTS=	${PKGBASE}-1.[0-8]*
-
-.if ${PKGNAMESUFFIX} != "-agent"
-CONFLICTS+=	${PORTNAME}-1.[0-8]*
-.endif
+CONFLICTS=	zabbix[0-9][0-9]${PKGNAMESUFFIX}-[0-9]* zabbix[0-13-9]${PKGNAMESUFFIX}-[0-9]*
 
 ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
 

Modified: head/net-mgmt/zabbix22-server/Makefile
==============================================================================
--- head/net-mgmt/zabbix22-server/Makefile	Fri Jun  9 21:42:08 2017	(r443043)
+++ head/net-mgmt/zabbix22-server/Makefile	Fri Jun  9 22:04:52 2017	(r443044)
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
-CONFLICTS=	zabbix2${PKGNAMESUFFIX}-[0-9]* zabbix24${PKGNAMESUFFIX}[0-9]* zabbix3${PKGNAMESUFFIX}-[0-9]*
+CONFLICTS=	zabbix[0-13-9][0-13-9]${PKGNAMESUFFIX}-[0-9]* zabbix[0-9]${PKGNAMESUFFIX}-[0-9]*
 
 ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
 

Modified: head/net-mgmt/zabbix3-server/Makefile
==============================================================================
--- head/net-mgmt/zabbix3-server/Makefile	Fri Jun  9 21:42:08 2017	(r443043)
+++ head/net-mgmt/zabbix3-server/Makefile	Fri Jun  9 22:04:52 2017	(r443044)
@@ -14,7 +14,7 @@ COMMENT=	Enterprise-class open source distributed moni
 
 LICENSE=	GPLv2
 
-CONFLICTS=	zabbix2${PKGNAMESUFFIX}-[0-9]* zabbix22${PKGNAMESUFFIX}-[0-9]* zabbix24${PKGNAMESUFFIX}-[0-9]* zabbix32${PKGNAMESUFFIX}-[0-9]*
+CONFLICTS=	zabbix[0-9][0-9]${PKGNAMESUFFIX}-[0-9]* zabbix[0-24-9]${PKGNAMESUFFIX}-[0-9]*
 
 IGNORE_WITH_MYSQL=	41
 

Modified: head/net-mgmt/zabbix32-server/Makefile
==============================================================================
--- head/net-mgmt/zabbix32-server/Makefile	Fri Jun  9 21:42:08 2017	(r443043)
+++ head/net-mgmt/zabbix32-server/Makefile	Fri Jun  9 22:04:52 2017	(r443044)
@@ -14,7 +14,7 @@ COMMENT=	Enterprise-class open source distributed moni
 
 LICENSE=	GPLv2
 
-CONFLICTS=	zabbix2${PKGNAMESUFFIX}-[0-9]* zabbix22${PKGNAMESUFFIX}-[0-9]* zabbix24${PKGNAMESUFFIX}-[0-9]* zabbix3${PKGNAMESUFFIX}-[0-9]*
+CONFLICTS=	zabbix[0-24-9][0-13-9]${PKGNAMESUFFIX}-[0-9]* zabbix[0-9]${PKGNAMESUFFIX}-[0-9]*
 
 IGNORE_WITH_MYSQL=	41