Index: Makefile
===================================================================
--- Makefile	(revision 422251)
+++ Makefile	(working copy)
@@ -3,6 +3,7 @@
 PORTNAME=	neomutt
 PORTVERSION=	20160910
 DISTVERSIONPREFIX=	${PORTNAME}-
+PORTREVISION=	1
 CATEGORIES=	mail
 
 MAINTAINER=	bapt@FreeBSD.org
@@ -16,8 +17,7 @@
 USES=		autoreconf localbase ncurses shebangfix ssl
 GNU_CONFIGURE=	yes
 
-LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet \
-		libnotmuch.so:mail/notmuch
+LIB_DEPENDS=	libnotmuch.so:mail/notmuch
 BUILD_DEPENDS=	gdate:sysutils/coreutils
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support \
 		urlview:textproc/urlview
@@ -26,10 +26,14 @@
 SHEBANG_FILES=	smime_keys.pl
 
 OPTIONS_DEFINE=	NLS DOCS SASL ICONV IDN FLOCK GPGME
-OPTIONS_DEFAULT=	SASL
+OPTIONS_DEFAULT=SASL TOKYOCABINET
+OPTIONS_RADIO=	HCACHE
+OPTIONS_RADIO_HCACHE=	TOKYOCABINET LMDB
 
 FLOCK_DESC=	Use flock() to lock files
 GPGME_DESC=	Use gpgme to handle pgp
+TOKYOCABINET_DESC=	Use TokyoCabinet as header-cache backend
+LMDB_DESC=		Use LMDB as header-cache backend
 
 CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--with-docdir="${DOCSDIR}" \
@@ -42,11 +46,16 @@
 		--enable-hcache \
 		--enable-sidebar \
 		--enable-notmuch \
-		--with-tokyocabinet \
 		--without-qdbm \
 		--disable-fcntl \
 		--enable-external-dotlock
 
+TOKYOCABINET_CONFIGURE_WITH=	tokyocabinet
+TOKYOCABINET_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
+
+LMDB_CONFIGURE_WITH=	lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 NLS_IMPLIES=	ICONV