diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index ce86dea7370..946fe3d1241 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2003/02/03 08:54:04 jakob Exp $
+# $OpenBSD: Makefile,v 1.8 2003/06/26 18:20:20 jakob Exp $
 
 COMMENT=	"RFC 2222 SASL (Simple Authentication and Security Layer)"
 
-DISTNAME=	cyrus-sasl-2.1.11
+DISTNAME=	cyrus-sasl-2.1.13
 CATEGORIES=     security
 
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -17,7 +17,7 @@ PERMIT_PACKAGE_FTP=	yes
 PERMIT_DISTFILES_CDROM=	yes
 PERMIT_DISTFILES_FTP=	yes
 
-SEPARATE_BUILD=		concurrent
+#SEPARATE_BUILD=		concurrent
 
 USE_LIBTOOL=		Yes
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/config ${WRKSRC}/saslauthd/config
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index d866633f4f9..fa7f454ea5a 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,3 +1,3 @@
-MD5 (cyrus-sasl-2.1.11.tar.gz) = aad25b5185101bc0803fc91e7e65b7de
-RMD160 (cyrus-sasl-2.1.11.tar.gz) = bffaa6af5a4972c19b435f93950f314c6ad3d7c3
-SHA1 (cyrus-sasl-2.1.11.tar.gz) = 18ab0c96a83e4befe291aa73759dddc680cb95b4
+MD5 (cyrus-sasl-2.1.13.tar.gz) = 1114d59d970791932e96de8557472672
+RMD160 (cyrus-sasl-2.1.13.tar.gz) = 70e43b6aeb62ba172526ec02fb2309f7f6e25bc4
+SHA1 (cyrus-sasl-2.1.13.tar.gz) = fccd1650b5b540380c4c5f87c6de76633a30bdca
diff --git a/security/cyrus-sasl2/patches/patch-configure b/security/cyrus-sasl2/patches/patch-configure
index 224c0400fa3..4b88bdbc22e 100644
--- a/security/cyrus-sasl2/patches/patch-configure
+++ b/security/cyrus-sasl2/patches/patch-configure
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure,v 1.4 2003/02/27 17:33:01 jakob Exp $
---- configure.orig	Fri Jan 31 12:55:38 2003
-+++ configure	Thu Feb 27 07:41:06 2003
+$OpenBSD: patch-configure,v 1.5 2003/06/26 18:20:20 jakob Exp $
+--- configure.orig	Mon Apr 14 20:07:48 2003
++++ configure	Wed Jun 25 23:50:09 2003
 @@ -2442,7 +2442,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -10,16 +10,16 @@ $OpenBSD: patch-configure,v 1.4 2003/02/27 17:33:01 jakob Exp $
  cat > conftest.$ac_ext <<EOF
  #line 2448 "configure"
  #include "confdefs.h"
-@@ -4782,7 +4782,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
+@@ -4797,7 +4797,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lresolv  $LIBS"
 +#LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 4788 "configure"
+ #line 4803 "configure"
  #include "confdefs.h"
-@@ -4816,7 +4816,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+@@ -4831,7 +4831,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
  #define $ac_tr_lib 1
  EOF
  
@@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.4 2003/02/27 17:33:01 jakob Exp $
  
  else
    echo "$ac_t""no" 1>&6
-@@ -5134,7 +5134,7 @@ EOF
+@@ -5149,7 +5149,7 @@ EOF
  #define HAVE_KRB 1
  EOF
  
@@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.4 2003/02/27 17:33:01 jakob Exp $
    else
      echo "$ac_t""disabled" 1>&6
    fi
-@@ -5152,7 +5152,7 @@ fi
+@@ -5261,7 +5261,7 @@ fi
  
   if test "$gssapi" != no; then
      if test -d ${gssapi}; then
@@ -46,16 +46,16 @@ $OpenBSD: patch-configure,v 1.4 2003/02/27 17:33:01 jakob Exp $
         LDFLAGS="$LDFLAGS -L$gssapi/lib"
      fi
      ac_safe=`echo "gssapi.h" | sed 'y%./+-%__p_%'`
-@@ -5285,7 +5285,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
+@@ -5394,7 +5394,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lresolv  $LIBS"
 +#LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 5291 "configure"
+ #line 5400 "configure"
  #include "confdefs.h"
-@@ -5319,7 +5319,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+@@ -5428,7 +5428,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
  #define $ac_tr_lib 1
  EOF
  
@@ -64,36 +64,36 @@ $OpenBSD: patch-configure,v 1.4 2003/02/27 17:33:01 jakob Exp $
  
  else
    echo "$ac_t""no" 1>&6
-@@ -5347,7 +5347,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
+@@ -5456,7 +5456,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
--LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -ldes -lasn1 -lroken ${LIB_CRYPT} -lcom_err $LIBS"
-+LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lkrb -lkafs -lcrypto -ldes -lasn1 ${LIB_CRYPT} -lcom_err $LIBS"
+-LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err $LIBS"
++LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lcrypto ${LIB_CRYPT} -lcom_err $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 5353 "configure"
+ #line 5462 "configure"
  #include "confdefs.h"
-@@ -5385,8 +5385,8 @@ fi
+@@ -5494,8 +5494,8 @@ fi
       GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
       GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
    elif test "$gss_impl" = "heimdal"; then
--     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -ldes -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
--     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libdes.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
-+     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -ldes -lasn1 -lkrb -lkafs -lcrypto ${LIB_CRYPT}"
-+     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libdes.a $gssapi_dir/libasn1.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
+-     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
+-     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
++     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 ${LIB_CRYPT} -lcom_err"
++     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
    else
       gssapi="no"
       echo "configure: warning: Disabling GSSAPI" 1>&2
-@@ -5439,7 +5439,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
+@@ -5548,7 +5548,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lresolv  $LIBS"
 +#LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 5445 "configure"
+ #line 5554 "configure"
  #include "confdefs.h"
-@@ -5467,7 +5467,7 @@ LIBS="$ac_save_LIBS"
+@@ -5576,7 +5576,7 @@ LIBS="$ac_save_LIBS"
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -102,16 +102,16 @@ $OpenBSD: patch-configure,v 1.4 2003/02/27 17:33:01 jakob Exp $
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -6240,7 +6240,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
+@@ -6256,7 +6256,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lresolv  $LIBS"
 +#LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 6246 "configure"
+ #line 6262 "configure"
  #include "confdefs.h"
-@@ -6274,7 +6274,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+@@ -6290,7 +6290,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
  #define $ac_tr_lib 1
  EOF
  
diff --git a/security/cyrus-sasl2/patches/patch-lib_dlopen_c b/security/cyrus-sasl2/patches/patch-lib_dlopen_c
index b5ffabb1db7..2822c322cf9 100644
--- a/security/cyrus-sasl2/patches/patch-lib_dlopen_c
+++ b/security/cyrus-sasl2/patches/patch-lib_dlopen_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-lib_dlopen_c,v 1.2 2002/12/10 08:37:42 jakob Exp $
---- lib/dlopen.c.orig	Thu Sep  5 21:21:14 2002
-+++ lib/dlopen.c	Tue Dec 10 00:10:52 2002
+$OpenBSD: patch-lib_dlopen_c,v 1.3 2003/06/26 18:20:20 jakob Exp $
+--- lib/dlopen.c.orig	Thu Feb 13 20:55:54 2003
++++ lib/dlopen.c	Wed Jun 25 23:44:04 2003
 @@ -165,7 +165,7 @@ int _sasl_locate_entry(void *library, co
  #ifdef DO_DLOPEN
  /* note that we still check for known problem systems in
diff --git a/security/cyrus-sasl2/patches/patch-saslauthd_Makefile_in b/security/cyrus-sasl2/patches/patch-saslauthd_Makefile_in
index 37b0c2b2c23..e8cb9c4dedc 100644
--- a/security/cyrus-sasl2/patches/patch-saslauthd_Makefile_in
+++ b/security/cyrus-sasl2/patches/patch-saslauthd_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-saslauthd_Makefile_in,v 1.3 2003/02/27 17:33:01 jakob Exp $
---- saslauthd/Makefile.in.orig	Fri Jan 31 12:55:41 2003
-+++ saslauthd/Makefile.in	Thu Feb 27 07:39:32 2003
-@@ -421,7 +421,7 @@ saslauthd.8: saslauthd.mdoc
+$OpenBSD: patch-saslauthd_Makefile_in,v 1.4 2003/06/26 18:20:20 jakob Exp $
+--- saslauthd/Makefile.in.orig	Mon Apr 14 20:07:51 2003
++++ saslauthd/Makefile.in	Wed Jun 25 23:44:04 2003
+@@ -430,7 +430,7 @@ saslauthd.8: saslauthd.mdoc
  
  install-data-local: saslauthd.8
  	$(mkinstalldirs) $(DESTDIR)$(mandir)/cat8
diff --git a/security/cyrus-sasl2/patches/patch-saslauthd_auth_krb5_c b/security/cyrus-sasl2/patches/patch-saslauthd_auth_krb5_c
index 2e068a741f3..f0ddebef645 100644
--- a/security/cyrus-sasl2/patches/patch-saslauthd_auth_krb5_c
+++ b/security/cyrus-sasl2/patches/patch-saslauthd_auth_krb5_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-saslauthd_auth_krb5_c,v 1.2 2002/12/10 08:37:42 jakob Exp $
---- saslauthd/auth_krb5.c.orig	Tue Aug 27 21:22:01 2002
-+++ saslauthd/auth_krb5.c	Tue Dec 10 00:10:52 2002
-@@ -307,7 +307,7 @@ auth_krb5 (
+$OpenBSD: patch-saslauthd_auth_krb5_c,v 1.3 2003/06/26 18:20:20 jakob Exp $
+--- saslauthd/auth_krb5.c.orig	Thu Mar  6 18:23:17 2003
++++ saslauthd/auth_krb5.c	Wed Jun 25 23:44:04 2003
+@@ -311,7 +311,7 @@ auth_krb5 (
      }
      
      /* create a new CCACHE so we don't stomp on anything */
diff --git a/security/cyrus-sasl2/patches/patch-saslauthd_configure b/security/cyrus-sasl2/patches/patch-saslauthd_configure
index d6b69cca0ec..8a161797297 100644
--- a/security/cyrus-sasl2/patches/patch-saslauthd_configure
+++ b/security/cyrus-sasl2/patches/patch-saslauthd_configure
@@ -1,6 +1,6 @@
-$OpenBSD: patch-saslauthd_configure,v 1.5 2003/02/27 17:33:01 jakob Exp $
---- saslauthd/configure.orig	Fri Jan 31 12:55:41 2003
-+++ saslauthd/configure	Thu Feb 27 07:39:33 2003
+$OpenBSD: patch-saslauthd_configure,v 1.6 2003/06/26 18:20:20 jakob Exp $
+--- saslauthd/configure.orig	Mon Apr 14 20:07:50 2003
++++ saslauthd/configure	Thu Jun 26 00:07:37 2003
 @@ -1603,7 +1603,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -10,16 +10,16 @@ $OpenBSD: patch-saslauthd_configure,v 1.5 2003/02/27 17:33:01 jakob Exp $
  cat > conftest.$ac_ext <<EOF
  #line 1609 "configure"
  #include "confdefs.h"
-@@ -2324,7 +2324,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
+@@ -2329,7 +2329,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lresolv  $LIBS"
 +#LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2330 "configure"
+ #line 2335 "configure"
  #include "confdefs.h"
-@@ -2358,7 +2358,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+@@ -2363,7 +2363,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
  #define $ac_tr_lib 1
  EOF
  
@@ -28,16 +28,16 @@ $OpenBSD: patch-saslauthd_configure,v 1.5 2003/02/27 17:33:01 jakob Exp $
  
  else
    echo "$ac_t""no" 1>&6
-@@ -2827,7 +2827,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
+@@ -2926,7 +2926,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lresolv  $LIBS"
 +#LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2833 "configure"
+ #line 2932 "configure"
  #include "confdefs.h"
-@@ -2861,7 +2861,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+@@ -2960,7 +2960,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
  #define $ac_tr_lib 1
  EOF
  
@@ -46,27 +46,36 @@ $OpenBSD: patch-saslauthd_configure,v 1.5 2003/02/27 17:33:01 jakob Exp $
  
  else
    echo "$ac_t""no" 1>&6
-@@ -2927,8 +2927,8 @@ fi
+@@ -2988,7 +2988,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err $LIBS"
++LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lcrypto ${LIB_CRYPT} -lcom_err $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 2994 "configure"
+ #include "confdefs.h"
+@@ -3026,8 +3026,8 @@ fi
       GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
       GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
    elif test "$gss_impl" = "heimdal"; then
--     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -ldes -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
--     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libdes.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
-+     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -ldes -lasn1 -lkrb -lkafs -lcrypto ${LIB_CRYPT} -lcom_err"
-+     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libdes.a $gssapi_dir/libasn1.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
+-     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
+-     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
++     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lcrypto ${LIB_CRYPT} -lcom_err"
++     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
    else
       gssapi="no"
       echo "configure: warning: Disabling GSSAPI" 1>&2
-@@ -2981,7 +2981,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
+@@ -3080,7 +3080,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lresolv  $LIBS"
 +#LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2987 "configure"
+ #line 3086 "configure"
  #include "confdefs.h"
-@@ -3009,7 +3009,7 @@ LIBS="$ac_save_LIBS"
+@@ -3108,7 +3108,7 @@ LIBS="$ac_save_LIBS"
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -75,16 +84,16 @@ $OpenBSD: patch-saslauthd_configure,v 1.5 2003/02/27 17:33:01 jakob Exp $
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -4243,7 +4243,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
+@@ -4352,7 +4352,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lresolv  $LIBS"
 +#LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 4249 "configure"
+ #line 4358 "configure"
  #include "confdefs.h"
-@@ -4277,7 +4277,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+@@ -4386,7 +4386,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
  #define $ac_tr_lib 1
  EOF
  
diff --git a/security/cyrus-sasl2/pkg/PFRAG.shared b/security/cyrus-sasl2/pkg/PFRAG.shared
index 822a4e42041..ac36bf93fd4 100644
--- a/security/cyrus-sasl2/pkg/PFRAG.shared
+++ b/security/cyrus-sasl2/pkg/PFRAG.shared
@@ -1,12 +1,11 @@
-@comment $OpenBSD: PFRAG.shared,v 1.6 2003/02/27 17:33:01 jakob Exp $
-lib/libsasl2.so.2.11
-lib/sasl2/libanonymous.so.2.11
-lib/sasl2/libcrammd5.so.2.11
-lib/sasl2/libdigestmd5.so.2.11
-lib/sasl2/libgssapiv2.so.2.11
-lib/sasl2/libkerberos4.so.2.11
-lib/sasl2/liblogin.so.2.11
-lib/sasl2/libotp.so.2.11
-lib/sasl2/libplain.so.2.11
-lib/sasl2/libsasldb.so.2.11
+@comment $OpenBSD: PFRAG.shared,v 1.7 2003/06/26 18:20:20 jakob Exp $
+lib/libsasl2.so.2.13
+lib/sasl2/libanonymous.so.2.13
+lib/sasl2/libcrammd5.so.2.13
+lib/sasl2/libdigestmd5.so.2.13
+lib/sasl2/libgssapiv2.so.2.13
+lib/sasl2/liblogin.so.2.13
+lib/sasl2/libotp.so.2.13
+lib/sasl2/libplain.so.2.13
+lib/sasl2/libsasldb.so.2.13
 DYNLIBDIR(%D/lib)
diff --git a/security/cyrus-sasl2/pkg/PLIST b/security/cyrus-sasl2/pkg/PLIST
index 66354891a51..9e32ea790b3 100644
--- a/security/cyrus-sasl2/pkg/PLIST
+++ b/security/cyrus-sasl2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2002/12/10 08:37:42 jakob Exp $
+@comment $OpenBSD: PLIST,v 1.7 2003/06/26 18:20:20 jakob Exp $
 @pkgcfl cyrus-sasl-*
 include/sasl/hmac-md5.h
 include/sasl/md5.h
@@ -17,8 +17,6 @@ lib/sasl2/libdigestmd5.a
 lib/sasl2/libdigestmd5.la
 lib/sasl2/libgssapiv2.a
 lib/sasl2/libgssapiv2.la
-lib/sasl2/libkerberos4.a
-lib/sasl2/libkerberos4.la
 lib/sasl2/liblogin.a
 lib/sasl2/liblogin.la
 lib/sasl2/libotp.a
@@ -78,13 +76,13 @@ share/doc/sasl2/advanced.html
 share/doc/sasl2/appconvert.html
 share/doc/sasl2/draft-burdis-cat-srp-sasl-06.txt
 share/doc/sasl2/draft-ietf-cat-sasl-gssapi-05.txt
-share/doc/sasl2/draft-melnikov-rfc2831bis-02.txt
+share/doc/sasl2/draft-ietf-sasl-anon-00.txt
+share/doc/sasl2/draft-ietf-sasl-plain-00.txt
+share/doc/sasl2/draft-ietf-sasl-rfc2831bis-00.txt
 share/doc/sasl2/draft-myers-saslrev-02.txt
 share/doc/sasl2/draft-nerenberg-sasl-crammd5-03.txt
-share/doc/sasl2/draft-newman-sasl-c-api-00.txt
+share/doc/sasl2/draft-newman-sasl-c-api-01.txt
 share/doc/sasl2/draft-sasl-login.txt
-share/doc/sasl2/draft-zeilenga-sasl-anon-01.txt
-share/doc/sasl2/draft-zeilenga-sasl-plain-01.txt
 share/doc/sasl2/gssapi.html
 share/doc/sasl2/index.html
 share/doc/sasl2/install.html
@@ -110,6 +108,7 @@ share/doc/sasl2/rfc3174.txt
 share/doc/sasl2/sysadmin.html
 share/doc/sasl2/testing.txt
 share/doc/sasl2/upgrading.html
+share/doc/sasl2/windows.html
 %%SHARED%%
 @dirrm share/doc/sasl2
 @dirrm lib/sasl2