diff options
| author | Yen-Ming Lee <leeym@FreeBSD.org> | 2005-04-05 17:33:36 +0000 |
|---|---|---|
| committer | Yen-Ming Lee <leeym@FreeBSD.org> | 2005-04-05 17:33:36 +0000 |
| commit | bc83b141563fe66e8546da548b42b8fd0ebadee3 (patch) | |
| tree | e38514d6d48d6e6189a611333b6f16f2c0d4f108 /chinese/tin | |
| parent | b9d7d7e24b3c2fa54793f8cd23fdba5393d06e12 (diff) | |
| download | ports-bc83b141563fe66e8546da548b42b8fd0ebadee3.tar.gz ports-bc83b141563fe66e8546da548b42b8fd0ebadee3.zip | |
- update patch and unbreak this port
- take over the maintainership
PR: part of 78990
Submitted by: leeym
Approved by: ex-maintainer
Notes
Notes:
svn path=/head/; revision=132573
Diffstat (limited to 'chinese/tin')
| -rw-r--r-- | chinese/tin/Makefile | 13 | ||||
| -rw-r--r-- | chinese/tin/files/patch-cook.c | 17 |
2 files changed, 15 insertions, 15 deletions
diff --git a/chinese/tin/Makefile b/chinese/tin/Makefile index 3defdc8193f5..2e6938069376 100644 --- a/chinese/tin/Makefile +++ b/chinese/tin/Makefile @@ -8,11 +8,7 @@ CATEGORIES= chinese -MASTERDIR= ${.CURDIR}/../../news/tin - -MAINTAINER= yssu@CCCA.NCTU.edu.tw - -BROKEN= Fails to patch +MAINTAINER= leeym@FreeBSD.org EXTRA_PATCHES= ${.CURDIR}/files/patch-attrib.c \ ${.CURDIR}/files/patch-cook.c \ @@ -20,7 +16,10 @@ EXTRA_PATCHES= ${.CURDIR}/files/patch-attrib.c \ ${.CURDIR}/files/patch-init.c \ ${.CURDIR}/files/patch-tin_defaults +MASTERDIR= ${.CURDIR}/../../news/tin + +CONFIGURE_ARGS= --disable-locale + .include "${MASTERDIR}/Makefile" -CONFIGURE_ARGS+= --disable-locale --with-screen=termcap \ - --with-mime-default-charset=Big5 +CONFIGURE_ARGS+=--with-screen=termcap --with-mime-default-charset=Big5 diff --git a/chinese/tin/files/patch-cook.c b/chinese/tin/files/patch-cook.c index 82b650d951da..a51fbc0cb991 100644 --- a/chinese/tin/files/patch-cook.c +++ b/chinese/tin/files/patch-cook.c @@ -1,15 +1,16 @@ ---- 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 @@ +--- src/cook.c.orig Wed Dec 1 18:48:37 2004 ++++ src/cook.c Fri Mar 18 23:34:58 2005 +@@ -408,8 +408,13 @@ + if (!(line && strlen(line))) 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); + /* convert network to local charset, tex2iso, iso2asc etc. */ + 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); ++ 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); - + #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + if (IS_LOCAL_CHARSET("UTF-8")) |