Index: head/dns/opendnssec13/Makefile
===================================================================
--- head/dns/opendnssec13/Makefile	(revision 362633)
+++ head/dns/opendnssec13/Makefile	(revision 362634)
@@ -1,79 +1,79 @@
 # Created by: Jaap Akkerhuis <jaap@NLnetLabs.nl>
 # $FreeBSD$
 
 PORTNAME=	opendnssec
-PORTVERSION=	1.3.17
-PORTREVISION=	1
+PORTVERSION=	1.3.18
 CATEGORIES=	dns
-MASTER_SITES=	http://dist.opendnssec.org/source/
+MASTER_SITES=	http://dist.opendnssec.org/source/ \
+	http://dist.opendnssec.org/source/testing/
 PKGNAMESUFFIX=	13
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Tool suite for maintaining DNSSEC
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	ldns>=1.6.16:${PORTSDIR}/dns/ldns
 LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns
 
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	opendnssec
 USE_GNOME=	libxml2
 USES=		perl5
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
 PLIST_SUB+=	USER=${USERS} GROUP=${GROUPS}
 
 CONFLICTS=	opendnssec-1.4*
 
 OPTIONS_DEFINE=		SOFTHSM AUDITOR MYSQL
 SOFTHSM_DESC=		SoftHSM cryptographic store for PKCS \#11 interface
 AUDITOR_DESC=		Build with Auditor
 OPTIONS_DEFAULT=	AUDITOR
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-database-backend=mysql
 USE_MYSQL=	compat
 PLIST_SUB+=	SQLITE="@comment "
 PLIST_SUB+=	MYSQL=""
 .else
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-database-backend=sqlite3
 USE_SQLITE=	yes
 BUILD_DEPENDS+=	sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3
 LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
 PLIST_SUB+=	SQLITE=""
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAUDITOR}
 BUILD_DEPENDS+=	rubygem-soap4r>=0:${PORTSDIR}/devel/rubygem-soap4r
 BUILD_DEPENDS+=	rubygem-dnsruby>=1.53:${PORTSDIR}/dns/rubygem-dnsruby
 USE_RUBY=	yes
 PLIST_SUB+=	AUDITOR=""
 .else
 CONFIGURE_ARGS+=	--disable-auditor
 PLIST_SUB+=	AUDITOR="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSOFTHSM}
 CONFIGURE_ARGS+=	--with-softhsm
-CONFIGURE_ARGS+=	--with-pkcs11-softhsm=${LOCALBASE}/lib/libsofthsm.so
+CONFIGURE_ARGS+=	--with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm.so
 RUN_DEPENDS+=	softhsm>=1.2.0:${PORTSDIR}/security/softhsm
 .endif
 
 PKGMESSAGE=	${WRKSRC}/MIGRATION
 
 pre-install:
 .if ${PORT_OPTIONS:MMYSQL}
 	@${REINPLACE_CMD} -e '/REQUIRE:/ s|$$| mysql|' ${WRKDIR}/opendnssec
 .endif
 
 .include <bsd.port.mk>
Index: head/dns/opendnssec13/distinfo
===================================================================
--- head/dns/opendnssec13/distinfo	(revision 362633)
+++ head/dns/opendnssec13/distinfo	(revision 362634)
@@ -1,2 +1,2 @@
-SHA256 (opendnssec-1.3.17.tar.gz) = 9f0dcfb53a3e10255b2d85e6a30663548eca1ec2e900b7cd5db9329f1710e323
-SIZE (opendnssec-1.3.17.tar.gz) = 1140751
+SHA256 (opendnssec-1.3.18.tar.gz) = e61d23ae0cc57b6e09d408bade6872fe5241896c61a03e8bc5ceeb65df13a676
+SIZE (opendnssec-1.3.18.tar.gz) = 1143889
Index: head/dns/opendnssec13/pkg-plist
===================================================================
--- head/dns/opendnssec13/pkg-plist	(revision 362633)
+++ head/dns/opendnssec13/pkg-plist	(revision 362634)
@@ -1,67 +1,69 @@
 %%AUDITOR%%bin/ods-auditor
+bin/ods-getconf
 bin/ods-hsmspeed
 bin/ods-hsmutil
 bin/ods-ksmutil
 %%AUDITOR%%bin/ods-kaspcheck
 bin/ods-kasp2html
 @sample %%ETCDIR%%/conf.xml.sample
 @sample %%ETCDIR%%/kasp.xml.sample
 @sample %%ETCDIR%%/zonefetch.xml.sample
 @sample %%ETCDIR%%/zonelist.xml.sample
 %%AUDITOR%%lib/opendnssec/kasp_auditor/auditor.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor/changed_config.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor/commands.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor/config.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor/key_tracker.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor/parse.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor/preparser.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor/partial_auditor.rb
 %%AUDITOR%%lib/opendnssec/kasp_checker.rb
 %%AUDITOR%%lib/opendnssec/time_shift.rb
 %%AUDITOR%%man/man1/ods-auditor.1.gz
 man/man1/ods-hsmspeed.1.gz
 man/man1/ods-hsmutil.1.gz
 %%AUDITOR%%man/man1/ods-kaspcheck.1.gz
 man/man1/ods-ksmutil.1.gz
 man/man5/ods-timing.5.gz
 man/man7/opendnssec.7.gz
 man/man8/ods-control.8.gz
 man/man8/ods-enforcerd.8.gz
+man/man8/ods-getconf.8.gz
 man/man8/ods-signer.8.gz
 man/man8/ods-signerd.8.gz
 sbin/ods-control
 sbin/ods-enforcerd
 sbin/ods-signer
 sbin/ods-signerd
 %%DATADIR%%/conf.rnc
 %%DATADIR%%/conf.rng
 %%SQLITE%%%%DATADIR%%/database_create.sqlite3
 %%MYSQL%%%%DATADIR%%/database_create.mysql
 %%DATADIR%%/kasp.rnc
 %%DATADIR%%/kasp.rng
 %%DATADIR%%/kasp2html.xsl
 %%DATADIR%%/signconf.rnc
 %%DATADIR%%/signconf.rng
 %%DATADIR%%/zonefetch.rnc
 %%DATADIR%%/zonefetch.rng
 %%DATADIR%%/zonelist.rnc
 %%DATADIR%%/zonelist.rng
 @dirrm var/opendnssec/unsigned
 @dirrm var/opendnssec/tmp
 @dirrm var/opendnssec/signed
 @dirrm var/opendnssec/signconf
 @dirrm var/opendnssec
 @dirrm %%DATADIR%%
 %%AUDITOR%%@dirrm lib/opendnssec/kasp_auditor
 %%AUDITOR%%@dirrm lib/opendnssec
 @dirrm %%ETCDIR%%
 @exec mkdir -p %D/var/run/opendnssec
 @exec mkdir -p %D/var/opendnssec/unsigned
 @exec mkdir -p %D/var/opendnssec/tmp
 @exec mkdir -p %D/var/opendnssec/signed
 @exec mkdir -p %D/var/opendnssec/signconf
 @exec chown -R %%USER%%:%%GROUP%% %D/var/opendnssec
 @dirrmtry var/run/opendnssec
 @dirrmtry var/run
 @dirrmtry var