From 782c3bd54ad443a1fd09c29ca91f9fc7a2bee6d2 Mon Sep 17 00:00:00 2001 From: krion Date: Mon, 14 Feb 2005 10:08:16 +0000 Subject: Update to version 1.5.8 PR: ports/77484 Submitted by: maintainer --- mail/mutt-devel/Makefile | 9 ++++- mail/mutt-devel/distinfo | 22 +++++------ mail/mutt-devel/files/extra-patch-edit-threads | 18 ++++----- .../files/extra-patch-maildir-header-cache | 44 ++++------------------ mail/mutt-devel/files/patch-Makefile.am | 24 ------------ mail/mutt-devel/files/patch-pgp.c | 11 ------ mail/mutt-devel/files/patch-threadcomplete | 16 ++++---- mail/mutt-devel/scripts/generate-plist | 5 ++- 8 files changed, 43 insertions(+), 106 deletions(-) delete mode 100644 mail/mutt-devel/files/patch-Makefile.am delete mode 100644 mail/mutt-devel/files/patch-pgp.c diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index e99cd811f071..daa6fc8e057e 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -92,8 +92,8 @@ # PORTNAME= mutt-devel -PORTVERSION= 1.5.7 -PORTREVISION= 1 +PORTVERSION= 1.5.8 +PORTREVISION= 0 CATEGORIES+= mail ipv6 .if defined(WITH_MUTT_NNTP) CATEGORIES+= news @@ -363,6 +363,7 @@ SGML_NEEDED= yes PATCHFILES+= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw .endif .if defined(WITH_MUTT_SIDEBAR_PATCH) +.error The WITH_MUTT_SIDEBAR_PATCH does not work at the moment. PATCHFILES+= patch-1.5.7i.sidebar.20050203.txt:thomer .endif @@ -397,6 +398,7 @@ CONFIGURE_ARGS+= --enable-hcache --without-gdbm --with-bdb .endif .if defined(WITH_MUTT_MAILDIR_HEADER_CACHE) SCRIPTS_ENV+= MUTT_MAILDIR_HEADER_CACHE="yes" +CONFIGURE_ARGS+= --disable-inodesort .endif .if defined(WITH_MUTT_SIDEBAR_PATCH) SCRIPTS_ENV+= MUTT_SIDEBAR_PATCH="yes" @@ -416,6 +418,9 @@ SCRIPTS_ENV+= MUTT_HTML="yes" .if !defined(WITHOUT_NLS) SCRIPTS_ENV+= MUTT_NLS="yes" .endif +.if defined(WITH_MUTT_IDN) +SCRIPTS_ENV+= MUTT_IDN="yes" +.endif .if !defined(NOPORTDOCS) SCRIPTS_ENV+= MUTT_PORTDOCS="yes" diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo index add8005e8a52..9d86bc56c74b 100644 --- a/mail/mutt-devel/distinfo +++ b/mail/mutt-devel/distinfo @@ -1,16 +1,14 @@ -MD5 (mutt/mutt-1.5.7i.tar.gz) = 395c699f1d00ee193f8f145b82d6afb7 -SIZE (mutt/mutt-1.5.7i.tar.gz) = 2990425 -MD5 (mutt/patch-1.5.7.rr.compressed.1.gz) = d001ab9fe475063a9d640a75f8dbbad5 -SIZE (mutt/patch-1.5.7.rr.compressed.1.gz) = 13770 -MD5 (mutt/patch-1.5.7.vvv.nntp.gz) = e2ad220c76ced7b519cea60ef67cc827 -SIZE (mutt/patch-1.5.7.vvv.nntp.gz) = 91881 -MD5 (mutt/patch-1.5.7.vvv.initials.gz) = 08e1772a0682a507ac5806c6d019c3b9 -SIZE (mutt/patch-1.5.7.vvv.initials.gz) = 699 -MD5 (mutt/patch-1.5.7.vvv.quote.gz) = 011d98d05d4d0866ea3a913935784e0f -SIZE (mutt/patch-1.5.7.vvv.quote.gz) = 1627 +MD5 (mutt/mutt-1.5.8i.tar.gz) = 9b9bdef4ef7107332f8782b3a910d00e +SIZE (mutt/mutt-1.5.8i.tar.gz) = 3010088 +MD5 (mutt/patch-1.5.8.rr.compressed.1.gz) = a45bd30996f98ba725bf479111cc9579 +SIZE (mutt/patch-1.5.8.rr.compressed.1.gz) = 13728 +MD5 (mutt/patch-1.5.8.vvv.nntp.gz) = b439b7cf7b7c83f4d392cc3e0cbe7aa2 +SIZE (mutt/patch-1.5.8.vvv.nntp.gz) = 92282 +MD5 (mutt/patch-1.5.8.vvv.initials.gz) = efcb8e77f504a046324ae5b1b59085f4 +SIZE (mutt/patch-1.5.8.vvv.initials.gz) = 687 +MD5 (mutt/patch-1.5.8.vvv.quote.gz) = 12f33e0520a68aec15e5c3e6993c4bc7 +SIZE (mutt/patch-1.5.8.vvv.quote.gz) = 1613 MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545 MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405 -MD5 (mutt/patch-1.5.7i.sidebar.20050203.txt) = e36f06d15f63e94f746c572900bfb9fa -SIZE (mutt/patch-1.5.7i.sidebar.20050203.txt) = 46003 diff --git a/mail/mutt-devel/files/extra-patch-edit-threads b/mail/mutt-devel/files/extra-patch-edit-threads index 4007238333da..34f9a78e9c57 100644 --- a/mail/mutt-devel/files/extra-patch-edit-threads +++ b/mail/mutt-devel/files/extra-patch-edit-threads @@ -17,17 +17,6 @@ diff -ru work.old/mutt-1.5.6/OPS work/mutt-1.5.6/OPS OP_MAIN_NEXT_NEW "jump to the next new message" OP_MAIN_NEXT_NEW_THEN_UNREAD "jump to the next new or unread message" OP_MAIN_NEXT_SUBTHREAD "jump to the next subthread" -diff -ru work.old/mutt-1.5.6/acconfig.h work/mutt-1.5.6/acconfig.h ---- acconfig.h Tue Jan 21 11:50:49 2003 -+++ acconfig.h Tue Feb 10 14:40:41 2004 -@@ -36,3 +36,7 @@ - * all return values other than (size_t)(-1) as equivalent. */ - #undef ICONV_NONTRANS - -+/* Do you want to use the rethreading functions with IMAP -+ * (--enable-imap-edit-threads) */ -+#undef IMAP_EDIT_THREADS -+ diff -ru work.old/mutt-1.5.6/config.h.in work/mutt-1.5.6/config.h.in --- config.h.in Sun Feb 1 18:18:21 2004 +++ config.h.in Tue Feb 10 14:40:41 2004 @@ -35,6 +24,13 @@ diff -ru work.old/mutt-1.5.6/config.h.in work/mutt-1.5.6/config.h.in * all return values other than (size_t)(-1) as equivalent. */ #undef ICONV_NONTRANS ++/* Do you want to use the rethreading functions with IMAP ++ * (--enable-imap-edit-threads) */ ++#undef IMAP_EDIT_THREADS ++ +--- /dev/null Sun Feb 13 11:16:10 2005 ++++ acconfig.h Sun Feb 13 11:15:44 2005 +@@ -0,0 +1,4 @@ +/* Do you want to use the rethreading functions with IMAP + * (--enable-imap-edit-threads) */ +#undef IMAP_EDIT_THREADS diff --git a/mail/mutt-devel/files/extra-patch-maildir-header-cache b/mail/mutt-devel/files/extra-patch-maildir-header-cache index 40df28ed3937..be2b5e998038 100644 --- a/mail/mutt-devel/files/extra-patch-maildir-header-cache +++ b/mail/mutt-devel/files/extra-patch-maildir-header-cache @@ -2,40 +2,10 @@ diff -Nru a/PATCHES b/PATCHES --- a/PATCHES +++ b/PATCHES @@ -0,0 +1 @@ -+patch-1.5.7.tg.hcache.1 -diff -Nru a/hcache.c b/hcache.c ---- a/hcache.c 2005-02-03 21:24:02 +01:00 -+++ b/hcache.c 2005-02-03 21:49:22 +01:00 -@@ -662,7 +662,7 @@ - safe_strcat (path, sizeof (path), filename); - - key.dptr = path; -- key.dsize = keylen(path); -+ key.dsize = strlen(h->folder) + keylen(path + strlen(h->folder)); - - data = gdbm_fetch(h->db, key); - -@@ -691,7 +691,7 @@ - safe_strcat (path, sizeof (path), filename); - - key.dptr = path; -- key.dsize = keylen(path); -+ key.dsize = strlen(h->folder) + keylen(path + strlen(h->folder)); - - data.dptr = mutt_hcache_dump(db, header, &data.dsize, uid_validity); - -@@ -717,7 +717,7 @@ - safe_strcat (path, sizeof (path), filename); - - key.dptr = path; -- key.dsize = keylen(path); -+ key.dsize = strlen(h->folder) + keylen(path + strlen(h->folder)); - - return gdbm_delete(h->db, key); - } ++mutt-cvs-header-cache.28 diff -Nru a/init.h b/init.h ---- a/init.h 2005-01-27 19:54:12 +01:00 -+++ b/init.h 2005-02-03 21:33:16 +01:00 +--- a/init.h 2005-01-27 20:54:24 +01:00 ++++ b/init.h 2005-01-28 15:12:41 +01:00 @@ -1032,6 +1032,13 @@ ** global header cache for all folders is used. Per default it is unset and so ** no header caching will be used. @@ -51,8 +21,8 @@ diff -Nru a/init.h b/init.h /* ** .pp diff -Nru a/mh.c b/mh.c ---- a/mh.c 2005-01-27 19:48:04 +01:00 -+++ b/mh.c 2005-02-03 21:35:59 +01:00 +--- a/mh.c 2005-01-27 20:45:37 +01:00 ++++ b/mh.c 2005-02-03 09:09:50 +01:00 @@ -787,6 +787,14 @@ return r; } @@ -223,8 +193,8 @@ diff -Nru a/mh.c b/mh.c static char *maildir_canon_filename (char *dest, const char *src, size_t l) diff -Nru a/mutt.h b/mutt.h ---- a/mutt.h 2005-01-27 19:53:51 +01:00 -+++ b/mutt.h 2005-02-03 21:32:14 +01:00 +--- a/mutt.h 2005-01-27 20:54:24 +01:00 ++++ b/mutt.h 2005-01-28 15:12:54 +01:00 @@ -353,6 +353,9 @@ OPTFORCENAME, OPTFORWDECODE, diff --git a/mail/mutt-devel/files/patch-Makefile.am b/mail/mutt-devel/files/patch-Makefile.am deleted file mode 100644 index 17576eefbe38..000000000000 --- a/mail/mutt-devel/files/patch-Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.am.orig Thu Feb 7 10:14:11 2002 -+++ Makefile.am Sun May 5 11:34:05 2002 -@@ -3,6 +3,7 @@ - - AUTOMAKE_OPTIONS = foreign - EXTRA_PROGRAMS = mutt_dotlock pgpring makedoc -+EXTRA_SCRIPTS = - - if BUILD_IMAP - IMAP_SUBDIR = imap -@@ -11,11 +12,11 @@ - - SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) - --bin_SCRIPTS = muttbug flea -+bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@ - - BUILT_SOURCES = keymap_defs.h patchlist.c - --bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@ -+bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ - mutt_SOURCES = $(BUILT_SOURCES) \ - addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ - commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \ diff --git a/mail/mutt-devel/files/patch-pgp.c b/mail/mutt-devel/files/patch-pgp.c deleted file mode 100644 index 216e21578bbc..000000000000 --- a/mail/mutt-devel/files/patch-pgp.c +++ /dev/null @@ -1,11 +0,0 @@ ---- pgp.c.orig Thu Jan 27 21:30:04 2005 -+++ pgp.c Fri Feb 4 13:14:04 2005 -@@ -209,7 +209,7 @@ - if (armor_header) - { - char *p = mutt_skip_whitespace (buf); -- if (*p == '\n') -+ if (*p == '\0') - armor_header = 0; - continue; - } diff --git a/mail/mutt-devel/files/patch-threadcomplete b/mail/mutt-devel/files/patch-threadcomplete index 235165ffdd43..6034ece2bd99 100644 --- a/mail/mutt-devel/files/patch-threadcomplete +++ b/mail/mutt-devel/files/patch-threadcomplete @@ -138,9 +138,9 @@ diff -Nru a/pattern.c b/pattern.c /* actions for mutt_pattern_comp/mutt_pattern_exec */ M_AND, ---- pattern.c.orig2 Mon Sep 6 09:24:10 2004 -+++ pattern.c Mon Sep 6 09:30:02 2004 -@@ -44,6 +44,7 @@ +--- pattern.c.orig2 Sun Feb 13 09:05:57 2005 ++++ pattern.c Sun Feb 13 09:08:06 2005 +@@ -48,6 +48,7 @@ } Flags[] = { @@ -148,10 +148,10 @@ diff -Nru a/pattern.c b/pattern.c { 'A', M_ALL, 0, NULL }, { 'b', M_BODY, M_FULL_MSG, eat_regexp }, { 'B', M_WHOLE_MSG, M_FULL_MSG, eat_regexp }, -@@ -1024,6 +1083,16 @@ - pat->alladdr, 2, h->env->to, h->env->cc)); +@@ -1085,6 +1086,16 @@ + pat->alladdr, 2, h->env->to, h->env->cc))); case M_LIST: - return (pat->not ^ mutt_is_list_recipient (pat->alladdr, h->env->to, h->env->cc)); + return (pat->not ^ (h->env && mutt_is_list_recipient (pat->alladdr, h->env->to, h->env->cc))); + case M_THREADCOMPLETE: + { static pattern_t tmp; + static short pattern_set = 0; @@ -160,8 +160,8 @@ diff -Nru a/pattern.c b/pattern.c + tmp.op = M_TAG; + pattern_set = 1; + } -+ return (pat->not ^ match_threadcomplete(&tmp, flags, ctx, h->thread, 1, 1, 1, 1)); ++ return (pat->not ^ (h->env && match_threadcomplete(&tmp, flags, ctx, h->thread, 1, 1, 1, 1))); + } case M_PERSONAL_RECIP: - return (pat->not ^ match_user (pat->alladdr, h->env->to, h->env->cc)); + return (pat->not ^ (h->env && match_user (pat->alladdr, h->env->to, h->env->cc))); case M_PERSONAL_FROM: diff --git a/mail/mutt-devel/scripts/generate-plist b/mail/mutt-devel/scripts/generate-plist index 740b8dc1bd0f..9a62e1ed2061 100644 --- a/mail/mutt-devel/scripts/generate-plist +++ b/mail/mutt-devel/scripts/generate-plist @@ -133,7 +133,7 @@ EOF fi if [ "$MUTT_HTML" = "yes" ]; then - html=380 + html=382 if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then html=$(($html + 5)) fi @@ -161,6 +161,9 @@ EOF if [ "$MUTT_IFDEF_PATCH" = "yes" ]; then html=$(($html + 1)) fi + if [ "$MUTT_IDN" = "yes" ]; then + html=$(($html + 1)) + fi if [ "$MUTT_SLAVE_HTML_PAGES" != "" ]; then html=$(($html + $MUTT_SLAVE_HTML_PAGES)) fi -- cgit