- Update to 1.7.1

- Move some vars around to make portlint happy
- Use MUTT_LITE instead of LITE
- Fetch deepif and date-contitional from remote locations
- Reword COMMENT
- Bring back remote patch versions incase mutt version and patch
  versions arn't in sync
- Remove date_conditional patch pulled in remotely
- Add two new sidebar samples
- convert patch-* patches to makepatch patches
- Greeting patch 1.7.1 now PATCHFILE
- make makesum will pull all optional dist/patchfiles

PR:		213431
Submitted by:	maintainer (dereks lifeofadishwasher com)

1 files changed, 0 insertions, 147 deletions

diff --git a/mail/mutt/files/patch-date-conditional b/mail/mutt/files/patch-date-conditional
deleted file mode 100644
index 56662cf0360b..000000000000
--- a/mail/mutt/files/patch-date-conditional
+++ /dev/null
@@ -1,147 +0,0 @@
---- PATCHES~	never
-+++ PATCHES	Thu Jun 13 16:25:05 CDT 2002
-@@ -0,0 +1 @@
-+dgc.deepif.1
-diff -Pur mutt-1.5.1-base/muttlib.c mutt-1.5.1/muttlib.c
---- muttlib.c	Tue Mar 26 16:47:06 2002
-+++ muttlib.c	Thu Jun 13 15:28:20 2002
-@@ -978,6 +978,12 @@
- 	count = 0;
-         while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&')
- 	{
-+	  if (*src == '\\')
-+	  {
-+	    src++;
-+	    if (!*src)
-+	      break;
-+	  }
-           *cp++ = *src++;
- 	  count++;
- 	}
-@@ -990,7 +996,13 @@
- 	count = 0;
- 	while (count < sizeof (elsestring) && *src && *src != '?')
- 	{
--	  *cp++ = *src++;
-+	  if (*src == '\\')
-+	  {
-+	    src++;
-+	    if (!*src)
-+	      break;
-+	  }
-+          *cp++ = *src++;
- 	  count++;
- 	}
- 	*cp = 0;
-Index: PATCHES
-===================================================================
---- PATCHES	(revision 22)
-+++ PATCHES	(revision 22)
-@@ -0,0 +1 @@
-+patch-1.5.0.ats.date_conditional.1
-Index: muttlib.c
-===================================================================
---- muttlib.c	(revision 22)
-+++ muttlib.c	(revision 22)
-@@ -944,7 +944,16 @@
-       if (*src == '?')
-       {
- 	flags |= MUTT_FORMAT_OPTIONAL;
--	src++;
-+	ch = *(++src); /* save the character to switch on */
-+	cp = prefix;
-+	++src;
-+	count = 0;
-+	while (count < sizeof (prefix) && *src != '?')
-+	{
-+	  *cp++ = *src++;
-+	  count++;
-+	}
-+	*cp = 0;
-       }
-       else
-       {
-@@ -960,12 +969,12 @@
- 	  count++;
- 	}
- 	*cp = 0;
--      }
- 
--      if (!*src)
--	break; /* bad format */
-+	if (!*src)
-+	  break; /* bad format */
- 
--      ch = *src++; /* save the character to switch on */
-+	ch = *src++; /* save the character to switch on */
-+      }
- 
-       if (flags & M_FORMAT_OPTIONAL)
-       {
---- hdrline.c.orig	Tue Jun 29 15:01:28 2004
-+++ hdrline.c	Tue Jun 29 15:02:59 2004
-@@ -316,6 +316,64 @@
- 	const char *cp;
- 	struct tm *tm; 
- 	time_t T;
-+	int i = 0, invert = 0;
-+
-+	if (optional && (op == '[' || op == '(')) {
-+	  char *is;
-+          int d;
-+	  T = time(NULL);
-+	  tm = localtime(&T);
-+	  d = (T + tm->tm_gmtoff) % 86400;
-+	  T -= (op == '(') ? hdr->received : hdr->date_sent;
-+
-+	  is = (char *)prefix;
-+	  if( *is == '>' ) {
-+	    invert = 1;
-+	    ++is;
-+	  }
-+
-+	  while( *is && *is != '?' ) {
-+	    int t = strtol (is, &is, 10);
-+	    switch (*(is++)) {
-+	      case '?':
-+		break;
-+	      case 'y':
-+		t *= 365 * 24 * 60 * 60;
-+		break;
-+	      case 'M':
-+		t *= 30 * 24 * 60 * 60;
-+		break;
-+	      case 'w':
-+		t *= 7 * 24 * 60 * 60;
-+		break;
-+	      case 'd':
-+		t *= 24 * 60 * 60;
-+		break;
-+	      case 't':
-+		if (t > 1) {
-+		  t = (t-1) * 24 * 60 * 60;
-+		} else {
-+		  t = 0;
-+		}
-+		t += d;
-+		break;
-+	      case 'h':
-+		t *= 60 * 60;
-+		break;
-+	      case 'm':
-+		t *= 60;
-+		break;
-+	    }
-+	    i += t;
-+	  }
-+
-+	  if (i < 0)
-+	    i *= -1;
-+
-+	  if( (T > i || T < -1*i) ^ invert )
-+	    optional = 0;
-+	  break;
-+	}
- 
- 	p = dest;
-