19 files changed, 218 insertions, 697 deletions

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 5023c743bae0..e812d37c448a 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -6,55 +6,48 @@
 #
 
 PORTNAME=	cyrus-sasl
-PORTVERSION=	1.5.27
-PORTREVISION=	5
+PORTVERSION=	2.1.6
 CATEGORIES=	security ipv6
-MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
-		http://www.surf.org.uk/downloads/ \
-		ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \
-		${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+		ftp://ftp.westbend.net/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
-MASTER_SITE_SUBDIR=	. OLD-VERSIONS/sasl cyrus-utils
 
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		sasl-${PORTVERSION}-ldap-ssl-filter-mysql-patch4.tgz
-
-PATCH_SITES=	ftp://ftp.westbend.net/pub/cyrus-mail/contrib/ \
-		http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=	sasl_apop_patch.gz \
-		${DISTNAME}-ipv6-${IPV6_VER}.diff.gz
-
-MAINTAINER=	hetzels@westbend.net
+MAINTAINER=	ume@FreeBSD.org
 
 USE_SUBMAKE=	yes
 USE_OPENSSL=	yes
 
 INSTALLS_SHLIB=	yes
 
-# IPv6 Patch provided by Hajimu UMEMOTO <ume@mahoroba.org>
-IPV6_VER=	20020106
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}2
 
-MAN3=		sasl.3 sasl_authorize_t.3 sasl_callbacks.3 sasl_checkpass.3 \
+MAN3=		sasl.3 sasl_authorize_t.3 sasl_auxprop.3 \
+		sasl_auxprop_getctx.3 sasl_auxprop_request.3 \
+		sasl_callbacks.3 sasl_canon_user_t.3 \
+		sasl_chalprompt_t.3 sasl_checkapop.3 sasl_checkpass.3 \
 		sasl_client_init.3 sasl_client_new.3 sasl_client_start.3 \
-		sasl_client_step.3 sasl_decode.3 sasl_done.3 sasl_encode.3 \
+		sasl_client_step.3 sasl_decode.3 sasl_dispose.3 sasl_done.3 \
+		sasl_encode.3 sasl_encodev.3 sasl_errdetail.3 sasl_errors.3 \
 		sasl_errstring.3 sasl_getopt_t.3 sasl_getpath_t.3 \
-		sasl_getprop.3 sasl_getsecret_t.3 sasl_getsimple_t.3 \
-		sasl_listmech.3 sasl_log_t.3 sasl_server_init.3 \
-		sasl_server_new.3 sasl_server_start.3 sasl_server_step.3 \
-		sasl_setprop.3 sasl_usererr.3
-MAN8=		sasldblistusers.8 saslpasswd.8
+		sasl_getprop.3 sasl_getrealm_t.3 sasl_getsecret_t.3 \
+		sasl_getsimple_t.3 sasl_global_listmech.3 \
+		sasl_idle.3 sasl_listmech.3 sasl_log_t.3 \
+		sasl_server_init.3 sasl_server_new.3 sasl_server_start.3 \
+		sasl_server_step.3 sasl_server_userdb_checkpass_t.3 \
+		sasl_server_userdb_setpass_t.3 sasl_setpass.3 sasl_setprop.3 \
+		sasl_user_exists.3 sasl_verifyfile_t.3
+MAN8=		saslauthd.8 sasldblistusers2.8 saslpasswd2.8
 
-USE_AUTOMAKE_VER=14
 USE_LIBTOOL=	YES
-AUTOMAKE_ARGS=	--add-missing --include-deps
 
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
-		--with-plugindir=${PREFIX}/lib/sasl \
-		--with-dbpath=${PREFIX}/etc/sasldb \
-		--includedir=${PREFIX}/include/sasl1 \
+		--with-plugindir=${PREFIX}/lib/sasl2 \
+		--with-dbpath=${PREFIX}/etc/sasldb2 \
+		--includedir=${PREFIX}/include \
 		--enable-static \
 		--enable-login \
-		--with-pwcheck=/var/pwcheck \
+		--with-saslauthd \
+		--enable-auth-sasldb \
 		--with-rc4=openssl
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
@@ -62,14 +55,7 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
 		REALCURDIR="${.CURDIR}" \
-		WITH_DB3="${WITH_DB3}" \
-		WITH_JAVA="${WITH_JAVA}" \
-		WITH_MYSQL="${WITH_MYSQL}" \
-		WITH_LDAP1="${WITH_LDAP1}" \
-		WITH_LDAP2="${WITH_LDAP2}"
-
-JAVADIR=	jdk1.3.1
-JAVALIBDIR=	${PREFIX}/${JAVADIR}/lib/i386/green_threads/
+		WITH_DB3="${WITH_DB3}"
 
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
 CONFIGURE_ARGS+=	--enable-gssapi=${KRB5_HOME}
@@ -91,26 +77,27 @@ CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE} \
 		OPENSSLINC=${OPENSSLINC} \
 		OPENSSLLIB=${OPENSSLLIB}
 
-DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README
+
+DOC2=	ONEWS TODO draft-burdis-cat-srp-sasl-06.txt \
+	draft-ietf-cat-sasl-gssapi-05.txt draft-myers-saslrev-02.txt \
+	draft-sasl-login.txt rfc1321.txt rfc1939.txt rfc2104.txt \
+	rfc2195.txt rfc2222.txt rfc2243.txt rfc2245.txt rfc2289.txt \
+	rfc2444.txt rfc2595.txt rfc2831.txt rfc2945.txt rfc3174.txt \
+	server-plugin-flow.fig testing.txt
+
+HTDOCS=	advanced appconvert gssapi index install macosx options \
+	plugprog programming readme sysadmin upgrading
 
 PLIST_SUB=	PREFIX=${PREFIX} \
 		GSSAPI=${GSSAPI} \
 		EBONES=${EBONES} \
 		DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} \
 
-LDAP_MYSQL_PATCH=	ldap-mysql_sasl-${PORTVERSION}/sasl-ldap+mysql.patch
-
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 450000
-FMT=    /usr/bin/fmt
-.else
-FMT=    /usr/bin/fmt -w 67
-.endif
-
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.sasl
 
@@ -118,12 +105,6 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
-post-extract:
-	@${CP} ${FILESDIR}/pwcheck_pam.c ${WRKSRC}/pwcheck
-
-pre-patch:
-	@(cd ${WRKSRC} && ${PATCH} -p1 < ${WRKDIR}/${LDAP_MYSQL_PATCH})
-
 # Fix sasldb name in pkg-install/deinstall scripts
 post-patch:
 	@${SED} -e "s;%%SASLDB%%;${SASLDB_NAME};g" \
@@ -133,10 +114,6 @@ post-patch:
 	@${SED} -e "s;%%SASLDB%%;${SASLDB_NAME};g" \
 		-e "s;%%PREFIX%%;${PREFIX};g" \
 		${.CURDIR}/pkg-message > ${PKGMESSAGE}
-.ifdef LDAP_MYSQL_MSG
-	@${ECHO_CMD} ${LDAP_MYSQL_MSG} | ${FMT} >> ${PKGMESSAGE}
-	@${ECHO_CMD} >> ${PKGMESSAGE}
-.endif
 
 pre-configure:
 	@(cd ${WRKSRC} && ${AUTOHEADER})
@@ -146,10 +123,16 @@ pre-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
+	${INSTALL_MAN} ${WRKSRC}/utils/saslpasswd2.8 \
+		${MAN8PREFIX}/man/man8/saslpasswd2.8
+	${INSTALL_MAN} ${WRKSRC}/utils/sasldblistusers2.8 \
+		${MAN8PREFIX}/man/man8/sasldblistusers2.8
+	${INSTALL_MAN} ${WRKSRC}/saslauthd/saslauthd.mdoc \
+		${MAN8PREFIX}/man/man8/saslauthd.8
 	@${SED} -e "s;%%PREFIX%%;${PREFIX};g" ${PWCHECK_SUB} \
-		${FILESDIR}/pwcheck.sh > ${PREFIX}/etc/rc.d/pwcheck.sh
-	@${CHMOD} 755 ${PREFIX}/etc/rc.d/pwcheck.sh
-	${INSTALL} -d -m 770 -o cyrus -g cyrus /var/pwcheck
+		${FILESDIR}/saslauthd.sh > ${PREFIX}/etc/rc.d/saslauthd.sh
+	@${CHMOD} 755 ${PREFIX}/etc/rc.d/saslauthd.sh
+	${INSTALL} -d -m 770 -o cyrus -g cyrus /var/state/saslauthd
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in ${DOCS}
@@ -159,8 +142,6 @@ post-install:
 	for file in `make -V EXTRA_DIST` ; do \
 		${INSTALL_DATA} ${WRKSRC}/doc/$${file} ${DOCSDIR} ; \
 	done)
-	@${INSTALL_DATA} ${WRKSRC}/java/doc/draft-weltman-java-sasl-02.txt ${DOCSDIR}
-	@${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${DOCSDIR}
 .endif
 	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
@@ -168,8 +149,4 @@ post-install:
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
-#if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-#include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-#endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index d11c5893e6e9..fa9c5eeed697 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,4 +1 @@
-MD5 (cyrus-sasl-1.5.27.tar.gz) = 76ea426e2e2da3b8d2e3a43af5488f3b
-MD5 (sasl-1.5.27-ldap-ssl-filter-mysql-patch4.tgz) = 3e2b5cf7c5f8f0e8551f28a8d83391bb
-MD5 (sasl_apop_patch.gz) = 6bf7a34b73d1c8d139d2269069d1ba4c
-MD5 (cyrus-sasl-1.5.27-ipv6-20020106.diff.gz) = b2956a084954a46ba2d751f56a80a275
+MD5 (cyrus-sasl-2.1.6.tar.gz) = 3b60cf1f0d1a3230fbc1bb7490f5ae42
diff --git a/security/cyrus-sasl2/files/Sendmail.README b/security/cyrus-sasl2/files/Sendmail.README
deleted file mode 100644
index c88d2433e92e..000000000000
--- a/security/cyrus-sasl2/files/Sendmail.README
+++ /dev/null
@@ -1,51 +0,0 @@
-How to enable SMTP AUTH with FreeBSD default Sendmail
-
-1) Add the following to  /etc/make.conf:
-
-    # Add SMTP AUTH support to Sendmail
-    SENDMAIL_CFLAGS+=	-I/usr/local/include/sasl1 -DSASL
-    SENDMAIL_LDFLAGS+=	-L/usr/local/lib
-    SENDMAIL_LDADD+=	-lsasl
-
-    NOTE: Sendmail 8.10 - 8.11 needS -D_FFR_UNSAFE_SASL added
-          to SENDMAIL_CFLAGS, if you need the GroupReadableSASLFile option
-
-2) Rebuild FreeBSD (make buildworld, ...)
-
-3) Create /usr/local/lib/sasl/Sendmail.conf with the following.
-
-   pwcheck_method: pwcheck
-
-4) Add the following to your sendmail.mc file:
-
-   dnl The group needs to be mail in order to read the sasldb file
-   define(`confRUN_AS_USER',`root:mail')dnl
-
-   TRUST_AUTH_MECH(`DIGEST-MD5 CRAM-MD5')dnl
-   define(`confAUTH_MECHANISMS',`DIGEST-MD5 CRAM-MD5')dnl
-
-   dnl Use the following for Sendmail 8.12
-   define(`confDONT_BLAME_SENDMAIL',`GroupReadableSASLDBFile')dnl
-
-   dnl Use the following for Sendmail 8.10 - 8.11
-   define(`confDONT_BLAME_SENDMAIL',`GroupReadableSASLFile')dnl
-
- ----
-
-   Additional AUTH Mechanisms are LOGIN, PLAIN, GSSAPI, and KERBEROS_V4.
-   These can be added to TRUST_AUTH_MECH and confAUTH_MECHANISMS as a space
-   seperated list.  You may want to restrict LOGIN, and PLAIN authentication
-   methods for use with STARTTLS, as the password is not encrypted when
-   passed to sendmail.
-
-   LOGIN is required for Outlook Express users.  "My server requires
-   authentication" needs to be checked in the accounts properties to 
-   use SASL Authentication.
-
-   PLAIN is required for Netscape Communicator users.  By default Netscape
-   Communicator will use SASL Authentication when sendmail is compiled with
-   SASL.
-
-   The DONT_BLAME_SENDMAIL option GroupReadableSASL[DB]File is needed when you
-   are using cyrus-imapd and sendmail on the same server that requires access
-   to the sasldb database.
diff --git a/security/cyrus-sasl2/files/patch-ab b/security/cyrus-sasl2/files/patch-ab
deleted file mode 100644
index 4b1a2c357e00..000000000000
--- a/security/cyrus-sasl2/files/patch-ab
+++ /dev/null
@@ -1,92 +0,0 @@
---- configure.in.orig	Wed May 22 20:49:46 2002
-+++ configure.in	Thu May 23 16:52:07 2002
-@@ -66,8 +66,12 @@
- dnl check for -R, etc. switch
- CMU_GUESS_RUNPATH_SWITCH
- dnl let's just link against local.  otherwise we never find anything useful.
--CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
--CMU_ADD_LIBPATH("/usr/local/lib")
-+CPPFLAGS="-I${OPENSSLINC}/openssl ${CPPFLAGS}"
-+if test "${OPENSSLINC}" != "/usr/include" ; then
-+  CPPFLAGS="-I${OPENSSLINC} ${CPPFLAGS}"
-+fi
-+CMU_ADD_LIBPATH("${OPENSSLLIB}")
-+CMU_ADD_LIBPATH("${LOCALBASE}/lib")
- 
- AM_DISABLE_STATIC
- 
-@@ -122,8 +126,6 @@
- 
-   AC_SUBST(JAVA_INCLUDES)
-   AC_MSG_RESULT(JAVA_INCLUDES)
--  JAVAC=`echo "$JAVAC" | sed 's,.*/,,'`
--  JAVAH=`echo "$JAVAH" | sed 's,.*/,,'`
- fi
- 
- AM_CONDITIONAL(SAMPLE, test "$enable_sample" = yes)
-@@ -149,11 +151,13 @@
- 	AC_CHECK_HEADER(db.h,
- 			AC_CHECK_LIB(db-3, db_create, SASL_DB_LIB="-ldb-3";
- 			   dblib="berkeley",
-+			AC_CHECK_LIB(db3, db_create, SASL_DB_LIB="-ldb3";
-+			   dblib="berkeley",
- 			AC_CHECK_LIB(db, db_create, SASL_DB_LIB="-ldb";
- 			   dblib="berkeley",
- 			AC_CHECK_LIB(db, db_open, SASL_DB_LIB="-ldb"; 
- 			   dblib="berkeley",
--                        dblib="no"))),
-+                        dblib="no")))),
- 			dblib="no")
- 	;;
-   gdbm)
-@@ -175,11 +179,13 @@
- 	AC_CHECK_HEADER(db.h,
- 			AC_CHECK_LIB(db-3, db_create, SASL_DB_LIB="-ldb-3";
- 			   dblib="berkeley",
-+			AC_CHECK_LIB(db3, db_create, SASL_DB_LIB="-ldb3";
-+			   dblib="berkeley",
- 			AC_CHECK_LIB(db, db_create, SASL_DB_LIB="-ldb";
- 			   dblib="berkeley",
- 			AC_CHECK_LIB(db, db_open, SASL_DB_LIB="-ldb"; 
- 			   dblib="berkeley",
--                        dblib="no"))),
-+                        dblib="no")))),
- 			dblib="no")
- 	if test "$dblib" = no; then
- 	  dnl How about ndbm?
-@@ -229,6 +235,13 @@
-   berkeley)
-     SASL_DB_BACKEND="db_${dblib}.lo"
-     AC_DEFINE(SASL_BERKELEYDB)
-+    for db3loc in ${prefix} /usr/local /usr
-+    do
-+      if test -d ${db3loc}/include/db3; then
-+       CPPFLAGS="-I${db3loc}/include/db3 $CPPFLAGS"
-+       break
-+      fi
-+    done
-     ;;
-   *)
-     AC_MSG_WARN([Disabling SASL authentication database support])
-@@ -534,12 +547,16 @@
-   fi
- 
-   if test "$with_des" != no; then
-+    case "$host_os" in
-+	freebsd*)
-+	    COM_ERR="-lcom_err"
-+	    ;;
-+    esac
-     AC_CHECK_HEADER(krb.h,
--      AC_CHECK_LIB(krb, krb_mk_priv, COM_ERR="",
--	AC_CHECK_LIB(krb, krb_mk_priv, COM_ERR="-lcom_err",
--                     AC_WARN(No Kerberos V4 found); krb4=no, -ldes -lcom_err),
--        -ldes),
--      AC_WARN(No Kerberos V4 found); krb4=no)
-+      AC_CHECK_LIB(krb, krb_mk_priv,:,
-+                AC_WARN(No Kerberos V4 found); krb4=no,
-+		-ldes ${COM_ERR}),
-+      AC_WARN(No Kerberos V4 headers found); krb4=no)
-   else
-     AC_WARN(No DES library found for Kerberos V4 support)
-     krb4=no
diff --git a/security/cyrus-sasl2/files/patch-java::CyrusSasl::Makefile.am b/security/cyrus-sasl2/files/patch-java::CyrusSasl::Makefile.am
deleted file mode 100644
index bf5be6aef933..000000000000
--- a/security/cyrus-sasl2/files/patch-java::CyrusSasl::Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- java/CyrusSasl/Makefile.am.orig	Tue Nov 21 23:55:17 2000
-+++ java/CyrusSasl/Makefile.am	Thu Jan 17 21:58:10 2002
-@@ -25,7 +25,7 @@
- 
- javasasl_version = 1:0:0
- 
--javasasldir = $(prefix)/lib/java/classes/sasl/CyrusSasl
-+javasasldir = $(prefix)/share/java/classes/sasl/CyrusSasl
- javahtmldir = $(prefix)/html/sasl
- 
- INCLUDES=$(JAVA_INCLUDES) -I$(top_srcdir)/include
diff --git a/security/cyrus-sasl2/files/patch-java::javax::security::auth::callback::Makefile.am b/security/cyrus-sasl2/files/patch-java::javax::security::auth::callback::Makefile.am
deleted file mode 100644
index d4f02627d7a8..000000000000
--- a/security/cyrus-sasl2/files/patch-java::javax::security::auth::callback::Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- java/javax/security/auth/callback/Makefile.am.orig	Sat Nov  4 16:55:44 2000
-+++ java/javax/security/auth/callback/Makefile.am	Thu Jan 17 22:05:23 2002
-@@ -39,7 +39,7 @@
- #
- ################################################################
- 
--javasasldir = $(prefix)/lib/java/classes/sasl/javax/security/auth/callback
-+javasasldir = $(prefix)/share/java/classes/sasl/javax/security/auth/callback
- javahtmldir = $(prefix)/html/sasl
- 
- javasasl_JAVA = PasswordCallback.java \
diff --git a/security/cyrus-sasl2/files/patch-lib::checkpw.c b/security/cyrus-sasl2/files/patch-lib::checkpw.c
deleted file mode 100644
index 3bc40e300107..000000000000
--- a/security/cyrus-sasl2/files/patch-lib::checkpw.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- lib/checkpw.c.orig	Mon Jun 17 18:28:29 2002
-+++ lib/checkpw.c	Mon Jun 17 18:31:44 2002
-@@ -1667,12 +1667,14 @@
-     return SASL_FAIL;
-   }
-   /* setting dereferensing aliases mode */
-+#ifdef LDAP_OPT_DEREF
-   if (ldap_set_option(ld, LDAP_OPT_DEREF, (void *) &ldap_deref) != LDAP_OPT_SUCCESS) {
-     if (reply) {
-       *reply = "cannot set deref options";
-     }
-     return SASL_FAIL;
-   }
-+#endif
-   /* set ssl mode if needed */
- #ifdef LDAP_OPT_X_TLS
-   if ( ldap_ssl_flag ) {
diff --git a/security/cyrus-sasl2/files/patch-plugins::gssapi.c b/security/cyrus-sasl2/files/patch-plugins::gssapi.c
deleted file mode 100644
index 02273633a299..000000000000
--- a/security/cyrus-sasl2/files/patch-plugins::gssapi.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- plugins/gssapi.c.orig	Fri Mar  9 23:56:46 2001
-+++ plugins/gssapi.c	Mon Jan 21 21:03:32 2002
-@@ -71,6 +71,12 @@
- #include <saslutil.h>
- #include <saslplug.h>
- 
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include <errno.h>
-+
- #ifdef WIN32
- /* This must be after sasl.h */
- # include "saslgssapi.h"
diff --git a/security/cyrus-sasl2/files/patch-pwcheck::Makefile.am b/security/cyrus-sasl2/files/patch-pwcheck::Makefile.am
deleted file mode 100644
index c9e94adefa82..000000000000
--- a/security/cyrus-sasl2/files/patch-pwcheck::Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
---- pwcheck/Makefile.am.orig	Wed Mar 22 11:06:43 2000
-+++ pwcheck/Makefile.am	Thu Jan 17 19:09:06 2002
-@@ -22,9 +22,13 @@
- # SOFTWARE.
- #
- 
--sbin_PROGRAMS = pwcheck
-+sbin_PROGRAMS = pwcheck pwcheck_pam
- 
- pwcheck_SOURCES = pwcheck.c
- EXTRA_pwcheck_SOURCES = pwcheck_getpwnam.c pwcheck_getspnam.c
- pwcheck_DEPENDECIES = pwcheck_@PWCHECKMETH@.lo
- pwcheck_LDADD = pwcheck_@PWCHECKMETH@.lo @LIB_CRYPT@ @LIB_SOCKET@
-+
-+pwcheck_pam_SOURCES = pwcheck.c
-+pwcheck_pam_DEPENDECIES = pwcheck_pam.lo
-+pwcheck_pam_LDADD = pwcheck_pam.lo @LIB_CRYPT@ @LIB_SOCKET@ @LIB_PAM@
diff --git a/security/cyrus-sasl2/files/patch-sample::Makefile.am b/security/cyrus-sasl2/files/patch-sample::Makefile.am
deleted file mode 100644
index 98fd62f809da..000000000000
--- a/security/cyrus-sasl2/files/patch-sample::Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
---- sample/Makefile.am.orig	Tue Jan 22 21:00:24 2002
-+++ sample/Makefile.am	Tue Jan 22 21:01:02 2002
-@@ -54,7 +54,9 @@
- client_SOURCES = client.c common.c common.h
- 
- server_LDADD = ../lib/libsasl.la $(LIB_SOCKET)
-+server_LDFLAGS = $(GSSAPIBASE_LIBS)
- client_LDADD = ../lib/libsasl.la $(LIB_SOCKET)
-+client_LDFLAGS = $(GSSAPIBASE_LIBS)
- 
- sample_client_LDADD = ../lib/libsasl.la $(LIB_SOCKET)
- sample_server_LDADD = ../lib/libsasl.la $(LIB_SOCKET)
diff --git a/security/cyrus-sasl2/files/patch-utils::Makefile.am b/security/cyrus-sasl2/files/patch-utils::Makefile.am
deleted file mode 100644
index f8c887ba515e..000000000000
--- a/security/cyrus-sasl2/files/patch-utils::Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
---- utils//Makefile.am.orig	Tue Jan 22 21:03:43 2002
-+++ utils//Makefile.am	Tue Jan 22 21:02:49 2002
-@@ -45,10 +45,13 @@
- sbin_PROGRAMS = saslpasswd sasldblistusers
- man_MANS = saslpasswd.8 sasldblistusers.8
- saslpasswd_LDADD = ../lib/libsasl.la
-+saslpasswd_LDFLAGS = $(GSSAPIBASE_LIBS)
- sasldblistusers_LDADD = $(SASL_DB_LIB)
-+sasldblistusers_LDFLAGS = $(GSSAPIBASE_LIBS)
- 
- noinst_PROGRAMS = dbconverter-1.5.9
- dbconverter_1_5_9_LDADD = ../lib/libsasl.la $(SASL_DB_LIB)
-+dbconverter_1_5_9_LDFLAGS = $(GSSAPIBASE_LIBS)
- 
- EXTRA_PROGRAMS = testsuite
- testsuite_LDADD = ../lib/libsasl.la $(SASL_DB_LIB) $(LIB_SOCKET)
diff --git a/security/cyrus-sasl2/files/pwcheck.sh b/security/cyrus-sasl2/files/pwcheck.sh
deleted file mode 100644
index 3f4c903817a2..000000000000
--- a/security/cyrus-sasl2/files/pwcheck.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-action=$1
-
-PREFIX=%%PREFIX%%
-
-# Suck in the configuration variables.
-if [ -z "${source_rc_confs_defined}" ]; then
-        if [ -r /etc/defaults/rc.conf ]; then
-                . /etc/defaults/rc.conf
-                source_rc_confs
-        elif [ -r /etc/rc.conf ]; then
-                . /etc/rc.conf
-        fi
-fi
-
-# The following sasl_pwcheck_* variables may be defined in rc.conf
-#
-# 	sasl_pwcheck_enable  -	Set to YES to enable pwcheck
-#				Default: %%ENABLEPWCHECK%%
-#
-#	sasl_pwcheck_program -	Path to pwcheck program (pwcheck/pwcheck_pam)
-#				Default: ${PREFIX}/sbin/%%PWCHECK%%
-
-if [ -z "${sasl_pwcheck_enable}" ] ; then
-	sasl_pwcheck_enable=%%ENABLEPWCHECK%%
-fi
-
-if [ -z "${sasl_pwcheck_program}" ]; then
-	sasl_pwcheck_program=${PREFIX}/sbin/%%PWCHECK%%
-fi
-
-rc=0
-
-case "${sasl_pwcheck_enable}" in
-    [Yy][Ee][Ss])
-	case "${action}" in
-
-	    start)
-		if [ -x ${sasl_pwcheck_program} ] ; then
-		    ${sasl_pwcheck_program} & && echo -n " pwcheck"
-		fi
-		;;
-
-	    stop)
-		if [ -r /var/run/pwcheck.pid ]; then
-		    kill `cat /var/run/pwcheck.pid` && echo -n " pwcheck"
-		    rm /var/run/pwcheck.pid
-		fi
-		;;
-
-	    *)
-		echo "usage: $0 {start|stop}" 1>&2
-		rc=64
-		;;
-	esac
-	;;
-    *)
-	rc=0
-	;;
-esac
-
-exit $rc
diff --git a/security/cyrus-sasl2/files/pwcheck_pam.c b/security/cyrus-sasl2/files/pwcheck_pam.c
deleted file mode 100644
index 57e1076ca92a..000000000000
--- a/security/cyrus-sasl2/files/pwcheck_pam.c
+++ /dev/null
@@ -1,101 +0,0 @@
-
-#include <security/pam_appl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* Static variables used to communicate between the conversation function
- * and the server_login function
- */
-static char *PAM_username;
-static char *PAM_password;
-
-/* PAM conversation function
- */
-static int PAM_conv (int num_msg,
-                     const struct pam_message **msg,
-                     struct pam_response **resp,
-                     void *appdata_ptr) {
-  int replies = 0;
-  struct pam_response *reply = NULL;
-
-  #define COPY_STRING(s) (s) ? strdup(s) : NULL
-
-  reply = malloc(sizeof(struct pam_response) * num_msg);
-  if (!reply) return PAM_CONV_ERR;
-
-  for (replies = 0; replies < num_msg; replies++) {
-    switch (msg[replies]->msg_style) {
-      case PAM_PROMPT_ECHO_ON:
-        reply[replies].resp_retcode = PAM_SUCCESS;
-        reply[replies].resp = COPY_STRING(PAM_username);
-          /* PAM frees resp */
-        break;
-      case PAM_PROMPT_ECHO_OFF:
-        reply[replies].resp_retcode = PAM_SUCCESS;
-        reply[replies].resp = COPY_STRING(PAM_password);
-          /* PAM frees resp */
-        break;
-      case PAM_TEXT_INFO:
-        /* fall through */
-      case PAM_ERROR_MSG:
-        /* ignore it, but pam still wants a NULL response... */
-        reply[replies].resp_retcode = PAM_SUCCESS;
-        reply[replies].resp = NULL;
-        break;
-      default:
-        /* Must be an error of some sort... */
-        free (reply);
-        return PAM_CONV_ERR;
-    }
-  }
-  *resp = reply;
-  return PAM_SUCCESS;
-}
-
-static struct pam_conv PAM_conversation = {
-    PAM_conv,
-    NULL
-};
-
-/* Server log in
- * Accepts: user name string
- *          password string
- * Returns: "OK" if password validated, error message otherwise
- */ 
- 
-char *pwcheck(char *username, char *password)
-{
-  pam_handle_t *pamh;
-  int pam_error;
-
-  /* PAM only handles authentication, not user information. */
-  if ( !(username && password && strlen(username) && strlen(password)) )
-      return "Incorrect username";
-
-  /* validate password */
-
-  PAM_password = password;
-  PAM_username = username;
-  fprintf(stderr, "checking %s\n", username);
-  pam_error = pam_start("cyrus", username, &PAM_conversation, &pamh);
-  if (pam_error == PAM_SUCCESS) 
-    pam_error = pam_authenticate(pamh, 0);
-    
-  if (pam_error == PAM_SUCCESS) 
-    pam_error = pam_acct_mgmt(pamh, 0);
-
-  if ( pam_error == PAM_SUCCESS) 
-    fprintf(stderr, "\tauthenticated %s\n", username);
-  else
-    fprintf(stderr, "\tfailed to authenticate %s\n", username);
-  
-  if(pam_end(pamh, pam_error) != PAM_SUCCESS) {
-    pamh = NULL;
-    fprintf(stderr, "pwcheck: failed to release authenticator\n");
-    exit(1);
-  }
-  return ( pam_error == PAM_SUCCESS ? "OK" : "Incorrect passwd" );
-}
-
-
diff --git a/security/cyrus-sasl2/files/saslauthd.sh b/security/cyrus-sasl2/files/saslauthd.sh
new file mode 100644
index 000000000000..39bd6fc091fc
--- /dev/null
+++ b/security/cyrus-sasl2/files/saslauthd.sh
@@ -0,0 +1,75 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+action=$1
+
+PREFIX=%%PREFIX%%
+
+# Suck in the configuration variables.
+if [ -z "${source_rc_confs_defined}" ]; then
+        if [ -r /etc/defaults/rc.conf ]; then
+                . /etc/defaults/rc.conf
+                source_rc_confs
+        elif [ -r /etc/rc.conf ]; then
+                . /etc/rc.conf
+        fi
+fi
+
+# The following sasl_saslauthd_* variables may be defined in rc.conf
+#
+# 	sasl_saslauthd_enable  - Set to YES to enable saslauthd
+#				 Default: %%ENABLEPWCHECK%%
+#
+#	sasl_saslauthd_program - Path to saslauthd program
+#				 Default: ${PREFIX}/sbin/%%PWCHECK%%
+#
+#	sasl_saslauthd_flags   - Flags to saslauthd program
+#				 Default: -a pam
+
+if [ -z "${sasl_saslauthd_enable}" ]; then
+	sasl_saslauthd_enable=%%ENABLEPWCHECK%%
+fi
+
+if [ -z "${sasl_saslauthd_program}" ]; then
+	sasl_saslauthd_program=${PREFIX}/sbin/%%PWCHECK%%
+fi
+
+if [ -z "${sasl_saslauthd_flags}" ]; then
+	sasl_saslauthd_flags="-a pam"
+fi
+
+rc=0
+
+case "${sasl_saslauthd_enable}" in
+    [Yy][Ee][Ss])
+	case "${action}" in
+
+	    start)
+		if [ -x ${sasl_saslauthd_program} ] ; then
+		    ${sasl_saslauthd_program} ${sasl_saslauthd_flags} \
+			&& echo -n " saslauthd"
+		fi
+		;;
+
+	    stop)
+		if [ -r /var/state/saslauthd/mux.pid ]; then
+		    kill `cat /var/state/saslauthd/mux.pid` && \
+			echo -n " saslauthd"
+		    rm /var/state/saslauthd/mux.pid
+		fi
+		;;
+
+	    *)
+		echo "usage: $0 {start|stop}" 1>&2
+		rc=64
+		;;
+	esac
+	;;
+    *)
+	rc=0
+	;;
+esac
+
+exit $rc
diff --git a/security/cyrus-sasl2/pkg-deinstall b/security/cyrus-sasl2/pkg-deinstall
index cda7889285c6..4d22d7921b8b 100644
--- a/security/cyrus-sasl2/pkg-deinstall
+++ b/security/cyrus-sasl2/pkg-deinstall
@@ -16,7 +16,7 @@ SASLDB_NAME=${PKG_PREFIX}/etc/%%SASLDB%%
 
 delete_sasldb() {
 	if [ -f ${SASLDB_NAME} ] ; then
-		if [ `${PKG_PREFIX}/sbin/sasldblistusers | wc -l` -eq 0 ] ; then
+		if [ `${PKG_PREFIX}/sbin/sasldblistusers2 | wc -l` -eq 0 ] ; then
 			rm ${SASLDB_NAME}
 		else
 			echo "WARNING: Users SASL passwords are in ${SASLDB_NAME}, keeping this file"
@@ -34,22 +34,9 @@ delete_user() {
 
 }
 
-# This should really be uninstalled by Sendmail
-
-sendmail_conf() {
-	if [ -f ${PKG_PREFIX}/lib/sasl/Sendmail.conf ]; then
-		echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl/Sendmail.conf.tmp
-		if cmp -s ${PKG_PREFIX}/lib/sasl/Sendmail.conf ${PKG_PREFIX}/lib/sasl/Sendmail.conf.tmp; then
-			rm -f ${PKG_PREFIX}/lib/sasl/Sendmail.conf
-		fi
-		rm -f ${PKG_PREFIX}/lib/sasl/Sendmail.conf.tmp
-	fi
-}
-
 case $2 in
 	DEINSTALL)
 		delete_sasldb
-		sendmail_conf
 		;;
 	POST-DEINSTALL)
 		delete_user
diff --git a/security/cyrus-sasl2/pkg-install b/security/cyrus-sasl2/pkg-install
index 3e0c005656de..5a3c1c7b6957 100644
--- a/security/cyrus-sasl2/pkg-install
+++ b/security/cyrus-sasl2/pkg-install
@@ -77,25 +77,17 @@ create_user() {
 
 create_sasldb() {
 	if [ ! -f ${SASLDB_NAME} ]; then
-		echo "test" | ${PKG_PREFIX}/sbin/saslpasswd -p -c cyrus
-		if [ `${PKG_PREFIX}/sbin/sasldblistusers | wc -l` -eq 0 ] ; then
+		echo "test" | ${PKG_PREFIX}/sbin/saslpasswd2 -p -c cyrus
+		if [ `${PKG_PREFIX}/sbin/sasldblistusers2 | wc -l` -eq 0 ] ; then
                         echo "WARNING: Failed to create ${PKG_PREFIX}/etc/$SASLDB_NAME}"
                 else
-			${PKG_PREFIX}/sbin/saslpasswd -d cyrus
+			${PKG_PREFIX}/sbin/saslpasswd2 -d cyrus
 			chown cyrus:mail ${SASLDB_NAME}
 			chmod 640 ${SASLDB_NAME}
 		fi
 	fi
 }
 
-# This should really be installed by Sendmail
-
-sendmail_conf() {
-	if [ ! -f ${PKG_PREFIX}/lib/sasl/Sendmail.conf ]; then
-		echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl/Sendmail.conf
-	fi
-}
-
 case $2 in
 	PRE-INSTALL)
 		create_user
@@ -103,7 +95,6 @@ case $2 in
 	POST-INSTALL)
 		if [ "${PKG_BATCH}" = "NO" ]; then
 			create_sasldb
-			sendmail_conf
 		fi
 		;;
 
diff --git a/security/cyrus-sasl2/pkg-message b/security/cyrus-sasl2/pkg-message
index 5dfe7ff77639..bcc38a9a79e3 100644
--- a/security/cyrus-sasl2/pkg-message
+++ b/security/cyrus-sasl2/pkg-message
@@ -1,12 +1,10 @@
 
-You may need to start the pwcheck daemon for authentication with
+You may need to start the saslauthd daemon for authentication with
 the system password files:
 
-	%%PREFIX%%/etc/rc.d/pwcheck.sh start
+	%%PREFIX%%/etc/rc.d/saslauthd.sh start
 
-or you can use sasldb for authentication, to add users use:
+or you can use sasldb2 for authentication, to add users use:
 
-	saslpasswd -c username
-
-How to enable SMTP AUTH with system Sendmail 8.11 - Sendmail.README
+	saslpasswd2 -c username
 
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index b3c88df17818..74216f9896ab 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -1,94 +1,92 @@
-@unexec if [ -f /var/run/pwcheck.pid ] ; then %D/etc/rc.d/pwcheck.sh stop ; echo " stopped." ; fi
-etc/rc.d/pwcheck.sh
-include/sasl1/hmac-md5.h
-include/sasl1/md5.h
-include/sasl1/md5global.h
-include/sasl1/sasl.h
-include/sasl1/saslplug.h
-include/sasl1/saslutil.h
-@dirrm include/sasl1
-%%JAVASASL%%lib/libjavasasl.a
-%%JAVASASL%%lib/libjavasasl.so
-%%JAVASASL%%lib/libjavasasl.so.1
-lib/libsasl.a
-lib/libsasl.so
-lib/libsasl.so.8
-lib/sasl/libanonymous.a
-lib/sasl/libanonymous.so
-lib/sasl/libanonymous.so.1
-lib/sasl/libcrammd5.a
-lib/sasl/libcrammd5.so
-lib/sasl/libcrammd5.so.1
-lib/sasl/libdigestmd5.a
-lib/sasl/libdigestmd5.so
-lib/sasl/libdigestmd5.so.0
-%%GSSAPI%%lib/sasl/libgssapiv2.a
-%%GSSAPI%%lib/sasl/libgssapiv2.so
-%%GSSAPI%%lib/sasl/libgssapiv2.so.1
-%%EBONES%%lib/sasl/libkerberos4.a
-%%EBONES%%lib/sasl/libkerberos4.so
-%%EBONES%%lib/sasl/libkerberos4.so.1
-lib/sasl/liblogin.a
-lib/sasl/liblogin.so
-lib/sasl/liblogin.so.0
-lib/sasl/libplain.a
-lib/sasl/libplain.so
-lib/sasl/libplain.so.1
-sbin/sasldblistusers
-sbin/saslpasswd
-sbin/pwcheck
-sbin/pwcheck_pam
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/ClientFactory.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/GenericClient.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/GenericCommon.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/GenericServer.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/Sasl.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslClient.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslClientFactory.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslException.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslInputStream.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslOutputStream.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslServer.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslServerFactory.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslUtils.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/ServerFactory.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/Callback.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/CallbackHandler.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/NameCallback.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/PasswordCallback.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/RealmCallback.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/UnsupportedCallbackException.class
+etc/rc.d/saslauthd.sh
+include/sasl/hmac-md5.h
+include/sasl/md5.h
+include/sasl/md5global.h
+include/sasl/prop.h
+include/sasl/sasl.h
+include/sasl/saslplug.h
+include/sasl/saslutil.h
+@dirrm include/sasl
+lib/libsasl2.a
+lib/libsasl2.so
+lib/libsasl2.so.2
+lib/sasl2/libanonymous.a
+lib/sasl2/libanonymous.so
+lib/sasl2/libanonymous.so.2
+lib/sasl2/libcrammd5.a
+lib/sasl2/libcrammd5.so
+lib/sasl2/libcrammd5.so.2
+lib/sasl2/libdigestmd5.a
+lib/sasl2/libdigestmd5.so
+lib/sasl2/libdigestmd5.so.2
+%%GSSAPI%%lib/sasl2/libgssapiv2.a
+%%GSSAPI%%lib/sasl2/libgssapiv2.so
+%%GSSAPI%%lib/sasl2/libgssapiv2.so.2
+%%EBONES%%lib/sasl2/libkerberos4.a
+%%EBONES%%lib/sasl2/libkerberos4.so
+%%EBONES%%lib/sasl2/libkerberos4.so.2
+lib/sasl2/liblogin.a
+lib/sasl2/liblogin.so
+lib/sasl2/liblogin.so.2
+lib/sasl2/libotp.a
+lib/sasl2/libotp.so
+lib/sasl2/libotp.so.2
+lib/sasl2/libplain.a
+lib/sasl2/libplain.so
+lib/sasl2/libplain.so.2
+lib/sasl2/libsasldb.a
+lib/sasl2/libsasldb.so
+lib/sasl2/libsasldb.so.2
+sbin/saslauthd
+sbin/sasldblistusers2
+sbin/saslpasswd2
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/Sendmail.README
+%%PORTDOCS%%%%DOCSDIR%%/ONEWS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/draft-newman-auth-scram-03.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-weltman-java-sasl-02.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-burdis-cat-srp-sasl-06.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-cat-sasl-gssapi-05.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-myers-saslrev-02.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-sasl-login.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc1321.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc2095.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc1939.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2104.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2195.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2222.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2243.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2245.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2289.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2444.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2595.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2831.txt
-%%PORTDOCS%%%%DOCSDIR%%/gssapi.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/programming.html
-%%PORTDOCS%%%%DOCSDIR%%/sysadmin.html
+%%PORTDOCS%%%%DOCSDIR%%/rfc2945.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc3174.txt
+%%PORTDOCS%%%%DOCSDIR%%/server-plugin-flow.fig
+%%PORTDOCS%%%%DOCSDIR%%/testing.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/html/appconvert.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gssapi.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/install.html
+%%PORTDOCS%%%%DOCSDIR%%/html/macosx.html
+%%PORTDOCS%%%%DOCSDIR%%/html/options.html
+%%PORTDOCS%%%%DOCSDIR%%/html/plugprog.html
+%%PORTDOCS%%%%DOCSDIR%%/html/programming.html
+%%PORTDOCS%%%%DOCSDIR%%/html/readme.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sysadmin.html
+%%PORTDOCS%%%%DOCSDIR%%/html/upgrading.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%JAVASASL%%@dirrm share/java/classes/sasl/javax/security/auth/callback
-%%JAVASASL%%@dirrm share/java/classes/sasl/javax/security/auth
-%%JAVASASL%%@dirrm share/java/classes/sasl/javax/security
-%%JAVASASL%%@dirrm share/java/classes/sasl/javax
-%%JAVASASL%%@dirrm share/java/classes/sasl/CyrusSasl
-%%JAVASASL%%@dirrm share/java/classes/sasl
-@dirrm lib/sasl
-@cwd /var
-@exec install -d -m 770 -o cyrus -g cyrus %D/pwcheck
-@comment This file gets created by the pwcheck program
-@unexec rm -f %D/pwcheck/pwcheck
-@dirrm pwcheck
+@dirrm lib/sasl2
+@mode ug=rwx,o=
+@exec mkdir -p state/saslauthd
+@exec chown -R cyrus:cyrus state
+@exec chmod -R o= state
+@comment This file gets created by the state/saslauthd program
+@unexec rm -fr /var/state/saslauthd
+@dirrm state
 @cwd %%PREFIX%%
diff --git a/security/cyrus-sasl2/scripts/configure.sasl b/security/cyrus-sasl2/scripts/configure.sasl
index 65a36ef5c876..b9b0983b93af 100644
--- a/security/cyrus-sasl2/scripts/configure.sasl
+++ b/security/cyrus-sasl2/scripts/configure.sasl
@@ -13,19 +13,8 @@ if [ "${BATCH}" ]; then
 	else
 		OPTIONS="\"NDBM\""
 	fi
-	if [ "${WITH_JAVA}" ]; then
-		OPTIONS="${OPTIONS} \"JAVA\""
-	fi
-	if [ "${WITH_MYSQL}" ]; then
-		OPTIONS="${OPTIONS} \"MySQL\""
-	fi
-	if [ "${WITH_LDAP2}" ]; then
-		OPTIONS="${OPTIONS} \"OpenLDAP2\""
-	elif [ "${WITH_LDAP1}" ]; then
-		OPTIONS="${OPTIONS} \"OpenLDAP1\""
-	fi
 	if [ "${OPTIONS}" != "x" ]; then
-		OPTIONS="${OPTIONS} \"PWCHECK\""
+		OPTIONS="${OPTIONS} \"SASLAUTHD\""
 		set ${OPTIONS}
 	fi
 else
@@ -36,37 +25,13 @@ else
 		SET_DB3="OFF"
 		SET_NDBM="ON"
 	fi
-	if [ "${WITH_JAVA}" ] ; then
-		SET_JAVA="ON"
-	else
-		SET_JAVA="OFF"
-	fi
-	if [ "${WITH_MYSQL}" -o -f ${PREFIX}/lib/mysql/libmysqlclient.so ] ; then
-		SET_MYSQL="ON"
-	else
-		SET_MYSQL="OFF"
-	fi
-
-	#Perfer LDAP2 over LDAP1
-	SET_LDAP1="OFF"
-	SET_LDAP2="OFF"
-	if [ "${WITH_LDAP2}" -o -f ${PREFIX}/lib/libldap.so.2 -a -f ${PREFIX}/lib/liblber.so.2 ] ; then
-		SET_LDAP2="ON"
-	elif [ "${WITH_LDAP1}" -o -f ${PREFIX}/lib/libldap.so.1 -a -f ${PREFIX}/lib/liblber.so.1 ]; then
-		SET_LDAP1="ON"
-	fi
 
 	/usr/bin/dialog --title "Additional SASL options" --clear \
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
 NDBM		"ndbm DB" ${SET_NDBM} \
 DB3		"Berkeley DB, revision 3" ${SET_DB3} \
-JAVA		"JavaSASL [Experimental]" ${SET_JAVA} \
-MySQL		"MySQL password Authentication" ${SET_MYSQL} \
-OpenLDAP1	"OpenLDAP 1.x password Authentication" ${SET_LDAP1} \
-OpenLDAP2	"OpenLDAP 2.x password Authentication w/TLS" ${SET_LDAP2} \
-PWCHECK		"Use pwcheck for password Authentication" ON \
-PAMPWCHECK      "Use pwcheck_pam for password Authentication" OFF \
+SASLAUTHD       "Use saslauthd for password Authentication" ON \
 2> $tempfile
 
 	retval=$?
@@ -103,7 +68,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "CONFIGURE_ARGS+=	--with-dblib=ndbm"
-			echo "SASLDB_NAME=	sasldb.db"
+			echo "SASLDB_NAME=	sasldb2.db"
 			DBLIB=1
 			;;
 		\"DB3\")
@@ -113,64 +78,13 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "LIB_DEPENDS+=	db3.2:\${PORTSDIR}/databases/db3"
-			echo "CONFIGURE_ARGS+=	--with-dblib=berkeley"
-			echo "SASLDB_NAME=	sasldb"
+			echo "CONFIGURE_ARGS+=	--with-dblib=berkeley --with-bdb-incdir=${PREFIX}/include/db3  --with-bdb-libdir=${PREFIX}/lib"
+			echo "SASLDB_NAME=	sasldb2"
 			DBLIB=1
 			;;
-		\"JAVA\")
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/\${JAVADIR}/bin/java:\${PORTSDIR}/java/jdk13"
-			echo "RUN_DEPENDS+=	\${LOCALBASE}/\${JAVADIR}/bin/java:\${PORTSDIR}/java/jdk13"
-			echo "USE_GMAKE=	yes"
-			echo "CONFIGURE_ARGS+=	--enable-java \\"
-			echo "			--with-javabase=\${LOCALBASE}/\${JAVADIR}"
-			echo "CONFIGURE_ENV+=	JAVAC=\"\${LOCALBASE}/\${JAVADIR}/bin/javac\" \\"
-			echo "		JAVAH=\"\${LOCALBASE}/\${JAVADIR}/bin/javah\" \\"
-			echo "		JAVADOC=\"\${LOCALBASE}/\${JAVADIR}/bin/javadoc\""
-			echo "PLIST_SUB+=	JAVASASL=\"\""
-			DEFJAVA=1
-			;;
-		\"MySQL\")
-			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
-			echo "CONFIGURE_ARGS+=	--with-mysql=\${PREFIX}"
-			MSG=1
-			;;
-		\"OpenLDAP1\")
-			if [ "$OPENLDAP" ]; then
-				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	ldap.1:\${PORTSDIR}/net/openldap"
-			echo "LIB_DEPENDS+=	lber.1:\${PORTSDIR}/net/openldap"
-			echo "CONFIGURE_ARGS+=	--with-ldap=\${PREFIX}"
-			OPENLDAP=1
-			;;
-		\"OpenLDAP2\")
-			if [ "$OPENLDAP" ]; then
-				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap2"
-			echo "LIB_DEPENDS+=	lber.2:\${PORTSDIR}/net/openldap2"
-			echo "CONFIGURE_ARGS+=	--with-ldap=\${PREFIX}"
-			OPENLDAP=1
-			;;
-		\"PWCHECK\")
-			if [ "$PWCHECK" ]; then
-				echo "PWCHECK or PAMPWCHECK must be choosen seperately: Defaulting to PAMPWCHECK" > /dev/stderr
-			else
-				echo "PWCHECK_SUB+=	-e \"s;%%PWCHECK%%;pwcheck;g\""
-				PWCHECK=1
-			fi
-			;;
-		\"PAMPWCHECK\")
-			if [ "$PWCHECK" ]; then
-				echo "PWCHECK or PAMPWCHECK must be choosen seperately: Defaulting to PWCHECK" > /dev/stderr
-			else
-				echo "PWCHECK_SUB+=	-e \"s;%%PWCHECK%%;pwcheck_pam;g\""
-				PWCHECK=1
-			fi
+		\"SASLAUTHD\")
+			echo "PWCHECK_SUB+=	-e \"s;%%PWCHECK%%;saslauthd;g\""
+			PWCHECK=1
 			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
@@ -184,17 +98,10 @@ done
 if [ "$PWCHECK" ]; then
 	echo "PWCHECK_SUB+=	-e \"s;%%ENABLEPWCHECK%%;yes;g\""
 else
-	echo "PWCHECK_SUB+=	-e \"s;%%PWCHECK%%;pwcheck;g\" \\"
+	echo "PWCHECK_SUB+=	-e \"s;%%PWCHECK%%;saslauthd;g\" \\"
 	echo "			-e \"s;%%ENABLEPWCHECK%%;no;g\""
 fi
-if [ ! "${DEFJAVA}" ]; then
-	echo "PLIST_SUB+=	JAVASASL=\"@comment \""
-fi
 if [ ! "${DBLIB}" ]; then
 	echo "CONFIGURE_ARGS+=	--with-dblib=ndbm"
-	echo "SASLDB_NAME=	sasldb.db"
-fi
-
-if [ "$OPENLDAP" ]; then
-	echo "LDAP_MYSQL_MSG=	\"See sysadmin.html in the Cyrus-SASL docs directory for informaion on using LDAP or MySQL for authentication.\""
+	echo "SASLDB_NAME=	sasldb2.db"
 fi