diff options
| author | Danilo G. Baio <dbaio@FreeBSD.org> | 2017-06-26 13:20:57 +0000 |
|---|---|---|
| committer | Danilo G. Baio <dbaio@FreeBSD.org> | 2017-06-26 13:20:57 +0000 |
| commit | 5cfa4ca99e546b5e6f8d6ea4e758a0b2333d175c (patch) | |
| tree | 36e5d475f82b7935decb253a78312de248dfce20 /net-mgmt | |
| parent | Add two missing linefeeds. (diff) | |
net-mgmt/zabbix24-*: Add note about the removal
Remove `-[0-9]*` from CONFLICTS
Reported by: mat
Approved by: garga (mentor), pg@pakhom.spb.ru (maintainer via email)
Differential Revision: https://reviews.freebsd.org/D10992
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/zabbix2-server/Makefile | 2 | ||||
| -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, 4 deletions
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile index 5a576ac4df7f..1244ebd8e06c 100644 --- a/net-mgmt/zabbix2-server/Makefile +++ b/net-mgmt/zabbix2-server/Makefile @@ -17,7 +17,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp \ libpkg.so:ports-mgmt/pkg -CONFLICTS= zabbix[0-9][0-9]${PKGNAMESUFFIX}-[0-9]* zabbix[0-13-9]${PKGNAMESUFFIX}-[0-9]* +CONFLICTS= zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-13-9]${PKGNAMESUFFIX} ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} diff --git a/net-mgmt/zabbix22-server/Makefile b/net-mgmt/zabbix22-server/Makefile index 7eb2049674f9..c0b6e98edcc9 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= zabbix[0-13-9][0-13-9]${PKGNAMESUFFIX}-[0-9]* zabbix[0-9]${PKGNAMESUFFIX}-[0-9]* +CONFLICTS= zabbix[0-13-9][0-13-9]${PKGNAMESUFFIX} zabbix[0-9]${PKGNAMESUFFIX} ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} diff --git a/net-mgmt/zabbix3-server/Makefile b/net-mgmt/zabbix3-server/Makefile index 9e0c859c2142..a6996fb07dbb 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= zabbix[0-9][0-9]${PKGNAMESUFFIX}-[0-9]* zabbix[0-24-9]${PKGNAMESUFFIX}-[0-9]* +CONFLICTS= zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-24-9]${PKGNAMESUFFIX} IGNORE_WITH_MYSQL= 41 diff --git a/net-mgmt/zabbix32-server/Makefile b/net-mgmt/zabbix32-server/Makefile index 2eb67b8a1600..f81aaf071eb4 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= zabbix[0-24-9][0-13-9]${PKGNAMESUFFIX}-[0-9]* zabbix[0-9]${PKGNAMESUFFIX}-[0-9]* +CONFLICTS= zabbix[0-24-9][0-13-9]${PKGNAMESUFFIX} zabbix[0-9]${PKGNAMESUFFIX} IGNORE_WITH_MYSQL= 41 |