diff options
| author | Mark Felder <feld@FreeBSD.org> | 2017-06-09 22:04:52 +0000 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2017-06-09 22:04:52 +0000 |
| commit | f0ee610982f1a608cb7a2e6c64e65da18fe3b24c (patch) | |
| tree | bc6e5af41249cb7f8670700146186d4b6611d4a3 | |
| parent | accessibility/redshift: fix shebangs (diff) | |
net-mgmt/zabbix*-server: Update CONFLICTS
Rework conflicts to correctly match the other zabbix packages.
PR: 208025
Notes
Notes:
svn path=/head/; revision=443044
| -rw-r--r-- | net-mgmt/zabbix2-server/Makefile | 6 | ||||
| -rw-r--r-- | net-mgmt/zabbix22-server/Makefile | 2 | ||||
| -rw-r--r-- | net-mgmt/zabbix3-server/Makefile | 2 | ||||
| -rw-r--r-- | net-mgmt/zabbix32-server/Makefile | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile index f9af9a062460..55f76554a9ef 100644 --- a/net-mgmt/zabbix2-server/Makefile +++ b/net-mgmt/zabbix2-server/Makefile @@ -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/^-//} diff --git a/net-mgmt/zabbix22-server/Makefile b/net-mgmt/zabbix22-server/Makefile index eab07ddd9b63..7eb2049674f9 100644 --- a/net-mgmt/zabbix22-server/Makefile +++ b/net-mgmt/zabbix22-server/Makefile @@ -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/^-//} diff --git a/net-mgmt/zabbix3-server/Makefile b/net-mgmt/zabbix3-server/Makefile index 3d601fca05ce..9e0c859c2142 100644 --- a/net-mgmt/zabbix3-server/Makefile +++ b/net-mgmt/zabbix3-server/Makefile @@ -14,7 +14,7 @@ COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/ 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 diff --git a/net-mgmt/zabbix32-server/Makefile b/net-mgmt/zabbix32-server/Makefile index d59636563775..2eb67b8a1600 100644 --- a/net-mgmt/zabbix32-server/Makefile +++ b/net-mgmt/zabbix32-server/Makefile @@ -14,7 +14,7 @@ COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/ 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 |