add WITHOUT_SASLAUTHD option.

3 files changed, 44 insertions, 20 deletions

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index be2bc1036042..8b1f746cdf25 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -48,7 +48,6 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--mandir=${MANPREFIX}/man \
 		--enable-static \
 		--enable-login \
-		--with-saslauthd \
 		--enable-auth-sasldb \
 		--with-rc4=openssl
 
@@ -57,6 +56,7 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
 		REALCURDIR="${.CURDIR}" \
+		WITHOUT_SASLAUTHD="${WITHOUT_SASLAUTHD}" \
 		WITH_DB3="${WITH_DB3}" \
 		WITH_DB4="${WITH_DB4}" \
 		WITH_DB41="${WITH_DB41}" \
@@ -88,6 +88,13 @@ NTLM=	"@comment "
 CONFIGURE_ARGS+=	--enable-ntlm
 .endif
 
+.if defined(WITHOUT_SASLAUTHD)
+CONFIGURE_ARGS+=	--without-saslauthd
+SASLAUTHD=	"@comment "
+.else
+CONFIGURE_ARGS+=	--with-saslauthd
+.endif
+
 .if !defined(WITHOUT_GSSAPI) && defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a)
 CONFIGURE_ARGS+=	--enable-gssapi=${KRB5_HOME}
 .elif !defined(WITHOUT_GSSAPI) && defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
@@ -151,6 +158,7 @@ HTDOCS=	advanced appconvert gssapi index install macosx mechanisms \
 	options plugprog programming readme sysadmin upgrading
 
 PLIST_SUB=	PREFIX=${PREFIX} \
+		SASLAUTHD=${SASLAUTHD} \
 		OTP=${OTP} \
 		CRAM=${CRAM} \
 		DIGEST=${DIGEST} \
@@ -195,16 +203,17 @@ post-install:
 		${MAN8PREFIX}/man/man8/saslpasswd2.8
 	${INSTALL_MAN} ${WRKSRC}/utils/sasldblistusers2.8 \
 		${MAN8PREFIX}/man/man8/sasldblistusers2.8
+.if !defined(WITHOUT_SASLAUTHD)
 	${GZIP_CMD} ${MAN8PREFIX}/man/cat8/saslauthd.8
 	@${SED} -e "s;%%PREFIX%%;${PREFIX};g" ${PWCHECK_SUB} \
 		${FILESDIR}/saslauthd.sh > ${PREFIX}/etc/rc.d/saslauthd.sh
 	@${CHMOD} 755 ${PREFIX}/etc/rc.d/saslauthd.sh
 	${MKDIR} -m 770 /var/state/saslauthd
 	${CHOWN} ${CYRUS_USER}:mail /var/state/saslauthd
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/html
-	@${MKDIR} ${DOCSDIR}/saslauthd
 .for file in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
@@ -214,9 +223,12 @@ post-install:
 .for file in ${HTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}/html
 .endfor
+.if !defined(WITHOUT_SASLAUTHD)
+	@${MKDIR} ${DOCSDIR}/saslauthd
 .for file in ${SASLAUTHD_DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/saslauthd/${file} ${DOCSDIR}/saslauthd
 .endfor
+.endif
 	@${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${DOCSDIR}
 .endif
 	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index d686345717d7..96218d37e922 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -1,4 +1,4 @@
-etc/rc.d/saslauthd.sh
+%%SASLAUTHD%%etc/rc.d/saslauthd.sh
 include/sasl/hmac-md5.h
 include/sasl/md5.h
 include/sasl/md5global.h
@@ -43,8 +43,8 @@ lib/sasl2/libplain.so.2
 lib/sasl2/libsasldb.a
 lib/sasl2/libsasldb.so
 lib/sasl2/libsasldb.so.2
-man/cat8/saslauthd.8.gz
-sbin/saslauthd
+%%SASLAUTHD%%man/cat8/saslauthd.8.gz
+%%SASLAUTHD%%sbin/saslauthd
 sbin/sasldblistusers2
 sbin/saslpasswd2
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
@@ -93,22 +93,22 @@ sbin/saslpasswd2
 %%PORTDOCS%%%%DOCSDIR%%/html/readme.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sysadmin.html
 %%PORTDOCS%%%%DOCSDIR%%/html/upgrading.html
-%%PORTDOCS%%%%DOCSDIR%%/saslauthd/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/saslauthd/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/saslauthd/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/saslauthd/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/saslauthd/LDAP_SASLAUTHD
-%%PORTDOCS%%%%DOCSDIR%%/saslauthd/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/saslauthd/README
+%%SASLAUTHD%%%%PORTDOCS%%%%DOCSDIR%%/saslauthd/AUTHORS
+%%SASLAUTHD%%%%PORTDOCS%%%%DOCSDIR%%/saslauthd/COPYING
+%%SASLAUTHD%%%%PORTDOCS%%%%DOCSDIR%%/saslauthd/ChangeLog
+%%SASLAUTHD%%%%PORTDOCS%%%%DOCSDIR%%/saslauthd/INSTALL
+%%SASLAUTHD%%%%PORTDOCS%%%%DOCSDIR%%/saslauthd/LDAP_SASLAUTHD
+%%SASLAUTHD%%%%PORTDOCS%%%%DOCSDIR%%/saslauthd/NEWS
+%%SASLAUTHD%%%%PORTDOCS%%%%DOCSDIR%%/saslauthd/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/saslauthd
+%%SASLAUTHD%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/saslauthd
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/sasl2
-@mode ug=rwx,o=
-@exec mkdir -p /var/state/saslauthd
-@exec chown -R cyrus:cyrus /var/state
-@exec chmod -R o= /var/state
-@comment This file gets created by the state/saslauthd program
-@unexec rm -fr /var/state/saslauthd
-@unexec rmdir /var/state
+%%SASLAUTHD%%@mode ug=rwx,o=
+%%SASLAUTHD%%@exec mkdir -p /var/state/saslauthd
+%%SASLAUTHD%%@exec chown -R cyrus:cyrus /var/state
+%%SASLAUTHD%%@exec chmod -R o= /var/state
+%%SASLAUTHD%%@comment This file gets created by the state/saslauthd program
+%%SASLAUTHD%%@unexec rm -fr /var/state/saslauthd
+%%SASLAUTHD%%@unexec rmdir /var/state
 @cwd %%PREFIX%%
diff --git a/security/cyrus-sasl2/scripts/configure.sasl b/security/cyrus-sasl2/scripts/configure.sasl
index 732683f6e83d..76e2bf19dde7 100644
--- a/security/cyrus-sasl2/scripts/configure.sasl
+++ b/security/cyrus-sasl2/scripts/configure.sasl
@@ -179,6 +179,10 @@ while [ "$1" ]; do
 			DEFMYSQL=1
 			;;
 		\"OpenLDAP21\")
+			if [ -n "${WITHOUT_SASLAUTHD}" ]; then
+				shift
+				continue
+			fi
 			if [ "${OPENLDAP}" ]; then
 				echo "OpenLDAP 2.0 and 2.1 are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
@@ -190,6 +194,10 @@ while [ "$1" ]; do
 			OPENLDAP=1
 			;;
 		\"OpenLDAP\")
+			if [ -n "${WITHOUT_SASLAUTHD}" ]; then
+				shift
+				continue
+			fi
 			if [ "${OPENLDAP}" ]; then
 				echo "OpenLDAP 2.0 and 2.1 are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
@@ -201,6 +209,10 @@ while [ "$1" ]; do
 			OPENLDAP=1
 			;;
 		\"SASLAUTHD\")
+			if [ -n "${WITHOUT_SASLAUTHD}" ]; then
+				shift
+				continue
+			fi
 			echo "PWCHECK_SUB+=	-e \"s;%%PWCHECK%%;saslauthd;g\""
 			PWCHECK=1
 			;;