Index: head/mail/mutt/Makefile
===================================================================
--- head/mail/mutt/Makefile	(revision 508962)
+++ head/mail/mutt/Makefile	(revision 508963)
@@ -1,258 +1,257 @@
 # Created by: Udo Schweigert
 # $FreeBSD$
 
 PORTNAME=	mutt
 DISTVERSION=	1.12.1
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
 		https://bitbucket.org/mutt/mutt/downloads/ \
 		ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \
 		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 shebangfix ssl
 
 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]*
 
 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
 
 OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=	SASL DEBUG DOCS EXAMPLES FLOCK \
 		FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
 		LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
 		NLS NNTP QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
 		SMTP URLVIEW XML
 
 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
 
 SASL_DESC=	SASL authentication
 DEBUG_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
 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
 SLANG_DESC=	SLANG support
 SMART_DATE_DESC=	Dynamic date formatting with "%@"
 SMTP_DESC=	SMTP relay support
 HCACHE_DESC=	Header Cache support
 HCACHE_BDB_DESC=	Use Berkeley DB (BDB)
 HCACHE_TOKYOCABINET_DESC=	Use Tokyo Cabinet
 HCACHE_KYOTOCABINET_DESC=	Use Kyoto Cabinet
 HCACHE_NONE_DESC=	Disable Header Cache
 URLVIEW_DESC=	Use urlview for the URL selector menu
 XML_DESC=	Use XML tools for rebuilding documentation
 
 OPTIONS_DEFAULT=	GPGME HTML HCACHE_BDB ICONV IDN \
 		IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
 		NLS NCURSES QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
 		SASL SMTP URLVIEW XML GSSAPI_NONE
 
 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
 
 .ifmake makesum # for optional distfiles patchfiles
 PORT_DBDIR=		/dev/null
 OPTIONS_DEFAULT+=	${OPTIONS_DEFINE}
 .endif
 
 DEBUG_CONFIGURE_ON=	--enable-debug
 
 # 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}
 
 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
 
 GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
 
-QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv
-QUOTE_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-vvv.quote
+QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
+	patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv
 
-NNTP_BROKEN=		NNTP broken with 1.12.0
 NNTP_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.nntp.xz:-p1:vvv
 NNTP_EXTRA_PATCHES=	${PATCHDIR}/extra-nntp-depfiles
 NNTP_CONFIGURE_ON=	--enable-nntp
 NNTP_VARS=	XML_NEEDED=yes
 NNTP_CATEGORIES=	news
 NNTP_USES=	perl5
 
 DOCS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-doc-ref
 
 .include <bsd.port.options.mk>
 
 # un/comment as each VERSION is created for PORTVERSION
-VVV_PATCH_VERSION=	1.11.1
+#VVV_PATCH_VERSION=	1.12.1
 GREETING_PATCH_VERSION=	1.12.0
 
 .if !defined(VVV_PATCH_VERSION)
 VVV_PATCH_VERSION=	${PORTVERSION}
 .endif
 .if !defined(GREETING_PATCH_VERSION)
 GREETING_PATCH_VERSION=	${PORTVERSION}
 .endif
 
 post-patch-NNTP-on:
 # Restore timestamps for autotools sources
 	@${TOUCH} -r ${WRKSRC}/configure.ac.orig ${WRKSRC}/configure.ac
 	@${TOUCH} -r ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am
 .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
 	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
 .endif
 .if ${PORT_OPTIONS:MFORCEBASE64}
 	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64-nntp
 .endif
 
 post-patch-NNTP-off:
 .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
 	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime
 .endif
 .if ${PORT_OPTIONS:MFORCEBASE64}
 	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64
 .endif
 
 post-install:
 	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5
 
 post-install-NNTP-on:
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
 
 pre-configure::
 	@${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
 		${WRKSRC}/contrib/pgp6.rc
 	@${REINPLACE_CMD} -E -e 's#(/samples|samples/)#share/examples/mutt#g' \
 		${WRKSRC}/doc/reference.html \
 		${WRKSRC}/doc/manual.html \
 		${WRKSRC}/doc/manual.txt \
 		${WRKSRC}/doc/Muttrc \
 		${WRKSRC}/INSTALL \
 		${WRKSRC}/init.h
 	@${REINPLACE_CMD} -e 's#$$(docdir)/samples#${EXAMPLESDIR}#g' \
 		${WRKSRC}/contrib/Makefile.in
 
 pre-configure-ASPELL-on:
 	@${REINPLACE_CMD} -e '/^# append-hook/p' \
 		-e 's/^# append-hook.*$$/set ispell="aspell --mode=email check"/' \
 	${WRKSRC}/doc/Muttrc.head
 
 pre-configure-HCACHE_BDB-on:
 	@${REINPLACE_CMD} -E -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 .if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
 BUILD_DEPENDS+=	xsltproc:textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
 		lynx:www/lynx
 .else
 pre-build::
 	@${REINPLACE_CMD} \
 		-e 's,manual.html stamp-doc-rc stamp-doc-chunked manual.txt,stamp-doc-rc,' \
 		${WRKSRC}/doc/Makefile
 .endif
 
 .include <bsd.port.mk>
Index: head/mail/mutt/distinfo
===================================================================
--- head/mail/mutt/distinfo	(revision 508962)
+++ head/mail/mutt/distinfo	(revision 508963)
@@ -1,9 +1,11 @@
-TIMESTAMP = 1560623854
+TIMESTAMP = 1565808330
 SHA256 (mutt/mutt-1.12.1.tar.gz) = 01c565406ec4ffa85db90b45ece2260b25fac3646cc063bbc20a242c6ed4210c
 SIZE (mutt/mutt-1.12.1.tar.gz) = 4675166
 SHA256 (mutt/mutt-1.12.0.vc.greeting) = 7596d930447e9834567c0cfddf9ac023ecbb99add64bee4131d87e0260eec591
 SIZE (mutt/mutt-1.12.0.vc.greeting) = 4559
-SHA256 (mutt/patch-1.11.1.vvv.nntp.xz) = 2a6386a82cbf9afde162bfb1989e545fb222bf40c5f6fac169d9249d4c904c79
-SIZE (mutt/patch-1.11.1.vvv.nntp.xz) = 49384
-SHA256 (mutt/patch-1.11.1.vvv.initials.xz) = af45defbda3a85f86db3f8ef5235ddb6613a36fdc35540cdc9afa38409114a07
-SIZE (mutt/patch-1.11.1.vvv.initials.xz) = 712
+SHA256 (mutt/patch-1.12.1.vvv.nntp.xz) = 9c420584d549ac0bb49c52ddfd2ab5bee0f89e59cb938673444ec27ad7c782ad
+SIZE (mutt/patch-1.12.1.vvv.nntp.xz) = 49672
+SHA256 (mutt/patch-1.12.1.vvv.initials.xz) = 6c66fe6c23362b0f4970a5028a75a33454e1e53ba178e5801113939f1bc22920
+SIZE (mutt/patch-1.12.1.vvv.initials.xz) = 724
+SHA256 (mutt/patch-1.12.1.vvv.quote.xz) = 365200817a203a892094062445865b7b8f9ab37e8214ec526082876ffd0d8ab4
+SIZE (mutt/patch-1.12.1.vvv.quote.xz) = 1332
Index: head/mail/mutt/files/extra-patch-vvv.quote
===================================================================
--- head/mail/mutt/files/extra-patch-vvv.quote	(revision 508962)
+++ head/mail/mutt/files/extra-patch-vvv.quote	(nonexistent)
@@ -1,81 +0,0 @@
---- PATCHES.orig	2019-06-15 21:17:01 UTC
-+++ PATCHES
-@@ -0,0 +1 @@
-+vvv.quote
---- handler.c.orig	2019-05-31 16:21:33 UTC
-+++ handler.c
-@@ -1593,7 +1593,31 @@ static int text_plain_handler (BODY *b, STATE *s)
- 	buf[--l] = 0;
-     }
-     if (s->prefix)
--      state_puts (s->prefix, s);
-+    {
-+      int i;
-+      char qbuf[2 * LONG_STRING];
-+      int j = 0, offset = 0;
-+      regmatch_t pmatch[1];
-+
-+      while (regexec ((regex_t *) QuoteRegexp.rx, &buf[offset], 1, pmatch, 0) == 0)
-+	offset += pmatch->rm_eo;
-+
-+      if (!option (OPTQUOTEEMPTY) && !*buf)
-+	strcpy (qbuf, buf);
-+      else if (option (OPTQUOTEQUOTED) && offset)
-+      {
-+	for (i = 0; i < offset; i++)
-+	  if (buf[i] != ' ')
-+	    j = i;
-+	strncpy (qbuf, buf, j + 1);
-+	strcpy (qbuf + j + 1, buf + j);
-+      }
-+      else
-+	snprintf (qbuf, sizeof (qbuf), "%s%s", NONULL(s->prefix), buf);
-+
-+      state_puts (qbuf, s);
-+    }
-+    else
-     state_puts (buf, s);
-     state_putc ('\n', s);
-   }
-@@ -1779,7 +1803,7 @@ int mutt_body_handler (BODY *b, STATE *s)
-        */
-       if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
- 	encrypted_handler = handler = crypt_pgp_application_pgp_handler;
--      else if (option(OPTREFLOWTEXT) && ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0)
-+      else if (option(OPTREFLOWTEXT) && ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0 && !s->prefix)
- 	handler = rfc3676_handler;
-       else
- 	handler = text_plain_handler;
---- init.h.orig	2019-06-15 21:17:01 UTC
-+++ init.h
-@@ -2745,6 +2745,19 @@ struct option_t MuttVars[] = {
-   ** have no effect, and if it is set to \fIask-yes\fP or \fIask-no\fP, you are
-   ** prompted for confirmation when you try to quit.
-   */
-+  { "quote_empty",	DT_BOOL, R_NONE, OPTQUOTEEMPTY, 1 },
-+  /*
-+  ** .pp
-+  ** Controls whether or not empty lines will be quoted using
-+  ** ``$indent_string''.
-+  */
-+  { "quote_quoted",	DT_BOOL, R_NONE, OPTQUOTEQUOTED, 0 },
-+  /*
-+  ** .pp
-+  ** Controls how quoted lines will be quoted. If set, one quote
-+  ** character will be added to the end of existing prefix.  Otherwise,
-+  ** quoted lines will be prepended by ``$indent_string''.
-+  */
-   { "quote_regexp",	DT_RX,	 R_PAGER, UL &QuoteRegexp, UL "^([ \t]*[|>:}#])+" },
-   /*
-   ** .pp
---- mutt.h.orig	2019-06-14 01:29:29 UTC
-+++ mutt.h
-@@ -479,6 +479,8 @@ enum
-   OPTPRINTDECODE,
-   OPTPRINTSPLIT,
-   OPTPROMPTAFTER,
-+  OPTQUOTEEMPTY,
-+  OPTQUOTEQUOTED,
-   OPTREADONLY,
-   OPTREFLOWSPACEQUOTES,
-   OPTREFLOWTEXT,

Property changes on: head/mail/mutt/files/extra-patch-vvv.quote
___________________________________________________________________
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