Index: head/security/softhsm2/Makefile
===================================================================
--- head/security/softhsm2/Makefile	(revision 448253)
+++ head/security/softhsm2/Makefile	(revision 448254)
@@ -1,52 +1,60 @@
 # Created by: Jaap Akkerhuis <jaap@NLnetLabs.nl>
 # $FreeBSD$
 
 PORTNAME=	softhsm
 PORTVERSION=	2.3.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
-CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var"
 INSTALL_TARGET=	install-strip
-USES=		libtool ssl
+USES=		libtool ssl pkgconfig
 
+SUB_FILES=	pkg-message
+
 CONFLICTS=	softhsm-1.*
 
 USE_LDCONFIG=	yes
 
+LIB_DEPENDS+=		libcppunit.so:devel/cppunit
+
 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
 
 CRYP_OPEN_DESC=		Build with OpenSSL crypto library
 CRYP_BOTAN_DESC=	Build with Botan crypto library
 
 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_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
 
 .include <bsd.port.mk>
Index: head/security/softhsm2/files/pkg-message.in
===================================================================
--- head/security/softhsm2/files/pkg-message.in	(nonexistent)
+++ head/security/softhsm2/files/pkg-message.in	(revision 448254)
@@ -0,0 +1,2 @@
+As of version 2.3.0_1, the storage directory for softhsm has changed from
+/usr/local/var/lib/softhsm to /var/lib/softhsm

Property changes on: head/security/softhsm2/files/pkg-message.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/security/softhsm2/pkg-plist
===================================================================
--- head/security/softhsm2/pkg-plist	(revision 448253)
+++ head/security/softhsm2/pkg-plist	(revision 448254)
@@ -1,17 +1,15 @@
 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
-@dir lib/softhsm
-@dir var/lib/softhsm/tokens
-@dir var/lib/softhsm
-@dir var/lib
-@dir var
+@dir /var/lib/softhsm/tokens
+@dir /var/lib/softhsm
+@dir /var/lib