Add support for Cyrus SASL authentication daemon, enabled if WITH_SASLAUTHD

is defined.

Add a note indicating that Cyrus pwcheck authentication daemon support
(enabled with WITH_PWCHECK) is deprecated.

Submitted by:	Jez Hancock <jez.hancock@munk.nu>

1 files changed, 14 insertions, 2 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index b4b66e7bc533..17c84c6bd8c4 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -57,11 +57,18 @@ POSTGRESQL_PORT?=	databases/postgresql7
 
 # Define WITH_TCP_WRAPPERS, WITH_MYSQL, and WITH_PGSQL to link against
 # libwrap, liblibmysqlclient and libpq respectively.  Define
-# WITH_PWCHECK to link against libsasl for SMTP AUTH authentication
-# via the Cyrus SASL pwcheck daemon.
+# WITH_SASLAUTHD to enable use of the Cyrus SASL authentication daemon.
 #WITH_TCP_WRAPPERS=	yes
 #WITH_MYSQL=		yes
 #WITH_PGSQL=		yes
+#WITH_SASLAUTHD=	yes
+
+# As an alternative to WITH_SASLAUTHD, you can define WITH_PWCHECK to
+# link against libsasl for SMTP AUTH authentication via the Cyrus SASL
+# pwcheck daemon.
+################################
+# THIS MECHANISM IS DEPRECATED #
+################################
 #WITH_PWCHECK=		yes
 
 # Define WITHOUT_IPV6 to exclude IPv6 support from the compiled exim
@@ -234,6 +241,11 @@ SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE}/lib/mysql -lmysqlclient,' \
 SEDLIST+=	-e 's,XX_MYSQL_[^ ]*_XX,,'
 .endif
 
+.if defined(WITH_SASLAUTHD)
+RUN_DEPENDS+=	${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
+SEDLIST+=     -e 's,^\# CYRUS_SASLAUTHD_SOCKET=,CYRUS_SASLAUTHD_SOCKET=,'
+.endif
+
 .if defined(WITH_PWCHECK)
 RUN_DEPENDS+=	${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl
 SEDLIST+=	-e 's,^\# SUPPORT_CYRUS_PWCHECK=,SUPPORT_CYRUS_PWCHECK=,' \