Index: head/net-mgmt/unifi4/Makefile
===================================================================
--- head/net-mgmt/unifi4/Makefile	(revision 422565)
+++ head/net-mgmt/unifi4/Makefile	(revision 422566)
@@ -1,59 +1,60 @@
 # Created by: Alban MAIRE <a.maire@s2mi.fr>
 # $FreeBSD$
 
 PORTNAME=	unifi4
 PORTVERSION=	4.8.20
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	https://www.ubnt.com/downloads/unifi/${PORTVERSION}/ \
 		LOCAL/feld/${PORTNAME}-${PORTVERSION}/
 DISTNAME=	UniFi.unix
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	UniFi Controller
 
 RUN_DEPENDS=	mongodb>0:databases/mongodb \
 		snappyjava>0:archivers/snappy-java
 
 BUILD=		8422
 
-SUB_LIST+=	USERS=${USERS} GROUPS=${GROUPS} JAVASHAREDIR=${JAVASHAREDIR}
+SUB_LIST+=	USERS=${USERS} GROUPS=${GROUPS} JAVASHAREDIR=${JAVASHAREDIR} \
+		JAVA=${JAVA}
 PLIST_SUB+=	BUILDVERSION="${PORTVERSION:S/./_/g}_${BUILD}"
 
 USES=		cpe zip
 CPE_VENDOR=	ubnt
 CPE_PRODUCT=	unifi_controller
 USE_JAVA=	yes
 JAVA_VERSION=	1.8
 JAVA_OS=	native
 JAVA_VENDOR=	openjdk bsdjava
 JAVA_RUN=	yes
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 USE_RC_SUBR=	unifi
 
 USERS=		unifi
 GROUPS=		unifi
 
 WRKSRC=		${WRKDIR}/UniFi
 
 RESTRICTED=	Redistribution of bundled firmware images is not permitted
 CONFLICTS=	unifi2-* unifi3-*
 
 post-patch:
 	${RM} ${WRKSRC}/lib/snappy-java-1.0.5.jar
 	(cd ${WRKSRC}/lib && ${LN} -s ${JAVAJARDIR}/snappy-java.jar snappy-java-1.0.5.jar)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/unifi
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${JAVASHAREDIR}/unifi/)
 	${LN} -sf ${PREFIX}/bin/mongod ${STAGEDIR}${JAVASHAREDIR}/unifi/bin/mongod
 # Create directories that will be writable by unifi
 .for i in data logs run work
 	${MKDIR} ${STAGEDIR}/${JAVASHAREDIR}/unifi/${i}
 .endfor
 
 .include <bsd.port.mk>
Index: head/net-mgmt/unifi4/files/unifi.in
===================================================================
--- head/net-mgmt/unifi4/files/unifi.in	(revision 422565)
+++ head/net-mgmt/unifi4/files/unifi.in	(revision 422566)
@@ -1,75 +1,41 @@
 #!/bin/sh
 #
 # Created by: Mark Felder <feld@FreeBSD.org>
 # $FreeBSD$
 #
 
 # PROVIDE: unifi
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable `unifi':
 #
 # unifi_enable="YES"
 
 . /etc/rc.subr
 name=unifi
 
 rcvar=unifi_enable
 load_rc_config ${name}
 
 : ${unifi_enable:=NO}
 : ${unifi_user:=%%USERS%%}
 : ${unifi_group:=%%GROUPS%%}
 : ${unifi_chdir=%%JAVASHAREDIR%%/unifi}
 : ${unifi_javaflags:="-Djava.awt.headless=true -Xmx1024M"}
 
-command_interpreter=.
-command="%%PREFIX%%/bin/java"
-command_args="${unifi_javaflags} -jar lib/ace.jar"
-start_cmd=start_cmd
+pidfile="/var/run/unifi/${name}.pid"
+procname=%%JAVA%%
+command="/usr/sbin/daemon"
+command_args="-f -p ${pidfile} %%JAVA%% ${unifi_javaflags} -jar lib/ace.jar start"
 start_precmd=start_precmd
-stop_cmd=stop_cmd
-status_cmd=status_cmd
-pidfile="/var/run/${name}.pid"
 
-procname=$(JAVAVM_DRYRUN=yes ${command} | fgrep JAVAVM_COMMAND)
-
 start_precmd()
 {
 	if [ ! -e /var/run/unifi ] ; then
 		install -d -o %%USERS%% -g %%GROUPS%% /var/run/unifi;
 	fi
-}
-
-start_cmd()
-{
-	check_startmsgs && echo "Starting ${name}."
-	cd ${unifi_chdir}
-	daemon -u %%USERS%% -f -p ${pidfile} ${command} ${command_args} start
-}
-
-stop_cmd()
-{
-	check_startmsgs && echo "Stopping ${name}."
-	rc_pid=$(check_pidfile $pidfile $procname)
-	cd ${unifi_chdir}
-	${command} ${command_args} stop
-	wait_for_pids $rc_pid
-}
-
-status_cmd()
-{
-	if [ -e ${pidfile} ] && $(pgrep -F ${pidfile} > /dev/null) ; then
-                mypid=$(cat ${pidfile})
-	fi
-
-        if [ ! ${mypid} = '' ]; then
-                echo "${name} is running with PID ${mypid}.";
-        else
-                echo "${name} not running?";
-        fi
 }
 
 run_rc_command "$1"