git: bf73380f7b78 - main - net/openldap26-{client,server}: upgrade to 2.6.14.

Xin LI <[email protected]>
Newsgroups gmane.os.freebsd.devel.cvs.ports
Message-ID <[email protected]> 
The branch main has been updated by delphij:

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

commit bf73380f7b7889a8dd8ef392e8b86ca8a58cad17
Author:     Xin LI <[email protected]>
AuthorDate: 2026-08-08 06:18:15 +0000
Commit:     Xin LI <[email protected]>
CommitDate: 2026-08-08 07:15:02 +0000

    net/openldap26-{client,server}: upgrade to 2.6.14.
    
    While there also fix some style issues.
---
 net/openldap26-client/Makefile |   4 +-
 net/openldap26-server/Makefile | 341 ++++++++++++++++++-----------------------
 net/openldap26-server/distinfo |   6 +-
 3 files changed, 154 insertions(+), 197 deletions(-)

diff --git a/net/openldap26-client/Makefile b/net/openldap26-client/Makefile
index d0048667337f..a05a88bfca1e 100644
--- a/net/openldap26-client/Makefile
+++ b/net/openldap26-client/Makefile
@@ -1,5 +1,5 @@
-CLIENT_ONLY=		yes
+MASTERDIR=	${.CURDIR}/../openldap26-server
 
-MASTERDIR=		${.CURDIR}/../openldap26-server
+CLIENT_ONLY=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile
index 562cbafc9adb..93aa39bd1a52 100644
--- a/net/openldap26-server/Makefile
+++ b/net/openldap26-server/Makefile
@@ -1,198 +1,154 @@
-PORTNAME=		openldap
-DISTVERSION=		2.6.13
-PORTREVISION=		${OPENLDAP_PORTREVISION}
-CATEGORIES=		net databases
-MASTER_SITES=		https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \
-			http://gpl.savoirfairelinux.net/pub/mirrors/openldap/%SUBDIR%/ \
-			http://repository.linagora.org/OpenLDAP/%SUBDIR%/ \
-			http://mirror.eu.oneandone.net/software/openldap/%SUBDIR%/ \
-			ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
-			https://mirror-hk.koddos.net/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/%SUBDIR%/ \
-			https://mirror.koddos.net/OpenLDAP/%SUBDIR%/ \
-			https://mirror.lyrahosting.com/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
-			http://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/
+PORTNAME=	openldap
+DISTVERSION=	2.6.14
+PORTREVISION=	${OPENLDAP_PORTREVISION}
+CATEGORIES=	net databases
+MASTER_SITES=	https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \
+		http://gpl.savoirfairelinux.net/pub/mirrors/openldap/%SUBDIR%/ \
+		http://repository.linagora.org/OpenLDAP/%SUBDIR%/ \
+		http://mirror.eu.oneandone.net/software/openldap/%SUBDIR%/ \
+		ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
+		https://mirror-hk.koddos.net/OpenLDAP/%SUBDIR%/ \
+		ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/%SUBDIR%/ \
+		https://mirror.koddos.net/OpenLDAP/%SUBDIR%/ \
+		https://mirror.lyrahosting.com/OpenLDAP/%SUBDIR%/ \
+		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
+		http://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/
 MASTER_SITE_SUBDIR=	openldap-release
 .if defined(CLIENT_ONLY)
-PKGNAMESUFFIX=		26-client
+PKGNAMESUFFIX=	26-client
 .else
-PKGNAMESUFFIX=		26-server
+PKGNAMESUFFIX=	26-server
 .endif
 
-MAINTAINER=		[email protected]
-WWW=		https://www.OpenLDAP.org/
+MAINTAINER=	[email protected]
 .if defined(CLIENT_ONLY)
-COMMENT=		Open source LDAP client implementation
+COMMENT=	Open source LDAP client implementation
 .else
-COMMENT=		Open source LDAP server implementation
+COMMENT=	Open source LDAP server implementation
 .endif
+WWW=		https://www.OpenLDAP.org/
 
-LICENSE=		OPENLDAP
-LICENSE_NAME=		OpenLDAP Public License
-LICENSE_FILE=		${WRKSRC}/LICENSE
-LICENSE_PERMS=		dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE=	OPENLDAP
+LICENSE_NAME=	OpenLDAP Public License
+LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 # :keepla because port uses lt_dlopen
-USES=			cpe gmake libtool:keepla localbase ssl tar:tgz
-BUILD_DEPENDS+=		autoconf>0:devel/autoconf
+USES=		cpe gmake libtool:keepla localbase ssl tar:tgz
+BUILD_DEPENDS+=	autoconf>0:devel/autoconf
 
 .if defined(CLIENT_ONLY)
-CONFLICTS_INSTALL=	${PORTNAME}2[0-57-9]-client ${PORTNAME}-client
+CONFLICTS_INSTALL=	${PORTNAME}-client ${PORTNAME}2[0-57-9]-client
 .else
-CONFLICTS_INSTALL=	${PORTNAME}2[0-57-9]-server ${PORTNAME}-server
+CONFLICTS_INSTALL=	${PORTNAME}-server ${PORTNAME}2[0-57-9]-server
 .endif
 
-GNU_CONFIGURE=		yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	2
+PORTREVISION_SERVER=	0
 OPENLDAP_SHLIB_MAJOR=	2
 OPENLDAP_SHLIB_MINOR=	0.200
 
 OPTIONS_DEFINE=		DEBUG FETCH GSSAPI
 OPTIONS_DEFAULT+=	DEBUG
 
-FETCH_DESC=		Enable fetch(3) support
-GSSAPI_DESC=		With GSSAPI support
+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
+GSSAPI_RUN_DEPENDS=	cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
 
 .if defined(CLIENT_ONLY)
 OPTIONS_DEFINE+=	DOCS
 .else
 OPTIONS_GROUP=		BKNDS OVLYS
-BKNDS_DESC=		OpenLDAP backends
 BKNDS_DEFAULTS=		ASYNCMETA DNSSRV MDB PASSWD RELAY SOCK
-OPTIONS_GROUP_BKNDS+=	${BKNDS_DEFAULTS}
-OPTIONS_GROUP_BKNDS+=	PERL SQL
+OPTIONS_GROUP_BKNDS+=	${BKNDS_DEFAULTS} PERL SQL
 
-OVLYS_DESC=		OpenLDAP overlays
-OPTIONS_GROUP_OVLYS+=	ACCESSLOG
-OPTIONS_GROUP_OVLYS+=	ADDPARTIAL
-OPTIONS_GROUP_OVLYS+=	ALLOP
-OPTIONS_GROUP_OVLYS+=	AUTOCA
-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+=	EMPTYDS
-OPTIONS_GROUP_OVLYS+=	HOMEDIR
-OPTIONS_GROUP_OVLYS+=	LASTBIND
-OPTIONS_GROUP_OVLYS+=	LASTMOD
-OPTIONS_GROUP_OVLYS+=	MEMBEROF
-OPTIONS_GROUP_OVLYS+=	NESTGROUP
-OPTIONS_GROUP_OVLYS+=	NOPS
-OPTIONS_GROUP_OVLYS+=	NSSOV
-OPTIONS_GROUP_OVLYS+=	OTP
-OPTIONS_GROUP_OVLYS+=	PROXYCACHE
-OPTIONS_GROUP_OVLYS+=	PPOLICY
-OPTIONS_GROUP_OVLYS+=	REFINT
-OPTIONS_GROUP_OVLYS+=	REMOTEAUTH
-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
-OPTIONS_DEFINE+=	PBKDF2
-OPTIONS_DEFINE+=	OUTLOOK
-OPTIONS_DEFINE+=	ARGON2
-OPTIONS_DEFINE+=	LLOADD
-OPTIONS_DEFINE+=	NETWORKING
-
-OPTIONS_EXCLUDE_FreeBSD_15=	SMBPWD	# Only works with Heimdal
-OPTIONS_EXCLUDE_FreeBSD_16=	SMBPWD	# Only works with Heimdal
-
-OPTIONS_DEFAULT+=	${BKNDS_DEFAULTS}
-OPTIONS_DEFAULT+=	${OPTIONS_GROUP_OVLYS}
-OPTIONS_DEFAULT+=	ARGON2 LLOADD
-
-OPTIONS_SUB=		yes
+OPTIONS_GROUP_OVLYS+=	ACCESSLOG ADDPARTIAL ALLOP AUDITLOG AUTOCA AUTOGROUP \
+			CLOAK COLLECT CONSTRAINT DDS DENYOP DEREF DYNGROUP \
+			DYNLIST EMPTYDS HOMEDIR LASTBIND LASTMOD MEMBEROF \
+			NESTGROUP NOPS NSSOV OTP PPOLICY PROXYCACHE REFINT \
+			REMOTEAUTH RETCODE RWM SEQMOD SHA2 SMBPWD SSSVLV \
+			SYNCPROV TRACE TRANSLUCENT UNIQUE VALSORT
 
-ACI_DESC=		Per-object ACI (experimental)
-ARGON2_DESC=		Argon2 password hashing module
-DYNACL_DESC=		Run-time loadable ACL (experimental)
-LLOADD_DESC=		Enable load balancer
-NETWORKING_DESC=	Require full network configuration (NETWORKING) before slapd starts
-OUTLOOK_DESC=		Force caseIgnoreOrderingMatch on name attribute (experimental)
-RLOOKUPS_DESC=		With reverse lookups of client hostnames
-SLAPI_DESC=		With Netscape SLAPI plugin API (experimental)
-SLP_DESC=		With SLPv2 (RFC 2608) support
+OPTIONS_DEFINE+=	ACI ARGON2 DYNACL LLOADD NETWORKING OUTLOOK PBKDF2 \
+			RLOOKUPS SLAPI SLP
 
-ASYNCMETA_DESC=		With asynchronous metadirectory backend
-DNSSRV_DESC=		With Dnssrv backend
-MDB_DESC=		With Memory-Mapped DB backend
-SQL_DESC=		With SQL backend
-PASSWD_DESC=		With Passwd backend
-PERL_DESC=		With Perl backend
-RELAY_DESC=		With Relay backend
-SOCK_DESC=		With Sock backend
+OPTIONS_EXCLUDE_FreeBSD_15=	SMBPWD # Only works with Heimdal
+OPTIONS_EXCLUDE_FreeBSD_16=	SMBPWD # Only works with Heimdal
+
+OPTIONS_DEFAULT+=	${BKNDS_DEFAULTS} ${OPTIONS_GROUP_OVLYS} ARGON2 LLOADD
+
+OPTIONS_SUB=	yes
 
 ACCESSLOG_DESC=		With In-Directory Access Logging overlay
+ACI_DESC=		Per-object ACI (experimental)
+ADDPARTIAL_DESC=	With addpartial overlay (experimental)
+ALLOP_DESC=		With allop overlay (experimental)
+ARGON2_DESC=		Argon2 password hashing module
+ASYNCMETA_DESC=		With asynchronous metadirectory backend
 AUDITLOG_DESC=		With Audit Logging overlay
 AUTOCA_DESC=		With Automatic Certificate Authority overlay
+AUTOGROUP_DESC=		With autogroup overlay (experimental)
+BKNDS_DESC=		OpenLDAP backends
+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
+DENYOP_DESC=		With denyop overlay (experimental)
 DEREF_DESC=		With Dereference overlay
+DNSSRV_DESC=		With Dnssrv backend
+DYNACL_DESC=		Run-time loadable ACL (experimental)
 DYNGROUP_DESC=		With Dynamic Group overlay
 DYNLIST_DESC=		With Dynamic List overlay
+EMPTYDS_DESC=		With emptyds overlay (experimental)
 HOMEDIR_DESC=		With Home Directory Management overlay
+LASTBIND_DESC=		With lastbind overlay
+LASTMOD_DESC=		With lastmod overlay (experimental)
+LLOADD_DESC=		Enable load balancer
+MDB_DESC=		With Memory-Mapped DB backend
 MEMBEROF_DESC=		With Reverse Group Membership overlay
 NESTGROUP_DESC=		With nestgroup overlay
+NETWORKING_DESC=	Require full network configuration (NETWORKING) before slapd starts
 NOPS_DESC=		With nops overlay
 NSSOV_DESC=		With NSS/PAM overlay [baked in nslcd(8)]
 OTP_DESC=		With OTP 2-factor authentication overlay
+OUTLOOK_DESC=		Force caseIgnoreOrderingMatch on name attribute (experimental)
+OVLYS_DESC=		OpenLDAP overlays
+PASSWD_DESC=		With Passwd backend
+PBKDF2_DESC=		With PBKDF2 hash password support
+PERL_DESC=		With Perl backend
 PPOLICY_DESC=		With Password Policy overlay
 PROXYCACHE_DESC=	With Proxy Cache overlay
 REFINT_DESC=		With Referential Integrity overlay
+RELAY_DESC=		With Relay backend
 REMOTEAUTH_DESC=	With Deferred Authentication overlay
 RETCODE_DESC=		With Return Code testing overlay
+RLOOKUPS_DESC=		With reverse lookups of client hostnames
 RWM_DESC=		With Rewrite/Remap overlay
 SEQMOD_DESC=		With Sequential Modify overlay
+SHA2_DESC=		With SHA2 Password hashes overlay
+SLAPI_DESC=		With Netscape SLAPI plugin API (experimental)
+SLP_DESC=		With SLPv2 (RFC 2608) support
+SMBPWD_DESC=		With Samba Password hashes overlay
+SOCK_DESC=		With Sock backend
+SQL_DESC=		With SQL backend
 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
 
-ADDPARTIAL_DESC=	With addpartial overlay (experimental)
-ALLOP_DESC=		With allop overlay (experimental)
-AUTOGROUP_DESC=		With autogroup overlay (experimental)
-CLOAK_DESC=		With cloak overlay (experimental)
-DENYOP_DESC=		With denyop overlay (experimental)
-EMPTYDS_DESC=		With emptyds overlay (experimental)
-LASTBIND_DESC=		With lastbind overlay
-LASTMOD_DESC=		With lastmod overlay (experimental)
-TRACE_DESC=		With Trace overlay
-
-PBKDF2_DESC=		With PBKDF2 hash password support
-SHA2_DESC=		With SHA2 Password hashes overlay
-SMBPWD_DESC=		With Samba Password hashes overlay
-
 ACCESSLOG_CONFIGURE_ENABLE=	accesslog=mod
 ACI_CONFIGURE_ENABLE=		aci
+ARGON2_LIB_DEPENDS=		libsodium.so:security/libsodium
 ARGON2_CONFIGURE_ENABLE=	argon2
 ARGON2_CONFIGURE_WITH=		argon2=libsodium
-ARGON2_LIB_DEPENDS=		libsodium.so:security/libsodium
 ASYNCMETA_CONFIGURE_ENABLE=	asyncmeta=mod
 AUDITLOG_CONFIGURE_ENABLE=	auditlog=mod
 AUTOCA_CONFIGURE_ENABLE=	autoca=mod
@@ -206,16 +162,20 @@ DYNACL_CONFIGURE_ENABLE=	dynacl
 DYNGROUP_CONFIGURE_ENABLE=	dyngroup=mod
 DYNLIST_CONFIGURE_ENABLE=	dynlist=mod
 HOMEDIR_CONFIGURE_ENABLE=	homedir=mod
-LLOADD_CONFIGURE_ENABLE=	balancer=mod
 LLOADD_LIB_DEPENDS=		libevent.so:devel/libevent
+LLOADD_CONFIGURE_ENABLE=	balancer=mod
 MDB_CONFIGURE_ENABLE=		mdb=yes
 MEMBEROF_CONFIGURE_ENABLE=	memberof=mod
 NESTGROUP_CONFIGURE_ENABLE=	nestgroup=mod
 OTP_CONFIGURE_ENABLE=		otp=mod
+# 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
 PASSWD_CONFIGURE_ENABLE=	passwd=mod
+PERL_USES=			perl5
 PERL_CONFIGURE_ENABLE=		perl=mod
 PERL_CONFIGURE_ENV=		PERLBIN="${PERL}"
-PERL_USES=			perl5
 PPOLICY_CONFIGURE_ENABLE=	ppolicy=mod
 PROXYCACHE_CONFIGURE_ENABLE=	proxycache=mod
 REFINT_CONFIGURE_ENABLE=	refint=mod
@@ -225,27 +185,22 @@ RETCODE_CONFIGURE_ENABLE=	retcode=mod
 RLOOKUPS_CONFIGURE_ENABLE=	rlookups
 RWM_CONFIGURE_ENABLE=		rwm=mod
 SEQMOD_CONFIGURE_ENABLE=	seqmod=mod
-SLAPI_CONFIGURE_ENABLE=		slapi
 SLAPI_USE=			LDCONFIG
-SLP_CONFIGURE_ENABLE=		slp
+SLAPI_CONFIGURE_ENABLE=		slapi
 SLP_LIB_DEPENDS=		libslp.so:net/openslp
+SLP_CONFIGURE_ENABLE=		slp
 SOCK_CONFIGURE_ENABLE=		sock=mod
+SQL_LIB_DEPENDS=		libodbc.so:databases/unixODBC
 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=yes
 TRANSLUCENT_CONFIGURE_ENABLE=	translucent=mod
 UNIQUE_CONFIGURE_ENABLE=	unique=mod
 VALSORT_CONFIGURE_ENABLE=	valsort=mod
-
-# 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'
+CONFIGURE_SED=	-e 's,uuid/uuid.h,xxuuid/uuid.h,g'
 
 .include <bsd.port.options.mk>
 
@@ -253,93 +208,95 @@ CONFIGURE_SED=		-e 's,uuid/uuid.h,xxuuid/uuid.h,g'
 OPENLDAP_PORTREVISION=	${PORTREVISION_CLIENT}
 OPENLDAP_PKGFILESUFX=	.client
 
-PORTDOCS=		CHANGES drafts rfc
+PORTDOCS=	CHANGES drafts rfc
 
-CONFIGURE_ARGS+=	--disable-slapd \
-			--disable-monitor \
+CONFIGURE_ARGS+=	--disable-monitor \
 			--disable-relay \
+			--disable-slapd \
 			--disable-syncprov
 USE_LDCONFIG=		yes
 .else
 OPENLDAP_PORTREVISION=	${PORTREVISION_SERVER}
 OPENLDAP_PKGFILESUFX=
 
-LIB_DEPENDS+=		libicudata.so:devel/icu \
-			libldap.so:net/openldap26-client \
-			libltdl.so:devel/libltdl
+LIB_DEPENDS+=	libicudata.so:devel/icu \
+		libldap.so:net/openldap26-client \
+		libltdl.so:devel/libltdl
 
-SUB_LIST+=		RC_DIR=${PREFIX} \
-			LDAP_RUN_DIR=${LDAP_RUN_DIR} \
-			DATABASEDIR=${DATABASEDIR}
+SUB_LIST+=	DATABASEDIR=${DATABASEDIR} \
+		LDAP_RUN_DIR=${LDAP_RUN_DIR} \
+		RC_DIR=${PREFIX}
 
 .if ${PORT_OPTIONS:MNETWORKING}
-SUB_LIST+=		SLAPD_REQUIRE=NETWORKING
+SUB_LIST+=	SLAPD_REQUIRE=NETWORKING
 .else
-SUB_LIST+=		SLAPD_REQUIRE=FILESYSTEMS
+SUB_LIST+=	SLAPD_REQUIRE=FILESYSTEMS
 .endif
 
-USERS=			ldap
-GROUPS=			ldap
-LDAP_USER?=		ldap
-LDAP_GROUP?=		ldap
-USE_LDCONFIG=		${PREFIX}/libexec/openldap
-SUB_FILES+=		pkg-deinstall
-USE_RC_SUBR=		slapd
+USERS=		ldap
+GROUPS=		ldap
+LDAP_USER?=	ldap
+LDAP_GROUP?=	ldap
+USE_LDCONFIG=	${PREFIX}/libexec/openldap
+SUB_FILES+=	pkg-deinstall
+USE_RC_SUBR=	slapd
 
-EXTRA_PATCHES+=		${FILESDIR}/extrapatch-Makefile.in
+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-Makefile.in
 
-LDFLAGS+=		-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-SED_MODULES=		-e 's/\(moduleload[ 	]*back_[a-z]*\)\.la/\1/' \
-			-e 's/\# *\(modulepath\)/\1/'
+SED_MODULES=	-e 's/\(moduleload[ 	]*back_[a-z]*\)\.la/\1/' -e \
+		's/\# *\(modulepath\)/\1/'
 
-CONFIGURE_ARGS+=	--enable-modules \
-			--localstatedir=${LOCALSTATEDIR} \
-			--enable-crypt \
+CONFIGURE_ARGS+=	--enable-crypt \
 			--enable-ldap=mod \
 			--enable-meta=mod \
-			--enable-null=mod
+			--enable-modules \
+			--enable-null=mod \
+			--localstatedir=${LOCALSTATEDIR}
 .endif
 
-LDAP_RUN_DIR?=		/var/run/openldap
-LOCALSTATEDIR?=		/var/db
-DATABASEDIR?=		${LOCALSTATEDIR}/openldap-data
-BACKUPDIR?=		/var/backups/openldap
+LDAP_RUN_DIR?=	/var/run/openldap
+LOCALSTATEDIR?=	/var/db
+DATABASEDIR?=	${LOCALSTATEDIR}/openldap-data
+BACKUPDIR?=	/var/backups/openldap
 
-DESCR=			${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
-PLIST=			${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
+DESCR=		${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
+PLIST=		${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
 
-SUB_FILES+=		pkg-message${OPENLDAP_PKGFILESUFX}
-PKGMESSAGE=		${WRKSRC}/pkg-message${OPENLDAP_PKGFILESUFX}
+SUB_FILES+=	pkg-message${OPENLDAP_PKGFILESUFX}
+PKGMESSAGE=	${WRKSRC}/pkg-message${OPENLDAP_PKGFILESUFX}
 
-SUB_LIST+=		LDAP_RUN_DIR=${LDAP_RUN_DIR} \
-			LDAP_USER=${LDAP_USER} \
-			LDAP_GROUP=${LDAP_GROUP} \
-			BACKUPDIR=${BACKUPDIR} \
-			DATABASEDIR=${DATABASEDIR} \
-			NSLCD_VARDIR=${NSLCD_VARDIR} \
-			PORTNAME=${PORTNAME} \
-			PKGNAME=${PKGNAME} \
-			PKGNAMESUFFIX=${PKGNAMESUFFIX}
+SUB_LIST+=	BACKUPDIR=${BACKUPDIR} \
+		DATABASEDIR=${DATABASEDIR} \
+		LDAP_GROUP=${LDAP_GROUP} \
+		LDAP_RUN_DIR=${LDAP_RUN_DIR} \
+		LDAP_USER=${LDAP_USER} \
+		NSLCD_VARDIR=${NSLCD_VARDIR} \
+		PKGNAME=${PKGNAME} \
+		PKGNAMESUFFIX=${PKGNAMESUFFIX} \
+		PORTNAME=${PORTNAME}
 
-CONFIGURE_ARGS+=	--with-threads=posix \
-			--with-tls=openssl \
-			--enable-dynamic
+CONFIGURE_ARGS+=	--enable-dynamic \
+			--with-threads=posix \
+			--with-tls=openssl
 
 LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
-CONFIGURE_ARGS+=	--with-cyrus-sasl --enable-spasswd
+CONFIGURE_ARGS+=	--enable-spasswd \
+			--with-cyrus-sasl
 MAKE_ENV+=		STRIP=${STRIP}
 
-CPPFLAGS+=		-I${LOCALBASE}/include
-LIBS+=			-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
-PLIST_SUB+=		${SUB_LIST}
-PLIST_SUB+=		SHLIB_MAJOR=${OPENLDAP_SHLIB_MAJOR}
-PLIST_SUB+=		SHLIB_MINOR=${OPENLDAP_SHLIB_MINOR}
+PLIST_SUB+=	${SUB_LIST} \
+		SHLIB_MAJOR=${OPENLDAP_SHLIB_MAJOR} \
+		SHLIB_MINOR=${OPENLDAP_SHLIB_MINOR}
 
-.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: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
diff --git a/net/openldap26-server/distinfo b/net/openldap26-server/distinfo
index ca5d542595d2..d0fae6d36992 100644
--- a/net/openldap26-server/distinfo
+++ b/net/openldap26-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1773450068
-SHA256 (openldap-2.6.13.tgz) = d693b49517a42efb85a1a364a310aed16a53d428d1b46c0d31ef3fba78fcb656
-SIZE (openldap-2.6.13.tgz) = 6525768
+TIMESTAMP = 1786167061
+SHA256 (openldap-2.6.14.tgz) = 806dcd21d366428187fba3278da773d5930f774852c9e92517f950d585f19107
+SIZE (openldap-2.6.14.tgz) = 6524817
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.