2 files changed, 29 insertions, 2 deletions

diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index c56f9e3ff9aa..699733b59818 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -56,7 +56,7 @@ BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 
 PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
+PORTREVISION_SERVER=	1
 OPENLDAP_SHLIB_MAJOR=	2
 OPENLDAP_SHLIB_MINOR=	10.8
 OPENLDAP_MAJOR=		${DISTVERSION:R}
@@ -75,6 +75,7 @@ OPTIONS_DEFINE+=	REFINT RETCODE RWM SEQMOD SSSVLV SYNCPROV TRANSLUCENT
 OPTIONS_DEFINE+=	UNIQUE VALSORT SMBPWD SHA2 DYNAMIC_BACKENDS SASL
 OPTIONS_DEFINE+=	LMPASSWD
 OPTIONS_DEFINE+=	OUTLOOK
+OPTIONS_DEFINE+=	LASTBIND
 
 OPTIONS_DEFAULT=	MDB SYNCPROV DYNAMIC_BACKENDS
 
@@ -119,6 +120,7 @@ SHA2_DESC=		With SHA2 Password hashes overlay
 LMPASSWD_DESC=		With LM hash password support (DEPRECATED)
 DYNAMIC_BACKENDS_DESC=	Build dynamic backends
 OUTLOOK_DESC=		Force caseIgnoreOrderingMatch on name attribute (experimental)
+LASTBIND_DESC=		With lastbind overlay
 .endif
 
 .if defined(CLIENT_ONLY)
@@ -351,6 +353,10 @@ CONFIGURE_ARGS+=	--enable-aci
 CONFIGURE_ARGS+=	--enable-dynacl
 .endif
 
+.if ${PORT_OPTIONS:MLASTBIND}
+CONFIGURE_ARGS+=	--enable-lastbind
+.endif
+
 .if !${PORT_OPTIONS:MBDB}
 CONFIGURE_ARGS+=	--disable-bdb \
 			--disable-hdb
@@ -449,6 +455,12 @@ PLIST_SUB+=		SHA2=""
 PLIST_SUB+=		SHA2="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MLASTBIND}
+PLIST_SUB+=		LASTBIND=""
+.else
+PLIST_SUB+=		LASTBIND="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MRLOOKUPS}
 CONFIGURE_ARGS+=	--enable-rlookups
 PLIST_SUB+=		RLOOKUPS=""
@@ -552,6 +564,11 @@ post-build:
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} prefix="${PREFIX}" all)
 .endif
+.if ${PORT_OPTIONS:MLASTBIND}
+	@(cd ${BUILD_WRKSRC}/contrib/slapd-modules/lastbind && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+		${MAKE_ARGS} prefix="${PREFIX}" all)
+.endif
 .endif
 
 pre-install:
@@ -588,6 +605,12 @@ post-install:
 		${MAKE_ARGS} prefix="${PREFIX}" install)
 	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/pw-sha2.a
 .endif
+.if ${PORT_OPTIONS:MLASTBIND}
+	@(cd ${WRKSRC}/contrib/slapd-modules/lastbind && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+		${MAKE_ARGS} prefix="${PREFIX}" install)
+	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/lastbind.a
+.endif
 .if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSMBPWD} || ${PORT_OPTIONS:MSHA2}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so
 .endif
diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist
index f75c31917676..70d0310b557f 100644
--- a/net/openldap24-server/pkg-plist
+++ b/net/openldap24-server/pkg-plist
@@ -34,7 +34,7 @@
 %%SLAPI%%lib/libslapi.a
 %%SLAPI%%lib/libslapi.la
 %%SLAPI%%lib/libslapi.so
-%%MODULES%%@exec mkdir -p %D/libexec/openldap
+%%MODULES%%@preexec mkdir -p %D/libexec/openldap
 %%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%BACK_BDB%%libexec/openldap/back_bdb.la
@@ -99,6 +99,10 @@
 %%SMBPWD%%libexec/openldap/smbk5pwd.so
 %%SMBPWD%%libexec/openldap/smbk5pwd.so.0
 %%SMBPWD%%libexec/openldap/smbk5pwd.so.0.0.0
+%%LASTBIND%%libexec/openldap/lastbind.la
+%%LASTBIND%%libexec/openldap/lastbind.so
+%%LASTBIND%%libexec/openldap/lastbind.so.0
+%%LASTBIND%%libexec/openldap/lastbind.so.0.0.0
 libexec/slapd
 man/man5/slapd-bdb.5.gz
 man/man5/slapd-config.5.gz