Skip to Content.
Sympa Menu

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

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 (0e9bf8921ec1cfcd9fcaeb8530502589d3d2c29e)
  • Date: Tue, 4 Apr 2017 01:35:04 +0000

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

mail/neomutt/BUILD | 1 -
mail/neomutt/CONFIGURE | 16 +++++++++++-----
mail/neomutt/DEPENDS | 39 +++++++++++++--------------------------
mail/neomutt/HISTORY | 4 ++++
4 files changed, 28 insertions(+), 32 deletions(-)

New commits:
commit 0e9bf8921ec1cfcd9fcaeb8530502589d3d2c29e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

mail/neomutt: reorganized terminal library and headers cache flags + some
cleanups

diff --git a/mail/neomutt/BUILD b/mail/neomutt/BUILD
index e4d89a4..daab3a2 100755
--- a/mail/neomutt/BUILD
+++ b/mail/neomutt/BUILD
@@ -2,7 +2,6 @@ OPTS="--build=${BUILD}
--with-mailpath=/var/spool/mail
--with-docdir=${INSTALL_ROOT}/usr/share/doc/mutt
${NEOMUTT_OPTS}
- ${TMP_NEOMUTT_OPTS}
${OPTS}
" &&

diff --git a/mail/neomutt/CONFIGURE b/mail/neomutt/CONFIGURE
index 0804496..cd6c8b8 100755
--- a/mail/neomutt/CONFIGURE
+++ b/mail/neomutt/CONFIGURE
@@ -1,3 +1,7 @@
+config_query_list TERMINAL_LIBRARY \
+ "Build against which terminal library?" \
+ ncurses slang &&
+
config_query_option NEOMUTT_OPTS "Enable POP support?" \
"y" \
"--enable-pop" \
@@ -8,10 +12,9 @@ config_query_option NEOMUTT_OPTS "Enable IMAP support?"
\
"--enable-imap" \
"--disable-imap" &&

-config_query_option NEOMUTT_OPTS "Enable the header cache?" \
- "n" \
- "--enable-hcache" \
- "--disable-hcache" &&
+config_query_list HCACHE_BACKEND "Use which header cache backend?" \
+ none gdbm db lmdb &&
+
config_query_option NEOMUTT_OPTS "Enable SMTP support?" \
"y" \
"--enable-smtp" \
@@ -30,4 +33,7 @@ config_query_option NEOMUTT_OPTS "Use fmemopen?"
\
config_query_option NEOMUTT_OPTS "Enable sidebar?" \
"n" \
"--enable-sidebar" \
- "--disable-sidebar"
+ "--disable-sidebar" &&
+
+list_remove NEOMUTT_OPTS "--enable-hcache" &&
+list_remove NEOMUTT_OPTS "--disable-hcache"
diff --git a/mail/neomutt/DEPENDS b/mail/neomutt/DEPENDS
index 6a51995..0d06db2 100755
--- a/mail/neomutt/DEPENDS
+++ b/mail/neomutt/DEPENDS
@@ -1,24 +1,13 @@
depends "automake" &&

-persistent_add TMP_NEOMUTT_OPTS &&
-TMP_NEOMUTT_OPTS="" &&
+persistent_remove TMP_NEOMUTT_OPTS &&

optional_depends "MAIL-TRANSPORT-AGENT" \
"" \
"" \
"to send mail" &&

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

optional_depends "gnupg" \
"" \
@@ -43,17 +32,16 @@ optional_depends "gpgme"
\
"" \
"alternate backend for PGP and S/MIME" &&

-if list_find "${NEOMUTT_OPTS}" "--enable-hcache"; then
- config_query_list HCACHE_BACKEND \
- "Use which header cache backend?" \
- gdbm db lmdb &&
- if [[ "$HCACHE_BACKEND" == "db" ]]; then
- TMP_NEOMUTT_OPTS="${TMP_NEOMUTT_OPTS} --without-gdbm --with-bdb"
- elif [[ "$HCACHE_BACKEND" == "lmdb" ]]; then
- TMP_NEOMUTT_OPTS="${TMP_NEOMUTT_OPTS} --without-gdbm --with-lmdb"
- fi &&
- depends "${HCACHE_BACKEND}"
-fi &&
+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 &&

optional_depends "tokyocabinet" \
"" \
@@ -87,7 +75,7 @@ if list_find "${NEOMUTT_OPTS}" "--enable-pop" || list_find
"${NEOMUTT_OPTS}" "--
"" \
"to enable SSL support for POP/IMAP via gnutls" &&

- optional_depends "libsasl" \
+ optional_depends "LIBSASL" \
"--with-sasl" \
"" \
"to enable SASL2 authentication for POP/IMAP"
@@ -104,4 +92,3 @@ optional_depends "notmuch"
\
"--enable-notmuch" \
"--disable-notmuch" \
"Enable NOTMUCH support"
-
diff --git a/mail/neomutt/HISTORY b/mail/neomutt/HISTORY
index d3522c3..d6ffc0d 100644
--- a/mail/neomutt/HISTORY
+++ b/mail/neomutt/HISTORY
@@ -1,3 +1,7 @@
+2017-04-03 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, CONFIGURE, DEPENDS: reorganized terminal library and
+ headers cache flags, libsasl -> LIBSASL, removed temporary variable
+
2017-03-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 20170306




  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (0e9bf8921ec1cfcd9fcaeb8530502589d3d2c29e), Pavel Vinogradov, 04/03/2017

Archive powered by MHonArc 2.6.24.

Top of Page