Index: head/security/softhsm2/Makefile
===================================================================
--- head/security/softhsm2/Makefile	(revision 386126)
+++ head/security/softhsm2/Makefile	(revision 386127)
@@ -1,51 +1,55 @@
 # Created by: Jaap Akkerhuis <jaap@NLnetLabs.nl>
 # $FreeBSD$
 
 PORTNAME=	softhsm
-PORTVERSION=	2.0.0.b1
+PORTVERSION=	2.0.0.b3
 CATEGORIES=	security
 MASTER_SITES=	http://dist.opendnssec.org/source/ \
 		http://dist.opendnssec.org/source/testing/
 PKGNAMESUFFIX=	2
-DISTNAME=	softhsm-2.0.0b1
+DISTNAME=	softhsm-2.0.0b3
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Software implementation of a Hardware Security Module (HSM)
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sqlite3=${LOCALBASE} --localstatedir="${PREFIX}/var"
 INSTALL_TARGET=	install-strip
 USES=		libtool
 
 CONFLICTS=	softhsm-1.*
 
 USE_LDCONFIG=	yes
 USE_SQLITE=	yes
 
 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
 
 CRYP_BOTAN_CONFIGURE_WITH=	crypto-backend=botan
+
+.if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl
+CONFIGURE_ARGS+=	--disable-gost
+.endif
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCRYP_BOTAN}
 LIB_DEPENDS+=	libbotan-1.10.so:${PORTSDIR}/security/botan110
 .endif
 
 .if ${PORT_OPTIONS:MCRYP_OPEN}
 USE_OPENSSL=	yes
 WITH_OPENSSL_PORT=	yes
 CONFIGURE_ARGS+=	--with-crypto-backend=openssl
 .endif
 
 .include <bsd.port.mk>
Index: head/security/softhsm2/distinfo
===================================================================
--- head/security/softhsm2/distinfo	(revision 386126)
+++ head/security/softhsm2/distinfo	(revision 386127)
@@ -1,2 +1,2 @@
-SHA256 (softhsm-2.0.0b1.tar.gz) = b72ffae3feadbc669eecb58f4da5dce7e5124e666173e816ae58f98824515ae6
-SIZE (softhsm-2.0.0b1.tar.gz) = 922134
+SHA256 (softhsm-2.0.0b3.tar.gz) = 390b81f88dd4fe1035b54b42188dfd5a8ba768649129ccc7a3634fbf9454a7e8
+SIZE (softhsm-2.0.0b3.tar.gz) = 945279
Index: head/security/softhsm2/pkg-plist
===================================================================
--- head/security/softhsm2/pkg-plist	(revision 386126)
+++ head/security/softhsm2/pkg-plist	(revision 386127)
@@ -1,17 +1,16 @@
 bin/softhsm2-dump-file
 bin/softhsm2-keyconv
 bin/softhsm2-util
 %%ETCDIR%%2.conf
 %%ETCDIR%%2.conf.sample
 lib/softhsm/libsofthsm2.a
 lib/softhsm/libsofthsm2.so
-man/man1/softhsm2-dump-db.1.gz
 man/man1/softhsm2-dump-file.1.gz
 man/man1/softhsm2-keyconv.1.gz
 man/man1/softhsm2-util.1.gz
 man/man5/softhsm2.conf.5.gz
 @dir lib/softhsm
 @dir var/lib/softhsm/tokens
 @dir var/lib/softhsm
 @dir var/lib
 @dir var