summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING11
-rw-r--r--net-mgmt/zabbix2-server/Makefile2
-rw-r--r--net-mgmt/zabbix22-server/Makefile2
-rw-r--r--net-mgmt/zabbix3-server/Makefile2
-rw-r--r--net-mgmt/zabbix32-server/Makefile2
5 files changed, 15 insertions, 4 deletions
diff --git a/UPDATING b/UPDATING
index 05f1bf9a5cb1..688cde4a29e4 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,17 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20170626:
+ AFFECTS: users of net-mgmt/zabbix24*
+ AUTHOR: dbaio@FreeBSD.org
+
+ Zabbix 2.4 has reached end of life and net-mgmt/zabbix24* ports have been
+ removed. Users that have not yet moved to a newer version, should use now
+ net-mgmt/zabbix3-* (LTS release) or net-mgmt/zabbix32-* (Standard release).
+
+ See more info about Zabbix releases here:
+ http://www.zabbix.com/life_cycle_and_release_policy
+
20170624:
AFFECTS: users of mail/dcc-dccd
AUTHOR: ultima@FreeBSD.org
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