Date: Sat, 6 Jun 2020 16:42:27 +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: r538107 - head/net-mgmt/zabbix44-server Message-ID: <202006061642.056GgRnT023370@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbaio Date: Sat Jun 6 16:42:27 2020 New Revision: 538107 URL: https://svnweb.freebsd.org/changeset/ports/538107 Log: net-mgmt/zabbix44-[proxy|server]: Avoid conflicts with bin/zabbix_js Same approach in Zabbix 5. Another way is having another slave port, zabbix44-js just for this file. PR: 245037 Reported by: Aleksandr Ignatyev <alex@i.org.ua> Approved by: maintainer timeout (pg@pakhom.spb.ru, > 2 months) Modified: head/net-mgmt/zabbix44-server/Makefile head/net-mgmt/zabbix44-server/pkg-plist Modified: head/net-mgmt/zabbix44-server/Makefile ============================================================================== --- head/net-mgmt/zabbix44-server/Makefile Sat Jun 6 16:33:37 2020 (r538106) +++ head/net-mgmt/zabbix44-server/Makefile Sat Jun 6 16:42:27 2020 (r538107) @@ -3,7 +3,7 @@ PORTNAME= zabbix44 PORTVERSION= 4.4.9 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${PORTVERSION:R}/ PKGNAMESUFFIX?= -server @@ -41,10 +41,12 @@ GROUPS= zabbix PLIST_SUB= PROXY="@comment " .else PLIST_SUB= PROXY="" +PLIST_FILES+= bin/zabbix_proxy_js .endif .if ${ZABBIX_BUILD} == "server" PLIST_SUB+= SERVER="" +PLIST_FILES+= bin/zabbix_js .else PLIST_SUB+= SERVER="@comment " .endif @@ -203,6 +205,11 @@ post-install: .if ${ZABBIX_BUILD} == "agent" ${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf \ ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf.sample +.endif + +.if ${ZABBIX_BUILD} == "proxy" + ${MV} ${STAGEDIR}${LOCALBASE}/bin/zabbix_js \ + ${STAGEDIR}${LOCALBASE}/bin/zabbix_proxy_js .endif .else # frontend Modified: head/net-mgmt/zabbix44-server/pkg-plist ============================================================================== --- head/net-mgmt/zabbix44-server/pkg-plist Sat Jun 6 16:33:37 2020 (r538106) +++ head/net-mgmt/zabbix44-server/pkg-plist Sat Jun 6 16:42:27 2020 (r538107) @@ -1,4 +1,3 @@ -bin/zabbix_js %%DATADIR%%/%%ZABBIX_BUILD%%/database/ibm_db2/data.sql %%DATADIR%%/%%ZABBIX_BUILD%%/database/ibm_db2/images.sql %%DATADIR%%/%%ZABBIX_BUILD%%/database/ibm_db2/schema.sql
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006061642.056GgRnT023370>