Index: head/security/opencryptoki/Makefile
===================================================================
--- head/security/opencryptoki/Makefile	(revision 416684)
+++ head/security/opencryptoki/Makefile	(revision 416685)
@@ -1,50 +1,55 @@
 # Created by: Ralf Meister
 # $FreeBSD$
 
 PORTNAME=	opencryptoki
 PORTVERSION=	3.5
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Open PKCS\#11 implementation library
 
 LICENSE=	CPL
 LICENSE_NAME=	Common Public License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libtspi.so:security/trousers
 
 USES=		alias autoreconf gmake libtool tar:tgz
 USE_LDCONFIG=	${PREFIX}/lib/opencryptoki
 WRKSRC=		${WRKDIR}/${PORTNAME}
 INSTALL_TARGET=	install-strip
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-swtok --enable-tpmtok \
 		--disable-crtok --disable-aeptok \
 		--disable-ccatok --disable-bcomtok \
 		--disable-pkcscca_migrate \
 		--with-lockdir=/var/run/opencryptoki \
 		--with-logdir=/var/log/opencryptoki \
 		--localstatedir=/var \
 		--with-pkcs11user=${USERS} \
 		--with-pkcs11group=${GROUPS} \
 		ac_cv_path_CHGRP=true
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_RC_SUBR=	pkcsslotd
 SUB_FILES=	pkg-message
 SUB_LIST=	USERS="${USERS}" GROUPS="${GROUPS}"
 PLIST_SUB=	USERS="${USERS}" GROUPS="${GROUPS}"
 USERS=		_pkcs11
 GROUPS=		_pkcs11
 
+OPTIONS_DEFINE=	LDAP
+OPTIONS_SUB=	yes
+LDAP_CONFIGURE_ENABLE=	icsf
+LDAP_USE=	OPENLDAP=yes
+
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/opencryptoki.conf \
 	    ${STAGEDIR}${ETCDIR}/opencryptoki.conf.sample
-	${RMDIR} ${STAGEDIR}/var/run/opencryptoki/swtok \
-	    ${STAGEDIR}/var/run/opencryptoki/tpm \
+	${RMDIR} ${STAGEDIR}/var/run/opencryptoki/* \
 	    ${STAGEDIR}/var/run/opencryptoki
 
 .include <bsd.port.mk>
Index: head/security/opencryptoki/files/pkcsslotd.in
===================================================================
--- head/security/opencryptoki/files/pkcsslotd.in	(revision 416684)
+++ head/security/opencryptoki/files/pkcsslotd.in	(revision 416685)
@@ -1,34 +1,35 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: pkcsslotd
 # REQUIRE: LOGIN tcsd
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # pkcsslotd_enable (bool): Set to NO by default.
 #                          Set it to YES to enable pkcsslotd.
 #
 
 . /etc/rc.subr
 
 name=pkcsslotd
 rcvar=${name}_enable
 command="%%PREFIX%%/sbin/$name"
 start_precmd=${name}_prestart
 
 pkcsslotd_prestart () {
 	install -d -o %%USERS%% -g %%GROUPS%% -m 0755 \
 	    /var/run/opencryptoki/swtok \
-	    /var/run/opencryptoki/tpm
+	    /var/run/opencryptoki/tpm \
+	    /var/run/opencryptoki/icsf
 }
 
 load_rc_config $name
 
 : ${pkcsslotd_enable="NO"}
 
 run_rc_command "$1"
 
Index: head/security/opencryptoki/pkg-plist
===================================================================
--- head/security/opencryptoki/pkg-plist	(revision 416684)
+++ head/security/opencryptoki/pkg-plist	(revision 416685)
@@ -1,36 +1,42 @@
 @sample etc/opencryptoki/opencryptoki.conf.sample
 include/opencryptoki/apiclient.h
 include/opencryptoki/pkcs11.h
 include/opencryptoki/pkcs11types.h
 lib/opencryptoki/PKCS11_API.so
 lib/opencryptoki/libopencryptoki.so
 lib/opencryptoki/libopencryptoki.so.0
 lib/opencryptoki/libopencryptoki.so.0.0.0
 lib/opencryptoki/methods
+%%LDAP%%lib/opencryptoki/stdll/PKCS11_ICSF.so
 lib/opencryptoki/stdll/PKCS11_SW.so
 lib/opencryptoki/stdll/PKCS11_TPM.so
 lib/opencryptoki/stdll/libpkcs11_sw.so
 lib/opencryptoki/stdll/libpkcs11_sw.so.0
 lib/opencryptoki/stdll/libpkcs11_sw.so.0.0.0
 lib/opencryptoki/stdll/libpkcs11_tpm.so
 lib/opencryptoki/stdll/libpkcs11_tpm.so.0
 lib/opencryptoki/stdll/libpkcs11_tpm.so.0.0.0
+%%LDAP%%lib/opencryptoki/stdll/libpkcs11_icsf.so.0.0.0
+%%LDAP%%lib/opencryptoki/stdll/libpkcs11_icsf.so.0
+%%LDAP%%lib/opencryptoki/stdll/libpkcs11_icsf.so
 lib/pkcs11/PKCS11_API.so
 lib/pkcs11/libopencryptoki.so
 lib/pkcs11/methods
 lib/pkcs11/stdll
 man/man1/pkcscca.1.gz
 man/man1/pkcsconf.1.gz
 man/man1/pkcsep11_migrate.1.gz
 man/man1/pkcsicsf.1.gz
 man/man5/opencryptoki.conf.5.gz
 man/man7/opencryptoki.7.gz
 man/man8/pkcsslotd.8.gz
 sbin/pkcsconf
+%%LDAP%%sbin/pkcsicsf
 sbin/pkcsslotd
+%%LDAP%%@dir(%%USERS%%,%%GROUPS%%,700) /var/lib/opencryptoki/icsf
 @dir(%%USERS%%,%%GROUPS%%,700) /var/lib/opencryptoki/swtok/TOK_OBJ
 @dir(%%USERS%%,%%GROUPS%%,700) /var/lib/opencryptoki/swtok
 @dir(%%USERS%%,%%GROUPS%%,700) /var/lib/opencryptoki/tpm
 @dir(%%USERS%%,%%GROUPS%%,700) /var/lib/opencryptoki
 @dir /var/lib
 @dir /var/log/opencryptoki