Update to mutt 1.3.20.

Because we Chinese people have to deal with at least 2 charsets,
let's forget about the mutt / mutt-devel strategy. We just need
mutt 1.3.x.

7 files changed, 15 insertions, 71 deletions

diff --git a/chinese/mutt/Makefile b/chinese/mutt/Makefile
index 995dfc635321..57eeaa86d16a 100644
--- a/chinese/mutt/Makefile
+++ b/chinese/mutt/Makefile
@@ -8,15 +8,17 @@
 
 CATEGORIES=	chinese
 
-MASTERDIR=	${.CURDIR}/../../mail/mutt
+MASTERDIR=	${.CURDIR}/../../mail/mutt-devel
 
 MAINTAINER=	ycheng@sinica.edu.tw
 
-EXTRA_PATCHES=	${.CURDIR}/files/patch-init.h  \
-		${.CURDIR}/files/patch-parse.c  \
-		${.CURDIR}/files/patch-pgp.c  \
-		${.CURDIR}/files/patch-sendlib.c 
+PATCH_SITES=	http://www.cirx.org/~clive/dist/mutt13/
+PATCHFILES=	${PKGNAMEPREFIX}mutt-${PORTVERSION}.diff.gz
+PATCH_DIST_ARGS=	-d ${WRKDIR} --quiet
 
-.include "${MASTERDIR}/Makefile"
+WITH_MUTT_LOCALES_FIX=	yes
+
+MD5_FILE=	${.CURDIR}/distinfo
+PKGMESSAGE=	${.CURDIR}/pkg-message
 
-CONFIGURE_ARGS+= --enable-locales-fix
+.include "${MASTERDIR}/Makefile"
diff --git a/chinese/mutt/distinfo b/chinese/mutt/distinfo
new file mode 100644
index 000000000000..3893b3a8dc44
--- /dev/null
+++ b/chinese/mutt/distinfo
@@ -0,0 +1,2 @@
+MD5 (mutt/mutt-1.3.20i.tar.gz) = 802bf75acd19566848e29dff0aef9940
+MD5 (mutt/zh-mutt-1.3.20.diff.gz) = 2bb93d7071c4f5edb03f3939bb0cbdc3
diff --git a/chinese/mutt/files/patch-init.h b/chinese/mutt/files/patch-init.h
deleted file mode 100644
index 65b5a687ae08..000000000000
--- a/chinese/mutt/files/patch-init.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- init.h.orig	Tue Jul 18 15:47:08 2000
-+++ init.h	Mon Aug 14 02:50:40 2000
-@@ -261,7 +261,7 @@
-   ** When this variable is set, mutt will include Delivered-To headers when
-   ** bouncing messages.  Postfix users may wish to unset this variable.
-   */
--  { "charset",		DT_STR,	 R_NONE, UL &Charset, UL "iso-8859-1" },
-+  { "charset",		DT_STR,	 R_NONE, UL &Charset, UL "big5" },
-   /*
-   ** .pp
-   ** Character set your terminal uses to display and enter textual data.
-@@ -2043,7 +2043,7 @@
-   ** recipient.  The fifth character is used to indicate mail that was sent
-   ** by \fIyou\fP.
-   */
--  { "use_8bitmime",	DT_BOOL, R_NONE, OPTUSE8BITMIME, 0 },
-+  { "use_8bitmime",	DT_BOOL, R_NONE, OPTUSE8BITMIME, 1 },
-   /*
-   ** .pp
-   ** \fBWarning:\fP do not set this variable unless you are using a version
diff --git a/chinese/mutt/files/patch-parse.c b/chinese/mutt/files/patch-parse.c
deleted file mode 100644
index f2545cc43cb7..000000000000
--- a/chinese/mutt/files/patch-parse.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- parse.c.orig	Sat Apr 22 16:49:29 2000
-+++ parse.c	Sat Aug  5 14:25:02 2000
-@@ -407,10 +407,11 @@
-       else if (!mutt_strcasecmp ("description", line + 8))
-       {
- 	mutt_str_replace (&p->description, c);
--	rfc2047_decode (p->description, p->description, mutt_strlen (p->description) + 1);
-       }
-     }
-   }
-+  if (p->description) rfc2047_decode (p->description, p->description, mutt_strlen (p->description) + 1);
-+  if (p->filename) rfc2047_decode (p->filename, p->filename, mutt_strlen (p->filename) + 1);
-   p->offset = ftell (fp); /* Mark the start of the real data */
-   if (p->type == TYPETEXT && !p->subtype)
-     p->subtype = safe_strdup ("plain");
diff --git a/chinese/mutt/files/patch-pgp.c b/chinese/mutt/files/patch-pgp.c
deleted file mode 100644
index a282bce7df19..000000000000
--- a/chinese/mutt/files/patch-pgp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- pgp.c.orig	Sat Aug 12 11:03:44 2000
-+++ pgp.c	Sat Aug 12 11:05:23 2000
-@@ -1019,7 +1019,7 @@
- 	mutt_message_to_7bit(a, NULL);
-     }
-     else if (a->encoding == ENC8BIT)
--      a->encoding = ENCQUOTEDPRINTABLE;
-+      { /* Do nothing */ }
-     else if (a->encoding == ENCBINARY)
-       a->encoding = ENCBASE64;
-     else if (a->content && a->encoding != ENCBASE64 &&
diff --git a/chinese/mutt/files/patch-sendlib.c b/chinese/mutt/files/patch-sendlib.c
deleted file mode 100644
index e090696be5cb..000000000000
--- a/chinese/mutt/files/patch-sendlib.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- sendlib.c.orig	Fri Aug 11 11:28:58 2000
-+++ sendlib.c	Fri Aug 11 11:29:19 2000
-@@ -1825,13 +1825,14 @@
-   rfc2047_encode_adrlist (env->from);
-   rfc2047_encode_adrlist (env->mail_followup_to);
-   rfc2047_encode_adrlist (env->reply_to);
--
-+  /*
-   if (env->subject)
-   {
-     rfc2047_encode_string (buffer, sizeof (buffer) - 1,
- 			   (unsigned char *) env->subject);
-     mutt_str_replace (&env->subject, buffer);
-   }
-+  */
-   encode_headers (env->userhdrs);
- }
- 
diff --git a/chinese/mutt/pkg-message b/chinese/mutt/pkg-message
new file mode 100644
index 000000000000..1a8557999772
--- /dev/null
+++ b/chinese/mutt/pkg-message
@@ -0,0 +1,4 @@
+Please execute the following command if you encounter problem with
+legacy bbs:
+
+echo "set bbsislame=yes" >> ~/.muttrc