From f6092768b1d0989ed25e19af6a7e416a43b69581 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 24 Apr 2014 23:17:31 +0000
Subject: [PATCH] Use MK_OPENLDAP in preference to WITH_OPENLDAP and make it a
 default NO option to match the opt-in nature of the historical nature of this
 option.

---
 kerberos5/Makefile.inc            | 4 +++-
 share/mk/bsd.opts.mk              | 1 +
 tools/build/options/WITH_OPENLDAP | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 tools/build/options/WITH_OPENLDAP

diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 79355ddaa3b6..943f7445a1c2 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -1,12 +1,14 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 NO_LINT=
 
 KRB5DIR=	${.CURDIR}/../../../crypto/heimdal
 
 CFLAGS+=	-DHAVE_CONFIG_H -I${.CURDIR}/../../include
 
-.if defined(WITH_OPENLDAP) && !defined(COMPAT_32BIT)
+.if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT)
 OPENLDAPBASE?=	/usr/local
 LDAPLDADD=	-lldap -llber
 LDAPDPADD=	${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;}
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index d59492bed6a5..ba3955a698df 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -182,6 +182,7 @@ __DEFAULT_NO_OPTIONS = \
     LLDB \
     NAND \
     OFED \
+    OPENLDAP \
     OPENSSH_NONE_CIPHER \
     SHARED_TOOLCHAIN \
     SORT_THREADS \
diff --git a/tools/build/options/WITH_OPENLDAP b/tools/build/options/WITH_OPENLDAP
new file mode 100644
index 000000000000..75f96822eb8c
--- /dev/null
+++ b/tools/build/options/WITH_OPENLDAP
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Enable building openldap support for kerberos.