diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 7a95c425704c..f3005bb5f4e9 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,129 +1,129 @@
 # New ports collection makefile for:	cyrus-sasl
 # Date created:				Nov 1 1999
 # Whom:					hetzels@westbend.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cyrus-sasl
-PORTVERSION=	1.5.21
+PORTVERSION=	1.5.24
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		${MASTER_SITE_LOCAL} \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
 MASTER_SITE_SUBDIR=	stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
 
 MAINTAINER=	hetzels@westbend.net
 
 USE_OPENSSL=	RSA
 
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
 Y2K=		http://asg.web.cmu.edu/cyrus/imapd/y2k.html
 
 MAN3=		sasl.3 sasl_authorize_t.3 sasl_callbacks.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_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
 
 USE_AUTOCONF=	YES
 USE_LIBTOOL=	YES
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-plugindir=${PREFIX}/lib/sasl \
 		--with-dbpath=${PREFIX}/etc/sasldb \
 		--includedir=${PREFIX}/include/sasl \
 		--enable-static \
 		--enable-login \
 		--with-pwcheck=/var/pwcheck \
 		--with-rc4=openssl
 
 # JavaSASL is currently Broken
 #JAVADIR=        jdk1.1.8
 #JAVALIBDIR=     ${PREFIX}/${JAVADIR}/lib/i386/green_threads/
 
 #.if defined(USE_JAVA) || exists(${LOCALBASE}/${JAVADIR}/bin/java)
 #BUILD_DEPENDS=  ${LOCALBASE}/${JAVADIR}/bin/java:${PORTSDIR}/java/jdk
 #CONFIGURE_ARGS+= --with-java \
 #		 --with-javabase=${LOCALBASE}/include
 #
 #CONFIGURE_ENV=	JAVAC="${LOCALBASE}/${JAVADIR}/bin/javac" \
 #		JAVAH="${LOCALBASE}/${JAVADIR}/bin/javah" \
 #		JAVADOC="${LOCALBASE}/${JAVADIR}/bin/javadoc"
 #.endif
 
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
 CONFIGURE_ARGS+= --enable-gssapi=${KRB5_HOME}
 .else
 CONFIGURE_ARGS+= --disable-gssapi
 GSSAPI=	"@comment "
 .endif
 
 .if exists(/usr/lib/libkrb.a)
 CONFIGURE_ARGS+= --enable-krb4
 .else
 CONFIGURE_ARGS+= --disable-krb4
 EBONES=	"@comment "
 .endif
 
 CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE} \
 		OPENSSLINC=${OPENSSLINC} \
 		OPENSSLLIB=${OPENSSLLIB}
 
 DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 
 DOC2=	draft-leach-digest-sasl-05.txt \
 	draft-newman-auth-scram-03.txt \
 	rfc1321.txt rfc2095.txt rfc2104.txt \
 	rfc2222.txt rfc2245.txt
 
 HTDOCS=	gssapi index programming sysadmin
 
 .if defined(NOPORTDOCS)
 NODOCS=	"@comment "
 .endif
 
 PLIST_SUB=	PREFIX=${PREFIX} \
 		GSSAPI=${GSSAPI} \
 		EBONES=${EBONES} \
 		NOPORTDOCS=${NODOCS}
 
 # Create Cyrus user and group
 pre-install:
 	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
 
 post-install:
 	@${SED}  -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/pwcheck.sh \
 		> ${PREFIX}/etc/rc.d/pwcheck.sh
 	@${CHMOD} 755 ${PREFIX}/etc/rc.d/pwcheck.sh
 	${INSTALL} -d -m 700 -o cyrus -g cyrus /var/pwcheck
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/SASL/html
 .for file in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SASL
 .endfor
 .for file in ${DOC2}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/SASL
 .endfor
 .for file in ${HTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${PREFIX}/share/doc/SASL/html
 .endfor
 .endif
 
 .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .elif ${PREFIX} != ${LOCALBASE}
 # Save PREFIX so that it can be used during make install
 .BEGIN:
 	@echo "PREFIX=	${PREFIX}" > ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index e79ca2b3aab1..6981d65ce1b0 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1 +1 @@
-MD5 (cyrus-sasl-1.5.21.tar.gz) = ada3a2b8ca3fd27982dcb6a97a65f4aa
+MD5 (cyrus-sasl-1.5.24.tar.gz) = aedc0f8b594e2a13503b375ed78f62b7
diff --git a/security/cyrus-sasl/files/patch-ab b/security/cyrus-sasl/files/patch-ab
index 334527822474..797e5ef3a899 100644
--- a/security/cyrus-sasl/files/patch-ab
+++ b/security/cyrus-sasl/files/patch-ab
@@ -1,35 +1,14 @@
---- configure.in.orig	Mon May  8 12:51:13 2000
-+++ configure.in	Sat Jun 10 20:23:18 2000
+--- configure.in.orig	Thu Aug  3 14:34:08 2000
++++ configure.in	Thu Aug  3 14:39:24 2000
 @@ -66,8 +66,9 @@
  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} -I${OPENSSLINC}/openssl ${CPPFLAGS}"
 +CMU_ADD_LIBPATH("${LOCALBASE}/lib")
 +CMU_ADD_LIBPATH("${OPENSSLLIB}")
  
  AM_DISABLE_STATIC
  
-@@ -413,8 +414,9 @@
- 
-   if test "$with_des" != no; then
-     AC_CHECK_HEADER(krb.h,
--      AC_CHECK_LIB(krb, krb_mk_priv,:,
--                   AC_WARN(No Kerberos V4 found); krb4=no,
-+      AC_CHECK_LIB(krb, krb_mk_priv, COM_ERR="",
-+                   AC_CHECK_LIB(krb, krb_mk_err, COM_ERR="-lcom_err",
-+			AC_WARN(No Kerberos V4 found); krb4=no,-ldes -lcom_err),
- 		   -ldes),
-       AC_WARN(No Kerberos V4 found); krb4=no)
-   else
-@@ -428,7 +430,7 @@
-   AC_MSG_RESULT(enabled)
-   SASL_MECHS="$SASL_MECHS libkerberos4.la"
-   AC_DEFINE(HAVE_KRB)
--  SASL_KRB_LIB="-lkrb -ldes"
-+  SASL_KRB_LIB="-lkrb -ldes $COM_ERR"
-   AC_SUBST(SASL_KRB_LIB)
- else
-   AC_MSG_RESULT(disabled)
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 7a95c425704c..f3005bb5f4e9 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,129 +1,129 @@
 # New ports collection makefile for:	cyrus-sasl
 # Date created:				Nov 1 1999
 # Whom:					hetzels@westbend.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cyrus-sasl
-PORTVERSION=	1.5.21
+PORTVERSION=	1.5.24
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		${MASTER_SITE_LOCAL} \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
 MASTER_SITE_SUBDIR=	stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
 
 MAINTAINER=	hetzels@westbend.net
 
 USE_OPENSSL=	RSA
 
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
 Y2K=		http://asg.web.cmu.edu/cyrus/imapd/y2k.html
 
 MAN3=		sasl.3 sasl_authorize_t.3 sasl_callbacks.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_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
 
 USE_AUTOCONF=	YES
 USE_LIBTOOL=	YES
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-plugindir=${PREFIX}/lib/sasl \
 		--with-dbpath=${PREFIX}/etc/sasldb \
 		--includedir=${PREFIX}/include/sasl \
 		--enable-static \
 		--enable-login \
 		--with-pwcheck=/var/pwcheck \
 		--with-rc4=openssl
 
 # JavaSASL is currently Broken
 #JAVADIR=        jdk1.1.8
 #JAVALIBDIR=     ${PREFIX}/${JAVADIR}/lib/i386/green_threads/
 
 #.if defined(USE_JAVA) || exists(${LOCALBASE}/${JAVADIR}/bin/java)
 #BUILD_DEPENDS=  ${LOCALBASE}/${JAVADIR}/bin/java:${PORTSDIR}/java/jdk
 #CONFIGURE_ARGS+= --with-java \
 #		 --with-javabase=${LOCALBASE}/include
 #
 #CONFIGURE_ENV=	JAVAC="${LOCALBASE}/${JAVADIR}/bin/javac" \
 #		JAVAH="${LOCALBASE}/${JAVADIR}/bin/javah" \
 #		JAVADOC="${LOCALBASE}/${JAVADIR}/bin/javadoc"
 #.endif
 
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
 CONFIGURE_ARGS+= --enable-gssapi=${KRB5_HOME}
 .else
 CONFIGURE_ARGS+= --disable-gssapi
 GSSAPI=	"@comment "
 .endif
 
 .if exists(/usr/lib/libkrb.a)
 CONFIGURE_ARGS+= --enable-krb4
 .else
 CONFIGURE_ARGS+= --disable-krb4
 EBONES=	"@comment "
 .endif
 
 CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE} \
 		OPENSSLINC=${OPENSSLINC} \
 		OPENSSLLIB=${OPENSSLLIB}
 
 DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 
 DOC2=	draft-leach-digest-sasl-05.txt \
 	draft-newman-auth-scram-03.txt \
 	rfc1321.txt rfc2095.txt rfc2104.txt \
 	rfc2222.txt rfc2245.txt
 
 HTDOCS=	gssapi index programming sysadmin
 
 .if defined(NOPORTDOCS)
 NODOCS=	"@comment "
 .endif
 
 PLIST_SUB=	PREFIX=${PREFIX} \
 		GSSAPI=${GSSAPI} \
 		EBONES=${EBONES} \
 		NOPORTDOCS=${NODOCS}
 
 # Create Cyrus user and group
 pre-install:
 	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
 
 post-install:
 	@${SED}  -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/pwcheck.sh \
 		> ${PREFIX}/etc/rc.d/pwcheck.sh
 	@${CHMOD} 755 ${PREFIX}/etc/rc.d/pwcheck.sh
 	${INSTALL} -d -m 700 -o cyrus -g cyrus /var/pwcheck
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/SASL/html
 .for file in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SASL
 .endfor
 .for file in ${DOC2}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/SASL
 .endfor
 .for file in ${HTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${PREFIX}/share/doc/SASL/html
 .endfor
 .endif
 
 .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .elif ${PREFIX} != ${LOCALBASE}
 # Save PREFIX so that it can be used during make install
 .BEGIN:
 	@echo "PREFIX=	${PREFIX}" > ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index e79ca2b3aab1..6981d65ce1b0 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1 +1 @@
-MD5 (cyrus-sasl-1.5.21.tar.gz) = ada3a2b8ca3fd27982dcb6a97a65f4aa
+MD5 (cyrus-sasl-1.5.24.tar.gz) = aedc0f8b594e2a13503b375ed78f62b7
diff --git a/security/cyrus-sasl2/files/patch-ab b/security/cyrus-sasl2/files/patch-ab
index 334527822474..797e5ef3a899 100644
--- a/security/cyrus-sasl2/files/patch-ab
+++ b/security/cyrus-sasl2/files/patch-ab
@@ -1,35 +1,14 @@
---- configure.in.orig	Mon May  8 12:51:13 2000
-+++ configure.in	Sat Jun 10 20:23:18 2000
+--- configure.in.orig	Thu Aug  3 14:34:08 2000
++++ configure.in	Thu Aug  3 14:39:24 2000
 @@ -66,8 +66,9 @@
  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} -I${OPENSSLINC}/openssl ${CPPFLAGS}"
 +CMU_ADD_LIBPATH("${LOCALBASE}/lib")
 +CMU_ADD_LIBPATH("${OPENSSLLIB}")
  
  AM_DISABLE_STATIC
  
-@@ -413,8 +414,9 @@
- 
-   if test "$with_des" != no; then
-     AC_CHECK_HEADER(krb.h,
--      AC_CHECK_LIB(krb, krb_mk_priv,:,
--                   AC_WARN(No Kerberos V4 found); krb4=no,
-+      AC_CHECK_LIB(krb, krb_mk_priv, COM_ERR="",
-+                   AC_CHECK_LIB(krb, krb_mk_err, COM_ERR="-lcom_err",
-+			AC_WARN(No Kerberos V4 found); krb4=no,-ldes -lcom_err),
- 		   -ldes),
-       AC_WARN(No Kerberos V4 found); krb4=no)
-   else
-@@ -428,7 +430,7 @@
-   AC_MSG_RESULT(enabled)
-   SASL_MECHS="$SASL_MECHS libkerberos4.la"
-   AC_DEFINE(HAVE_KRB)
--  SASL_KRB_LIB="-lkrb -ldes"
-+  SASL_KRB_LIB="-lkrb -ldes $COM_ERR"
-   AC_SUBST(SASL_KRB_LIB)
- else
-   AC_MSG_RESULT(disabled)