D38233.diff
No OneTemporary
Actions

Size

72 KB

Referenced Files

None

Subscribers

None

D38233.diff
View Options

	diff --git a/Mk/Uses/ldap.mk b/Mk/Uses/ldap.mk
	new file mode 100644
	--- /dev/null
	+++ b/Mk/Uses/ldap.mk
	@@ -0,0 +1,111 @@
	+# Provide support for OpenLDAP
	+# Feature: ldap
	+# Usage: USES=ldap or USES=ldap:args
	+# Valid ARGS: <version>, client, server, (none)
	+#
	+# version If no version is given (by the maintainer via the port), try to
	+# find the currently installed version. Fall back to default if
	+# necessary (OpenLDAP-2.6 = 26, look at bsd.default-versions.mk for
	+# possible values).
	+# client Depends on the libldap library (default)
	+# server
	+# Depend on the server at runtime. If none of these is
	+# set, depends on the client.
	+#
	+# IGNORE_WITH_OPENLDAP
	+# This variable can be defined if the ports does not support one
	+# or more version of OpenLDAP.
	+# WITH_OPENLDAP_VER
	+# User defined variable to set OpenLDAP version.
	+# OPENLDAP_VER
	+# Detected OpenLDAP version.
	+#
	+# MAINTAINER: ports@FreeBSD.org
	+
	+.if !defined(_INCLUDE_USES_LDAP_MK)
	+_INCLUDE_USES_LDAP_MK= yes
	+
	+. if !empty(ldap_ARGS)
	+.undef _WANT_OPENLDAP_VER
	+.undef _WANT_OPENLDAP_SERVER
	+_OPENLDAP_ARGS= ${ldap_ARGS:S/,/ /g}
	+. if ${_OPENLDAP_ARGS:Mserver}
	+_WANT_OPENLDAP_SERVER= yes
	+_OPENLDAP_ARGS:= ${_OPENLDAP_ARGS:Nserver}
	+. endif
	+. if ${_OPENLDAP_ARGS:Mclient}
	+_WANT_OPENLDAP_CLIENT= yes
	+_OPENLDAP_ARGS:= ${_OPENLDAP_ARGS:Nclient}
	+. endif
	+
	+# Port requested a version
	+. if !empty(_OPENLDAP_ARGS)
	+_WANT_OPENLDAP_VER= ${_OPENLDAP_ARGS}
	+. endif
	+. endif # !empty(ldap_ARGS)
	+
	+. if defined(DEFAULT_OPENLDAP_VER)
	+WARNING+= "DEFAULT_OPENLDAP_VER is defined, consider using DEFAULT_VERSIONS=openldap=${DEFAULT_OPENLDAP_VER} instead"
	+. endif
	+
	+DEFAULT_OPENLDAP_VER?= ${OPENLDAP_DEFAULT:S/.//}
	+# OpenLDAP client version currently supported.
	+# When adding a version, please keep the comment in
	+# Mk/bsd.default-versions.mk in sync.
	+# OpenLDAP client versions currently supported
	+OPENLDAP24_LIB= libldap-2.4.so.2
	+OPENLDAP25_LIB= libldap-2.5.so.0
	+OPENLDAP26_LIB= libldap.so.2
	+
	+. if exists(${LOCALBASE}/bin/ldapwhoami)
	+_OPENLDAP_VER!= ${LOCALBASE}/bin/ldapwhoami -VV 2>&1 \| ${GREP} ldapwhoami \| ${SED} -E 's/.OpenLDAP: ldapwhoami (2)\.([0-9])./\1\2/'
	+. endif
	+
	+. if defined(WANT_OPENLDAP_VER)
	+. if defined(WITH_OPENLDAP_VER) && ${WITH_OPENLDAP_VER} != ${WANT_OPENLDAP_VER}
	+IGNORE= cannot install: the port wants openldap${WANT_OPENLDAP_VER}-client and you try to install openldap${WITH_OPENLDAP_VER}-client
	+. endif
	+OPENLDAP_VER= ${WANT_OPENLDAP_VER}
	+. elif defined(WITH_OPENLDAP_VER)
	+OPENLDAP_VER= ${WITH_OPENLDAP_VER}
	+. else
	+. if defined(_OPENLDAP_VER)
	+OPENLDAP_VER= ${_OPENLDAP_VER}
	+. else
	+OPENLDAP_VER= ${DEFAULT_OPENLDAP_VER}
	+. endif
	+. endif # WANT_OPENLDAP_VER
	+
	+. if defined(_OPENLDAP_VER)
	+. if ${_OPENLDAP_VER} != ${OPENLDAP_VER}
	+IGNORE= cannot install: OpenLDAP versions mismatch: openldap${_OPENLDAP_VER}-client is installed and wanted version is openldap${OPENLDAP_VER}-client
	+. endif
	+. endif
	+
	+. if ${OPENLDAP_VER} > 24
	+CFLAGS+= -DLDAP_DEPRECATED
	+. endif
	+
	+_OPENLDAP_CLIENT= net/openldap${OPENLDAP_VER}-client
	+_OPENLDAP_SERVER= net/openldap${OPENLDAP_VER}-server
	+
	+# And now we are checking if we can use it
	+. if defined(OPENLDAP${OPENLDAP_VER}_LIB)
	+. if defined(IGNORE_WITH_OPENLDAP)
	+. for VER in ${IGNORE_WITH_OPENLDAP}
	+. if (${OPENLDAP_VER} == "${VER}")
	+IGNORE= cannot install: doesn't work with OpenLDAP version: ${OPENLDAP_VER} (Doesn't support OpenLDAP ${IGNORE_WITH_OPENLDAP})
	+. endif
	+. endfor
	+. endif # IGNORE_WITH_OPENLDAP
	+. if defined(_WANT_OPENLDAP_SERVER)
	+RUN_DEPENDS+= ${LOCALBASE}/libexec/slapd:${_OPENLDAP_SERVER}
	+. endif
	+. if defined(_WANT_OPENLDAP_CLIENT) \|\| !defined(_WANT_OPENLDAP_SERVER)
	+LIB_DEPENDS+= ${OPENLDAP${OPENLDAP_VER}_LIB}:${_OPENLDAP_CLIENT}
	+. endif
	+. else
	+IGNORE= cannot install: unknown OpenLDAP version: ${OPENLDAP_VER}
	+. endif # Check for correct libs
	+
	+.endif # !defined(_INCLUDE_USES_LDAP_MK)
	diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
	--- a/Mk/bsd.default-versions.mk
	+++ b/Mk/bsd.default-versions.mk
	@@ -19,7 +19,7 @@

	. for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC \
	GHOSTSCRIPT GL GO IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM \
	- LUA LUAJIT MONO MYSQL NINJA NODEJS PERL5 PGSQL PHP PYTHON \
	+ LUA LUAJIT MONO MYSQL NINJA NODEJS OPENLDAP PERL5 PGSQL PHP PYTHON \
	PYTHON2 PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH
	. if defined(${lang}_DEFAULT)
	ERROR+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
	@@ -95,6 +95,8 @@
	NINJA_DEFAULT?= ninja
	# Possible value: 14, 16, 18, 19, current, lts (Note: current = 19 and lts = 18)
	NODEJS_DEFAULT?= lts
	+# Possible value: 24, 25, 26
	+OPENLDAP_DEFAULT?= 26
	# Possible values: 5.32, 5.34, 5.36, devel
	. if !exists(${LOCALBASE}/bin/perl) \|\| (!defined(_PORTS_ENV_CHECK) && \
	defined(PACKAGE_BUILDING))
	diff --git a/Mk/bsd.ldap.mk b/Mk/bsd.ldap.mk
	deleted file mode 100644
	--- a/Mk/bsd.ldap.mk
	+++ /dev/null
	@@ -1,87 +0,0 @@
	-# -- tab-width: 4; --
	-# ex: ts=4
	-
	-.if defined(_POSTMKINCLUDED) && !defined(Ldap_Post_Include)
	-
	-Ldap_Post_Include= bsd.ldap.mk
	-Database_Include_MAINTAINER= ports@FreeBSD.org
	-
	-# For including this file define macro USE_OPENLDAP. Defining macro like
	-# USE_OPENLDAP_VER or WANT_OPENLDAP_VER will include this file too.
	-#
	-##
	-# USE_OPENLDAP - Add OpenLDAP client dependency.
	-# If no version is given (by the maintainer via the port or
	-# by the user via defined variable), try to find the
	-# currently installed version. Fall back to default if
	-# necessary (OpenLDAP 2.4 = 24).
	-# DEFAULT_OPENLDAP_VER
	-# - OpenLDAP default version. Can be overriden within a port.
	-# Default: 24.
	-# WANT_OPENLDAP_VER
	-# - Maintainer can set an arbitrary version of OpenLDAP by using it.
	-# IGNORE_OPENLDAP_OPENLDAP
	-# - This variable can be defined if the ports doesn't support
	-# one or more version of OpenLDAP.
	-# WITH_OPENLDAP_VER
	-# - User defined variable to set OpenLDAP version.
	-# OPENLDAP_VER
	-# - Detected OpenLDAP version.
	-
	-. if defined(USE_OPENLDAP)
	-DEFAULT_OPENLDAP_VER?= 26
	-# OpenLDAP client versions currently supported
	-OPENLDAP24_LIB= libldap-2.4.so.2
	-OPENLDAP25_LIB= libldap-2.5.so.0
	-OPENLDAP26_LIB= libldap.so.2
	-
	-. if exists(${LOCALBASE}/bin/ldapwhoami)
	-_OPENLDAP_VER!= ${LOCALBASE}/bin/ldapwhoami -VV 2>&1 \| ${GREP} ldapwhoami \| ${SED} -E 's/.OpenLDAP: ldapwhoami (2)\.([0-9])./\1\2/'
	-. endif
	-
	-. if defined(WANT_OPENLDAP_VER)
	-. if defined(WITH_OPENLDAP_VER) && ${WITH_OPENLDAP_VER} != ${WANT_OPENLDAP_VER}
	-IGNORE= cannot install: the port wants openldap${WANT_OPENLDAP_VER}-client and you try to install openldap${WITH_OPENLDAP_VER}-client
	-. endif
	-OPENLDAP_VER= ${WANT_OPENLDAP_VER}
	-. elif defined(WITH_OPENLDAP_VER)
	-OPENLDAP_VER= ${WITH_OPENLDAP_VER}
	-. else
	-. if defined(_OPENLDAP_VER)
	-OPENLDAP_VER= ${_OPENLDAP_VER}
	-. else
	-OPENLDAP_VER= ${DEFAULT_OPENLDAP_VER}
	-. endif
	-. endif # WANT_OPENLDAP_VER
	-
	-. if defined(_OPENLDAP_VER)
	-. if ${_OPENLDAP_VER} != ${OPENLDAP_VER}
	-IGNORE= cannot install: OpenLDAP versions mismatch: openldap${_OPENLDAP_VER}-client is installed and wanted version is openldap${OPENLDAP_VER}-client
	-. endif
	-. endif
	-
	-CFLAGS+= -DLDAP_DEPRECATED
	-
	-_OPENLDAP_CLIENT_PKG!= ${PKG_INFO} -Ex openldap.\*-client 2>/dev/null; ${ECHO_CMD}
	-
	-# And now we are checking if we can use it
	-. if defined(OPENLDAP${OPENLDAP_VER}_LIB)
	-# compatability shim
	-. if defined(BROKEN_WITH_OPENLDAP)
	-IGNORE_WITH_OPENLDAP=${BROKEN_WITH_OPENLDAP}
	-. endif
	-. if defined(IGNORE_WITH_OPENLDAP)
	-. for VER in ${IGNORE_WITH_OPENLDAP}
	-. if (${OPENLDAP_VER} == "${VER}")
	-IGNORE= cannot install: doesn't work with OpenLDAP version: ${OPENLDAP_VER} (Doesn't support OpenLDAP ${IGNORE_WITH_OPENLDAP})
	-. endif
	-. endfor
	-. endif # IGNORE_WITH_OPENLDAP
	-LIB_DEPENDS+= ${OPENLDAP${OPENLDAP_VER}_LIB}:net/openldap${OPENLDAP_VER}-client
	-. else
	-IGNORE= cannot install: unknown OpenLDAP version: ${OPENLDAP_VER}
	-. endif # Check for correct libs
	-
	-. endif # defined(USE_OPENLDAP)
	-
	-.endif # defined(_POSTMKINCLUDED) && !defined(Ldap_Post_Include)
	diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
	--- a/Mk/bsd.port.mk
	+++ b/Mk/bsd.port.mk
	@@ -1863,10 +1863,6 @@
	. endfor
	. endif

	-. if defined(USE_OPENLDAP) \|\| defined(WANT_OPENLDAP_VER)
	-.include "${PORTSDIR}/Mk/bsd.ldap.mk"
	-. endif
	-
	. if defined(USE_RC_SUBR)
	SUB_FILES+= ${USE_RC_SUBR}
	. endif
	diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
	--- a/Mk/bsd.sanity.mk
	+++ b/Mk/bsd.sanity.mk
	@@ -209,7 +209,8 @@
	USE_FPC_RUN WANT_FPC_BASE WANT_FPC_ALL USE_QT4 USE_QT5 QT_NONSTANDARD \
	XORG_CAT CARGO_USE_GITHUB CARGO_USE_GITLAB CARGO_GIT_SUBDIR \
	USE_RUBY USE_RUBY_EXTCONF USE_RUBY_SETUP RUBY_NO_BUILD_DEPENDS \
	- RUBY_NO_RUN_DEPENDS USE_APACHE USE_APACHE_BUILD USE_APACHE_RUN
	+ RUBY_NO_RUN_DEPENDS USE_APACHE USE_APACHE_BUILD USE_APACHE_RUN \
	+ USE_OPENLDAP WANT_OPENLDAP_VER
	SANITY_DEPRECATED= MLINKS \
	USE_MYSQL WANT_MYSQL_VER \
	PYDISTUTILS_INSTALLNOSINGLE
	@@ -244,6 +245,7 @@
	USE_DRUPAL_ALT= USES=drupal
	USE_PYDISTUTILS_ALT= USE_PYTHON=distutils
	USE_PGSQL_ALT= USES=pgsql
	+USE_OPENLDAP_ALT= USES=ldap
	INSTALLS_SHLIB_ALT= USE_LDCONFIG
	NEED_ROOT_ALT= USES=fakeroot or USES=uidfix
	PYTHON_CONCURRENT_INSTALL_ALT= USE_PYTHON=concurrent
	@@ -262,6 +264,7 @@
	USE_BDB_ALT= USES=bdb:${USE_BDB}
	USE_MYSQL_ALT= USES=mysql:${USE_MYSQL}
	WANT_MYSQL_VER_ALT= USES=mysql:${WANT_MYSQL_VER}
	+WANT_OPENLDAP_VER_ALT= USES=ldap:${WANT_OPENLDAP_VER}
	USE_OPENSSL_ALT= USES=ssl
	USE_PHPIZE_ALT= USES=php:phpize
	USE_PHPEXT_ALT= USES=php:ext
	diff --git a/databases/ateam_mysql57_ldap_auth/Makefile b/databases/ateam_mysql57_ldap_auth/Makefile
	--- a/databases/ateam_mysql57_ldap_auth/Makefile
	+++ b/databases/ateam_mysql57_ldap_auth/Makefile
	@@ -14,8 +14,7 @@

	LIB_DEPENDS= libconfig.so:devel/libconfig

	-USES= compiler:c++11-lang gmake mysql:57,client,server
	-USE_OPENLDAP= yes
	+USES= compiler:c++11-lang gmake ldap mysql:57,client,server

	USE_GITHUB= yes
	GH_ACCOUNT= ateamsystems
	diff --git a/databases/ateam_mysql_ldap_auth/Makefile b/databases/ateam_mysql_ldap_auth/Makefile
	--- a/databases/ateam_mysql_ldap_auth/Makefile
	+++ b/databases/ateam_mysql_ldap_auth/Makefile
	@@ -15,8 +15,7 @@

	LIB_DEPENDS= libconfig.so:devel/libconfig

	-USE_OPENLDAP= yes
	-USES= gmake mysql:client,server
	+USES= gmake ldap mysql:client,server

	IGNORE_WITH_MYSQL= 57 80 101m 102m 103m 57p 57w

	diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
	--- a/databases/evolution-data-server/Makefile
	+++ b/databases/evolution-data-server/Makefile
	@@ -65,7 +65,7 @@

	LDAP_CMAKE_ON= -DWITH_OPENLDAP=${LOCALBASE}
	LDAP_CMAKE_OFF= -DWITH_OPENLDAP=OFF
	-LDAP_USE= openldap=yes
	+LDAP_USES= ldap

	VAPI_USES= vala:build
	VAPI_CMAKE_BOOL= ENABLE_VALA_BINDINGS
	diff --git a/databases/ldb15/Makefile b/databases/ldb15/Makefile
	--- a/databases/ldb15/Makefile
	+++ b/databases/ldb15/Makefile
	@@ -31,12 +31,11 @@
	#nopython_CONFLICTS= ldb
	#default_CONFLICTS= ldb-nopython

	-USES= compiler gettext-runtime pkgconfig waf
	+USES= compiler gettext-runtime ldap pkgconfig waf
	USE_LDCONFIG= yes
	WAF_CMD= ${BUILD_WRKSRC}/buildtools/bin/waf
	CONFIGURE_LOG= ${BUILD_WRKSRC}/bin/config.log

	-USE_OPENLDAP= yes
	PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
	PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}

	diff --git a/databases/ldb20/Makefile b/databases/ldb20/Makefile
	--- a/databases/ldb20/Makefile
	+++ b/databases/ldb20/Makefile
	@@ -26,12 +26,11 @@

	CONFLICTS_INSTALL= ldb[0-9][0-9] # include/ldb.h

	-USES= compiler pkgconfig waf
	+USES= compiler ldap pkgconfig waf
	USE_LDCONFIG= yes
	WAF_CMD= ${BUILD_WRKSRC}/buildtools/bin/waf
	CONFIGURE_LOG= ${BUILD_WRKSRC}/bin/config.log

	-USE_OPENLDAP= yes
	PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
	PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}

	diff --git a/databases/ldb21/Makefile b/databases/ldb21/Makefile
	--- a/databases/ldb21/Makefile
	+++ b/databases/ldb21/Makefile
	@@ -23,7 +23,7 @@
	cmocka>=1.1.3:sysutils/cmocka \
	popt>=0:devel/popt

	-USES= compiler pkgconfig waf
	+USES= compiler ldap pkgconfig waf

	CONFLICTS_INSTALL= ldb[0-9][0-9] # include/ldb.h

	@@ -31,7 +31,6 @@
	WAF_CMD= ${BUILD_WRKSRC}/buildtools/bin/waf
	CONFIGURE_LOG= ${BUILD_WRKSRC}/bin/config.log

	-USE_OPENLDAP= yes
	PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
	PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}

	diff --git a/databases/ldb22/Makefile b/databases/ldb22/Makefile
	--- a/databases/ldb22/Makefile
	+++ b/databases/ldb22/Makefile
	@@ -24,7 +24,7 @@
	cmocka>=1.1.3:sysutils/cmocka
	RUN_DEPENDS= ${LDB_DEPENDS}

	-USES= compiler pkgconfig waf
	+USES= compiler ldap pkgconfig waf

	CONFLICTS_INSTALL= ldb[0-9][0-9] # include/ldb.h

	@@ -32,7 +32,6 @@
	WAF_CMD= ${BUILD_WRKSRC}/buildtools/bin/waf
	CONFIGURE_LOG= ${BUILD_WRKSRC}/bin/config.log

	-USE_OPENLDAP= yes
	PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
	PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}

	diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
	--- a/databases/libgda5/Makefile
	+++ b/databases/libgda5/Makefile
	@@ -61,7 +61,7 @@
	.endif

	.if ${LIBGDA5_SLAVE}==ldap
	-USE_OPENLDAP= yes
	+USES= ldap
	CONFIGURE_ARGS+= --with-ldap=${LOCALBASE}
	.else
	CONFIGURE_ARGS+= --without-ldap
	diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
	--- a/databases/mysql57-client/Makefile
	+++ b/databases/mysql57-client/Makefile
	@@ -34,7 +34,7 @@
	SASLCLIENT_DESC= SASL client plugin module
	SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP
	SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
	-SASLCLIENT_USE= OPENLDAP=yes
	+SASLCLIENT_USES= ldap
	OPTIONS_DEFAULT+= SASLCLIENT

	# issue 166367: adding symlinks for back-compatibility with ${lib}_r
	diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile
	--- a/databases/mysql80-client/Makefile
	+++ b/databases/mysql80-client/Makefile
	@@ -33,7 +33,7 @@
	SASLCLIENT_DESC= SASL client plugin module
	SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP
	SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
	-SASLCLIENT_USE= OPENLDAP=yes
	+SASLCLIENT_USES= ldap

	OPTIONS_DEFAULT+= SASLCLIENT
	OPTIONS_SUB= yes
	diff --git a/databases/percona57-client/Makefile b/databases/percona57-client/Makefile
	--- a/databases/percona57-client/Makefile
	+++ b/databases/percona57-client/Makefile
	@@ -34,7 +34,7 @@
	SASLCLIENT_DESC= SASL client plugin module
	SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP
	SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
	-SASLCLIENT_USE= OPENLDAP=yes
	+SASLCLIENT_USES= ldap
	OPTIONS_DEFAULT+= SASLCLIENT
	OPTIONS_SUB= yes

	diff --git a/databases/postgresql15-server/Makefile b/databases/postgresql15-server/Makefile
	--- a/databases/postgresql15-server/Makefile
	+++ b/databases/postgresql15-server/Makefile
	@@ -164,7 +164,7 @@
	NLS_USES= gettext

	LDAP_CONFIGURE_WITH= ldap
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap

	OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops

	diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
	--- a/databases/virtuoso/Makefile
	+++ b/databases/virtuoso/Makefile
	@@ -99,7 +99,7 @@

	.if ${PORT_OPTIONS:MLDAP}
	CONFIGURE_ARGS+=--enable-openldap=${LOCALBASE}
	-USE_OPENLDAP= yes
	+USES= ldap
	.else
	CONFIGURE_ARGS+=--disable-openldap
	.endif
	diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
	--- a/devel/apr1/Makefile
	+++ b/devel/apr1/Makefile
	@@ -43,7 +43,7 @@
	# APR-Util Options
	BDB_USES= bdb:5+
	GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	MYSQL_USES= mysql
	NSS_LIB_DEPENDS= libnss3.so:security/nss
	ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
	diff --git a/devel/p5-Test-OpenLDAP/Makefile b/devel/p5-Test-OpenLDAP/Makefile
	--- a/devel/p5-Test-OpenLDAP/Makefile
	+++ b/devel/p5-Test-OpenLDAP/Makefile
	@@ -14,14 +14,12 @@

	RUN_DEPENDS= \
	p5-Data-UUID>0:devel/p5-Data-UUID \
	- p5-perl-ldap>0:net/p5-perl-ldap \
	- ${LOCALBASE}/libexec/slapd:net/openldap${OPENLDAP_VER}-server
	+ p5-perl-ldap>0:net/p5-perl-ldap
	BUILD_DEPENDS= ${RUN_DEPENDS}

	NO_ARCH= yes
	-USES= perl5
	+USES= ldap:server perl5
	USE_PERL5= configure
	-USE_OPENLDAP= yes

	CONFIGURE_ENV= PATH=${PATH}:${PREFIX}/libexec

	diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile
	--- a/devel/ptlib/Makefile
	+++ b/devel/ptlib/Makefile
	@@ -135,7 +135,7 @@
	.endif

	.if ${PORT_OPTIONS:MLDAP}
	-USE_OPENLDAP= yes
	+USES+= ldap
	CONFIGURE_ARGS+=--enable-openldap
	.else
	CONFIGURE_ARGS+=--disable-openldap
	diff --git a/devel/sope/Makefile b/devel/sope/Makefile
	--- a/devel/sope/Makefile
	+++ b/devel/sope/Makefile
	@@ -38,7 +38,7 @@
	MYSQL_DESC= Build with MySQL support
	PGSQL_DESC= Build with PostgreSQL support

	-LDAP_USE= OPENLDAP=client
	+LDAP_USES= ldap
	MEMCACHED_RUN_DEPENDS= ${LOCALBASE}/bin/memcached:databases/memcached
	MYSQL_USES= mysql
	PGSQL_USES= pgsql
	diff --git a/devel/sope2/Makefile b/devel/sope2/Makefile
	--- a/devel/sope2/Makefile
	+++ b/devel/sope2/Makefile
	@@ -22,7 +22,6 @@
	OPTIONS_DEFAULT= LDAP PGSQL MEMCACHED
	OPTIONS_SUB= yes

	-LDAP_DESC= Build with LDAP support
	MYSQL_DESC= Build with MySQL support
	PGSQL_DESC= Build with PostgreSQL support
	MEMCACHED_DESC= Install memcached
	@@ -37,7 +36,7 @@

	CONFIGURE_ARGS= --with-gnustep --disable-debug --enable-strip

	-LDAP_USE= OPENLDAP=client
	+LDAP_USES= ldap
	PGSQL_USES= pgsql
	MYSQL_USES= mysql
	MEMCACHED_RUN_DEPENDS= ${LOCALBASE}/bin/memcached:databases/memcached
	diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile
	--- a/dns/bind916/Makefile
	+++ b/dns/bind916/Makefile
	@@ -100,7 +100,7 @@
	DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes

	DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes
	-DLZ_LDAP_USE= OPENLDAP=yes
	+DLZ_LDAP_USES= ldap

	DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes
	DLZ_MYSQL_USES= mysql
	diff --git a/dns/ldapdns/Makefile b/dns/ldapdns/Makefile
	--- a/dns/ldapdns/Makefile
	+++ b/dns/ldapdns/Makefile
	@@ -14,8 +14,7 @@
	RUN_DEPENDS= setuidgid:sysutils/daemontools \
	tcpserver:sysutils/ucspi-tcp

	-USES= localbase:ldflags shebangfix tar:xz
	-USE_OPENLDAP= yes
	+USES= ldap localbase:ldflags shebangfix tar:xz
	HAS_CONFIGURE= yes
	CONFIGURE_ARGS= --prefix=${PREFIX}
	USE_CSTD= gnu89
	diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
	--- a/dns/powerdns/Makefile
	+++ b/dns/powerdns/Makefile
	@@ -96,7 +96,7 @@
	MYSQL_CONFIGURE_OFF= --without-mysql
	MYSQL_VARS= MODULES+=gmysql

	-OPENLDAP_USE= OPENLDAP=YES
	+OPENLDAP_USES= ldap
	OPENLDAP_CXXFLAGS= -DLDAP_DEPRECATED=1
	OPENLDAP_VARS= MODULES+=ldap

	diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
	--- a/editors/libreoffice/Makefile
	+++ b/editors/libreoffice/Makefile
	@@ -124,11 +124,10 @@

	GNU_CONFIGURE= yes
	USES= autoreconf:build bison compiler:c++17-lang cpe desktop-file-utils \
	- gettext gl gmake gnome jpeg localbase:ldflags perl5 pkgconfig \
	+ gettext gl gmake gnome jpeg ldap localbase:ldflags perl5 pkgconfig \
	python:3.8+ shebangfix shared-mime-info ssl tar:xz xorg
	USE_GL= gl glew glu
	USE_GNOME= cairo glib20 libxml2 libxslt
	-USE_OPENLDAP= yes
	USE_PERL5= build
	USE_XORG= ice sm x11 xaw xcb xext xinerama xrandr xrender

	diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
	--- a/emulators/wine/Makefile
	+++ b/emulators/wine/Makefile
	@@ -89,7 +89,7 @@
	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls

	LDAP_CONFIGURE_WITH= ldap
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap

	MONO_RUN_DEPENDS= wine-mono>0:emulators/wine-mono

	diff --git a/finance/odoo/Makefile b/finance/odoo/Makefile
	--- a/finance/odoo/Makefile
	+++ b/finance/odoo/Makefile
	@@ -64,9 +64,8 @@
	${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \
	${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR}

	-USES= cpe python:3.7+ pgsql shebangfix
	+USES= cpe ldap python:3.7+ pgsql shebangfix
	USE_PYTHON= distutils
	-USE_OPENLDAP= yes

	SHEBANG_LANG= python
	SHEBANG_FILES= ${WRKSRC}/${PORTNAME}-bin
	diff --git a/finance/odoo14/Makefile b/finance/odoo14/Makefile
	--- a/finance/odoo14/Makefile
	+++ b/finance/odoo14/Makefile
	@@ -66,9 +66,8 @@
	${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \
	${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR}

	-USES= cpe python:3.7+ pgsql shebangfix
	+USES= cpe ldap python:3.7+ pgsql shebangfix
	USE_PYTHON= distutils
	-USE_OPENLDAP= yes

	SHEBANG_LANG= python
	SHEBANG_FILES= ${WRKSRC}/${PORTNAME}-bin
	diff --git a/finance/odoo15/Makefile b/finance/odoo15/Makefile
	--- a/finance/odoo15/Makefile
	+++ b/finance/odoo15/Makefile
	@@ -66,9 +66,8 @@
	${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \
	${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR}

	-USES= cpe python:3.7+ pgsql shebangfix
	+USES= cpe ldap python:3.7+ pgsql shebangfix
	USE_PYTHON= distutils
	-USE_OPENLDAP= yes

	SHEBANG_LANG= python
	SHEBANG_FILES= ${WRKSRC}/${PORTNAME}-bin
	diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
	--- a/ftp/curl/Makefile
	+++ b/ftp/curl/Makefile
	@@ -105,7 +105,7 @@
	IMAP_CONFIGURE_ENABLE= imap
	IPV6_CONFIGURE_ENABLE= ipv6
	LDAP_CONFIGURE_ENABLE= ldap
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAPS_CONFIGURE_ENABLE= ldaps
	LIBSSH2_CONFIGURE_WITH= libssh2
	LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2
	diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile
	--- a/ftp/pure-ftpd/Makefile
	+++ b/ftp/pure-ftpd/Makefile
	@@ -51,7 +51,7 @@
	ANONRESUME_CPPFLAGS= -DANON_CAN_RESUME
	LARGEFILE_CONFIGURE_ENABLE= largefile
	LDAP_CONFIGURE_WITH= ldap
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	MYSQL_CONFIGURE_WITH= mysql
	MYSQL_USES= mysql
	PAM_CONFIGURE_WITH= pam
	diff --git a/irc/anope/Makefile b/irc/anope/Makefile
	--- a/irc/anope/Makefile
	+++ b/irc/anope/Makefile
	@@ -27,7 +27,7 @@

	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap

	MYSQL_USES= mysql

	diff --git a/irc/atheme-services/Makefile b/irc/atheme-services/Makefile
	--- a/irc/atheme-services/Makefile
	+++ b/irc/atheme-services/Makefile
	@@ -43,7 +43,7 @@
	CONTRIB_CONFIGURE_ENABLE= contrib
	CRACKLIB_LIB_DEPENDS= libcrack.so:security/cracklib
	CRACKLIB_CONFIGURE_WITH= cracklib
	-LDAP_USE= openldap=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= ldap
	NLS_USES= gettext
	NLS_CONFIGURE_ENABLE= nls
	diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile
	--- a/irc/bitlbee/Makefile
	+++ b/irc/bitlbee/Makefile
	@@ -66,7 +66,7 @@
	libgpg-error.so:security/libgpg-error
	JABBER_CONFIGURE_OFF= --jabber=0
	LDAP_CONFIGURE_ON= --ldap=1
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LIBEVENT_CONFIGURE_ON= --events=libevent --libevent=${LOCALBASE}
	LIBEVENT_LIB_DEPENDS= libevent.so:devel/libevent
	LIBPURPLE_CONFIGURE_ON= --purple=1
	diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile
	--- a/irc/inspircd/Makefile
	+++ b/irc/inspircd/Makefile
	@@ -68,7 +68,7 @@
	GNUTLS_USES= pkgconfig
	GNUTLS_VARS= EXTRAS+=m_ssl_gnutls.cpp

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_VARS= EXTRAS+=m_ldap.cpp
	MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
	MBEDTLS_VARS= EXTRAS+=m_ssl_mbedtls.cpp
	diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile
	--- a/irc/quassel/Makefile
	+++ b/irc/quassel/Makefile
	@@ -13,11 +13,10 @@

	BUILD_DEPENDS= ${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs

	-USES= cmake compiler:c++11-lib cpe pkgconfig qca qt:5 tar:xz
	+USES= cmake compiler:c++11-lib cpe ldap pkgconfig qca qt:5 tar:xz
	USE_GITHUB= nodefault
	#GH_ACCOUNT= ${PORTNAME}
	#GH_PROJECT= ${PORTNAME}
	-USE_OPENLDAP= yes
	USE_QT= buildtools:build core network qmake:build

	CPE_VENDOR= quassel-irc
	diff --git a/lang/php80/Makefile.ext b/lang/php80/Makefile.ext
	--- a/lang/php80/Makefile.ext
	+++ b/lang/php80/Makefile.ext
	@@ -179,7 +179,7 @@
	CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \
	OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
	PHP_OPENSSL=yes
	-
	+
	LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
	USES+= ssl
	.endif
	@@ -197,8 +197,7 @@

	.if ${PHP_MODNAME} == "ldap"
	CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
	-
	-USE_OPENLDAP= yes
	+USE+= ldap
	.endif

	.if ${PHP_MODNAME} == "mbstring"
	diff --git a/lang/php81/Makefile b/lang/php81/Makefile
	--- a/lang/php81/Makefile
	+++ b/lang/php81/Makefile
	@@ -363,8 +363,7 @@
	.if ${PHP_MODNAME} == "ldap"
	CONFIGURE_ARGS+= --with-ldap-sasl=${LOCALBASE} \
	--with-ldap=${LOCALBASE}
	-
	-USE_OPENLDAP= yes
	+USES+= ldap
	.endif

	.if ${PHP_MODNAME} == "mbstring"
	diff --git a/lang/php82/Makefile b/lang/php82/Makefile
	--- a/lang/php82/Makefile
	+++ b/lang/php82/Makefile
	@@ -364,8 +364,7 @@
	.if ${PHP_MODNAME} == "ldap"
	CONFIGURE_ARGS+= --with-ldap-sasl=${LOCALBASE} \
	--with-ldap=${LOCALBASE}
	-
	-USE_OPENLDAP= yes
	+USES+= ldap
	.endif

	.if ${PHP_MODNAME} == "mbstring"
	diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
	--- a/mail/alpine/Makefile
	+++ b/mail/alpine/Makefile
	@@ -59,7 +59,7 @@
	IPV6_CONFIGURE_WITH= ipv6

	# Option LDAP
	-LDAP_USE= openldap=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= ldap
	LDAP_CFLAGS= -I${LOCALBASE}/include
	LDAP_LDFLAGS= -L${LOCALBASE}/lib
	diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
	--- a/mail/balsa/Makefile
	+++ b/mail/balsa/Makefile
	@@ -42,7 +42,7 @@
	GPG_DESC= GnuPG support
	GPG_CONFIGURE_WITH= gpgme
	GPG_LIB_DEPENDS= libgpgme.so:security/gpgme
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= ldap
	GTKSPELL_CONFIGURE_WITH= gtkspell
	GTKSPELL_LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3
	diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
	--- a/mail/claws-mail/Makefile
	+++ b/mail/claws-mail/Makefile
	@@ -51,7 +51,7 @@

	IPV6_CONFIGURE_ENABLE= ipv6

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_ENABLE= ldap

	NLS_USES= gettext-tools
	diff --git a/mail/cone/Makefile b/mail/cone/Makefile
	--- a/mail/cone/Makefile
	+++ b/mail/cone/Makefile
	@@ -17,11 +17,10 @@
	BUILD_DEPENDS= gpgv:security/gnupg1
	LIB_DEPENDS= libaspell.so:textproc/aspell \
	libcourier-unicode.so:devel/courier-unicode \
	- libidn.so:dns/libidn \
	- libldap_r.so:net/openldap24-client
	+ libidn.so:dns/libidn
	RUN_DEPENDS= gpgv:security/gnupg1

	-USES= compiler:c++11-lang fam gettext gmake gnome iconv \
	+USES= compiler:c++11-lang fam gettext gmake gnome iconv ldap:24 \
	localbase:ldflags ncurses perl5 pkgconfig shebangfix ssl \
	tar:bzip2
	USE_GNOME= libxml2
	diff --git a/mail/courier/Makefile b/mail/courier/Makefile
	--- a/mail/courier/Makefile
	+++ b/mail/courier/Makefile
	@@ -138,7 +138,7 @@
	.include "${.CURDIR}/Makefile.own"

	.if ${PORT_OPTIONS:MLDAP}
	-USE_OPENLDAP= yes
	+USES+= ldap
	WITH_AUTH_LDAP= yes
	RUN_DEPENDS+= ${LOCALBASE}/lib/courier-authlib/libauthldap.so:net/courier-authlib-ldap
	CONFIGURE_ARGS+=--with-ldapaliasd
	diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
	--- a/mail/cyrus-imapd23/Makefile
	+++ b/mail/cyrus-imapd23/Makefile
	@@ -52,7 +52,7 @@
	IDLED_DESC= Enable IMAP idled support
	IDLED_CONFIGURE_ENABLE= idled
	LDAP_PTLOADER_DESC= Enable LDAP ptloader
	-LDAP_PTLOADER_USE= OPENLDAP=yes
	+LDAP_PTLOADER_USES= ldap
	LDAP_PTLOADER_CONFIGURE_ON=--with-ldap=${LOCALBASE}
	LISTEXT_DESC= Enable IMAP List extensions
	LISTEXT_CONFIGURE_ENABLE=listext
	diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
	--- a/mail/cyrus-imapd24/Makefile
	+++ b/mail/cyrus-imapd24/Makefile
	@@ -51,7 +51,7 @@
	IDLED_DESC= Enable IMAP idled support
	IDLED_CONFIGURE_ENABLE= idled
	LDAP_DESC= Enable LDAP support (experimental)
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE}
	MURDER_DESC= Enable IMAP Murder support
	MURDER_CONFIGURE_ENABLE=murder
	diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile
	--- a/mail/cyrus-imapd25/Makefile
	+++ b/mail/cyrus-imapd25/Makefile
	@@ -63,7 +63,7 @@
	IDLED_DESC= Enable IMAP idled support
	IDLED_CONFIGURE_ENABLE= idled
	LDAP_DESC= Enable LDAP support (experimental)
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE}
	MURDER_DESC= Enable IMAP Murder support
	MURDER_CONFIGURE_ENABLE=murder
	diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile
	--- a/mail/cyrus-imapd30/Makefile
	+++ b/mail/cyrus-imapd30/Makefile
	@@ -67,7 +67,7 @@
	IDLED_DESC= Enable IMAP idled support
	IDLED_CONFIGURE_ENABLE= idled
	LDAP_DESC= Enable LDAP support (experimental)
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE}
	LMDB_DESC= Use LMDB backend
	LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb
	diff --git a/mail/cyrus-imapd32/Makefile b/mail/cyrus-imapd32/Makefile
	--- a/mail/cyrus-imapd32/Makefile
	+++ b/mail/cyrus-imapd32/Makefile
	@@ -72,7 +72,7 @@
	IDLED_DESC= Enable IMAP idled support
	IDLED_CONFIGURE_ENABLE= idled
	LDAP_DESC= Enable LDAP support (experimental)
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE}
	MURDER_DESC= Enable IMAP Murder support
	MURDER_CONFIGURE_ENABLE=murder
	diff --git a/mail/cyrus-imapd34/Makefile b/mail/cyrus-imapd34/Makefile
	--- a/mail/cyrus-imapd34/Makefile
	+++ b/mail/cyrus-imapd34/Makefile
	@@ -90,7 +90,7 @@
	IDLED_DESC= Enable IMAP idled support
	IDLED_CONFIGURE_ENABLE= idled
	LDAP_DESC= Enable LDAP support (experimental)
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE}
	MURDER_DESC= Enable IMAP Murder support
	MURDER_CONFIGURE_ENABLE=murder
	diff --git a/mail/cyrus-imapd36/Makefile b/mail/cyrus-imapd36/Makefile
	--- a/mail/cyrus-imapd36/Makefile
	+++ b/mail/cyrus-imapd36/Makefile
	@@ -91,7 +91,7 @@
	IDLED_DESC= Enable IMAP idled support
	IDLED_CONFIGURE_ENABLE= idled
	LDAP_DESC= Enable LDAP support (experimental)
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE}
	LDAP_CONFIGURE_OFF= --without-ldap
	MURDER_DESC= Enable IMAP Murder support
	diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
	--- a/mail/dbmail/Makefile
	+++ b/mail/dbmail/Makefile
	@@ -47,8 +47,7 @@

	DOCS= AUTHORS CHANGELOG.md INSTALL README THANKS UPGRADING

	-LDAP_USES= gettext-runtime
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= gettext-runtime ldap
	LDAP_CONFIGURE_WITH= ldap
	SIEVE_LIB_DEPENDS= libsieve.so:mail/libsieve
	SIEVE_CONFIGURE_WITH= sieve
	diff --git a/mail/dovecot-pigeonhole/Makefile b/mail/dovecot-pigeonhole/Makefile
	--- a/mail/dovecot-pigeonhole/Makefile
	+++ b/mail/dovecot-pigeonhole/Makefile
	@@ -49,7 +49,7 @@
	LDAP_CONFIGURE_WITH= ldap
	LDAP_CPPFLAGS= -I${LOCALBASE}/include
	LDAP_LDFLAGS= -L${LOCALBASE}/lib
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap

	PORTDOCS= sieve/extensions/* sieve/plugins/* sieve/locations/*

	diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
	--- a/mail/dovecot/Makefile
	+++ b/mail/dovecot/Makefile
	@@ -85,7 +85,7 @@
	CDB_CONFIGURE_WITH= cdb
	CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= ldap

	MYSQL_USES= mysql
	diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
	--- a/mail/dspam/Makefile
	+++ b/mail/dspam/Makefile
	@@ -304,7 +304,7 @@

	.if ${PORT_OPTIONS:MEXTERNAL_LOOKUP}
	CONFIGURE_ARGS+= --enable-external-lookup
	-USE_OPENLDAP= YES
	+USES+= ldap
	.endif

	.if ${PORT_OPTIONS:MUSER_HOMEDIR}
	diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
	--- a/mail/evolution/Makefile
	+++ b/mail/evolution/Makefile
	@@ -89,7 +89,7 @@

	LDAP_CMAKE_ON= -DWITH_OPENLDAP=${LOCALBASE}
	LDAP_CMAKE_OFF= -DWITH_OPENLDAP=OFF
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap

	YTNEF_DESC= Support MS Outlook TNEF format
	YTNEF_LIB_DEPENDS= libytnef.so:converters/ytnef
	diff --git a/mail/exim/Makefile b/mail/exim/Makefile
	--- a/mail/exim/Makefile
	+++ b/mail/exim/Makefile
	@@ -54,7 +54,7 @@
	INTERNATIONAL_LIB_DEPENDS= libidn.so:dns/libidn
	LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb
	MYSQL_USES= mysql
	-OPENLDAP_USE= openldap=yes
	+OPENLDAP_USES= ldap
	PGSQL_LIB_DEPENDS= libicudata.so:devel/icu
	PGSQL_USES= pgsql pkgconfig
	REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis
	@@ -321,10 +321,6 @@
	SEDLIST+= -e 's,XX_ICONV_LIBS_XX,,'
	.endif

	-.if ${PORT_OPTIONS:MOPENLDAP_VER} && ${WITH_OPENLDAP_VER:tl} != "auto"
	-WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER}
	-.endif
	-
	.if ${PORT_OPTIONS:MOPENLDAP}
	LDAP_LIB_TYPE= OPENLDAP2
	SEDLIST+= -e 's,XX_LDAP_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -llber -lldap,' \
	diff --git a/mail/gnarwl/Makefile b/mail/gnarwl/Makefile
	--- a/mail/gnarwl/Makefile
	+++ b/mail/gnarwl/Makefile
	@@ -12,8 +12,7 @@

	LIB_DEPENDS= libgdbm.so:databases/gdbm

	-USES= iconv gmake groff tar:tgz
	-USE_OPENLDAP= yes
	+USES= iconv gmake groff ldap tar:tgz
	GNU_CONFIGURE= yes
	CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --localstatedir="${PREFIX}/var"
	CPPFLAGS+= -I${LOCALBASE}/include
	diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile
	--- a/mail/mailutils/Makefile
	+++ b/mail/mailutils/Makefile
	@@ -80,7 +80,7 @@
	KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet
	KYOTOCABINET_CONFIGURE_WITH= kyotocabinet

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= ldap

	MYSQL_USES= mysql
	diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
	--- a/mail/milter-greylist/Makefile
	+++ b/mail/milter-greylist/Makefile
	@@ -56,7 +56,7 @@
	CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE}
	LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE}
	LDAP_LDFLAGS= -L${LOCALBASE}/lib
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap

	.include <bsd.port.options.mk>

	diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
	--- a/mail/opendkim/Makefile
	+++ b/mail/opendkim/Makefile
	@@ -84,7 +84,7 @@

	OPENLDAP_DESC= Store filter policies in LDAP
	OPENLDAP_CONFIGURE_WITH=openldap
	-OPENLDAP_USE= OPENLDAP=yes
	+OPENLDAP_USES= ldap

	POPAUTH_DESC= Use POP authentication DB
	POPAUTH_CONFIGURE_ENABLE= popauth
	diff --git a/mail/opensmtpd-extras-table-ldap/Makefile b/mail/opensmtpd-extras-table-ldap/Makefile
	--- a/mail/opensmtpd-extras-table-ldap/Makefile
	+++ b/mail/opensmtpd-extras-table-ldap/Makefile
	@@ -7,7 +7,7 @@

	CONFIGURE_ARGS+= --with-table-ldap

	-USE_OPENLDAP= client
	+USES= ldap

	MASTERDIR= ${.CURDIR}/../opensmtpd-extras
	SLAVE_PORT= yes
	diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
	--- a/mail/perdition/Makefile
	+++ b/mail/perdition/Makefile
	@@ -110,7 +110,7 @@
	.endif

	.if ${PORT_OPTIONS:MLDAP}
	-USE_OPENLDAP= yes
	+USES+= ldap
	CONFIGURE_ARGS+= --enable-ldap \
	--with-ldap-schema-directory=${LOCALBASE}/etc/openldap/schema/ \
	--disable-ldap-doc
	diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
	--- a/mail/postfix-current/Makefile
	+++ b/mail/postfix-current/Makefile
	@@ -88,7 +88,7 @@
	BLACKLISTD_EXTRA_PATCHES= ${FILESDIR}/extra-patch-blacklistd
	CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb
	EAI_LIB_DEPENDS= libicuuc.so:devel/icu
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb
	MYSQL_USES?= mysql
	PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2
	@@ -263,9 +263,6 @@

	.if ${PORT_OPTIONS:MLDAP}
	DYN_EXT+= ldap
	-. if defined(WITH_OPENLDAP_VER)
	-WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER}
	-. endif
	POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include \
	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
	POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -llber"
	diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
	--- a/mail/postfix/Makefile
	+++ b/mail/postfix/Makefile
	@@ -106,7 +106,7 @@
	CDB_DESC= CDB maps lookups
	EAI_DESC= Email Address Internationalization (SMTPUTF8) support
	INST_BASE_DESC= Install into /usr and /etc/postfix
	-LDAP_DESC= LDAP maps (uses WITH_OPENLDAP_VER)
	+LDAP_DESC= LDAP maps
	LMDB_DESC= LMDB maps
	PCRE2_DESC= Use Perl Compatible Regular Expressions, version 2
	RG1_DESC= Kerberos network authentication protocol type
	@@ -119,7 +119,7 @@
	BLACKLISTD_EXTRA_PATCHES= ${FILESDIR}/extra-patch-blacklistd
	CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb
	EAI_LIB_DEPENDS= libicuuc.so:devel/icu
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb
	MYSQL_USES?= mysql
	PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2
	@@ -300,9 +300,6 @@

	.if ${PORT_OPTIONS:MLDAP}
	DYN_EXT+= ldap
	-. if defined(WITH_OPENLDAP_VER)
	-WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER}
	-. endif
	POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include \
	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
	POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -llber"
	diff --git a/mail/qmail-activedir/Makefile b/mail/qmail-activedir/Makefile
	--- a/mail/qmail-activedir/Makefile
	+++ b/mail/qmail-activedir/Makefile
	@@ -8,19 +8,14 @@
	COMMENT= Programs to allow qmail to authenticate users through a MS ad
	WWW= http://fo2k.com/qmail-activedir/

	-USES= qmail:run
	+USES= ldap qmail:run
	SUB_FILES= pkg-message
	SUB_LIST+= QMAIL_PREFIX=${QMAIL_PREFIX}
	-USE_OPENLDAP= yes

	BINARIES= checkadpassword qmail-adgetpw create_alias_files

	CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -Wall -lldap

	-.if defined(WITH_OPENLDAP_VER)
	-WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER}
	-.endif
	-
	OPTIONS_DEFINE= DOCS

	post-patch:
	diff --git a/mail/sendmail-devel/Makefile b/mail/sendmail-devel/Makefile
	--- a/mail/sendmail-devel/Makefile
	+++ b/mail/sendmail-devel/Makefile
	@@ -72,7 +72,7 @@
	SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
	SASLAUTHD_RUN_DEPENDS= saslauthd:security/cyrus-sasl2-saslauthd
	DANE_IMPLIES= TLS
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_IMPLIES= DANE
	BDB_USES= bdb
	GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm
	diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
	--- a/mail/sendmail/Makefile
	+++ b/mail/sendmail/Makefile
	@@ -71,7 +71,7 @@
	SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
	SASLAUTHD_RUN_DEPENDS= saslauthd:security/cyrus-sasl2-saslauthd
	DANE_IMPLIES= TLS
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_IMPLIES= DANE
	BDB_USES= bdb
	GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm
	diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
	--- a/mail/spamass-milter/Makefile
	+++ b/mail/spamass-milter/Makefile
	@@ -24,7 +24,7 @@
	.endif

	.if ${PORT_OPTIONS:MLDAP}
	-USE_OPENLDAP=yes
	+USE+= ldap
	CPPFLAGS+= -I${LOCALBASE}/include
	LDFLAGS+= -L${LOCALBASE}/lib
	.endif
	diff --git a/mail/spmfilter/Makefile b/mail/spmfilter/Makefile
	--- a/mail/spmfilter/Makefile
	+++ b/mail/spmfilter/Makefile
	@@ -54,10 +54,7 @@
	.endif

	.if ${PORT_OPTIONS:MLDAP}
	-USE_OPENLDAP= yes
	-.if ${PORT_OPTIONS:MOPENLDAP_VER}
	-WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER}
	-.endif
	+USES+= ldap
	.else
	CMAKE_ARGS+= -DWITHOUT_LDAP=TRUE
	.endif
	diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
	--- a/mail/sylpheed/Makefile
	+++ b/mail/sylpheed/Makefile
	@@ -69,7 +69,7 @@
	HIDE_OSSIG_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_main.c

	LDAP_CONFIGURE_ENABLE= ldap
	-LDAP_USE= openldap=yes
	+LDAP_USES= ldap

	ONIGURUMA_LIB_DEPENDS= libonig.so:devel/oniguruma
	ONIGURUMA_CONFIGURE_ENABLE= oniguruma
	diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
	--- a/mail/tpop3d/Makefile
	+++ b/mail/tpop3d/Makefile
	@@ -49,7 +49,7 @@
	PGSQL_CONFIGURE_ON= --enable-auth-pgsql \
	--with-pgsql-lib-dir=${LOCALBASE}/lib \
	--with-pgsql-include-dir=${LOCALBASE}/include
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_ON= --enable-auth-ldap --with-openldap-root=${LOCALBASE}
	PERLAUTH_USES= perl5
	FIX_PERLAUTH_EXTRA_PATCHES=${PATCHDIR}/extra-patch-auth_perl.c
	diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
	--- a/mail/vpopmail/Makefile
	+++ b/mail/vpopmail/Makefile
	@@ -252,7 +252,7 @@
	# End of user-configurable variables

	.if ${PORT_OPTIONS:MLDAP}
	-USE_OPENLDAP= yes
	+USES+= ldap
	LDAP_FILES= ${WRKSRC}/doc/README.ldap \
	${WRKSRC}/ldap/nsswitch.conf \
	${WRKSRC}/ldap/pam_ldap.conf \
	diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
	--- a/net-im/jabberd/Makefile
	+++ b/net-im/jabberd/Makefile
	@@ -80,7 +80,7 @@
	BDB_CONFIGURE_ENABLE= db
	BDB_CONFIGURE_ON= --oldincludedir=/nonexistant

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_ENABLE= ldap

	FS_CONFIGURE_ENABLE= fs
	diff --git a/net-mgmt/adcli/Makefile b/net-mgmt/adcli/Makefile
	--- a/net-mgmt/adcli/Makefile
	+++ b/net-mgmt/adcli/Makefile
	@@ -9,7 +9,6 @@

	LICENSE= LGPL21

	-USE_OPENLDAP= yes
	BUILD_DEPENDS= xsltproc:textproc/libxslt \
	docbook-xml>0:textproc/docbook-xml \
	docbook-xsl>0:textproc/docbook-xsl
	@@ -28,7 +27,7 @@
	ac_cv_path_XMLTO=${PORT_OPTIONS:MDOCS:S\|DOCS\|${LOCALBASE}/bin/xmlto\|:S\|^$\|${TRUE}\|}
	CONFIGURE_ARGS= --sysconfdir=/etc

	-USES= autoreconf libtool
	+USES= autoreconf ldap libtool

	# Kerberos may or may not be there, but LDAP always is:
	CFLAGS+= -I${LOCALBASE}/include
	diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
	--- a/net-mgmt/collectd5/Makefile
	+++ b/net-mgmt/collectd5/Makefile
	@@ -192,7 +192,7 @@
	ONEWIRE_CONFIGURE_ENABLE= onewire
	ONEWIRE_CONFIGURE_WITH= libowcapi=${LOCALBASE}

	-OPENLDAP_USE= OPENLDAP=yes
	+OPENLDAP_USES= ldap
	OPENLDAP_CONFIGURE_ENABLE= openldap
	OPENLDAP_CONFIGURE_WITH= libldap=${LOCALBASE}

	diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile
	--- a/net-mgmt/monitoring-plugins/Makefile
	+++ b/net-mgmt/monitoring-plugins/Makefile
	@@ -82,7 +82,7 @@

	IPV6_CONFIGURE_WITH= ipv6

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= ldap

	MYSQL_USES= mysql
	diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
	--- a/net-mgmt/nagios-plugins/Makefile
	+++ b/net-mgmt/nagios-plugins/Makefile
	@@ -85,7 +85,7 @@

	IPV6_CONFIGURE_WITH= ipv6

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= ldap

	MYSQL_USES= mysql
	diff --git a/net-mgmt/seafile-server/Makefile b/net-mgmt/seafile-server/Makefile
	--- a/net-mgmt/seafile-server/Makefile
	+++ b/net-mgmt/seafile-server/Makefile
	@@ -58,7 +58,7 @@
	FUSE_LIB_DEPENDS= libfuse.so:sysutils/fusefs-libs

	LDAP_CONFIGURE_ENABLE= ldap
	-LDAP_USE= openldap=yes
	+LDAP_USES= ldap

	NLS_USES= gettext

	diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
	--- a/net-mgmt/xymon-server/Makefile
	+++ b/net-mgmt/xymon-server/Makefile
	@@ -56,7 +56,7 @@

	.if ${PORT_OPTIONS:MLDAP}
	MAKE_ENV+= WITH_LDAP=1
	-USE_OPENLDAP= yes
	+USE+= ldap
	.endif

	.if ${PORT_OPTIONS:MNETSNMP}
	diff --git a/net-mgmt/zabbix4-server/Makefile b/net-mgmt/zabbix4-server/Makefile
	--- a/net-mgmt/zabbix4-server/Makefile
	+++ b/net-mgmt/zabbix4-server/Makefile
	@@ -96,7 +96,7 @@
	ORACLE_CONFIGURE_WITH= oracle

	LDAP_CONFIGURE_WITH= ldap
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap

	IPMI_CONFIGURE_WITH= openipmi
	IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi
	diff --git a/net-mgmt/zabbix5-server/Makefile b/net-mgmt/zabbix5-server/Makefile
	--- a/net-mgmt/zabbix5-server/Makefile
	+++ b/net-mgmt/zabbix5-server/Makefile
	@@ -96,7 +96,7 @@
	ORACLE_CONFIGURE_WITH= oracle

	LDAP_CONFIGURE_WITH= ldap
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap

	IPMI_CONFIGURE_WITH= openipmi
	IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi
	diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile
	--- a/net-mgmt/zabbix6-server/Makefile
	+++ b/net-mgmt/zabbix6-server/Makefile
	@@ -105,7 +105,7 @@
	IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi

	LDAP_CONFIGURE_WITH= ldap
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap

	MYSQL_CONFIGURE_ON= --with-mysql
	MYSQL_USES+= compiler:c11 mysql:80
	diff --git a/net-mgmt/zabbix62-server/Makefile b/net-mgmt/zabbix62-server/Makefile
	--- a/net-mgmt/zabbix62-server/Makefile
	+++ b/net-mgmt/zabbix62-server/Makefile
	@@ -105,7 +105,7 @@
	IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi

	LDAP_CONFIGURE_WITH= ldap
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap

	MYSQL_CONFIGURE_ON= --with-mysql
	MYSQL_USES+= compiler:c11 mysql:80
	diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
	--- a/net/asterisk16/Makefile
	+++ b/net/asterisk16/Makefile
	@@ -143,7 +143,7 @@
	GSM_LIB_DEPENDS= libgsm.so:audio/gsm

	LDAP_CONFIGURE_WITH= ldap
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap

	LUA_CONFIGURE_WITH= lua
	LUA_USES= lua
	diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile
	--- a/net/asterisk18/Makefile
	+++ b/net/asterisk18/Makefile
	@@ -143,7 +143,7 @@
	GSM_LIB_DEPENDS= libgsm.so:audio/gsm

	LDAP_CONFIGURE_WITH= ldap
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap

	LUA_CONFIGURE_WITH= lua
	LUA_USES= lua
	diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile
	--- a/net/ceph14/Makefile
	+++ b/net/ceph14/Makefile
	@@ -60,11 +60,10 @@
	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
	${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR}

	-USES= cmake:noninja compiler:c++17-lang cpe dos2unix fuse gettext-runtime gmake ncurses \
	+USES= cmake:noninja compiler:c++17-lang cpe dos2unix fuse gettext-runtime gmake ldap ncurses \
	pkgconfig python:3.8-3.9 readline shebangfix ssl
	CPE_VENDOR= linuxfoundation
	USE_PYTHON= cython py3kplist
	-USE_OPENLDAP= yes
	USE_GITHUB= yes
	GH_ACCOUNT= ceph:DEFAULT
	DOS2UNIX_FILES= src/pybind/mgr/diskprediction_cloud/common/__init__.py
	diff --git a/net/echoping/Makefile b/net/echoping/Makefile
	--- a/net/echoping/Makefile
	+++ b/net/echoping/Makefile
	@@ -34,7 +34,7 @@
	OPTIONS_DEFAULT=LDAP
	OPTIONS_SUB= yes

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_VARS= PING_PLUGINS+=ldap

	PGSQL_USES= pgsql
	diff --git a/net/fpc-ldap/Makefile b/net/fpc-ldap/Makefile
	--- a/net/fpc-ldap/Makefile
	+++ b/net/fpc-ldap/Makefile
	@@ -14,6 +14,6 @@
	OPENLDAP_DESC= Install OpenLDAP libraries
	OPTIONS_DEFAULT= OPENLDAP

	-OPENLDAP_USE= OPENLDAP=yes
	+OPENLDAP_USES= ldap

	.include "${MASTERDIR}/Makefile"
	diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
	--- a/net/freeradius3/Makefile
	+++ b/net/freeradius3/Makefile
	@@ -107,7 +107,7 @@
	FIREBIRD_USES= firebird
	LDAP_CONFIGURE_WITH= rlm_ldap
	LDAP_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
	-LDAP_USE= OPENLDAP
	+LDAP_USES= ldap
	LDAP_VARS= _REQUIRE+=slapd
	MITKRB_PORT_CONFIGURE_ON= --with-rlm-krb5-dir=${LOCALBASE}
	MITKRB_PORT_LIB_DEPENDS= libkrb5support.so:security/krb5
	diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile
	--- a/net/gnu-dico/Makefile
	+++ b/net/gnu-dico/Makefile
	@@ -38,7 +38,7 @@
	GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2
	GUILE_CONFIGURE_OFF= --without-guile

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_OFF= --without-ldap

	NLS_USES= gettext
	diff --git a/net/gq/Makefile b/net/gq/Makefile
	--- a/net/gq/Makefile
	+++ b/net/gq/Makefile
	@@ -18,10 +18,9 @@

	LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring

	-USES= desktop-file-utils gettext gmake gnome pkgconfig \
	+USES= desktop-file-utils gettext gmake gnome ldap pkgconfig \
	shared-mime-info ssl
	USE_GNOME= intltool libglade2
	-USE_OPENLDAP= yes
	GNU_CONFIGURE= yes
	CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE} --disable-update-mimedb

	diff --git a/net/isc-dhcp44-server/Makefile b/net/isc-dhcp44-server/Makefile
	--- a/net/isc-dhcp44-server/Makefile
	+++ b/net/isc-dhcp44-server/Makefile
	@@ -90,8 +90,7 @@
	BINLEASES_CONFIGURE_ENABLE= binary-leases
	PARANOIA_CONFIGURE_ENABLE= paranoia early-chroot
	LDAP_CONFIGURE_WITH= ldap ldapcrypto
	-LDAP_USE= OPENLDAP
	-LDAP_USES= shebangfix
	+LDAP_USES= ldap shebangfix
	LDAP_SSL_USES= ssl
	LDAP_SSL_VARS= LIBS+=-lssl
	LDAP_IMPLIES= IPV6
	diff --git a/net/kldap/Makefile b/net/kldap/Makefile
	--- a/net/kldap/Makefile
	+++ b/net/kldap/Makefile
	@@ -11,14 +11,13 @@
	LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
	libqt5keychain.so:security/qtkeychain@qt5

	-USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	+USES= cmake compiler:c++11-lib gettext kde:5 ldap qt:5 tar:xz
	USE_KDE= completion config coreaddons i18n kio widgetsaddons service \
	ecm:build
	# pim components
	USE_KDE+= mbox
	USE_QT= concurrent core dbus gui network widgets \
	buildtools:build qmake:build
	-USE_OPENLDAP= yes
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	diff --git a/net/ldapdiff/Makefile b/net/ldapdiff/Makefile
	--- a/net/ldapdiff/Makefile
	+++ b/net/ldapdiff/Makefile
	@@ -11,8 +11,7 @@

	LICENSE= GPLv3+

	-USES= cpe iconv tar:tgz
	-USE_OPENLDAP= yes
	+USES= cpe iconv ldap tar:tgz
	GNU_CONFIGURE= yes
	CONFIGURE_ARGS= --prefix=${LOCALBASE} \
	--with-ldap-dir=${LOCALBASE}
	diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile
	--- a/net/ldapscripts/Makefile
	+++ b/net/ldapscripts/Makefile
	@@ -11,19 +11,11 @@

	LICENSE= GPLv2

	-RUN_DEPENDS= ldapadd:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \
	- ldapsearch:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \
	- ldapdelete:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \
	- ldapmodify:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \
	- ldapmodrdn:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \
	- ldappasswd:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client
	-
	NO_ARCH= yes

	OPTIONS_DEFINE= SASL DOCS

	-USES= iconv tar:tgz
	-USE_OPENLDAP= yes
	+USES= iconv ldap tar:tgz
	LIBDIR= ${PREFIX}/lib/${PORTNAME}
	MAKE_ENV+= MANDIR=${MANPREFIX}/man \
	ETCDIR=${ETCDIR}
	diff --git a/net/liblinphone/Makefile b/net/liblinphone/Makefile
	--- a/net/liblinphone/Makefile
	+++ b/net/liblinphone/Makefile
	@@ -46,7 +46,7 @@
	OPTIONS_SUB= yes

	LDAP_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CMAKE_BOOL= ENABLE_LDAP
	VIDEO_CMAKE_BOOL= ENABLE_VIDEO

	diff --git a/net/lualdap/Makefile b/net/lualdap/Makefile
	--- a/net/lualdap/Makefile
	+++ b/net/lualdap/Makefile
	@@ -11,8 +11,7 @@

	LICENSE= MIT

	-USES= gmake lua:module
	-USE_OPENLDAP= yes
	+USES= gmake ldap lua:module
	USE_GITHUB= yes
	USE_CSTD= c99

	diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
	--- a/net/netatalk3/Makefile
	+++ b/net/netatalk3/Makefile
	@@ -58,7 +58,7 @@
	MDNSRESPONDER_SUB_LIST= ZEROCONF="mdnsd"
	LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE}
	LDAP_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_OFF= --without-ldap
	SENDFILE_CONFIGURE_ENABLE=sendfile
	DBUS_USES= gnome python
	diff --git a/net/nss-pam-ldapd/Makefile b/net/nss-pam-ldapd/Makefile
	--- a/net/nss-pam-ldapd/Makefile
	+++ b/net/nss-pam-ldapd/Makefile
	@@ -12,10 +12,9 @@
	LICENSE= LGPL21 LGPL3
	LICENSE_COMB= dual

	-USES= cpe
	+USES= cpe ldap
	CPE_VENDOR= arthurdejong
	GNU_CONFIGURE= yes
	-USE_OPENLDAP= yes
	USE_RC_SUBR= nslcd
	PAM_LDAP_SHMAJOR= 1
	NSS_LDAP_SHMAJOR= 1
	diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile
	--- a/net/nss_ldap/Makefile
	+++ b/net/nss_ldap/Makefile
	@@ -14,11 +14,10 @@

	NSS_LDAP_VERSION=265

	-USES= autoreconf cpe gmake perl5
	+USES= autoreconf cpe gmake ldap perl5
	USE_PERL5= build
	GNU_CONFIGURE= yes
	USE_LDCONFIG= yes
	-USE_OPENLDAP= yes
	CPE_VENDOR= padl

	OPTIONS_DEFINE= LCLASS KERBEROS
	diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile
	--- a/net/ntopng/Makefile
	+++ b/net/ntopng/Makefile
	@@ -24,9 +24,8 @@
	libhiredis.so:databases/hiredis
	BUILD_DEPENDS= bash:shells/bash

	-USES= autoreconf compiler:c++11-lang cpe gmake libtool localbase \
	+USES= autoreconf compiler:c++11-lang cpe gmake ldap libtool localbase \
	lua:54 mysql pathfix pkgconfig shebangfix sqlite ssl
	-USE_OPENLDAP= yes

	SUB_FILES= ntopng-geoip2update.sh pkg-deinstall
	SHEBANG_FILES= httpdocs/misc/ntopng-add-user.sh \
	diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
	--- a/net/openldap24-server/Makefile
	+++ b/net/openldap24-server/Makefile
	@@ -46,11 +46,6 @@
	# :keepla because port uses lt_dlopen
	USES= cpe libtool:keepla ssl tar:tgz

	-WANT_OPENLDAP_VER?= 24
	-.if ${WANT_OPENLDAP_VER} != 24
	-BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
	-.endif
	-
	PORTREVISION_CLIENT= 4
	PORTREVISION_SERVER= 11
	OPENLDAP_SHLIB_MAJOR= 2
	@@ -370,15 +365,11 @@

	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
	+USES+= ldap:24

	LIB_DEPENDS+= libicudata.so:devel/icu

	diff --git a/net/openradius/Makefile b/net/openradius/Makefile
	--- a/net/openradius/Makefile
	+++ b/net/openradius/Makefile
	@@ -33,7 +33,7 @@
	.include <bsd.port.options.mk>

	.if ${PORT_OPTIONS:MLDAP}
	-USE_OPENLDAP= YES
	+USES=+ ldap
	PLIST_SUB+= LDAP=""
	SCRIPTS_ENV+= USE_LDAP=yes
	.else
	diff --git a/net/opensips31/Makefile b/net/opensips31/Makefile
	--- a/net/opensips31/Makefile
	+++ b/net/opensips31/Makefile
	@@ -56,7 +56,7 @@
	HTTP_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd
	HTTP_VARS= EXTRA_MODULES+=httpd

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_VARS= EXTRA_MODULES+="ldap h350"

	MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached
	diff --git a/net/proftpd-mod_ldap/Makefile b/net/proftpd-mod_ldap/Makefile
	--- a/net/proftpd-mod_ldap/Makefile
	+++ b/net/proftpd-mod_ldap/Makefile
	@@ -13,8 +13,7 @@

	MASTERDIR= ${.CURDIR}/../../ftp/proftpd

	-USE_OPENLDAP= yes
	-USES= cpe ssl
	+USES= cpe ldap ssl

	INCLUDEDIRS= ${LOCALBASE}/include
	LIBDIRS= ${LOCALBASE}/lib
	diff --git a/net/proxy-suite/Makefile b/net/proxy-suite/Makefile
	--- a/net/proxy-suite/Makefile
	+++ b/net/proxy-suite/Makefile
	@@ -32,7 +32,7 @@
	# OPTIONAL: include ldap-support
	#
	.if defined(WITH_LDAP)
	-USE_OPENLDAP= yes
	+USES+= ldap
	CONFIGURE_ARGS+= --with-libldap=${LOCALBASE}/lib
	.else
	CONFIGURE_ARGS+= --without-libldap
	diff --git a/net/py-ldap/Makefile b/net/py-ldap/Makefile
	--- a/net/py-ldap/Makefile
	+++ b/net/py-ldap/Makefile
	@@ -15,9 +15,8 @@
	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR} \
	${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:devel/py-pyasn1-modules@${PY_FLAVOR}

	-USES= python:3.6+
	+USES= ldap python:3.6+
	USE_PYTHON= autoplist distutils
	-USE_OPENLDAP= yes

	post-patch:
	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' ${WRKSRC}/setup.py
	diff --git a/net/py-ldap0/Makefile b/net/py-ldap0/Makefile
	--- a/net/py-ldap0/Makefile
	+++ b/net/py-ldap0/Makefile
	@@ -12,11 +12,10 @@
	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/openldap24-server
	+TEST_DEPENDS= ${LOCALBASE}/libexec/slapd:net/openldap${OPENLDAP_VER}-server

	-USES= localbase python:3.6+
	+USES= ldap:24 localbase python:3.6+
	USE_LOCALE= en_US.UTF-8
	-USE_OPENLDAP= yes
	USE_PYTHON= autoplist distutils

	USE_GITLAB= yes
	diff --git a/net/samba413/Makefile b/net/samba413/Makefile
	--- a/net/samba413/Makefile
	+++ b/net/samba413/Makefile
	@@ -362,7 +362,7 @@

	LDAP_CONFIGURE_WITH= ldap
	LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE}
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_VARS= SAMBA4_MODULES+=idmap_ldap

	LIBZFS_CONFIGURE_WITH= libzfs
	diff --git a/net/samba416/Makefile b/net/samba416/Makefile
	--- a/net/samba416/Makefile
	+++ b/net/samba416/Makefile
	@@ -380,7 +380,7 @@

	LDAP_CONFIGURE_WITH= ldap
	LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE}
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_VARS= SAMBA4_MODULES+=idmap_ldap

	LIBZFS_CONFIGURE_WITH= libzfs
	diff --git a/net/ss5/Makefile b/net/ss5/Makefile
	--- a/net/ss5/Makefile
	+++ b/net/ss5/Makefile
	@@ -16,8 +16,7 @@

	WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-[0-9]+//}

	-USES= ssl
	-USE_OPENLDAP= yes
	+USES= ldap ssl
	USE_RC_SUBR= ${PORTNAME}

	GNU_CONFIGURE= yes
	diff --git a/net/x2goclient/Makefile b/net/x2goclient/Makefile
	--- a/net/x2goclient/Makefile
	+++ b/net/x2goclient/Makefile
	@@ -28,7 +28,7 @@
	OPTIONS_DEFINE= DOCS LDAP
	OPTIONS_DEFAULT= LDAP

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CFLAGS= -DUSELDAP
	LDAP_QMAKE_ON= LIBS+="-lX11 -lXpm -lcups -lldap"
	LDAP_QMAKE_OFF= LIBS+="-lX11 -lXpm -lcups"
	diff --git a/net/yptransitd/Makefile b/net/yptransitd/Makefile
	--- a/net/yptransitd/Makefile
	+++ b/net/yptransitd/Makefile
	@@ -11,8 +11,7 @@
	LICENSE= BSD4CLAUSE
	LICENSE_FILE= ${WRKSRC}/LICENSE

	-USES= bison
	-USE_OPENLDAP= yes
	+USES= ldap bison
	GNU_CONFIGURE= yes
	CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE}
	USE_LDCONFIG= yes
	diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
	--- a/news/nntpcache/Makefile
	+++ b/news/nntpcache/Makefile
	@@ -43,7 +43,7 @@

	SPAMPHOBIA_DESC= Spamphobia NoCeM support

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= authinfo-ldap
	LDAP_CPPFLAGS= -I${PREFIX}/include -I${LOCALBASE}/include
	LDAP_LDFLAGS= -L${PREFIX}/lib -L${LOCALBASE}/lib
	diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
	--- a/print/cups-filters/Makefile
	+++ b/print/cups-filters/Makefile
	@@ -108,7 +108,7 @@

	LDAP_CONFIGURE_ENABLE= ldap
	LDAP_DESC= Get printer locations from an LDAP server
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap

	# Default PDF-to-PostScript renderer

	diff --git a/security/clamav-lts/Makefile b/security/clamav-lts/Makefile
	--- a/security/clamav-lts/Makefile
	+++ b/security/clamav-lts/Makefile
	@@ -93,7 +93,7 @@
	IPV6_CONFIGURE_ENABLE= ipv6
	JSON_LIB_DEPENDS= libjson-c.so:devel/json-c
	JSON_CONFIGURE_WITH= libjson=${LOCALBASE}
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_LDFLAGS= -lldap -L${LOCALBASE}/lib
	LHA_RUN_DEPENDS= lha:archivers/lha
	.if !exists(/usr/lib/libmilter.so)
	diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
	--- a/security/courier-authlib/Makefile
	+++ b/security/courier-authlib/Makefile
	@@ -109,7 +109,7 @@
	OPTIONS_DEFINE+= DOCS

	DOCS= README.ldap
	-USE_OPENLDAP= yes
	+USES+= ldap
	CONFIGURE_ARGS+=--with-authldap
	.else
	CONFIGURE_ARGS+=--without-authldap
	diff --git a/security/cyrus-sasl2-ldapdb/Makefile b/security/cyrus-sasl2-ldapdb/Makefile
	--- a/security/cyrus-sasl2-ldapdb/Makefile
	+++ b/security/cyrus-sasl2-ldapdb/Makefile
	@@ -5,6 +5,6 @@

	CYRUS_CONFIGURE_ARGS= --enable-ldapdb --with-ldap=${LOCALBASE}

	-USE_OPENLDAP= yes
	+USES= ldap

	.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"
	diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
	--- a/security/cyrus-sasl2-saslauthd/Makefile
	+++ b/security/cyrus-sasl2-saslauthd/Makefile
	@@ -20,7 +20,7 @@
	HTTPFORM_DESC= Enable HTTP form authentication
	HTTPFORM_CONFIGURE_ENABLE=httpform
	OPENLDAP_DESC= Use OpenLDAP
	-OPENLDAP_USE= OPENLDAP=yes
	+OPENLDAP_USES= ldap
	OPENLDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE}

	SASLDB_DESC= Experimental SASLdb authentication module
	diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
	--- a/security/dirmngr/Makefile
	+++ b/security/dirmngr/Makefile
	@@ -18,8 +18,7 @@
	libksba.so:security/libksba \
	libpth.so:devel/pth

	-USES= gmake iconv tar:bzip2
	-USE_OPENLDAP= yes
	+USES= gmake iconv ldap tar:bzip2
	GNU_CONFIGURE= yes
	INFO= dirmngr

	diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
	--- a/security/gnupg/Makefile
	+++ b/security/gnupg/Makefile
	@@ -47,7 +47,7 @@

	LDAP_CONFIGURE_WITH= ldap=${LOCALBASE}
	LDAP_LIBS= -L${LOCALBASE}/lib
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap

	NLS_CONFIGURE_ENABLE= nls
	NLS_USES= gettext
	diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
	--- a/security/gnupg1/Makefile
	+++ b/security/gnupg1/Makefile
	@@ -45,7 +45,7 @@

	LIBUSB_CONFIGURE_WITH= libusb=${LOCALBASE}

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= ldap=${LOCALBASE}

	NLS_USES= gettext
	diff --git a/security/gvm-libs/Makefile b/security/gvm-libs/Makefile
	--- a/security/gvm-libs/Makefile
	+++ b/security/gvm-libs/Makefile
	@@ -34,7 +34,7 @@

	LDAP_CMAKE_ON= -DBUILD_WITH_LDAP=1
	LDAP_CMAKE_OFF= -DBUILD_WITH_LDAP=0
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	RADIUS_CMAKE_ON= -DBUILD_WITH_RADIUS=1
	RADIUS_CMAKE_OFF= -DBUILD_WITH_RADIUS=0
	RADIUS_LIB_DEPENDS= libfreeradius-client.so:net/freeradius-client
	diff --git a/security/heimdal-devel/Makefile b/security/heimdal-devel/Makefile
	--- a/security/heimdal-devel/Makefile
	+++ b/security/heimdal-devel/Makefile
	@@ -91,7 +91,7 @@
	SQLITE_CONFIGURE_WITH= sqlite3

	LDAP_DESC= Enable OpenLDAP KDC backend support
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_ON= --with-openldap-include="${LOCALBASE}/include" \
	--with-openldap-lib="${LOCALBASE}/lib"
	LDAP_CONFIGURE_WITH= openldap
	diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
	--- a/security/heimdal/Makefile
	+++ b/security/heimdal/Makefile
	@@ -80,7 +80,7 @@
	SQLITE_CONFIGURE_WITH= sqlite3

	LDAP_DESC= Enable OpenLDAP KDC backend support
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_ON= --with-openldap-include="${LOCALBASE}/include" \
	--with-openldap-lib="${LOCALBASE}/lib"
	LDAP_CONFIGURE_WITH= openldap
	diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
	--- a/security/ipsec-tools/Makefile
	+++ b/security/ipsec-tools/Makefile
	@@ -64,7 +64,7 @@
	GSSAPI_LDFLAGS= -L${LOCALBASE}/lib
	GSSAPI_CONFIGURE_ENABLE=gssapi
	RADIUS_CONFIGURE_WITH= libradius
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_ON= --with-libldap=${LOCALBASE}
	LDAP_CONFIGURE_OFF= --without-libldap
	SAUNSPEC_CONFIGURE_ENABLE= samode-unspec
	diff --git a/security/krb5-118/Makefile b/security/krb5-118/Makefile
	--- a/security/krb5-118/Makefile
	+++ b/security/krb5-118/Makefile
	@@ -50,7 +50,7 @@
	DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names
	DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for-realm
	LDAP= Enable LDAP support
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= ldap
	LMDB_DESC= OpenLDAP Lightning Memory-Mapped Database support
	LMDB_CONFIGURE_WITH= lmdb
	diff --git a/security/krb5-119/Makefile b/security/krb5-119/Makefile
	--- a/security/krb5-119/Makefile
	+++ b/security/krb5-119/Makefile
	@@ -46,7 +46,7 @@
	DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names
	DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for-realm
	LDAP= Enable LDAP support
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= ldap
	LMDB_DESC= OpenLDAP Lightning Memory-Mapped Database support
	LMDB_CONFIGURE_WITH= lmdb
	diff --git a/security/krb5-120/Makefile b/security/krb5-120/Makefile
	--- a/security/krb5-120/Makefile
	+++ b/security/krb5-120/Makefile
	@@ -46,7 +46,7 @@
	DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names
	DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for-realm
	LDAP= Enable LDAP support
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= ldap
	LMDB_DESC= OpenLDAP Lightning Memory-Mapped Database support
	LMDB_CONFIGURE_WITH= lmdb
	diff --git a/security/krb5-devel/Makefile b/security/krb5-devel/Makefile
	--- a/security/krb5-devel/Makefile
	+++ b/security/krb5-devel/Makefile
	@@ -45,7 +45,7 @@
	DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names
	DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for-realm
	LDAP= Enable LDAP support
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= ldap
	LMDB_DESC= OpenLDAP Lightning Memory-Mapped Database support
	LMDB_CONFIGURE_WITH= lmdb
	diff --git a/security/libpki/Makefile b/security/libpki/Makefile
	--- a/security/libpki/Makefile
	+++ b/security/libpki/Makefile
	@@ -35,7 +35,7 @@
	PGSQL_DESC= "Enable PostgreSQL support"

	DNS_CONFIGURE_ENABLE= dns
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_ENABLE= ldap
	MYSQL_USES= mysql
	MYSQL_CONFIGURE_ENABLE= mysql
	diff --git a/security/opencryptoki/Makefile b/security/opencryptoki/Makefile
	--- a/security/opencryptoki/Makefile
	+++ b/security/opencryptoki/Makefile
	@@ -15,8 +15,7 @@
	LIB_DEPENDS= libtspi.so:security/trousers \
	libepoll-shim.so:devel/libepoll-shim

	-USES= alias autoreconf bison gmake libtool localbase ssl tar:tgz
	-USE_OPENLDAP= yes
	+USES= alias autoreconf bison gmake ldap libtool localbase ssl tar:tgz
	USE_LDCONFIG= ${PREFIX}/lib/opencryptoki
	USE_GITHUB= yes
	GNU_CONFIGURE= yes
	diff --git a/security/openscep/Makefile b/security/openscep/Makefile
	--- a/security/openscep/Makefile
	+++ b/security/openscep/Makefile
	@@ -14,13 +14,12 @@
	DEPRECATED= Do not support recent RFC 8894
	EXPIRATION_DATE= 2023-03-31

	-USES= apache gmake libtool ssl
	+USES= apache gmake ldap libtool ssl
	BROKEN_SSL= base
	BROKEN_SSL_REASON= unexpected type name 'issuer_and_subject_t': expected expression
	IGNORE_SSL= libressl libressl-devel
	IGNORE_SSL_REASON= unknown ASN1 functions
	USE_LDCONFIG= yes
	-USE_OPENLDAP= yes

	GNU_CONFIGURE= yes
	CONFIGURE_ARGS= --with-html-install-dir="${PREFIX}/www/openscep" \
	diff --git a/security/openvpn-auth-ldap/Makefile b/security/openvpn-auth-ldap/Makefile
	--- a/security/openvpn-auth-ldap/Makefile
	+++ b/security/openvpn-auth-ldap/Makefile
	@@ -19,11 +19,10 @@
	# and https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=235776
	# appears to document issues on some systems when --with-openssl
	# is missing.
	-USES= autoreconf objc ssl tar:xz
	+USES= autoreconf ldap objc ssl tar:xz
	USE_GITHUB= yes
	GH_ACCOUNT= threerings
	GNU_CONFIGURE= yes
	-USE_OPENLDAP= yes
	CONFIGURE_ARGS+= --with-openldap=${LOCALBASE} \
	--with-openvpn=${LOCALBASE}/include \
	--with-objc-runtime=GNU \
	diff --git a/security/pam_ldap/Makefile b/security/pam_ldap/Makefile
	--- a/security/pam_ldap/Makefile
	+++ b/security/pam_ldap/Makefile
	@@ -14,8 +14,7 @@
	LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
	LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING.LIB

	-USES= cpe gmake perl5 shebangfix
	-USE_OPENLDAP= yes
	+USES= cpe gmake ldap perl5 shebangfix
	USE_PERL5= build
	GNU_CONFIGURE= yes
	CONFIGURE_ARGS= --with-ldap-conf-file=${PREFIX}/etc/${PAM_LDAP_CONF} \
	diff --git a/security/pam_pkcs11/Makefile b/security/pam_pkcs11/Makefile
	--- a/security/pam_pkcs11/Makefile
	+++ b/security/pam_pkcs11/Makefile
	@@ -31,7 +31,7 @@
	CURL_LIB_DEPENDS= libcurl.so:ftp/curl
	CURL_CONFIGURE_WITH= curl

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= ldap

	# Users can only choose either NSS or SSL
	diff --git a/security/pam_yubico/Makefile b/security/pam_yubico/Makefile
	--- a/security/pam_yubico/Makefile
	+++ b/security/pam_yubico/Makefile
	@@ -33,7 +33,7 @@
	CR_PLIST_FILES= bin/ykpamcfg \
	man/man1/ykpamcfg.1.gz

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= ldap

	STATIC_CONFIGURE_ENABLE= static
	diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
	--- a/security/seahorse/Makefile
	+++ b/security/seahorse/Makefile
	@@ -50,7 +50,7 @@

	AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app
	AVAHI_MESON_TRUE= key-sharing
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_MESON_TRUE= ldap-support

	.include <bsd.port.mk>
	diff --git a/security/sssd/Makefile b/security/sssd/Makefile
	--- a/security/sssd/Makefile
	+++ b/security/sssd/Makefile
	@@ -61,10 +61,9 @@

	TEST_TARGET= check

	-USES= autoreconf cpe gettext gmake iconv libtool pathfix pkgconfig \
	+USES= autoreconf cpe gettext gmake iconv ldap libtool pathfix pkgconfig \
	python:3.6+ shebangfix gssapi:mit
	USE_LDCONFIG= yes
	-USE_OPENLDAP= yes
	INSTALL_TARGET= install-strip
	CPE_VENDOR= fedoraproject

	diff --git a/security/strongswan/Makefile b/security/strongswan/Makefile
	--- a/security/strongswan/Makefile
	+++ b/security/strongswan/Makefile
	@@ -102,7 +102,7 @@
	IPSECKEY_CONFIGURE_ON= --enable-ipseckey
	KDF_CONFIGURE_ON= --enable-kdf
	KERNELLIBIPSEC_CONFIGURE_ON= --enable-kernel-libipsec
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_ON= --enable-ldap
	LIBC_CONFIGURE_ON= --with-printf-hooks=glibc
	LOADTESTER_CONFIGURE_ON= --enable-load-tester
	diff --git a/security/sudo/Makefile b/security/sudo/Makefile
	--- a/security/sudo/Makefile
	+++ b/security/sudo/Makefile
	@@ -63,7 +63,7 @@
	INSULTS_CONFIGURE_ON= --with-insults
	INSULTS_CONFIGURE_ON+= --with-all-insults

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_ON= --with-ldap=${PREFIX}
	SUDO_LDAP_CONF?= ldap.conf
	LDAP_CONFIGURE_ON+= --with-ldap-conf-file=${PREFIX}/etc/${SUDO_LDAP_CONF}
	diff --git a/sysutils/adtool/Makefile b/sysutils/adtool/Makefile
	--- a/sysutils/adtool/Makefile
	+++ b/sysutils/adtool/Makefile
	@@ -8,9 +8,8 @@
	COMMENT= Active Directory administration tool
	WWW= https://gp2x.org/adtool/

	-USES= gmake libtool
	+USES= gmake ldap libtool
	GNU_CONFIGURE= yes
	-USE_OPENLDAP= yes

	CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}

	diff --git a/sysutils/am-utils/Makefile b/sysutils/am-utils/Makefile
	--- a/sysutils/am-utils/Makefile
	+++ b/sysutils/am-utils/Makefile
	@@ -34,8 +34,7 @@
	INFO= am-utils
	PORTDOCS= AUTHORS BUGS FAQ NEWS README.attrcache

	-OPENLDAP_USES= localbase:ldflags
	-OPENLDAP_USE= OPENLDAP=yes
	+OPENLDAP_USES= ldap localbase:ldflags
	OPENLDAP_CONFIGURE_WITH= ldap
	OPENLDAP_PORTDOCS= README.ldap ldap-id.txt ldap.schema

	diff --git a/sysutils/eclat/Makefile b/sysutils/eclat/Makefile
	--- a/sysutils/eclat/Makefile
	+++ b/sysutils/eclat/Makefile
	@@ -28,7 +28,7 @@
	GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm
	GDBM_CONFIGURE_WITH= gdbm

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= ldap

	post-patch:
	diff --git a/sysutils/ldapvi/Makefile b/sysutils/ldapvi/Makefile
	--- a/sysutils/ldapvi/Makefile
	+++ b/sysutils/ldapvi/Makefile
	@@ -13,8 +13,7 @@

	LIB_DEPENDS= libpopt.so:devel/popt

	-USES= gmake gnome iconv ncurses pkgconfig
	-USE_OPENLDAP= yes
	+USES= gmake gnome iconv ldap ncurses pkgconfig
	USE_GNOME= glib20
	GNU_CONFIGURE= yes
	MAKEFILE= GNUmakefile
	diff --git a/sysutils/msktutil/Makefile b/sysutils/msktutil/Makefile
	--- a/sysutils/msktutil/Makefile
	+++ b/sysutils/msktutil/Makefile
	@@ -12,9 +12,8 @@

	RUN_DEPENDS= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi

	-USES= autoreconf ssl
	+USES= autoreconf ldap ssl
	USE_GITHUB= yes
	-USE_OPENLDAP= yes
	GNU_CONFIGURE= yes
	CONFIGURE_ARGS+=--with-sasldir=${LOCALBASE} --with-ldapdir=${LOCALBASE}

	diff --git a/sysutils/omnibackup/Makefile b/sysutils/omnibackup/Makefile
	--- a/sysutils/omnibackup/Makefile
	+++ b/sysutils/omnibackup/Makefile
	@@ -22,7 +22,7 @@
	MYSQL

	OPENLDAP_DESC= OpenLDAP support
	-OPENLDAP_USE= OPENLDAP=yes
	+OPENLDAP_USES= ldap

	NO_ARCH= yes
	NO_BUILD= yes
	diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile
	--- a/www/c-icap/Makefile
	+++ b/www/c-icap/Makefile
	@@ -52,7 +52,7 @@
	MEMCACHE_CONFIGURE_WITH= memcached
	MEMCACHE_LIB_DEPENDS= libmemcached.so:databases/libmemcached

	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_ON= --with-ldap=yes
	LDAP_CONFIGURE_OFF= --with-ldap=no

	diff --git a/www/glewlwyd/Makefile b/www/glewlwyd/Makefile
	--- a/www/glewlwyd/Makefile
	+++ b/www/glewlwyd/Makefile
	@@ -24,7 +24,6 @@
	libjwt.so:www/libjwt \
	libgnutls.so:security/gnutls \
	libconfig.so:devel/libconfig \
	- liblber.so:net/openldap24-client \
	librhonabwy.so:security/rhonabwy \
	libiddawc.so:security/iddawc

	@@ -38,7 +37,7 @@
	orcania>2.2.1:devel/orcania \
	oath-toolkit>0:security/oath-toolkit

	-USES= cmake cpe pgsql sqlite
	+USES= cmake cpe ldap:24 pgsql sqlite

	USE_GITHUB= yes
	GH_ACCOUNT= babelouest
	diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
	--- a/www/lighttpd/Makefile
	+++ b/www/lighttpd/Makefile
	@@ -67,7 +67,7 @@
	KRB5_LIBS= ${GSSAPILIBS}
	KRB5_USES= gssapi:mit
	LDAP_CONFIGURE_WITH= ldap
	-LDAP_USE= openldap=yes
	+LDAP_USES= ldap
	LDAP_VARS= REQUIRE+=slapd
	LUA_USES= lua
	LUA_CONFIGURE_WITH= lua
	diff --git a/www/mod_cfg_ldap/Makefile b/www/mod_cfg_ldap/Makefile
	--- a/www/mod_cfg_ldap/Makefile
	+++ b/www/mod_cfg_ldap/Makefile
	@@ -11,8 +11,7 @@

	LICENSE= BSD3CLAUSE

	-USES= apache
	-USE_OPENLDAP= yes
	+USES= apache ldap
	AP_FAST_BUILD= yes
	AP_GENPLIST= yes

	diff --git a/www/mod_webauth/Makefile b/www/mod_webauth/Makefile
	--- a/www/mod_webauth/Makefile
	+++ b/www/mod_webauth/Makefile
	@@ -12,8 +12,7 @@
	LIB_DEPENDS= libcurl.so:ftp/curl \
	libsasl2.so:security/cyrus-sasl2

	-USES= apache libtool pathfix pkgconfig ssl
	-USE_OPENLDAP= yes
	+USES= apache ldap libtool pathfix pkgconfig ssl
	USE_LDCONFIG= yes
	GNU_CONFIGURE= yes
	CONFIGURE_ARGS= --with-ldap-lib=${LOCALBASE}/lib \
	diff --git a/www/sarg/Makefile b/www/sarg/Makefile
	--- a/www/sarg/Makefile
	+++ b/www/sarg/Makefile
	@@ -36,7 +36,7 @@
	PHP_CONFIGURE_OFF= --disable-sargphp
	PCRE_CONFIGURE_WITH= pcre
	PCRE_LIB_DEPENDS= libpcre.so:devel/pcre
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap
	LDAP_CONFIGURE_WITH= ldap
	ICONV_USES= iconv
	ICONV_CONFIGURE_WITH= iconv
	diff --git a/www/squid-devel/Makefile b/www/squid-devel/Makefile
	--- a/www/squid-devel/Makefile
	+++ b/www/squid-devel/Makefile
	@@ -63,7 +63,7 @@
	ARP_ACL_CONFIGURE_ENABLE= eui
	AUTH_LDAP_CFLAGS= -I${LOCALBASE}/include
	AUTH_LDAP_LDFLAGS= -L${LOCALBASE}/lib
	-AUTH_LDAP_USE= OPENLDAP=yes
	+AUTH_LDAP_USES= ldap
	AUTH_LDAP_VARS= BASIC_AUTH+=LDAP DIGEST_AUTH+="eDirectory LDAP" EXTERNAL_ACL+="LDAP_group eDirectory_userip"
	AUTH_SASL_CFLAGS= -I${LOCALBASE}/include
	AUTH_SASL_CPPFLAGS= -I${LOCALBASE}/include
	diff --git a/www/squid/Makefile b/www/squid/Makefile
	--- a/www/squid/Makefile
	+++ b/www/squid/Makefile
	@@ -58,7 +58,7 @@
	WCCPV2

	ARP_ACL_CONFIGURE_ENABLE= eui
	-AUTH_LDAP_USE= OPENLDAP=yes
	+AUTH_LDAP_USES= ldap
	AUTH_LDAP_VARS= BASIC_AUTH+=LDAP DIGEST_AUTH+="eDirectory LDAP" EXTERNAL_ACL+="LDAP_group eDirectory_userip"
	AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
	AUTH_SASL_VARS= BASIC_AUTH+=SASL
	diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile
	--- a/www/squidguard/Makefile
	+++ b/www/squidguard/Makefile
	@@ -55,7 +55,7 @@
	LDAP_CONFIGURE_ON= --with-ldap
	LDAP_CONFIGURE_OFF= --without-ldap
	LDAP_LDFLAGS= -L${LOCALBASE}/lib
	-LDAP_USE= OPENLDAP=yes
	+LDAP_USES= ldap

	.include <bsd.port.options.mk>

File Metadata

Mime Type: text/plain
Expires: Fri, Jan 24, 10:15 PM (20 h, 30 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 16106725
Default Alt Text: D38233.diff (72 KB)

D38233.diffNo OneTemporaryActions

D38233.diffView Options

File Metadata

Event Timeline

D38233.diff
No OneTemporary
Actions

D38233.diff
View Options