Index: head/dns/opendnssec/Makefile
===================================================================
--- head/dns/opendnssec/Makefile	(revision 513770)
+++ head/dns/opendnssec/Makefile	(revision 513771)
@@ -1,91 +1,91 @@
 # Created by: Jaap Akkerhuis <jaap@NLnetLabs.nl>
 # $FreeBSD$
 
 PORTNAME=	opendnssec
 PORTVERSION=	1.4.14
 PORTREVISION=	2
 CATEGORIES=	dns
 MASTER_SITES=	http://dist.opendnssec.org/source/
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Tool suite for maintaining DNSSEC
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	ldns>=1.6.16:dns/ldns
 LIB_DEPENDS=	libldns.so:dns/ldns
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var"
 USE_RC_SUBR=	opendnssec
 USE_GNOME=	libxml2
 USES=		compiler:c11 perl5 ssl
 USE_LDCONFIG=	yes
 
 CONFLICTS=	opendnssec-1.[0-3]* opendnssec2-[0-9]*
 
 USERS=		opendnssec
 GROUPS=		opendnssec
 
 PORTDOCS=	KNOWN_ISSUES MIGRATION NEWS README.md
 
 OPTIONS_DEFINE=		SOFTHSM DOCS
 OPTIONS_SUB=		yes
 
 OPTIONS_SINGLE=		DB
 OPTIONS_SINGLE_DB=	MYSQL SQLITE
 OPTIONS_DEFAULT=	MYSQL
 
 SOFTHSM_DESC=		SoftHSM cryptographic store for PKCS \#11 interface
 
 MYSQL_DESC=		Use MYSQL backend
 SQLITE_DESC=		Use SQLite backend
 
 SQLITE_USE=	yes
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
 CONFIGURE_ARGS+=	--with-database-backend=mysql
 USES+=		mysql
 SCRIPTDATA=	migrate_adapters_1.mysql migrate_keyshare_mysql.pl \
 		migrate_zone_delete.mysql migrate_id_mysql.pl \
 		migrate_to_ng_mysql.pl migrate_1_4_8.mysql
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-database-backend=sqlite3
 BUILD_DEPENDS+=	sqlite3>=3.3.9:databases/sqlite3
 SCRIPTDATA=	database_create.sqlite3 migrate_keyshare_sqlite3.pl \
 		migrate_adapters_1.sqlite3 migrate_to_ng_sqlite.pl \
 		migrate_1_4_8.sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MSOFTHSM}
-CONFIGURE_ARGS+=	--with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm.so
-RUN_DEPENDS+=	softhsm>=1.2.0:security/softhsm
+CONFIGURE_ARGS+=	--with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm2.so
+RUN_DEPENDS+=	softhsm2>=2.5.0:security/softhsm2
 .endif
 
 SCRIPTDATA+=	convert_database.pl
 
 PKGMESSAGE=	${WRKSRC}/MIGRATION
 
 post-patch:
 	${REINPLACE_CMD} -e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" \
 		${WRKSRC}/configure
 
 pre-install:
 .if ${PORT_OPTIONS:MMYSQL}
 	@${REINPLACE_CMD} -e '/REQUIRE:/ s|$$| mysql|' ${WRKDIR}/opendnssec
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 		@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 .endif
 	${INSTALL_DATA} ${SCRIPTDATA:S|^|${WRKSRC}/enforcer/utils/|} ${STAGEDIR}${DATADIR}
 #	${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/var/opendnssec
 
 .include <bsd.port.mk>
Index: head/dns/opendnssec2/Makefile
===================================================================
--- head/dns/opendnssec2/Makefile	(revision 513770)
+++ head/dns/opendnssec2/Makefile	(revision 513771)
@@ -1,97 +1,97 @@
 # Created by: Jaap Akkerhuis <jaap@NLnetLabs.nl>
 # $FreeBSD$
 
 PORTNAME=	opendnssec
 PORTVERSION=	2.1.4
 PORTREVISION=	1
 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/libsofthsm.so
-SOFTHSM_RUN_DEPENDS=	softhsm>=1.2.0:security/softhsm
+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>