Attachment #169114 for bug #208641




# $FreeBSD: head/mail/mutt/Makefile 412348 2016-04-01 14:16:16Z mat $

PORTNAME=	mutt
PORTVERSION=	1.6.0
PORTREVISION?=	6
CATEGORIES+=	mail ipv6
MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \

CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
.endif

#USES+=		autoreconf
#GNU_CONFIGURE=	yes
USE_AUTOTOOLS=	automake autoconf
AUTOMAKE_ARGS=	--add-missing --foreign
USE_OPENSSL=	yes




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.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
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




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"));
 




 /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

Return to bug 208641

Lines 336-357 Link Here

(-)../../home/pi/myp/mail/mutt/files/extra-patch-trash-purge (-16 lines)
336	diff -pruN -x'*.orig' mutt-1.5.20/pager.c mutt-1.5.20-trash/pager.c	336	diff -pruN -x'*.orig' mutt-1.5.20/pager.c mutt-1.5.20-trash/pager.c
337	--- mutt-1.5.20/pager.c 2009-06-03 16:48:31.000000000 -0400	337	--- mutt-1.5.20/pager.c 2009-06-03 16:48:31.000000000 -0400
338	+++ mutt-1.5.20-trash/pager.c 2009-07-23 09:44:40.000000000 -0400	338	+++ mutt-1.5.20-trash/pager.c 2009-07-23 09:44:40.000000000 -0400
339	@@ -2309,12 +2309,15 @@ search_next:
340	MAYBE_REDRAW (redraw);
341	break;
342
343	+ case OP_PURGE_MESSAGE:
344	case OP_DELETE:
345	CHECK_MODE(IsHeader (extra));
346	CHECK_READONLY;
347	CHECK_ACL(M_ACL_DELETE, _("delete message"));
348
349	mutt_set_flag (Context, extra->hdr, M_DELETE, 1);
350	+ mutt_set_flag (Context, extra->hdr, M_PURGED,
351	+ ch != OP_PURGE_MESSAGE ? 0 : 1);
352	if (option (OPTDELETEUNTAG))
353	mutt_set_flag (Context, extra->hdr, M_TAG, 0);
354	redraw = REDRAW_STATUS \| REDRAW_INDEX;
355	@@ -2641,6 +2644,7 @@ search_next:	339	@@ -2641,6 +2644,7 @@ search_next:
356	CHECK_ACL(M_ACL_DELETE, _("undelete message"));	340	CHECK_ACL(M_ACL_DELETE, _("undelete message"));
357		341

Lines 2-9 Link Here

(-)../../home/pi/myp/mail/mutt/Makefile (-2 / +3 lines)
2	# $FreeBSD: head/mail/mutt/Makefile 412348 2016-04-01 14:16:16Z mat $	2	# $FreeBSD: head/mail/mutt/Makefile 412348 2016-04-01 14:16:16Z mat $
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	PORTVERSION= 1.5.24	5	PORTVERSION= 1.6.0
6	PORTREVISION?= 6
7	CATEGORIES+= mail ipv6	6	CATEGORIES+= mail ipv6
8	MASTER_SITES= ftp://ftp.mutt.org/mutt/ \	7	MASTER_SITES= ftp://ftp.mutt.org/mutt/ \
9	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \	8	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
Lines 40-45 Link Here
40	CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS}	39	CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS}
41	.endif	40	.endif
42		41
		42	#USES+= autoreconf
		43	#GNU_CONFIGURE= yes
43	USE_AUTOTOOLS= automake autoconf	44	USE_AUTOTOOLS= automake autoconf
44	AUTOMAKE_ARGS= --add-missing --foreign	45	AUTOMAKE_ARGS= --add-missing --foreign
45	USE_OPENSSL= yes	46	USE_OPENSSL= yes

Lines 1-12 Link Here

(-)../../home/pi/myp/mail/mutt/distinfo (-12 / +8 lines)
1	SHA256 (mutt/mutt-1.5.24.tar.gz) = a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200	1	SHA256 (mutt/mutt-1.6.0.tar.gz) = 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19
2	SIZE (mutt/mutt-1.5.24.tar.gz) = 3897115	2	SIZE (mutt/mutt-1.6.0.tar.gz) = 3954591
3	SHA256 (mutt/patch-1.5.24.rr.compressed.gz) = c5eb9b53f7bd3feaa5ee03722575f64e43512b756c099ffe20db6fe5c958e3dc	3	SHA256 (mutt/patch-1.6.0.rr.compressed.gz) = c57ad6b19b2dbd812c27a098273b68b2d3b45ce2d36c3a4bff3493ad2cb75b85
4	SIZE (mutt/patch-1.5.24.rr.compressed.gz) = 10019	4	SIZE (mutt/patch-1.6.0.rr.compressed.gz) = 9977
5	SHA256 (mutt/patch-1.5.24.vvv.nntp.gz) = d34be4542d549aab6de9f7038c88b3eeefe826db643c92b27e1e65ab5f7d573e	5	SHA256 (mutt/patch-1.6.0.vvv.initials.gz) = f1923f35cd5a400930d6aa6a60f213bf7b8b0f65e6a0d856e7ef23914e822f4d
6	SIZE (mutt/patch-1.5.24.vvv.nntp.gz) = 61359	6	SIZE (mutt/patch-1.6.0.vvv.initials.gz) = 668
7	SHA256 (mutt/patch-1.5.24.vvv.nntp_ru.gz) = 70436af316aefd0d31aa33e127df49da4bdd1b4a8b3fbec73b3fca5428f3ab0e	7	SHA256 (mutt/patch-1.6.0.vvv.quote.gz) = 362b9462b2e45de36c962450e9b6715e7f4c00fb5dce4c041fd6c675fbb73814
8	SIZE (mutt/patch-1.5.24.vvv.nntp_ru.gz) = 5719	8	SIZE (mutt/patch-1.6.0.vvv.quote.gz) = 1252
9	SHA256 (mutt/patch-1.5.24.vvv.initials.gz) = 6522d12d34c0be71531465e05010413a0f2907d597e9fb5100a65d18093f0599
10	SIZE (mutt/patch-1.5.24.vvv.initials.gz) = 671
11	SHA256 (mutt/patch-1.5.24.vvv.quote.gz) = fa161302179bbc646a83d7029381f828bece5b177e940f2fca6d5769633b9f0a
12	SIZE (mutt/patch-1.5.24.vvv.quote.gz) = 1254

Lines 70-86 Link Here

(-)../../home/pi/myp/mail/mutt/files/patch-examples (-11 lines)
70	/usr/local/etc.	70	/usr/local/etc.
71	--- doc/manual.txt.orig 2015-08-30 19:25:51.000000000 +0200	71	--- doc/manual.txt.orig 2015-08-30 19:25:51.000000000 +0200
72	+++ doc/manual.txt 2015-09-10 08:56:32.000000000 +0200	72	+++ doc/manual.txt 2015-09-10 08:56:32.000000000 +0200
73	@@ -3128,8 +3128,8 @@
74	argument.
75
76	A practical example is the mutt_xtitle script installed in the samples
77	- subdirectory of the Mutt documentation: it can be used as filter for
78	- $$ssttaattuuss__ffoorrmmaatt to set the current terminal's title, if supported.
79	+ share/examples/mutt subdirectory of the Mutt documentation: it can be used as
80	+ filter for $$ssttaattuuss__ffoorrmmaatt to set the current terminal's title, if supported.
81
82	29.4. Padding
83
84	@@ -7736,8 +7736,8 @@	73	@@ -7736,8 +7736,8 @@
85		74
86	For examples on how to configure these formats for the various versions	75	For examples on how to configure these formats for the various versions