Index: CHANGES
===================================================================
--- CHANGES
+++ CHANGES
@@ -10,6 +10,11 @@
 
 All ports committers are allowed to commit to this file.
 
+2021XXXX:
+AUTHOR: delphij@FreeBSD.org
+  WANT_OPENLDAP_SASL is removed now that OpenLDAP is always built with
+  SASL support.
+
 20210604:
 AUTHOR: mat@FreeBSD.org
 
Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -16471,3 +16471,4 @@
 net/rubygem-gitlab-fog-google|net/rubygem-fog-google|2021-07-25|Obsolete, use net/rubygem-fog-google
 devel/rubygem-gitlab-rdoc|devel/rubygem-rdoc|2021-07-25|Obsolete, use devel/rubygem-rdoc
 databases/rubygem-redis-namespace17|databases/rubygem-redis-namespace|2021-07-25|Obsolete, use databases/rubygem-redis-namespace
+net/openldap24-sasl-client|net/openldap24-client|2021-XX-XX|SASL is always enabled for OpenLDAP
Index: Mk/bsd.ldap.mk
===================================================================
--- Mk/bsd.ldap.mk
+++ Mk/bsd.ldap.mk
@@ -20,9 +20,6 @@
 #				  Default: 24.
 # WANT_OPENLDAP_VER
 #				- Maintainer can set an arbitrary version of OpenLDAP by using it.
-# WANT_OPENLDAP_SASL
-#				- User-defined variable to depend upon SASL-enabled OpenLDAP
-#				  client. Must NOT be set in a port Makefile.
 # IGNORE_OPENLDAP_OPENLDAP
 #				- This variable can be defined if the ports doesn't support
 #				  one or more version of OpenLDAP.
@@ -64,14 +61,6 @@
 CFLAGS+=	-DLDAP_DEPRECATED
 
 _OPENLDAP_CLIENT_PKG!=	${PKG_INFO} -Ex openldap.\*-client 2>/dev/null; ${ECHO_CMD}
-_OPENLDAP_FLAVOUR=	${_OPENLDAP_CLIENT_PKG:C/openldap//:C/-client-.*//}
-
-.if defined(WANT_OPENLDAP_SASL)
-.if !empty(_OPENLDAP_CLIENT_PKG) && empty(_OPENLDAP_FLAVOUR)
-IGNORE= cannot install: SASL support requested and ${_OPENLDAP_CLIENT_PKG} is installed
-.endif
-_OPENLDAP_FLAVOUR=	-sasl
-.endif
 
 # And now we are checking if we can use it
 .if defined(OPENLDAP${OPENLDAP_VER}_LIB)
@@ -86,7 +75,7 @@
 .		endif
 .	endfor
 .endif # IGNORE_WITH_OPENLDAP
-LIB_DEPENDS+=	${OPENLDAP${OPENLDAP_VER}_LIB}:net/openldap${OPENLDAP_VER}${_OPENLDAP_FLAVOUR}-client
+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
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -364,11 +364,8 @@
 # USE_OPENLDAP	- If set, this port uses the OpenLDAP libraries.
 #				  Implies: WANT_OPENLDAP_VER?=24
 # WANT_OPENLDAP_VER
-#				- Legal values are: 23, 24
+#				- Legal values are: 24
 #				  If set to an unknown value, the port is marked BROKEN.
-# WANT_OPENLDAP_SASL
-#				- If set, the system should use OpenLDAP libraries
-#				  with SASL support.
 ##
 # USE_JAVA		- If set, this port relies on the Java language.
 #				  Implies inclusion of bsd.java.mk.  (Also see
Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -5,6 +5,19 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+2021XXXX:
+  AFFECTS: users of OpenLDAP
+  AUTHOR: delphij@FreeBSD.org
+
+  SASL is now always enabled for OpenLDAP.
+
+  If you use portmaster:
+        portmaster -o net/openldap24-client openldap24-sasl-client
+  If you use portupgrade:
+	portupgrade -fo net/openldap24-client openldap24-sasl-client
+  If you use pkg with binary packages:
+        pkg set -o net/openldap24-sasl-client:net/openldap24-client
+
 20210721:
   AFFECTS: users of x11/rxvt-unicode
   AUTHOR: thierry@FreeBSD.org
Index: databases/mysql57-client/Makefile
===================================================================
--- databases/mysql57-client/Makefile
+++ databases/mysql57-client/Makefile
@@ -1,7 +1,7 @@
 # Created by: "Mahdi Mokhtari <mokhi64@gmail.com>"
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	57-client
 
 COMMENT=	Multithreaded SQL database (client)
@@ -36,7 +36,7 @@
 SASLCLIENT_DESC=	SASL client plugin module
 SASLCLIENT_CMAKE_BOOL=	WITH_AUTHENTICATION_LDAP
 SASLCLIENT_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
-SASLCLIENT_BUILD_DEPENDS=	${LOCALBASE}/include/lber.h:net/openldap24-sasl-client
+SASLCLIENT_USE=		OPENLDAP=yes
 OPTIONS_DEFAULT+=	SASLCLIENT
 
 # issue 166367: adding symlinks for back-compatibility with ${lib}_r
Index: databases/mysql57-server/Makefile
===================================================================
--- databases/mysql57-server/Makefile
+++ databases/mysql57-server/Makefile
@@ -164,17 +164,6 @@
 CXXFLAGS+=	-fpermissive
 .endif
 
-# mysql57-server fails to compile with llvm11, which was imported to current in r364284
-# without a version increase (1300109 = r364274).
-# Until a proper fix is provided, simply use llvm from ports, which probably could be
-# a backport of amongst other tings:
-# https://github.com/mysql/mysql-server/commit/08f46b3c00ee70e7ed7825daeb91df2289f80f50
-.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109
-BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-CC=		${LOCALBASE}/bin/clang${LLVM_DEFAULT}
-CXX=		${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
-.endif
-
 .if ${ARCH} == powerpc
 LLD_UNSAFE=	yes
 .endif
Index: databases/percona57-client/Makefile
===================================================================
--- databases/percona57-client/Makefile
+++ databases/percona57-client/Makefile
@@ -1,7 +1,7 @@
 # Created by: Mark Felder <feld@FreeBSD.org>
 
 PORTNAME=	percona
-PORTREVISION?=	0
+PORTREVISION?=	1
 PKGNAMESUFFIX=	57-client
 
 COMMENT=	Multithreaded SQL database (client)
@@ -36,7 +36,7 @@
 SASLCLIENT_DESC=	SASL client plugin module
 SASLCLIENT_CMAKE_BOOL=	WITH_AUTHENTICATION_LDAP
 SASLCLIENT_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
-SASLCLIENT_BUILD_DEPENDS=	${LOCALBASE}/include/lber.h:net/openldap24-sasl-client
+SASLCLIENT_USE=		OPENLDAP=yes
 OPTIONS_DEFAULT+=	SASLCLIENT
 OPTIONS_SUB=	yes
 
Index: lang/php73/Makefile
===================================================================
--- lang/php73/Makefile
+++ lang/php73/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	php73
 DISTVERSION=	7.3.29
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${DISTVERSION}
Index: lang/php73/Makefile.ext
===================================================================
--- lang/php73/Makefile.ext
+++ lang/php73/Makefile.ext
@@ -174,13 +174,9 @@
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
+CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
 
 USE_OPENLDAP=	yes
-
-. ifdef(WANT_OPENLDAP_SASL)
-CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE}
-. endif
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
Index: lang/php74/Makefile
===================================================================
--- lang/php74/Makefile
+++ lang/php74/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	php74
 DISTVERSION=	7.4.21
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=   PHP/distributions
 DISTNAME=	php-${DISTVERSION}
Index: lang/php74/Makefile.ext
===================================================================
--- lang/php74/Makefile.ext
+++ lang/php74/Makefile.ext
@@ -172,13 +172,9 @@
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
+CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
 
 USE_OPENLDAP=	yes
-
-. ifdef(WANT_OPENLDAP_SASL)
-CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE}
-. endif
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
Index: lang/php80/Makefile
===================================================================
--- lang/php80/Makefile
+++ lang/php80/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	php80
 DISTVERSION=	8.0.8
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${DISTVERSION}
Index: lang/php80/Makefile.ext
===================================================================
--- lang/php80/Makefile.ext
+++ lang/php80/Makefile.ext
@@ -172,13 +172,9 @@
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
+CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
 
 USE_OPENLDAP=	yes
-
-. ifdef(WANT_OPENLDAP_SASL)
-CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE}
-. endif
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
Index: mail/opendkim/Makefile
===================================================================
--- mail/opendkim/Makefile
+++ mail/opendkim/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	opendkim
 PORTVERSION=	2.10.3
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	mail security
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/${PORTNAME}/Previous%20Releases \
@@ -107,10 +107,6 @@
 WITH_DEBUG=	yes
 .endif
 
-.if ${PORT_OPTIONS:MSASL} && ${PORT_OPTIONS:MOPENLDAP}
-WANT_OPENLDAP_SASL=	yes
-.endif
-
 .if ${PORT_OPTIONS:MFILTER}
 SUB_FILES=		pkg-message
 WITHOUT_MILTER_CFLAGS=	yes
Index: mail/postfix-current/Makefile
===================================================================
--- mail/postfix-current/Makefile
+++ mail/postfix-current/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	postfix
 DISTVERSION=	3.7-20210707
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	6
 CATEGORIES=	mail
 MASTER_SITES=	http://ftp.porcupine.org/mirrors/postfix-release/ \
@@ -38,7 +38,7 @@
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP LDAP_SASL \
+OPTIONS_DEFINE=	BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP \
 		LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS
 
 OPTIONS_RADIO=		RG1
@@ -63,7 +63,6 @@
 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_SASL_DESC=	LDAP client-to-server SASL auth
 LMDB_DESC=	LMDB maps
 TEST_DESC=	SMTP/LMTP test server and generator
 
@@ -234,15 +233,9 @@
 WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 . endif
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
+POSTFIX_CCARGS+=	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber"
 _REQUIRE+=		slapd
-. if ${PORT_OPTIONS:MLDAP_SASL}
-.  if ! ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
-.  endif
-WANT_OPENLDAP_SASL=	yes
-POSTFIX_CCARGS+=	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
-. endif
 .endif
 
 .if ${PORT_OPTIONS:MCDB}
Index: mail/postfix/Makefile
===================================================================
--- mail/postfix/Makefile
+++ mail/postfix/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	postfix
 DISTVERSION=	3.6.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://ftp.porcupine.org/mirrors/postfix-release/ \
@@ -38,7 +38,7 @@
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP LDAP_SASL \
+OPTIONS_DEFINE=	BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP \
 		LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS
 
 OPTIONS_RADIO=		RG1
@@ -63,7 +63,6 @@
 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_SASL_DESC=	LDAP client-to-server SASL auth
 LMDB_DESC=	LMDB maps
 TEST_DESC=	SMTP/LMTP test server and generator
 
@@ -234,15 +233,9 @@
 WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 . endif
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
+POSTFIX_CCARGS+=	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber"
 _REQUIRE+=		slapd
-. if ${PORT_OPTIONS:MLDAP_SASL}
-.  if ! ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
-.  endif
-WANT_OPENLDAP_SASL=	yes
-POSTFIX_CCARGS+=	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
-. endif
 .endif
 
 .if ${PORT_OPTIONS:MCDB}
Index: mail/postfix35/Makefile
===================================================================
--- mail/postfix35/Makefile
+++ mail/postfix35/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	postfix
 DISTVERSION=	3.5.11
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://ftp.porcupine.org/mirrors/postfix-release/ \
@@ -41,7 +41,7 @@
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP LDAP_SASL \
+OPTIONS_DEFINE=	BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP \
 		LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS
 
 OPTIONS_RADIO=		RG1
@@ -67,7 +67,6 @@
 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_SASL_DESC=	LDAP client-to-server SASL auth
 LMDB_DESC=	LMDB maps
 TEST_DESC=	SMTP/LMTP test server and generator
 
@@ -230,15 +229,9 @@
 WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 . endif
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
+POSTFIX_CCARGS+=	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber"
 _REQUIRE+=		slapd
-. if ${PORT_OPTIONS:MLDAP_SASL}
-.  if ! ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
-.  endif
-WANT_OPENLDAP_SASL=	yes
-POSTFIX_CCARGS+=	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
-. endif
 .endif
 
 .if ${PORT_OPTIONS:MCDB}
Index: mail/vpopmail/Makefile
===================================================================
--- mail/vpopmail/Makefile
+++ mail/vpopmail/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	vpopmail
 PORTVERSION=	5.4.33
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
 
@@ -68,7 +68,7 @@
 		SQL_LOG \
 		SQL_LOG_TRIM
 OPTIONS_SINGLE=	AUTH
-OPTIONS_SINGLE_AUTH=	CDB MYSQL PGSQL LDAP LDAP_SASL ORACLE SYBASE
+OPTIONS_SINGLE_AUTH=	CDB MYSQL PGSQL LDAP ORACLE SYBASE
 
 OPTIONS_DEFAULT=MD5_PASSWORDS \
 		CDB \
@@ -90,7 +90,6 @@
 MYSQL_LIMITS_DESC=		MySQL mailbox limitations support
 ORACLE_DESC=			Auth via Oracle
 LDAP_DESC=			Auth via LDAP
-LDAP_SASL_DESC=			Auth via LDAP SASL
 VALIAS_DESC=			Store aliases in DB instead of .qmail files
 ROAMING_DESC=			roaming users support
 IP_ALIAS_DESC=			IP alias support
@@ -255,9 +254,6 @@
 
 .if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
-.if ${PORT_OPTIONS:MLDAP_SASL}
-WANT_OPENLDAP_SASL=	yes
-.endif
 LDAP_FILES=		${WRKSRC}/doc/README.ldap \
 			${WRKSRC}/ldap/nsswitch.conf \
 			${WRKSRC}/ldap/pam_ldap.conf \
Index: net-mgmt/adcli/Makefile
===================================================================
--- net-mgmt/adcli/Makefile
+++ net-mgmt/adcli/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	adcli
 PORTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt net security
 MASTER_SITES=	https://www.freedesktop.org/software/realmd/releases/
 
@@ -10,7 +11,7 @@
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libldap.so:net/openldap24-sasl-client
+USE_OPENLDAP=	yes
 BUILD_DEPENDS=	xsltproc:textproc/libxslt	\
 		docbook-xml>0:textproc/docbook-xml	\
 		docbook-xsl>0:textproc/docbook-xsl
Index: net/Makefile
===================================================================
--- net/Makefile
+++ net/Makefile
@@ -544,7 +544,6 @@
     SUBDIR += openbgpd
     SUBDIR += openbgpd6
     SUBDIR += openldap24-client
-    SUBDIR += openldap24-sasl-client
     SUBDIR += openldap24-server
     SUBDIR += openmdns
     SUBDIR += openmpi
Index: net/ldapscripts/Makefile
===================================================================
--- net/ldapscripts/Makefile
+++ net/ldapscripts/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ldapscripts
 PORTVERSION=	2.0.8
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		http://contribs.martymac.org/ldapscripts/
@@ -21,7 +22,6 @@
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	SASL DOCS
-SASL_VARS=	OPENLDAP_FLAVOUR=-sasl WANT_OPENLDAP_SASL=yes
 
 USES=		iconv tar:tgz
 USE_OPENLDAP=	yes
Index: net/nss-pam-ldapd/Makefile
===================================================================
--- net/nss-pam-ldapd/Makefile
+++ net/nss-pam-ldapd/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=		nss-pam-ldapd
 PORTVERSION=		0.9.11
+PORTREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		http://arthurdejong.org/nss-pam-ldapd/ \
 			ZI
@@ -74,7 +75,6 @@
 .endif
 
 .if ${PORT_OPTIONS:MSASL}
-WANT_OPENLDAP_SASL=	yes
 CONFIGURE_ARGS+=	--enable-sasl
 .else
 CONFIGURE_ARGS+=	--disable-sasl
Index: net/nss_ldap/Makefile
===================================================================
--- net/nss_ldap/Makefile
+++ net/nss_ldap/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	nss_ldap
 PORTVERSION=	1.${NSS_LDAP_VERSION}
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	net
 MASTER_SITES=	http://www.padl.com/download/ \
 		LOCAL/martymac
@@ -21,13 +21,11 @@
 USE_LDCONFIG=	yes
 USE_OPENLDAP=	yes
 
-OPTIONS_DEFINE=	LCLASS KERBEROS SASL
+OPTIONS_DEFINE=	LCLASS KERBEROS
 OPTIONS_DEFAULT=LCLASS KERBEROS
 
 LCLASS_DESC=	Enable login classes via the loginClass attribute
 
-SASL_DESC=	Use the SASL-enabled version of OpenLDAP
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib
 
@@ -49,10 +47,6 @@
 CFLAGS+="-DHAVE_LOGIN_CLASSES"
 .endif
 
-.if ${PORT_OPTIONS:MSASL}
-WANT_OPENLDAP_SASL=	 yes
-.endif
-
 post-extract:
 	${CP} ${FILESDIR}/bsdnss.c ${WRKSRC}
 
Index: net/openldap24-sasl-client/Makefile
===================================================================
--- net/openldap24-sasl-client/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# Created by: Xin LI <delphij@FreeBSD.org>
-
-CLIENT_ONLY=		sasl
-
-MASTERDIR=		${.CURDIR}/../openldap24-server
-
-.include "${MASTERDIR}/Makefile"
Index: net/openldap24-server/Makefile
===================================================================
--- net/openldap24-server/Makefile
+++ net/openldap24-server/Makefile
@@ -17,22 +17,14 @@
 			http://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/
 MASTER_SITE_SUBDIR=	openldap-release
 .if defined(CLIENT_ONLY)
-.if ${CLIENT_ONLY} == sasl
-PKGNAMESUFFIX=		-sasl-client
-.else
 PKGNAMESUFFIX=		-client
-.endif
 .else
 PKGNAMESUFFIX?=		-server
 .endif
 
 MAINTAINER=		delphij@FreeBSD.org
 .if defined(CLIENT_ONLY)
-.if ${CLIENT_ONLY} == sasl
-COMMENT=		Open source LDAP client implementation with SASL2 support
-.else
 COMMENT=		Open source LDAP client implementation
-.endif
 .else
 COMMENT=		Open source LDAP server implementation
 .endif
@@ -43,13 +35,7 @@
 LICENSE_PERMS=		dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 .if defined(CLIENT_ONLY)
-.if ${CLIENT_ONLY} == sasl
-CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
-			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[0-3].*
-.else
-CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-3].* \
-			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
-.endif
+CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-35-9].*
 .endif
 
 GNU_CONFIGURE=		yes
@@ -67,8 +53,8 @@
 BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 
-PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	1
+PORTREVISION_SERVER=	1
 OPENLDAP_SHLIB_MAJOR=	2
 OPENLDAP_SHLIB_MINOR=	11.7
 OPENLDAP_MAJOR=		${DISTVERSION:R}
@@ -76,7 +62,7 @@
 OPTIONS_DEFINE=		DEBUG FETCH GSSAPI
 
 FETCH_DESC=		Enable fetch(3) support
-GSSAPI_DESC=		With GSSAPI support (implies SASL support)
+GSSAPI_DESC=		With GSSAPI support
 
 .if defined(CLIENT_ONLY)
 OPTIONS_DEFINE+=	DOCS
@@ -86,7 +72,7 @@
 OPTIONS_DEFINE+=	ACCESSLOG AUDITLOG COLLECT CONSTRAINT DDS
 OPTIONS_DEFINE+=	DEREF DYNGROUP DYNLIST MEMBEROF PPOLICY PCACHE
 OPTIONS_DEFINE+=	REFINT RETCODE RWM SEQMOD SSSVLV SYNCPROV TRANSLUCENT
-OPTIONS_DEFINE+=	UNIQUE VALSORT SMBPWD SHA2 DYNAMIC_BACKENDS SASL
+OPTIONS_DEFINE+=	UNIQUE VALSORT SMBPWD SHA2 DYNAMIC_BACKENDS
 OPTIONS_DEFINE+=	LMPASSWD
 OPTIONS_DEFINE+=	PBKDF2
 OPTIONS_DEFINE+=	OUTLOOK
@@ -132,7 +118,6 @@
 REFINT_DESC=		With Referential Integrity overlay
 RETCODE_DESC=		With Return Code testing overlay
 RWM_DESC=		With Rewrite/Remap overlay
-SASL_DESC=		With (Cyrus) SASL2 support
 SEQMOD_DESC=		With Sequential Modify overlay
 SSSVLV_DESC=		With ServerSideSort/VLV overlay
 SYNCPROV_DESC=		With Syncrepl Provider overlay
@@ -165,9 +150,6 @@
 .if defined(CLIENT_ONLY)
 PORTDOCS=		CHANGES drafts rfc
 
-.if ${CLIENT_ONLY} == sasl
-PORT_OPTIONS+=	SASL
-.endif
 .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
@@ -176,22 +158,6 @@
 WANT_OPENLDAP_VER=	24
 
 LIB_DEPENDS+=		libicudata.so:devel/icu
-
-.if ${PORT_OPTIONS:MGSSAPI} && empty(PORT_OPTIONS:MSASL)
-PORT_OPTIONS+=	SASL
-.endif
-
-.if ${PORT_OPTIONS:MSASL}
-WANT_OPENLDAP_SASL=	yes
-CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.*
-PKGNAMESUFFIX=		-sasl-server
-.if ${PORT_OPTIONS:MGSSAPI}
-RUN_DEPENDS+=		cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
-.endif
-.else
-CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
-.endif
-
 .endif
 
 DESCR=			${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
@@ -218,12 +184,11 @@
 			--disable-dependency-tracking \
 			--enable-dynamic
 
-.if ${PORT_OPTIONS:MSASL}
+
+GSSAPI_RUN_DEPENDS+=	cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
+
 LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-cyrus-sasl
-.else
-CONFIGURE_ARGS+=	--without-cyrus-sasl
-.endif
 
 .if defined(CLIENT_ONLY)
 # client specific configuration
@@ -523,9 +488,7 @@
 PLIST_SUB+=		BACK_PERL="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MSASL}
 CONFIGURE_ARGS+=	--enable-spasswd
-.endif
 
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=	--enable-sql=${BACKEND_ENABLE}
Index: net/py-ldap/Makefile
===================================================================
--- net/py-ldap/Makefile
+++ net/py-ldap/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ldap
 DISTVERSION=	3.3.1
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,18 +20,9 @@
 USE_OPENLDAP=	yes
 WANT_OPENLDAP_VER=	24
 
-OPTIONS_DEFINE=	SASL
-
-SASL_VARS=	WANT_OPENLDAP_SASL=yes
-SASL_CONFLICTS=	openldap24-client-2.*
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py
 
-do-configure-SASL-off:
-	@cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q setopt -c _ldap -s HAVE_TLS -o defines
-	@cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q saveopts
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_ldap*.so
 
Index: net/py-ldap0/Makefile
===================================================================
--- net/py-ldap0/Makefile
+++ net/py-ldap0/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ldap0
 PORTVERSION=	1.2.8
+PORTREVISION=	1
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -10,7 +11,6 @@
 
 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}
-# OpenLDAP needs SASL option enabled
 # Cyrus needs PLAIN / CRAM-MD5 / DIGEST-MD5 enabled
 TEST_DEPENDS=	${LOCALBASE}/libexec/slapd:net/openldap24-server
 
@@ -24,8 +24,6 @@
 GL_PROJECT=	python-ldap0
 GL_COMMIT=	1bf10aa9ad4ab7755e02c9f74cfa9ad7b4368d34
 
-WANT_OPENLDAP_SASL=	yes
-
 PYDISTUTILS_BUILD_TARGET=	build_ext
 PYDISTUTILS_BUILDARGS+=		--inplace
 
Index: security/cyrus-sasl2-ldapdb/Makefile
===================================================================
--- security/cyrus-sasl2-ldapdb/Makefile
+++ security/cyrus-sasl2-ldapdb/Makefile
@@ -4,13 +4,6 @@
 
 CYRUS_CONFIGURE_ARGS=	--enable-ldapdb --with-ldap=${LOCALBASE}
 
-OPTIONS_DEFINE=		OPENLDAP_SASL
-OPENLDAP_SASL_DESC=	OpenLDAP client with SASL2 support
-OPENLDAP_SASL_VARS=	WANT_OPENLDAP_SASL=yes
-
 USE_OPENLDAP=	yes
-.if defined(WITH_OPENLDAP_VER)
-WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
-.endif
 
 .include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"
Index: security/cyrus-sasl2-saslauthd/Makefile
===================================================================
--- security/cyrus-sasl2-saslauthd/Makefile
+++ security/cyrus-sasl2-saslauthd/Makefile
@@ -1,5 +1,5 @@
 PKGNAMESUFFIX=	-saslauthd
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	SASL authentication server for cyrus-sasl2
 
@@ -12,7 +12,7 @@
 CYRUS_CONFIGURE_ARGS=	--with-saslauthd=${SASLAUTHD_RUNPATH}
 CONFIGURE_ENV+=		andrew_cv_runpath_switch=none
 
-OPTIONS_DEFINE=		DOCS HTTPFORM OPENLDAP OPENLDAP_SASL
+OPTIONS_DEFINE=		DOCS HTTPFORM OPENLDAP
 OPTIONS_RADIO=		GSSAPI SASLDB
 OPTIONS_RADIO_SASLDB=	BDB1 BDB GDBM LMDB
 OPTIONS_DEFAULT=	BDB1
@@ -22,8 +22,6 @@
 OPENLDAP_DESC=		Use OpenLDAP
 OPENLDAP_USE=		OPENLDAP=yes
 OPENLDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
-OPENLDAP_SASL_DESC=	OpenLDAP client with SASL2 support
-OPENLDAP_SASL_VARS=	WANT_OPENLDAP_SASL=yes
 
 SASLDB_DESC=		Experimental SASLdb authentication module
 BDB_USES=		bdb
Index: security/cyrus-sasl2/Makefile
===================================================================
--- security/cyrus-sasl2/Makefile
+++ security/cyrus-sasl2/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)
 
Index: security/heimdal/Makefile
===================================================================
--- security/heimdal/Makefile
+++ security/heimdal/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	heimdal
 PORTVERSION=	7.7.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/heimdal/heimdal/releases/download/${DISTNAME}/
 
@@ -98,10 +99,6 @@
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MLDAP}
-WANT_OPENLDAP_SASL?=	yes
-.endif
-
 post-extract:
 	@${MKDIR} ${WRKSRC}/kpasswdd-cracklib
 	${INSTALL_DATA} ${FILESDIR}/kpasswdd-cracklib.c \
Index: sysutils/ldapvi/Makefile
===================================================================
--- sysutils/ldapvi/Makefile
+++ sysutils/ldapvi/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ldapvi
 PORTVERSION=	1.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://www.lichteblau.com/download/ \
 		LOCAL/sbz
@@ -29,11 +29,6 @@
 		${DOCSDIR_REL}/manual.css ${DOCSDIR_REL}/manual.xml \
 		${DOCSDIR_REL}/bg.png ${DOCSDIR_REL}/html.xsl
 
-# XXX should probably be converted to OptionsNG
-.if !defined(WANT_OPENLDAP_SASL) || defined(WITHOUT_SASL)
-CONFIGURE_ARGS=	--without-sasl
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/-lssl/-lcrypto/' ${WRKSRC}/configure
 
Index: sysutils/msktutil/Makefile
===================================================================
--- sysutils/msktutil/Makefile
+++ sysutils/msktutil/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	msktutil
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -20,7 +20,6 @@
 USE_OPENLDAP=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-sasldir=${LOCALBASE} --with-ldapdir=${LOCALBASE}
-WANT_OPENLDAP_SASL=	yes
 
 OPTIONS_SINGLE=	GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT