sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (51d47b374230ee42e9d4f65bfe05194ebd5a21b8)

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 (51d47b374230ee42e9d4f65bfe05194ebd5a21b8)
Date: Sat, 20 Aug 2016 04:54:45 +0000

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

mail/mutt/CONFIGURE | 19 ++++++-------
mail/mutt/DEPENDS | 76
++++++++++++++++++++++++----------------------------
mail/mutt/DETAILS | 2 -
mail/mutt/DOWNLOAD | 45 ------------------------------
mail/mutt/HISTORY | 5 +++
5 files changed, 52 insertions(+), 95 deletions(-)

New commits:
commit 51d47b374230ee42e9d4f65bfe05194ebd5a21b8
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

mail/mutt: updated stable branch to 1.6.2 + some cleanups

diff --git a/mail/mutt/CONFIGURE b/mail/mutt/CONFIGURE
index 4ba09b4..189387a 100755
--- a/mail/mutt/CONFIGURE
+++ b/mail/mutt/CONFIGURE
@@ -60,15 +60,16 @@ for PATCH in ${REAL_PATCHES}; do
fi
done &&

-if [[ "${MUTT_BRANCH}" != "stable" ]]; then
- config_query_option MUTT_OPTS "Enable the header cache?" \
- "n" \
- "--enable-hcache" \
- "--disable-hcache" &&
- config_query_option MUTT_OPTS "Enable SMTP support?" \
- "y" \
- "--enable-smtp" \
- "--disable-smtp" &&
+config_query_option MUTT_OPTS "Enable the header cache?" \
+ "n" \
+ "--enable-hcache" \
+ "--disable-hcache" &&
+config_query_option MUTT_OPTS "Enable SMTP support?" \
+ "y" \
+ "--enable-smtp" \
+ "--disable-smtp" &&
+
+if [[ "${MUTT_BRANCH}" != "stable" ]]; then
config_query_option MUTT_OPTS "Enable sidebar?" \
"n" \
"--enable-sidebar" \
diff --git a/mail/mutt/DEPENDS b/mail/mutt/DEPENDS
index efd9c94..d75d42d 100755
--- a/mail/mutt/DEPENDS
+++ b/mail/mutt/DEPENDS
@@ -5,8 +5,8 @@ optional_depends "MAIL-TRANSPORT-AGENT"
\
"" \
"" \
"to send mail" &&
-
-if [[ "$MUTT_BRANCH" == "scm" ]]; then
+
+if [[ "$MUTT_BRANCH" == "scm" ]]; then
depends mercurial
fi &&

@@ -32,54 +32,50 @@ optional_depends "ispell"
\
"" \
"for spell checking" &&

-if [[ "$MUTT_BRANCH" != "stable" ]]; then
- # Do NOT add --with-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" \
- "" \
- "" \
- "to support S/MIME signing and encrypting messages" &&
-
- optional_depends "gpgme" \
- "--enable-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}"
+# Do NOT add --with-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" \
+ "" \
+ "" \
+ "to support S/MIME signing and encrypting messages" &&
+
+optional_depends "gpgme" \
+ "--enable-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 &&
-
- optional_depends "libidn" \
- "--with-idn" \
- "" \
- "to use GNU libidn for domain names"
+ depends "${HCACHE_BACKEND}"
fi &&

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

- if [[ "$MUTT_BRANCH" != "stable" ]]; then
- optional_depends "gnutls" \
- "--with-gnutls" \
- "" \
- "to enable SSL support for POP/IMAP via gnutls" &&
+ optional_depends "gnutls" \
+ "--with-gnutls" \
+ "" \
+ "to enable SSL support for POP/IMAP via gnutls" &&

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

if list_find "${MUTT_OPTS}" "--enable-imap"; then
diff --git a/mail/mutt/DETAILS b/mail/mutt/DETAILS
index 5ec38a8..bb8315a 100755
--- a/mail/mutt/DETAILS
+++ b/mail/mutt/DETAILS
@@ -27,7 +27,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SECURITY_PATCH=1
;;
*)
- VERSION=1.6.0
+ VERSION=1.6.2
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_URL[0]=ftp://ftp.mutt.org/pub/mutt/${SOURCE}
diff --git a/mail/mutt/DOWNLOAD b/mail/mutt/DOWNLOAD
deleted file mode 100755
index c277ba6..0000000
--- a/mail/mutt/DOWNLOAD
+++ /dev/null
@@ -1,45 +0,0 @@
-#once the hg download handler hits stable sorcery this DOWNLOAD script would
-#only need to be removed, SOURCE_URL is compatible with the planned hg
handler
-
-function my_url_hg_http_crack() {
-
- URL=$(url_strip_prefix "$1" hg_http)
- HG_ROOT=$(echo $URL | sed "s#$^[^/]*[^:]*$:.*#\1#")
- HG_ROOT=http://$HG_ROOT
- local HG_DIRECTORY_TAG=$(echo $URL | sed "s#^[^/]*[^:]*$.*$#\1#")
- HG_DIRECTORY=$(echo $HG_DIRECTORY_TAG | cut -d : -f2)
- local HG_TAGNAME=$(echo $HG_DIRECTORY_TAG | cut -d : -f3)
- HG_TAG=${HG_TAGNAME:=default}
-
-}
-
-if [[ "$MUTT_BRANCH" != "scm" ]]; then
- default_download &&
- return $?
-fi &&
-
-message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
-my_url_hg_http_crack $SOURCE_URL &&
-if [[ -f $SOURCE_CACHE/$SOURCE ]]; then
- message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
- tar -jxf $SOURCE_CACHE/$SOURCE &&
- message "${MESSAGE_COLOR}Running hg pull...${DEFAULT_COLOR}" &&
- ( cd $HG_DIRECTORY &&
- echo hg pull $HG_ROOT &&
- hg pull $HG_ROOT &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
-else
- message "${MESSAGE_COLOR}Running hg clone...${DEFAULT_COLOR}"
- echo hg clone $HG_ROOT $HG_DIRECTORY
- hg clone $HG_ROOT $HG_DIRECTORY &&
- ( cd $HG_DIRECTORY &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
-fi &&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
-tar -jcf $SOURCE $HG_DIRECTORY &&
-cp $SOURCE $SOURCE_CACHE/$SOURCE &&
-rm $SOURCE &&
-message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
diff --git a/mail/mutt/HISTORY b/mail/mutt/HISTORY
index fd4454a..9248701 100644
--- a/mail/mutt/HISTORY
+++ b/mail/mutt/HISTORY
@@ -1,3 +1,8 @@
+2016-08-20 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated stable branch to 1.6.2
+ * CONFIGURE, DEPENDS: removed checks for stable branch, reformatting
+ * DOWNLOAD: removed, it's sorcery's job now
+
2016-08-19 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated devel branch to 1.7.0
* CONFIGURE: added sidebar optional feature

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (51d47b374230ee42e9d4f65bfe05194ebd5a21b8), Pavel Vinogradov, 08/20/2016