diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 817e4d951d3..0b4b8949045 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2004/02/10 04:52:22 kevlo Exp $
+# $OpenBSD: Makefile,v 1.11 2004/02/16 11:08:46 kevlo Exp $
 
 COMMENT=	"RFC 2222 SASL (Simple Authentication and Security Layer)"
 
@@ -17,9 +17,6 @@ PERMIT_PACKAGE_FTP=	yes
 PERMIT_DISTFILES_CDROM=	yes
 PERMIT_DISTFILES_FTP=	yes
 
-#SEPARATE_BUILD=		concurrent
-
-USE_LIBTOOL=		Yes
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/config ${WRKSRC}/saslauthd/config
 
 CONFIGURE_STYLE=	gnu
@@ -28,14 +25,27 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
 
 CONFIGURE_ARGS+=	--with-saslauthd="/var/sasl2" \
 			--with-staticsasl \
-			--with-dblib=ndbm \
-			--without-bdb-libdir \
-			--without-bdb-incdir \
+			--with-dblib=berkeley \
+			--with-bdb-libdir="${LOCALBASE}/lib/db4" \
+			--with-bdb-incdir="${LOCALBASE}/include/db4" \
 			--enable-login \
 			--enable-gssapi="/usr" \
 			--disable-sample
 CFLAGS+=		-I/usr/include/kerberosV
 
+FLAVORS=	db4
+FLAVOR?=
+
+.if ${FLAVOR:L} == "db4"
+CONFIGURE_ARGS+=	--with-dblib=berkeley \
+			--with-bdb-libdir="${LOCALBASE}/lib/db4" \
+			--with-bdb-incdir="${LOCALBASE}/include/db4"
+LIB_DEPENDS=		lib/db4/db.4::databases/db/v4
+.else
+CONFIGURE_ARGS+=	--with-dblib=ndbm \
+			--without-bdb-libdir \
+			--without-bdb-incdir
+.endif
 
 post-build:
 	(cd ${WRKBUILD}/saslauthd; \
@@ -45,7 +55,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sasl2
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/sasl2
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/sasl2
-	${INSTALL_DATA} ${WRKBUILD}/lib/.libs/libsasl2.a ${PREFIX}/lib
 	${INSTALL_PROGRAM} ${WRKBUILD}/saslauthd/testsaslauthd ${PREFIX}/sbin
 
 .include <bsd.port.mk>
diff --git a/security/cyrus-sasl2/patches/patch-config_ltconfig b/security/cyrus-sasl2/patches/patch-config_ltconfig
new file mode 100644
index 00000000000..abe9cd6e586
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-config_ltconfig
@@ -0,0 +1,95 @@
+$OpenBSD: patch-config_ltconfig,v 1.1 2004/02/16 11:08:48 kevlo Exp $
+--- config/ltconfig.orig	2002-09-05 19:21:12.000000000 +0000
++++ config/ltconfig	2004-02-16 18:26:29.000000000 +0000
+@@ -501,7 +501,14 @@ fi
+ 
+ if test -n "$RANLIB"; then
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++  case "$host_os" in
++  openbsd*)
++    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++  ;;
++  *)
++    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++  ;;
++  esac
+ fi
+ 
+ # Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
+@@ -1110,7 +1117,9 @@ cygwin* | mingw*)
+     with_gnu_ld=no
+   fi
+   ;;
+-
++openbsd*)
++  with_gnu_ld=no
++  ;;
+ esac
+ 
+ ld_shlibs=yes
+@@ -1417,10 +1426,31 @@ else
+     ;;
+ 
+   openbsd*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
++    case "$host_cpu" in
++    m88k|hppa|vax)
++      ld_shlibs=no
++      ;;
++    *)
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
++	hardcode_libdir_flag_spec='${wl}-R$libdir'
++	export_dynamic_flag_spec='${wl}-E'
++      else
++	case "$host_os" in
++	openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	  archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
++	  hardcode_libdir_flag_spec='-R$libdir'
++	  ;;
++	*)
++	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
++	  hardcode_libdir_flag_spec='${wl}-R$libdir'
++	  ;;
++	esac
++      fi
++      ;;
++    esac
+     ;;
+ 
+   os2*)
+@@ -2051,9 +2081,25 @@ netbsd*)
+ 
+ openbsd*)
+   version_type=sunos
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-    need_version=no
++  need_lib_prefix=no
++  need_version=no
++  sys_lib_search_path_spec="/usr/lib"
++  sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
++  file_magic_cmd=/usr/bin/file
++  file_magic_test_file=`echo /usr/lib/libc.so.*`
++  if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++    case "$host_os" in
++    openbsd2.[89] | openbsd2.[89].*)
++      shlibpath_overrides_runpath=no
++    ;;
++    *)
++      shlibpath_overrides_runpath=yes
++    ;;
++    esac
++  else
++    deplibs_check_method='file_magic OpenBSD.* shared library'
++    shlibpath_overrides_runpath=yes
+   fi
+   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
diff --git a/security/cyrus-sasl2/patches/patch-config_ltmain_sh b/security/cyrus-sasl2/patches/patch-config_ltmain_sh
new file mode 100644
index 00000000000..555f11acb45
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-config_ltmain_sh
@@ -0,0 +1,90 @@
+$OpenBSD: patch-config_ltmain_sh,v 1.1 2004/02/16 11:08:48 kevlo Exp $
+--- config/ltmain.sh.orig	2002-09-03 14:59:59.000000000 +0000
++++ config/ltmain.sh	2004-02-16 18:26:29.000000000 +0000
+@@ -1093,6 +1093,17 @@ compiler."
+ 	    deplibs="$deplibs -framework System"
+ 	    continue
+ 	    ;;
++	  *-*-openbsd*)
++	    # Do not include libc due to us having libc/libc_r.
++	    continue
++	    ;;
++	  esac
++	elif test "$arg" = "-lc_r"; then
++	  case "$host" in
++	  *-*-openbsd*)
++	    # Do not include libc_r directly, use -pthread flag.
++	    continue
++	    ;;
+ 	  esac
+ 	elif test "$arg" = "-lm"; then
+ 	  case "$host" in
+@@ -1110,6 +1121,17 @@ compiler."
+ 	deplibs="$deplibs $arg"
+ 	;;
+ 
++      -pthread)
++	case $host in
++	*-*-openbsd*)
++	  deplibs="$deplibs $arg"
++	  ;;
++	*)
++	  continue
++	  ;;
++	esac
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
+@@ -1828,6 +1850,9 @@ compiler."
+ 	  # Rhapsody C library is in the System framework
+ 	  deplibs="$deplibs -framework System"
+ 	  ;;
++	*-*-openbsd*)
++	  # Do not include libc due to us having libc/libc_r.
++	  ;;
+ 	*)
+ 	  # Add libc to deplibs on all other systems.
+ 	  deplibs="$deplibs -lc"
+@@ -3596,40 +3621,6 @@ libdir='$install_libdir'\
+     # Exit here if they wanted silent mode.
+     test "$show" = : && exit 0
+ 
+-    echo "----------------------------------------------------------------------"
+-    echo "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      echo "   $libdir"
+-    done
+-    echo
+-    echo "If you ever happen to want to link against installed libraries"
+-    echo "in a given directory, LIBDIR, you must either use libtool, and"
+-    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
+-    echo "flag during linking and do at least one of the following:"
+-    if test -n "$shlibpath_var"; then
+-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      echo "     during execution"
+-    fi
+-    if test -n "$runpath_var"; then
+-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      echo "     during linking"
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-      echo "   - use the \`$flag' linker flag"
+-    fi
+-    if test -n "$admincmds"; then
+-      echo "   - have your system administrator run these commands:$admincmds"
+-    fi
+-    if test -f /etc/ld.so.conf; then
+-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+-    fi
+-    echo
+-    echo "See any operating system documentation about shared libraries for"
+-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    echo "----------------------------------------------------------------------"
+     exit 0
+     ;;
+