Index: head/mail/neomutt/Makefile =================================================================== --- head/mail/neomutt/Makefile (revision 533321) +++ head/mail/neomutt/Makefile (revision 533322) @@ -1,114 +1,114 @@ # $FreeBSD$ PORTNAME= neomutt -PORTVERSION= 20200417 +PORTVERSION= 20200424 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 +EXTRA_PATCHES= ${FILESDIR}/0001-fix-sidebar-use-abbreviated-path-if-possible.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 533321) +++ head/mail/neomutt/distinfo (revision 533322) @@ -1,3 +1,3 @@ -TIMESTAMP = 1587368728 -SHA256 (neomutt-neomutt-20200417_GH0.tar.gz) = 6ed358053ae17694b580f3b5b13eec9f00f5a7320e76fae6fba767607c40cc48 -SIZE (neomutt-neomutt-20200417_GH0.tar.gz) = 3322435 +TIMESTAMP = 1588144159 +SHA256 (neomutt-neomutt-20200424_GH0.tar.gz) = e708d04f057a788041acaced765861bcfbab50f287f8e83620447ec8eb5145df +SIZE (neomutt-neomutt-20200424_GH0.tar.gz) = 3323821 Index: head/mail/neomutt/files/0001-fix-sidebar-use-abbreviated-path-if-possible.patch =================================================================== --- head/mail/neomutt/files/0001-fix-sidebar-use-abbreviated-path-if-possible.patch (nonexistent) +++ head/mail/neomutt/files/0001-fix-sidebar-use-abbreviated-path-if-possible.patch (revision 533322) @@ -0,0 +1,41 @@ +From 96af299e8c8aff16f4c5e400f79d6edc3792eef5 Mon Sep 17 00:00:00 2001 +From: Austin Ray +Date: Tue, 28 Apr 2020 21:00:57 -0400 +Subject: [PATCH] fix(sidebar): use abbreviated path if possible + +After the refactor in commit d77c704ceb85f34061e1333ab9c8eb5a264a0685, +the sidebar only displays a mailbox's full path/URI except in the case +of 'sidebar_short_path'. The full path/URI is not preferable for end +users. + +What broke during the refactor is how the variable 'display' is updated. +It's initialized to a mailbox's full path/URI and only updated if using +'sidebar_short_path'. However, after initialization, an abbreviation is +calculated to remove the 'folder' or protocol. + +To resolve this issue, if there's an abbreviation, store it in the +'display' variable. + +Fixes #2293 +--- + sidebar.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/sidebar.c b/sidebar.c +index 810146e66..bc680000d 100644 +--- a/sidebar.c ++++ b/sidebar.c +@@ -1101,6 +1101,10 @@ static void draw_sidebar(struct MuttWindow *win, int num_rows, int num_cols, int + if (!abbr) + abbr = abbrev_url(display, m->type); + ++ // Use the abbreviation if we have one. The full path is not preferable. ++ if (abbr) ++ display = abbr; ++ + const char *last_part = abbr; + int depth = calc_path_depth(abbr, C_SidebarDelimChars, &last_part); + +-- +2.26.2 + Property changes on: head/mail/neomutt/files/0001-fix-sidebar-use-abbreviated-path-if-possible.patch ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property