git: 47ce16cb2589 - main - net/openldap26-server: consolidate creation of state directories.

The branch main has been updated by delphij:

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

commit 47ce16cb2589aba30e937734c195e0dde3692367
Author:     yds <yds@Necessitu.de>
AuthorDate: 2026-03-19 06:15:01 +0000
Commit:     Xin LI <delphij@FreeBSD.org>
CommitDate: 2026-03-19 06:17:34 +0000

    net/openldap26-server: consolidate creation of state directories.
    
    Fix NSLCD_VARDIR when NSSOV is disabled.
    
    PR:             ports/293531
---
 net/openldap26-server/Makefile       | 5 +++--
 net/openldap26-server/files/slapd.in | 7 ++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile
index bd375c80b447..5855ad74b401 100644
--- a/net/openldap26-server/Makefile
+++ b/net/openldap26-server/Makefile
@@ -1,5 +1,6 @@
 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%/ \
@@ -46,7 +47,7 @@ GNU_CONFIGURE=		yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
+PORTREVISION_SERVER=	1
 OPENLDAP_SHLIB_MAJOR=	2
 OPENLDAP_SHLIB_MINOR=	0.200
 
@@ -316,6 +317,7 @@ SUB_LIST+=		LDAP_RUN_DIR=${LDAP_RUN_DIR} \
 			LDAP_GROUP=${LDAP_GROUP} \
 			BACKUPDIR=${BACKUPDIR} \
 			DATABASEDIR=${DATABASEDIR} \
+			NSLCD_VARDIR=${NSLCD_VARDIR} \
 			PORTNAME=${PORTNAME} \
 			PKGNAME=${PKGNAME} \
 			PKGNAMESUFFIX=${PKGNAMESUFFIX}
@@ -380,7 +382,6 @@ CONTRIB_MODULES+=	slapd-modules/nssov
 CONTRIB_CLEANFILES+=	nssov.a
 NSLCD_VARDIR!=		${MAKE} -C ../nss-pam-ldapd -V NSLCD_VARDIR
 NSLCD_SOCKET!=		${MAKE} -C ../nss-pam-ldapd -V NSLCD_SOCKET
-SUB_LIST+=		NSLCD_VARDIR=${NSLCD_VARDIR}
 .endif
 .if ${PORT_OPTIONS:MTRACE}
 CONTRIB_MODULES+=	slapd-modules/trace
diff --git a/net/openldap26-server/files/slapd.in b/net/openldap26-server/files/slapd.in
index bb5414b22fc9..061fb9340612 100644
--- a/net/openldap26-server/files/slapd.in
+++ b/net/openldap26-server/files/slapd.in
@@ -87,7 +87,7 @@ start_precmd()
 {
   local slapd_ownername slapd_groupname
 
-  mkdir -p %%LDAP_RUN_DIR%%
+  mkdir -p %%LDAP_RUN_DIR%% %%NSLCD_VARDIR%%
 
   case "$slapd_owner" in
   ""|[Nn][Oo][Nn][Ee]|[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
@@ -102,7 +102,7 @@ start_precmd()
        chown -fRL "$slapd_owner" "${DBDIR}"
        chmod 700 "${DBDIR}"
     done
-    chown "$slapd_owner" "%%LDAP_RUN_DIR%%"
+    chown "$slapd_owner" %%LDAP_RUN_DIR%% %%NSLCD_VARDIR%%
 
     if checkyesno slapd_cn_config; then
         chown -fR $slapd_owner "%%PREFIX%%/etc/openldap/slapd.d"
@@ -113,9 +113,6 @@ start_precmd()
     slapd_ownername="${slapd_owner%:*}"
     slapd_groupname="${slapd_owner#*:}"
 
-    if [ -n "%%NSLCD_VARDIR%%" ]; then
-        install -o "${slapd_ownername}" -g "${slapd_groupname}" -m 0755 -d "%%NSLCD_VARDIR%%"
-    fi
     if [ -n "$slapd_ownername" ]; then
       rc_flags="$rc_flags -u $slapd_ownername"
     fi