diff options
Diffstat (limited to 'mail/mutt14/files')
-rw-r--r-- | mail/mutt14/files/extra-patch-doc-ref | 12 | ||||
-rw-r--r-- | mail/mutt14/files/patch-Makefile.am | 22 | ||||
-rw-r--r-- | mail/mutt14/files/patch-Muttrc | 10 | ||||
-rw-r--r-- | mail/mutt14/files/patch-configure.in | 14 | ||||
-rw-r--r-- | mail/mutt14/files/patch-contrib-Makefile.in | 11 | ||||
-rw-r--r-- | mail/mutt14/files/patch-doc-Makefile.in | 21 | ||||
-rw-r--r-- | mail/mutt14/files/patch-doc-mutt.man | 34 | ||||
-rw-r--r-- | mail/mutt14/files/patch-doc_manual.sgml | 13 | ||||
-rw-r--r-- | mail/mutt14/files/patch-examples | 50 | ||||
-rw-r--r-- | mail/mutt14/files/patch-init.c | 39 | ||||
-rw-r--r-- | mail/mutt14/files/patch-m4-gssapi.m4 | 33 | ||||
-rw-r--r-- | mail/mutt14/files/patch-message.c | 11 | ||||
-rw-r--r-- | mail/mutt14/files/patch-mktemp | 15 | ||||
-rw-r--r-- | mail/mutt14/files/patch-staging-Makefile.am | 18 | ||||
-rw-r--r-- | mail/mutt14/files/patch-string-handling | 87 | ||||
-rw-r--r-- | mail/mutt14/files/patch-threadcomplete | 73 | ||||
-rw-r--r-- | mail/mutt14/files/patch-z | 40 |
17 files changed, 0 insertions, 503 deletions
diff --git a/mail/mutt14/files/extra-patch-doc-ref b/mail/mutt14/files/extra-patch-doc-ref deleted file mode 100644 index 99222e0bceb0..000000000000 --- a/mail/mutt14/files/extra-patch-doc-ref +++ /dev/null @@ -1,12 +0,0 @@ ---- doc/mutt.man.orig Mon Jul 13 12:50:38 1998 -+++ doc/mutt.man Thu Oct 1 22:15:40 1998 -@@ -20,7 +20,8 @@ - .SH DESCRIPTION - Mutt is a small but very powerful text based program for reading electronic - mail under unix operating systems, including support color terminals, MIME, --and a threaded sorting mode. -+and a threaded sorting mode. Details of how to use all of this is -+available in \fI${DOCSDIR}\fP. - .SH OPTIONS - .IP "-a \fIfile\fP" - Attach a file to your message using MIME. diff --git a/mail/mutt14/files/patch-Makefile.am b/mail/mutt14/files/patch-Makefile.am deleted file mode 100644 index 320a71259dc0..000000000000 --- a/mail/mutt14/files/patch-Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.am.orig 2007-05-23 03:17:52.000000000 +0200 -+++ Makefile.am 2015-12-29 17:27:11.713299000 +0100 -@@ -2,7 +2,7 @@ - ## Use aclocal -I m4; automake --foreign - - AUTOMAKE_OPTIONS = foreign --EXTRA_PROGRAMS = mutt_dotlock pgpring makedoc -+EXTRA_PROGRAMS = mutt_dotlock pgpewrap pgpring makedoc - - if BUILD_IMAP - IMAP_SUBDIR = imap -@@ -90,6 +90,10 @@ - pgpring_LDADD = @LIBOBJS@ $(INTLLIBS) - pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS) - -+pgpewrap_SOURCES = pgpewrap.c -+pgpewrap_LDADD = @LIBOBJS@ $(INTLLIBS) -+pgpewrap_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS) -+ - mutt_dotlock.c: dotlock.c - cp $(srcdir)/dotlock.c mutt_dotlock.c - diff --git a/mail/mutt14/files/patch-Muttrc b/mail/mutt14/files/patch-Muttrc deleted file mode 100644 index 3e50cbd13779..000000000000 --- a/mail/mutt14/files/patch-Muttrc +++ /dev/null @@ -1,10 +0,0 @@ ---- Muttrc.orig Sat May 13 08:30:44 2000 -+++ Muttrc Sat May 13 08:32:05 2000 -@@ -629,6 +629,7 @@ - # Type: boolean - # Default: yes - # -+set followup_to=no - # - # Controls whether or not the Mail-Followup-To header field is - # generated when sending mail. When set, Mutt will generate this diff --git a/mail/mutt14/files/patch-configure.in b/mail/mutt14/files/patch-configure.in deleted file mode 100644 index e255741da094..000000000000 --- a/mail/mutt14/files/patch-configure.in +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.in.orig 2007-05-26 17:58:12.000000000 -0700 -+++ configure.in 2012-05-03 18:04:49.000000000 -0700 -@@ -31,6 +31,2 @@ - AC_ISC_POSIX --AM_C_PROTOTYPES --if test "x$U" != "x"; then -- AC_MSG_ERROR(Compiler not ANSI compliant) --fi - AC_PROG_CPP -@@ -629,3 +625,3 @@ - if test x$GCC = xyes -a $mutt_cv_warnings = yes; then -- CFLAGS="-Wall -pedantic $CFLAGS" -+ CFLAGS="-Wall $CFLAGS" - fi diff --git a/mail/mutt14/files/patch-contrib-Makefile.in b/mail/mutt14/files/patch-contrib-Makefile.in deleted file mode 100644 index 71e216bd607c..000000000000 --- a/mail/mutt14/files/patch-contrib-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/Makefile.in.orig Mon Jun 4 19:14:31 2001 -+++ contrib/Makefile.in Mon Mar 21 08:12:59 2005 -@@ -20,7 +20,7 @@ - - subdir = contrib - --SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \ -+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \ - sample.muttrc sample.mailcap sample.muttrc-tlr - - DISTFILES = Makefile.in language.txt language50.txt \ diff --git a/mail/mutt14/files/patch-doc-Makefile.in b/mail/mutt14/files/patch-doc-Makefile.in deleted file mode 100644 index afeadc06b9d4..000000000000 --- a/mail/mutt14/files/patch-doc-Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ ---- doc/Makefile.in.orig 2007-05-23 03:17:52.000000000 +0200 -+++ doc/Makefile.in 2014-05-13 08:16:43.000000000 +0200 -@@ -98,18 +98,6 @@ - -rm -rf $(DESTDIR)$(docdir) - - check: --manual.txt: manual.sgml -- if sgml2txt -c latin manual ; then \ -- uniq < manual.txt | expand > _manual.txt ; \ -- rm manual.txt ; \ -- mv _manual.txt manual.txt ;\ -- fi -- --manual.html: manual.sgml -- sgml2html manual || true -- --manual.ps: manual.sgml -- sgml2latex --output=ps manual || true - - clean: - rm -f *~ *.html *.orig *.rej stamp-doc-sgml stamp-doc-man *.ps diff --git a/mail/mutt14/files/patch-doc-mutt.man b/mail/mutt14/files/patch-doc-mutt.man deleted file mode 100644 index 46e086721a76..000000000000 --- a/mail/mutt14/files/patch-doc-mutt.man +++ /dev/null @@ -1,34 +0,0 @@ ---- doc/mutt.man.orig Wed Jul 24 10:41:31 2002 -+++ doc/mutt.man Sun Oct 26 11:06:36 2003 -@@ -136,9 +136,9 @@ - User's personal mapping between MIME types and file extensions. - .IP "/etc/mime.types" - System mapping between MIME types and file extensions. --.IP "/usr/local/bin/mutt_dotlock" -+.IP "${PREFIX}/bin/mutt_dotlock" - The privileged dotlocking program. --.IP "/usr/local/doc/mutt/manual.txt" -+.IP "${DOCSDIR}/manual.txt" - The Mutt manual. - .SH BUGS - .PP ---- doc/muttrc.man Sun Oct 26 11:09:09 2003 -+++ doc/muttrc.man Sun Oct 26 11:08:48 2003 -@@ -990,7 +972,7 @@ - .B dotlock_program - .nf - Type: path --Default: \(lq/usr/local/bin/mutt_dotlock\(rq -+Default: \(lq${PREFIX}/bin/mutt_dotlock\(rq - .fi - .IP - Contains the path of the mutt_dotlock (8) binary to be used by -@@ -3970,7 +3952,7 @@ - instead of a raw socket. You may be able to use this to set up - preauthenticated connections to your IMAP/POP3 server. Example: - .IP --tunnel=\(rqssh -q mailhost.net /usr/local/libexec/imapd\(rq -+tunnel=\(rqssh -q mailhost.net ${PREFIX}/libexec/imapd\(rq - .IP - NOTE: For this example to work you must be able to log in to the remote - machine without having to enter a password. diff --git a/mail/mutt14/files/patch-doc_manual.sgml b/mail/mutt14/files/patch-doc_manual.sgml deleted file mode 100644 index b870f7f7aaec..000000000000 --- a/mail/mutt14/files/patch-doc_manual.sgml +++ /dev/null @@ -1,13 +0,0 @@ ---- doc/manual.sgml.orig Tue May 9 17:15:26 2000 -+++ doc/manual.sgml Fri May 12 11:05:40 2000 -@@ -1,5 +1,8 @@ --<!doctype linuxdoc system> -- -+<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [ -+<!ENTITY dquot """> -+]> -+<linuxdoc> -+ - <article> - - <title>The Mutt E-Mail Client diff --git a/mail/mutt14/files/patch-examples b/mail/mutt14/files/patch-examples deleted file mode 100644 index 2d24771033f7..000000000000 --- a/mail/mutt14/files/patch-examples +++ /dev/null @@ -1,50 +0,0 @@ ---- contrib/Makefile.in.orig Mon Jun 4 19:14:31 2001 -+++ contrib/Makefile.in Wed Mar 26 11:45:15 2003 -@@ -12,6 +12,7 @@ - mandir = @mandir@ - srcdir = @srcdir@ - docdir = @docdir@ -+samplesdir = @samplesdir@ - top_srcdir = @top_srcdir@ - top_builddir = .. - INSTALL = @INSTALL@ -@@ -37,12 +38,12 @@ - check: - - install: -- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(samplesdir) $(DESTDIR)$(samplesdir)/iconv - for f in $(SAMPLES) ; do \ -- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ; \ -+ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir); \ - done - for f in $(srcdir)/iconv/*.rc ; do \ -- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv ; \ -+ $(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv ; \ - done - - # Nothing needs to be done - uninstall in doc removes samples as well. ---- init.h.orig Wed Mar 26 11:50:36 2003 -+++ init.h Wed Mar 26 12:54:37 2003 -@@ -1347,8 +1347,8 @@ - ** .pp - ** For examples on how to configure these formats for the various versions - ** of PGP which are floating around, see the pgp*.rc and gpg.rc files in -- ** the samples/ subdirectory which has been installed on your system -- ** alongside the documentation. -+ ** the share/examples/mutt subdirectory which has been installed on your -+ ** system. - */ - { "pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, 0}, - /* ---- Makefile.am.orig Wed Mar 26 13:13:10 2003 -+++ Makefile.am Wed Mar 26 13:25:40 2003 -@@ -13,7 +13,7 @@ - - bin_SCRIPTS = muttbug flea - --BUILT_SOURCES = keymap_defs.h patchlist.c -+BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc - - bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ - mutt_SOURCES = $(BUILT_SOURCES) \ diff --git a/mail/mutt14/files/patch-init.c b/mail/mutt14/files/patch-init.c deleted file mode 100644 index 389b682cfa11..000000000000 --- a/mail/mutt14/files/patch-init.c +++ /dev/null @@ -1,39 +0,0 @@ ---- init.c.orig Wed Jul 24 10:41:29 2002 -+++ init.c Sat May 3 08:46:29 2003 -@@ -1707,7 +1707,11 @@ - void mutt_init (int skip_sys_rc, LIST *commands) - { - struct passwd *pw; -+#if __FreeBSD_version < 500000 -+ char nodename[STRING]; -+#else - struct utsname utsname; -+#endif - char *p, buffer[STRING], error[STRING]; - int i, default_rc = 0, need_pause = 0; - BUFFER err; -@@ -1765,16 +1769,21 @@ - #endif - - /* And about the host... */ -+#if __FreeBSD_version < 500000 -+ gethostname(nodename, sizeof (nodename)); -+#else - uname (&utsname); -+ strfcpy (nodename, utsname.nodename, sizeof (nodename)); -+#endif - /* some systems report the FQDN instead of just the hostname */ -- if ((p = strchr (utsname.nodename, '.'))) -+ if ((p = strchr (nodename, '.'))) - { -- Hostname = mutt_substrdup (utsname.nodename, p); -+ Hostname = mutt_substrdup (nodename, p); - p++; - strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */ - } - else -- Hostname = safe_strdup (utsname.nodename); -+ Hostname = safe_strdup (nodename); - - #ifndef DOMAIN - #define DOMAIN buffer diff --git a/mail/mutt14/files/patch-m4-gssapi.m4 b/mail/mutt14/files/patch-m4-gssapi.m4 deleted file mode 100644 index 43c8000c4825..000000000000 --- a/mail/mutt14/files/patch-m4-gssapi.m4 +++ /dev/null @@ -1,33 +0,0 @@ ---- m4/gssapi.m4.orig Wed Apr 17 19:05:04 2002 -+++ m4/gssapi.m4 Mon Oct 16 10:59:34 2006 -@@ -6,10 +6,13 @@ - dnl if it is set and not "yes". - dnl Defines GSSAPI_CFLAGS and GSSAPI_LIBS if found. - dnl Defines GSSAPI_IMPL to "Heimdal", "MIT", or "OldMIT", or "none" if not found --AC_DEFUN(MUTT_AM_PATH_GSSAPI, -+AC_DEFUN([MUTT_AM_PATH_GSSAPI], - [ - GSSAPI_PREFIX=[$]$1 - GSSAPI_IMPL="none" -+ saved_CPPFLAGS="$CPPFLAGS" -+ saved_LDFLAGS="$LDFLAGS" -+ saved_LIBS="$LIBS" - dnl First try krb5-config - if test "$GSSAPI_PREFIX" != "yes" - then -@@ -24,14 +27,11 @@ - GSSAPI_LIBS="$MUTTLIBS `$KRB5CFGPATH --libs gssapi`" - case "`$KRB5CFGPATH --version`" in - "Kerberos 5 "*) GSSAPI_IMPL="MIT";; -- [hH]eimdal*) GSSAPI_IMPL="Heimdal";; -+ *[[hH]]eimdal*) GSSAPI_IMPL="Heimdal";; - *) GSSAPI_IMPL="Unknown";; - esac - else - dnl No krb5-config, run the old code -- saved_CPPFLAGS="$CPPFLAGS" -- saved_LDFLAGS="$LDFLAGS" -- saved_LIBS="$LIBS" - if test "$GSSAPI_PREFIX" != "yes" - then - GSSAPI_CFLAGS="-I$GSSAPI_PREFIX/include" diff --git a/mail/mutt14/files/patch-message.c b/mail/mutt14/files/patch-message.c deleted file mode 100644 index ba2861e38ff8..000000000000 --- a/mail/mutt14/files/patch-message.c +++ /dev/null @@ -1,11 +0,0 @@ ---- imap/message.c.orig 2007-05-23 03:17:53.000000000 +0200 -+++ imap/message.c 2013-06-04 00:53:42.000000000 +0200 -@@ -435,7 +435,7 @@ - rewind (fp); - - imap_munge_mbox_name (mbox, sizeof (mbox), mailbox); -- snprintf (buf, sizeof (buf), "APPEND %s (\\Seen) {%d}", mbox, len); -+ snprintf (buf, sizeof (buf), "APPEND %s (\\Seen) {%lu}", mbox, (unsigned long)len); - - imap_cmd_start (idata, buf); - diff --git a/mail/mutt14/files/patch-mktemp b/mail/mutt14/files/patch-mktemp deleted file mode 100644 index 8fc82de528d7..000000000000 --- a/mail/mutt14/files/patch-mktemp +++ /dev/null @@ -1,15 +0,0 @@ ---- muttlib.c.orig Fri May 7 17:30:35 2004 -+++ muttlib.c Fri May 7 17:32:13 2004 -@@ -656,7 +656,11 @@ - - void mutt_mktemp (char *s) - { -- snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-%d-%d", NONULL (Tempdir), NONULL(Hostname), (int) getpid (), Counter++); -+ char t[7]; -+ snprintf (t, 7, "-%05d", Counter++); -+ snprintf (s, _POSIX_PATH_MAX-6, "%s/mutt-%s-XXXXXXXX", NONULL(Tempdir), NONULL(Hostname)); -+ mktemp (s); -+ strncat(s, t, 6); - unlink (s); - } - diff --git a/mail/mutt14/files/patch-staging-Makefile.am b/mail/mutt14/files/patch-staging-Makefile.am deleted file mode 100644 index bc3dbf4149d9..000000000000 --- a/mail/mutt14/files/patch-staging-Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ ---- Makefile.am.orig 2007-05-23 01:17:52 UTC -+++ Makefile.am -@@ -121,15 +121,6 @@ patchlist.c: $(srcdir)/PATCHES $(srcdir) - $(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c - - install-exec-local: -- if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then \ -- rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \ -- ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ -- fi -- if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \ -- chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \ -- chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \ -- { echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \ -- fi - - install-data-local: Muttrc - $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) diff --git a/mail/mutt14/files/patch-string-handling b/mail/mutt14/files/patch-string-handling deleted file mode 100644 index 13a52d9daa40..000000000000 --- a/mail/mutt14/files/patch-string-handling +++ /dev/null @@ -1,87 +0,0 @@ ---- curs_lib.c.old Wed Sep 1 19:39:20 1999 -+++ curs_lib.c Sun Sep 26 23:47:03 1999 -@@ -156,6 +156,16 @@ - def = 0; - break; - } -+ else if (tolower(ch.ch) == 'y') -+ { -+ def = 1; -+ break; -+ } -+ else if (tolower(ch.ch) == 'n') -+ { -+ def = 0; -+ break; -+ } - else - { - BEEP(); -@@ -413,8 +423,9 @@ - { - event_t ch; - int choice; -- char *p; -+ char *p, *nletters; - -+ nletters = _(letters); - mvaddstr (LINES - 1, 0, prompt); - clrtoeol (); - FOREVER -@@ -428,6 +439,12 @@ - } - else - { -+ p = strchr (nletters, ch.ch); -+ if (p) -+ { -+ choice = p - nletters + 1; -+ break; -+ } - p = strchr (letters, ch.ch); - if (p) - { ---- browser.c.orig Fri Sep 24 01:08:08 1999 -+++ browser.c Sun Sep 26 23:46:25 1999 -@@ -750,7 +750,7 @@ - switch (mutt_multi_choice ((reverse) ? - _("Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? ") : - _("Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "), -- _("dazn"))) -+ N_("dazn"))) - { - case -1: /* abort */ - resort = 0; ---- commands.c.orig Wed Jul 7 02:56:24 1999 -+++ commands.c Sun Sep 26 23:46:25 1999 -@@ -337,7 +337,7 @@ - switch (mutt_multi_choice (reverse ? - _("Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: ") : - _("Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "), -- _("dfrsotuzc"))) -+ N_("dfrsotuzc"))) - { - case -1: /* abort - don't resort */ - return -1; ---- compose.c.orig Mon Feb 12 18:02:38 2001 -+++ compose.c Fri Mar 30 17:04:09 2001 -@@ -130,7 +130,7 @@ - char input_signas[SHORT_STRING]; - - switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "), -- _("esabf"))) -+ N_("esabf"))) - { - case 1: /* (e)ncrypt */ - bits |= PGPENCRYPT; ---- muttlib.c.orig Sun Apr 9 14:39:02 2000 -+++ muttlib.c Fri May 12 11:26:58 2000 -@@ -671,7 +671,7 @@ - if (*append == 0 && access (fname, F_OK) == 0) - { - switch (mutt_multi_choice -- (_("File exists, (o)verwrite, (a)ppend, or (c)ancel?"), _("oac"))) -+ (_("File exists, (o)verwrite, (a)ppend, or (c)ancel?"), N_("oac"))) - { - case -1: /* abort */ - case 3: /* cancel */ diff --git a/mail/mutt14/files/patch-threadcomplete b/mail/mutt14/files/patch-threadcomplete deleted file mode 100644 index e4f56f261382..000000000000 --- a/mail/mutt14/files/patch-threadcomplete +++ /dev/null @@ -1,73 +0,0 @@ -written by Nicolas Rachinsky <nr@rachinsky.de> -http://www.rachinsky.de - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published -by the Free Software Foundation; version 2 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - ---- mutt-1.3.28.ori/mutt.h Thu Mar 14 19:22:25 2002 -+++ mutt.h Fri Mar 15 00:22:41 2002 -@@ -198,6 +198,7 @@ - M_LIMIT, - M_EXPIRED, - M_SUPERSEDED, -+ M_THREADCOMPLETE, - - /* actions for mutt_pattern_comp/mutt_pattern_exec */ - M_AND, ---- mutt-1.3.28.ori/pattern.c Thu Mar 14 19:22:26 2002 -+++ pattern.c Fri Mar 15 00:23:52 2002 -@@ -50,6 +50,7 @@ - } - Flags[] = - { -+ { 'a', M_THREADCOMPLETE, 0, NULL }, - { 'A', M_ALL, 0, NULL }, - { 'b', M_BODY, M_FULL_MSG, eat_regexp }, - { 'B', M_WHOLE_MSG, M_FULL_MSG, eat_regexp }, -@@ -957,6 +958,27 @@ - return alladdr; - } - -+static int match_threadcomplete(int flag,THREAD *t,int left,int up,int right,int down) -+{ -+ int a=0; -+ HEADER *h=NULL; -+ -+ if(! t)return 0; -+ h=t->message; -+ if(! flag && h && h->tagged)return 1; -+ if(flag && h && ! h->tagged) return 1; -+ -+ if(up)a=match_threadcomplete(flag,t->parent,1,1,1,0); -+ if(a)return a; -+ if(right && t->parent)a=match_threadcomplete(flag,t->next,0,0,1,1); -+ if(a)return a; -+ if(left && t->parent)a=match_threadcomplete(flag,t->prev,1,0,0,1); -+ if(a)return a; -+ if(down)a=match_threadcomplete(flag,t->child,1,0,1,1); -+ if(a)return a; -+ return 0; -+} -+ - /* flags - M_MATCH_FULL_ADDRESS match both personal and machine address */ - int -@@ -1053,6 +1075,8 @@ - return (pat->not ^ (h->env->x_label && regexec (pat->rx, h->env->x_label, 0, NULL, 0) == 0)); - case M_DUPLICATED: - return (pat->not ^ (h->thread && h->thread->duplicate_thread)); -+ case M_THREADCOMPLETE: -+ return ((h->thread && match_threadcomplete(pat->not,h->thread,1,1,1,1))); - } - mutt_error (_("error: unknown op %d (report this error)."), pat->op); - return (-1); ---- PATCHES~ Tue Nov 6 19:59:33 2001 -+++ PATCHES Tue Nov 6 19:59:42 2001 -@@ -1,0 +1 @@ -+1.3.28.nr.threadcomplete diff --git a/mail/mutt14/files/patch-z b/mail/mutt14/files/patch-z deleted file mode 100644 index b96407b9cc2b..000000000000 --- a/mail/mutt14/files/patch-z +++ /dev/null @@ -1,40 +0,0 @@ ---- Makefile.am.orig 2014-06-01 17:46:47.000000000 +0200 -+++ Makefile.am 2014-06-01 17:48:02.000000000 +0200 -@@ -11,7 +11,7 @@ - - SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) - --bin_SCRIPTS = muttbug flea -+bin_SCRIPTS = - - BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc - -@@ -135,16 +135,7 @@ - - install-data-local: Muttrc - $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) -- -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \ -- mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \ -- elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \ -- mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \ -- elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \ -- $(INSTALL) -m 644 $(srcdir)/Muttrc $(DESTDIR)$(sysconfdir) ; \ -- fi -- -if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \ -- $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \ -- fi -+ $(INSTALL) -m 644 $(srcdir)/Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample - - - # Don't make this one ChangeLog - it's intended to be ---- doc/Makefile.in.orig2 Thu Jan 6 15:45:57 2005 -+++ doc/Makefile.in Thu Jan 6 15:53:52 2005 -@@ -78,8 +78,6 @@ - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5 - ./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/mutt.1 -- ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1 -- echo ".so $(mandir)/man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1 - ./instdoc $(srcdir)/dotlock.man \ - $(DESTDIR)$(mandir)/man1/mutt_dotlock.1 - ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5 |