--- Makefile	(revision 525801)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	opendnssec
-PORTVERSION=	2.1.4
-PORTREVISION=	1
+PORTVERSION=	2.1.6
 CATEGORIES=	dns
 MASTER_SITES=	http://dist.opendnssec.org/source/
 PKGNAMESUFFIX=	2
--- distinfo	(revision 525801)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1558098992
-SHA256 (opendnssec-2.1.4.tar.gz) = 77e85e417d1067a5e4529b636248875a9e2d1925d5e90f022449007e59d6a293
-SIZE (opendnssec-2.1.4.tar.gz) = 1119991
+TIMESTAMP = 1581416801
+SHA256 (opendnssec-2.1.6.tar.gz) = b2c0caa673b8cfef73585dedf276997f5ca69bb3d523ce4e080f70dfcb23c56c
+SIZE (opendnssec-2.1.6.tar.gz) = 1122405
--- files/opendnssec.in	(revision 525801)
+++ files/opendnssec.in	(working copy)
@@ -10,6 +10,8 @@ 
 #
 # opendnssec_enable="YES"
 
+ODS_CONTROL=%%PREFIX%%/sbin/ods-control
+
 . /etc/rc.subr
 
 name=opendnssec
@@ -21,13 +23,34 @@ 
 
 start_cmd="${name}_run start"
 stop_cmd="${name}_run stop"
-extra_commands="reload ksm hsm signer enforcer"
+restart_cmd="${name}_restart"
+status_cmd="${name}_status"
+reload_cmd="${name}_reload"
+extra_commands="reload status"
 
-procname=${opendnssec_procname}
-
 opendnssec_run()
 {
-    %%PREFIX%%/sbin/ods-control $1
+    $ODS_CONTROL $1
 }
 
+opendnssec_restart()
+{
+    $ODS_CONTROL stop
+    $ODS_CONTROL start
+}
+
+opendnssec_reload()
+{
+    echo "OpenDNSSEC reloading:"
+    echo -n "  Signer  : "; $ODS_CONTROL signer reload
+    echo -n "  Enforcer: "; $ODS_CONTROL enforcer reload
+}
+
+opendnssec_status()
+{
+    echo "OpenDNSSEC status:"
+    echo -n "  Signer  : "; $ODS_CONTROL signer running
+    echo -n "  Enforcer: "; $ODS_CONTROL enforcer running
+}
+
 run_rc_command "$1"