svn commit: r566807 - branches/2021Q1/net-mgmt/zabbix4-server

[Juraj Lutter]

Author: otis
Date: Sun Feb 28 20:19:22 2021
New Revision: 566807
URL: https://svnweb.freebsd.org/changeset/ports/566807

Log:
  MFH: r566805
  
  net-mgmt/zabbix4-server: Update to 4.0.29
  
  Changelog: https://www.zabbix.com/rn/rn4.0.29
  
  PR:		253825
  Submitted by:	pg at pakhom.spb.ru (maintainer)
  Reviewed by:	osa (mentor)
  Approved by:	osa (mentor)
  Differential Revision:	https://reviews.freebsd.org/D28976

Modified:
  branches/2021Q1/net-mgmt/zabbix4-server/Makefile
  branches/2021Q1/net-mgmt/zabbix4-server/distinfo
Directory Properties:
  branches/2021Q1/   (props changed)

Modified: branches/2021Q1/net-mgmt/zabbix4-server/Makefile
==============================================================================
--- branches/2021Q1/net-mgmt/zabbix4-server/Makefile	Sun Feb 28 20:18:45 2021	(r566806)
+++ branches/2021Q1/net-mgmt/zabbix4-server/Makefile	Sun Feb 28 20:19:22 2021	(r566807)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zabbix4
-PORTVERSION=	4.0.27
+PORTVERSION=	4.0.29
 PORTREVISION?=	0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://cdn.zabbix.com/zabbix/sources/stable/${PORTVERSION:R}/
@@ -17,20 +17,22 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
-CONFLICTS_INSTALL=	zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-35-9]${PKGNAMESUFFIX}
+CONFLICTS_INSTALL=	zabbix[0-35-9]${PKGNAMESUFFIX} \
+			zabbix[0-9][0-9]${PKGNAMESUFFIX}
 
 ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
 
 .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings
 .if ${ZABBIX_BUILD} != "agent"
-CONFIGURE_ARGS+=	--with-libevent=${LOCALBASE} --cache-file=${WRKSRC}/config.cache
-LIB_DEPENDS+=	libevent.so:devel/libevent
-USE_RC_SUBR=	zabbix_${ZABBIX_BUILD}
+CONFIGURE_ARGS+=	--cache-file=${WRKSRC}/config.cache \
+			--with-libevent=${LOCALBASE}
+LIB_DEPENDS+=		libevent.so:devel/libevent
+USE_RC_SUBR=		zabbix_${ZABBIX_BUILD}
 .else
-USE_RC_SUBR=	zabbix_${ZABBIX_BUILD}d
+USE_RC_SUBR=		zabbix_${ZABBIX_BUILD}d
 .endif
 
-USES=		pkgconfig iconv
+USES=		iconv pkgconfig
 
 USERS=		zabbix
 GROUPS=		zabbix
@@ -47,14 +49,15 @@ PLIST_SUB+=	SERVER=""
 PLIST_SUB+=	SERVER="@comment "
 .endif
 
-PLIST_SUB+=	ZABBIX_BUILD=${ZABBIX_BUILD} PORTVERSION=${PORTVERSION}
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
+		ZABBIX_BUILD=${ZABBIX_BUILD}
 SUB_LIST=	ZABBIX_BUILD=${ZABBIX_BUILD}
 
-MAKE_ARGS+=	ARCH=freebsd
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD} \
+MAKE_ARGS+=		ARCH=freebsd
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--datadir=${ETCDIR} \
+			--enable-${ZABBIX_BUILD} \
 			--sysconfdir=${ETCDIR} \
-			--datadir=${ETCDIR} \
 			--with-iconv=${ICONV_PREFIX}
 
 .if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
@@ -66,23 +69,23 @@ SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS+=	--with-net-snmp
 
-OPTIONS_DEFINE=		IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC
+OPTIONS_DEFINE=	CURL FPING IPMI IPV6 JABBER LDAP LIBXML2 NMAP SSH UNIXODBC
 
-OPTIONS_DEFAULT=	FPING CURL UNIXODBC MYSQL OPENSSL
+OPTIONS_DEFAULT=	CURL FPING MYSQL OPENSSL UNIXODBC
 OPTIONS_SUB=		yes
 
-FPING_DESC=		Build/install fping for ping checks
-IPMI_DESC=		Support for IPMI checks
-JABBER_DESC=		Support for Jabber media type
-LDAP_DESC=		Support for LDAP server checks
-NMAP_DESC=		Build/install nmap for o/s detection
-SSH_DESC=		Support for SSH-based checks
-UNIXODBC_DESC=		Support for database checks via ODBC
-LIBXML2_DESC=		Support for libxml2 (required by monitoring VMware)
+FPING_DESC=	Build/install fping for ping checks
+IPMI_DESC=	Support for IPMI checks
+JABBER_DESC=	Support for Jabber media type
+LDAP_DESC=	Support for LDAP server checks
+NMAP_DESC=	Build/install nmap for o/s detection
+SSH_DESC=	Support for SSH-based checks
+UNIXODBC_DESC=	Support for database checks via ODBC
+LIBXML2_DESC=	Support for libxml2 (required by monitoring VMware)
 
 OPTIONS_SINGLE=		DB SSL
-OPTIONS_SINGLE_DB?=	MYSQL PGSQL ORACLE
-OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
+OPTIONS_SINGLE_DB?=	MYSQL ORACLE PGSQL
+OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
 
 MYSQL_CONFIGURE_WITH=	mysql
 MYSQL_USES+=		compiler:c11 mysql
@@ -109,11 +112,11 @@ FPING_RUN_DEPENDS=	fping:net/fping
 SSH_CONFIGURE_WITH=	ssh2
 SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
 
-UNIXODBC_CONFIGURE_WITH=unixodbc
-UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
+UNIXODBC_CONFIGURE_WITH=	unixodbc
+UNIXODBC_LIB_DEPENDS=		libodbc.so:databases/unixODBC
 .elif ${ZABBIX_BUILD} == "agent"
-OPTIONS_SINGLE=	SSL
-OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
+OPTIONS_SINGLE=			SSL
+OPTIONS_SINGLE_SSL=		GNUTLS OPENSSL
 .endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
 
 CURL_DESC=		Support for web monitoring

Modified: branches/2021Q1/net-mgmt/zabbix4-server/distinfo
==============================================================================
--- branches/2021Q1/net-mgmt/zabbix4-server/distinfo	Sun Feb 28 20:18:45 2021	(r566806)
+++ branches/2021Q1/net-mgmt/zabbix4-server/distinfo	Sun Feb 28 20:19:22 2021	(r566807)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1606983187
-SHA256 (zabbix-4.0.27.tar.gz) = d9fcc829a99b0dfb2905c138566eaa1828a2e04637fd38842ba81b433e9bab3a
-SIZE (zabbix-4.0.27.tar.gz) = 17426383
+TIMESTAMP = 1614197683
+SHA256 (zabbix-4.0.29.tar.gz) = 3e65574407d4579bdb9fcd7d83ac73a809cdb12b796b57d351deaf7cf2e9f061
+SIZE (zabbix-4.0.29.tar.gz) = 17411987