git: 245421553605 - main - net/openldap25-server: Make mdb, relay and syncrepl built-in.

The branch main has been updated by delphij:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2454215536053fc775c17e8655f308de4721683f

commit 2454215536053fc775c17e8655f308de4721683f
Author:     Xin LI <delphij@FreeBSD.org>
AuthorDate: 2021-11-24 06:14:26 +0000
Commit:     Xin LI <delphij@FreeBSD.org>
CommitDate: 2021-11-24 06:17:27 +0000

    net/openldap25-server: Make mdb, relay and syncrepl built-in.
    
    The upstream builds the mdb backend and relay, syncrepl built-ins.
    Following the upstream would avoid confusion with examples as they
    sometimes do not include the required load directives.
---
 net/openldap25-server/Makefile  |  8 ++++----
 net/openldap25-server/pkg-plist | 12 ------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile
index 68ed4f0c1c4c..c554842cf117 100644
--- a/net/openldap25-server/Makefile
+++ b/net/openldap25-server/Makefile
@@ -46,7 +46,7 @@ CONFLICTS_INSTALL=	${PORTNAME}2[0-46-9]-server-* ${PORTNAME}-server-*
 GNU_CONFIGURE=		yes
 
 PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
+PORTREVISION_SERVER=	1
 OPENLDAP_SHLIB_MAJOR=	0
 OPENLDAP_SHLIB_MINOR=	1.4
 OPENLDAP_MAJOR=		${DISTVERSION:R}
@@ -195,7 +195,7 @@ DYNLIST_CONFIGURE_ENABLE=	dynlist=mod
 HOMEDIR_CONFIGURE_ENABLE=	homedir=mod
 LLOADD_CONFIGURE_ENABLE=	balancer=mod
 LLOADD_LIB_DEPENDS=		libevent.so:devel/libevent
-MDB_CONFIGURE_ENABLE=		mdb=mod
+MDB_CONFIGURE_ENABLE=		mdb=yes
 MEMBEROF_CONFIGURE_ENABLE=	memberof=mod
 OTP_CONFIGURE_ENABLE=		otp=mod
 PASSWD_CONFIGURE_ENABLE=	passwd=mod
@@ -205,7 +205,7 @@ PERL_USES=			perl5
 PPOLICY_CONFIGURE_ENABLE=	ppolicy=mod
 PROXYCACHE_CONFIGURE_ENABLE=	proxycache=mod
 REFINT_CONFIGURE_ENABLE=	refint=mod
-RELAY_CONFIGURE_ENABLE=		relay=mod
+RELAY_CONFIGURE_ENABLE=		relay=yes
 REMOTEAUTH_CONFIGURE_ENABLE=	remoteauth=mod
 RETCODE_CONFIGURE_ENABLE=	retcode=mod
 RLOOKUPS_CONFIGURE_ENABLE=	rlookups
@@ -220,7 +220,7 @@ SQL_CONFIGURE_ENABLE=		sql=mod
 SQL_LDFLAGS=			-L${LOCALBASE}/lib
 SQL_LIB_DEPENDS=		libodbc.so:databases/unixODBC
 SSSVLV_CONFIGURE_ENABLE=	sssvlv=mod
-SYNCPROV_CONFIGURE_ENABLE=	syncprov=mod
+SYNCPROV_CONFIGURE_ENABLE=	syncprov=yes
 TRANSLUCENT_CONFIGURE_ENABLE=	translucent=mod
 UNIQUE_CONFIGURE_ENABLE=	unique=mod
 VALSORT_CONFIGURE_ENABLE=	valsort=mod
diff --git a/net/openldap25-server/pkg-plist b/net/openldap25-server/pkg-plist
index 818928f2a447..4bdf2cce7dc1 100644
--- a/net/openldap25-server/pkg-plist
+++ b/net/openldap25-server/pkg-plist
@@ -119,10 +119,6 @@
 %%LLOADD%%libexec/%%PORTNAME%%/lloadd-%%OPENLDAP_MAJOR%%.so.0.%%SHLIB_MINOR%%
 %%LLOADD%%libexec/%%PORTNAME%%/lloadd.la
 %%LLOADD%%libexec/%%PORTNAME%%/lloadd.so
-%%MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
-%%MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
-%%MDB%%libexec/openldap/back_mdb.la
-%%MDB%%libexec/openldap/back_mdb.so
 %%MEMBEROF%%libexec/openldap/memberof-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%MEMBEROF%%libexec/openldap/memberof-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%MEMBEROF%%libexec/openldap/memberof.la
@@ -161,10 +157,6 @@
 %%REFINT%%libexec/openldap/refint-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%REFINT%%libexec/openldap/refint.la
 %%REFINT%%libexec/openldap/refint.so
-%%RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
-%%RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
-%%RELAY%%libexec/openldap/back_relay.la
-%%RELAY%%libexec/openldap/back_relay.so
 %%REMOTEAUTH%%libexec/openldap/remoteauth-%%OPENLDAP_MAJOR%%.so.0
 %%REMOTEAUTH%%libexec/openldap/remoteauth-%%OPENLDAP_MAJOR%%.so.0.%%SHLIB_MINOR%%
 %%REMOTEAUTH%%libexec/openldap/remoteauth.la
@@ -208,10 +200,6 @@
 %%SSSVLV%%libexec/openldap/sssvlv-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%SSSVLV%%libexec/openldap/sssvlv.la
 %%SSSVLV%%libexec/openldap/sssvlv.so
-%%SYNCPROV%%libexec/openldap/syncprov-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
-%%SYNCPROV%%libexec/openldap/syncprov-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
-%%SYNCPROV%%libexec/openldap/syncprov.la
-%%SYNCPROV%%libexec/openldap/syncprov.so
 %%TRACE%%libexec/openldap/trace.la
 %%TRACE%%libexec/openldap/trace.so
 %%TRACE%%libexec/openldap/trace.so.0