Index: net-mgmt/zabbix52-server/Makefile
===================================================================
--- net-mgmt/zabbix52-server/Makefile
+++ net-mgmt/zabbix52-server/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	zabbix52
-PORTVERSION=	5.2.2
+DISTVERSION=	5.2.3
 PORTREVISION?=	0
 CATEGORIES=	net-mgmt
-MASTER_SITES=	https://cdn.zabbix.com/zabbix/sources/stable/${PORTVERSION:R}/
+MASTER_SITES=	https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/
 PKGNAMESUFFIX?=	-server
-DISTNAME=	zabbix-${PORTVERSION}
+DISTNAME=	zabbix-${DISTVERSION}
 
 MAINTAINER=	pg@pakhom.spb.ru
 COMMENT=	Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//})
@@ -17,22 +17,23 @@
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
-CONFLICTS_INSTALL=	zabbix[0-46-9][0-9]${PKGNAMESUFFIX} \
-		zabbix5[0-13-9]${PKGNAMESUFFIX} \
-		zabbix[0-9]${PKGNAMESUFFIX}
+CONFLICTS_INSTALL=	zabbix5[0-13-9]${PKGNAMESUFFIX} \
+			zabbix[0-46-9][0-9]${PKGNAMESUFFIX} \
+			zabbix[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
@@ -51,14 +52,15 @@
 PLIST_SUB+=	SERVER="@comment "
 .endif
 
-PLIST_SUB+=	ZABBIX_BUILD=${ZABBIX_BUILD} PORTVERSION=${PORTVERSION}
+PLIST_SUB+=	DISTVERSION=${DISTVERSION} \
+		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"
@@ -70,22 +72,22 @@
 
 CONFIGURE_ARGS+=	--with-net-snmp
 
-OPTIONS_DEFINE=		IPV6 FPING CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC
+OPTIONS_DEFINE=	CURL FPING IPMI IPV6 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
-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
+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 +111,11 @@
 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
Index: net-mgmt/zabbix52-server/distinfo
===================================================================
--- net-mgmt/zabbix52-server/distinfo
+++ net-mgmt/zabbix52-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1606982680
-SHA256 (zabbix-5.2.2.tar.gz) = 0f71a623ae801ba493849204415ceae73be078452be86ea8e5914d9c61e9589b
-SIZE (zabbix-5.2.2.tar.gz) = 19745101
+TIMESTAMP = 1611337430
+SHA256 (zabbix-5.2.3.tar.gz) = ce36c89bf39e7c88ad36f308cb39883ee10a8707d6643700b5b11f45951c9b72
+SIZE (zabbix-5.2.3.tar.gz) = 19791383
Index: net-mgmt/zabbix52-server/pkg-plist.frontend
===================================================================
--- net-mgmt/zabbix52-server/pkg-plist.frontend
+++ net-mgmt/zabbix52-server/pkg-plist.frontend
@@ -542,6 +542,7 @@
 %%WWWDIR%%/include/classes/helpers/CCookieHelper.php
 %%WWWDIR%%/include/classes/helpers/CDashboardHelper.php
 %%WWWDIR%%/include/classes/helpers/CDataCacheHelper.php
+%%WWWDIR%%/include/classes/helpers/CDateTimeZoneHelper.php
 %%WWWDIR%%/include/classes/helpers/CElasticsearchHelper.php
 %%WWWDIR%%/include/classes/helpers/CEncryptHelper.php
 %%WWWDIR%%/include/classes/helpers/CHousekeepingHelper.php
Index: net-mgmt/zabbix52-server/pkg-plist.java
===================================================================
--- net-mgmt/zabbix52-server/pkg-plist.java
+++ net-mgmt/zabbix52-server/pkg-plist.java
@@ -7,5 +7,5 @@
 sbin/zabbix_java/lib/android-json-4.3_r3.1.jar
 @sample sbin/zabbix_java/settings.sh.sample
 sbin/zabbix_java/startup.sh
-sbin/zabbix_java/bin/zabbix-java-gateway-%%PORTVERSION%%.jar
+sbin/zabbix_java/bin/zabbix-java-gateway-%%DISTVERSION%%.jar
 @dir(zabbix,zabbix,755) /var/run/zabbix