Index: head/security/softhsm2/Makefile
===================================================================
--- head/security/softhsm2/Makefile	(revision 475431)
+++ head/security/softhsm2/Makefile	(revision 475432)
@@ -1,64 +1,68 @@
 # Created by: Jaap Akkerhuis <jaap@NLnetLabs.nl>
 # $FreeBSD$
 
 PORTNAME=	softhsm
 PORTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://dist.opendnssec.org/source/ \
 		http://dist.opendnssec.org/source/testing/
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Software implementation of a Hardware Security Module (HSM)
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		libtool ssl pkgconfig
 
 SUB_FILES=	pkg-message
 
 CONFLICTS=	softhsm-1.*
 
 USE_LDCONFIG=	yes
 
 LIB_DEPENDS+=		libcppunit.so:devel/cppunit
 
-OPTIONS_DEFINE=		SQLITE
+OPTIONS_DEFINE=		SQLITE MIGRATE
+MIGRATE_IMPLIES=	SQLITE
 OPTIONS_SUB=		yes
 SQLITE_DESC=		Build with object store backend DB support (SQLITE3)
+MIGRATE_DESC=		Build the migration tool
 
 OPTIONS_SINGLE=		CRYP
 OPTIONS_SINGLE_CRYP=	CRYP_OPEN CRYP_BOTAN
 
 CRYP_OPEN_DESC=		Build with OpenSSL crypto library
 CRYP_BOTAN_DESC=	Build with Botan crypto library
 
-OPTIONS_DEFAULT=	CRYP_OPEN
+OPTIONS_DEFAULT=	CRYP_OPEN SQLITE MIGRATE
 
 SQLITE_CONFIGURE_WITH=	sqlite3=${LOCALBASE} objectstore-backend-db
 SQLITE_USES=		sqlite
+MIGRATE_CONFIGURE_WITH=	migrate
 
 CRYP_BOTAN_CONFIGURE_ON=	--with-crypto-backend=botan
 CRYP_BOTAN_LIB_DEPENDS=	libbotan-1.10.so:security/botan110
 
 CRYP_OPEN_CONFIGURE_ON=	--with-crypto-backend=openssl
 
 .include <bsd.port.options.mk>
 
 .if ${SSL_DEFAULT:Mlibressl*} || ${SSL_DEFAULT:Mopenssl-devel}
 CONFIGURE_ARGS+=	--disable-gost
 .endif
 
 .if ${SSL_DEFAULT:Mopenssl-devel}
 CONFIGURE_ARGS+=	--disable-gost
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/p11-kit/modules
 	${INSTALL_DATA} ${WRKSRC}/softhsm2.module \
 		${STAGEDIR}${PREFIX}/share/p11-kit/modules
 
 .include <bsd.port.mk>
Index: head/security/softhsm2/pkg-plist
===================================================================
--- head/security/softhsm2/pkg-plist	(revision 475431)
+++ head/security/softhsm2/pkg-plist	(revision 475432)
@@ -1,18 +1,20 @@
 bin/softhsm2-dump-file
 %%SQLITE%%bin/softhsm2-dump-db
 bin/softhsm2-keyconv
+%%MIGRATE%%bin/softhsm2-migrate
 bin/softhsm2-util
 @sample %%ETCDIR%%2.conf.sample
 lib/softhsm/libsofthsm2.a
 lib/softhsm/libsofthsm2.so
 man/man1/softhsm2-dump-file.1.gz
 %%SQLITE%%man/man1/softhsm2-dump-db.1.gz
 man/man1/softhsm2-keyconv.1.gz
+%%MIGRATE%%man/man1/softhsm2-migrate.1.gz
 man/man1/softhsm2-util.1.gz
 man/man5/softhsm2.conf.5.gz
 @dir /var/lib/softhsm/tokens
 @dir /var/lib/softhsm
 @dir /var/lib
 @dir share/p11-kit/modules
 @dir share
 share/p11-kit/modules/softhsm2.module