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

[Danilo G. Baio]

Author: dbaio
Date: Mon Jun 26 13:20:57 2017
New Revision: 444367
URL: https://svnweb.freebsd.org/changeset/ports/444367

Log:
  net-mgmt/zabbix24-*: Add note about the removal
  
  Remove `-[0-9]*` from CONFLICTS
  
  Reported by:	mat
  Approved by:	garga (mentor), pg at pakhom.spb.ru (maintainer via email)
  Differential Revision:	https://reviews.freebsd.org/D10992

Modified:
  head/UPDATING
  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/UPDATING
==============================================================================
--- head/UPDATING	Mon Jun 26 12:50:00 2017	(r444366)
+++ head/UPDATING	Mon Jun 26 13:20:57 2017	(r444367)
@@ -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 at 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 at FreeBSD.org

Modified: head/net-mgmt/zabbix2-server/Makefile
==============================================================================
--- head/net-mgmt/zabbix2-server/Makefile	Mon Jun 26 12:50:00 2017	(r444366)
+++ head/net-mgmt/zabbix2-server/Makefile	Mon Jun 26 13:20:57 2017	(r444367)
@@ -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/^-//}
 

Modified: head/net-mgmt/zabbix22-server/Makefile
==============================================================================
--- head/net-mgmt/zabbix22-server/Makefile	Mon Jun 26 12:50:00 2017	(r444366)
+++ head/net-mgmt/zabbix22-server/Makefile	Mon Jun 26 13:20:57 2017	(r444367)
@@ -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/^-//}
 

Modified: head/net-mgmt/zabbix3-server/Makefile
==============================================================================
--- head/net-mgmt/zabbix3-server/Makefile	Mon Jun 26 12:50:00 2017	(r444366)
+++ head/net-mgmt/zabbix3-server/Makefile	Mon Jun 26 13:20:57 2017	(r444367)
@@ -14,7 +14,7 @@ COMMENT=	Enterprise-class open source distributed moni
 
 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
 

Modified: head/net-mgmt/zabbix32-server/Makefile
==============================================================================
--- head/net-mgmt/zabbix32-server/Makefile	Mon Jun 26 12:50:00 2017	(r444366)
+++ head/net-mgmt/zabbix32-server/Makefile	Mon Jun 26 13:20:57 2017	(r444367)
@@ -14,7 +14,7 @@ COMMENT=	Enterprise-class open source distributed moni
 
 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