From owner-svn-ports-all@freebsd.org Sun Apr 9 20:10:27 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C2CA1D36F1A; Sun, 9 Apr 2017 20:10:27 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9DEF9CE6; Sun, 9 Apr 2017 20:10:27 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v39KAQJq016146; Sun, 9 Apr 2017 20:10:26 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v39KAQK6016140; Sun, 9 Apr 2017 20:10:26 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201704092010.v39KAQK6016140@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Sun, 9 Apr 2017 20:10:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438118 - in head/net-mgmt: zabbix22-frontend zabbix22-server zabbix22-server/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2017 20:10:27 -0000 Author: danilo Date: Sun Apr 9 20:10:26 2017 New Revision: 438118 URL: https://svnweb.freebsd.org/changeset/ports/438118 Log: - Update to 2.2.17 PR: 215320 Submitted by: pg@pakhom.spb.ru Modified: head/net-mgmt/zabbix22-frontend/Makefile head/net-mgmt/zabbix22-server/Makefile head/net-mgmt/zabbix22-server/distinfo head/net-mgmt/zabbix22-server/files/zabbix_agentd.in head/net-mgmt/zabbix22-server/files/zabbix_proxy.in head/net-mgmt/zabbix22-server/files/zabbix_server.in Modified: head/net-mgmt/zabbix22-frontend/Makefile ============================================================================== --- head/net-mgmt/zabbix22-frontend/Makefile Sun Apr 9 20:05:37 2017 (r438117) +++ head/net-mgmt/zabbix22-frontend/Makefile Sun Apr 9 20:10:26 2017 (r438118) @@ -14,7 +14,7 @@ PLIST= ${PKGDIR}/pkg-plist.frontend USE_PHP= bcmath ctype gd pcre snmp sockets mbstring session dom xml \ xmlreader xmlwriter simplexml gettext ldap -WANT_PHP_WEB= yes +USES+= php:web OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE OPTIONS_DEFAULT= MYSQL MYSQLI Modified: head/net-mgmt/zabbix22-server/Makefile ============================================================================== --- head/net-mgmt/zabbix22-server/Makefile Sun Apr 9 20:05:37 2017 (r438117) +++ head/net-mgmt/zabbix22-server/Makefile Sun Apr 9 20:10:26 2017 (r438118) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zabbix22 -PORTVERSION= 2.2.15 +PORTVERSION= 2.2.17 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server Modified: head/net-mgmt/zabbix22-server/distinfo ============================================================================== --- head/net-mgmt/zabbix22-server/distinfo Sun Apr 9 20:05:37 2017 (r438117) +++ head/net-mgmt/zabbix22-server/distinfo Sun Apr 9 20:10:26 2017 (r438118) @@ -1,3 +1,3 @@ -TIMESTAMP = 1475755867 -SHA256 (zabbix-2.2.15.tar.gz) = 1dc370a04bc42bf21cdedc2dd53de051ac4a61d20ae83cd7c6e1cdd9c574f653 -SIZE (zabbix-2.2.15.tar.gz) = 15487398 +TIMESTAMP = 1489335489 +SHA256 (zabbix-2.2.17.tar.gz) = cf42c5db31c27466a9ec33b6bf22289bbc43ee4e5711e6d323d71644b743e535 +SIZE (zabbix-2.2.17.tar.gz) = 15494053 Modified: head/net-mgmt/zabbix22-server/files/zabbix_agentd.in ============================================================================== --- head/net-mgmt/zabbix22-server/files/zabbix_agentd.in Sun Apr 9 20:05:37 2017 (r438117) +++ head/net-mgmt/zabbix22-server/files/zabbix_agentd.in Sun Apr 9 20:10:26 2017 (r438118) @@ -11,8 +11,10 @@ # enable zabbix_agentd. # zabbix_agentd_config (string): Set to the standard config file path by # default. -# zabbix_agentd_pidfile (string): Location of the zabbix_agentd pid file +# zabbix_agentd_pidfile (string): Location of the zabbix_agent pid file # Default is /var/run/zabbix/zabbix_agentd.pid +# zabbix_agentd_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. # . /etc/rc.subr @@ -25,10 +27,12 @@ load_rc_config $name : ${zabbix_agentd_enable:=NO} : ${zabbix_agentd_config:=%%ETCDIR%%/${name}.conf} : ${zabbix_agentd_pidfile:=/var/run/zabbix/zabbix_agentd.pid} +: ${zabbix_agentd_paths:=$PATH} command="%%PREFIX%%/sbin/${name}" required_files="${zabbix_agentd_config}" +start_cmd=zabbix_agentd_cmd start_precmd=zabbix_agentd_precmd status_precmd=zabbix_agentd_precmd stop_precmd=zabbix_agentd_precmd @@ -52,4 +56,9 @@ zabbix_agentd_precmd() rc_pid=$(check_pidfile ${pidfile} ${command}) } +zabbix_agentd_cmd() +{ + PATH=$zabbix_agentd_paths $command -c $zabbix_agentd_config +} + run_rc_command "$1" Modified: head/net-mgmt/zabbix22-server/files/zabbix_proxy.in ============================================================================== --- head/net-mgmt/zabbix22-server/files/zabbix_proxy.in Sun Apr 9 20:05:37 2017 (r438117) +++ head/net-mgmt/zabbix22-server/files/zabbix_proxy.in Sun Apr 9 20:10:26 2017 (r438118) @@ -15,6 +15,8 @@ # default. # zabbix_proxy_pidfile (string): Location of the zabbix_proxy pid file # Default is /var/run/zabbix/zabbix_proxy.pid +# zabbix_proxy_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. # . /etc/rc.subr @@ -31,6 +33,7 @@ load_rc_config $name command="%%PREFIX%%/sbin/${name}" required_files="${zabbix_proxy_config}" +start_cmd=zabbix_proxy_cmd start_precmd=zabbix_proxy_precmd status_precmd=zabbix_proxy_precmd stop_precmd=zabbix_proxy_precmd @@ -54,4 +57,9 @@ zabbix_proxy_precmd() rc_pid=$(check_pidfile ${pidfile} ${command}) } +zabbix_proxy_cmd() +{ + PATH=$zabbix_proxy_paths $command -c $zabbix_proxy_config +} + run_rc_command "$1" Modified: head/net-mgmt/zabbix22-server/files/zabbix_server.in ============================================================================== --- head/net-mgmt/zabbix22-server/files/zabbix_server.in Sun Apr 9 20:05:37 2017 (r438117) +++ head/net-mgmt/zabbix22-server/files/zabbix_server.in Sun Apr 9 20:10:26 2017 (r438118) @@ -15,6 +15,8 @@ # default. # zabbix_server_pidfile (string): Location of the zabbix_server pid file # Default is /var/run/zabbix/zabbix_server.pid +# zabbix_server_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. # . /etc/rc.subr @@ -27,10 +29,12 @@ load_rc_config $name : ${zabbix_server_enable:=NO} : ${zabbix_server_config:=%%ETCDIR%%/${name}.conf} : ${zabbix_server_pidfile:=/var/run/zabbix/zabbix_server.pid} +: ${zabbix_server_paths:=$PATH} command="%%PREFIX%%/sbin/${name}" required_files="${zabbix_server_config}" +start_cmd=zabbix_server_cmd start_precmd=zabbix_server_precmd status_precmd=zabbix_server_precmd stop_precmd=zabbix_server_precmd @@ -54,4 +58,9 @@ zabbix_server_precmd() rc_pid=$(check_pidfile ${pidfile} ${command}) } +zabbix_server_cmd() +{ + PATH=$zabbix_server_paths $command -c $zabbix_server_config +} + run_rc_command "$1"