4 files changed, 75 insertions, 8 deletions

diff --git a/dns/opendnssec/Makefile b/dns/opendnssec/Makefile
index 5adeed64c23c..04ba4d986593 100644
--- a/dns/opendnssec/Makefile
+++ b/dns/opendnssec/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	opendnssec
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3.0
 CATEGORIES=	dns
 MASTER_SITES=	http://www.opendnssec.org/files/source/
 
@@ -14,13 +14,13 @@ MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Tool suite for maintaining DNSSEC
 
 BUILD_DEPENDS=	ldns>=1.6.9:${PORTSDIR}/dns/ldns \
-		rubygem-dnsruby>=1.52:${PORTSDIR}/dns/rubygem-dnsruby \
-		sqlite3>=3.4.2:${PORTSDIR}/databases/sqlite3
-LIB_DEPENDS=	ldns:${PORTSDIR}/dns/ldns \
-		sqlite3:${PORTSDIR}/databases/sqlite3
+		rubygem-dnsruby>=1.52:${PORTSDIR}/dns/rubygem-dnsruby
+LIB_DEPENDS=	ldns:${PORTSDIR}/dns/ldns
 
 GNU_CONFIGURE=	yes
+USE_RC_SUBR=	opendnssec
 USE_GNOME=	libxml2
+USE_OPENSSL=	yes
 USE_PERL5=	yes
 USE_RUBY=	yes
 USE_LDCONFIG=	yes
@@ -31,6 +31,30 @@ MAN5=		ods-timing.5
 MAN7=		opendnssec.7
 MAN8=		ods-control.8 ods-enforcerd.8 ods-signer.8 ods-signerd.8
 
+OPTIONS=	SOFTHSM "Build/update SOFTHSM as well." Off \
+		MYSQL "Use with (experimental) MYSQL support" Off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_MYSQL)
+CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-database-backend=mysql
+BUILD_DEPENDS+=	mysql-client>=5.0.3:${PORTSDIR}/databases/mysql50-client
+PLIST_SUB+=	SQLITE="@comment "
+PLIST_SUB+=	MYSQL=""
+.else
+BUILD_DEPENDS+=	sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
+PLIST_SUB+=	SQLITE=""
+PLIST_SUB+=	MYSQL="@comment "
+.endif
+
+.if defined(WITH_SOFTHSM)
+CONFIGURE_ARGS+=	--with-softhsm
+CONFIGURE_ARGS+=	--with-pkcs11-softhsm=${LOCALBASE}/lib/libsofthsm.so
+RUN_DEPENDS+=	softhsm>=1.2.0:${PORTSDIR}/security/softhsm
+.endif
+
 PKGMESSAGE=	${WRKSRC}/MIGRATION
 
 post-install:
diff --git a/dns/opendnssec/distinfo b/dns/opendnssec/distinfo
index 0581a082c530..a8048c37f7eb 100644
--- a/dns/opendnssec/distinfo
+++ b/dns/opendnssec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opendnssec-1.2.1.tar.gz) = 3463edd1bed103d7fa68493b3008259da0c950d8f1e45d4b90ab0e1106d29502
-SIZE (opendnssec-1.2.1.tar.gz) = 1649465
+SHA256 (opendnssec-1.3.0.tar.gz) = 624bb5ed2fe1ee0a158796e0b183430d1707430af8614740ad2f739abb5a1fb9
+SIZE (opendnssec-1.3.0.tar.gz) = 1072194
diff --git a/dns/opendnssec/files/opendnssec.in b/dns/opendnssec/files/opendnssec.in
new file mode 100644
index 000000000000..8c42a9074d96
--- /dev/null
+++ b/dns/opendnssec/files/opendnssec.in
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# 
+#
+# PROVIDE: opendnssec
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable nsd:
+#
+# opendnssec_enable="YES"
+#
+
+
+. /etc/rc.subr
+
+name=opendnssec
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
+opendnssec_enable=${opendnssec_enable-"NO"}
+
+start_cmd="${name}_start"
+stop_cmd="${name}_stop"
+extra_commands="reload ksm hsm signer enforcer"
+
+procname=${opendnssec_procname}
+
+
+opendnssec_start()
+{
+    %%PREFIX%%/sbin/ods-control start
+}
+
+opendnssec_stop()
+{
+    %%PREFIX%%/sbin/ods-control stop
+}
+
+run_rc_command "$1"
+
diff --git a/dns/opendnssec/pkg-plist b/dns/opendnssec/pkg-plist
index e852672d32ff..982357db2491 100644
--- a/dns/opendnssec/pkg-plist
+++ b/dns/opendnssec/pkg-plist
@@ -25,7 +25,8 @@ sbin/ods-signer
 sbin/ods-signerd
 %%DATADIR%%/conf.rnc
 %%DATADIR%%/conf.rng
-%%DATADIR%%/database_create.sqlite3
+%%SQLITE%%%%DATADIR%%/database_create.sqlite3
+%%MYSQL%%%%DATADIR%%/database_create.mysql
 %%DATADIR%%/kasp.rnc
 %%DATADIR%%/kasp.rng
 %%DATADIR%%/kasp2html.xsl