Index: branches/2020Q4/mail/mutt/Makefile
===================================================================
--- branches/2020Q4/mail/mutt/Makefile	(revision 556092)
+++ branches/2020Q4/mail/mutt/Makefile	(revision 556093)
@@ -1,225 +1,208 @@
 # Created by: Udo Schweigert
 # $FreeBSD$
 
 PORTNAME=	mutt
-DISTVERSION=	1.14.7
+DISTVERSION=	2.0.2
 CATEGORIES+=	mail
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		https://bitbucket.org/mutt/mutt/downloads/ \
 		http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
 		http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv
 DIST_SUBDIR=	mutt
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES+=	http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
 		http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
 		http://vc.org.ua/mutt/:vc
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	dereks@lifeofadishwasher.com
 COMMENT=	Small but powerful text based program for read/writing e-mail
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support
 
 USES=		cpe perl5 shebangfix ssl
 USE_PERL5=	build
 
-CONFLICTS=	ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-1.4* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]*
+SHEBANG_FILES=	doc/gen-map-doc smime_keys.pl contrib/smime_keys_test.pl
 
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-fcntl --with-ssl=${OPENSSLBASE} \
 		--with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \
 		--enable-external-dotlock --enable-pop --enable-imap \
 		--enable-compressed --enable-sidebar
 
-INFO=	${PORTNAME}
-
-SHEBANG_FILES=	doc/gen-map-doc smime_keys.pl contrib/smime_keys_test.pl
-
 .if defined(MUTT_CONFIGURE_ARGS)
 CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
 .endif
 
-GNU_CONFIGURE=	yes
+CONFLICTS=	ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-1.4* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]*
 
+INFO=	${PORTNAME}
+
 OPTIONS_SUB=	yes
 
-OPTIONS_DEFINE=	AUTOCRYPT DEBUG_LOGS DOCS EXAMPLES FLOCK FORCEBASE64 GPGME \
+OPTIONS_DEFINE=	AUTOCRYPT DEBUG_LOGS DOCS EXAMPLES FLOCK GPGME \
 		GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \
 		MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH \
 		REVERSE_REPLY_PATCH SASL SMIME SMART_DATE SMTP URLVIEW
 
 OPTIONS_SINGLE=	GSSAPI HCACHE SCREEN
-OPTIONS_RADIO=	SPELL
-OPTIONS_RADIO_SPELL=	ASPELL ISPELL
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_SINGLE_HCACHE=	HCACHE_BDB HCACHE_TOKYOCABINET HCACHE_KYOTOCABINET HCACHE_NONE
 OPTIONS_SINGLE_SCREEN=	NCURSES SLANG
 
 AUTOCRYPT_DESC=	Convenient End-to-End Encryption
 DEBUG_LOGS_DESC=	Debugging capabilities
 FLOCK_DESC=	flock() usage
-FORCEBASE64_DESC=	Option to force base64 encoding for compose
 GPGME_DESC=	Gpgme interface
 GREETING_PATCH_DESC=	Greeting support
 HCACHE_BDB_DESC=	Use Berkeley DB (BDB)
 HCACHE_DESC=	Header Cache support
 HCACHE_KYOTOCABINET_DESC=	Use Kyoto Cabinet
 HCACHE_NONE_DESC=	Disable Header Cache
 HCACHE_TOKYOCABINET_DESC=	Use Tokyo Cabinet
 HTML_DESC=	HTML documentation
 IDN_DESC=	International Domain Names (implies ICONV)
 IFDEF_PATCH_DESC=	ifdef feature
 LOCALES_FIX_DESC=	Locales fix
 MAILBOX_MANPAGES_DESC=	Install mbox.5/mmdf.5 manpages
 MAILDIR_MTIME_PATCH_DESC=	Maildir mtime patch
 NCURSES_DESC=	Ncurses support
 NLS_DESC=	Native language support (implies ICONV)
 QUOTE_PATCH_DESC=	Extended quoting
 REVERSE_REPLY_PATCH_DESC=	Reverse_reply
 SASL_DESC=	SASL authentication
 SMIME_DESC=	SMIME email check option patch
 SLANG_DESC=	SLANG support
 SMART_DATE_DESC=	Dynamic date formatting with "%@"
 SMTP_DESC=	SMTP relay support
 URLVIEW_DESC=	Use urlview for the URL selector menu
 
 OPTIONS_DEFAULT=	AUTOCRYPT DEBUG_LOGS GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \
 		IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NCURSES \
 		NLS QUOTE_PATCH REVERSE_REPLY_PATCH SASL SMIME SMART_DATE SMTP URLVIEW
 
 .ifmake makesum # for optional distfiles patchfiles
 OPTIONS_OVERRIDE=	${OPTIONS_DEFINE} ${OPTIONS_DEFAULT}
 .MAKEOVERRIDES+=	OPTIONS_OVERRIDE
 .endif
 
 AUTOCRYPT_CONFIGURE_ENABLE=	autocrypt
 AUTOCRYPT_IMPLIES=		GPGME IDN
 AUTOCRYPT_USES=			sqlite:3
 AUTOCRYPT_CONFIGURE_WITH=	sqlite3=${LOCALBASE}
 AUTOCRYPT_DEPENDS=		gnupg>=2.1:security/gnupg \
 				gpgme>=1.8:security/gpgme
 AUTOCRYPT_BUILD_DEPENDS=	${AUTOCRYPT_DEPENDS}
 AUTOCRYPT_RUN_DEPENDS=		${AUTOCRYPT_DEPENDS}
 
-ASPELL_BUILD_DEPENDS=	aspell:textproc/aspell
-ASPELL_RUN_DEPENDS=	aspell:textproc/aspell
-ISPELL_BUILD_DEPENDS=	ispell:textproc/aspell-ispell
-ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
 URLVIEW_RUN_DEPENDS=	urlview:textproc/urlview
 
 DEBUG_LOGS_CONFIGURE_ON=	--enable-debug
 
 DOCS_BUILD_DEPENDS=	lynx:www/lynx
 
 # Handle ncurses/ncurses-port/slang
 SLANG_CONFIGURE_ON=	--with-slang=${LOCALBASE}
 SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
 SLANG_VARS=	PKGMESSAGE=${FILESDIR}/pkg-message.slang
 
 NCURSES_USES=	ncurses
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_IMPLIES=	ICONV
 
 # Handle GSSAPI from various places
 GSSAPI_BASE_USES=	gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_MIT_USES=	gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_NONE_CONFIGURE_ON=	--without-gss
 
 HCACHE_NONE_CONFIGURE_ON=	--disable-hcache
 HCACHE_NONE_CONFIGURE_OFF=	--enable-hcache --without-qdbm --without-gdbm
 
 HCACHE_BDB_CONFIGURE_WITH=	bdb=${LOCALBASE}
 HCACHE_BDB_USES=	bdb:42+
 
 HCACHE_TOKYOCABINET_CONFIGURE_WITH=	tokyocabinet=${LOCALBASE}
 HCACHE_TOKYOCABINET_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
 HCACHE_KYOTOCABINET_CONFIGURE_WITH=	kyotocabinet=${LOCALBASE}
 HCACHE_KYOTOCABINET_LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
 
 ICONV_USES=	iconv:translit
 ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
 ICONV_CONFIGURE_OFF=	--disable-iconv
 
 REVERSE_REPLY_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-reverse_reply
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_CONFIGURE_ON=	--with-sasl=${LOCALBASE}
 
 SMIME_EXTRA_PATCHES=	${PATCHDIR}/extra-smime-sender
 
 SMART_DATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-smartdate
 
 FLOCK_CONFIGURE_ENABLE=	flock
 
 LOCALES_FIX_CONFIGURE_ON=	--enable-locales-fix
 
 IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2 \
 			libunistring.so:devel/libunistring
 IDN_CONFIGURE_WITH=	idn2=${LOCALBASE}
 IDN_IMPLIES=	ICONV
 
 IFDEF_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ifdef
 
 GPGME_LIB_DEPENDS+=	libgpgme.so:security/gpgme
 GPGME_LIB_DEPENDS+=	libgpg-error.so:security/libgpg-error
 GPGME_LIB_DEPENDS+=	libassuan.so:security/libassuan
 GPGME_CONFIGURE_ENABLE=	gpgme
 
 SMTP_CONFIGURE_ENABLE=	smtp
 
-FORCEBASE64_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-forcebase64
-
 MAILDIR_MTIME_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-maildir-mtime
 
 GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
 
 QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
 	patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv
 
 .include <bsd.port.options.mk>
 
-# un/comment as each VERSION is created for PORTVERSION
 VVV_PATCH_VERSION=	1.13.0
-GREETING_PATCH_VERSION=	1.14.3
+GREETING_PATCH_VERSION=	2.0.1
 
 post-install:
 	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5
 
 pre-configure::
 	# Stop make from setgid mutt_dotlock
 	@${REINPLACE_CMD} \
 		-e '/if test.*mutt_dotlock.*DOTLOCK_GROUP/s/if/if ${FALSE} \&\&/' \
 		${WRKSRC}/Makefile.in
 	# Base FreeBSD krb5-config --version returns "FreeBSD heimdal"
 	@${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	# Install contrib samples to ${EXAMPLESDIR}
 	@${REINPLACE_CMD} -e 's#$$(docdir)/samples#${EXAMPLESDIR}#g' \
 		${WRKSRC}/contrib/Makefile.in
 
 pre-configure-HCACHE_BDB-on:
 	@${REINPLACE_CMD} -E -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 # Undo some dist. installed files
 post-stage::
 	@${MV} ${STAGEDIR}/${LOCALBASE}/etc/Muttrc.dist \
 	    	${STAGEDIR}/${LOCALBASE}/etc/Muttrc.sample
 	@${RM} ${STAGEDIR}/${LOCALBASE}/etc/mime.types*
-
-# Change default ispell
-post-build-ASPELL-on:
-	@${REINPLACE_CMD} -e '/^# append-hook/p' \
-		-e 's/^# append-hook.*$$/set ispell="aspell --mode=email check"/' \
-		${WRKSRC}/doc/Muttrc
 
 .include <bsd.port.mk>
Index: branches/2020Q4/mail/mutt/distinfo
===================================================================
--- branches/2020Q4/mail/mutt/distinfo	(revision 556092)
+++ branches/2020Q4/mail/mutt/distinfo	(revision 556093)
@@ -1,9 +1,9 @@
-TIMESTAMP = 1598742511
-SHA256 (mutt/mutt-1.14.7.tar.gz) = e4f507b133253cb5eef27996b8668956cdf9caac622cf8adad13f0f9a4eda864
-SIZE (mutt/mutt-1.14.7.tar.gz) = 5009968
-SHA256 (mutt/mutt-1.14.3.vc.greeting) = c6067f19e51e99e3c981c0c45a29fb442626d8bb3f0df56736ce4ee0eb0bfa83
-SIZE (mutt/mutt-1.14.3.vc.greeting) = 4472
+TIMESTAMP = 1605903183
+SHA256 (mutt/mutt-2.0.2.tar.gz) = 471218babe97968a45704f1e1e17523c4620ad1f92bae4143a4c9749ab1411c8
+SIZE (mutt/mutt-2.0.2.tar.gz) = 5293613
+SHA256 (mutt/mutt-2.0.1.vc.greeting) = 28d157df0ca36f2448dcc3d1cd19e34ec0eefe88251ebf1951e080d7178cccd2
+SIZE (mutt/mutt-2.0.1.vc.greeting) = 4452
 SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02
 SIZE (mutt/patch-1.13.0.vvv.initials.xz) = 720
 SHA256 (mutt/patch-1.13.0.vvv.quote.xz) = 788d25d1439d86d6c5007d141d1c219496e77940b5ce37819471c941f78f03e4
 SIZE (mutt/patch-1.13.0.vvv.quote.xz) = 1340
Index: branches/2020Q4/mail/mutt/files/extra-patch-forcebase64
===================================================================
--- branches/2020Q4/mail/mutt/files/extra-patch-forcebase64	(revision 556092)
+++ branches/2020Q4/mail/mutt/files/extra-patch-forcebase64	(nonexistent)
@@ -1,37 +0,0 @@
---- init.h.orig	2019-12-08 02:41:29 UTC
-+++ init.h
-@@ -1079,6 +1079,11 @@ struct option_t MuttVars[] = {
-   ** sent to both the list and your address, resulting in two copies
-   ** of the same email for you.
-   */
-+  { "force_base64",   DT_BOOL, R_NONE, {.l=OPTFORCEBASE64}, {.l=0} },
-+  /*
-+  ** .pp
-+  ** If you need to encode all text parts to base64, set this option.
-+  */
-   { "force_name",	DT_BOOL, R_NONE, {.l=OPTFORCENAME}, {.l=0} },
-   /*
-   ** .pp
---- mutt.h.orig	2019-12-08 02:41:29 UTC
-+++ mutt.h
-@@ -423,6 +423,7 @@ enum
-   OPTFCCCLEAR,
-   OPTFLAGSAFE,
-   OPTFOLLOWUPTO,
-+  OPTFORCEBASE64,
-   OPTFORCENAME,
-   OPTFORWDECODE,
-   OPTFORWQUOTE,
---- sendlib.c.orig	2019-12-08 02:41:29 UTC
-+++ sendlib.c
-@@ -1218,7 +1218,9 @@ static void mutt_set_encoding (BODY *b, CONTENT *info)
-   if (b->type == TYPETEXT)
-   {
-     char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);
--    if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) || info->linemax > 990 || (info->from && option (OPTENCODEFROM)))
-+    if (option (OPTFORCEBASE64))
-+      b->encoding = ENCBASE64;
-+    else if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) || info->linemax > 990 || (info->from && option (OPTENCODEFROM)))
-       b->encoding = ENCQUOTEDPRINTABLE;
-     else if (info->hibin)
-       b->encoding = option (OPTALLOW8BIT) ? ENC8BIT : ENCQUOTEDPRINTABLE;

Property changes on: branches/2020Q4/mail/mutt/files/extra-patch-forcebase64
___________________________________________________________________
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
Index: branches/2020Q4/mail/mutt/files/patch-muttlib.c
===================================================================
--- branches/2020Q4/mail/mutt/files/patch-muttlib.c	(revision 556092)
+++ branches/2020Q4/mail/mutt/files/patch-muttlib.c	(nonexistent)
@@ -1,25 +0,0 @@
---- muttlib.c.orig	2020-05-05 02:09:34 UTC
-+++ muttlib.c
-@@ -930,16 +930,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, const char *pre
- void _mutt_mktemp (char *s, size_t slen, const char *prefix, const char *suffix,
-                    const char *src, int line)
- {
--  size_t n = snprintf (s, slen, "%s/%s-%s-%d-%d-%ld%ld%s%s",
--                       NONULL (Tempdir), NONULL (prefix), NONULL (Hostname),
--                       (int) getuid (), (int) getpid (), random (), random (),
--                       suffix ? "." : "", NONULL (suffix));
-+  size_t n = snprintf (s, slen, "%s/mutt-%s-XXXXXXXX", NONULL (Tempdir), NONULL (Hostname));
-   if (n >= slen)
-     dprint (1, (debugfile, "%s:%d: ERROR: insufficient buffer space to hold temporary filename! slen=%zu but need %zu\n",
-                 src, line, slen, n));
--  dprint (3, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));
--  if (unlink (s) && errno != ENOENT)
--    dprint (1, (debugfile, "%s:%d: ERROR: unlink(\"%s\"): %s (errno %d)\n", src, line, s, strerror (errno), errno));
-+  if (mktemp (s)) { 
-+    dprint (3, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));
-+  } else {
-+    dprint (1, (debugfile, "%s:%d: ERROR: mktemp(\"%s\"): %s (errno %d)\n", src, line, s, strerror (errno), errno));
-+  }
- }
- 
- /* these characters must be escaped in regular expressions */

Property changes on: branches/2020Q4/mail/mutt/files/patch-muttlib.c
___________________________________________________________________
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
Index: branches/2020Q4/mail/mutt/files/patch-threadcomplete
===================================================================
--- branches/2020Q4/mail/mutt/files/patch-threadcomplete	(revision 556092)
+++ branches/2020Q4/mail/mutt/files/patch-threadcomplete	(nonexistent)
@@ -1,37 +0,0 @@
---- mutt.h.orig	2020-05-25 22:13:51 UTC
-+++ mutt.h
-@@ -242,6 +242,7 @@ enum
-   MUTT_EXPIRED,
-   MUTT_SUPERSEDED,
-   MUTT_TRASH,
-+  MUTT_THREADCOMPLETE,
- 
-   /* actions for mutt_pattern_comp/mutt_pattern_exec */
-   MUTT_AND,
---- pattern.c.orig	2020-05-25 20:41:30 UTC
-+++ pattern.c
-@@ -57,6 +57,7 @@ static const struct pattern_flags
- }
- Flags[] =
- {
-+  { 'a', MUTT_THREADCOMPLETE,	0,		NULL },
-   { 'A', MUTT_ALL,			0,		NULL },
-   { 'b', MUTT_BODY,  MUTT_FULL_MSG|MUTT_SEND_MODE_SEARCH, eat_regexp },
-   { 'B', MUTT_WHOLE_MSG,  MUTT_FULL_MSG|MUTT_SEND_MODE_SEARCH, eat_regexp },
-@@ -1499,6 +1500,16 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec
-       else
-         result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc);
-       return (pat->not ^ result);
-+    case MUTT_THREADCOMPLETE:
-+      { static pattern_t tmp;
-+        static short pattern_set = 0;
-+        if(! pattern_set) {
-+          memset (&tmp, 0, sizeof (tmp));
-+          tmp.op = MUTT_TAG;
-+          pattern_set = 1;
-+        }
-+        return (pat->not ^ (h->env && match_threadcomplete(&tmp, flags, ctx, h->thread, 1, 1, 1, 1)));
-+      } 
-     case MUTT_SUBSCRIBED_LIST:
-       if (cache)
-       {

Property changes on: branches/2020Q4/mail/mutt/files/patch-threadcomplete
___________________________________________________________________
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
Index: branches/2020Q4/mail/mutt/pkg-plist
===================================================================
--- branches/2020Q4/mail/mutt/pkg-plist	(revision 556092)
+++ branches/2020Q4/mail/mutt/pkg-plist	(revision 556093)
@@ -1,115 +1,117 @@
 bin/flea
 bin/mutt
 bin/muttbug
 @(,mail,2755) bin/mutt_dotlock
 bin/mutt_pgpring
 bin/pgpewrap
 bin/smime_keys
 @sample etc/Muttrc.sample
 man/man1/mutt.1.gz
 man/man1/mutt_dotlock.1.gz
 man/man1/mutt_pgpring.1.gz
 man/man1/pgpewrap.1.gz
 man/man1/smime_keys.1.gz
 man/man5/mailcap.5.gz
 %%MAILBOX_MANPAGES%%man/man5/mbox.5.gz
 %%MAILBOX_MANPAGES%%man/man5/mmdf.5.gz
 man/man5/muttrc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/GPL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.SECURITY
 %%PORTDOCS%%%%DOCSDIR%%/README.SSL
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/applying-patches.txt
 %%PORTDOCS%%%%DOCSDIR%%/devel-notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
 %%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/advancedusage.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/configuration.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/index.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/intro.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/manual.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/mimesupport.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/miscellany.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/reference.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/security.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tuning.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mush.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tin.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ca-bundle.crt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgedit-detectgui.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgedit-screen-tmux.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.default
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.linux
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpg.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-3.2.5.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.1.5.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.2.0.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.3.2.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.freebsd-3.3.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.3.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.90.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-10.01.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-10.20.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-11.00.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.irix-6.5.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0a.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0d.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.4.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.5.1.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/markdown2html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_oauth2.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_oauth2.py.README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_xtitle
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp2.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp5.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.mailcap
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-compress
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-sidebar
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-starter
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-tlr
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.vimrc-sidebar
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime_keys_test.pl
 %%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/da/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/de/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/el/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/es/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/et/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/id/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/it/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 556092)
+++ branches/2020Q4	(revision 556093)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r556068