Index: head/net-mgmt/zabbix3-java/Makefile
===================================================================
--- head/net-mgmt/zabbix3-java/Makefile	(revision 538808)
+++ head/net-mgmt/zabbix3-java/Makefile	(revision 538809)
@@ -1,14 +1,15 @@
 # $FreeBSD$
 
 PORTNAME=	zabbix3
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 PKGNAMESUFFIX=	-java
 
 MASTERDIR=	${.CURDIR}/../zabbix3-server
 PLIST=		${PKGDIR}/pkg-plist.java
 
 OPTIONS_DEFINE=		IPV6
 
 USE_JAVA=	yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/net-mgmt/zabbix3-server/files/zabbix_java.in
===================================================================
--- head/net-mgmt/zabbix3-server/files/zabbix_java.in	(revision 538808)
+++ head/net-mgmt/zabbix3-server/files/zabbix_java.in	(revision 538809)
@@ -1,27 +1,47 @@
 #!/bin/sh
 
 # PROVIDE: zabbix_java
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
 #
 # Options to configure zabbix_java via /etc/rc.conf:
 #
 # zabbix_java_enable (bool):
 #   Enable service on boot.
 #   Default: NO
 #
 
 . /etc/rc.subr
 
 name="zabbix_java"
 rcvar=zabbix_java_enable
 
 load_rc_config $name
 
 : ${zabbix_java_enable:=NO}
 
 start_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/startup.sh"
 stop_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/shutdown.sh"
+status_cmd="zabbix_java_status"
+
+extra_commands="status"
+
+zabbix_java_status() {
+  if get_pidfile_from_conf PID_FILE %%PREFIX%%/sbin/zabbix_java/settings.sh; then
+    PID_FILE="$_pidfile_from_conf"
+  fi
+
+  if [ -n "$PID_FILE" -a -f "$PID_FILE" ]; then
+    PID=`cat "$PID_FILE"`
+    if ps -p "$PID" > /dev/null 2>&1; then
+      echo "${name} is running as pid ${PID}"
+    else
+      echo "${name} is not running"
+    fi
+  else
+    echo "${name} is not running"
+  fi
+}
 
 run_rc_command "$1"
Index: head/net-mgmt/zabbix4-java/Makefile
===================================================================
--- head/net-mgmt/zabbix4-java/Makefile	(revision 538808)
+++ head/net-mgmt/zabbix4-java/Makefile	(revision 538809)
@@ -1,14 +1,15 @@
 # $FreeBSD$
 
 PORTNAME=	zabbix4
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 PKGNAMESUFFIX=	-java
 
 MASTERDIR=	${.CURDIR}/../zabbix4-server
 PLIST=		${PKGDIR}/pkg-plist.java
 
 OPTIONS_DEFINE=		IPV6
 
 USE_JAVA=	yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/net-mgmt/zabbix4-server/files/zabbix_java.in
===================================================================
--- head/net-mgmt/zabbix4-server/files/zabbix_java.in	(revision 538808)
+++ head/net-mgmt/zabbix4-server/files/zabbix_java.in	(revision 538809)
@@ -1,27 +1,47 @@
 #!/bin/sh
 
 # PROVIDE: zabbix_java
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
 #
 # Options to configure zabbix_java via /etc/rc.conf:
 #
 # zabbix_java_enable (bool):
 #   Enable service on boot.
 #   Default: NO
 #
 
 . /etc/rc.subr
 
 name="zabbix_java"
 rcvar=zabbix_java_enable
 
 load_rc_config $name
 
 : ${zabbix_java_enable:=NO}
 
 start_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/startup.sh"
 stop_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/shutdown.sh"
+status_cmd="zabbix_java_status"
+
+extra_commands="status"
+
+zabbix_java_status() {
+  if get_pidfile_from_conf PID_FILE %%PREFIX%%/sbin/zabbix_java/settings.sh; then
+    PID_FILE="$_pidfile_from_conf"
+  fi
+
+  if [ -n "$PID_FILE" -a -f "$PID_FILE" ]; then
+    PID=`cat "$PID_FILE"`
+    if ps -p "$PID" > /dev/null 2>&1; then
+      echo "${name} is running as pid ${PID}"
+    else
+      echo "${name} is not running"
+    fi
+  else
+    echo "${name} is not running"
+  fi
+}
 
 run_rc_command "$1"
Index: head/net-mgmt/zabbix42-java/Makefile
===================================================================
--- head/net-mgmt/zabbix42-java/Makefile	(revision 538808)
+++ head/net-mgmt/zabbix42-java/Makefile	(revision 538809)
@@ -1,14 +1,15 @@
 # $FreeBSD$
 
 PORTNAME=	zabbix42
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 PKGNAMESUFFIX=	-java
 
 MASTERDIR=	${.CURDIR}/../zabbix42-server
 PLIST=		${PKGDIR}/pkg-plist.java
 
 OPTIONS_DEFINE=		IPV6
 
 USE_JAVA=	yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/net-mgmt/zabbix42-server/files/zabbix_java.in
===================================================================
--- head/net-mgmt/zabbix42-server/files/zabbix_java.in	(revision 538808)
+++ head/net-mgmt/zabbix42-server/files/zabbix_java.in	(revision 538809)
@@ -1,27 +1,47 @@
 #!/bin/sh
 
 # PROVIDE: zabbix_java
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
 #
 # Options to configure zabbix_java via /etc/rc.conf:
 #
 # zabbix_java_enable (bool):
 #   Enable service on boot.
 #   Default: NO
 #
 
 . /etc/rc.subr
 
 name="zabbix_java"
 rcvar=zabbix_java_enable
 
 load_rc_config $name
 
 : ${zabbix_java_enable:=NO}
 
 start_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/startup.sh"
 stop_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/shutdown.sh"
+status_cmd="zabbix_java_status"
+
+extra_commands="status"
+
+zabbix_java_status() {
+  if get_pidfile_from_conf PID_FILE %%PREFIX%%/sbin/zabbix_java/settings.sh; then
+    PID_FILE="$_pidfile_from_conf"
+  fi
+
+  if [ -n "$PID_FILE" -a -f "$PID_FILE" ]; then
+    PID=`cat "$PID_FILE"`
+    if ps -p "$PID" > /dev/null 2>&1; then
+      echo "${name} is running as pid ${PID}"
+    else
+      echo "${name} is not running"
+    fi
+  else
+    echo "${name} is not running"
+  fi
+}
 
 run_rc_command "$1"
Index: head/net-mgmt/zabbix44-java/Makefile
===================================================================
--- head/net-mgmt/zabbix44-java/Makefile	(revision 538808)
+++ head/net-mgmt/zabbix44-java/Makefile	(revision 538809)
@@ -1,14 +1,15 @@
 # $FreeBSD$
 
 PORTNAME=	zabbix44
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 PKGNAMESUFFIX=	-java
 
 MASTERDIR=	${.CURDIR}/../zabbix44-server
 PLIST=		${PKGDIR}/pkg-plist.java
 
 OPTIONS_DEFINE=		IPV6
 
 USE_JAVA=	yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/net-mgmt/zabbix44-server/files/zabbix_java.in
===================================================================
--- head/net-mgmt/zabbix44-server/files/zabbix_java.in	(revision 538808)
+++ head/net-mgmt/zabbix44-server/files/zabbix_java.in	(revision 538809)
@@ -1,27 +1,47 @@
 #!/bin/sh
 
 # PROVIDE: zabbix_java
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
 #
 # Options to configure zabbix_java via /etc/rc.conf:
 #
 # zabbix_java_enable (bool):
 #   Enable service on boot.
 #   Default: NO
 #
 
 . /etc/rc.subr
 
 name="zabbix_java"
 rcvar=zabbix_java_enable
 
 load_rc_config $name
 
 : ${zabbix_java_enable:=NO}
 
 start_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/startup.sh"
 stop_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/shutdown.sh"
+status_cmd="zabbix_java_status"
+
+extra_commands="status"
+
+zabbix_java_status() {
+  if get_pidfile_from_conf PID_FILE %%PREFIX%%/sbin/zabbix_java/settings.sh; then
+    PID_FILE="$_pidfile_from_conf"
+  fi
+
+  if [ -n "$PID_FILE" -a -f "$PID_FILE" ]; then
+    PID=`cat "$PID_FILE"`
+    if ps -p "$PID" > /dev/null 2>&1; then
+      echo "${name} is running as pid ${PID}"
+    else
+      echo "${name} is not running"
+    fi
+  else
+    echo "${name} is not running"
+  fi
+}
 
 run_rc_command "$1"
Index: head/net-mgmt/zabbix5-java/Makefile
===================================================================
--- head/net-mgmt/zabbix5-java/Makefile	(revision 538808)
+++ head/net-mgmt/zabbix5-java/Makefile	(revision 538809)
@@ -1,14 +1,15 @@
 # $FreeBSD$
 
 PORTNAME=	zabbix5
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 PKGNAMESUFFIX=	-java
 
 MASTERDIR=	${.CURDIR}/../zabbix5-server
 PLIST=		${PKGDIR}/pkg-plist.java
 
 OPTIONS_DEFINE=		IPV6
 
 USE_JAVA=	yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/net-mgmt/zabbix5-server/Makefile
===================================================================
--- head/net-mgmt/zabbix5-server/Makefile	(revision 538808)
+++ head/net-mgmt/zabbix5-server/Makefile	(revision 538809)
@@ -1,216 +1,217 @@
 # Created by: Pakhom Golynga <pg@pakhom.spb.ru>
 # $FreeBSD$
 
 PORTNAME=	zabbix5
 PORTVERSION=	5.0.1
+PORTREVISION?=	0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://cdn.zabbix.com/zabbix/sources/stable/${PORTVERSION:R}/
 PKGNAMESUFFIX?=	-server
 DISTNAME=	zabbix-${PORTVERSION}
 
 MAINTAINER=	pg@pakhom.spb.ru
 COMMENT=	Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LTS
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 CONFLICTS_INSTALL=	zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-46-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}
 .else
 USE_RC_SUBR=	zabbix_${ZABBIX_BUILD}d
 .endif
 
 USES=		pkgconfig iconv
 
 USERS=		zabbix
 GROUPS=		zabbix
 
 .if ${ZABBIX_BUILD} != "proxy"
 PLIST_SUB=	PROXY="@comment "
 .else
 PLIST_SUB=	PROXY=""
 PLIST_FILES+=	bin/zabbix_proxy_js
 .endif
 
 .if ${ZABBIX_BUILD} == "server"
 PLIST_SUB+=	SERVER=""
 PLIST_FILES+=	bin/zabbix_js
 .else
 PLIST_SUB+=	SERVER="@comment "
 .endif
 
 PLIST_SUB+=	ZABBIX_BUILD=${ZABBIX_BUILD} PORTVERSION=${PORTVERSION}
 SUB_LIST=	ZABBIX_BUILD=${ZABBIX_BUILD}
 
 MAKE_ARGS+=	ARCH=freebsd
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD} \
 			--sysconfdir=${ETCDIR} \
 			--datadir=${ETCDIR} \
 			--with-iconv=${ICONV_PREFIX}
 
 .if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
 LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS+=	--with-net-snmp
 
 OPTIONS_DEFINE=		IPV6 FPING CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC
 
 OPTIONS_DEFAULT=	FPING CURL UNIXODBC MYSQL OPENSSL
 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)
 
 OPTIONS_SINGLE=		DB SSL
 OPTIONS_SINGLE_DB?=	MYSQL PGSQL ORACLE
 OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
 
 MYSQL_CONFIGURE_WITH=	mysql
 MYSQL_USES+=		compiler:c11 mysql
 
 PGSQL_CONFIGURE_WITH=	postgresql
 PGSQL_USES+=		pgsql
 
 SQLITE_CONFIGURE_WITH=	sqlite3
 SQLITE_USES+=		sqlite:3
 
 ORACLE_CONFIGURE_WITH=	oracle
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		OPENLDAP=yes
 
 IPMI_CONFIGURE_WITH=	openipmi
 IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
 
 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
 .elif ${ZABBIX_BUILD} == "agent"
 OPTIONS_SINGLE=	SSL
 OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
 .endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
 
 CURL_DESC=		Support for web monitoring
 CURL_CONFIGURE_WITH=	libcurl
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 NMAP_RUN_DEPENDS=	nmap:security/nmap \
 			sudo:security/sudo
 
 LIBXML2_CONFIGURE_WITH=	libxml2=${LOCALBASE}
 LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 OPENSSL_CONFIGURE_WITH=	openssl
 OPENSSL_USES=		ssl
 OPENSSL_VARS=		BROKEN_SSL="libressl libressl-devel" \
 			BROKEN_SSL_REASON="PSK is not provided by LibreSSL"
 
 GNUTLS_CONFIGURE_WITH=	gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
 	  | ${XARGS} ${REINPLACE_CMD} -e 's#/usr/local/etc#${ETCDIR}#g'
 
 	@${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} == "server"
 	@${REINPLACE_CMD} -e 's#/tmp/zabbix_server.pid#/var/run/zabbix/zabbix_server.pid#g' \
 		${WRKSRC}/conf/zabbix_server.conf \
 		${WRKSRC}/src/zabbix_server/server.c
 .endif
 
 .if ${ZABBIX_BUILD} == "proxy"
 	@${REINPLACE_CMD} -e 's#/tmp/zabbix_proxy.pid#/var/run/zabbix/zabbix_proxy.pid#g' \
 		${WRKSRC}/conf/zabbix_proxy.conf \
 		${WRKSRC}/src/zabbix_proxy/proxy.c
 .endif
 
 .if ${ZABBIX_BUILD} == "agent"
 	@${REINPLACE_CMD} -e 's#/tmp/zabbix_agentd.pid#/var/run/zabbix/zabbix_agentd.pid#g' \
 		${WRKSRC}/conf/zabbix_agentd.conf \
 		${WRKSRC}/src/zabbix_agent/zabbix_agentd.c
 .endif
 
 .if ${ZABBIX_BUILD} == "java"
 	@${REINPLACE_CMD} -e 's#/tmp/zabbix_java.pid#/var/run/zabbix/zabbix_java.pid#g' \
 		${WRKSRC}/src/zabbix_java/settings.sh
 .endif
 
 .if ${ZABBIX_BUILD} != "agent"
 .  for d in mysql oracle postgresql sqlite3
 	@${REINPLACE_CMD} \
 		-e 's|/usr/bin/traceroute|/usr/sbin/traceroute|g' \
 		-e 's|sudo /usr/bin/nmap|sudo ${LOCALBASE}/bin/nmap|g' \
 		${WRKSRC}/database/${d}/data.sql
 .  endfor
 .endif
 	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) \
 		-exec ${RM} {} +
 
 pre-configure:
 	@echo "ac_cv_env_PKG_CONFIG_set=${LOCALBASE}/bin/pkgconf" > ${WRKSRC}/config.cache
 
 post-install:
 .if ${ZABBIX_BUILD} == "java"
 	${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh \
 		${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample
 	@${MKDIR} ${STAGEDIR}/var/run/zabbix
 .endif
 
 .if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
 	${MKDIR} ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database
 	@${RM} ${WRKSRC}/database/*/Makefile*
 	(cd ${WRKSRC}/database/ && \
 		${COPYTREE_SHARE} "mysql oracle postgresql sqlite3" \
 		${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/)
 
 	${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}.conf \
 		${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}.conf.sample
 .endif
 
 .if ${ZABBIX_BUILD} == "agent"
 	${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf \
 		${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf.sample
 .endif
 
 .if ${ZABBIX_BUILD} == "proxy"
 	${MV} ${STAGEDIR}${LOCALBASE}/bin/zabbix_js \
 		${STAGEDIR}${LOCALBASE}/bin/zabbix_proxy_js
 .endif
 
 .else # frontend
 .include <bsd.port.pre.mk>
 .endif
 
 .include <bsd.port.post.mk>
Index: head/net-mgmt/zabbix5-server/files/zabbix_java.in
===================================================================
--- head/net-mgmt/zabbix5-server/files/zabbix_java.in	(revision 538808)
+++ head/net-mgmt/zabbix5-server/files/zabbix_java.in	(revision 538809)
@@ -1,27 +1,47 @@
 #!/bin/sh
 
 # PROVIDE: zabbix_java
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
 #
 # Options to configure zabbix_java via /etc/rc.conf:
 #
 # zabbix_java_enable (bool):
 #   Enable service on boot.
 #   Default: NO
 #
 
 . /etc/rc.subr
 
 name="zabbix_java"
 rcvar=zabbix_java_enable
 
 load_rc_config $name
 
 : ${zabbix_java_enable:=NO}
 
 start_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/startup.sh"
 stop_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/shutdown.sh"
+status_cmd="zabbix_java_status"
+
+extra_commands="status"
+
+zabbix_java_status() {
+  if get_pidfile_from_conf PID_FILE %%PREFIX%%/sbin/zabbix_java/settings.sh; then
+    PID_FILE="$_pidfile_from_conf"
+  fi
+
+  if [ -n "$PID_FILE" -a -f "$PID_FILE" ]; then
+    PID=`cat "$PID_FILE"`
+    if ps -p "$PID" > /dev/null 2>&1; then
+      echo "${name} is running as pid ${PID}"
+    else
+      echo "${name} is not running"
+    fi
+  else
+    echo "${name} is not running"
+  fi
+}
 
 run_rc_command "$1"