Date: Thu, 22 Feb 2018 17:08:46 +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: r462615 - in head/net-mgmt: zabbix2-server zabbix22-server zabbix3-server zabbix32-server zabbix34-server Message-ID: <201802221708.w1MH8kd5012158@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbaio Date: Thu Feb 22 17:08:46 2018 New Revision: 462615 URL: https://svnweb.freebsd.org/changeset/ports/462615 Log: net-mgmt/zabbix*: Fix fping location Zabbix ports were patching fping location only in the config file, so the default location of fping was wrong. PR: 225956 Reported by: markham_breitbach@ssimicro.com Approved by: Pakhom Golynga <pg@pakhom.spb.ru> (maintainer) 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 head/net-mgmt/zabbix34-server/Makefile Modified: head/net-mgmt/zabbix2-server/Makefile ============================================================================== --- head/net-mgmt/zabbix2-server/Makefile Thu Feb 22 16:44:08 2018 (r462614) +++ head/net-mgmt/zabbix2-server/Makefile Thu Feb 22 17:08:46 2018 (r462615) @@ -3,7 +3,7 @@ PORTNAME= zabbix2 PORTVERSION= 2.0.20 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server @@ -125,7 +125,11 @@ JAVAGW_USE= JAVA=yes post-patch: @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g' - @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' ${WRKSRC}/conf/zabbix_*.conf + @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \ + ${WRKSRC}/conf/zabbix_*.conf \ + ${WRKSRC}/src/zabbix_proxy/proxy.c \ + ${WRKSRC}/src/zabbix_server/server.c + .if ${ZABBIX_BUILD} != "agent" .for d in mysql oracle postgresql sqlite3 Modified: head/net-mgmt/zabbix22-server/Makefile ============================================================================== --- head/net-mgmt/zabbix22-server/Makefile Thu Feb 22 16:44:08 2018 (r462614) +++ head/net-mgmt/zabbix22-server/Makefile Thu Feb 22 17:08:46 2018 (r462615) @@ -3,7 +3,7 @@ PORTNAME= zabbix22 PORTVERSION= 2.2.21 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server @@ -130,7 +130,10 @@ LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 post-patch: @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g' - @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' ${WRKSRC}/conf/zabbix_*.conf + @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \ + ${WRKSRC}/conf/zabbix_*.conf \ + ${WRKSRC}/src/zabbix_proxy/proxy.c \ + ${WRKSRC}/src/zabbix_server/server.c .if ${ZABBIX_BUILD} != "agent" .if ! ${PORT_OPTIONS:MFPING} Modified: head/net-mgmt/zabbix3-server/Makefile ============================================================================== --- head/net-mgmt/zabbix3-server/Makefile Thu Feb 22 16:44:08 2018 (r462614) +++ head/net-mgmt/zabbix3-server/Makefile Thu Feb 22 17:08:46 2018 (r462615) @@ -3,7 +3,7 @@ PORTNAME= zabbix3 PORTVERSION= 3.0.14 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server @@ -152,7 +152,9 @@ post-patch: @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g' @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \ - ${WRKSRC}/conf/zabbix_*.conf + ${WRKSRC}/conf/zabbix_*.conf \ + ${WRKSRC}/src/zabbix_proxy/proxy.c \ + ${WRKSRC}/src/zabbix_server/server.c .if ${ZABBIX_BUILD} == "server" @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \ Modified: head/net-mgmt/zabbix32-server/Makefile ============================================================================== --- head/net-mgmt/zabbix32-server/Makefile Thu Feb 22 16:44:08 2018 (r462614) +++ head/net-mgmt/zabbix32-server/Makefile Thu Feb 22 17:08:46 2018 (r462615) @@ -3,7 +3,7 @@ PORTNAME= zabbix32 PORTVERSION= 3.2.11 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server @@ -154,7 +154,10 @@ post-patch: @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g' @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \ - ${WRKSRC}/conf/zabbix_*.conf + ${WRKSRC}/conf/zabbix_*.conf \ + ${WRKSRC}/src/zabbix_proxy/proxy.c \ + ${WRKSRC}/src/zabbix_server/server.c + .if ${ZABBIX_BUILD} == "server" @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \ Modified: head/net-mgmt/zabbix34-server/Makefile ============================================================================== --- head/net-mgmt/zabbix34-server/Makefile Thu Feb 22 16:44:08 2018 (r462614) +++ head/net-mgmt/zabbix34-server/Makefile Thu Feb 22 17:08:46 2018 (r462615) @@ -3,7 +3,7 @@ PORTNAME= zabbix34 PORTVERSION= 3.4.7 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server @@ -157,7 +157,9 @@ post-patch: @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g' @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \ - ${WRKSRC}/conf/zabbix_*.conf + ${WRKSRC}/conf/zabbix_*.conf \ + ${WRKSRC}/src/zabbix_proxy/proxy.c \ + ${WRKSRC}/src/zabbix_server/server.c .if ${ZABBIX_BUILD} == "server" @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802221708.w1MH8kd5012158>