* Fix some problems with building the Kerberos IV and 5 mechs.

* Made the port to optionally not build the mechs, define
WITHOUT_[ANONYMOUS,CRAM,DIGEST,LOGIN,OTP,GSSAPI,PLAIN].

* The Kerberos IV case is special, as we can use the base kerberos 4x
(<=5.0-RELEASE), or use the security/krb4 port.
    WITH_KERBEROS4 - use security/krb4 port
        if <=5.0-RELEASE, use krb4 port only if /usr/lib/libkrb.a
	doesn't exist
    WITHOUT_KERBEROS4 - disables using the base systems /usr/lib/libkrb.a
	(<=5.0), if it exists and MAKE_KERBEROS4 defined in /etc/make.conf

* Changed the combined rcNG/rcOG scripts, so that the defaults are at the top
of the rc.d script and not in an external file to the script.

PR:		51505
Submitted by:	maintainer

1 files changed, 6 insertions, 4 deletions

diff --git a/security/cyrus-sasl/pkg-message b/security/cyrus-sasl/pkg-message
index 2af802713957..e4cfeb9ce050 100644
--- a/security/cyrus-sasl/pkg-message
+++ b/security/cyrus-sasl/pkg-message
@@ -2,7 +2,7 @@
 You may need to start the pwcheck or saslauthd daemon for authentication
 with the system password files:
 
-	%%PREFIX%%/etc/rc.d/pwcheck.sh start
+	%%PREFIX%%/etc/rc.d/cyrus_pwcheck.sh start
 or
 	%%PREFIX%%/etc/rc.d/saslauthd1.sh start
 
@@ -13,7 +13,9 @@ or you can use sasldb for authentication, to add users use:
 If you want to enable SMTP AUTH with the system Sendmail, read Sendmail.README
 
 NOTE: This port has been compiled with a default pwcheck_method of
-      %%PWCHECK_METHOD%%. Set sasl_pwcheck_method to %%PWCHECK_METHOD%%,
-      after installing the Cyrus-IMAPd 1.6.24 port.  You should also check
-      the %%PREFIX%%/lib/sasl/*.conf files for the correct pwcheck_method.
+      %%PWCHECK_METHOD%%. You may need to set sasl_pwcheck_method to
+      %%PWCHECK_METHOD%% after installing either the Cyrus-IMAPd 1.6.24
+      or 2.0.17 ports.
 
+      You should also check the %%PREFIX%%/lib/sasl/*.conf files for the
+      correct pwcheck_method.