Index: head/security/softhsm2/Makefile
===================================================================
--- head/security/softhsm2/Makefile	(revision 483670)
+++ head/security/softhsm2/Makefile	(revision 483671)
@@ -1,68 +1,73 @@
 # Created by: Jaap Akkerhuis <jaap@NLnetLabs.nl>
 # $FreeBSD$
 
 PORTNAME=	softhsm
-PORTVERSION=	2.4.0
+PORTVERSION=	2.5.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 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 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
+
+# openssl-1.1.1 (default after 1200080) doesn't  support GHOST (yet), punt for now. 
+.if ${OSVERSION}>=1200080
 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/distinfo
===================================================================
--- head/security/softhsm2/distinfo	(revision 483670)
+++ head/security/softhsm2/distinfo	(revision 483671)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519738695
-SHA256 (softhsm-2.4.0.tar.gz) = 26aac12bdeaacd15722dc0a24a5a1981a3b711e61d10ac687a23ff0b7075da07
-SIZE (softhsm-2.4.0.tar.gz) = 1042566
+TIMESTAMP = 1540213808
+SHA256 (softhsm-2.5.0.tar.gz) = 92aa56cf45e25892326e98b851c44de9cac8559e208720e579bf8e2cd1c132b2
+SIZE (softhsm-2.5.0.tar.gz) = 1078439