7 files changed, 106 insertions, 113 deletions

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 3f19c337484b..c7511ff4af3f 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cyrus-sasl
-PORTVERSION=	2.1.20
-PORTREVISION=	1
+PORTVERSION=	2.1.21
+#PORTREVISION=	0
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
 		ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \
@@ -41,7 +41,7 @@ MAN3=		sasl.3 sasl_authorize_t.3 sasl_auxprop.3 \
 MAN8=		sasldblistusers2.8 saslpasswd2.8
 
 USE_OPENSSL=	yes
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-plugindir=${PREFIX}/lib/sasl2 \
@@ -81,13 +81,13 @@ SASLDB_NAME=	sasldb2.db
 .endif
 
 .if defined(WITH_MYSQL_VER)
-WITH_MYSQL=	YES
+WITH_MYSQL=	yes
 .if ${WITH_MYSQL_VER} == 3
 WANT_MYSQL_VER=	323
 .endif
 .endif
 .if defined(WITH_MYSQL)
-USE_MYSQL=	YES
+USE_MYSQL=	yes
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--without-mysql
@@ -203,12 +203,12 @@ CYRUS_GROUP?=	cyrus
 
 DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README
 
-DOC2=	ONEWS TODO draft-burdis-cat-srp-sasl-08.txt \
-	draft-ietf-sasl-anon-02.txt draft-ietf-sasl-crammd5-01.txt \
-	draft-ietf-sasl-gssapi-00.txt draft-ietf-sasl-plain-03.txt \
-	draft-ietf-sasl-rfc2222bis-03.txt draft-ietf-sasl-rfc2831bis-02.txt \
-	draft-ietf-sasl-saslprep-04.txt draft-murchison-sasl-login-00.txt \
-	draft-newman-sasl-c-api-01.txt rfc1321.txt rfc1939.txt rfc2104.txt \
+DOC2=	ONEWS TODO draft-burdis-cat-srp-sasl-xx.txt \
+	draft-ietf-sasl-anon-xx.txt draft-ietf-sasl-crammd5-xx.txt \
+	draft-ietf-sasl-gssapi-xx.txt draft-ietf-sasl-plain-xx.txt \
+	draft-ietf-sasl-rfc2222bis-xx.txt draft-ietf-sasl-rfc2831bis-xx.txt \
+	draft-ietf-sasl-saslprep-xx.txt draft-murchison-sasl-login-xx.txt \
+	draft-newman-sasl-c-api-xx.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
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index fedf675371a4..dae499879992 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,2 +1,2 @@
-MD5 (cyrus-sasl-2.1.20.tar.gz) = 268ead27f4ac39bcfe17d9e38e0f2977
-SIZE (cyrus-sasl-2.1.20.tar.gz) = 1775163
+MD5 (cyrus-sasl-2.1.21.tar.gz) = dde02db234dea892bee298390890502e
+SIZE (cyrus-sasl-2.1.21.tar.gz) = 1584931
diff --git a/security/cyrus-sasl2/files/patch-configure b/security/cyrus-sasl2/files/patch-configure
index ca1914b37c31..96669c572928 100644
--- a/security/cyrus-sasl2/files/patch-configure
+++ b/security/cyrus-sasl2/files/patch-configure
@@ -1,8 +1,8 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Mon Oct 25 05:21:08 2004
-+++ configure	Mon Oct 25 21:24:23 2004
-@@ -1578,6 +1578,7 @@
+--- configure.orig	Sun May 15 14:58:28 2005
++++ configure	Wed May 18 00:40:41 2005
+@@ -1583,6 +1583,7 @@
  fi
  echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
@@ -10,16 +10,16 @@ diff -u configure.orig configure
  test "$program_prefix" != NONE &&
    program_transform_name="s,^,$program_prefix,;$program_transform_name"
  # Use a double $ so make ignores it.
-@@ -5129,7 +5130,7 @@
+@@ -5124,7 +5125,7 @@
  	fi
  
  	saved_LIBS=$LIBS
--        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
  	    LIBS="$saved_LIBS -l$dbname"
  	    cat >conftest.$ac_ext <<_ACEOF
-@@ -5139,6 +5140,7 @@
+@@ -5134,6 +5135,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -27,24 +27,16 @@ diff -u configure.orig configure
  #include <db.h>
  int
  main ()
-@@ -5161,6 +5163,7 @@
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
-+  break
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -5885,7 +5888,7 @@
+@@ -5881,7 +5883,7 @@
  	fi
  
  	saved_LIBS=$LIBS
--        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
  	    LIBS="$saved_LIBS -l$dbname"
  	    cat >conftest.$ac_ext <<_ACEOF
-@@ -5895,6 +5898,7 @@
+@@ -5891,6 +5893,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -52,15 +44,34 @@ diff -u configure.orig configure
  #include <db.h>
  int
  main ()
-@@ -5917,6 +5921,7 @@
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
-+  break
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -7089,6 +7094,8 @@
+@@ -6512,7 +6515,7 @@
+ echo "$as_me: WARNING: Disabling SASL authentication database support" >&2;}
+             SASL_DB_BACKEND="db_none.lo"
+     SASL_DB_BACKEND_STATIC="db_none.o"
+-    SASL_DB_BACKEND_STATIC_SRC="../sasldb/db_none.c"
++    SASL_DB_BACKEND_STATIC_SRCS="../sasldb/db_none.c"
+     SASL_DB_UTILS=""
+     SASL_DB_MANS=""
+     SASL_DB_LIB=""
+@@ -6521,7 +6524,7 @@
+ 
+ if test "$enable_static" = yes; then
+     if test "$dblib" != "none"; then
+-      SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sasldb.c $SASL_DB_BACKEND_STATIC_SRC"
++      SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sasldb.c $SASL_DB_BACKEND_STATIC_SRCS"
+       SASL_STATIC_OBJS="$SASL_STATIC_OBJS sasldb.o $SASL_DB_BACKEND_STATIC"
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -6530,7 +6533,7 @@
+ 
+     else
+       SASL_STATIC_OBJS="$SASL_STATIC_OBJS $SASL_DB_BACKEND_STATIC"
+-      SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRC"
++      SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRCS"
+     fi
+ fi
+ 
+@@ -7167,6 +7170,8 @@
    SASLAUTHD_TRUE='#'
    SASLAUTHD_FALSE=
  fi
@@ -69,16 +80,16 @@ diff -u configure.orig configure
  
  echo "$as_me:$LINENO: checking if I should include saslauthd" >&5
  echo $ECHO_N "checking if I should include saslauthd... $ECHO_C" >&6
-@@ -10084,7 +10091,7 @@
+@@ -10564,7 +10569,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
-+LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi` $LIBS"
+-LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
++LIBS="${GSSAPIBASE_LIBS} `krb5-config --libs gssapi` $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -10434,7 +10441,7 @@
+@@ -10914,7 +10919,7 @@
      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
      CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
@@ -87,7 +98,7 @@ diff -u configure.orig configure
      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}"
    elif test "$gss_impl" = "cybersafe03"; then
  # Version of CyberSafe with two libraries
-@@ -11229,7 +11236,7 @@
+@@ -11752,7 +11757,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
diff --git a/security/cyrus-sasl2/files/patch-lib::Makefile.in b/security/cyrus-sasl2/files/patch-lib::Makefile.in
new file mode 100644
index 000000000000..b1de51dc4e17
--- /dev/null
+++ b/security/cyrus-sasl2/files/patch-lib::Makefile.in
@@ -0,0 +1,24 @@
+Index: lib/Makefile.in
+diff -u lib/Makefile.in.orig lib/Makefile.in
+--- lib/Makefile.in.orig	Sun May 15 14:58:38 2005
++++ lib/Makefile.in	Wed May 18 01:12:50 2005
+@@ -12,6 +12,8 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
++.PATH: ${.CURDIR}/../plugins ${.CURDIR}/../sasldb
++
+ @SET_MAKE@
+ 
+ # Makefile.am for the SASL library
+@@ -645,10 +647,6 @@
+ 	rm -f $@
+ 	ln -s .libs/$@ $@
+ 
+-$(SASL_STATIC_OBJS): linksrcs
+-
+-linksrcs:
+-	-ln -s $(SASL_STATIC_SRCS) .
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/security/cyrus-sasl2/files/patch-saslauthd::configure b/security/cyrus-sasl2/files/patch-saslauthd::configure
index c22cb2ab9d1b..fcc55047239d 100644
--- a/security/cyrus-sasl2/files/patch-saslauthd::configure
+++ b/security/cyrus-sasl2/files/patch-saslauthd::configure
@@ -1,8 +1,8 @@
 Index: saslauthd/configure
 diff -u saslauthd/configure.orig saslauthd/configure
---- saslauthd/configure.orig	Mon Oct 25 05:21:13 2004
-+++ saslauthd/configure	Mon Oct 25 21:24:46 2004
-@@ -1523,6 +1523,7 @@
+--- saslauthd/configure.orig	Sun May 15 14:59:04 2005
++++ saslauthd/configure	Tue May 17 14:57:49 2005
+@@ -1525,6 +1525,7 @@
  fi
  echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
@@ -10,16 +10,16 @@ diff -u saslauthd/configure.orig saslauthd/configure
  test "$program_prefix" != NONE &&
    program_transform_name="s,^,$program_prefix,;$program_transform_name"
  # Use a double $ so make ignores it.
-@@ -6392,7 +6393,7 @@
+@@ -6782,7 +6783,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
-+LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi` $LIBS"
+-LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
++LIBS="${GSSAPIBASE_LIBS} `krb5-config --libs gssapi` $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -6742,7 +6743,7 @@
+@@ -7132,7 +7133,7 @@
      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
      CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
@@ -28,16 +28,16 @@ diff -u saslauthd/configure.orig saslauthd/configure
      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}"
    elif test "$gss_impl" = "cybersafe03"; then
  # Version of CyberSafe with two libraries
-@@ -7502,7 +7503,7 @@
+@@ -7889,7 +7890,7 @@
  	fi
  
  	saved_LIBS=$LIBS
--        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
  	    LIBS="$saved_LIBS -l$dbname"
  	    cat >conftest.$ac_ext <<_ACEOF
-@@ -7512,6 +7513,7 @@
+@@ -7899,6 +7900,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -45,24 +45,16 @@ diff -u saslauthd/configure.orig saslauthd/configure
  #include <db.h>
  int
  main ()
-@@ -7534,6 +7536,7 @@
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
-+  break
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8258,7 +8261,7 @@
+@@ -8646,7 +8648,7 @@
  	fi
  
  	saved_LIBS=$LIBS
--        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
  	    LIBS="$saved_LIBS -l$dbname"
  	    cat >conftest.$ac_ext <<_ACEOF
-@@ -8268,6 +8271,7 @@
+@@ -8656,6 +8658,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -70,11 +62,3 @@ diff -u saslauthd/configure.orig saslauthd/configure
  #include <db.h>
  int
  main ()
-@@ -8290,6 +8294,7 @@
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
-+  break
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
diff --git a/security/cyrus-sasl2/pkg-descr b/security/cyrus-sasl2/pkg-descr
index 2346952a8f89..aabf743f0683 100644
--- a/security/cyrus-sasl2/pkg-descr
+++ b/security/cyrus-sasl2/pkg-descr
@@ -8,30 +8,4 @@ protection of subsequent protocol interactions. If its use is
 negotiated, a security layer is inserted between the protocol
 and the connection.
 
-FEATURES
---------
-The following mechanisms are included in this distribution:
-ANONYMOUS
-CRAM-MD5
-DIGEST-MD5
-GSSAPI (MIT Kerberos 5 or Heimdal Kerberos 5)
-KERBEROS_V4
-PLAIN
-
-The library can use a Berkeley DB, gdbm or ndbm file on the server
-side to store per-user authentication secrets.  The utility saslpasswd
-has been included for adding authentication secrets to the file.
-
-PLAIN can either check /etc/passwd, Kerberos V4, use PAM, or the sasl
-secrets database.  By default PAM is used if PAM is found, then
-Kerberos, finally /etc/passwd (non-shadow).  This is tweakable in the
-configuration file.  Please see
-"${PREFIX}/share/doc/cyrus-sasl2/html/sysadmin.html".
-
-The sample directory contains two programs which provide a reference
-for using the library, as well as making it easy to test a mechanism
-on the command line.  See
-"${PREFIX}/share/doc/cyrus-sasl2/html/programming.html" for more
-information.
-
 WWW: http://asg.web.cmu.edu/sasl/
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index 62cc41c51c6c..577efc17de91 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -53,16 +53,16 @@ sbin/saslpasswd2
 %%PORTDOCS%%%%DOCSDIR%%/ONEWS
 %%PORTDOCS%%%%DOCSDIR%%/Sendmail.README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/draft-burdis-cat-srp-sasl-08.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-anon-02.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-crammd5-01.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-gssapi-00.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-plain-03.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2222bis-03.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2831bis-02.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-saslprep-04.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-murchison-sasl-login-00.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-newman-sasl-c-api-01.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-burdis-cat-srp-sasl-xx.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-anon-xx.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-crammd5-xx.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-gssapi-xx.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-plain-xx.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2222bis-xx.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2831bis-xx.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-saslprep-xx.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-murchison-sasl-login-xx.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-newman-sasl-c-api-xx.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc1321.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc1939.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2104.txt