Date: Sun, 6 Jun 2004 08:04:00 +0200 (CEST) From: Udo Schweigert <udo.schweigert@siemens.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/67619: maintainer-update of mail/mutt-devel Message-ID: <200406060604.i56640WP037384@alaska.cert.siemens.com> Resent-Message-ID: <200406060610.i566ALQe029809@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67619 >Category: ports >Synopsis: maintainer-update of mail/mutt-devel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jun 05 23:10:21 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Udo Schweigert >Release: FreeBSD 4.9-STABLE i386 >Organization: >Environment: >Description: Maintainer update of mail/mutt-devel: - Add the color_after_eol option (after several discussions on the mutt-users mailing list) to be able to behave like mutt-1.4.x. - Remove a non-working site from PATCH_SITES (pointed out by portsurvey) - Bump portrevision. >How-To-Repeat: >Fix: diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile --- /usr/ports/mail/mutt-devel/Makefile Sat Jun 5 06:06:18 2004 +++ ./Makefile Sat Jun 5 09:23:40 2004 @@ -81,7 +81,7 @@ PORTNAME= mutt-devel PORTVERSION= 1.5.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= mail ipv6 .if defined(WITH_MUTT_NNTP) CATEGORIES+= news @@ -96,7 +96,6 @@ http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://www3.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \ - ftp://ftp2.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \ ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \ http://cedricduval.free.fr/mutt/patches/download/:cd \ http://home.woolridge.ca/mutt/patches/:dw diff -ru /usr/ports/mail/mutt-devel/files/patch-color-eol ./files/patch-color-eol --- /usr/ports/mail/mutt-devel/files/patch-color-eol Thu Jan 1 01:00:00 1970 +++ ./files/patch-color-eol Sat Jun 5 09:14:44 2004 @@ -0,0 +1,62 @@ +--- mutt.h.orig Fri Jun 4 13:35:59 2004 ++++ mutt.h Fri Jun 4 13:49:26 2004 +@@ -350,6 +350,7 @@ + OPTBEEPNEW, + OPTBOUNCEDELIVERED, + OPTCHECKNEW, ++ OPTCOLORAFTEREOL, + OPTCOLLAPSEUNREAD, + OPTCONFIRMAPPEND, + OPTCONFIRMCREATE, +--- init.h.orig Fri Jun 4 13:35:56 2004 ++++ init.h Fri Jun 4 13:45:43 2004 +@@ -315,6 +315,12 @@ + ** \fIcheck_new\fP is \fIunset\fP, no check for new mail is performed + ** while the mailbox is open. + */ ++ { "color_after_eol", DT_BOOL, R_NONE, OPTCOLORAFTEREOL, 1 }, ++ /* ++ ** .pp ++ ** When \fIset\fP, Mutt will color a line after the last character extending ++ ** to the end of the window. ++ */ + { "collapse_unread", DT_BOOL, R_NONE, OPTCOLLAPSEUNREAD, 1 }, + /* + ** .pp +--- pager.c.orig Sat Jun 5 09:13:33 2004 ++++ pager.c Sat Jun 5 09:12:31 2004 +@@ -1392,7 +1392,7 @@ + * ncurses does an implicit clrtoeol() when you do addch('\n') so we have + * to make sure to reset the color *after* that + */ +- if (flags & M_SHOWCOLOR) ++ if (option (OPTCOLORAFTEREOL) && (flags & M_SHOWCOLOR)) + { + m = ((*lineInfo)[n].continuation) ? ((*lineInfo)[n].syntax)[0].first : n; + if ((*lineInfo)[m].type == MT_COLOR_HEADER) +@@ -1406,6 +1406,16 @@ + #endif + } + ++ /* ++ * reset the color back to normal. This *must* come before the ++ * addch('\n') for the color not to be filled to the right margin. ++ */ ++ if (!option (OPTCOLORAFTEREOL) && (flags & M_SHOWCOLOR)) ++ { ++ SETCOLOR(MT_COLOR_NORMAL); ++ BKGDSET(MT_COLOR_NORMAL); ++ } ++ + /* ncurses always wraps lines when you get to the right side of the + * screen, but S-Lang seems to only wrap if the next character is *not* + * a newline (grr!). +@@ -1420,7 +1430,7 @@ + * addch('\n'), otherwise the color for this line will not be + * filled to the right margin. + */ +- if (flags & M_SHOWCOLOR) ++ if (option (OPTCOLORAFTEREOL) && (flags & M_SHOWCOLOR)) + { + SETCOLOR(MT_COLOR_NORMAL); + BKGDSET(MT_COLOR_NORMAL); diff -ru /usr/ports/mail/mutt-devel/scripts/generate-plist ./scripts/generate-plist --- /usr/ports/mail/mutt-devel/scripts/generate-plist Sun May 9 09:39:57 2004 +++ ./scripts/generate-plist Fri Jun 4 13:57:40 2004 @@ -131,7 +131,7 @@ fi if [ "$MUTT_HTML" = "yes" ]; then - html=370 + html=371 if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then html=$(($html + 5)) fi >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406060604.i56640WP037384>