Date: Tue, 12 Sep 2017 02:29:53 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449669 - in head/mail/mutt: . files Message-ID: <201709120229.v8C2TrCD062645@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Tue Sep 12 02:29:53 2017 New Revision: 449669 URL: https://svnweb.freebsd.org/changeset/ports/449669 Log: Update VVV patch to support 1.9.0, and unbreak the NNTP option. PR: 222244 Submitted by: maintainer (dereks lifeofadishwasher com) Modified: head/mail/mutt/Makefile head/mail/mutt/distinfo head/mail/mutt/files/extra-patch-forcebase64-nntp head/mail/mutt/files/extra-patch-maildir-mtime-nntp Modified: head/mail/mutt/Makefile ============================================================================== --- head/mail/mutt/Makefile Tue Sep 12 01:46:42 2017 (r449668) +++ head/mail/mutt/Makefile Tue Sep 12 02:29:53 2017 (r449669) @@ -3,7 +3,7 @@ PORTNAME= mutt PORTVERSION= 1.9.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ @@ -201,7 +201,6 @@ NNTP_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.g 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 @@ -210,7 +209,7 @@ DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref .include <bsd.port.options.mk> # un/comment as each VERSION is created for PORTVERSION -VVV_PATCH_VERSION= 1.8.3 +#VVV_PATCH_VERSION= 1.8.3 #GREETING_PATCH_VERSION= 1.8.3 .if !defined(VVV_PATCH_VERSION) Modified: head/mail/mutt/distinfo ============================================================================== --- head/mail/mutt/distinfo Tue Sep 12 01:46:42 2017 (r449668) +++ head/mail/mutt/distinfo Tue Sep 12 02:29:53 2017 (r449669) @@ -1,13 +1,13 @@ -TIMESTAMP = 1504471107 +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.8.3.vvv.nntp.gz) = 940cf7fd4fbea39f48bd5594180a7be5c3cc6714d62eeb3f2e5fbc0ab4b3545b -SIZE (mutt/patch-1.8.3.vvv.nntp.gz) = 60675 -SHA256 (mutt/patch-1.8.3.vvv.initials.gz) = e929c863dd012624b2ac724cd296f346374cd2522f256020fa458e94890ca750 -SIZE (mutt/patch-1.8.3.vvv.initials.gz) = 686 -SHA256 (mutt/patch-1.8.3.vvv.quote.gz) = 03b1aa4aa9152b968fc1709e68207073df62b9b1a5da43ff1d680d6dfe17fe35 -SIZE (mutt/patch-1.8.3.vvv.quote.gz) = 1282 +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 Modified: head/mail/mutt/files/extra-patch-forcebase64-nntp ============================================================================== --- head/mail/mutt/files/extra-patch-forcebase64-nntp Tue Sep 12 01:46:42 2017 (r449668) +++ head/mail/mutt/files/extra-patch-forcebase64-nntp Tue Sep 12 02:29:53 2017 (r449669) @@ -1,6 +1,6 @@ ---- init.h.orig 2017-04-14 01:20:27 UTC +--- init.h.orig 2017-09-10 22:12:31 UTC +++ init.h -@@ -903,6 +903,11 @@ struct option_t MuttVars[] = { +@@ -911,6 +911,11 @@ struct option_t MuttVars[] = { ** message via mail. */ #endif @@ -12,9 +12,9 @@ { "force_name", DT_BOOL, R_NONE, OPTFORCENAME, 0 }, /* ** .pp ---- mutt.h.orig 2017-04-14 01:20:27 UTC +--- mutt.h.orig 2017-09-10 22:12:31 UTC +++ mutt.h -@@ -368,6 +368,7 @@ enum +@@ -379,6 +379,7 @@ enum OPTFCCCLEAR, OPTFLAGSAFE, OPTFOLLOWUPTO, @@ -22,9 +22,9 @@ OPTFORCENAME, OPTFORWDECODE, OPTFORWQUOTE, ---- sendlib.c.orig 2017-04-14 01:20:27 UTC +--- sendlib.c.orig 2017-09-10 22:12:31 UTC +++ sendlib.c -@@ -1175,7 +1175,9 @@ static void mutt_set_encoding (BODY *b, +@@ -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); Modified: head/mail/mutt/files/extra-patch-maildir-mtime-nntp ============================================================================== --- head/mail/mutt/files/extra-patch-maildir-mtime-nntp Tue Sep 12 01:46:42 2017 (r449668) +++ head/mail/mutt/files/extra-patch-maildir-mtime-nntp Tue Sep 12 02:29:53 2017 (r449669) @@ -1,8 +1,8 @@ ---- PATCHES.orig 2017-04-09 21:00:46 UTC +--- 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-04-09 20:49:44 UTC +--- browser.c.orig 2017-09-10 21:56:59 UTC +++ browser.c @@ -35,6 +35,7 @@ #ifdef USE_NNTP @@ -43,8 +43,8 @@ !mutt_strcmp (tmp->realpath, Context->realpath)) { @@ -737,6 +754,7 @@ static int examine_mailboxes (MUTTMENU * - strfcpy (buffer, NONULL(tmp->path), sizeof (buffer)); - mutt_pretty_mailbox (buffer, sizeof (buffer)); + s.st_mtime = st2.st_mtime; + } + check_maildir_times (tmp, &s); add_folder (menu, state, buffer, &s, tmp, NULL);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709120229.v8C2TrCD062645>