Index: security/softhsm2/Makefile
===================================================================
--- security/softhsm2/Makefile	(revision 438501)
+++ security/softhsm2/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	softhsm
 PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://dist.opendnssec.org/source/ \
 		http://dist.opendnssec.org/source/testing/
@@ -14,17 +14,18 @@
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
-
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-sqlite3=${LOCALBASE} --localstatedir="${PREFIX}/var"
+CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var"
 INSTALL_TARGET=	install-strip
-USES=		libtool sqlite
+USES=		libtool
 
 CONFLICTS=	softhsm-1.*
 
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE= 	SQLITE
+SQLITE_DESC=		Build with object store backend DB support (SQLITE3)
+
 OPTIONS_SINGLE=		CRYP
 OPTIONS_SINGLE_CRYP=	CRYP_OPEN CRYP_BOTAN
 
@@ -33,6 +34,9 @@
 
 OPTIONS_DEFAULT=	CRYP_OPEN
 
+SQLITE_CONFIGURE_WITH= sqlite3=${LOCALBASE} objectstore-backend-db
+SQLITE_USES=sqlite
+
 CRYP_BOTAN_CONFIGURE_ON=	--with-crypto-backend=botan
 CRYP_BOTAN_LIB_DEPENDS=	libbotan-1.10.so:security/botan110
 CRYP_OPEN_USES=		ssl