Date: Sat, 9 Apr 2016 17:02:24 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412853 - in head/mail/mutt: . files Message-ID: <201604091702.u39H2Ohv036910@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Sat Apr 9 17:02:24 2016 New Revision: 412853 URL: https://svnweb.freebsd.org/changeset/ports/412853 Log: mail/mutt: 1.5.24 -> 1.6.0 Changes: - http://www.mutt.org/doc/UPDATING - added base64 option PR: 208641, 208054 Submitted by: Udo.Schweigert@siemens.com (maintainer), ports@bsdserwis.com Added: head/mail/mutt/files/extra-patch-forcebase64 (contents, props changed) head/mail/mutt/files/extra-patch-forcebase64-nntp (contents, props changed) Deleted: head/mail/mutt/files/extra-patch-signature-menu Modified: head/mail/mutt/Makefile head/mail/mutt/distinfo head/mail/mutt/files/extra-patch-sidebar head/mail/mutt/files/extra-patch-sidebar-nntp head/mail/mutt/files/extra-patch-trash-purge head/mail/mutt/files/patch-examples Modified: head/mail/mutt/Makefile ============================================================================== --- head/mail/mutt/Makefile Sat Apr 9 16:38:16 2016 (r412852) +++ head/mail/mutt/Makefile Sat Apr 9 17:02:24 2016 (r412853) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= mutt -PORTVERSION= 1.5.24 -PORTREVISION?= 6 +PORTVERSION= 1.6.0 +PORTREVISION?= 0 CATEGORIES+= mail ipv6 -MASTER_SITES= ftp://ftp.mutt.org/mutt/ \ +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/ \ @@ -55,13 +55,13 @@ USES+= ncurses OPTIONS_UNSET= NLS DOCS EXAMPLES .else OPTIONS_DEFINE= COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \ - GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \ + FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \ IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \ MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH \ MIXMASTER NLS NNTP PARENT_CHILD_MATCH_PATCH \ QUOTE_PATCH REVERSE_REPLY_PATCH SIDEBAR_PATCH \ - SIGNATURE_MENU SMART_DATE SMIME_OUTLOOK_COMPAT SMTP \ - TOKYOCABINET TRASH_PATCH URLVIEW XML + SMART_DATE SMIME_OUTLOOK_COMPAT SMTP TOKYOCABINET \ + TRASH_PATCH URLVIEW XML OPTIONS_SINGLE= GSSAPI SCREEN OPTIONS_RADIO= SPELL @@ -73,6 +73,7 @@ COMPRESSED_FOLDERS_DESC= Compressed fold 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 @@ -82,7 +83,6 @@ LOCALES_FIX_DESC= Locales fix MAILBOX_MANPAGES_DESC= Install mbox.5/mmdf.5 manpages MAILDIR_HEADER_CACHE_DESC= Maildir header cache MAILDIR_MTIME_PATCH_DESC= Maildir mtime patch -MBOX_HOOK_PATCH_DESC= Enhanced mbox-hook MIXMASTER_DESC= Mixmaster support NCURSES_DESC= Ncurses support NLS_DESC= Native language support @@ -90,7 +90,6 @@ PARENT_CHILD_MATCH_PATCH_DESC= Parent/ch QUOTE_PATCH_DESC= Extended quoting REVERSE_REPLY_PATCH_DESC= Reverse_reply SIDEBAR_PATCH_DESC= Sidebar support -SIGNATURE_MENU_DESC= Signature menu SLANG_DESC= SLANG support SMART_DATE_DESC= Dynamic date formatting with "%@" SMIME_OUTLOOK_COMPAT_DESC= SMIME outlook compatibility @@ -205,17 +204,9 @@ SIDEBAR_PATCH_VARS= XML_NEEDED=yes DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref -SIGNATURE_MENU_IGNORE= SIGNATURE_MENU does not work at the moment -SIGNATURE_MENU_VARS= XML_NEEDED=yes -SIGNATURE_MENU_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-signature-menu - -MBOX_HOOK_PATCH_IGNORE= MBOX_HOOK_PATCH does not work at the moment -MBOX_HOOK_PATCH_PATCHFILES= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw - .include <bsd.port.options.mk> DW_PATCH_VERSION= 1.5.6 -DW_MBOX_PATCH_VERSION= 1.5.18 .if !defined(VVV_PATCH_VERSION) VVV_PATCH_VERSION= ${PORTVERSION} .endif @@ -225,9 +216,6 @@ RR_PATCH_VERSION= ${PORTVERSION} .if !defined(DW_PATCH_VERSION) DW_PATCH_VERSION= ${PORTVERSION} .endif -.if !defined(DW_MBOX_PATCH_VERSION) -DW_MBOX_PATCH_VERSION= ${DW_PATCH_VERSION} -.endif # XXX # this should be done automagically by aclocal but .... @@ -268,6 +256,9 @@ post-patch-NNTP-on: .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH} @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp .endif +.if ${PORT_OPTIONS:MFORCEBASE64} + @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64-nntp +.endif post-patch-NNTP-off: .if ${PORT_OPTIONS:MSIDEBAR_PATCH} @@ -277,6 +268,9 @@ post-patch-NNTP-off: .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH} @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime .endif +.if ${PORT_OPTIONS:MFORCEBASE64} + @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64 +.endif post-install: ${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5 Modified: head/mail/mutt/distinfo ============================================================================== --- head/mail/mutt/distinfo Sat Apr 9 16:38:16 2016 (r412852) +++ head/mail/mutt/distinfo Sat Apr 9 17:02:24 2016 (r412853) @@ -1,12 +1,12 @@ -SHA256 (mutt/mutt-1.5.24.tar.gz) = a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 -SIZE (mutt/mutt-1.5.24.tar.gz) = 3897115 -SHA256 (mutt/patch-1.5.24.rr.compressed.gz) = c5eb9b53f7bd3feaa5ee03722575f64e43512b756c099ffe20db6fe5c958e3dc -SIZE (mutt/patch-1.5.24.rr.compressed.gz) = 10019 -SHA256 (mutt/patch-1.5.24.vvv.nntp.gz) = d34be4542d549aab6de9f7038c88b3eeefe826db643c92b27e1e65ab5f7d573e -SIZE (mutt/patch-1.5.24.vvv.nntp.gz) = 61359 -SHA256 (mutt/patch-1.5.24.vvv.nntp_ru.gz) = 70436af316aefd0d31aa33e127df49da4bdd1b4a8b3fbec73b3fca5428f3ab0e -SIZE (mutt/patch-1.5.24.vvv.nntp_ru.gz) = 5719 -SHA256 (mutt/patch-1.5.24.vvv.initials.gz) = 6522d12d34c0be71531465e05010413a0f2907d597e9fb5100a65d18093f0599 -SIZE (mutt/patch-1.5.24.vvv.initials.gz) = 671 -SHA256 (mutt/patch-1.5.24.vvv.quote.gz) = fa161302179bbc646a83d7029381f828bece5b177e940f2fca6d5769633b9f0a -SIZE (mutt/patch-1.5.24.vvv.quote.gz) = 1254 +SHA256 (mutt/mutt-1.6.0.tar.gz) = 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19 +SIZE (mutt/mutt-1.6.0.tar.gz) = 3954591 +SHA256 (mutt/patch-1.6.0.rr.compressed.gz) = c57ad6b19b2dbd812c27a098273b68b2d3b45ce2d36c3a4bff3493ad2cb75b85 +SIZE (mutt/patch-1.6.0.rr.compressed.gz) = 9977 +SHA256 (mutt/patch-1.6.0.vvv.nntp.gz) = 6a69429c2942f438d5c22cfc3f97564bbbf689b2ea482d440692048bd92f5355 +SIZE (mutt/patch-1.6.0.vvv.nntp.gz) = 61343 +SHA256 (mutt/patch-1.6.0.vvv.nntp_ru.gz) = 06f1932626a88a824f514356edf97c031a28f5d0b756353244d483285ab29c4e +SIZE (mutt/patch-1.6.0.vvv.nntp_ru.gz) = 5729 +SHA256 (mutt/patch-1.6.0.vvv.initials.gz) = f1923f35cd5a400930d6aa6a60f213bf7b8b0f65e6a0d856e7ef23914e822f4d +SIZE (mutt/patch-1.6.0.vvv.initials.gz) = 668 +SHA256 (mutt/patch-1.6.0.vvv.quote.gz) = 362b9462b2e45de36c962450e9b6715e7f4c00fb5dce4c041fd6c675fbb73814 +SIZE (mutt/patch-1.6.0.vvv.quote.gz) = 1252 Added: head/mail/mutt/files/extra-patch-forcebase64 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/mutt/files/extra-patch-forcebase64 Sat Apr 9 17:02:24 2016 (r412853) @@ -0,0 +1,37 @@ +--- 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 @@ + ** sent to both the list and your address, resulting in two copies + ** of the same email for you. + */ ++ { "force_base64", DT_BOOL, R_NONE, OPTFORCEBASE64, 0 }, ++ /* ++ ** .pp ++ ** If you need to encode all text parts to base64, set this option. ++ */ + { "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, + OPTFCCCLEAR, + 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, + 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; Added: head/mail/mutt/files/extra-patch-forcebase64-nntp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/mutt/files/extra-patch-forcebase64-nntp Sat Apr 9 17:02:24 2016 (r412853) @@ -0,0 +1,37 @@ +--- 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 @@ + ** message via mail. + */ + #endif ++ { "force_base64", DT_BOOL, R_NONE, OPTFORCEBASE64, 0 }, ++ /* ++ ** .pp ++ ** If you need to encode all text parts to base64, set this option. ++ */ + { "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, + OPTFCCCLEAR, + 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, + 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; Modified: head/mail/mutt/files/extra-patch-sidebar ============================================================================== --- head/mail/mutt/files/extra-patch-sidebar Sat Apr 9 16:38:16 2016 (r412852) +++ head/mail/mutt/files/extra-patch-sidebar Sat Apr 9 17:02:24 2016 (r412853) @@ -999,85 +999,46 @@ Based on http://lunar-linux.org/~tchan/m mutt_index_menu (); if (Context) FREE (&Context); -*** mutt-1.5.24-orig/Makefile.am 2015-08-30 12:06:38.000000000 -0500 ---- mutt-1.5.24/Makefile.am 2015-09-16 23:18:13.000000000 -0500 -*************** -*** 33,38 **** ---- 33,39 ---- - rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ - score.c send.c sendlib.c signal.c sort.c \ - status.c system.c thread.c charset.c history.c lib.c \ -+ sidebar.c \ - muttlib.c editmsg.c mbyte.c \ - url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c - -*** mutt-1.5.24-orig/Makefile.in 2015-08-30 12:24:26.000000000 -0500 ---- mutt-1.5.24/Makefile.in 2015-09-16 23:18:13.000000000 -0500 -*************** -*** 83,92 **** - $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(srcdir)/config.h.in \ - $(top_srcdir)/intl/Makefile.in $(srcdir)/hcachever.sh.in \ -! $(srcdir)/muttbug.sh.in strtok_r.c strcasecmp.c regex.c \ -! snprintf.c wcscasecmp.c strcasestr.c setenv.c mkdtemp.c \ -! strsep.c strdup.c depcomp ABOUT-NLS ChangeLog INSTALL NEWS \ -! README TODO compile config.guess config.sub install-sh missing - EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) \ - pgpewrap$(EXEEXT) mutt_md5$(EXEEXT) - bin_PROGRAMS = mutt$(EXEEXT) $(DOTLOCK_TARGET) $(PGPAUX_TARGET) ---- 83,92 ---- - $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(srcdir)/config.h.in \ - $(top_srcdir)/intl/Makefile.in $(srcdir)/hcachever.sh.in \ -! $(srcdir)/muttbug.sh.in snprintf.c strtok_r.c regex.c strdup.c \ -! strcasecmp.c setenv.c strcasestr.c wcscasecmp.c mkdtemp.c \ -! strsep.c depcomp ABOUT-NLS ChangeLog INSTALL NEWS README TODO \ -! compile config.guess config.sub install-sh missing - EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) \ - pgpewrap$(EXEEXT) mutt_md5$(EXEEXT) - bin_PROGRAMS = mutt$(EXEEXT) $(DOTLOCK_TARGET) $(PGPAUX_TARGET) -*************** -*** 128,136 **** - score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \ - signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \ - system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \ -! history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \ -! editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \ -! ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT) - am__objects_1 = - am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \ - $(am__objects_1) ---- 128,137 ---- - score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \ - signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \ - system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \ -! history.$(OBJEXT) lib.$(OBJEXT) sidebar.$(OBJEXT) \ -! muttlib.$(OBJEXT) editmsg.$(OBJEXT) mbyte.$(OBJEXT) \ -! url.$(OBJEXT) ascii.$(OBJEXT) crypt-mod.$(OBJEXT) \ -! safe_asprintf.$(OBJEXT) - am__objects_1 = - am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \ - $(am__objects_1) -*************** -*** 474,479 **** ---- 475,481 ---- - rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ - score.c send.c sendlib.c signal.c sort.c \ - status.c system.c thread.c charset.c history.c lib.c \ -+ sidebar.c \ - muttlib.c editmsg.c mbyte.c \ - url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c - -*************** -*** 804,809 **** ---- 806,812 ---- - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendlib.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@ -+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sidebar.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signal.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smime.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smtp.Po@am__quote@ +*** mutt-1.6.0-orig/Makefile.am.orig 2016-04-09 10:50:09.604018596 +0200 +--- mutt-1.6.0/Makefile.am 2016-04-09 10:51:03.718016605 +0200 +@@ -32,7 +32,7 @@ + main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \ + postpone.c query.c recvattach.c recvcmd.c \ + rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ +- score.c send.c sendlib.c signal.c sort.c \ ++ score.c send.c sendlib.c sidebar.c signal.c sort.c \ + status.c system.c thread.c charset.c history.c lib.c \ + muttlib.c editmsg.c mbyte.c mutt_idna.c \ + url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c + +*** mutt-1.6.0-orig/Makefile.in.orig 2016-04-09 10:50:09.495008024 +0200 +--- mutt-1.5.24/Makefile.in 2016-04-09 10:53:55.074988370 +0200 +@@ -134,7 +134,7 @@ + recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \ + rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \ + score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \ +- signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \ ++ sidebar.$(OBJEXT) signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \ + system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \ + history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \ + editmsg.$(OBJEXT) mbyte.$(OBJEXT) mutt_idna.$(OBJEXT) \ +@@ -489,7 +489,7 @@ + main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \ + postpone.c query.c recvattach.c recvcmd.c \ + rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ +- score.c send.c sendlib.c signal.c sort.c \ ++ score.c send.c sendlib.c sidebar.c signal.c sort.c \ + status.c system.c thread.c charset.c history.c lib.c \ + muttlib.c editmsg.c mbyte.c mutt_idna.c \ + url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c +@@ -820,6 +820,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendlib.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sidebar.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signal.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smime.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smtp.Po@am__quote@ *** mutt-1.5.24-orig/mbox.c 2015-08-30 12:06:38.000000000 -0500 --- mutt-1.5.24/mbox.c 2015-09-16 23:18:13.000000000 -0500 *************** Modified: head/mail/mutt/files/extra-patch-sidebar-nntp ============================================================================== --- head/mail/mutt/files/extra-patch-sidebar-nntp Sat Apr 9 16:38:16 2016 (r412852) +++ head/mail/mutt/files/extra-patch-sidebar-nntp Sat Apr 9 17:02:24 2016 (r412853) @@ -915,85 +915,45 @@ Based on http://lunar-linux.org/~tchan/m mutt_index_menu (); if (Context) FREE (&Context); -*** mutt-1.5.24-orig/Makefile.am 2015-08-30 12:06:38.000000000 -0500 ---- mutt-1.5.24/Makefile.am 2015-09-16 23:18:13.000000000 -0500 -*************** -*** 33,38 **** ---- 33,39 ---- - rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ - score.c send.c sendlib.c signal.c sort.c \ - status.c system.c thread.c charset.c history.c lib.c \ -+ sidebar.c \ - muttlib.c editmsg.c mbyte.c \ - url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c - -*** mutt-1.5.24-orig/Makefile.in 2015-08-30 12:24:26.000000000 -0500 ---- mutt-1.5.24/Makefile.in 2015-09-16 23:18:13.000000000 -0500 -*************** -*** 83,92 **** - $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(srcdir)/config.h.in \ - $(top_srcdir)/intl/Makefile.in $(srcdir)/hcachever.sh.in \ -! $(srcdir)/muttbug.sh.in strtok_r.c strcasecmp.c regex.c \ -! snprintf.c wcscasecmp.c strcasestr.c setenv.c mkdtemp.c \ -! strsep.c strdup.c depcomp ABOUT-NLS ChangeLog INSTALL NEWS \ -! README TODO compile config.guess config.sub install-sh missing - EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) \ - pgpewrap$(EXEEXT) mutt_md5$(EXEEXT) - bin_PROGRAMS = mutt$(EXEEXT) $(DOTLOCK_TARGET) $(PGPAUX_TARGET) ---- 83,92 ---- - $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(srcdir)/config.h.in \ - $(top_srcdir)/intl/Makefile.in $(srcdir)/hcachever.sh.in \ -! $(srcdir)/muttbug.sh.in snprintf.c strtok_r.c regex.c strdup.c \ -! strcasecmp.c setenv.c strcasestr.c wcscasecmp.c mkdtemp.c \ -! strsep.c depcomp ABOUT-NLS ChangeLog INSTALL NEWS README TODO \ -! compile config.guess config.sub install-sh missing - EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) \ - pgpewrap$(EXEEXT) mutt_md5$(EXEEXT) - bin_PROGRAMS = mutt$(EXEEXT) $(DOTLOCK_TARGET) $(PGPAUX_TARGET) -*************** -*** 128,136 **** - score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \ - signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \ - system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \ -! history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \ -! editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \ -! ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT) - am__objects_1 = - am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \ - $(am__objects_1) ---- 128,137 ---- - score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \ - signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \ - system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \ -! history.$(OBJEXT) lib.$(OBJEXT) sidebar.$(OBJEXT) \ -! muttlib.$(OBJEXT) editmsg.$(OBJEXT) mbyte.$(OBJEXT) \ -! url.$(OBJEXT) ascii.$(OBJEXT) crypt-mod.$(OBJEXT) \ -! safe_asprintf.$(OBJEXT) - am__objects_1 = - am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \ - $(am__objects_1) -*************** -*** 474,479 **** ---- 475,481 ---- - rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ - score.c send.c sendlib.c signal.c sort.c \ - status.c system.c thread.c charset.c history.c lib.c \ -+ sidebar.c \ - muttlib.c editmsg.c mbyte.c \ - url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c - -*************** -*** 804,809 **** ---- 806,812 ---- - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendlib.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@ -+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sidebar.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signal.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smime.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smtp.Po@am__quote@ +*** mutt-1.6.0-orig/Makefile.am.orig 2016-04-09 10:50:09.604018596 +0200 +--- mutt-1.6.0/Makefile.am 2016-04-09 10:51:03.718016605 +0200 +@@ -32,7 +32,7 @@ + main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \ + postpone.c query.c recvattach.c recvcmd.c \ + rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ +- score.c send.c sendlib.c signal.c sort.c \ ++ score.c send.c sendlib.c sidebar.c signal.c sort.c \ + status.c system.c thread.c charset.c history.c lib.c \ + muttlib.c editmsg.c mbyte.c mutt_idna.c \ + url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c +*** mutt-1.6.0-orig/Makefile.in.orig 2016-04-09 10:50:09.495008024 +0200 +--- mutt-1.6.0/Makefile.in 2016-04-09 10:53:55.074988370 +0200 +@@ -134,7 +134,7 @@ + recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \ + rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \ + score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \ +- signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \ ++ sidebar.$(OBJEXT) signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \ + system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \ + history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \ + editmsg.$(OBJEXT) mbyte.$(OBJEXT) mutt_idna.$(OBJEXT) \ +@@ -489,7 +489,7 @@ + main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \ + postpone.c query.c recvattach.c recvcmd.c \ + rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ +- score.c send.c sendlib.c signal.c sort.c \ ++ score.c send.c sendlib.c sidebar.c signal.c sort.c \ + status.c system.c thread.c charset.c history.c lib.c \ + muttlib.c editmsg.c mbyte.c mutt_idna.c \ + url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c +@@ -820,6 +820,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendlib.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sidebar.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signal.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smime.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smtp.Po@am__quote@ *** mutt-1.5.24-orig/mbox.c 2015-08-30 12:06:38.000000000 -0500 --- mutt-1.5.24/mbox.c 2015-09-16 23:18:13.000000000 -0500 *************** Modified: head/mail/mutt/files/extra-patch-trash-purge ============================================================================== --- head/mail/mutt/files/extra-patch-trash-purge Sat Apr 9 16:38:16 2016 (r412852) +++ head/mail/mutt/files/extra-patch-trash-purge Sat Apr 9 17:02:24 2016 (r412853) @@ -336,22 +336,6 @@ diff -pruN -x'*.orig' mutt-1.5.20/mx.c m diff -pruN -x'*.orig' mutt-1.5.20/pager.c mutt-1.5.20-trash/pager.c --- mutt-1.5.20/pager.c 2009-06-03 16:48:31.000000000 -0400 +++ mutt-1.5.20-trash/pager.c 2009-07-23 09:44:40.000000000 -0400 -@@ -2309,12 +2309,15 @@ search_next: - MAYBE_REDRAW (redraw); - break; - -+ case OP_PURGE_MESSAGE: - case OP_DELETE: - CHECK_MODE(IsHeader (extra)); - CHECK_READONLY; - CHECK_ACL(M_ACL_DELETE, _("delete message")); - - mutt_set_flag (Context, extra->hdr, M_DELETE, 1); -+ mutt_set_flag (Context, extra->hdr, M_PURGED, -+ ch != OP_PURGE_MESSAGE ? 0 : 1); - if (option (OPTDELETEUNTAG)) - mutt_set_flag (Context, extra->hdr, M_TAG, 0); - redraw = REDRAW_STATUS | REDRAW_INDEX; @@ -2641,6 +2644,7 @@ search_next: CHECK_ACL(M_ACL_DELETE, _("undelete message")); Modified: head/mail/mutt/files/patch-examples ============================================================================== --- head/mail/mutt/files/patch-examples Sat Apr 9 16:38:16 2016 (r412852) +++ head/mail/mutt/files/patch-examples Sat Apr 9 17:02:24 2016 (r412853) @@ -70,17 +70,6 @@ /usr/local/etc. --- doc/manual.txt.orig 2015-08-30 19:25:51.000000000 +0200 +++ doc/manual.txt 2015-09-10 08:56:32.000000000 +0200 -@@ -3128,8 +3128,8 @@ - argument. - - A practical example is the mutt_xtitle script installed in the samples -- subdirectory of the Mutt documentation: it can be used as filter for -- $$ssttaattuuss__ffoorrmmaatt to set the current terminal's title, if supported. -+ share/examples/mutt subdirectory of the Mutt documentation: it can be used as -+ filter for $$ssttaattuuss__ffoorrmmaatt to set the current terminal's title, if supported. - - 29.4. Padding - @@ -7736,8 +7736,8 @@ For examples on how to configure these formats for the various versions
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604091702.u39H2Ohv036910>