Index: head/mail/neomutt/Makefile =================================================================== --- head/mail/neomutt/Makefile (revision 529046) +++ head/mail/neomutt/Makefile (revision 529047) @@ -1,115 +1,114 @@ # $FreeBSD$ PORTNAME= neomutt -PORTVERSION= 20200313 -PORTREVISION= 1 +PORTVERSION= 20200320 CATEGORIES= mail MAINTAINER= bapt@FreeBSD.org COMMENT= Bringing together all the Mutt Code LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support \ urlview:textproc/urlview USES= iconv:translit localbase perl5 shebangfix ssl USE_GITHUB= yes USE_PERL5= build MAKE_JOBS_UNSAFE= yes HAS_CONFIGURE= yes OPTIONS_SUB= yes SHEBANG_FILES= contrib/smime_keys EXTRA_PATCHES= ${FILESDIR}/indent-sidebar.patch:-p1 OPTIONS_DEFINE= NLS DOCS SASL IDN FLOCK GPGME NOTMUCH OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME LMDB NCURSES GSSAPI_BASE OPTIONS_MULTI= HCACHE OPTIONS_MULTI_HCACHE= BDB GDBM KYOTOCABINET LMDB QDBM TOKYOCABINET OPTIONS_SINGLE= SCREEN GSSAPI OPTIONS_SINGLE_SCREEN= NCURSES SLANG OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT FLOCK_DESC= Use flock() to lock files GPGME_DESC= Use gpgme to handle pgp NOTMUCH_DESC= Use notmuch for tagging and searching HCACHE_DESC= Header-cache backend KYOTOCABINET_DESC= Kyoto Cabinet support LMDB_DESC= Lightning Memory-Mapped Database support QDBM_DESC= Quick DataBase Manager support TOKYOCABINET_DESC= Tokyo Cabinet support SCREEN_DESC= Screen options CONFIGURE_ARGS= --with-ssl="${OPENSSLBASE}" \ --locales-fix \ --fmemopen \ --mandir=${PREFIX}/man \ ${ICONV_CONFIGURE_ARGS} # Header cache BDB_CONFIGURE_ON= --bdb BDB_USES= bdb GDBM_CONFIGURE_ON= --gdbm GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm KYOTOCABINET_CONFIGURE_ON= --kyotocabinet KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet LMDB_CONFIGURE_ON= --lmdb LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb QDBM_CONFIGURE_ON= --qdbm QDBM_LIB_DEPENDS= libqdbm.so:databases/qdbm TOKYOCABINET_CONFIGURE_ON= --tokyocabinet TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext IDN_LIB_DEPENDS= libidn.so:dns/libidn IDN_CONFIGURE_ENABLE= idn FLOCK_CONFIGURE_ON= --with-lock=flock SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_CONFIGURE_ON= --sasl GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme \ libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error GPGME_CONFIGURE_ENABLE= gpgme NOTMUCH_LIB_DEPENDS= libnotmuch.so:mail/notmuch NOTMUCH_CONFIGURE_ENABLE= notmuch SLANG_CONFIGURE_ON= --with-slang=${LOCALBASE} --with-ui=slang SLANG_CONFIGURE_OFF= --with-ui=ncurses SLANG_LIB_DEPENDS= libslang.so:devel/libslang2 SLANG_VARS= PKGMESSAGE=${FILESDIR}/pkg-message.slang # GSSAPI GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --gss GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gss=${LOCALBASE} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --with-gss=${LOCALBASE} NCURSES_USES= ncurses DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \ lynx:www/lynx # Trick neomutt into building manpages and neomuttrc DOCS_VARS_OFF= BINARY_ALIAS=xsltproc=true \ BINARY_ALIAS+=xmlcatalog=true post-install: ${RM} ${STAGEDIR}${PREFIX}/etc/mime* ${MV} ${STAGEDIR}${PREFIX}/etc/neomuttrc ${STAGEDIR}${PREFIX}/etc/neomuttrc.dist ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/neomutt \ ${STAGEDIR}${PREFIX}/libexec/neomutt/pgpewrap .include Index: head/mail/neomutt/distinfo =================================================================== --- head/mail/neomutt/distinfo (revision 529046) +++ head/mail/neomutt/distinfo (revision 529047) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584350770 -SHA256 (neomutt-neomutt-20200313_GH0.tar.gz) = b5ff780506a5371f737f32afd694857568e8827b1c391e0aca27c66687019e85 -SIZE (neomutt-neomutt-20200313_GH0.tar.gz) = 3295200 +TIMESTAMP = 1585065378 +SHA256 (neomutt-neomutt-20200320_GH0.tar.gz) = 69daf2e0633dee7e8bdba74ab714adfa70e8f078028b56d612228c2aa836aafa +SIZE (neomutt-neomutt-20200320_GH0.tar.gz) = 3304719 Index: head/mail/neomutt/files/indent-sidebar.patch =================================================================== --- head/mail/neomutt/files/indent-sidebar.patch (revision 529046) +++ head/mail/neomutt/files/indent-sidebar.patch (nonexistent) @@ -1,104 +0,0 @@ -From a7f602f120788bb8501cba46e9de6cf9de35a742 Mon Sep 17 00:00:00 2001 -From: Richard Russon -Date: Sun, 15 Mar 2020 17:12:58 +0000 -Subject: [PATCH] fix sidebar indent - -Take care when comparing "$folder" against an IMAP Mailbox path -(the `user@` may not be present on both sides). - -Fixes: #2173 -Fixes: #2175 ---- - sidebar.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++---- - 1 file changed, 56 insertions(+), 4 deletions(-) - -diff --git a/sidebar.c b/sidebar.c -index 199fa7df0b..1f0943371a 100644 ---- a/sidebar.c -+++ b/sidebar.c -@@ -36,6 +36,7 @@ - #include - #include "mutt/lib.h" - #include "config/lib.h" -+#include "email/lib.h" - #include "core/lib.h" - #include "gui/lib.h" - #include "sidebar.h" -@@ -833,6 +834,48 @@ static void fill_empty_space(struct MuttWindow *win, int first_row, - } - } - -+/** -+ * imap_is_prefix - Check if folder matches the beginning of mbox -+ * @param folder Folder -+ * @param mbox Mailbox path -+ * @param plen Prefix length -+ * @retval true If folder is the prefix of mbox -+ */ -+static bool imap_is_prefix(const char *folder, const char *mbox, size_t *plen) -+{ -+ struct Url *url_m = url_parse(mbox); -+ struct Url *url_f = url_parse(folder); -+ -+ if (!url_m || !url_f) -+ return false; -+ -+ bool rc = false; -+ -+ if (mutt_str_strcasecmp(url_m->host, url_f->host) != 0) -+ goto done; -+ -+ if (url_m->user && url_f->user && (mutt_str_strcasecmp(url_m->user, url_f->user) != 0)) -+ goto done; -+ -+ size_t mlen = mutt_str_strlen(url_m->path); -+ size_t flen = mutt_str_strlen(url_f->path); -+ if (flen > mlen) -+ goto done; -+ -+ if (mutt_str_strncmp(url_m->path, url_f->path, flen) != 0) -+ goto done; -+ -+ if (url_m->user && !url_f->user) -+ *plen += mutt_str_strlen(url_m->user) + 1; -+ rc = true; -+ -+done: -+ url_free(&url_m); -+ url_free(&url_f); -+ -+ return rc; -+} -+ - /** - * draw_sidebar - Write out a list of mailboxes, in a panel - * @param win Window to draw on -@@ -915,15 +958,24 @@ static void draw_sidebar(struct MuttWindow *win, int num_rows, int num_cols, int - size_t maildirlen = mutt_str_strlen(C_Folder); - if (maildirlen && C_SidebarDelimChars && - strchr(C_SidebarDelimChars, C_Folder[maildirlen - 1])) -+ { - maildirlen--; -+ } - - /* check whether C_Folder is a prefix of the current folder's path */ - bool maildir_is_prefix = false; -- if ((mutt_buffer_len(&m->pathbuf) > maildirlen) && -- (mutt_str_strncmp(C_Folder, mailbox_path(m), maildirlen) == 0) && -- C_SidebarDelimChars && strchr(C_SidebarDelimChars, mailbox_path(m)[maildirlen])) -+ if (m->magic == MUTT_IMAP) - { -- maildir_is_prefix = true; -+ maildir_is_prefix = imap_is_prefix(C_Folder, mailbox_path(m), &maildirlen); -+ } -+ else -+ { -+ if ((mutt_buffer_len(&m->pathbuf) > maildirlen) && -+ (mutt_str_strncmp(C_Folder, mailbox_path(m), maildirlen) == 0) && -+ C_SidebarDelimChars && strchr(C_SidebarDelimChars, mailbox_path(m)[maildirlen])) -+ { -+ maildir_is_prefix = true; -+ } - } - - /* calculate depth of current folder and generate its display name with indented spaces */ Property changes on: head/mail/neomutt/files/indent-sidebar.patch ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property