Attachment #186280 for bug #222244

View | Details | Raw Unified | Return to bug 222244
Collapse All | Expand All





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

NNTP_CONFIGURE_ON=	--enable-nntp
NNTP_VARS=	XML_NEEDED=yes
NNTP_CATEGORIES=	news
NNTP_BROKEN=	NNTP fails to apply to 1.9.0

SIDEBAR_CONFIGURE_ENABLE=	sidebar


.include <bsd.port.options.mk>

# un/comment as each VERSION is created for PORTVERSION
#VVV_PATCH_VERSION=	1.8.3
#GREETING_PATCH_VERSION=	1.8.3

.if !defined(VVV_PATCH_VERSION)




TIMESTAMP = 1505077543
SHA256 (mutt/mutt-1.9.0.tar.gz) = ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4
SIZE (mutt/mutt-1.9.0.tar.gz) = 4191932
SHA256 (mutt/date-conditional.diff) = 8936c5fe7a2a62a68f2a8d001c7a6dddf138c48186a338482b6639507ba9133e
SIZE (mutt/date-conditional.diff) = 2023
SHA256 (mutt/mutt-1.9.0.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317
SIZE (mutt/mutt-1.9.0.vc.greeting) = 4534
SHA256 (mutt/patch-1.9.0.vvv.nntp.gz) = f7098b713dfcbb2a4a6e5edaf536eb99be6d92fad073d5d3ac436b0191c7c892
SIZE (mutt/patch-1.9.0.vvv.nntp.gz) = 60687
SHA256 (mutt/patch-1.9.0.vvv.initials.gz) = 4673ca438fb673dfee09c6b8b8f9e8e78af06056f1b515c6030b0533dae847e5
SIZE (mutt/patch-1.9.0.vvv.initials.gz) = 681
SHA256 (mutt/patch-1.9.0.vvv.quote.gz) = 22967bd615bd0c10046e264270b6d9cd037fd078365ed3bc1f4d631b8c69b003
SIZE (mutt/patch-1.9.0.vvv.quote.gz) = 1279




--- init.h.orig	2017-09-10 22:12:31 UTC
+++ init.h
@@ -911,6 +911,11 @@ struct option_t MuttVars[] = {
   ** message via mail.
   */
 #endif

   { "force_name",	DT_BOOL, R_NONE, OPTFORCENAME, 0 },
   /*
   ** .pp
--- mutt.h.orig	2017-09-10 22:12:31 UTC
+++ mutt.h
@@ -379,6 +379,7 @@ enum
   OPTFCCCLEAR,
   OPTFLAGSAFE,
   OPTFOLLOWUPTO,

   OPTFORCENAME,
   OPTFORWDECODE,
   OPTFORWQUOTE,
--- sendlib.c.orig	2017-09-10 22:12:31 UTC
+++ sendlib.c
@@ -1180,7 +1180,9 @@ static void mutt_set_encoding (BODY *b, 
   if (b->type == TYPETEXT)
   {
     char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);




--- PATCHES.orig	2017-09-10 21:57:09 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.7.ust.maildir-mtime.2
--- browser.c.orig	2017-09-10 21:56:59 UTC
+++ browser.c
@@ -35,6 +35,7 @@
 #ifdef USE_NNTP

         !mutt_strcmp (tmp->realpath, Context->realpath))
     {
@@ -737,6 +754,7 @@ static int examine_mailboxes (MUTTMENU *
 	s.st_mtime = st2.st_mtime;
     }
 
+    check_maildir_times (tmp, &s);
     add_folder (menu, state, buffer, &s, tmp, NULL);
- 

Return to bug 222244

Lines 3-9 Link Here

(-)b/mail/mutt/Makefile (-3 / +2 lines)
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	PORTVERSION= 1.9.0	5	PORTVERSION= 1.9.0
6	PORTREVISION?= 0	6	PORTREVISION?= 1
7	CATEGORIES+= mail ipv6	7	CATEGORIES+= mail ipv6
8	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \	8	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
9	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \	9	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
Lines 201-207 NNTP_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:-p1:vvv Link Here
201	NNTP_CONFIGURE_ON= --enable-nntp	201	NNTP_CONFIGURE_ON= --enable-nntp
202	NNTP_VARS= XML_NEEDED=yes	202	NNTP_VARS= XML_NEEDED=yes
203	NNTP_CATEGORIES= news	203	NNTP_CATEGORIES= news
204	NNTP_BROKEN= NNTP fails to apply to 1.9.0
205		204
206	SIDEBAR_CONFIGURE_ENABLE= sidebar	205	SIDEBAR_CONFIGURE_ENABLE= sidebar
207		206
Lines 210-216 DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref Link Here
210	.include <bsd.port.options.mk>	209	.include <bsd.port.options.mk>
211		210
212	# un/comment as each VERSION is created for PORTVERSION	211	# un/comment as each VERSION is created for PORTVERSION
213	VVV_PATCH_VERSION= 1.8.3	212	#VVV_PATCH_VERSION= 1.8.3
214	#GREETING_PATCH_VERSION= 1.8.3	213	#GREETING_PATCH_VERSION= 1.8.3
215		214
216	.if !defined(VVV_PATCH_VERSION)	215	.if !defined(VVV_PATCH_VERSION)

Lines 1-13 Link Here

(-)b/mail/mutt/distinfo (-7 / +7 lines)
1	TIMESTAMP = 1504471107	1	TIMESTAMP = 1505077543
2	SHA256 (mutt/mutt-1.9.0.tar.gz) = ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4	2	SHA256 (mutt/mutt-1.9.0.tar.gz) = ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4
3	SIZE (mutt/mutt-1.9.0.tar.gz) = 4191932	3	SIZE (mutt/mutt-1.9.0.tar.gz) = 4191932
4	SHA256 (mutt/date-conditional.diff) = 8936c5fe7a2a62a68f2a8d001c7a6dddf138c48186a338482b6639507ba9133e	4	SHA256 (mutt/date-conditional.diff) = 8936c5fe7a2a62a68f2a8d001c7a6dddf138c48186a338482b6639507ba9133e
5	SIZE (mutt/date-conditional.diff) = 2023	5	SIZE (mutt/date-conditional.diff) = 2023
6	SHA256 (mutt/mutt-1.9.0.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317	6	SHA256 (mutt/mutt-1.9.0.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317
7	SIZE (mutt/mutt-1.9.0.vc.greeting) = 4534	7	SIZE (mutt/mutt-1.9.0.vc.greeting) = 4534
8	SHA256 (mutt/patch-1.8.3.vvv.nntp.gz) = 940cf7fd4fbea39f48bd5594180a7be5c3cc6714d62eeb3f2e5fbc0ab4b3545b	8	SHA256 (mutt/patch-1.9.0.vvv.nntp.gz) = f7098b713dfcbb2a4a6e5edaf536eb99be6d92fad073d5d3ac436b0191c7c892
9	SIZE (mutt/patch-1.8.3.vvv.nntp.gz) = 60675	9	SIZE (mutt/patch-1.9.0.vvv.nntp.gz) = 60687
10	SHA256 (mutt/patch-1.8.3.vvv.initials.gz) = e929c863dd012624b2ac724cd296f346374cd2522f256020fa458e94890ca750	10	SHA256 (mutt/patch-1.9.0.vvv.initials.gz) = 4673ca438fb673dfee09c6b8b8f9e8e78af06056f1b515c6030b0533dae847e5
11	SIZE (mutt/patch-1.8.3.vvv.initials.gz) = 686	11	SIZE (mutt/patch-1.9.0.vvv.initials.gz) = 681
12	SHA256 (mutt/patch-1.8.3.vvv.quote.gz) = 03b1aa4aa9152b968fc1709e68207073df62b9b1a5da43ff1d680d6dfe17fe35	12	SHA256 (mutt/patch-1.9.0.vvv.quote.gz) = 22967bd615bd0c10046e264270b6d9cd037fd078365ed3bc1f4d631b8c69b003
13	SIZE (mutt/patch-1.8.3.vvv.quote.gz) = 1282	13	SIZE (mutt/patch-1.9.0.vvv.quote.gz) = 1279

Lines 1-6 Link Here

(-)b/mail/mutt/files/extra-patch-forcebase64-nntp (-6 / +6 lines)
1	--- init.h.orig 2017-04-14 01:20:27 UTC	1	--- init.h.orig 2017-09-10 22:12:31 UTC
2	+++ init.h	2	+++ init.h
3	@@ -903,6 +903,11 @@ struct option_t MuttVars[] = {	3	@@ -911,6 +911,11 @@ struct option_t MuttVars[] = {
4	** message via mail.	4	** message via mail.
5	*/	5	*/
6	#endif	6	#endif
Lines 12-20 Link Here
12	{ "force_name", DT_BOOL, R_NONE, OPTFORCENAME, 0 },	12	{ "force_name", DT_BOOL, R_NONE, OPTFORCENAME, 0 },
13	/*	13	/*
14	** .pp	14	** .pp
15	--- mutt.h.orig 2017-04-14 01:20:27 UTC	15	--- mutt.h.orig 2017-09-10 22:12:31 UTC
16	+++ mutt.h	16	+++ mutt.h
17	@@ -368,6 +368,7 @@ enum	17	@@ -379,6 +379,7 @@ enum
18	OPTFCCCLEAR,	18	OPTFCCCLEAR,
19	OPTFLAGSAFE,	19	OPTFLAGSAFE,
20	OPTFOLLOWUPTO,	20	OPTFOLLOWUPTO,
Lines 22-30 Link Here
22	OPTFORCENAME,	22	OPTFORCENAME,
23	OPTFORWDECODE,	23	OPTFORWDECODE,
24	OPTFORWQUOTE,	24	OPTFORWQUOTE,
25	--- sendlib.c.orig 2017-04-14 01:20:27 UTC	25	--- sendlib.c.orig 2017-09-10 22:12:31 UTC
26	+++ sendlib.c	26	+++ sendlib.c
27	@@ -1175,7 +1175,9 @@ static void mutt_set_encoding (BODY *b,	27	@@ -1180,7 +1180,9 @@ static void mutt_set_encoding (BODY *b,
28	if (b->type == TYPETEXT)	28	if (b->type == TYPETEXT)
29	{	29	{
30	char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);	30	char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);

Lines 1-8 Link Here

(-)b/mail/mutt/files/extra-patch-maildir-mtime-nntp (-5 / +4 lines)
1	--- PATCHES.orig 2017-04-09 21:00:46 UTC	1	--- PATCHES.orig 2017-09-10 21:57:09 UTC
2	+++ PATCHES	2	+++ PATCHES
3	@@ -0,0 +1 @@	3	@@ -0,0 +1 @@
4	+patch-1.5.7.ust.maildir-mtime.2	4	+patch-1.5.7.ust.maildir-mtime.2
5	--- browser.c.orig 2017-04-09 20:49:44 UTC	5	--- browser.c.orig 2017-09-10 21:56:59 UTC
6	+++ browser.c	6	+++ browser.c
7	@@ -35,6 +35,7 @@	7	@@ -35,6 +35,7 @@
8	#ifdef USE_NNTP	8	#ifdef USE_NNTP
Lines 43-50 Link Here
43	!mutt_strcmp (tmp->realpath, Context->realpath))	43	!mutt_strcmp (tmp->realpath, Context->realpath))
44	{	44	{
45	@@ -737,6 +754,7 @@ static int examine_mailboxes (MUTTMENU *	45	@@ -737,6 +754,7 @@ static int examine_mailboxes (MUTTMENU *
46	strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));	46	s.st_mtime = st2.st_mtime;
47	mutt_pretty_mailbox (buffer, sizeof (buffer));	47	}
48		48
49	+ check_maildir_times (tmp, &s);	49	+ check_maildir_times (tmp, &s);
50	add_folder (menu, state, buffer, &s, tmp, NULL);	50	add_folder (menu, state, buffer, &s, tmp, NULL);
51	-