Index: mail/mutt/Makefile =================================================================== --- mail/mutt/Makefile +++ mail/mutt/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= mutt -PORTVERSION= 1.8.0 -PORTREVISION?= 2 +PORTVERSION= 1.8.2 +PORTREVISION?= 0 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ @@ -17,6 +17,7 @@ PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ + https://web-beta.archive.org/web/20161116074212/http://home.uchicago.edu/~dgc/sw/mutt/:dgc \ http://home.uchicago.edu/~dgc/sw/mutt/:dgc \ https://www.schrab.com/aaron/mutt/:ats \ http://vc.org.ua/mutt/:vc @@ -216,7 +217,7 @@ # un/comment as each VERSION is created for PORTVERSION VVV_PATCH_VERSION= 1.8.0 -GREETING_PATCH_VERSION= 1.8.0 +#GREETING_PATCH_VERSION= 1.8.1 .if !defined(VVV_PATCH_VERSION) VVV_PATCH_VERSION= ${PORTVERSION} @@ -277,7 +278,14 @@ ${WRKSRC}/contrib/gpg.rc @${REINPLACE_CMD} -e 's,pgp6,pgp,g' \ ${WRKSRC}/contrib/pgp6.rc - @${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \ + @${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.am pre-configure:: Index: mail/mutt/distinfo =================================================================== --- mail/mutt/distinfo +++ mail/mutt/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1489875322 -SHA256 (mutt/mutt-1.8.0.tar.gz) = 45841eda12804b460260adff8f3f39cc977744e832486a3c49e182eda967adab -SIZE (mutt/mutt-1.8.0.tar.gz) = 4116223 +TIMESTAMP = 1492629436 +SHA256 (mutt/mutt-1.8.2.tar.gz) = 1d057bf1b565f2c38ee50c9a661654cbbe4165f98e25bfa361ebbd707d96f235 +SIZE (mutt/mutt-1.8.2.tar.gz) = 4118429 SHA256 (mutt/patch-1.8.0.vvv.nntp.gz) = 1bd4b83708bb664749a34a188f01bc541cc7ab51628a163d87da119152ed00b9 SIZE (mutt/patch-1.8.0.vvv.nntp.gz) = 60675 SHA256 (mutt/patch-1.8.0.vvv.nntp_ru.gz) = ec9be57cdd516748f9ee7ee27b137d6ef7d3346258198940cb3d1eabb12d13ea @@ -9,8 +9,8 @@ SIZE (mutt/patch-1.5.1.dgc.deepif.1) = 767 SHA256 (mutt/patch-1.7.0.ats.date_conditional.1) = a7f65e0b6e59713582b3b0a1c3d3c0e54e5875f5dfe3bda285e51a5b6d96e14e SIZE (mutt/patch-1.7.0.ats.date_conditional.1) = 2415 -SHA256 (mutt/mutt-1.8.0.vc.greeting) = 95458c249a81bd61f087c0f82999ba2ad435f762cc5ee2b899fbfb102df117d5 -SIZE (mutt/mutt-1.8.0.vc.greeting) = 4499 +SHA256 (mutt/mutt-1.8.2.vc.greeting) = 73113eb0a3eb761755315ab03c0b6bcb316c09603461a1f8a3f54bd870a576cc +SIZE (mutt/mutt-1.8.2.vc.greeting) = 4499 SHA256 (mutt/patch-1.8.0.vvv.initials.gz) = 98c667c86028691ee0e9a8022977a7ba16972854c1f2fd87f83899c30598fedd SIZE (mutt/patch-1.8.0.vvv.initials.gz) = 686 SHA256 (mutt/patch-1.8.0.vvv.quote.gz) = 18d50110ab38a4338284691e081aa06b1b52301eca49633d2c7639b46acf7e2c Index: mail/mutt/files/extra-patch-aspell =================================================================== --- mail/mutt/files/extra-patch-aspell +++ mail/mutt/files/extra-patch-aspell @@ -1,8 +1,8 @@ ---- doc/Muttrc.head.orig Thu Jan 24 13:10:47 2002 -+++ doc/Muttrc.head Tue Nov 9 08:53:14 2004 -@@ -19,6 +19,8 @@ - macro index "!less @docdir@/manual.txt\n" "Show Mutt documentation" - macro pager "!less @docdir@/manual.txt\n" "Show Mutt documentation" +--- doc/Muttrc.head.orig 2017-04-12 23:01:06 UTC ++++ doc/Muttrc.head +@@ -34,6 +34,8 @@ bind browser y exit + # close-hook '\.gz$' "gzip -c '%t' > '%f'" + # append-hook '\.gz$' "gzip -c '%t' >> '%f'" +set ispell="/usr/local/bin/aspell --mode=email check" + Index: mail/mutt/files/extra-patch-forcebase64 =================================================================== --- mail/mutt/files/extra-patch-forcebase64 +++ mail/mutt/files/extra-patch-forcebase64 @@ -1,6 +1,6 @@ ---- mutt-1.5.24/init.h.orig 2016-03-31 22:09:51.864031000 +0200 -+++ mutt-1.5.24/init.h 2016-03-31 22:12:01.242952000 +0200 -@@ -838,6 +838,11 @@ +--- init.h.orig 2017-04-12 23:01:17 UTC ++++ init.h +@@ -871,6 +871,11 @@ struct option_t MuttVars[] = { ** sent to both the list and your address, resulting in two copies ** of the same email for you. */ @@ -12,19 +12,19 @@ { "force_name", DT_BOOL, R_NONE, OPTFORCENAME, 0 }, /* ** .pp ---- mutt-1.5.24-orig/mutt.h 2015-08-30 19:06:38.000000000 +0200 -+++ mutt-1.5.24/mutt.h 2016-02-09 13:48:24.758051324 +0100 -@@ -339,6 +339,7 @@ enum - OPTFASTREPLY, +--- mutt.h.orig 2017-04-12 23:01:17 UTC ++++ mutt.h +@@ -355,6 +355,7 @@ enum OPTFCCCLEAR, + OPTFLAGSAFE, OPTFOLLOWUPTO, + OPTFORCEBASE64, OPTFORCENAME, OPTFORWDECODE, OPTFORWQUOTE, ---- mutt-1.5.24-orig/sendlib.c 2015-08-30 19:06:38.000000000 +0200 -+++ mutt-1.5.24/sendlib.c 2016-02-09 13:48:24.759051309 +0100 -@@ -1168,7 +1168,9 @@ static void mutt_set_encoding (BODY *b, +--- sendlib.c.orig 2017-04-12 23:01:08 UTC ++++ sendlib.c +@@ -1171,7 +1171,9 @@ static void mutt_set_encoding (BODY *b, if (b->type == TYPETEXT) { char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b); Index: mail/mutt/files/extra-patch-forcebase64-nntp =================================================================== --- mail/mutt/files/extra-patch-forcebase64-nntp +++ mail/mutt/files/extra-patch-forcebase64-nntp @@ -1,6 +1,6 @@ ---- mutt/init.h.orig 2016-04-09 11:37:12.650818818 +0200 -+++ mutt/init.h 2016-04-09 11:57:47.378726695 +0200 -@@ -873,6 +873,11 @@ +--- init.h.orig 2017-04-14 01:20:27 UTC ++++ init.h +@@ -903,6 +903,11 @@ struct option_t MuttVars[] = { ** message via mail. */ #endif @@ -12,19 +12,19 @@ { "force_name", DT_BOOL, R_NONE, OPTFORCENAME, 0 }, /* ** .pp ---- mutt-1.5.24-orig/mutt.h 2015-08-30 19:06:38.000000000 +0200 -+++ mutt-1.5.24/mutt.h 2016-02-09 13:48:24.758051324 +0100 -@@ -339,6 +339,7 @@ enum - OPTFASTREPLY, +--- mutt.h.orig 2017-04-14 01:20:27 UTC ++++ mutt.h +@@ -368,6 +368,7 @@ enum OPTFCCCLEAR, + OPTFLAGSAFE, OPTFOLLOWUPTO, + OPTFORCEBASE64, OPTFORCENAME, OPTFORWDECODE, OPTFORWQUOTE, ---- mutt-1.5.24-orig/sendlib.c 2015-08-30 19:06:38.000000000 +0200 -+++ mutt-1.5.24/sendlib.c 2016-02-09 13:48:24.759051309 +0100 -@@ -1168,7 +1168,9 @@ static void mutt_set_encoding (BODY *b, +--- sendlib.c.orig 2017-04-14 01:20:27 UTC ++++ sendlib.c +@@ -1175,7 +1175,9 @@ static void mutt_set_encoding (BODY *b, if (b->type == TYPETEXT) { char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b); Index: mail/mutt/files/extra-patch-ifdef =================================================================== --- mail/mutt/files/extra-patch-ifdef +++ mail/mutt/files/extra-patch-ifdef @@ -1,7 +1,11 @@ ---- mutt-1.5.4.orig/init.c 2003-03-04 08:49:48.000000000 +0100 -+++ mutt-1.5.4/init.c 2003-07-22 20:14:47.000000000 +0200 -@@ -349,6 +349,52 @@ static void remove_from_list (LIST **l, - } +--- PATCHES.orig 2017-04-12 23:01:05 UTC ++++ PATCHES +@@ -0,0 +1 @@ ++patch-1.5.4.cd.ifdef.1 +--- init.c.orig 2017-04-12 23:01:17 UTC ++++ init.c +@@ -656,6 +656,52 @@ static mbchar_table *parse_mbchar_table + return t; } +static int parse_ifdef (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err) @@ -53,10 +57,9 @@ static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) { do -diff -pruN mutt-1.5.4.orig/init.h mutt-1.5.4/init.h ---- mutt-1.5.4.orig/init.h.orig 2009-06-22 15:48:16.000000000 +0200 -+++ mutt-1.5.4/init.h 2009-06-22 15:49:28.000000000 +0200 -@@ -3658,6 +3658,7 @@ +--- init.h.orig 2017-04-12 23:01:17 UTC ++++ init.h +@@ -3889,6 +3889,7 @@ static int parse_lists (BUFFER *, BUFFER static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *); @@ -64,7 +67,7 @@ static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *); -@@ -3715,6 +3716,7 @@ +@@ -3951,6 +3952,7 @@ const struct command_t Commands[] = { { "hdr_order", parse_list, UL &HeaderOrderList }, #ifdef HAVE_ICONV { "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK }, @@ -72,8 +75,3 @@ #endif { "ignore", parse_ignore, 0 }, { "lists", parse_lists, 0 }, -diff -pruN mutt-1.5.4.orig/PATCHES mutt-1.5.4/PATCHES ---- mutt-1.5.4.orig/PATCHES 2003-03-19 22:33:37.000000000 +0100 -+++ mutt-1.5.4/PATCHES 2003-07-22 20:14:47.000000000 +0200 -@@ -0,0 +1 @@ -+patch-1.5.4.cd.ifdef.1 Index: mail/mutt/files/extra-patch-reverse_reply =================================================================== --- mail/mutt/files/extra-patch-reverse_reply +++ mail/mutt/files/extra-patch-reverse_reply @@ -1,13 +1,12 @@ -diff -u PATCHES PATCHES ---- PATCHES +--- PATCHES.orig 2017-04-12 23:01:05 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.6.cb.reverse_reply.2 ---- init.h.orig 2005-03-01 16:56:02.000000000 +0100 -+++ init.h 2005-05-25 18:20:57.000000000 +0200 -@@ -2257,6 +2257,13 @@ - ** possibly including eventual real names. When it is unset, mutt will - ** override any such real names with the setting of the $realname variable. +--- init.h.orig 2017-04-12 23:01:17 UTC ++++ init.h +@@ -2575,6 +2575,13 @@ struct option_t MuttVars[] = { + ** possibly including eventual real names. When it is \fIunset\fP, mutt will + ** override any such real names with the setting of the $$realname variable. */ + { "reverse_reply", DT_BOOL, R_NONE, OPTREVREPLY, 0 }, + /* @@ -19,9 +18,9 @@ { "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 }, /* ** .pp ---- mutt.h.orig 2005-02-28 16:13:57.000000000 +0100 -+++ mutt.h 2005-05-25 18:20:57.000000000 +0200 -@@ -410,6 +410,7 @@ +--- mutt.h.orig 2017-04-12 23:01:17 UTC ++++ mutt.h +@@ -438,6 +438,7 @@ enum OPTREVALIAS, OPTREVNAME, OPTREVREAL, @@ -29,19 +28,19 @@ OPTRFC2047PARAMS, OPTSAVEADDRESS, OPTSAVEEMPTY, ---- protos.h.orig Wed Jul 12 01:32:28 2006 -+++ protos.h Mon Jul 17 16:14:16 2006 -@@ -92,6 +92,7 @@ +--- protos.h.orig 2017-04-12 23:01:17 UTC ++++ protos.h +@@ -93,6 +93,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, c ADDRESS *mutt_lookup_alias (const char *s); ADDRESS *mutt_remove_duplicates (ADDRESS *); ADDRESS *mutt_remove_xrefs (ADDRESS *, ADDRESS *); +ADDRESS *mutt_reverse_address (ADDRESS *); ADDRESS *mutt_expand_aliases (ADDRESS *); ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *); - ---- send.c.orig 2005-02-03 19:47:53.000000000 +0100 -+++ send.c 2005-05-25 18:20:57.000000000 +0200 -@@ -588,6 +588,10 @@ + +--- send.c.orig 2017-04-12 23:01:07 UTC ++++ send.c +@@ -585,6 +585,10 @@ void mutt_fix_reply_recipients (ENVELOPE /* the CC field can get cluttered, especially with lists */ env->to = mutt_remove_duplicates (env->to); env->cc = mutt_remove_duplicates (env->cc); @@ -50,11 +49,11 @@ + env->cc = mutt_reverse_address (env->cc); + } env->cc = mutt_remove_xrefs (env->to, env->cc); - } - ---- sendlib.c.orig 2005-02-21 05:45:57.000000000 +0100 -+++ sendlib.c 2005-05-25 18:20:57.000000000 +0200 -@@ -2341,6 +2341,35 @@ + + if (env->cc && !env->to) +--- sendlib.c.orig 2017-04-12 23:01:08 UTC ++++ sendlib.c +@@ -2714,6 +2714,35 @@ static void set_noconv_flags (BODY *b, s } } Index: mail/mutt/files/patch-contrib_Makefile.am =================================================================== --- mail/mutt/files/patch-contrib_Makefile.am +++ mail/mutt/files/patch-contrib_Makefile.am @@ -1,4 +1,4 @@ ---- contrib/Makefile.am.orig 2016-10-08 19:30:21 UTC +--- contrib/Makefile.am.orig 2017-04-12 23:01:05 UTC +++ contrib/Makefile.am @@ -2,7 +2,7 @@ @@ -7,5 +7,5 @@ -SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \ +SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \ sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \ - sample.vimrc-sidebar colors.default colors.linux smime.rc \ + sample.muttrc-compress sample.vimrc-sidebar colors.default colors.linux smime.rc \ ca-bundle.crt smime_keys_test.pl mutt_xtitle Index: mail/mutt/files/patch-examples =================================================================== --- mail/mutt/files/patch-examples +++ /dev/null @@ -1,94 +0,0 @@ ---- INSTALL.orig 2016-10-08 19:30:21 UTC -+++ INSTALL -@@ -228,13 +228,13 @@ If you decide to use your system's iconv - need to tell mutt about implementation-defined names for some - character sets. Sample configuration files for various systems can - be found in the directory contrib/iconv/ in this source --distribution, and will be installed in the samples/iconv directory -+distribution, and will be installed in the share/examples/mutt/iconv directory - as part of mutt's documentation. - - In order to use these sample configuration files, just put a line - like - -- source /usr/local/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc -+ source /usr/local/share/examples/mutt/iconv/iconv.osf1-4.0d.rc - - into your system's global Muttrc, which normally resides in /etc or - /usr/local/etc. ---- contrib/Makefile.am.orig 2016-10-08 19:30:21 UTC -+++ contrib/Makefile.am -@@ -1,6 +1,7 @@ - # $Id$ - - subdir = contrib -+samplesdir = @samplesdir@ - - SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \ - sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \ -@@ -14,12 +15,12 @@ EXTRA_DIST = language.txt language50.txt - iconv/make.sh - - install-data-local: -- $(MKDIR_P) $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv -+ $(MKDIR_P) $(DESTDIR)$(samplesdir) $(DESTDIR)$(samplesdir)/iconv - for f in $(SAMPLES) ; do \ -- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ; \ -+ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir) ; \ - done - for f in $(srcdir)/iconv/*.rc ; do \ -- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv ; \ -+ $(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv ; \ - done - - uninstall-local: ---- doc/manual.txt.orig 2016-10-08 19:55:06 UTC -+++ doc/manual.txt -@@ -8073,8 +8073,8 @@ set imap_authenticators="gssapi:cram-md5 - - For examples on how to configure these formats for the various versions - of PGP which are floating around, see the pgp and gpg sample -- configuration files in the samples/ subdirectory which has been -- installed on your system alongside the documentation. (PGP only) -+ configuration files in the share/examples/mutt/ subdirectory which has -+ been installed on your system alongside the documentation. (PGP only) - - 3.166. pgp_decrypt_command - -@@ -9332,8 +9332,8 @@ set sidebar_delim_chars='.' - or "-CAfile [1766]$$ssmmiimmee__ccaa__llooccaattiioonn". - - For examples on how to configure these formats, see the smime.rc in the -- samples/ subdirectory which has been installed on your system alongside -- the documentation. (S/MIME only) -+ share/examples/mutt/ subdirectory which has been installed on your system -+ alongside the documentation. (S/MIME only) - - 3.271. smime_decrypt_use_default_key - ---- init.h.orig 2016-10-08 19:35:50 UTC -+++ init.h -@@ -1814,9 +1814,8 @@ struct option_t MuttVars[] = { - ** .pp - ** For examples on how to configure these formats for the various versions - ** of PGP which are floating around, see the pgp and gpg sample configuration files in -- ** the \fCsamples/\fP subdirectory which has been installed on your system -- ** alongside the documentation. -- ** (PGP only) -+ ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on -+ ** your system. (PGP only) - */ - { "pgp_decrypt_command", DT_STR, R_NONE, UL &PgpDecryptCommand, 0}, - /* -@@ -2942,9 +2941,8 @@ struct option_t MuttVars[] = { - ** .de - ** .pp - ** For examples on how to configure these formats, see the \fCsmime.rc\fP in -- ** the \fCsamples/\fP subdirectory which has been installed on your system -- ** alongside the documentation. -- ** (S/MIME only) -+ ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on -+ ** your system. (S/MIME only) - */ - { "smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1 }, - /* Index: mail/mutt/files/patch-smime-sender =================================================================== --- mail/mutt/files/patch-smime-sender +++ mail/mutt/files/patch-smime-sender @@ -1,4 +1,4 @@ ---- commands.c.orig 2016-10-08 19:30:21 UTC +--- commands.c.orig 2017-04-12 23:01:17 UTC +++ commands.c @@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur) { @@ -9,7 +9,7 @@ mutt_message ( _("S/MIME signature successfully verified.")); else mutt_error ( _("S/MIME certificate owner does not match sender.")); ---- contrib/smime.rc.orig 2016-10-08 19:30:21 UTC +--- contrib/smime.rc.orig 2017-04-12 23:01:05 UTC +++ contrib/smime.rc @@ -8,7 +8,10 @@ set smime_is_default @@ -23,10 +23,10 @@ # Passphrase expiration set smime_timeout=300 ---- init.h.orig 2016-10-08 19:35:50 UTC +--- init.h.orig 2017-04-12 23:01:17 UTC +++ init.h -@@ -2946,6 +2946,15 @@ struct option_t MuttVars[] = { - ** alongside the documentation. +@@ -2980,6 +2980,15 @@ struct option_t MuttVars[] = { + ** to determine the key to use. It will ask you to supply a key, if it can't find one. ** (S/MIME only) */ + { "smime_dont_check_sender", DT_BOOL, R_NONE, OPTSMIMENOSENDER, 0 }, @@ -38,12 +38,12 @@ + ** longer needs email-addresses as part of the certificates. + ** It is not set by default. + */ - { "smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1 }, + { "smime_sign_as", DT_SYN, R_NONE, UL "smime_default_key", 0 }, + { "smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0 }, /* - ** .pp ---- mutt.h.orig 2016-10-08 19:30:21 UTC +--- mutt.h.orig 2017-04-12 23:01:17 UTC +++ mutt.h -@@ -486,6 +486,7 @@ enum +@@ -499,6 +499,7 @@ enum OPTCRYPTTIMESTAMP, OPTSMIMEISDEFAULT, OPTASKCERTLABEL,