aboutsummaryrefslogtreecommitdiff
path: root/mail/mutt-devel
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2010-01-28 01:10:07 +0000
committerMartin Wilke <miwi@FreeBSD.org>2010-01-28 01:10:07 +0000
commite8a7a8487fd7987f94c1114dc50c364716719817 (patch)
treeecf99d80a09a5eb1aa99b13e8dd6aa6cb5de7c3c /mail/mutt-devel
parentcf8d93faa5f67425043ebfed8e0a59784f500179 (diff)
downloadports-e8a7a8487fd7987f94c1114dc50c364716719817.tar.gz
ports-e8a7a8487fd7987f94c1114dc50c364716719817.zip
- Fix dependency when using WITH_TOKYOCABINET
- Add support for Berkeley DB versions 4.7 and 4.8 PR: 143297 Submitted by: Udo Schweigert <udo.schweigert@siemens.com> (maintainer)
Notes
Notes: svn path=/head/; revision=248732
Diffstat (limited to 'mail/mutt-devel')
-rw-r--r--mail/mutt-devel/Makefile5
-rw-r--r--mail/mutt-devel/files/patch-bdb11
2 files changed, 13 insertions, 3 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 1c692a240255..33d5e6ede823 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -297,9 +297,6 @@ LIB_DEPENDS+= slang.2:${PORTSDIR}/devel/libslang2
.if defined(WITH_MUTT_CYRUS_SASL2)
LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
.endif
-.if defined(WITH_MUTT_IMAP_HEADER_CACHE)
-USE_BDB= 42+
-.endif
.if exists(${LOCALBASE}/lib/libidn.so) && !defined(WITHOUT_MUTT_IDN)
WITH_MUTT_IDN= yes
.endif
@@ -489,7 +486,9 @@ SCRIPTS_ENV+= MUTT_QUOTE_PATCH="yes"
.if defined(WITH_MUTT_IMAP_HEADER_CACHE)
.if defined(WITH_TOKYOCABINET)
CONFIGURE_ARGS+= --enable-hcache --without-gdbm --without-bdb --with-tokyocabinet
+LIB_DEPENDS+= tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet
.else
+USE_BDB= 42+
CONFIGURE_ARGS+= --enable-hcache --without-gdbm --with-bdb
.endif
.else
diff --git a/mail/mutt-devel/files/patch-bdb b/mail/mutt-devel/files/patch-bdb
new file mode 100644
index 000000000000..dc5a3fa67cb5
--- /dev/null
+++ b/mail/mutt-devel/files/patch-bdb
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2009-06-09 08:50:33.000000000 +0200
++++ configure.ac 2010-01-27 18:15:31.000000000 +0100
+@@ -976,7 +976,7 @@
+ bdbpfx="$bdbpfx $d/$v"
+ done
+ done
+- BDB_VERSIONS="db-4 db4 db-4.6 db4.6 db46 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 ''"
++ BDB_VERSIONS="db-4 db4 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 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])
+ for d in $bdbpfx; do
+ BDB_INCLUDE_DIR=""