Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (35b203e16cfc1730f44f01579a8a23a67598ad49)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (35b203e16cfc1730f44f01579a8a23a67598ad49)
  • Date: Thu, 13 Apr 2017 22:05:27 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

mail/mutt/BUILD | 1 -
mail/mutt/CONFIGURE | 12 ++++++++++++
mail/mutt/DEPENDS | 46 ++++++++++++++++++++++++----------------------
mail/mutt/DETAILS | 2 +-
mail/mutt/HISTORY | 13 ++++++++++---
5 files changed, 47 insertions(+), 27 deletions(-)

New commits:
commit 35b203e16cfc1730f44f01579a8a23a67598ad49
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

mail/mutt: devel version 1.8.1 + reorganization

diff --git a/mail/mutt/BUILD b/mail/mutt/BUILD
index 1d9ffea..66549c5 100755
--- a/mail/mutt/BUILD
+++ b/mail/mutt/BUILD
@@ -2,7 +2,6 @@ OPTS="--build=${BUILD}
--with-mailpath=/var/spool/mail
--with-docdir=${INSTALL_ROOT}/usr/share/doc/mutt
${MUTT_OPTS}
- ${TMP_MUTT_OPTS}
${OPTS}
" &&

diff --git a/mail/mutt/CONFIGURE b/mail/mutt/CONFIGURE
index 189387a..c6672bb 100755
--- a/mail/mutt/CONFIGURE
+++ b/mail/mutt/CONFIGURE
@@ -44,6 +44,10 @@ elif [[ ! -z "${REAL_PATCHES}" ]]; then
"${UPDATE_DOC_DEFAULT}"
fi &&

+config_query_list TERMINAL_LIBRARY \
+ "Build against which terminal library?" \
+ ncurses slang &&
+
config_query_option MUTT_OPTS "Enable POP support?" \
"y" \
"--enable-pop" \
@@ -64,6 +68,14 @@ config_query_option MUTT_OPTS "Enable the header cache?"
\
"n" \
"--enable-hcache" \
"--disable-hcache" &&
+if list_find "${MUTT_OPTS}" "--enable-hcache"; then
+ local BACKENDS="db gdbm" &&
+ if [[ "${MUTT_BRANCH}" != "stable" ]]; then
+ BACKENDS+=" lmdb"
+ fi &&
+ config_query_list HCACHE_BACKEND "Use which header cache backend?" \
+ ${BACKENDS}
+fi &&
config_query_option MUTT_OPTS "Enable SMTP support?" \
"y" \
"--enable-smtp" \
diff --git a/mail/mutt/DEPENDS b/mail/mutt/DEPENDS
index d75d42d..31f36c7 100755
--- a/mail/mutt/DEPENDS
+++ b/mail/mutt/DEPENDS
@@ -1,5 +1,4 @@
-persistent_add TMP_MUTT_OPTS &&
-TMP_MUTT_OPTS="" &&
+persistent_remove TMP_MUTT_OPTS &&

optional_depends "MAIL-TRANSPORT-AGENT" \
"" \
@@ -10,17 +9,7 @@ if [[ "$MUTT_BRANCH" == "scm" ]]; then
depends mercurial
fi &&

-config_query_list TERMINAL_LIBRARY \
- "Build against which terminal library?" \
- ncurses slang &&
-
-if [[ ${TERMINAL_LIBRARY} = "ncurses" ]]; then
- TMP_MUTT_OPTS="${TMP_MUTT_OPTS} --with-curses"
-else
- TMP_MUTT_OPTS="${TMP_MUTT_OPTS} --with-${TERMINAL_LIBRARY}"
-fi &&
-
-depends "${TERMINAL_LIBRARY}" &&
+depends "${TERMINAL_LIBRARY}" "--with-${TERMINAL_LIBRARY/ncurses/curses}" &&

optional_depends "gnupg" \
"" \
@@ -45,14 +34,27 @@ optional_depends "gpgme"
\
"" \
"alternate backend for PGP and S/MIME" &&

-if list_find "${MUTT_OPTS}" "--enable-hcache"; then
- config_query_list HCACHE_BACKEND \
- "Use which header cache backend?" \
- gdbm db &&
- if [[ "$HCACHE_BACKEND" == "db" ]]; then
- TMP_MUTT_OPTS="${TMP_MUTT_OPTS} --without-gdbm --with-bdb"
- fi &&
- depends "${HCACHE_BACKEND}"
+case ${HCACHE_BACKEND} in
+ db)
+ depends "${HCACHE_BACKEND}" "--with-bdb --without-gdbm
--without-lmdb" ;;
+ lmdb)
+ depends "${HCACHE_BACKEND}" "--with-lmdb --without-db
--without-gdbm" ;;
+ gdbm)
+ depends "${HCACHE_BACKEND}" "--with-gdbm --without-db
--without-lmdb" ;;
+ *)
+ ;;
+ esac &&
+
+if [[ "${MUTT_BRANCH}" != "stable" ]]; then
+ optional_depends "tokyocabinet" \
+ "" \
+ "--without-tokyocabinet" \
+ "Use tokyocabinet?" &&
+
+ optional_depends "kyotocabinet" \
+ "" \
+ "--without-kyotocabinet" \
+ "Use kyotocabinet?"
fi &&

optional_depends "libidn" \
@@ -72,7 +74,7 @@ if list_find "${MUTT_OPTS}" "--enable-pop" || list_find
"${MUTT_OPTS}" "--enable
"" \
"to enable SSL support for POP/IMAP via gnutls" &&

- optional_depends "cyrus-sasl" \
+ optional_depends "LIBSASL" \
"--with-sasl" \
"" \
"to enable SASL2 authentication for POP/IMAP"
diff --git a/mail/mutt/DETAILS b/mail/mutt/DETAILS
index 0344528..1773b03 100755
--- a/mail/mutt/DETAILS
+++ b/mail/mutt/DETAILS
@@ -12,7 +12,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-mercurial
;;
devel)
- VERSION=1.8.0
+ VERSION=1.8.1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_URL[0]=ftp://ftp.mutt.org/pub/mutt/${SOURCE}
diff --git a/mail/mutt/HISTORY b/mail/mutt/HISTORY
index 18c268b..2d00829 100644
--- a/mail/mutt/HISTORY
+++ b/mail/mutt/HISTORY
@@ -1,5 +1,12 @@
+2017-04-13 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: devel version 1.8.1
+ * BUILD, CONFIGURE, DEPENDS: reorganized terminal library and header
+ cache selection code, added lmdb, kyotocabinet and tokiocabinet
+ optional dependensies for devel branch and above,
+ cyrus-sasl -> LIBSASL
+
2017-02-25 Ismael Luceno <ismael AT sourcemage.org>
- * patches/imap_copy_for_trash/*: Removed, equivalent patch applied by
+ * patches/imap_copy_for_trash/*: Removed, equivalent patch applied by
upstream

2017-02-24 Pavel Vinogradov <public AT sourcemage.org>
@@ -69,8 +76,8 @@
url, SECURITY_PATCH++
* mutt.gpg: added developer's subkey, 3DBDDC68, Brendan Cully
<brendan AT kublai.com>

-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL

2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (35b203e16cfc1730f44f01579a8a23a67598ad49), Pavel Vinogradov, 04/13/2017

Archive powered by MHonArc 2.6.24.

Top of Page