net/openldap24-server: Cleanup and make better use of options framework.

While there also add the following contrib/ overlaies:

 - addpartial
 - allop
 - autogroup
 - cloak
 - denyop
 - lastmod
 - nops
 - trace

2 files changed, 356 insertions, 387 deletions

diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 160ac1f471b1..6146a8c82b34 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -19,7 +19,7 @@ MASTER_SITE_SUBDIR=	openldap-release
 .if defined(CLIENT_ONLY)
 PKGNAMESUFFIX=		-client
 .else
-PKGNAMESUFFIX?=		-server
+PKGNAMESUFFIX=		-server
 .endif
 
 MAINTAINER=		delphij@FreeBSD.org
@@ -34,19 +34,11 @@ LICENSE_NAME=		OpenLDAP Public License
 LICENSE_FILE=		${WRKSRC}/LICENSE
 LICENSE_PERMS=		dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-.if defined(CLIENT_ONLY)
-CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-35-9].*
-.endif
+CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-2.[0-35-9].*
 
 GNU_CONFIGURE=		yes
 # :keepla because port uses lt_dlopen
 USES=			cpe libtool:keepla ssl tar:tgz
-.if !defined(CLIENT_ONLY)
-USERS=			ldap
-GROUPS=			ldap
-LDAP_USER?=		ldap
-LDAP_GROUP?=		ldap
-.endif
 
 WANT_OPENLDAP_VER?=	24
 .if ${WANT_OPENLDAP_VER} != 24
@@ -54,7 +46,7 @@ BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 
 PORTREVISION_CLIENT=	1
-PORTREVISION_SERVER=	1
+PORTREVISION_SERVER=	2
 OPENLDAP_SHLIB_MAJOR=	2
 OPENLDAP_SHLIB_MINOR=	11.7
 OPENLDAP_MAJOR=		${DISTVERSION:R}
@@ -64,30 +56,63 @@ OPTIONS_DEFINE=		DEBUG FETCH GSSAPI
 FETCH_DESC=		Enable fetch(3) support
 GSSAPI_DESC=		With GSSAPI support
 
+FETCH_CONFIGURE_WITH=	fetch
+GSSAPI_RUN_DEPENDS=	cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
+
 .if defined(CLIENT_ONLY)
 OPTIONS_DEFINE+=	DOCS
 .else
-OPTIONS_DEFINE+=	DYNACL ACI BDB MDB DNSSRV PASSWD PERL RELAY SHELL
-OPTIONS_DEFINE+=	SOCK ODBC RLOOKUPS SLP SLAPI TCP_WRAPPERS
-OPTIONS_DEFINE+=	ACCESSLOG AUDITLOG COLLECT CONSTRAINT DDS
-OPTIONS_DEFINE+=	DEREF DYNGROUP DYNLIST MEMBEROF PPOLICY PCACHE
-OPTIONS_DEFINE+=	REFINT RETCODE RWM SEQMOD SSSVLV SYNCPROV TRANSLUCENT
-OPTIONS_DEFINE+=	UNIQUE VALSORT SMBPWD SHA2 DYNAMIC_BACKENDS
+OPTIONS_GROUP=		BKNDS OVLYS
+BKNDS_DESC=		OpenLDAP backends
+BKNDS_DEFAULTS=		DNSSRV MDB PASSWD RELAY ODBC SOCK
+OPTIONS_GROUP_BKNDS+=	${BKNDS_DEFAULTS}
+OPTIONS_GROUP_BKNDS+=	BDB PERL SHELL
+
+OVLYS_DESC=		OpenLDAP overlays
+OPTIONS_GROUP_OVLYS+=	ACCESSLOG
+OPTIONS_GROUP_OVLYS+=	ADDPARTIAL
+OPTIONS_GROUP_OVLYS+=	ALLOP
+OPTIONS_GROUP_OVLYS+=	AUDITLOG
+OPTIONS_GROUP_OVLYS+=	AUTOGROUP
+OPTIONS_GROUP_OVLYS+=	CLOAK
+OPTIONS_GROUP_OVLYS+=	COLLECT
+OPTIONS_GROUP_OVLYS+=	CONSTRAINT
+OPTIONS_GROUP_OVLYS+=	DDS
+OPTIONS_GROUP_OVLYS+=	DENYOP
+OPTIONS_GROUP_OVLYS+=	DEREF
+OPTIONS_GROUP_OVLYS+=	DYNGROUP
+OPTIONS_GROUP_OVLYS+=	DYNLIST
+OPTIONS_GROUP_OVLYS+=	LASTBIND
+OPTIONS_GROUP_OVLYS+=	LASTMOD
+OPTIONS_GROUP_OVLYS+=	MEMBEROF
+OPTIONS_GROUP_OVLYS+=	NOPS
+OPTIONS_GROUP_OVLYS+=	PCACHE
+OPTIONS_GROUP_OVLYS+=	PPOLICY
+OPTIONS_GROUP_OVLYS+=	REFINT
+OPTIONS_GROUP_OVLYS+=	RETCODE
+OPTIONS_GROUP_OVLYS+=	RWM
+OPTIONS_GROUP_OVLYS+=	SEQMOD
+OPTIONS_GROUP_OVLYS+=	SHA2
+OPTIONS_GROUP_OVLYS+=	SMBPWD
+OPTIONS_GROUP_OVLYS+=	SSSVLV
+OPTIONS_GROUP_OVLYS+=	SYNCPROV
+OPTIONS_GROUP_OVLYS+=	TRACE
+OPTIONS_GROUP_OVLYS+=	TRANSLUCENT
+OPTIONS_GROUP_OVLYS+=	UNIQUE
+OPTIONS_GROUP_OVLYS+=	VALSORT
+
+OPTIONS_DEFINE+=	DYNACL ACI
+OPTIONS_DEFINE+=	RLOOKUPS SLP SLAPI TCP_WRAPPERS
+OPTIONS_DEFINE+=	DYNAMIC_BACKENDS
 OPTIONS_DEFINE+=	LMPASSWD
 OPTIONS_DEFINE+=	PBKDF2
 OPTIONS_DEFINE+=	OUTLOOK
-OPTIONS_DEFINE+=	LASTBIND
 OPTIONS_DEFINE+=	KQUEUE
 OPTIONS_DEFINE+=	DYNAMIC_MODULES
 
 OPTIONS_DEFAULT=	DYNAMIC_MODULES
-# Backend modules
-OPTIONS_DEFAULT+=	DNSSRV MDB PASSWD RELAY ODBC
-# Overlay modules
-OPTIONS_DEFAULT+=	ACCESSLOG AUDITLOG COLLECT CONSTRAINT DDS
-OPTIONS_DEFAULT+=	DYNGROUP DYNLIST MEMBEROF PCACHE PPOLICY
-OPTIONS_DEFAULT+=	REFINT RETCODE RWM SOCK SSSVLV SYNCPROV
-OPTIONS_DEFAULT+=	TRANSLUCENT UNIQUE VALSORT
+OPTIONS_DEFAULT+=	${BKNDS_DEFAULTS}
+OPTIONS_DEFAULT+=	${OPTIONS_GROUP_OVLYS}
 
 DYNACL_DESC=		Run-time loadable ACL (experimental)
 ACI_DESC=		Per-object ACI (experimental)
@@ -105,14 +130,20 @@ SLP_DESC=		With SLPv2 (RFC 2608) support
 SLAPI_DESC=		With Netscape SLAPI plugin API (experimental)
 TCP_WRAPPERS_DESC=	With tcp wrapper support
 ACCESSLOG_DESC=		With In-Directory Access Logging overlay
+ADDPARTIAL_DESC=	With addpartial overlay (experimental)
+ALLOP_DESC=		With allop overlay (experimental)
 AUDITLOG_DESC=		With Audit Logging overlay
+AUTOGROUP_DESC=		With autogroup overlay (experimental)
+CLOAK_DESC=		With cloak overlay (experimental)
 COLLECT_DESC=		With Collect overy Services overlay
 CONSTRAINT_DESC=	With Attribute Constraint overlay
 DDS_DESC=		With Dynamic Directory Services overlay
 DEREF_DESC=		With Dereference overlay
+DENYOP_DESC=		With denyop overlay (experimental)
 DYNGROUP_DESC=		With Dynamic Group overlay
 DYNLIST_DESC=		With Dynamic List overlay
 MEMBEROF_DESC=		With Reverse Group Membership overlay
+NOPS_DESC=		With nops overlay
 PPOLICY_DESC=		With Password Policy overlay
 PCACHE_DESC=		With Proxy Cache overlay
 REFINT_DESC=		With Referential Integrity overlay
@@ -121,6 +152,7 @@ RWM_DESC=		With Rewrite/Remap overlay
 SEQMOD_DESC=		With Sequential Modify overlay
 SSSVLV_DESC=		With ServerSideSort/VLV overlay
 SYNCPROV_DESC=		With Syncrepl Provider overlay
+TRACE_DESC=		With Trace overlay
 TRANSLUCENT_DESC=	With Translucent Proxy overlay
 UNIQUE_DESC=		With attribute Uniqueness overlay
 VALSORT_DESC=		With Value Sorting overlay
@@ -132,34 +164,224 @@ DYNAMIC_BACKENDS_DESC=	Build dynamic backends (DEPRECATED)
 DYNAMIC_MODULES_DESC=	Build dynamic backend and overlay modules
 OUTLOOK_DESC=		Force caseIgnoreOrderingMatch on name attribute (experimental)
 LASTBIND_DESC=		With lastbind overlay
+LASTMOD_DESC=		With lastmod overlay (experimental)
 KQUEUE_DESC=		With kqueue support (experimental)
-.endif
 
-.if defined(CLIENT_ONLY)
-OPENLDAP_PORTREVISION=	${PORTREVISION_CLIENT}
-OPENLDAP_PKGFILESUFX=	.client
-.else
-OPENLDAP_PORTREVISION=	${PORTREVISION_SERVER}
-OPENLDAP_PKGFILESUFX=
+ACCESSLOG_CONFIGURE_ENABLE=	accesslog=${OVERLAY_ENABLE}
+ACCESSLOG_PLIST_SUB=		OVERLAY_ACCESSLOG=${OVERLAY_PLIST}
+ACCESSLOG_PLIST_SUB_OFF=	OVERLAY_ACCESSLOG="@comment "
+
+AUDITLOG_CONFIGURE_ENABLE=	auditlog=${OVERLAY_ENABLE}
+AUDITLOG_PLIST_SUB=		OVERLAY_AUDITLOG=${OVERLAY_PLIST}
+AUDITLOG_PLIST_SUB_OFF=		OVERLAY_AUDITLOG="@comment "
+
+ADDPARTIAL_PLIST_SUB=		OVERLAY_ADDPARTIAL=${OVERLAY_PLIST}
+ADDPARTIAL_PLIST_SUB_OFF=	OVERLAY_ADDPARTIAL="@comment "
+
+ALLOP_PLIST_SUB=		OVERLAY_ALLOP=${OVERLAY_PLIST}
+ALLOP_PLIST_SUB_OFF=		OVERLAY_ALLOP="@comment "
+
+AUTOGROUP_PLIST_SUB=		OVERLAY_AUTOGROUP=${OVERLAY_PLIST}
+AUTOGROUP_PLIST_SUB_OFF=	OVERLAY_AUTOGROUP="@comment "
+
+CLOAK_PLIST_SUB=		OVERLAY_CLOAK=${OVERLAY_PLIST}
+CLOAK_PLIST_SUB_OFF=		OVERLAY_CLOAK="@comment "
+
+COLLECT_CONFIGURE_ENABLE=	collect=${OVERLAY_ENABLE}
+COLLECT_PLIST_SUB=		OVERLAY_COLLECT=${OVERLAY_PLIST}
+COLLECT_PLIST_SUB_OFF=		OVERLAY_COLLECT="@comment "
+
+CONSTRAINT_CONFIGURE_ENABLE=	constraint=${OVERLAY_ENABLE}
+CONSTRAINT_PLIST_SUB=		OVERLAY_CONSTRAINT=${OVERLAY_PLIST}
+CONSTRAINT_PLIST_SUB_OFF=	OVERLAY_CONSTRAINT="@comment "
+
+DDS_CONFIGURE_ENABLE=		dds=${OVERLAY_ENABLE}
+DDS_PLIST_SUB=			OVERLAY_DDS=${OVERLAY_PLIST}
+DDS_PLIST_SUB_OFF=		OVERLAY_DDS="@comment "
+
+DENYOP_PLIST_SUB=		OVERLAY_DENYOP=${OVERLAY_PLIST}
+DENYOP_PLIST_SUB_OFF=		OVERLAY_DENYOP="@comment "
+
+DEBUG_CONFIGURE_ENABLE=		debug
+MAKE_ENV+=			STRIP=${STRIP}
+
+KQUEUE_BUILD_DEPENDS=		autoconf>0:devel/autoconf
+KQUEUE_EXTRA_PATCHES+=		${FILESDIR}/extrapatch-ITS6300
+
+LMPASSWD_CONFIGURE_ENABLE=	lmpasswd
+
+DEREF_CONFIGURE_ENABLE=		deref=${OVERLAY_ENABLE}
+DEREF_PLIST_SUB=		OVERLAY_DEREF=${OVERLAY_PLIST}
+DEREF_PLIST_SUB_OFF=		OVERLAY_DEREF="@comment "
+
+DYNGROUP_CONFIGURE_ENABLE=	dyngroup=${OVERLAY_ENABLE}
+DYNGROUP_PLIST_SUB=		OVERLAY_DYNGROUP=${OVERLAY_PLIST}
+DYNGROUP_PLIST_SUB_OFF=		OVERLAY_DYNGROUP="@comment "
+
+DYNLIST_CONFIGURE_ENABLE=	dynlist=${OVERLAY_ENABLE}
+DYNLIST_PLIST_SUB=		OVERLAY_DYNLIST=${OVERLAY_PLIST}
+DYNLIST_PLIST_SUB_OFF=		OVERLAY_DYNLIST="@comment "
+
+MEMBEROF_CONFIGURE_ENABLE=	memberof=${OVERLAY_ENABLE}
+MEMBEROF_PLIST_SUB=		OVERLAY_MEMBEROF=${OVERLAY_PLIST}
+MEMBEROF_PLIST_SUB_OFF=		OVERLAY_MEMBEROF="@comment "
+
+PPOLICY_CONFIGURE_ENABLE=	ppolicy=${OVERLAY_ENABLE}
+PPOLICY_PLIST_SUB=		OVERLAY_PPOLICY=${OVERLAY_PLIST}
+PPOLICY_PLIST_SUB_OFF=		OVERLAY_PPOLICY="@comment "
+
+PCACHE_CONFIGURE_ENABLE=	proxycache=${OVERLAY_ENABLE}
+PCACHE_PLIST_SUB=		OVERLAY_PCACHE=${OVERLAY_PLIST}
+PCACHE_PLIST_SUB_OFF=		OVERLAY_PCACHE="@comment "
+
+REFINT_CONFIGURE_ENABLE=	refint=${OVERLAY_ENABLE}
+REFINT_PLIST_SUB=		OVERLAY_REFINT=${OVERLAY_PLIST}
+REFINT_PLIST_SUB_OFF=		OVERLAY_REFINT="@comment "
+
+RETCODE_CONFIGURE_ENABLE=	retcode=${OVERLAY_ENABLE}
+RETCODE_PLIST_SUB=		OVERLAY_RETCODE=${OVERLAY_PLIST}
+RETCODE_PLIST_SUB_OFF=		OVERLAY_RETCODE="@comment "
+
+RWM_CONFIGURE_ENABLE+=		rwm=${OVERLAY_ENABLE}
+RWM_PLIST_SUB=			OVERLAY_RWM=${OVERLAY_PLIST}
+RWM_PLIST_SUB_OFF=		OVERLAY_RWM="@comment "
+
+SEQMOD_CONFIGURE_ENABLE=	seqmod=${OVERLAY_ENABLE}
+SEQMOD_PLIST_SUB=		OVERLAY_SEQMOD=${OVERLAY_PLIST}
+SEQMOD_PLIST_SUB_OFF=		OVERLAY_SEQMOD="@comment "
+
+SSSVLV_CONFIGURE_ENABLE=	sssvlv=${OVERLAY_ENABLE}
+SSSVLV_PLIST_SUB=		OVERLAY_SSSVLV=${OVERLAY_PLIST}
+SSSVLV_PLIST_SUB_OFF=		OVERLAY_SSSVLV="@comment "
+
+SYNCPROV_CONFIGURE_ENABLE=	syncprov=${OVERLAY_ENABLE}
+SYNCPROV_PLIST_SUB=		OVERLAY_SYNCPROV=${OVERLAY_PLIST}
+SYNCPROV_PLIST_SUB_OFF=		OVERLAY_SYNCPROV="@comment "
+
+TRANSLUCENT_CONFIGURE_ENABLE=	translucent=${OVERLAY_ENABLE}
+TRANSLUCENT_PLIST_SUB=		OVERLAY_TRANSLUCENT=${OVERLAY_PLIST}
+TRANSLUCENT_PLIST_SUB_OFF=	OVERLAY_TRANSLUCENT="@comment "
+
+UNIQUE_CONFIGURE_ENABLE=	unique=${OVERLAY_ENABLE}
+UNIQUE_PLIST_SUB=		OVERLAY_UNIQUE=${OVERLAY_PLIST}
+UNIQUE_PLIST_SUB_OFF=		OVERLAY_UNIQUE="@comment "
+
+VALSORT_CONFIGURE_ENABLE=	valsort=${OVERLAY_ENABLE}
+VALSORT_PLIST_SUB=		OVERLAY_VALSORT=${OVERLAY_PLIST}
+VALSORT_PLIST_SUB_OFF=		OVERLAY_VALSORT="@comment "
+
+ACI_CONFIGURE_ENABLE=		aci
+DYNACL_CONFIGURE_ENABLE=	dynacl
+
+DNSSRV_CONFIGURE_ENABLE=	dnssrv=${BACKEND_ENABLE}
+DNSSRV_PLIST_SUB=		BACK_DNSSRV=${BACKEND_PLIST}
+DNSSRV_PLIST_SUB_OFF=		BACK_DNSSRV="@comment "
+
+MDB_CONFIGURE_ENABLE=		mdb=${BACKEND_ENABLE}
+MDB_PLIST_SUB=			BACK_MDB=${BACKEND_PLIST}
+MDB_PLIST_SUB_OFF=		BACK_MDB="@comment "
+
+PASSWD_CONFIGURE_ENABLE=	passwd=${BACKEND_ENABLE}
+PASSWD_PLIST_SUB=		BACK_PASSWD=${BACKEND_PLIST}
+PASSWD_PLIST_SUB_OFF=		BACK_PASSWD="@comment "
+
+RELAY_CONFIGURE_ENABLE=		relay=${BACKEND_ENABLE}
+RELAY_PLIST_SUB=		BACK_RELAY=${BACKEND_PLIST}
+RELAY_PLIST_SUB_OFF=		BACK_RELAY="@comment "
+
+SHELL_CONFIGURE_ARGS=		--without-threads
+SHELL_CONFIGURE_ENABLE=		shell=${BACKEND_ENABLE}
+SHELL_PLIST_SUB=		BACK_SHELL=${BACKEND_PLIST}
+SHELL_PLIST_SUB_OFF=		BACK_SHELL="@comment "
+
+SOCK_CONFIGURE_ENABLE=		sock=${BACKEND_ENABLE}
+SOCK_PLIST_SUB=			BACK_SOCK=${BACKEND_PLIST}
+SOCK_PLIST_SUB_OFF=		BACK_SOCK="@comment "
+
+PERL_USES=			perl5
+PERL_CONFIGURE_ENABLE=		perl=${BACKEND_ENABLE}
+PERL_CONFIGURE_ENV=		PERLBIN="${PERL}"
+PERL_PLIST_SUB=			BACK_PERL=${BACKEND_PLIST}
+PERL_PLIST_SUB_OFF=		BACK_PERL="@comment "
+
+CONFIGURE_ARGS+=		--enable-spasswd
+
+ODBC_CONFIGURE_ENABLE=		sql=${BACKEND_ENABLE}
+ODBC_LIB_DEPENDS=		libodbc.so:databases/unixODBC
+ODBC_LDFLAGS=			-L${LOCALBASE}/lib
+ODBC_PLIST_SUB=			BACK_SQL=${BACKEND_PLIST}
+ODBC_PLIST_SUB_OFF=		BACK_SQL="@comment "
+
+SMBPWD_PLIST_SUB=		SMBPWD=""
+SMBPWD_PLIST_SUB_OFF=		SMBPWD="@comment "
+
+SHA2_PLIST_SUB=			SHA2=""
+SHA2_PLIST_SUB_OFF=		SHA2="@comment "
+
+PBKDF2_PLIST_SUB=		PBKDF2=""
+PBKDF2_PLIST_SUB_OFF=		PBKDF2="@comment "
+
+LASTBIND_PLIST_SUB=		OVERLAY_LASTBIND=""
+LASTBIND_PLIST_SUB_OFF=		OVERLAY_LASTBIND="@comment "
+
+LASTMOD_PLIST_SUB=		OVERLAY_LASTMOD=""
+LASTMOD_PLIST_SUB_OFF=		OVERLAY_LASTMOD="@comment "
+
+NOPS_PLIST_SUB=			OVERLAY_NOPS=""
+NOPS_PLIST_SUB_OFF=		OVERLAY_NOPS="@comment "
+
+RLOOKUPS_CONFIGURE_ENABLE=	rlookups
+RLOOKUPS_SUB=			RLOOKUPS=""
+RLOOKUPS_PLIST_SUB_OFF=		RLOOKUPS="@comment "
+
+SLAPI_CONFIGURE_ENABLE=		slapi
+SLAPI_PLIST_SUB=		SLAPI=""
+SLAPI_PLIST_SUB_OFF=		SLAPI="@comment "
+
+SLP_CONFIGURE_ENABLE=		slp
+SLP_LIB_DEPENDS=		libslp.so:net/openslp
+
+TRACE_PLIST_SUB=		OVERLAY_TRACE=""
+TRACE_PLIST_SUB_OFF=		OVERLAY_TRACE="@comment "
+
+TCP_WRAPPERS_CONFIGURE_ENABLE=	wrappers
+
+# Force using caseIgnoreOrderingMatch on 'name' attribute.
+# This may be a violation of RFC 4519 2.18 definition.
+# See http://www.openldap.org/lists/openldap-technical/201211/msg00175.html
+OUTLOOK_EXTRA_PATCHES=		${FILESDIR}/extrapatch-outlook-servers__slapd__schema_prep.c
 .endif
 
 CONFIGURE_SED=		-e 's,uuid/uuid.h,xxuuid/uuid.h,g'
 
-GSSAPI_RUN_DEPENDS+=	cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
-
 .include <bsd.port.options.mk>
 
 .if defined(CLIENT_ONLY)
+OPENLDAP_PORTREVISION=	${PORTREVISION_CLIENT}
+OPENLDAP_PKGFILESUFX=	.client
+
 PORTDOCS=		CHANGES drafts rfc
 
 .if defined(USE_OPENLDAP)
 BROKEN=			you have USE_OPENLDAP variable defined either in environment or in make(1) arguments; please undefine and try again
 .endif
 .else
+OPENLDAP_PORTREVISION=	${PORTREVISION_SERVER}
+OPENLDAP_PKGFILESUFX=
+
 USE_OPENLDAP=		yes
 WANT_OPENLDAP_VER=	24
 
 LIB_DEPENDS+=		libicudata.so:devel/icu
+
+SUB_LIST+=		RC_DIR=${PREFIX} \
+			LDAP_RUN_DIR=${LDAP_RUN_DIR} \
+			DATABASEDIR=${DATABASEDIR}
+
+USERS=			ldap
+GROUPS=			ldap
+LDAP_USER?=		ldap
+LDAP_GROUP?=		ldap
 .endif
 
 DESCR=			${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
@@ -181,12 +403,11 @@ SUB_LIST+=		LDAP_RUN_DIR=${LDAP_RUN_DIR} \
 			PKGNAME=${PKGNAME} \
 			PKGNAMESUFFIX=${PKGNAMESUFFIX}
 
-CONFIGURE_ARGS=		--with-threads=posix \
+CONFIGURE_ARGS+=	--with-threads=posix \
 			--with-tls=openssl \
 			--disable-dependency-tracking \
 			--enable-dynamic
 
-
 LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-cyrus-sasl
 
@@ -251,177 +472,7 @@ CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
 
 PLIST_SUB+=		BACKEND=${BACKEND_PLIST}
 
-.if ${PORT_OPTIONS:MACCESSLOG}
-CONFIGURE_ARGS+=	--enable-accesslog=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_ACCESSLOG=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_ACCESSLOG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MAUDITLOG}
-CONFIGURE_ARGS+=	--enable-auditlog=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_AUDITLOG=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_AUDITLOG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCOLLECT}
-CONFIGURE_ARGS+=	--enable-collect=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_COLLECT=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_COLLECT="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCONSTRAINT}
-CONFIGURE_ARGS+=	--enable-constraint=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_CONSTRAINT=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_CONSTRAINT="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDDS}
-CONFIGURE_ARGS+=	--enable-dds=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_DDS=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_DDS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug=yes
-.endif
-
-MAKE_ENV+=		STRIP=${STRIP}
-
-.if ${PORT_OPTIONS:MDEREF}
-CONFIGURE_ARGS+=	--enable-deref=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_DEREF=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_DEREF="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDYNGROUP}
-CONFIGURE_ARGS+=	--enable-dyngroup=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_DYNGROUP=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_DYNGROUP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDYNLIST}
-CONFIGURE_ARGS+=	--enable-dynlist=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_DYNLIST=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_DYNLIST="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MLMPASSWD}
-CONFIGURE_ARGS+=	--enable-lmpasswd
-.endif
-
-.if ${PORT_OPTIONS:MMEMBEROF}
-CONFIGURE_ARGS+=	--enable-memberof=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_MEMBEROF=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_MEMBEROF="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPPOLICY}
-CONFIGURE_ARGS+=	--enable-ppolicy=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_PPOLICY=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_PPOLICY="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPCACHE}
-CONFIGURE_ARGS+=	--enable-proxycache=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_PCACHE=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_PCACHE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MREFINT}
-CONFIGURE_ARGS+=	--enable-refint=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_REFINT=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_REFINT="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MRETCODE}
-CONFIGURE_ARGS+=	--enable-retcode=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_RETCODE=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_RETCODE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MRWM}
-CONFIGURE_ARGS+=	--enable-rwm=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_RWM=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_RWM="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSEQMOD}
-CONFIGURE_ARGS+=	--enable-seqmod=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_SEQMOD=${OVERLAY_PLIST}
-.else
-CONFIGURE_ARGS+=	--disable-seqmod
-PLIST_SUB+=		OVERLAY_SEQMOD="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSSSVLV}
-CONFIGURE_ARGS+=	--enable-sssvlv=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_SSSVLV=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_SSSVLV="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSYNCPROV}
-CONFIGURE_ARGS+=	--enable-syncprov=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_SYNCPROV=${OVERLAY_PLIST}
-.else
-CONFIGURE_ARGS+=	--disable-syncprov
-PLIST_SUB+=		OVERLAY_SYNCPROV="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTRANSLUCENT}
-CONFIGURE_ARGS+=	--enable-translucent=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_TRANSLUCENT=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_TRANSLUCENT="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MUNIQUE}
-CONFIGURE_ARGS+=	--enable-unique=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_UNIQUE=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_UNIQUE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MVALSORT}
-CONFIGURE_ARGS+=	--enable-valsort=${OVERLAY_ENABLE}
-PLIST_SUB+=		OVERLAY_VALSORT=${OVERLAY_PLIST}
-.else
-PLIST_SUB+=		OVERLAY_VALSORT="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MACI}
-CONFIGURE_ARGS+=	--enable-aci
-.endif
-
-.if ${PORT_OPTIONS:MDYNACL}
-CONFIGURE_ARGS+=	--enable-dynacl
-.endif
-
-.if ${PORT_OPTIONS:MLASTBIND}
-CONFIGURE_ARGS+=	--enable-lastbind
-.endif
-
-.if !${PORT_OPTIONS:MBDB}
-CONFIGURE_ARGS+=	--disable-bdb \
-			--disable-hdb
-PLIST_SUB+=		BACK_BDB="@comment " \
-			BACK_HDB="@comment "
-.else
-
+.if ${PORT_OPTIONS:MBDB}
 USES+=			bdb
 INVALID_BDB_VER=	6
 
@@ -434,130 +485,11 @@ CPPFLAGS+=		-I${BDB_INCLUDE_DIR}
 LDFLAGS+=		-L${BDB_LIB_DIR}
 CONFIGURE_SED+=		-e 's,ol_DB_LIB=$$,&-l${BDB_LIB_NAME:R},' \
 			-e 's,(ol_cv_lib_db=)yes$$,\1-l${BDB_LIB_NAME:R},'
-.endif
-
-.if ${PORT_OPTIONS:MDNSSRV}
-CONFIGURE_ARGS+=	--enable-dnssrv=${BACKEND_ENABLE}
-PLIST_SUB+=		BACK_DNSSRV=${BACKEND_PLIST}
-.else
-PLIST_SUB+=		BACK_DNSSRV="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMDB}
-CONFIGURE_ARGS+=	--enable-mdb=${BACKEND_ENABLE}
-PLIST_SUB+=		BACK_MDB=${BACKEND_PLIST}
-.else
-PLIST_SUB+=		BACK_MDB="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPASSWD}
-CONFIGURE_ARGS+=	--enable-passwd=${BACKEND_ENABLE}
-PLIST_SUB+=		BACK_PASSWD=${BACKEND_PLIST}
-.else
-PLIST_SUB+=		BACK_PASSWD="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MRELAY}
-CONFIGURE_ARGS+=	--enable-relay=${BACKEND_ENABLE}
-PLIST_SUB+=		BACK_RELAY=${BACKEND_PLIST}
-.else
-PLIST_SUB+=		BACK_RELAY="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSHELL}
-CONFIGURE_ARGS+=	--without-threads --enable-shell=${BACKEND_ENABLE}
-PLIST_SUB+=		BACK_SHELL=${BACKEND_PLIST}
-.else
-PLIST_SUB+=		BACK_SHELL="@comment "
-WANT_OPENLDAP_THREADS=	yes
-.endif
-
-.if ${PORT_OPTIONS:MSOCK}
-CONFIGURE_ARGS+=	--enable-sock=${BACKEND_ENABLE}
-PLIST_SUB+=		BACK_SOCK=${BACKEND_PLIST}
-.else
-PLIST_SUB+=		BACK_SOCK="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPERL}
-USES+=			perl5
-CONFIGURE_ARGS+=	--enable-perl=${BACKEND_ENABLE}
-CONFIGURE_ENV+=		PERLBIN="${PERL}"
-PLIST_SUB+=		BACK_PERL=${BACKEND_PLIST}
-.else
-PLIST_SUB+=		BACK_PERL="@comment "
-.endif
-
-CONFIGURE_ARGS+=	--enable-spasswd
-
-.if ${PORT_OPTIONS:MODBC}
-CONFIGURE_ARGS+=	--enable-sql=${BACKEND_ENABLE}
-PLIST_SUB+=		BACK_SQL=${BACKEND_PLIST}
-LIB_DEPENDS+=		libodbc.so:databases/unixODBC
-LDFLAGS+=		-L${LOCALBASE}/lib
-.else
-PLIST_SUB+=		BACK_SQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSMBPWD}
-PLIST_SUB+=		SMBPWD=""
-.else
-PLIST_SUB+=		SMBPWD="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSHA2}
-PLIST_SUB+=		SHA2=""
-.else
-PLIST_SUB+=		SHA2="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPBKDF2}
-PLIST_SUB+=		PBKDF2=""
-.else
-PLIST_SUB+=		PBKDF2="@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=""
-.else
-PLIST_SUB+=		RLOOKUPS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSLAPI}
-CONFIGURE_ARGS+=	--enable-slapi
-PLIST_SUB+=		SLAPI=""
-USE_LDCONFIG=		yes
 .else
-PLIST_SUB+=		SLAPI="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSLP}
-CONFIGURE_ARGS+=	--enable-slp
-LIB_DEPENDS+=		libslp.so:net/openslp
-.endif
-
-# Include tcp-wrapper support
-.if ${PORT_OPTIONS:MTCP_WRAPPERS}
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
-
-# Force using caseIgnoreOrderingMatch on 'name' attribute.
-# This may be a violation of RFC 4519 2.18 definition.
-# See http://www.openldap.org/lists/openldap-technical/201211/msg00175.html
-.if ${PORT_OPTIONS:MOUTLOOK}
-EXTRA_PATCHES+=		${FILESDIR}/extrapatch-outlook-servers__slapd__schema_prep.c
-.endif
-
-.if ${PORT_OPTIONS:MKQUEUE}
-BUILD_DEPENDS+=		autoconf>0:devel/autoconf
-EXTRA_PATCHES+=		${FILESDIR}/extrapatch-ITS6300
+CONFIGURE_ARGS+=	--disable-bdb \
+			--disable-hdb
+PLIST_SUB+=		BACK_BDB="@comment " \
+			BACK_HDB="@comment "
 .endif
 
 # end of client/server specific configuration
@@ -570,13 +502,6 @@ CPPFLAGS+=		-DLDAP_CONNECTIONLESS
 CPPFLAGS+=		-I${LOCALBASE}/include
 LIBS+=			-L${LOCALBASE}/lib
 
-.if defined(CLIENT_ONLY)
-.else
-SUB_LIST+=		RC_DIR=${PREFIX} \
-			LDAP_RUN_DIR=${LDAP_RUN_DIR} \
-			DATABASEDIR=${DATABASEDIR}
-.endif
-
 PLIST_SUB+=		${SUB_LIST}
 PLIST_SUB+=		SHLIB_MAJOR=${OPENLDAP_SHLIB_MAJOR}
 PLIST_SUB+=		SHLIB_MINOR=${OPENLDAP_SHLIB_MINOR}
@@ -584,12 +509,57 @@ PLIST_SUB+=		OPENLDAP_MAJOR=${OPENLDAP_MAJOR}
 
 .include <bsd.port.pre.mk>
 
-.if !${PORT_OPTIONS:MFETCH}
-CONFIGURE_ARGS+=	--without-fetch
-.else
-. if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" || ${SSL_DEFAULT} != base
+.if ${PORT_OPTIONS:MFETCH} && defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" || ${SSL_DEFAULT} != base
 BROKEN=	using OpenSSL from ports and OPTION FETCH together is not supported
 . endif
+
+.if ${PORT_OPTIONS:MADDPARTIAL}
+CONTRIB_MODULES+=	slapd-modules/addpartial
+CONTRIB_CLEANFILES+=	addpartial.a
+.endif
+.if ${PORT_OPTIONS:MALLOP}
+CONTRIB_MODULES+=	slapd-modules/allop
+CONTRIB_CLEANFILES+=	allop.a
+.endif
+.if ${PORT_OPTIONS:MAUTOGROUP}
+CONTRIB_MODULES+=	slapd-modules/autogroup
+CONTRIB_CLEANFILES+=	autogroup.a
+.endif
+.if ${PORT_OPTIONS:MCLOAK}
+CONTRIB_MODULES+=	slapd-modules/cloak
+CONTRIB_CLEANFILES+=	cloak.a
+.endif
+.if ${PORT_OPTIONS:MDENYOP}
+CONTRIB_MODULES+=	slapd-modules/denyop
+CONTRIB_CLEANFILES+=	denyop.a
+.endif
+.if ${PORT_OPTIONS:MLASTBIND}
+CONTRIB_MODULES+=	slapd-modules/lastbind
+CONTRIB_CLEANFILES+=	lastbind.a
+.endif
+.if ${PORT_OPTIONS:MLASTMOD}
+CONTRIB_MODULES+=	slapd-modules/lastmod
+CONTRIB_CLEANFILES+=	lastmod.a
+.endif
+.if ${PORT_OPTIONS:MNOPS}
+CONTRIB_MODULES+=	slapd-modules/nops
+CONTRIB_CLEANFILES+=	nops.a
+.endif
+.if ${PORT_OPTIONS:MTRACE}
+CONTRIB_MODULES+=	slapd-modules/trace
+CONTRIB_CLEANFILES+=	trace.a
+.endif
+.if ${PORT_OPTIONS:MSHA2}
+CONTRIB_MODULES+=	slapd-modules/passwd/sha2
+CONTRIB_CLEANFILES+=	pw-sha2.a
+.endif
+.if ${PORT_OPTIONS:MPBKDF2}
+CONTRIB_MODULES+=	slapd-modules/passwd/pbkdf2
+CONTRIB_CLEANFILES+=	pw-pbkdf2.a
+.endif
+.if ${PORT_OPTIONS:MSMBPWD}
+CONTRIB_MODULES+=	slapd-modules/smbk5pwd
+CONTRIB_CLEANFILES+=	smbk5pwd.a
 .endif
 
 post-patch:
@@ -620,27 +590,11 @@ test: build
 
 post-build:
 	@${DO_NADA}
-.if ${PORT_OPTIONS:MSMBPWD}
-	@(cd ${BUILD_WRKSRC}/contrib/slapd-modules/smbk5pwd && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
-		${MAKE_ARGS} DEFS="-DDO_SAMBA" prefix="${PREFIX}" all)
-.endif
-.if ${PORT_OPTIONS:MSHA2}
-	@(cd ${BUILD_WRKSRC}/contrib/slapd-modules/passwd/sha2 && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
-		${MAKE_ARGS} prefix="${PREFIX}" all)
-.endif
-.if ${PORT_OPTIONS:MPBKDF2}
-	@(cd ${BUILD_WRKSRC}/contrib/slapd-modules/passwd/pbkdf2 && \
+.for module in ${CONTRIB_MODULES}
+	@(cd ${BUILD_WRKSRC}/contrib/${module} && \
 		${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
+.endfor
 .endif
 
 pre-install:
@@ -665,31 +619,14 @@ post-install:
 	done
 .else
 	${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR}
-.if ${PORT_OPTIONS:MSMBPWD}
-	(cd ${WRKSRC}/contrib/slapd-modules/smbk5pwd && \
+.for module in ${CONTRIB_MODULES}
+	(cd ${WRKSRC}/contrib/${module} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} prefix="${PREFIX}" install)
-	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/smbk5pwd.a
-.endif
-.if ${PORT_OPTIONS:MSHA2}
-	(cd ${WRKSRC}/contrib/slapd-modules/passwd/sha2 && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
-		${MAKE_ARGS} prefix="${PREFIX}" install)
-	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/pw-sha2.a
-.endif
-.if ${PORT_OPTIONS:MPBKDF2}
-	(cd ${WRKSRC}/contrib/slapd-modules/passwd/pbkdf2 && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
-		${MAKE_ARGS} prefix="${PREFIX}" install)
-	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/pw-pbkdf2.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
+.endfor
+.for cleanfile in ${CONTRIB_CLEANFILES}
+	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/${cleanfile}
+.endfor
 .if ${PORT_OPTIONS:MDYNAMIC_MODULES} || ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSMBPWD} || ${PORT_OPTIONS:MSHA2} || ${PORT_OPTIONS:MPBKDF2}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so
 .endif
diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist
index 24336a53db34..99235a630802 100644
--- a/net/openldap24-server/pkg-plist
+++ b/net/openldap24-server/pkg-plist
@@ -93,10 +93,26 @@
 %%OVERLAY_ACCESSLOG%%libexec/openldap/accesslog-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%OVERLAY_ACCESSLOG%%libexec/openldap/accesslog.la
 %%OVERLAY_ACCESSLOG%%libexec/openldap/accesslog.so
+%%OVERLAY_ADDPARTIAL%%libexec/openldap/addpartial.la
+%%OVERLAY_ADDPARTIAL%%libexec/openldap/addpartial.so
+%%OVERLAY_ADDPARTIAL%%libexec/openldap/addpartial.so.0
+%%OVERLAY_ADDPARTIAL%%libexec/openldap/addpartial.so.0.0.0
+%%OVERLAY_ALLOP%%libexec/openldap/allop.la
+%%OVERLAY_ALLOP%%libexec/openldap/allop.so
+%%OVERLAY_ALLOP%%libexec/openldap/allop.so.0
+%%OVERLAY_ALLOP%%libexec/openldap/allop.so.0.0.0
 %%OVERLAY_AUDITLOG%%libexec/openldap/auditlog-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%OVERLAY_AUDITLOG%%libexec/openldap/auditlog-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%OVERLAY_AUDITLOG%%libexec/openldap/auditlog.la
 %%OVERLAY_AUDITLOG%%libexec/openldap/auditlog.so
+%%OVERLAY_AUTOGROUP%%libexec/openldap/autogroup.la
+%%OVERLAY_AUTOGROUP%%libexec/openldap/autogroup.so
+%%OVERLAY_AUTOGROUP%%libexec/openldap/autogroup.so.0
+%%OVERLAY_AUTOGROUP%%libexec/openldap/autogroup.so.0.0.0
+%%OVERLAY_CLOAK%%libexec/openldap/cloak.la
+%%OVERLAY_CLOAK%%libexec/openldap/cloak.so
+%%OVERLAY_CLOAK%%libexec/openldap/cloak.so.0
+%%OVERLAY_CLOAK%%libexec/openldap/cloak.so.0.0.0
 %%OVERLAY_COLLECT%%libexec/openldap/collect-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%OVERLAY_COLLECT%%libexec/openldap/collect-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%OVERLAY_COLLECT%%libexec/openldap/collect.la
@@ -109,6 +125,10 @@
 %%OVERLAY_DDS%%libexec/openldap/dds-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%OVERLAY_DDS%%libexec/openldap/dds.la
 %%OVERLAY_DDS%%libexec/openldap/dds.so
+%%OVERLAY_DENYOP%%libexec/openldap/denyop.la
+%%OVERLAY_DENYOP%%libexec/openldap/denyop.so
+%%OVERLAY_DENYOP%%libexec/openldap/denyop.so.0
+%%OVERLAY_DENYOP%%libexec/openldap/denyop.so.0.0.0
 %%OVERLAY_DEREF%%libexec/openldap/deref-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%OVERLAY_DEREF%%libexec/openldap/deref-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%OVERLAY_DEREF%%libexec/openldap/deref.la
@@ -121,10 +141,22 @@
 %%OVERLAY_DYNLIST%%libexec/openldap/dynlist-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%OVERLAY_DYNLIST%%libexec/openldap/dynlist.la
 %%OVERLAY_DYNLIST%%libexec/openldap/dynlist.so
+%%OVERLAY_LASTBIND%%libexec/openldap/lastbind.la
+%%OVERLAY_LASTBIND%%libexec/openldap/lastbind.so
+%%OVERLAY_LASTBIND%%libexec/openldap/lastbind.so.0
+%%OVERLAY_LASTBIND%%libexec/openldap/lastbind.so.0.0.0
+%%OVERLAY_LASTMOD%%libexec/openldap/lastmod.la
+%%OVERLAY_LASTMOD%%libexec/openldap/lastmod.so
+%%OVERLAY_LASTMOD%%libexec/openldap/lastmod.so.0
+%%OVERLAY_LASTMOD%%libexec/openldap/lastmod.so.0.0.0
 %%OVERLAY_MEMBEROF%%libexec/openldap/memberof-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%OVERLAY_MEMBEROF%%libexec/openldap/memberof-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%OVERLAY_MEMBEROF%%libexec/openldap/memberof.la
 %%OVERLAY_MEMBEROF%%libexec/openldap/memberof.so
+%%OVERLAY_NOPS%%libexec/openldap/nops.la
+%%OVERLAY_NOPS%%libexec/openldap/nops.so
+%%OVERLAY_NOPS%%libexec/openldap/nops.so.0
+%%OVERLAY_NOPS%%libexec/openldap/nops.so.0.0.0
 %%OVERLAY_PCACHE%%libexec/openldap/pcache-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%OVERLAY_PCACHE%%libexec/openldap/pcache-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%OVERLAY_PCACHE%%libexec/openldap/pcache.la
@@ -157,6 +189,10 @@
 %%OVERLAY_SYNCPROV%%libexec/openldap/syncprov-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%OVERLAY_SYNCPROV%%libexec/openldap/syncprov.la
 %%OVERLAY_SYNCPROV%%libexec/openldap/syncprov.so
+%%OVERLAY_TRACE%%libexec/openldap/trace.la
+%%OVERLAY_TRACE%%libexec/openldap/trace.so
+%%OVERLAY_TRACE%%libexec/openldap/trace.so.0
+%%OVERLAY_TRACE%%libexec/openldap/trace.so.0.0.0
 %%OVERLAY_TRANSLUCENT%%libexec/openldap/translucent-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%OVERLAY_TRANSLUCENT%%libexec/openldap/translucent-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%OVERLAY_TRANSLUCENT%%libexec/openldap/translucent.la
@@ -181,10 +217,6 @@
 %%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