Date: Sat, 6 Jun 2020 01:32:10 +0000 (UTC) From: "Danilo G. Baio" <dbaio@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538069 - in head/net-mgmt: zabbix3-server zabbix4-server zabbix42-server zabbix44-server zabbix5-server Message-ID: <202006060132.0561WAMI058267@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbaio Date: Sat Jun 6 01:32:10 2020 New Revision: 538069 URL: https://svnweb.freebsd.org/changeset/ports/538069 Log: net-mgmt/zabbix*: Change conflicts They can be built when the other ports are already installed, but they cannot coexist. Approved by: portmgr blanket Modified: head/net-mgmt/zabbix3-server/Makefile head/net-mgmt/zabbix4-server/Makefile head/net-mgmt/zabbix42-server/Makefile head/net-mgmt/zabbix44-server/Makefile head/net-mgmt/zabbix5-server/Makefile Modified: head/net-mgmt/zabbix3-server/Makefile ============================================================================== --- head/net-mgmt/zabbix3-server/Makefile Sat Jun 6 00:56:53 2020 (r538068) +++ head/net-mgmt/zabbix3-server/Makefile Sat Jun 6 01:32:10 2020 (r538069) @@ -15,7 +15,7 @@ COMMENT= Enterprise-class open source distributed moni LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-24-9]${PKGNAMESUFFIX} +CONFLICTS_INSTALL= zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-24-9]${PKGNAMESUFFIX} ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} Modified: head/net-mgmt/zabbix4-server/Makefile ============================================================================== --- head/net-mgmt/zabbix4-server/Makefile Sat Jun 6 00:56:53 2020 (r538068) +++ head/net-mgmt/zabbix4-server/Makefile Sat Jun 6 01:32:10 2020 (r538069) @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpcre.so:devel/pcre -CONFLICTS= zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-35-9]${PKGNAMESUFFIX} +CONFLICTS_INSTALL= zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-35-9]${PKGNAMESUFFIX} ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} Modified: head/net-mgmt/zabbix42-server/Makefile ============================================================================== --- head/net-mgmt/zabbix42-server/Makefile Sat Jun 6 00:56:53 2020 (r538068) +++ head/net-mgmt/zabbix42-server/Makefile Sat Jun 6 01:32:10 2020 (r538069) @@ -20,7 +20,7 @@ EXPIRATION_DATE=2020-06-20 LIB_DEPENDS= libpcre.so:devel/pcre -CONFLICTS= zabbix[0-35-9][0-9]${PKGNAMESUFFIX} \ +CONFLICTS_INSTALL= zabbix[0-35-9][0-9]${PKGNAMESUFFIX} \ zabbix4[0-13-9]${PKGNAMESUFFIX} \ zabbix[0-9]${PKGNAMESUFFIX} Modified: head/net-mgmt/zabbix44-server/Makefile ============================================================================== --- head/net-mgmt/zabbix44-server/Makefile Sat Jun 6 00:56:53 2020 (r538068) +++ head/net-mgmt/zabbix44-server/Makefile Sat Jun 6 01:32:10 2020 (r538069) @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpcre.so:devel/pcre -CONFLICTS= zabbix[0-35-9][0-9]${PKGNAMESUFFIX} \ +CONFLICTS_INSTALL= zabbix[0-35-9][0-9]${PKGNAMESUFFIX} \ zabbix4[0-35-9]${PKGNAMESUFFIX} \ zabbix[0-9]${PKGNAMESUFFIX} Modified: head/net-mgmt/zabbix5-server/Makefile ============================================================================== --- head/net-mgmt/zabbix5-server/Makefile Sat Jun 6 00:56:53 2020 (r538068) +++ head/net-mgmt/zabbix5-server/Makefile Sat Jun 6 01:32:10 2020 (r538069) @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpcre.so:devel/pcre -CONFLICTS= zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-46-9]${PKGNAMESUFFIX} +CONFLICTS_INSTALL= zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-46-9]${PKGNAMESUFFIX} ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006060132.0561WAMI058267>