diff options
| author | Danilo G. Baio <dbaio@FreeBSD.org> | 2020-06-06 16:42:27 +0000 |
|---|---|---|
| committer | Danilo G. Baio <dbaio@FreeBSD.org> | 2020-06-06 16:42:27 +0000 |
| commit | 004ff0652c8fb69878dee1e7c88c4e4d3ad9bf6b (patch) | |
| tree | d8b7f97e304fbbbd24e57e8968d4af3f5bbbc1e8 /net-mgmt | |
| parent | dbbeb2728d1b0d08853ddfc5897ee4c645091730 (diff) | |
| download | ports-004ff0652c8fb69878dee1e7c88c4e4d3ad9bf6b.tar.gz ports-004ff0652c8fb69878dee1e7c88c4e4d3ad9bf6b.zip | |
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)
Notes
Notes:
svn path=/head/; revision=538107
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/zabbix44-server/Makefile | 9 | ||||
| -rw-r--r-- | net-mgmt/zabbix44-server/pkg-plist | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/net-mgmt/zabbix44-server/Makefile b/net-mgmt/zabbix44-server/Makefile index ad2beb83a276..291092eb572f 100644 --- a/net-mgmt/zabbix44-server/Makefile +++ b/net-mgmt/zabbix44-server/Makefile @@ -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 @@ -205,6 +207,11 @@ post-install: ${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 .include <bsd.port.pre.mk> .endif diff --git a/net-mgmt/zabbix44-server/pkg-plist b/net-mgmt/zabbix44-server/pkg-plist index 1f4be5829ada..3beb0e982576 100644 --- a/net-mgmt/zabbix44-server/pkg-plist +++ b/net-mgmt/zabbix44-server/pkg-plist @@ -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 |