From owner-svn-ports-head@freebsd.org Mon Apr 10 14:51:52 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 28548D37950; Mon, 10 Apr 2017 14:51:52 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E0531893; Mon, 10 Apr 2017 14:51:51 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3AEppG7081991; Mon, 10 Apr 2017 14:51:51 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3AEpoBs081989; Mon, 10 Apr 2017 14:51:50 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201704101451.v3AEpoBs081989@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Mon, 10 Apr 2017 14:51:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438172 - in head/mail/mutt: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2017 14:51:52 -0000 Author: adamw Date: Mon Apr 10 14:51:50 2017 New Revision: 438172 URL: https://svnweb.freebsd.org/changeset/ports/438172 Log: Regenerate the maildir-mtime-nntp patch. It was being fuzzy applied in the wrong place previously. PORTREVISION bump for this. Submitted by: dereks lifeofadishwasher com (maintainer) Differential Revision: https://reviews.freebsd.org/D10334 Modified: head/mail/mutt/Makefile head/mail/mutt/files/extra-patch-maildir-mtime-nntp Modified: head/mail/mutt/Makefile ============================================================================== --- head/mail/mutt/Makefile Mon Apr 10 14:41:32 2017 (r438171) +++ head/mail/mutt/Makefile Mon Apr 10 14:51:50 2017 (r438172) @@ -3,7 +3,7 @@ PORTNAME= mutt PORTVERSION= 1.8.0 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ Modified: head/mail/mutt/files/extra-patch-maildir-mtime-nntp ============================================================================== --- head/mail/mutt/files/extra-patch-maildir-mtime-nntp Mon Apr 10 14:41:32 2017 (r438171) +++ head/mail/mutt/files/extra-patch-maildir-mtime-nntp Mon Apr 10 14:51:50 2017 (r438172) @@ -1,16 +1,19 @@ ---- PATCHES Dec 2002 17:44:54 -0000 3.6 -+++ PATCHES Feb 2004 13:19:42 -0000 +--- PATCHES.orig 2017-04-09 21:00:46 UTC ++++ PATCHES @@ -0,0 +1 @@ +patch-1.5.7.ust.maildir-mtime.2 ---- browser.c.orig Tue Feb 8 10:29:57 2005 -+++ browser.c Tue Feb 8 10:29:58 2005 -@@ -31,4 +31,5 @@ +--- browser.c.orig 2017-04-09 20:49:44 UTC ++++ browser.c +@@ -35,6 +35,7 @@ + #ifdef USE_NNTP #include "nntp.h" #endif +#include "mx.h" #include -@@ -473,4 +474,19 @@ + #include +@@ -545,6 +546,21 @@ static void init_state (struct browser_s + menu->data = state->entry; } +static void check_maildir_times (BUFFY *buf, struct stat *st) @@ -30,15 +33,20 @@ + /* get list of all files/newsgroups with mask */ static int examine_directory (MUTTMENU *menu, struct browser_state *state, -@@ -562,4 +578,5 @@ + char *d, const char *prefix) +@@ -634,6 +650,7 @@ static int examine_directory (MUTTMENU * + tmp = Incoming; while (tmp && mutt_strcmp (buffer, tmp->path)) tmp = tmp->next; + check_maildir_times (tmp, &s); - add_folder (menu, state, de->d_name, &s, NULL, (tmp) ? tmp->new : 0); - } -@@ -637,4 +654,5 @@ - mutt_pretty_mailbox (buffer); + if (tmp && Context && + !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)); + check_maildir_times (tmp, &s); - add_folder (menu, state, buffer, &s, NULL, tmp->new); + add_folder (menu, state, buffer, &s, tmp, NULL); } + while ((tmp = tmp->next));