Attachment 169120 Details for Bug 208641 – patch for 1.6.0 with sidebar and some cleanup

[patch] patch for 1.6.0 with sidebar and some cleanup

mutt.diff (text/plain), 44.46 KB, created by Udo.Schweigert on 2016-04-09 11:22:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Udo.Schweigert

Created: 2016-04-09 11:22:53 UTC

Size: 44.46 KB

patch

obsolete

>diff -ru  /usr/ports-current/mail/mutt/Makefile ./Makefile
>--- /usr/ports-current/mail/mutt/Makefile	2016-04-09 11:40:47.000000000 +0200
>+++ ./Makefile	2016-04-09 12:24:34.000000000 +0200
>@@ -2,10 +2,10 @@
> # $FreeBSD: head/mail/mutt/Makefile 412348 2016-04-01 14:16:16Z mat $
> 
> 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 @@
> 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 @@
> 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 @@
> 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 @@
> 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 @@
> 
> 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 @@
> .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 @@
> .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 @@
> .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
>diff -ru  /usr/ports-current/mail/mutt/distinfo ./distinfo
>--- /usr/ports-current/mail/mutt/distinfo	2015-11-21 17:44:58.000000000 +0100
>+++ ./distinfo	2016-04-09 11:06:05.047437000 +0200
>@@ -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
>diff -ru  /usr/ports-current/mail/mutt/files/extra-patch-forcebase64 ./files/extra-patch-forcebase64
>--- /usr/ports-current/mail/mutt/files/extra-patch-forcebase64	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/extra-patch-forcebase64	2016-03-31 22:14:30.576295000 +0200
>@@ -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;
>diff -ru  /usr/ports-current/mail/mutt/files/extra-patch-forcebase64-nntp ./files/extra-patch-forcebase64-nntp
>--- /usr/ports-current/mail/mutt/files/extra-patch-forcebase64-nntp	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/extra-patch-forcebase64-nntp	2016-04-09 11:06:05.047437000 +0200
>@@ -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;
>diff -ru  /usr/ports-current/mail/mutt/files/extra-patch-sidebar ./files/extra-patch-sidebar
>--- /usr/ports-current/mail/mutt/files/extra-patch-sidebar	2016-03-14 08:14:08.000000000 +0100
>+++ ./files/extra-patch-sidebar	2016-04-09 11:06:05.047437000 +0200
>@@ -999,85 +999,46 @@
>         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
> ***************
>diff -ru  /usr/ports-current/mail/mutt/files/extra-patch-sidebar-nntp ./files/extra-patch-sidebar-nntp
>--- /usr/ports-current/mail/mutt/files/extra-patch-sidebar-nntp	2016-03-14 08:14:08.000000000 +0100
>+++ ./files/extra-patch-sidebar-nntp	2016-04-09 11:06:05.047437000 +0200
>@@ -915,85 +915,45 @@
>         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
> ***************
>diff -ru  /usr/ports-current/mail/mutt/files/extra-patch-signature-menu ./files/extra-patch-signature-menu
>--- /usr/ports-current/mail/mutt/files/extra-patch-signature-menu	2014-09-11 12:28:45.000000000 +0200
>+++ ./files/extra-patch-signature-menu	1970-01-01 01:00:00.000000000 +0100
>@@ -1,729 +0,0 @@
>---- mutt-1.5.11/PATCHES Dec 2002 17:44:54 -0000	3.6
>-+++ mutt-1.5.11/PATCHES Feb 2004 13:19:42 -0000
>-@@ -0,0 +1 @@
>-+patch-1.5.11.cd.signatures_menu.2.1
>---- mutt-1.5.11/Makefile.am.orig	Thu Aug 11 23:27:28 2005
>-+++ mutt-1.5.11/Makefile.am	Sat Mar 11 21:47:55 2006
>-@@ -25,7 +25,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 \
>--	score.c send.c sendlib.c signal.c sort.c \
>-+	score.c send.c sendlib.c signal.c signature.c sort.c \
>- 	status.c system.c thread.c charset.c history.c lib.c \
>- 	muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \
>- 	url.c ascii.c mutt_idna.c crypt-mod.c crypt-mod.h
>---- mutt-1.5.12/Makefile.in.orig	Mon Jul 17 16:29:15 2006
>-+++ mutt-1.5.12/Makefile.in	Mon Jul 17 16:30:26 2006
>-@@ -90,7 +90,7 @@
>- 	query.$(OBJEXT) recvattach.$(OBJEXT) recvcmd.$(OBJEXT) \
>- 	rfc822.$(OBJEXT) rfc1524.$(OBJEXT) rfc2047.$(OBJEXT) \
>- 	rfc2231.$(OBJEXT) score.$(OBJEXT) send.$(OBJEXT) \
>--	sendlib.$(OBJEXT) signal.$(OBJEXT) sort.$(OBJEXT) \
>-+	sendlib.$(OBJEXT) signal.$(OBJEXT) signature.$(OBJEXT) sort.$(OBJEXT) \
>- 	status.$(OBJEXT) system.$(OBJEXT) thread.$(OBJEXT) \
>- 	charset.$(OBJEXT) history.$(OBJEXT) lib.$(OBJEXT) \
>- 	muttlib.$(OBJEXT) editmsg.$(OBJEXT) utf8.$(OBJEXT) \
>-@@ -309,7 +309,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 \
>--	score.c send.c sendlib.c signal.c sort.c \
>-+	score.c send.c sendlib.c signal.c signature.c sort.c \
>- 	status.c system.c thread.c charset.c history.c lib.c \
>- 	muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \
>- 	url.c ascii.c mutt_idna.c crypt-mod.c crypt-mod.h
>---- mutt-1.5.11/OPS.orig	Sun Jul 24 18:56:42 2005
>-+++ mutt-1.5.11/OPS	Sat Mar 11 21:47:55 2006
>-@@ -38,6 +38,7 @@
>- OP_COMPOSE_POSTPONE_MESSAGE "save this message to send later"
>- OP_COMPOSE_RENAME_FILE "rename/move an attached file"
>- OP_COMPOSE_SEND_MESSAGE "send the message"
>-+OP_COMPOSE_SIG "choose a signature"
>- OP_COMPOSE_TOGGLE_DISPOSITION "toggle disposition between inline/attachment"
>- OP_COMPOSE_TOGGLE_UNLINK "toggle whether to delete file after sending it"
>- OP_COMPOSE_UPDATE_ENCODING "update an attachment's encoding info"
>-@@ -131,6 +132,7 @@
>- OP_NEXT_ENTRY "move to the next entry"
>- OP_NEXT_LINE "scroll down one line"
>- OP_NEXT_PAGE "move to the next page"
>-+OP_NEXT_SIG "move to the next signature"
>- OP_PAGER_BOTTOM "jump to the bottom of the message"
>- OP_PAGER_HIDE_QUOTED "toggle display of quoted text"
>- OP_PAGER_SKIP_QUOTED "skip beyond quoted text"
>-@@ -139,10 +141,12 @@
>- OP_PREV_ENTRY "move to the previous entry"
>- OP_PREV_LINE "scroll up one line"
>- OP_PREV_PAGE "move to the previous page"
>-+OP_PREV_SIG "move to the previous signature"
>- OP_PRINT "print the current entry"
>- OP_QUERY "query external program for addresses"
>- OP_QUERY_APPEND "append new query results to current results"
>- OP_QUIT "save changes to mailbox and quit"
>-+OP_RANDOM_SIG "pick a signature at random"
>- OP_RECALL_MESSAGE "recall a postponed message"
>- OP_REDRAW "clear and redraw the screen"
>- OP_REFORMAT_WINCH "{internal}"
>-@@ -156,6 +160,7 @@
>- OP_SEARCH_OPPOSITE "search for next match in opposite direction"
>- OP_SEARCH_TOGGLE "toggle search pattern coloring"
>- OP_SHELL_ESCAPE "invoke a command in a subshell"
>-+OP_SIG_SEARCH "search signatures matching a pattern"
>- OP_SORT "sort messages"
>- OP_SORT_REVERSE "sort messages in reverse order"
>- OP_TAG "tag the current entry"
>---- mutt-1.5.11/compose.c.orig	Thu Aug 11 21:37:23 2005
>-+++ mutt-1.5.11/compose.c	Sat Mar 11 21:47:55 2006
>-@@ -1128,6 +1128,12 @@
>-         /* no send2hook, since this doesn't modify the message */
>- 	break;
>- 
>-+      case OP_COMPOSE_SIG:
>-+	mutt_signature(msg->content->filename);
>-+	MAYBE_REDRAW (menu->redraw);
>-+	mutt_update_encoding (msg->content);
>-+	break;
>-+
>-       case OP_PIPE:
>-       case OP_FILTER:
>-         CHECK_COUNT;
>---- mutt-1.5.12/doc/manual.xml.head.orig	Mon Jul 17 16:21:01 2006
>-+++ mutt-1.5.12/doc/manual.xml.head	Mon Jul 17 16:24:46 2006
>-@@ -999,6 +999,7 @@
>- <row><entry>c</entry><entry>edit-cc</entry><entry>edit the Cc field</entry></row>
>- <row><entry>b</entry><entry>edit-bcc</entry><entry>edit the Bcc field</entry></row>
>- <row><entry>y</entry><entry>send-message</entry><entry>send the message</entry></row>
>-+<row><entry>ESC s</entry><entry>signature-menu</entry><entry>select a signature and append it to your mail</entry></row>
>- <row><entry>s</entry><entry>edit-subject</entry><entry>edit the Subject</entry></row>
>- <row><entry>S</entry><entry>smime-menu</entry><entry>select S/MIME options</entry></row>
>- <row><entry>f</entry><entry>edit-fcc</entry><entry>specify an ``Fcc'' mailbox</entry></row>
>---- mutt-1.5.11/functions.h.orig	Sun Jul 24 18:56:42 2005
>-+++ mutt-1.5.11/functions.h	Sat Mar 11 21:48:05 2006
>-@@ -311,6 +311,7 @@
>-   { "view-attach",	OP_VIEW_ATTACH,			M_ENTER_S },
>-   { "send-message",	OP_COMPOSE_SEND_MESSAGE,	"y" },
>-   { "pipe-entry",	OP_PIPE,			"|" },
>-+  { "signature-menu",	OP_COMPOSE_SIG,			"\033s" },
>- 
>-   { "attach-key",	OP_COMPOSE_ATTACH_KEY,		"\033k" },
>-   { "pgp-menu",		OP_COMPOSE_PGP_MENU,		"p" 	},
>-@@ -368,6 +369,19 @@
>-   { "mail",		OP_MAIL,		"m" },
>-   { "query",		OP_QUERY,		"Q" },
>-   { "query-append",	OP_QUERY_APPEND,	"A" },
>-+  { NULL,		0,			NULL }
>-+};
>-+
>-+/* Signature Menu */
>-+struct binding_t OpSig[] = {
>-+  { "next-sig",		OP_NEXT_SIG,		"j" },
>-+  { "previous-sig",	OP_PREV_SIG,		"k" },
>-+  { "random-sig",	OP_RANDOM_SIG,		"r" },
>-+  { NULL,		0,			NULL }
>-+};
>-+
>-+struct binding_t OpSigDir[] = {
>-+  { "search-sig",	OP_SIG_SEARCH,		"/" },
>-   { NULL,		0,			NULL }
>- };
>- 
>---- mutt-1.5.11/globals.h.orig	Thu Sep 15 16:19:54 2005
>-+++ mutt-1.5.11/globals.h	Sat Mar 11 21:48:05 2006
>-@@ -109,6 +109,7 @@
>- WHERE char *Sendmail;
>- WHERE char *Shell;
>- WHERE char *Signature;
>-+WHERE char *SigDirectory;
>- WHERE char *SimpleSearch;
>- WHERE char *Spoolfile;
>- WHERE char *SpamSep;
>---- mutt-1.5.11/init.h.orig	Thu Sep 15 16:19:54 2005
>-+++ mutt-1.5.11/init.h	Sat Mar 11 21:48:05 2006
>-@@ -2457,6 +2457,14 @@
>-   ** assumed that filename is a shell command and input should be read from
>-   ** its stdout.
>-   */
>-+  { "signatures_directory",	DT_PATH, R_NONE, UL &SigDirectory, UL "" },
>-+  /*
>-+  ** .pp
>-+  ** Specifies the path where your signatures are located. In the files of
>-+  ** this directory, the signatures are separated by blank lines and/or
>-+  ** sig_dashes (``-- '').
>-+  ** You can choose between these signatures from the compose menu.
>-+  */
>-   { "simple_search",	DT_STR,	 R_NONE, UL &SimpleSearch, UL "~f %s | ~s %s" },
>-   /*
>-   ** .pp
>---- mutt-1.5.11/keymap.c.orig	Wed Sep  7 10:19:43 2005
>-+++ mutt-1.5.11/keymap.c	Sat Mar 11 21:48:05 2006
>-@@ -55,6 +55,8 @@
>-   
>- 
>-  { "query",	MENU_QUERY },
>-+ { "signature",	MENU_SIG },
>-+ { "sig_directory",	MENU_SIG_DIR },
>-  { "generic",	MENU_GENERIC },
>-  { NULL,	0 }
>- };
>-@@ -560,6 +562,8 @@
>-   create_bindings (OpPost, MENU_POST);
>-   create_bindings (OpQuery, MENU_QUERY);
>-   create_bindings (OpAlias, MENU_ALIAS);
>-+  create_bindings (OpSig, MENU_SIG);
>-+  create_bindings (OpSigDir, MENU_SIG_DIR);
>- 
>- 
>-   if ((WithCrypto & APPLICATION_PGP))
>-@@ -658,6 +662,9 @@
>-   km_bindkey ("<enter>", MENU_ATTACH, OP_VIEW_ATTACH);
>-   km_bindkey ("<enter>", MENU_COMPOSE, OP_VIEW_ATTACH);
>- 
>-+  km_bindkey ("<up>", MENU_SIG, OP_PREV_SIG);
>-+  km_bindkey ("<down>", MENU_SIG, OP_NEXT_SIG);
>-+
>-   /* edit-to (default "t") hides generic tag-entry in Compose menu
>-      This will bind tag-entry to  "T" in the Compose menu */
>-   km_bindkey ("T", MENU_COMPOSE, OP_TAG);
>-@@ -793,6 +800,10 @@
>-       return OpEditor;
>-     case MENU_QUERY:
>-       return OpQuery;
>-+    case MENU_SIG:
>-+      return OpSig;
>-+    case MENU_SIG_DIR:
>-+      return OpSigDir;
>- 
>-     case MENU_PGP:
>-       return (WithCrypto & APPLICATION_PGP)? OpPgp:NULL;
>---- mutt-1.5.11/keymap.h.orig	Thu Jun 17 22:33:04 2004
>-+++ mutt-1.5.11/keymap.h	Sat Mar 11 21:48:05 2006
>-@@ -62,6 +62,8 @@
>-   MENU_PAGER,
>-   MENU_POST,
>-   MENU_QUERY,
>-+  MENU_SIG,
>-+  MENU_SIG_DIR,
>- 
>-   
>-   MENU_PGP,
>-@@ -108,6 +110,8 @@
>- extern struct binding_t OpEditor[];
>- extern struct binding_t OpQuery[];
>- extern struct binding_t OpAlias[];
>-+extern struct binding_t OpSig[];
>-+extern struct binding_t OpSigDir[];
>- 
>- extern struct binding_t OpPgp[];
>- 
>---- mutt-1.5.11/protos.h.orig	Wed Sep  7 10:19:43 2005
>-+++ mutt-1.5.11/protos.h	Sat Mar 11 21:48:05 2006
>-@@ -242,6 +242,7 @@
>- void mutt_shell_escape (void);
>- void mutt_show_error (void);
>- void mutt_signal_init (void);
>-+void mutt_signature (char *);
>- void mutt_stamp_attachment (BODY *a);
>- void mutt_tabs_to_spaces (char *);
>- void mutt_tag_set_flag (int, int);
>---- mutt-1.5.11/signature.c.orig	Sat Mar 11 21:58:38 2006
>-+++ mutt-1.5.11/signature.c	Sat Mar 11 22:07:31 2006
>-@@ -0,0 +1,499 @@
>-+/*
>-+ * Copyright (C) 2001 Cedric Duval <cedricduval@free.fr>
>-+ * 
>-+ *     This program is free software; you can redistribute it and/or modify
>-+ *     it under the terms of the GNU General Public License as published by
>-+ *     the Free Software Foundation; either version 2 of the License, or
>-+ *     (at your option) any later version.
>-+ * 
>-+ *     This program is distributed in the hope that it will be useful,
>-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
>-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-+ *     GNU General Public License for more details.
>-+ * 
>-+ *     You should have received a copy of the GNU General Public License
>-+ *     along with this program; if not, write to the Free Software
>-+ *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
>-+ */
>-+
>-+#if HAVE_CONFIG_H
>-+# include "config.h"
>-+#endif
>-+
>-+#include "mutt.h"
>-+#include "mutt_menu.h"
>-+#include "mapping.h"
>-+#include "mutt_curses.h"
>-+
>-+#include <stdio.h>
>-+#include <string.h>
>-+#include <stdlib.h>
>-+#include <dirent.h>
>-+#include <sys/stat.h>
>-+
>-+#define SIG_DISPLAY_LINES 4
>-+#define SEPARATOR(x) ((*x == '\n') || (mutt_strcmp (x, "-- \n") == 0))
>-+#define SIG_ADD_LINE(x,y) mutt_add_list (x, strtok (y, "\n"))
>-+
>-+typedef struct sig_list
>-+{
>-+  struct sig_list *next;
>-+  LIST *sig;
>-+} SIG_LIST;
>-+
>-+typedef struct sig_dir
>-+{
>-+  struct sig_dir *next;
>-+  char *name;
>-+} SIG_DIR;
>-+
>-+typedef LIST * ENTRY;
>-+
>-+typedef struct entry_dir
>-+{
>-+  int tagged;
>-+  SIG_DIR *data;
>-+} ENTRY_DIR;
>-+
>-+static struct mapping_t SigHelp[] = {
>-+  { N_("Exit"),   OP_EXIT },
>-+  { N_("Search"), OP_SEARCH },
>-+  { N_("Random"), OP_RANDOM_SIG },
>-+  { N_("Help"),   OP_HELP },
>-+  { NULL }
>-+};
>-+
>-+static struct mapping_t SigDirHelp[] = {
>-+  { N_("Exit"),   OP_EXIT },
>-+  { N_("Search signature"), OP_SIG_SEARCH },
>-+  { N_("Help"),   OP_HELP },
>-+  { NULL }
>-+};
>-+
>-+void menu_next_entry (MUTTMENU *menu);
>-+void menu_prev_entry (MUTTMENU *menu);
>-+
>-+
>-+static int sig_match (LIST *s, regex_t *re)
>-+{
>-+  while (s)
>-+  {
>-+    if (regexec (re, s->data, (size_t)0, NULL, (int)0) == 0)
>-+      return 1;
>-+    s = s->next;
>-+  }
>-+  return 0;
>-+}
>-+
>-+static void read_sig_file (char *name, SIG_LIST **begin, regex_t *re)
>-+{
>-+  FILE *fp;
>-+  char buf[STRING];
>-+  LIST *sig = NULL;
>-+  SIG_LIST *first, *cur;
>-+  int append = 0;
>-+
>-+  if (!(fp = safe_fopen (name, "r")))
>-+  {
>-+    mutt_error (_("Can't open signature file %s"), name);
>-+    return;
>-+  }
>-+
>-+  for (first = *begin; first && first->next; first = first->next, append++)
>-+    ; /* append results to an existing list */
>-+  cur = first;
>-+
>-+  while (fgets (buf, sizeof (buf), fp))
>-+  {
>-+    if (buf[0] && !SEPARATOR (buf))
>-+    {
>-+      sig = SIG_ADD_LINE (NULL, buf);
>-+
>-+      while (fgets (buf, sizeof (buf), fp) && buf[0] && !SEPARATOR (buf))
>-+	SIG_ADD_LINE (sig, buf);
>-+
>-+      if (re && !sig_match (sig, re))
>-+	mutt_free_list (&sig); /* previous sig didn't match the regexp */
>-+      else
>-+      {
>-+	/* add signature */
>-+	if (first == NULL)
>-+	  first = cur = (SIG_LIST *) safe_calloc (1, sizeof (SIG_LIST));
>-+	else
>-+	{
>-+	  cur->next = (SIG_LIST *) safe_calloc (1, sizeof (SIG_LIST));
>-+	  cur = cur->next;
>-+	}
>-+
>-+	cur->sig = sig;
>-+	cur->next = NULL;
>-+      }
>-+    }
>-+  }
>-+
>-+  if (!append)
>-+    *begin = first;
>-+
>-+  safe_fclose (&fp);
>-+}
>-+
>-+static void sig_make_entry (char *s, size_t slen, MUTTMENU *menu, int num)
>-+{
>-+  ENTRY *table = (ENTRY *) menu->data;
>-+
>-+  snprintf (s, slen, "%3d %s",
>-+	    num + 1,
>-+	    table[num]->data);
>-+}
>-+
>-+static int sig_menu_search (MUTTMENU *menu, regex_t *re, int num)
>-+{
>-+  return (sig_match (((ENTRY *)menu->data)[num], re) ? 0 : REG_NOMATCH);
>-+}
>-+
>-+static void draw_sig_frame (LIST *s)
>-+{
>-+  int i;
>-+
>-+  for (i = 1; i <= SIG_DISPLAY_LINES; i++)
>-+  {
>-+    if (s)
>-+    {
>-+      mvaddstr (i, 0, s->data);
>-+      s = s->next;
>-+    }
>-+    else
>-+      move (i, 0);
>-+
>-+    clrtoeol ();
>-+  }
>-+
>-+  SETCOLOR (MT_COLOR_STATUS);
>-+  mvaddstr (SIG_DISPLAY_LINES + 1, 0, _("-- Signature"));
>-+  BKGDSET (MT_COLOR_STATUS);
>-+  clrtoeol ();
>-+
>-+  BKGDSET (MT_COLOR_NORMAL);
>-+  SETCOLOR (MT_COLOR_NORMAL);
>-+}
>-+
>-+static void free_sig_list (SIG_LIST **sigs)
>-+{
>-+  SIG_LIST *cur;
>-+
>-+  while (*sigs)
>-+  {
>-+    cur = *sigs;
>-+    *sigs = (*sigs)->next;
>-+    mutt_free_list (&cur->sig);
>-+    safe_free ((void **)&cur);
>-+  }
>-+}
>-+
>-+static void append_signature (char *msg_file, LIST *s)
>-+{
>-+  FILE *fp;
>-+
>-+  if ((fp = safe_fopen (msg_file, "a")) == 0)
>-+    mutt_perror (msg_file);
>-+  else
>-+  {
>-+    if (option (OPTSIGDASHES))
>-+      fputs ("\n-- \n", fp);
>-+
>-+    for (; s; s = s->next)
>-+      fprintf (fp, "%s\n", s->data);
>-+
>-+    mutt_message (_("Signature appended to your mail"));
>-+    safe_fclose (&fp);
>-+  }
>-+}
>-+
>-+static LIST *sig_list_menu (char *file, SIG_LIST *list)
>-+{
>-+  LIST *result = NULL;
>-+  SIG_LIST *sigl;
>-+  MUTTMENU *menu;
>-+  ENTRY *SigTable;
>-+  char helpstr[SHORT_STRING], title[SHORT_STRING];
>-+  int i, done = 0;
>-+
>-+  snprintf (title, sizeof (title), _("Signature : %s"), file);
>-+
>-+  menu = mutt_new_menu ();
>-+  menu->make_entry = sig_make_entry;
>-+  menu->tag = NULL;
>-+  menu->search = sig_menu_search;
>-+  menu->menu = MENU_SIG;
>-+  menu->title = title;
>-+  menu->help = mutt_compile_help (helpstr, sizeof (helpstr),
>-+				  MENU_SIG, SigHelp);
>-+  menu->offset = SIG_DISPLAY_LINES + 2;
>-+  menu->pagelen = LINES - SIG_DISPLAY_LINES - 4;
>-+  
>-+  for (sigl = list; sigl; sigl = sigl->next)
>-+    menu->max++;
>-+
>-+  menu->data = SigTable = (ENTRY *) safe_calloc (menu->max, sizeof (ENTRY));
>-+
>-+  for (i = 0, sigl = list; sigl; i++, sigl = sigl->next)
>-+    SigTable[i] = sigl->sig;
>-+
>-+  while (!done)
>-+  {
>-+    switch (mutt_menuLoop (menu))
>-+    {
>-+      case OP_GENERIC_SELECT_ENTRY:
>-+        result = SigTable[menu->current];
>-+	done = 1;
>-+	break;
>-+
>-+      case OP_PREV_SIG:
>-+	menu_prev_entry (menu);
>-+	draw_sig_frame (SigTable[menu->current]);
>-+	break;
>-+
>-+      case OP_NEXT_SIG:
>-+	menu_next_entry (menu);
>-+	draw_sig_frame (SigTable[menu->current]);
>-+	break;
>-+
>-+      case OP_REDRAW:
>-+	menu->offset = SIG_DISPLAY_LINES + 2;
>-+	menu->pagelen = LINES - SIG_DISPLAY_LINES - 4;
>-+	draw_sig_frame (SigTable[menu->current]);
>-+	break;
>-+
>-+      case OP_RANDOM_SIG:
>-+	menu->current = LRAND () % menu->max;
>-+	draw_sig_frame (SigTable[menu->current]);
>-+	menu->redraw |= REDRAW_MOTION;
>-+	break;
>-+
>-+      case OP_EXIT:
>-+	set_option (OPTNEEDREDRAW);
>-+        done = 1;
>-+        break;
>-+    }
>-+  }
>-+  
>-+  mutt_menuDestroy (&menu);
>-+  safe_free ((void **)&SigTable);
>-+  return result;
>-+}
>-+
>-+static SIG_LIST *sig_search_filter (MUTTMENU *menu, char *path)
>-+{
>-+  regex_t re;
>-+  char buf[STRING];
>-+  SIG_LIST *result = NULL;
>-+  int i;
>-+
>-+  snprintf (buf, sizeof(buf), menu->searchBuf ? menu->searchBuf : "");
>-+  if (mutt_get_field (_("Search for: "), buf,
>-+		      sizeof (buf), M_CLEAR) != 0 || !buf[0])
>-+    return (NULL);
>-+  mutt_str_replace (&menu->searchBuf, buf);
>-+
>-+  if ((i = regcomp (&re, menu->searchBuf, REG_NOSUB | REG_EXTENDED | REG_WORDS
>-+		    | mutt_which_case (menu->searchBuf))) != 0)
>-+  {
>-+    regerror (i, &re, buf, sizeof (buf));
>-+    regfree (&re);
>-+    mutt_error ("%s", buf);
>-+    return (NULL);
>-+  }
>-+
>-+  /* building list of sigs matching the regexp */
>-+  for (i = 0; i < menu->max; i++)
>-+  {
>-+    /* search in every file if none is tagged */
>-+    if (((ENTRY_DIR *) menu->data)[i].tagged || (menu->tagged == 0))
>-+    {
>-+      snprintf (buf, sizeof (buf), "%s/%s", path,
>-+		((ENTRY_DIR *) menu->data)[i].data->name);
>-+      read_sig_file (buf, &result, &re);
>-+    }
>-+  }
>-+
>-+  regfree (&re);
>-+  if (!result)
>-+    mutt_error (_("Not found."));
>-+
>-+  return (result);
>-+}
>-+
>-+/* returns the list of files in this directory */
>-+static SIG_DIR *sig_directory (char *path)
>-+{
>-+  DIR *dp;
>-+  struct dirent *de;
>-+  struct stat s;
>-+  SIG_DIR *first = NULL, *cur = NULL;
>-+  char file[_POSIX_PATH_MAX + SHORT_STRING];
>-+
>-+  if ((dp = opendir (path)) == NULL)
>-+  {
>-+    mutt_perror (path);
>-+    return (NULL);
>-+  }
>-+  
>-+  while ((de = readdir (dp)))
>-+  {
>-+    if ((de->d_name)[0] == '.') /* no hidden files */
>-+      continue;
>-+
>-+    snprintf (file, sizeof (file), "%s/%s", path, de->d_name);
>-+    if (lstat (file, &s) == -1)
>-+      continue;
>-+
>-+    if ((!S_ISREG (s.st_mode)) && (!S_ISLNK (s.st_mode)))
>-+      continue;
>-+
>-+    if (first == NULL)
>-+      cur = first = safe_calloc (1, sizeof (SIG_DIR));
>-+    else
>-+    {
>-+      cur->next = safe_calloc (1, sizeof (SIG_DIR));
>-+      cur = cur->next;
>-+    }
>-+    cur->name = safe_strdup (de->d_name);
>-+    cur->next = NULL;
>-+  }
>-+  closedir (dp);
>-+  return first;
>-+}
>-+
>-+static void sig_dir_make_entry (char *s, size_t slen, MUTTMENU *menu, int num)
>-+{
>-+  ENTRY_DIR *table = (ENTRY_DIR *) menu->data;
>-+
>-+  snprintf (s, slen, "%c %3d - %s",
>-+	    table[num].tagged ? '*' : ' ',
>-+	    num + 1,
>-+	    table[num].data->name);
>-+}
>-+
>-+static int sig_dir_tag (MUTTMENU *menu, int n, int m)
>-+{
>-+  ENTRY_DIR *cur = &((ENTRY_DIR *) menu->data)[n];
>-+  int ot = cur->tagged;
>-+  
>-+  cur->tagged = m >= 0 ? m : !cur->tagged;
>-+  return cur->tagged - ot;
>-+
>-+}
>-+
>-+static int sig_dir_sort (const void *a, const void *b)
>-+{
>-+  ENTRY_DIR *pa = (ENTRY_DIR *) a;
>-+  ENTRY_DIR *pb = (ENTRY_DIR *) b;
>-+
>-+  return (mutt_strcmp (pa->data->name, pb->data->name));
>-+}
>-+
>-+static int sig_dir_menu (char *path, char *msg_file)
>-+{
>-+  MUTTMENU *menu;
>-+  SIG_LIST *sigl;
>-+  LIST *result = NULL;
>-+  ENTRY_DIR *FileTable;
>-+  SIG_DIR *list, *files;
>-+  char buf[STRING], helpstr[SHORT_STRING], title[SHORT_STRING];
>-+  int i, done = 0;
>-+
>-+  if ((list = sig_directory (path)) == NULL)
>-+    return -1;
>-+
>-+  snprintf (title, sizeof (title), "Signature directory : %s", path);
>-+
>-+  menu = mutt_new_menu ();
>-+  menu->make_entry = sig_dir_make_entry;
>-+  menu->search = NULL; /* search within files with sig_search_filter() */
>-+  menu->tag = sig_dir_tag;
>-+  menu->menu = MENU_SIG_DIR;
>-+  menu->title = title;
>-+  menu->help = mutt_compile_help (helpstr, sizeof (helpstr),
>-+				  MENU_SIG_DIR, SigDirHelp);
>-+
>-+  for (files = list; files; files = files->next)
>-+    menu->max++;
>-+
>-+  menu->data = FileTable = (ENTRY_DIR *) safe_calloc (menu->max,
>-+						      sizeof (ENTRY_DIR));
>-+
>-+  for (i = 0, files = list; files; i++, files = files->next)
>-+    FileTable[i].data = files;
>-+
>-+  qsort (FileTable, menu->max, sizeof (ENTRY_DIR), sig_dir_sort);
>-+
>-+  while (!done)
>-+  {
>-+    switch (mutt_menuLoop (menu))
>-+    {
>-+      case OP_SIG_SEARCH:
>-+	sigl = sig_search_filter (menu, path);
>-+
>-+	if (sigl)
>-+	{
>-+	  if ((result = sig_list_menu (_("query results"), sigl)) != NULL)
>-+	  {
>-+	    append_signature (msg_file, result);
>-+	    done = 1;
>-+	  }
>-+
>-+	  MAYBE_REDRAW (menu->redraw);
>-+	  free_sig_list (&sigl);
>-+	}
>-+	break;
>-+
>-+      case OP_GENERIC_SELECT_ENTRY:
>-+	snprintf (buf, sizeof (buf), "%s/%s", path,
>-+		  FileTable[menu->current].data->name);
>-+	sigl = NULL;
>-+	read_sig_file (buf, &sigl, NULL);
>-+
>-+	if (sigl)
>-+	{
>-+	  if ((result = sig_list_menu (buf, sigl)) != NULL)
>-+	  {
>-+	    append_signature (msg_file, result);
>-+	    done = 1;
>-+	  }
>-+
>-+	  MAYBE_REDRAW (menu->redraw);
>-+	  free_sig_list (&sigl);
>-+      	}
>-+	break;
>-+
>-+      case OP_EXIT:
>-+        done = 1;
>-+        break;
>-+    }
>-+  }
>-+
>-+  while (list)
>-+  {
>-+    safe_free ((void **)&list->name);
>-+    files = list;
>-+    list = list->next;
>-+    safe_free ((void **)&files);
>-+  }
>-+  safe_free ((void **)&FileTable);
>-+  mutt_menuDestroy (&menu);
>-+  return 0;
>-+}
>-+
>-+void mutt_signature (char *msg_file)
>-+{
>-+  if (!SigDirectory)
>-+  {
>-+    mutt_error (_("variable 'signatures_directory' is unset"));
>-+    return;
>-+  }
>-+
>-+  if (sig_dir_menu (SigDirectory, msg_file) == -1)
>-+    mutt_error (_("%s: no files in this directory"), SigDirectory);
>-+  else
>-+    set_option (OPTNEEDREDRAW);
>-+}
>diff -ru  /usr/ports-current/mail/mutt/files/extra-patch-trash-purge ./files/extra-patch-trash-purge
>--- /usr/ports-current/mail/mutt/files/extra-patch-trash-purge	2015-11-21 17:44:58.000000000 +0100
>+++ ./files/extra-patch-trash-purge	2016-04-09 11:06:05.047437000 +0200
>@@ -336,22 +336,6 @@
> 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"));
>  
>diff -ru  /usr/ports-current/mail/mutt/files/patch-examples ./files/patch-examples
>--- /usr/ports-current/mail/mutt/files/patch-examples	2016-03-31 21:57:22.000000000 +0200
>+++ ./files/patch-examples	2016-04-09 11:06:05.047437000 +0200
>@@ -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

Actions: View | Diff

Attachments on bug 208641: 169114 | 169120 | 169121