Index: head/security/openssl_tpm_engine/Makefile
===================================================================
--- head/security/openssl_tpm_engine/Makefile	(revision 496140)
+++ head/security/openssl_tpm_engine/Makefile	(revision 496141)
@@ -1,49 +1,64 @@
 # Created by: Sebastian Schuetz <sschuetz@fhm.edu>
 # $FreeBSD$
 
 PORTNAME=	openssl_tpm_engine
 PORTVERSION=	0.5.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	OpenSSL TPM engine
 
 LICENSE=	OpenSSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/tcsd:security/trousers
 LIB_DEPENDS=	libtspi.so:security/trousers
 
 USES=		autoreconf gmake libtool localbase ssl pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 GH_ACCOUNT=	mgerstner
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl="${OPENSSLBASE}"
 SUB_FILES=	pkg-message
-PLIST_FILES=	bin/create_tpm_key \
-		lib/openssl/engines/tpm.so
+PLIST_FILES=	bin/create_tpm_key
 INSTALL_TARGET=	install-strip
 PORTEXAMPLES=	openssl.cnf.sample
 
 OPTIONS_DEFINE=	EXAMPLES
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT:Mlibressl*}
 IGNORE=	Detected LibreSSL (RAND_METHOD structure unsupported)
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' \
+	(${CAT} ${OPENSSLINC}/openssl/opensslv.h; \
+	 ${ECHO_CMD} "#if OPENSSL_VERSION_NUMBER < 0x10100000L"; \
+	 ${ECHO_CMD} "lib/openssl/engines/libtpm.so"; \
+	 ${ECHO_CMD} "#else"; \
+	 ${ECHO_CMD} "lib/openssl/engines/tpm.so"; \
+	 ${ECHO_CMD} "#endif"; \
+	) | ${CPP} | ${GREP} -v \# > ${WRKDIR}/.tpmso; \
+	${REINPLACE_CMD} "s|%%TPMSO%%|${PREFIX}/$$(cat ${WRKDIR}/.tpmso)|g" \
 	    ${WRKSRC}/dist/openssl.cnf.sample
+
+.if defined(INSTALL_AS_USER)
+_T=|| ${TRUE}
+.endif
+post-install:
+	(${CAT} ${WRKDIR}/.tpmso; \
+	${ECHO_CMD} "@postexec /usr/sbin/service ldconfig restart > /dev/null ${_T}" >> ${TMPPLIST}; \
+	${ECHO_CMD} "@postunexec /usr/sbin/service ldconfig restart > /dev/null ${_T}" >> ${TMPPLIST}; \
+	) >> ${TMPPLIST}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/dist/openssl.cnf.sample \
 	    ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
Index: head/security/openssl_tpm_engine/files/patch-dist-openssl.cnf.sample
===================================================================
--- head/security/openssl_tpm_engine/files/patch-dist-openssl.cnf.sample	(revision 496140)
+++ head/security/openssl_tpm_engine/files/patch-dist-openssl.cnf.sample	(revision 496141)
@@ -1,11 +1,11 @@
 --- dist/openssl.cnf.sample.orig	2017-12-18 15:45:34 UTC
 +++ dist/openssl.cnf.sample
 @@ -18,7 +18,7 @@ engines = engine_section
  foo = tpm_section
  
  [tpm_section]
 -dynamic_path = /usr/local/ssl/lib/engines/libtpm.so
-+dynamic_path = %%PREFIX%%/lib/openssl/engines/tpm.so
++dynamic_path = %%TPMSO%%
  engine_id = tpm
  default_algorithms = ALL
  #default_algorithms = RAND,RSA