sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (96f78816561ee89818261c388fecc0e92e6d65f4)

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 (96f78816561ee89818261c388fecc0e92e6d65f4)
Date: Tue, 12 Dec 2017 22:27:55 +0000

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

mail/neomutt/BUILD | 4 +-
mail/neomutt/CONFIGURE | 45 +++++++++++----------------
mail/neomutt/DEPENDS | 79
++++++++++++++++++++++---------------------------
mail/neomutt/HISTORY | 4 ++
mail/neomutt/PRE_BUILD | 4 +-
5 files changed, 64 insertions(+), 72 deletions(-)

New commits:
commit 96f78816561ee89818261c388fecc0e92e6d65f4
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

mail/neomutt: switched to autosetup + some cleanups

diff --git a/mail/neomutt/BUILD b/mail/neomutt/BUILD
index da715be..5e41a0c 100755
--- a/mail/neomutt/BUILD
+++ b/mail/neomutt/BUILD
@@ -1,5 +1,5 @@
-OPTS="--with-docdir=${INSTALL_ROOT}/usr/share/doc/mutt
+OPTS+=" --docdir=${INSTALL_ROOT}/usr/share/doc/mutt
--with-mailpath=${INSTALL_ROOT}/var/spool/mail
- ${NEOMUTT_OPTS} ${OPTS}" &&
+ ${NEOMUTT_OPTS}" &&

default_build
diff --git a/mail/neomutt/CONFIGURE b/mail/neomutt/CONFIGURE
index cd6c8b8..bdb2285 100755
--- a/mail/neomutt/CONFIGURE
+++ b/mail/neomutt/CONFIGURE
@@ -2,38 +2,31 @@ config_query_list TERMINAL_LIBRARY
\
"Build against which terminal library?" \
ncurses slang &&

-config_query_option NEOMUTT_OPTS "Enable POP support?" \
- "y" \
- "--enable-pop" \
- "--disable-pop" &&
-
-config_query_option NEOMUTT_OPTS "Enable IMAP support?" \
- "y" \
- "--enable-imap" \
- "--disable-imap" &&
-
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" \
- "--disable-smtp" &&
-
-config_query_option NEOMUTT_OPTS "Enable compressed folder support?" \
- "n" \
- "--enable-compressed" \
- "--disable-compressed" &&
-
config_query_option NEOMUTT_OPTS "Use fmemopen?" \
"n" \
- "--enable-fmemopen" \
- "--disable-fmemopen" &&
+ "--fmemopen" \
+ "" &&

-config_query_option NEOMUTT_OPTS "Enable sidebar?" \
- "n" \
- "--enable-sidebar" \
- "--disable-sidebar" &&
+list_remove NEOMUTT_OPTS "--enable-fmemopen" &&
+list_remove NEOMUTT_OPTS "--disable-fmemopen" &&
+
+list_remove NEOMUTT_OPTS "--enable-pop" &&
+list_remove NEOMUTT_OPTS "--disable-pop" &&
+
+list_remove NEOMUTT_OPTS "--enable-imap" &&
+list_remove NEOMUTT_OPTS "--disable-imap" &&
+
+list_remove NEOMUTT_OPTS "--enable-smtp" &&
+list_remove NEOMUTT_OPTS "--disable-smtp" &&
+
+list_remove NEOMUTT_OPTS "--enable-compressed" &&
+list_remove NEOMUTT_OPTS "--disable-compressed" &&
+
+list_remove NEOMUTT_OPTS "--enable-sidebar" &&
+list_remove NEOMUTT_OPTS "--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 8384666..6fca482 100755
--- a/mail/neomutt/DEPENDS
+++ b/mail/neomutt/DEPENDS
@@ -1,6 +1,3 @@
-depends "autoconf" &&
-depends "automake" &&
-
if [[ "${NEOMUTT_BRANCH}" == "scm" ]]; then
depends git
fi &&
@@ -12,88 +9,84 @@ optional_depends "MAIL-TRANSPORT-AGENT"
\
"" \
"to send mail" &&

-depends "${TERMINAL_LIBRARY}" "--with-${TERMINAL_LIBRARY/ncurses/curses}" &&
+depends "${TERMINAL_LIBRARY}" "--with-ui=${TERMINAL_LIBRARY}" &&

optional_depends "gnupg" \
"" \
"--disable-pgp" \
"to support PGP signing and encrypting messages" &&

-optional_depends "ispell" \
- "" \
- "" \
- "for spell checking" &&
-
-# Do NOT add --with-ssl here, that only works if POP/IMAP are used. This is
+# Do NOT add --ssl here, that only works if POP/IMAP are used. This is
# mostly just here to prompt for SSL if they don't have it and want
# S/MIME.
optional_depends "SSL" \
"" \
- "" \
+ "--disable-smime" \
"to support S/MIME signing and encrypting messages" &&

optional_depends "gpgme" \
- "--enable-gpgme" \
+ "--gpgme" \
"" \
"alternate backend for PGP and S/MIME" &&

case ${HCACHE_BACKEND} in
db)
- depends "${HCACHE_BACKEND}" "--with-bdb --without-gdbm
--without-lmdb" ;;
+ depends "${HCACHE_BACKEND}" "--bdb" ;;
lmdb)
- depends "${HCACHE_BACKEND}" "--with-lmdb --without-db
--without-gdbm" ;;
+ depends "${HCACHE_BACKEND}" "--lmdb" ;;
gdbm)
- depends "${HCACHE_BACKEND}" "--with-gdbm --without-db
--without-lmdb" ;;
+ depends "${HCACHE_BACKEND}" "--gdbm" ;;
*)
;;
esac &&

optional_depends "tokyocabinet" \
+ "--tokyocabinet" \
"" \
- "--without-tokyocabinet" \
"Use tokyocabinet?" &&

optional_depends "kyotocabinet" \
+ "--kyotocabinet" \
"" \
- "--without-kyotocabinet" \
"Use kyotocabinet?" &&

optional_depends "qdbm" \
+ "--qdbm" \
"" \
- "--without-qdbm" \
"Use kyotocabinet?" &&

optional_depends "libidn" \
- "--with-idn" \
"" \
+ "--disable-idn" \
"to use GNU libidn for domain names" &&

-if list_find "${NEOMUTT_OPTS}" "--enable-pop" || list_find "${NEOMUTT_OPTS}"
"--enable-imap"; then
- # If they have POP/IMAP then prompt again for SSL to get --with-ssl.
- optional_depends "SSL" \
- "--with-ssl" \
- "" \
- "to enable SSL support for POP/IMAP" &&
+# If they have POP/IMAP then prompt again for SSL to get --ssl.
+optional_depends "SSL" \
+ "--ssl" \
+ "" \
+ "to enable SSL support for POP/IMAP" &&

- optional_depends "gnutls" \
- "--with-gnutls" \
- "" \
- "to enable SSL support for POP/IMAP via gnutls" &&
+optional_depends "gnutls" \
+ "--gnutls" \
+ "" \
+ "to enable SSL support for POP/IMAP via gnutls" &&

- optional_depends "LIBSASL" \
- "--with-sasl" \
- "" \
- "to enable SASL2 authentication for POP/IMAP"
-fi &&
+optional_depends "LIBSASL" \
+ "--sasl" \
+ "" \
+ "to enable SASL2 authentication for POP/IMAP" &&

-if list_find "${NEOMUTT_OPTS}" "--enable-imap"; then
- optional_depends "krb5" \
- "--with-gss" \
- "" \
- "to enable GSSAPI authentication for IMAP"
-fi &&
+optional_depends "krb5" \
+ "--gss" \
+ "" \
+ "to enable GSSAPI authentication for IMAP" &&
+
+optional_depends "LUA" \
+ "--lua" \
+ "" \
+ "for Lua scripting" &&

-optional_depends "notmuch" \
- "--enable-notmuch" \
- "--disable-notmuch" \
+optional_depends "notmuch" \
+ "--notmuch" \
+ "" \
"Enable NOTMUCH support"
diff --git a/mail/neomutt/HISTORY b/mail/neomutt/HISTORY
index 7b4040a..ec2be8b 100644
--- a/mail/neomutt/HISTORY
+++ b/mail/neomutt/HISTORY
@@ -1,3 +1,7 @@
+2017-12-12 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, CONFIGURE, DEPENDS, PRE_BUILD: switched to autosetup,
+ dropped autotools, added LUA option
+
2017-12-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 20171208

diff --git a/mail/neomutt/PRE_BUILD b/mail/neomutt/PRE_BUILD
index 41366a2..7c273d7 100755
--- a/mail/neomutt/PRE_BUILD
+++ b/mail/neomutt/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

-autoreconf --install
+if [[ "${NEOMUTT_BRANCH}" != "scm" ]]; then
+ mv configure.autosetup configure
+fi

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (96f78816561ee89818261c388fecc0e92e6d65f4), Pavel Vinogradov, 12/12/2017