databases/openldap*: move from net/

Move all OpenLDAP ports (openldap25-client, openldap25-server,
openldap26-client, openldap26-server) from net/ to databases/ to be
consistent with OpenLDAP 2.7 which was already in databases/.

Bump PORTREVISION for all moved ports.  Simplify Mk/Uses/ldap.mk now
that all OpenLDAP versions live under databases/.

51 files changed, 43 insertions, 24 deletions

diff --git a/MOVED b/MOVED
index 124897285e0b..46cf47ce0e5e 100644
--- a/MOVED
+++ b/MOVED
@@ -5620,3 +5620,7 @@ sysutils/py-py-cpuinfo|sysutils/py-py-cpuinfo2|2026-09-16|Remove obsolete sysuti
 textproc/uim-gtk2||2026-09-20|Has expired: Uses deprecated gtk2 libraries
 misc/github-copilot-cli-legacy|misc/github-copilot-cli|2026-09-22|Remove in favor of misc/github-copilot-cli which is a Linux binary which works well on FreeBSD
 graphics/glad|graphics/py-glad2|2026-09-22|glad is now a Python package, use graphics/py-glad2 instead
+net/openldap25-client|databases/openldap25-client|2026-09-24|Move all OpenLDAP ports to databases/
+net/openldap25-server|databases/openldap25-server|2026-09-24|Move all OpenLDAP ports to databases/
+net/openldap26-client|databases/openldap26-client|2026-09-24|Move all OpenLDAP ports to databases/
+net/openldap26-server|databases/openldap26-server|2026-09-24|Move all OpenLDAP ports to databases/
diff --git a/Mk/Uses/ldap.mk b/Mk/Uses/ldap.mk
index d68f5a7faeb5..1833b1774327 100644
--- a/Mk/Uses/ldap.mk
+++ b/Mk/Uses/ldap.mk
@@ -84,14 +84,8 @@ IGNORE=	cannot install: OpenLDAP versions mismatch: openldap${_OPENLDAP_VER}-cli
 
 CFLAGS+=	-DLDAP_DEPRECATED
 
-# OpenLDAP 27+ lives in databases/, older versions in net/
-.  if ${OPENLDAP_VER} >= 27
-_OPENLDAP_CATEGORY=	databases
-.  else
-_OPENLDAP_CATEGORY=	net
-.  endif
-_OPENLDAP_CLIENT=	${_OPENLDAP_CATEGORY}/openldap${OPENLDAP_VER}-client
-_OPENLDAP_SERVER=	${_OPENLDAP_CATEGORY}/openldap${OPENLDAP_VER}-server
+_OPENLDAP_CLIENT=	databases/openldap${OPENLDAP_VER}-client
+_OPENLDAP_SERVER=	databases/openldap${OPENLDAP_VER}-server
 
 # And now we are checking if we can use it
 .  if defined(OPENLDAP${OPENLDAP_VER}_LIB)
diff --git a/UPDATING b/UPDATING
index 5b0a5d25c6cb..2d9671a7ab49 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,27 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20260924:
+  AFFECTS: users of net/openldap25-client, net/openldap25-server,
+    net/openldap26-client, net/openldap26-server
+  AUTHOR: delphij@FreeBSD.org
+
+  All OpenLDAP ports have been moved from net/ to databases/ to be
+  consistent with OpenLDAP 2.7 which was already in databases/.
+
+  pkg users should be able to upgrade directly with:
+    # pkg upgrade
+
+  Portmaster users:
+    # portmaster -o databases/openldap2X-client net/openldap2X-client
+    # portmaster -o databases/openldap2X-server net/openldap2X-server
+
+  Portupgrade users:
+    # portinstall databases/openldap2X-client databases/openldap2X-server
+    # portupgrade -a
+
+  Replace 2X with the actual version (25 or 26) you have installed.
+
 20260925:
   AFFECTS: users of lang/erlang, lang/erlang-runtime27, lang/erlang-runtime28
     and lang/erlang-runtime29 running an SSH daemon
diff --git a/databases/Makefile b/databases/Makefile
index 316c088f401f..662e85352425 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -233,6 +233,10 @@
     SUBDIR += ods2sql
     SUBDIR += opendbviewer
     SUBDIR += opendbx
+    SUBDIR += openldap25-client
+    SUBDIR += openldap25-server
+    SUBDIR += openldap26-client
+    SUBDIR += openldap26-server
     SUBDIR += openldap27-client
     SUBDIR += openldap27-server
     SUBDIR += openvoxdb-terminus8
diff --git a/net/openldap25-client/Makefile b/databases/openldap25-client/Makefile
index 32a77ea48247..32a77ea48247 100644
--- a/net/openldap25-client/Makefile
+++ b/databases/openldap25-client/Makefile
diff --git a/net/openldap25-server/Makefile b/databases/openldap25-server/Makefile
index 8cafc1931579..4a67b818b5cd 100644
--- a/net/openldap25-server/Makefile
+++ b/databases/openldap25-server/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		openldap
 DISTVERSION=		2.5.20
-PORTREVISION=	2
-CATEGORIES=		net databases
+PORTREVISION=	${OPENLDAP_PORTREVISION}
+CATEGORIES=		databases net
 MASTER_SITES=		https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \
 			http://gpl.savoirfairelinux.net/pub/mirrors/openldap/%SUBDIR%/ \
 			http://repository.linagora.org/OpenLDAP/%SUBDIR%/ \
@@ -46,8 +46,8 @@ CONFLICTS_INSTALL=	${PORTNAME}2[0-46-9]-server ${PORTNAME}-server
 GNU_CONFIGURE=		yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
-PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	3
+PORTREVISION_SERVER=	3
 OPENLDAP_SHLIB_MAJOR=	0
 OPENLDAP_SHLIB_MINOR=	1.15
 OPENLDAP_MAJOR=		${DISTVERSION:R}
@@ -257,7 +257,7 @@ OPENLDAP_PORTREVISION=	${PORTREVISION_SERVER}
 OPENLDAP_PKGFILESUFX=
 
 LIB_DEPENDS+=		libicudata.so:devel/icu \
-			libldap.so:net/openldap25-client \
+			libldap.so:databases/openldap25-client \
 			libltdl.so:devel/libltdl
 
 SUB_LIST+=		RC_DIR=${PREFIX} \
diff --git a/net/openldap25-server/distinfo b/databases/openldap25-server/distinfo
index 3a7223163703..3a7223163703 100644
--- a/net/openldap25-server/distinfo
+++ b/databases/openldap25-server/distinfo
diff --git a/net/openldap25-server/files/extrapatch-Makefile.in b/databases/openldap25-server/files/extrapatch-Makefile.in
index b1de5e09f0db..b1de5e09f0db 100644
--- a/net/openldap25-server/files/extrapatch-Makefile.in
+++ b/databases/openldap25-server/files/extrapatch-Makefile.in
diff --git a/net/openldap25-server/files/extrapatch-outlook-servers__slapd__schema_prep.c b/databases/openldap25-server/files/extrapatch-outlook-servers__slapd__schema_prep.c
index 508bc5be8202..508bc5be8202 100644
--- a/net/openldap25-server/files/extrapatch-outlook-servers__slapd__schema_prep.c
+++ b/databases/openldap25-server/files/extrapatch-outlook-servers__slapd__schema_prep.c
diff --git a/net/openldap25-server/files/patch-ITS7548 b/databases/openldap25-server/files/patch-ITS7548
index edfd3cc80667..edfd3cc80667 100644
--- a/net/openldap25-server/files/patch-ITS7548
+++ b/databases/openldap25-server/files/patch-ITS7548
diff --git a/net/openldap25-server/files/patch-ITS8874 b/databases/openldap25-server/files/patch-ITS8874
index 280562c90877..280562c90877 100644
--- a/net/openldap25-server/files/patch-ITS8874
+++ b/databases/openldap25-server/files/patch-ITS8874
diff --git a/net/openldap25-server/files/patch-build__top.mk b/databases/openldap25-server/files/patch-build__top.mk
index 7468883924a0..7468883924a0 100644
--- a/net/openldap25-server/files/patch-build__top.mk
+++ b/databases/openldap25-server/files/patch-build__top.mk
diff --git a/net/openldap25-server/files/patch-configure b/databases/openldap25-server/files/patch-configure
index a3372a8f7efc..a3372a8f7efc 100644
--- a/net/openldap25-server/files/patch-configure
+++ b/databases/openldap25-server/files/patch-configure
diff --git a/net/openldap25-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h b/databases/openldap25-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h
index e03f4ba2b873..e03f4ba2b873 100644
--- a/net/openldap25-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h
+++ b/databases/openldap25-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h
diff --git a/net/openldap25-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile b/databases/openldap25-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile
index 1f2d56dc866e..1f2d56dc866e 100644
--- a/net/openldap25-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile
+++ b/databases/openldap25-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile
diff --git a/net/openldap25-server/files/patch-include__ldap_defaults.h b/databases/openldap25-server/files/patch-include__ldap_defaults.h
index b14af6f6ab27..b14af6f6ab27 100644
--- a/net/openldap25-server/files/patch-include__ldap_defaults.h
+++ b/databases/openldap25-server/files/patch-include__ldap_defaults.h
diff --git a/net/openldap25-server/files/patch-libraries__libldap__Makefile.in b/databases/openldap25-server/files/patch-libraries__libldap__Makefile.in
index d8a203f7b4c2..d8a203f7b4c2 100644
--- a/net/openldap25-server/files/patch-libraries__libldap__Makefile.in
+++ b/databases/openldap25-server/files/patch-libraries__libldap__Makefile.in
diff --git a/net/openldap25-server/files/patch-libraries_libldap_tls__o.c b/databases/openldap25-server/files/patch-libraries_libldap_tls__o.c
index 9b4681e95901..9b4681e95901 100644
--- a/net/openldap25-server/files/patch-libraries_libldap_tls__o.c
+++ b/databases/openldap25-server/files/patch-libraries_libldap_tls__o.c
diff --git a/net/openldap25-server/files/patch-servers_slapd_Makefile.in b/databases/openldap25-server/files/patch-servers_slapd_Makefile.in
index d4d16458b30b..d4d16458b30b 100644
--- a/net/openldap25-server/files/patch-servers_slapd_Makefile.in
+++ b/databases/openldap25-server/files/patch-servers_slapd_Makefile.in
diff --git a/net/openldap25-server/files/pkg-deinstall.in b/databases/openldap25-server/files/pkg-deinstall.in
index 1557b33873af..1557b33873af 100644
--- a/net/openldap25-server/files/pkg-deinstall.in
+++ b/databases/openldap25-server/files/pkg-deinstall.in
diff --git a/net/openldap25-server/files/pkg-message.client.in b/databases/openldap25-server/files/pkg-message.client.in
index 1ae2cf27dd22..1ae2cf27dd22 100644
--- a/net/openldap25-server/files/pkg-message.client.in
+++ b/databases/openldap25-server/files/pkg-message.client.in
diff --git a/net/openldap25-server/files/pkg-message.in b/databases/openldap25-server/files/pkg-message.in
index d07531c959ce..d07531c959ce 100644
--- a/net/openldap25-server/files/pkg-message.in
+++ b/databases/openldap25-server/files/pkg-message.in
diff --git a/net/openldap25-server/files/slapd.in b/databases/openldap25-server/files/slapd.in
index bdc2ad538a74..bdc2ad538a74 100644
--- a/net/openldap25-server/files/slapd.in
+++ b/databases/openldap25-server/files/slapd.in
diff --git a/net/openldap25-server/pkg-descr b/databases/openldap25-server/pkg-descr
index 7c1999f29542..7c1999f29542 100644
--- a/net/openldap25-server/pkg-descr
+++ b/databases/openldap25-server/pkg-descr
diff --git a/net/openldap25-server/pkg-descr.client b/databases/openldap25-server/pkg-descr.client
index c6ad8ebcefc6..c6ad8ebcefc6 100644
--- a/net/openldap25-server/pkg-descr.client
+++ b/databases/openldap25-server/pkg-descr.client
diff --git a/net/openldap25-server/pkg-plist b/databases/openldap25-server/pkg-plist
index 8cad7131ea45..8cad7131ea45 100644
--- a/net/openldap25-server/pkg-plist
+++ b/databases/openldap25-server/pkg-plist
diff --git a/net/openldap25-server/pkg-plist.client b/databases/openldap25-server/pkg-plist.client
index ce386e851fbe..ce386e851fbe 100644
--- a/net/openldap25-server/pkg-plist.client
+++ b/databases/openldap25-server/pkg-plist.client
diff --git a/net/openldap26-client/Makefile b/databases/openldap26-client/Makefile
index a05a88bfca1e..a05a88bfca1e 100644
--- a/net/openldap26-client/Makefile
+++ b/databases/openldap26-client/Makefile
diff --git a/net/openldap26-server/Makefile b/databases/openldap26-server/Makefile
index a17970c012af..e1b278e288cd 100644
--- a/net/openldap26-server/Makefile
+++ b/databases/openldap26-server/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	openldap
 DISTVERSION=	2.6.15
 PORTREVISION=	${OPENLDAP_PORTREVISION}
-CATEGORIES=	net databases
+CATEGORIES=	databases net
 MASTER_SITES=	https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \
 		http://gpl.savoirfairelinux.net/pub/mirrors/openldap/%SUBDIR%/ \
 		http://repository.linagora.org/OpenLDAP/%SUBDIR%/ \
@@ -46,8 +46,8 @@ CONFLICTS_INSTALL=	${PORTNAME}-server ${PORTNAME}2[0-57-9]-server
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
-PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	1
+PORTREVISION_SERVER=	1
 OPENLDAP_SHLIB_MAJOR=	2
 OPENLDAP_SHLIB_MINOR=	0.200
 
@@ -219,7 +219,7 @@ OPENLDAP_PORTREVISION=	${PORTREVISION_SERVER}
 OPENLDAP_PKGFILESUFX=
 
 LIB_DEPENDS+=	libicudata.so:devel/icu \
-		libldap.so:net/openldap26-client \
+		libldap.so:databases/openldap26-client \
 		libltdl.so:devel/libltdl
 
 SUB_LIST+=	DATABASEDIR=${DATABASEDIR} \
@@ -331,8 +331,8 @@ CONTRIB_CLEANFILES+=	nops.a
 .if ${PORT_OPTIONS:MNSSOV}
 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
+NSLCD_VARDIR!=		${MAKE} -C ${PORTSDIR}/net/nss-pam-ldapd -V NSLCD_VARDIR
+NSLCD_SOCKET!=		${MAKE} -C ${PORTSDIR}/net/nss-pam-ldapd -V NSLCD_SOCKET
 .endif
 .if ${PORT_OPTIONS:MTRACE}
 CONTRIB_MODULES+=	slapd-modules/trace
diff --git a/net/openldap26-server/distinfo b/databases/openldap26-server/distinfo
index 486720b58ee7..486720b58ee7 100644
--- a/net/openldap26-server/distinfo
+++ b/databases/openldap26-server/distinfo
diff --git a/net/openldap26-server/files/extrapatch-Makefile.in b/databases/openldap26-server/files/extrapatch-Makefile.in
index b1de5e09f0db..b1de5e09f0db 100644
--- a/net/openldap26-server/files/extrapatch-Makefile.in
+++ b/databases/openldap26-server/files/extrapatch-Makefile.in
diff --git a/net/openldap26-server/files/extrapatch-outlook-servers__slapd__schema_prep.c b/databases/openldap26-server/files/extrapatch-outlook-servers__slapd__schema_prep.c
index 508bc5be8202..508bc5be8202 100644
--- a/net/openldap26-server/files/extrapatch-outlook-servers__slapd__schema_prep.c
+++ b/databases/openldap26-server/files/extrapatch-outlook-servers__slapd__schema_prep.c
diff --git a/net/openldap26-server/files/patch-ITS7548 b/databases/openldap26-server/files/patch-ITS7548
index edfd3cc80667..edfd3cc80667 100644
--- a/net/openldap26-server/files/patch-ITS7548
+++ b/databases/openldap26-server/files/patch-ITS7548
diff --git a/net/openldap26-server/files/patch-build__top.mk b/databases/openldap26-server/files/patch-build__top.mk
index 7468883924a0..7468883924a0 100644
--- a/net/openldap26-server/files/patch-build__top.mk
+++ b/databases/openldap26-server/files/patch-build__top.mk
diff --git a/net/openldap26-server/files/patch-configure.ac b/databases/openldap26-server/files/patch-configure.ac
index a1c993ad850e..a1c993ad850e 100644
--- a/net/openldap26-server/files/patch-configure.ac
+++ b/databases/openldap26-server/files/patch-configure.ac
diff --git a/net/openldap26-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h b/databases/openldap26-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h
index e03f4ba2b873..e03f4ba2b873 100644
--- a/net/openldap26-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h
+++ b/databases/openldap26-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h
diff --git a/net/openldap26-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile b/databases/openldap26-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile
index 0d1ccc97f6d1..0d1ccc97f6d1 100644
--- a/net/openldap26-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile
+++ b/databases/openldap26-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile
diff --git a/net/openldap26-server/files/patch-include__ldap_defaults.h b/databases/openldap26-server/files/patch-include__ldap_defaults.h
index a82e3f7325a4..a82e3f7325a4 100644
--- a/net/openldap26-server/files/patch-include__ldap_defaults.h
+++ b/databases/openldap26-server/files/patch-include__ldap_defaults.h
diff --git a/net/openldap26-server/files/patch-libraries__libldap__Makefile.in b/databases/openldap26-server/files/patch-libraries__libldap__Makefile.in
index a018476f7c66..a018476f7c66 100644
--- a/net/openldap26-server/files/patch-libraries__libldap__Makefile.in
+++ b/databases/openldap26-server/files/patch-libraries__libldap__Makefile.in
diff --git a/net/openldap26-server/files/patch-libraries_libldap_tls__o.c b/databases/openldap26-server/files/patch-libraries_libldap_tls__o.c
index 5d6af668480d..5d6af668480d 100644
--- a/net/openldap26-server/files/patch-libraries_libldap_tls__o.c
+++ b/databases/openldap26-server/files/patch-libraries_libldap_tls__o.c
diff --git a/net/openldap26-server/files/patch-servers_slapd_Makefile.in b/databases/openldap26-server/files/patch-servers_slapd_Makefile.in
index d4d16458b30b..d4d16458b30b 100644
--- a/net/openldap26-server/files/patch-servers_slapd_Makefile.in
+++ b/databases/openldap26-server/files/patch-servers_slapd_Makefile.in
diff --git a/net/openldap26-server/files/pkg-deinstall.in b/databases/openldap26-server/files/pkg-deinstall.in
index 1557b33873af..1557b33873af 100644
--- a/net/openldap26-server/files/pkg-deinstall.in
+++ b/databases/openldap26-server/files/pkg-deinstall.in
diff --git a/net/openldap26-server/files/pkg-message.client.in b/databases/openldap26-server/files/pkg-message.client.in
index 1ae2cf27dd22..1ae2cf27dd22 100644
--- a/net/openldap26-server/files/pkg-message.client.in
+++ b/databases/openldap26-server/files/pkg-message.client.in
diff --git a/net/openldap26-server/files/pkg-message.in b/databases/openldap26-server/files/pkg-message.in
index d07531c959ce..d07531c959ce 100644
--- a/net/openldap26-server/files/pkg-message.in
+++ b/databases/openldap26-server/files/pkg-message.in
diff --git a/net/openldap26-server/files/slapd.in b/databases/openldap26-server/files/slapd.in
index 061fb9340612..061fb9340612 100644
--- a/net/openldap26-server/files/slapd.in
+++ b/databases/openldap26-server/files/slapd.in
diff --git a/net/openldap26-server/pkg-descr b/databases/openldap26-server/pkg-descr
index 7c1999f29542..7c1999f29542 100644
--- a/net/openldap26-server/pkg-descr
+++ b/databases/openldap26-server/pkg-descr
diff --git a/net/openldap26-server/pkg-descr.client b/databases/openldap26-server/pkg-descr.client
index c6ad8ebcefc6..c6ad8ebcefc6 100644
--- a/net/openldap26-server/pkg-descr.client
+++ b/databases/openldap26-server/pkg-descr.client
diff --git a/net/openldap26-server/pkg-plist b/databases/openldap26-server/pkg-plist
index 48959d11a14b..48959d11a14b 100644
--- a/net/openldap26-server/pkg-plist
+++ b/databases/openldap26-server/pkg-plist
diff --git a/net/openldap26-server/pkg-plist.client b/databases/openldap26-server/pkg-plist.client
index 68d2af1c62b5..68d2af1c62b5 100644
--- a/net/openldap26-server/pkg-plist.client
+++ b/databases/openldap26-server/pkg-plist.client
diff --git a/net/Makefile b/net/Makefile
index bcdf9138cdd8..67f37619ed27 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -590,10 +590,6 @@
     SUBDIR += openbgpd7
     SUBDIR += openbgpd8
     SUBDIR += openbgpd9
-    SUBDIR += openldap25-client
-    SUBDIR += openldap25-server
-    SUBDIR += openldap26-client
-    SUBDIR += openldap26-server
     SUBDIR += openmdns
     SUBDIR += openmpi
     SUBDIR += openmpi4
diff --git a/net/py-ldap0/Makefile b/net/py-ldap0/Makefile
index 71c942136bff..623017c8de33 100644
--- a/net/py-ldap0/Makefile
+++ b/net/py-ldap0/Makefile
@@ -13,7 +13,7 @@ LICENSE=	PSFL
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.4.5:devel/py-pyasn1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.2.5:devel/py-pyasn1-modules@${PY_FLAVOR}
 # Cyrus needs PLAIN / CRAM-MD5 / DIGEST-MD5 enabled
-TEST_DEPENDS=	${LOCALBASE}/libexec/slapd:net/openldap${OPENLDAP_VER}-server
+TEST_DEPENDS=	${LOCALBASE}/libexec/slapd:databases/openldap${OPENLDAP_VER}-server
 
 USES=		ldap:24 localbase python
 USE_PYTHON=	autoplist distutils