diff options
| author | Andrew Pantyukhin <sat@FreeBSD.org> | 2007-08-27 18:35:50 +0000 |
|---|---|---|
| committer | Andrew Pantyukhin <sat@FreeBSD.org> | 2007-08-27 18:35:50 +0000 |
| commit | 72450bee8c97f68de95353dc72ccc3330bef5427 (patch) | |
| tree | 0c797405d79f258312c59dc4fff9e5ff1402bc36 /net-mgmt/zabbix2-agent | |
| parent | f7167b0964792fad56a207cf2b7d35d5992a7764 (diff) | |
| download | ports-72450bee8c97f68de95353dc72ccc3330bef5427.tar.gz ports-72450bee8c97f68de95353dc72ccc3330bef5427.zip | |
- Update to 1.4.2
- Always link server against pthread libs when sqlite3 is selected
- Clean up a bit
Notes
Notes:
svn path=/head/; revision=198397
Diffstat (limited to 'net-mgmt/zabbix2-agent')
| -rw-r--r-- | net-mgmt/zabbix2-agent/Makefile | 17 | ||||
| -rw-r--r-- | net-mgmt/zabbix2-agent/distinfo | 6 | ||||
| -rw-r--r-- | net-mgmt/zabbix2-agent/files/zabbix_agentd.in | 3 |
3 files changed, 12 insertions, 14 deletions
diff --git a/net-mgmt/zabbix2-agent/Makefile b/net-mgmt/zabbix2-agent/Makefile index aa82788b0f81..144df088f315 100644 --- a/net-mgmt/zabbix2-agent/Makefile +++ b/net-mgmt/zabbix2-agent/Makefile @@ -6,7 +6,7 @@ # PORTNAME= zabbix -PORTVERSION= 1.4.1 +PORTVERSION= 1.4.2 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= SF @@ -26,19 +26,18 @@ ZABBIX_CFG= agent agentd ZABBIX_BINFILES=${ZABBIX_BIN:S|^|zabbix_|:C|.+|&/&|:S|agentd/|agent/|} ZABBIX_CFGFILES=${ZABBIX_CFG:S|^|zabbix_|:S|$|.conf|} PLIST_FILES= ${ZABBIX_BIN:S|^|bin/zabbix_|} \ - ${ZABBIX_CFG:S|^|etc/zabbix/zabbix_|:S|$|.conf.sample|} + ${ZABBIX_CFG:S|^|%%ETCDIR%%/zabbix_|:S|$|.conf.sample|} post-patch: @${FIND} ${WRKSRC}/src/ -type f|${XARGS} \ - ${REINPLACE_CMD} -Ee 's|(/etc/zabbix)|${PREFIX}\1|;s|/usr/sbin|${LOCALBASE}/sbin|' + ${REINPLACE_CMD} -e 's|/etc/zabbix|${ETCDIR}|;s|/usr/sbin|${LOCALBASE}/sbin|' do-install: - @${ECHO_CMD} '@unexec rmdir %D/etc/zabbix 2>/dev/null || true' >> ${TMPPLIST} + @${ECHO_CMD} '@unexec rmdir %D/${ETCDIR_REL} 2>/dev/null || true' >> ${TMPPLIST} @${INSTALL_PROGRAM} ${ZABBIX_BINFILES:S,^,${WRKSRC}/src/,} ${PREFIX}/bin/ - @${INSTALL} -d ${PREFIX}/etc/zabbix/ -.for FILE in ${ZABBIX_CFGFILES} - ${INSTALL_DATA} ${WRKSRC}/misc/conf/${FILE} ${PREFIX}/etc/zabbix/${FILE}.sample -.endfor - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${INSTALL} -d ${ETCDIR}/ + @for i in ${ZABBIX_CFGFILES};do\ + ${INSTALL_DATA} ${WRKSRC}/misc/conf/$$i ${ETCDIR}/$$i.sample;done + @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .include <bsd.port.mk> diff --git a/net-mgmt/zabbix2-agent/distinfo b/net-mgmt/zabbix2-agent/distinfo index 712dce49566e..fc172025f3ac 100644 --- a/net-mgmt/zabbix2-agent/distinfo +++ b/net-mgmt/zabbix2-agent/distinfo @@ -1,3 +1,3 @@ -MD5 (zabbix-1.4.1.tar.gz) = c9e9a12eeb3ae784075cb7899f200889 -SHA256 (zabbix-1.4.1.tar.gz) = 631445f5a1a9b0852bb20644cfdf735d8e1ecdc04c4c0a9b394bfb3429a5a6dc -SIZE (zabbix-1.4.1.tar.gz) = 3246817 +MD5 (zabbix-1.4.2.tar.gz) = 1a89f3b8b0925c6373379b4c5dd3138b +SHA256 (zabbix-1.4.2.tar.gz) = 8dd0455e8a723cc9f31f0d41e7fbefa4d72088727c470c918e29de94c71c99bd +SIZE (zabbix-1.4.2.tar.gz) = 3302530 diff --git a/net-mgmt/zabbix2-agent/files/zabbix_agentd.in b/net-mgmt/zabbix2-agent/files/zabbix_agentd.in index 0be45c4d2b66..cc3eeb70286b 100644 --- a/net-mgmt/zabbix2-agent/files/zabbix_agentd.in +++ b/net-mgmt/zabbix2-agent/files/zabbix_agentd.in @@ -11,7 +11,6 @@ load_rc_config $name eval : \${${rcvar}='NO'} command="%%PREFIX%%/bin/${name}" -required_files="%%PREFIX%%/etc/zabbix/${name}.conf" - +required_files="%%ETCDIR%%/${name}.conf" run_rc_command "$1" |