I've been using mblaze 1.3 for a week or two with the below patch, which just deletes everything in patches/ (all are upstream) and updates DISTNAME, REVISION, distinfo.
-- James diff /usr/ports commit - 83548194a42d7f57da82615fe837c246d5393768 path + /usr/ports blob - 2a9d003a311615d75ac4fa2882fb02f2437527a1 file + mail/mblaze/Makefile --- mail/mblaze/Makefile +++ mail/mblaze/Makefile @@ -1,7 +1,6 @@ COMMENT = set of Maildir utilities -DISTNAME = mblaze-1.2 -REVISION = 1 +DISTNAME = mblaze-1.3 CATEGORIES = mail HOMEPAGE = https://git.vuxu.org/mblaze/ blob - 551fa018c9d62d14c7b43b73c1481bef4c047578 file + mail/mblaze/distinfo --- mail/mblaze/distinfo +++ mail/mblaze/distinfo @@ -1,2 +1,2 @@ -SHA256 (mblaze-1.2.tar.gz) = UMFkyIzIO09SaRNB7hQGDaWm8YWehqpz/1ld5LQQA38= -SIZE (mblaze-1.2.tar.gz) = 99578 +SHA256 (mblaze-1.3.tar.gz) = 2yx73DfrL2rAcmMjKx1w1zPt+nCc3vh9tjquxP5k2jw= +SIZE (mblaze-1.3.tar.gz) = 102829 blob - abc75342ca8c00e55cc134d8995163d7887b2360 file + /dev/null --- mail/mblaze/patches/patch-man_mmime_1 +++ /dev/null @@ -1,20 +0,0 @@ -allow to relax body line length limit; backport of -https://git.vuxu.org/mblaze/commit/?id=e951b0ba27f878e4daa09c59a89e8f5196e31e07 - -Index: man/mmime.1 ---- man/mmime.1.orig -+++ man/mmime.1 -@@ -46,6 +46,13 @@ Override Content-Type for the toplevel part. - Defaults to - .Sq Li multipart/mixed . - .El -+.Sh ENVIRONMENT -+.Bl -tag -width Ds -+.It Ev MBLAZE_RELAXED_MIME -+If set, -+.Ic Nm Fl c -+will relax the body line length check and only consider bodies with lines -+longer than 998 characters need to be MIME formatted. - .Sh EXIT STATUS - .Ex -std - .Sh SEE ALSO blob - 6eda42f6e139f9c0e7242e111dd5eb0bb90a8166 file + /dev/null --- mail/mblaze/patches/patch-mdeliver_c +++ /dev/null @@ -1,19 +0,0 @@ -mrefile or mdeliver -M needs fattr for utimes(2), backport of -https://git.vuxu.org/mblaze/commit/?id=9d66764 - -Index: mdeliver.c ---- mdeliver.c.orig -+++ mdeliver.c -@@ -355,7 +355,11 @@ usage2: - if (argc != optind+1) - goto usage2; - -- xpledge("stdio rpath wpath cpath", ""); -+ xpledge("stdio rpath wpath cpath fattr", ""); -+ if (!preserve_mtime && !Mflag) { -+ /* drop fattr */ -+ xpledge("stdio rpath wpath cpath", ""); -+ } - - targetdir = argv[optind]; - blob - 948cdae136c8ba93e50ab2c266b4ab6c91fa0960 file + /dev/null --- mail/mblaze/patches/patch-mmime_c +++ /dev/null @@ -1,23 +0,0 @@ -allow to relax body line length limit; backport of -https://git.vuxu.org/mblaze/commit/?id=e951b0ba27f878e4daa09c59a89e8f5196e31e07 - -Index: mmime.c ---- mmime.c.orig -+++ mmime.c -@@ -517,6 +517,7 @@ check() - off_t linelen = 0; - off_t maxheadlinelen = 0; - off_t maxbodylinelen = 0; -+ off_t bodylinelenlimit = getenv("MBLAZE_RELAXED_MIME") ? 998 : 78; - - int c; - int l = -1; -@@ -554,7 +555,7 @@ check() - } - - if (bitlow == 0 && bithigh == 0 && -- maxheadlinelen < 998 && maxbodylinelen <= 78 && -+ maxheadlinelen < 998 && maxbodylinelen <= bodylinelenlimit && - l == '\n') - return 0; - else blob - ddef96825e43c06edfc2ef92033681226e47318d file + /dev/null --- mail/mblaze/patches/patch-t_1000-mmime_t +++ /dev/null @@ -1,29 +0,0 @@ -allow to relax body line length limit; backport of -https://git.vuxu.org/mblaze/commit/?id=e951b0ba27f878e4daa09c59a89e8f5196e31e07 - -Index: t/1000-mmime.t ---- t/1000-mmime.t.orig -+++ t/1000-mmime.t -@@ -2,7 +2,7 @@ - cd ${0%/*} - . ./lib.sh - --plan 17 -+plan 19 - - cat <<EOF >tmp - References: <aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@a> <bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb@b> <ccccccccccccccccccccccccccccccc@c> -@@ -124,3 +124,13 @@ Subject: inclusion without further content - EOF - - check 'no empty parts are generated after inclusion lines' '! mmime <tmp2 | mshow -t - | grep -q size=0' -+ -+cat <<EOF >tmp2 -+Subject: Strict mode -+ -+Body with lines longer than 78 characters -+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -+EOF -+ -+check 'body lines longer than 78 characters needs MIME formatting' '! mmime -c <tmp2' -+check 'MBLAZE_RELAXED_MIME allows body lines longer than 78 characters' 'MBLAZE_RELAXED_MIME= mmime -c <tmp2'
