diff -ruN /usr/ports/chinese/tin/Makefile tin/Makefile --- /usr/ports/chinese/tin/Makefile Thu Jan 23 21:34:37 2003 +++ tin/Makefile Wed Oct 8 15:18:40 2003 @@ -13,6 +13,8 @@ MAINTAINER= yssu@CCCA.NCTU.edu.tw EXTRA_PATCHES= ${.CURDIR}/files/patch-attrib.c \ + ${.CURDIR}/files/patch-cook.c \ + ${.CURDIR}/files/patch-mail.c \ ${.CURDIR}/files/patch-init.c .include "${MASTERDIR}/Makefile" diff -ruN /usr/ports/chinese/tin/files/patch-cook.c tin/files/patch-cook.c --- /usr/ports/chinese/tin/files/patch-cook.c Thu Jan 1 08:00:00 1970 +++ tin/files/patch-cook.c Wed Oct 8 15:07:01 2003 @@ -0,0 +1,15 @@ +--- src/cook.c.orig Tue Aug 26 20:34:07 2003 ++++ src/cook.c Wed Oct 8 15:05:05 2003 +@@ -719,7 +719,12 @@ + break; /* premature end of file, file error etc. */ + + /* convert network to local charset, tex2iso, iso2asc etc. */ ++#ifndef CHARSET_CONVERSION + process_charsets(&line, &max_line_len, get_param(part->params, "charset"), tinrc.mm_local_charset, CURR_GROUP.attribute->tex2iso_conv && art->tex2iso); ++#else ++ // force to use undeclared_charset first ++ process_charsets(&line, &max_line_len, (CURR_GROUP.attribute->undeclared_charset) ? (CURR_GROUP.attribute->undeclared_charset) : get_param(part->params, "charset"), tinrc.mm_local_charset, CURR_GROUP.attribute->tex2iso_conv && art->tex2iso); ++#endif /* !CHARSET_CONVERSION */ + + len = (int) strlen(line); + diff -ruN /usr/ports/chinese/tin/files/patch-mail.c tin/files/patch-mail.c --- /usr/ports/chinese/tin/files/patch-mail.c Thu Jan 1 08:00:00 1970 +++ tin/files/patch-mail.c Wed Oct 8 15:07:07 2003 @@ -0,0 +1,15 @@ +--- src/mail.c.orig Sun Aug 10 21:27:36 2003 ++++ src/mail.c Wed Oct 8 14:52:42 2003 +@@ -327,7 +327,12 @@ + * + * TODO: change US-ASCII to UTF-8 when NNTP draft becomes RFC + */ ++#ifndef CHARSET_CONVERSION + process_charsets(&r, &r_len, "US-ASCII", tinrc.mm_local_charset, FALSE); ++#else ++ process_charsets(&r, &r_len, (CURR_GROUP.attribute->undeclared_charset) ? (CURR_GROUP.attribute->undeclared_charset) : "US-ASCII", tinrc.mm_local_charset, FALSE); ++#endif /* !CHARSET_CONVERSION */ ++ + group->description = convert_to_printable(r); + } +