net-mgmt/zabbix3-server: 3.0.4 -> 3.0.5

- RC scripts: add zabbix_server_paths, zabbix_agentd_paths, zabbix_proxy_paths
- Fix net-snmp depends for -agent

PR:		213267
Changes:	http://www.zabbix.com/rn3.0.5.php
Submitted by:	Pakhom Golynga <pg@pakhom.spb.ru> (maintainer)

5 files changed, 44 insertions, 13 deletions

diff --git a/net-mgmt/zabbix3-server/Makefile b/net-mgmt/zabbix3-server/Makefile
index 896219604b41..d027f0ec5777 100644
--- a/net-mgmt/zabbix3-server/Makefile
+++ b/net-mgmt/zabbix3-server/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	zabbix3
-PORTVERSION=	3.0.4
-PORTREVISION?=	1
+PORTVERSION=	3.0.5
+PORTREVISION?=	0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
 PKGNAMESUFFIX?=	-server
@@ -14,9 +14,7 @@ COMMENT=	Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
-
-CONFLICTS=	zabbix2${PKGNAMESUFFIX}-[0-9]* zabbix22${PKGNAMESUFFIX}[0-9]* zabbix24${PKGNAMESUFFIX}-[0-9]*
+CONFLICTS=	zabbix2${PKGNAMESUFFIX}-[0-9]* zabbix22${PKGNAMESUFFIX}-[0-9]* zabbix24${PKGNAMESUFFIX}-[0-9]* zabbix32${PKGNAMESUFFIX}-[0-9]*
 
 IGNORE_WITH_PHP=	52
 IGNORE_WITH_MYSQL=	41
@@ -58,6 +56,7 @@ CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD} \
 			--with-iconv=${ICONV_PREFIX}
 
 .if ${ZABBIX_BUILD} != "agent"
+LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 USES+=		execinfo
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -89,13 +88,13 @@ OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
 OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS POLARSSL
 
 MYSQL_CONFIGURE_WITH=	mysql
-MYSQL_USES+=	mysql
+MYSQL_USES+=		mysql
 
 PGSQL_CONFIGURE_WITH=	postgresql
-PGSQL_USES+=	pgsql
+PGSQL_USES+=		pgsql
 
 SQLITE_CONFIGURE_WITH=	sqlite3
-SQLITE_USES+=	sqlite:3
+SQLITE_USES+=		sqlite:3
 
 ORACLE_CONFIGURE_WITH=	oracle
 
@@ -149,7 +148,7 @@ POLARSSL_LIB_DEPENDS=	libmbedtls.so:security/polarssl13
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT} == base
-IGNORE_FreeBSD_9=	Requires newer OpenSSL (set DEFAULT_VERSIONS+=ssl=openssl)
+IGNORE_FreeBSD_9=	Requires OpenSSL >= 1.0.1 (set DEFAULT_VERSIONS+=ssl=openssl)
 .endif
 
 .if ${SSL_DEFAULT:Mlibressl*}
@@ -165,16 +164,22 @@ post-patch:
 .if ${ZABBIX_BUILD} == "server"
 	@${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \
 		${WRKSRC}/conf/zabbix_server*.conf
+	@${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \
+		${WRKSRC}/conf/zabbix_server*.conf
 .endif
 
 .if ${ZABBIX_BUILD} == "proxy"
 	@${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_proxy.pid#PidFile=/var/run/zabbix/zabbix_proxy.pid#g' \
 		${WRKSRC}/conf/zabbix_proxy*.conf
+	@${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \
+		${WRKSRC}/conf/zabbix_proxy*.conf
 .endif
 
 .if ${ZABBIX_BUILD} == "agent"
 	@${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_agentd.pid#PidFile=/var/run/zabbix/zabbix_agentd.pid#g' \
 		${WRKSRC}/conf/zabbix_agentd*.conf
+	@${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \
+		${WRKSRC}/conf/zabbix_agentd*.conf
 .endif
 
 .if ${ZABBIX_BUILD} != "agent"
diff --git a/net-mgmt/zabbix3-server/distinfo b/net-mgmt/zabbix3-server/distinfo
index e8c431482304..2749bfc464ff 100644
--- a/net-mgmt/zabbix3-server/distinfo
+++ b/net-mgmt/zabbix3-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474053011
-SHA256 (zabbix-3.0.4.tar.gz) = 9fa47d97843b6ca9f550d706b40ee6b35b76c5165ff32ff11ef0474f161e7700
-SIZE (zabbix-3.0.4.tar.gz) = 15403727
+TIMESTAMP = 1475655645
+SHA256 (zabbix-3.0.5.tar.gz) = 641e608765e34edfc04ec005f7c501430105b7c3ec9210bbf52b73fda530c1a1
+SIZE (zabbix-3.0.5.tar.gz) = 15412400
diff --git a/net-mgmt/zabbix3-server/files/zabbix_agentd.in b/net-mgmt/zabbix3-server/files/zabbix_agentd.in
index 12dff564ac47..d3ac5102f812 100644
--- a/net-mgmt/zabbix3-server/files/zabbix_agentd.in
+++ b/net-mgmt/zabbix3-server/files/zabbix_agentd.in
@@ -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_agent 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"
diff --git a/net-mgmt/zabbix3-server/files/zabbix_proxy.in b/net-mgmt/zabbix3-server/files/zabbix_proxy.in
index d990d2338bba..f202f3825111 100644
--- a/net-mgmt/zabbix3-server/files/zabbix_proxy.in
+++ b/net-mgmt/zabbix3-server/files/zabbix_proxy.in
@@ -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"
diff --git a/net-mgmt/zabbix3-server/files/zabbix_server.in b/net-mgmt/zabbix3-server/files/zabbix_server.in
index eb79cb37e8cb..5454914ff3b3 100644
--- a/net-mgmt/zabbix3-server/files/zabbix_server.in
+++ b/net-mgmt/zabbix3-server/files/zabbix_server.in
@@ -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"