diff -ru  /usr/ports/mail/mutt-devel/Makefile ./Makefile
--- /usr/ports/mail/mutt-devel/Makefile	Fri Jun 29 06:09:10 2007
+++ ./Makefile	Mon Jul  2 17:24:12 2007
@@ -137,7 +137,8 @@
 		http://home.woolridge.ca/mutt/patches/:dw \
 		http://www.spinnaker.de/mutt/compressed/:rr \
 		http://www.emaillab.org/mutt/${AC_PATCH_VERSION}/:jp \
-		http://vc.org.ua/mutt/:vc
+		http://vc.org.ua/mutt/:vc \
+		http://yz.kiev.ua/mutt/:vc
 
 MAINTAINER?=	udo.schweigert@siemens.com
 COMMENT?=	The Mongrel of Mail User Agents (development version)
@@ -299,8 +300,7 @@
 LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 .endif
 .if defined(WITH_MUTT_IMAP_HEADER_CACHE)
-LIB_DEPENDS+=	db-4.2.2:${PORTSDIR}/databases/db42
-CFLAGS+=	-I${LOCALBASE}/include/db42
+USE_BDB=	42+
 .endif
 .if exists(${LOCALBASE}/lib/libidn.so)
 WITH_MUTT_IDN=	yes
diff -ru  /usr/ports/mail/mutt-devel/files/patch-hcache-db ./files/patch-hcache-db
--- /usr/ports/mail/mutt-devel/files/patch-hcache-db	Thu Apr 12 06:08:43 2007
+++ ./files/patch-hcache-db	Thu Jan  1 01:00:00 1970
@@ -1,18 +0,0 @@
---- configure.ac.orig2	Mon Apr  9 15:24:59 2007
-+++ configure.ac	Mon Apr  9 15:28:42 2007
-@@ -886,12 +886,12 @@
-         test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr"
-         for d in $ac_bdb_prefix; do
-             bdbpfx="$bdbpfx $d"
--            for v in BerkeleyDB.4.3 BerkeleyDB.4.2 BerkeleyDB.4.1; do
-+            for v in BerkeleyDB.4.2; do
-                 bdbpfx="$bdbpfx $d/$v"
-             done
-         done
--        BDB_VERSIONS="db-4 db4 db-4.5 db4.5 db45 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 ''"
--        AC_MSG_CHECKING([for BerkeleyDB > 4.0])
-+	BDB_VERSIONS="db-4.2 db4.2 db42 ''"
-+        AC_MSG_CHECKING([for BerkeleyDB = 4.2])
-         for d in $bdbpfx; do
-             BDB_INCLUDE_DIR=""
-             BDB_LIB_DIR=""