From owner-svn-ports-all@freebsd.org Fri Jun 9 22:04:53 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B4C8BFE257; Fri, 9 Jun 2017 22:04:53 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 66A4D7DDE0; Fri, 9 Jun 2017 22:04:53 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v59M4qGJ007667; Fri, 9 Jun 2017 22:04:52 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v59M4qZ7007663; Fri, 9 Jun 2017 22:04:52 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201706092204.v59M4qZ7007663@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 9 Jun 2017 22:04:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r443044 - in head/net-mgmt: zabbix2-server zabbix22-server zabbix3-server zabbix32-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Jun 2017 22:04:53 -0000 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