Index: head/dns/opendnssec2/Makefile
===================================================================
--- head/dns/opendnssec2/Makefile	(revision 525889)
+++ head/dns/opendnssec2/Makefile	(revision 525890)
@@ -1,97 +1,96 @@
 # Created by: Jaap Akkerhuis <jaap@NLnetLabs.nl>
 # $FreeBSD$
 
 PORTNAME=	opendnssec
-PORTVERSION=	2.1.4
-PORTREVISION=	1
+PORTVERSION=	2.1.6
 CATEGORIES=	dns
 MASTER_SITES=	http://dist.opendnssec.org/source/
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Tool suite for maintaining DNSSEC
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	ldns>=1.6.16:dns/ldns
 LIB_DEPENDS=	libldns.so:dns/ldns
 
 USES=		ssl gnome
 USE_RC_SUBR=	opendnssec
 USE_GNOME=	libxml2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var" \
 		--with-ssl=${OPENSSLBASE}
 
 SUB_FILES=	pkg-message
 
 CONFLICTS=	opendnssec-1.[0-4]*
 
 USERS=		opendnssec
 GROUPS=		opendnssec
 
 PORTDOCS=	MIGRATION NEWS README.md
 MIGRATE=	README.md find_problematic_zones.sql \
 		convert_mysql mysql_convert.sql \
 		convert_sqlite sqlite_convert.sql
 CONVERT=	convert_mysql_to_sqlite convert_sqlite_to_mysql
 SCHEMAS=	schema.mysql schema.sqlite
 
 OPTIONS_DEFINE=		SOFTHSM DOCS
 OPTIONS_DEFAULT=	SQLITE
 OPTIONS_SUB=		yes
 
 OPTIONS_SINGLE=		DB
 OPTIONS_SINGLE_DB=	SQLITE MYSQL
 
 SOFTHSM_DESC=		SoftHSM cryptographic store for PKCS \#11 interface
 
 MYSQL_DESC=		Use MYSQL backend
 SQLITE_DESC=		Use SQLite backend
 
 MYSQL_CONFIGURE_ON=	--with-enforcer-database=mysql
 MYSQL_USES=		mysql
 
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-enforcer-database=sqlite3
 SQLITE_BUILD_DEPENDS=	sqlite3>=3.3.9:databases/sqlite3
 
 SOFTHSM_CONFIGURE_ON=	--with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm2.so
 SOFTHSM_RUN_DEPENDS=	softhsm2>=2.5.0:security/softhsm2
 
 post-patch:
 	${REINPLACE_CMD} -e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" \
 		${WRKSRC}/configure
 
 pre-install-MYSQL-on:
 	${REINPLACE_CMD} -e '/REQUIRE:/ s|$$| mysql|' ${WRKDIR}/opendnssec
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert
 	${INSTALL_DATA} \
 		${MIGRATE:S|^|${WRKSRC}/enforcer/utils/1.4-2.0_db_convert/|} \
 		${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert
 	${INSTALL_DATA} \
 		${CONVERT:S|^|${WRKSRC}/enforcer/utils/|} \
 		${STAGEDIR}${DOCSDIR}
 	${REINPLACE_CMD} -e 's|enforcer/utils/|${DOCSDIR}/|' \
 		${STAGEDIR}${DOCSDIR}/MIGRATION
 	${INSTALL_DATA} \
 		${SCHEMAS:S|^|${WRKSRC}/enforcer/src/db/|} \
 		${STAGEDIR}${DOCSDIR}
 	${REINPLACE_CMD} -e 's|../src/db/schema|${DOCSDIR}/schema|' \
 		-e 's|mysql_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		-e 's|sqlite_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		-e 's|find_problematic_zones.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		${STAGEDIR}${DOCSDIR}/convert_*
 	${REINPLACE_CMD} -e 's|../../src/db/schema|${DOCSDIR}/schema|' \
 		-e 's|mysql_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		-e 's|sqlite_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		-e 's|find_problematic_zones.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert/convert_*
 
 .include <bsd.port.mk>
Index: head/dns/opendnssec2/distinfo
===================================================================
--- head/dns/opendnssec2/distinfo	(revision 525889)
+++ head/dns/opendnssec2/distinfo	(revision 525890)
@@ -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
Index: head/dns/opendnssec2/files/opendnssec.in
===================================================================
--- head/dns/opendnssec2/files/opendnssec.in	(revision 525889)
+++ head/dns/opendnssec2/files/opendnssec.in	(revision 525890)
@@ -1,33 +1,56 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: opendnssec
 # REQUIRE: LOGIN DAEMON
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable opendnssec:
 #
 # opendnssec_enable="YES"
 
+ODS_CONTROL=%%PREFIX%%/sbin/ods-control
+
 . /etc/rc.subr
 
 name=opendnssec
 rcvar=opendnssec_enable
 
 load_rc_config $name
 
 opendnssec_enable=${opendnssec_enable:-"NO"}
 
 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"