--- Makefile	
+++ Makefile	
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	kea
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/-beta/b/:S/a/.a/:S/rc/.rc/}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ISC/kea/${ISCVERSION}
 DISTNAME=	${PORTNAME}-${ISCVERSION}
@@ -16,6 +16,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	liblog4cplus.so:devel/log4cplus \
 		libboost_system.so:devel/boost-libs
 
+USES=		autoreconf compiler:c++11-lang iconv libtool pathfix ssl cpe
+
 # ISC releases things like 1.4.0-P1, which our versioning doesn't like
 ISCVERSION=	1.6.0
 
@@ -25,7 +27,6 @@ CPE_VERSION=	${ISCVERSION:C/-.*//}
 CPE_UPDATE=	${ISCVERSION:C/.*-//:tl}
 .endif
 
-USES=		autoreconf compiler:c++11-lang iconv libtool pathfix ssl cpe
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	${PORTNAME}
 GNU_CONFIGURE=	yes
--- files/kea.in	
+++ files/kea.in	
@@ -3,7 +3,7 @@ 
 #
 # PROVIDE: kea
 # REQUIRE: netif routing
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 #
 # Add the following to /etc/rc.conf[.local] to enable this service
@@ -13,28 +13,20 @@ 
 
 . /etc/rc.subr
 
-name="kea"
-rcvar="${name}_enable"
-command="%%PREFIX%%/sbin/keactrl"
-required_files="%%PREFIX%%/etc/${name}/keactrl.conf"
-extra_commands="reload"
-start_precmd="kea_start_precmd"
-stop_cmd="kea_cmd stop"
-status_cmd="kea_cmd status"
-reload_cmd="kea_cmd reload"
+name=kea
+desc="Kea DHCP Server"
+rcvar=kea_enable
 
-kea_start_precmd()
-{
-
-	command_args="start"
-}
+load_rc_config $name
 
-kea_cmd()
-{
+kea_enable=${kea_enable:-"NO"}
 
-	$command $1
-}
+command="%%PREFIX%%/sbin/keactrl"
+required_files="%%PREFIX%%/etc/${name}/keactrl.conf"
+extra_commands=reload
+start_precmd=command_args=start
+stop_cmd="$command stop"
+status_cmd="$command status"
+reload_cmd="$command reload"
 
-load_rc_config $name
-: ${kea_enable="NO"}
 run_rc_command "$1"
--- /dev/null	
+++ files/patch-src_bin_keactrl_keactrl.in	
@@ -0,0 +1,13 @@ 
+--- src/bin/keactrl/keactrl.in.orig	2019-10-19 21:50:45 UTC
++++ src/bin/keactrl/keactrl.in
+@@ -517,8 +517,8 @@ ${args}" 1
+ 
+     status)
+         if [ -t 1 ]; then
+-            inactive="\e[91minactive\e[0m"
+-            active="\e[92mactive\e[0m"
++            inactive="\033[91minactive\033[0m"
++            active="\033[92mactive\033[0m"
+         else
+             inactive="inactive"
+             active="active"
--- pkg-plist	
+++ pkg-plist	
@@ -1,3 +1,8 @@ 
+@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample
+@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample
+@sample %%ETCDIR%%/kea-dhcp4.conf.sample
+@sample %%ETCDIR%%/kea-dhcp6.conf.sample
+@sample %%ETCDIR%%/keactrl.conf.sample
 include/kea/asiodns/asiodns_messages.h
 include/kea/asiodns/io_fetch.h
 include/kea/asiodns/logger.h
@@ -517,10 +522,5 @@ sbin/keactrl
 %%DATADIR%%/scripts/pgsql/upgrade_4.0_to_5.0.sh
 %%DATADIR%%/scripts/pgsql/upgrade_5.0_to_5.1.sh
 %%DATADIR%%/scripts/pgsql/wipe_data.sh
-@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample
-@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample
-@sample %%ETCDIR%%/kea-dhcp4.conf.sample
-@sample %%ETCDIR%%/kea-dhcp6.conf.sample
-@sample %%ETCDIR%%/keactrl.conf.sample
 @dir /var/db/kea
 @dir /var/run/kea