Mk/**ldap.mk: Convert USE_LDAP to USES=ldap

Convert the USE_LDAP=yes to USES=ldap and adds the following features:

- Adds the argument USES=ldap:server to add openldap2{4|5|6}-server as
  RUN_DEPENDS
- Adds the argument USES=ldap<version> and replaces WANT_OPENLDAP_VER
- Adds OPENLDAP versions in bsd.default-versions.mk
- Adds USE_OPENLDAP/WANT_OPENLDAP_VER in Mk/bsd.sanity.mk
- Changes consumers to use the features

Reviewed by:	delphij
Approved by:	portmgr
Differential Revision: https://reviews.freebsd.org/D38233

34 files changed, 36 insertions, 57 deletions

diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index accd8e32a8c2..d30d6089e99b 100644
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -59,7 +59,7 @@ CONS25_EXTRA_PATCHES=		${FILESDIR}/cons25-alpine_keymenu.c
 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
index 4536046f539e..a08f660f0eaf 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -42,7 +42,7 @@ GTKSV_DESC=	GtkSourceview support
 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
index e6eea73f94f5..0768af936156 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -51,7 +51,7 @@ ENCHANT_CONFIGURE_ENABLE=	enchant
 
 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
index 59042e4b28ea..8aa1d491c78e 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -17,11 +17,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING.GPL
 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
index 45e36b3a803e..c47d70c00adf 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -138,7 +138,7 @@ PERIODIC_DESC=	modify/create periodic.conf
 .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
index 602a9fe633cf..84fcab96d093 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -52,7 +52,7 @@ BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 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
index 794ac23f463c..55591c3eb130 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -51,7 +51,7 @@ BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 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
index 0a872e19376b..15028c490cc4 100644
--- a/mail/cyrus-imapd25/Makefile
+++ b/mail/cyrus-imapd25/Makefile
@@ -63,7 +63,7 @@ HTTP_USE=		GNOME=libxml2
 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
index 6a3caeefdaf0..9a5ca6e5354b 100644
--- a/mail/cyrus-imapd30/Makefile
+++ b/mail/cyrus-imapd30/Makefile
@@ -67,7 +67,7 @@ HTTP_USE=		GNOME=libxml2
 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
index b32226d46817..572e7c9ade98 100644
--- a/mail/cyrus-imapd32/Makefile
+++ b/mail/cyrus-imapd32/Makefile
@@ -72,7 +72,7 @@ HTTP_USE=		GNOME=libxml2
 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
index f5a375816b83..be3369465ad5 100644
--- a/mail/cyrus-imapd34/Makefile
+++ b/mail/cyrus-imapd34/Makefile
@@ -90,7 +90,7 @@ HTTP_USE=		GNOME=libxml2
 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
index 90ffb4e28ce4..dbe13c5612a0 100644
--- a/mail/cyrus-imapd36/Makefile
+++ b/mail/cyrus-imapd36/Makefile
@@ -91,7 +91,7 @@ HTTP_USE=		GNOME=libxml2
 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
index 1e76698bfdf1..ef959312cfc5 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -47,8 +47,7 @@ SIEVE_DESC=		Sieve mail sorting language support
 
 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
index 91d70d68d601..f6b5766e1f94 100644
--- a/mail/dovecot-pigeonhole/Makefile
+++ b/mail/dovecot-pigeonhole/Makefile
@@ -49,7 +49,7 @@ MANAGESIEVE_CONFIGURE_WITH=	managesieve
 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
index 7465de6f81b5..4e4190a81059 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -85,7 +85,7 @@ LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 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
index 70c28d661d56..9a412c98cb88 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -304,7 +304,7 @@ PLIST_SUB+=	NOSETUID=""
 
 .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
index cf977611d49a..957e4a0e9e8e 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -89,7 +89,7 @@ OPTIONS_GROUP_SPAM=	BOGOFILTER SPAMASSASSIN
 
 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
index 5714816ebe68..2242ff7608fa 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -54,7 +54,7 @@ ICONV_USES=	iconv:lib,build
 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,-L${LOCALBASE:S/,/\\,/g}/lib ${ICONV_LIB},' \
 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
index 7020536a68ac..0113636afcf8 100644
--- a/mail/gnarwl/Makefile
+++ b/mail/gnarwl/Makefile
@@ -12,8 +12,7 @@ LICENSE=	GPLv2
 
 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
index 9bc72d3c73ee..a59b6de51178 100644
--- a/mail/mailutils/Makefile
+++ b/mail/mailutils/Makefile
@@ -80,7 +80,7 @@ GDBM_CONFIGURE_WITH=	gdbm
 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
index 33b1eae4d6aa..314bd92b18d3 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -56,7 +56,7 @@ GEOIP_CONFIGURE_ON=		--with-libmaxminddb=${LOCALBASE}
 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
index 0a0ee017100f..25294939abd9 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -84,7 +84,7 @@ OPENDBX_LIB_DEPENDS=	libopendbx.so:databases/opendbx
 
 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
index eddfdcccb861..6603aab46d2e 100644
--- a/mail/opensmtpd-extras-table-ldap/Makefile
+++ b/mail/opensmtpd-extras-table-ldap/Makefile
@@ -7,7 +7,7 @@ PLIST_FILES=		libexec/opensmtpd/table-ldap
 
 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
index fa393b4bc0c8..6044ef244e27 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -110,7 +110,7 @@ PLIST_SUB+=		PGSQL="@comment "
 .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
index 30f05b9566d2..c6eaeda78c63 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -88,7 +88,7 @@ BDB_USES=			bdb
 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 @@ POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_SQLITE=-L${LOCALBASE}/lib -lsqlite3 -lpthread"
 
 .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
index f6561241cc33..e1ba529c1215 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -106,7 +106,7 @@ BLACKLISTD_DESC=	Enable blacklistd support
 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 @@ BDB_USES=			bdb
 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 @@ POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_SQLITE=-L${LOCALBASE}/lib -lsqlite3 -lpthread"
 
 .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
index c1f79c1e98e1..49165bdd1525 100644
--- a/mail/qmail-activedir/Makefile
+++ b/mail/qmail-activedir/Makefile
@@ -8,19 +8,14 @@ MAINTAINER=	ports@FreeBSD.org
 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
index 396386ff6c96..9bbb2220917d 100644
--- a/mail/sendmail-devel/Makefile
+++ b/mail/sendmail-devel/Makefile
@@ -72,7 +72,7 @@ TLS_USES=	ssl
 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
index 9417d3c2b2b2..eab2a8b114a1 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -71,7 +71,7 @@ TLS_USES=	ssl
 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
index cd302a64ebb1..1148b1b1acc0 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -24,7 +24,7 @@ WITH_LDAP=yes
 .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
index cb6c08167c8e..44f18639981f 100644
--- a/mail/spmfilter/Makefile
+++ b/mail/spmfilter/Makefile
@@ -54,10 +54,7 @@ CMAKE_ARGS+=	-DENABLE_DEBUG=TRUE
 .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
index 144eb7cd441a..a70af224cfa0 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -69,7 +69,7 @@ GTKSPELL_CONFIGURE_ENABLE=	gtkspell
 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
index 8f16d1a0bfa0..dc5f18dfb8ef 100644
--- a/mail/tpop3d/Makefile
+++ b/mail/tpop3d/Makefile
@@ -49,7 +49,7 @@ PGSQL_USES=		pgsql
 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
index 370959980593..a03b5cc197a2 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -252,7 +252,7 @@ VPOPMAIL_DIR?=			${PREFIX}/vpopmail
 # 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 \