Index: head/security/softhsm2/Makefile
===================================================================
--- head/security/softhsm2/Makefile
+++ head/security/softhsm2/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	softhsm
-PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTVERSION=	2.3.0
 CATEGORIES=	security
 MASTER_SITES=	http://dist.opendnssec.org/source/ \
 		http://dist.opendnssec.org/source/testing/
@@ -13,18 +12,21 @@
 COMMENT=	Software implementation of a Hardware Security Module (HSM)
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-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 ssl
 
 CONFLICTS=	softhsm-1.*
 
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=		SQLITE
+OPTIONS_SUB=		yes
+SQLITE_DESC=		Build with object store backend DB support (SQLITE3)
+
 OPTIONS_SINGLE=		CRYP
 OPTIONS_SINGLE_CRYP=	CRYP_OPEN CRYP_BOTAN
 
@@ -33,14 +35,21 @@
 
 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
+
 CRYP_OPEN_CONFIGURE_ON=	--with-crypto-backend=openssl
 
 .include <bsd.port.options.mk>
 
 .if ${SSL_DEFAULT:Mlibressl*}
+CONFIGURE_ARGS+=	--disable-gost
+.endif
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
 CONFIGURE_ARGS+=	--disable-gost
 .endif
 
Index: head/security/softhsm2/distinfo
===================================================================
--- head/security/softhsm2/distinfo
+++ head/security/softhsm2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480976612
-SHA256 (softhsm-2.2.0.tar.gz) = eb6928ae08da44fca4135d84d6b79ad7345f408193208c54bf69f5b2e71f85f7
-SIZE (softhsm-2.2.0.tar.gz) = 966806
+TIMESTAMP = 1499110463
+SHA256 (softhsm-2.3.0.tar.gz) = 5ed604c89a3a6ef9d7d1ee92c28a2c4b3cd1f86f302c808e2d12c8f39aa2c127
+SIZE (softhsm-2.3.0.tar.gz) = 992417
Index: head/security/softhsm2/files/patch-src_lib_object__store_DB.h
===================================================================
--- head/security/softhsm2/files/patch-src_lib_object__store_DB.h
+++ head/security/softhsm2/files/patch-src_lib_object__store_DB.h
@@ -0,0 +1,10 @@
+--- src/lib/object_store/DB.h.orig	2017-07-13 14:38:02 UTC
++++ src/lib/object_store/DB.h
+@@ -37,6 +37,7 @@
+ 
+ #include <string>
+ #include <sqlite3.h>
++#include <time.h>
+ 
+ namespace DB {
+ 
Index: head/security/softhsm2/pkg-plist
===================================================================
--- head/security/softhsm2/pkg-plist
+++ head/security/softhsm2/pkg-plist
@@ -1,10 +1,12 @@
 bin/softhsm2-dump-file
+%%SQLITE%%bin/softhsm2-dump-db
 bin/softhsm2-keyconv
 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
 man/man1/softhsm2-util.1.gz
 man/man5/softhsm2.conf.5.gz