Attachment #52107 for bug #78990

View | Details | Raw Unified | Return to bug 78990
Collapse All | Expand All





CATEGORIES=	chinese

MASTERDIR=	${.CURDIR}/../../news/tin

MAINTAINER=	yssu@CCCA.NCTU.edu.tw

EXTRA_PATCHES=	${.CURDIR}/files/patch-attrib.c \

		${.CURDIR}/files/patch-init.c \
		${.CURDIR}/files/patch-tin_defaults

MASTERDIR=	${.CURDIR}/../../news/tin

MM_CHARSET=	Big5
SCREEN=		termcap

CONFIGURE_ARGS=	--disable-locale

.include "${MASTERDIR}/Makefile"




--- 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
 		/* 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);
+#endif /* !CHARSET_CONVERSION */
 
 #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE)
 		if (IS_LOCAL_CHARSET("UTF-8"))

Lines 24-30 Link Here

(-)news/tin/Makefile (-5 / +16 lines)
24	USE_GMAKE= yes	24	USE_GMAKE= yes
25	USE_ICONV= yes	25	USE_ICONV= yes
26	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
27	TIN_EDITOR?= /usr/bin/ee	27
		28	EDITOR?= /usr/bin/ee
		29	MM_CHARSET?= US-ASCII
		30	SCREEN?= ncurses
28		31
29	# --with-mime-default-charset=US-ASCII needed to build tin in the non-ascii	32	# --with-mime-default-charset=US-ASCII needed to build tin in the non-ascii
30	# national environment.	33	# national environment.
Lines 32-44 Link Here
32	--with-spooldir=/var/news \	35	--with-spooldir=/var/news \
33	--with-libdir=${PREFIX}/news/lib \	36	--with-libdir=${PREFIX}/news/lib \
34	--with-defaults-dir=${PREFIX}/etc \	37	--with-defaults-dir=${PREFIX}/etc \
35	--with-editor=${TIN_EDITOR} \	38	--with-editor=${EDITOR} \
36	--enable-nls \
37	--with-pcre=yes \	39	--with-pcre=yes \
38	--with-screen=ncurses \	40	--with-screen=${SCREEN} \
39	--enable-break-long-lines \	41	--enable-break-long-lines \
40	--with-libiconv-prefix=${LOCALBASE} \	42	--with-libiconv-prefix=${LOCALBASE} \
41	--with-mime-default-charset=US-ASCII	43	--with-mime-default-charset=${MM_CHARSET}
42	CONFIGURE_ENV= CFLAGS='${CFLAGS} -DNNTP_SERVER_FILE="\"${PREFIX}/etc/nntpserver\""' \	44	CONFIGURE_ENV= CFLAGS='${CFLAGS} -DNNTP_SERVER_FILE="\"${PREFIX}/etc/nntpserver\""' \
43	CPPFLAGS='${CPPFLAGS} -I${LOCALBASE}/include' \	45	CPPFLAGS='${CPPFLAGS} -I${LOCALBASE}/include' \
44	LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib'	46	LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib'
Lines 47-52 Link Here
47	MAN5= tin.5 mbox.5 mmdf.5	49	MAN5= tin.5 mbox.5 mmdf.5
48	MLINKS= tin.1 rtin.1	50	MLINKS= tin.1 rtin.1
49		51
		52	.if !defined(WITHOUT_NLS)
		53	PLIST_SUB+= NLS=""
		54	.else
		55	PLIST_SUB+= NLS="@comment "
		56	CONFIGURE_ARGS+=--disable-nls
		57	.endif
		58
50	.if defined(WITH_TIN_NNTP_ONLY)	59	.if defined(WITH_TIN_NNTP_ONLY)
51	CONFIGURE_ARGS+= --enable-nntp-only	60	CONFIGURE_ARGS+= --enable-nntp-only
52	.endif	61	.endif
Lines 107-113 Link Here
107	.endif	116	.endif
108		117
109	post-build:	118	post-build:
		119	.if !defined(WITHOUT_NLS)
110	cd ${WRKSRC}/po; ${GMAKE}	120	cd ${WRKSRC}/po; ${GMAKE}
		121	.endif
111		122
112	post-install:	123	post-install:
113	cd ${WRKSRC}/doc; ${INSTALL_DATA} tin.defaults ${PREFIX}/etc/tin.defaults.dist	124	cd ${WRKSRC}/doc; ${INSTALL_DATA} tin.defaults ${PREFIX}/etc/tin.defaults.dist

Lines 12-18 Link Here

(-)news/tin/pkg-plist (-4 / +4 lines)
12	@exec [ -f %B/tin.defaults ] \|\| cp %B/%f %B/tin.defaults	12	@exec [ -f %B/tin.defaults ] \|\| cp %B/%f %B/tin.defaults
13	etc/tin.mime.types.dist	13	etc/tin.mime.types.dist
14	@exec [ -f %B/mime.types ] \|\| cp %B/%f %B/mime.types	14	@exec [ -f %B/mime.types ] \|\| cp %B/%f %B/mime.types
15	share/locale/de/LC_MESSAGES/tin.mo	15	%%NLS%%share/locale/de/LC_MESSAGES/tin.mo
16	share/locale/en_GB/LC_MESSAGES/tin.mo	16	%%NLS%%share/locale/en_GB/LC_MESSAGES/tin.mo
17	share/locale/et/LC_MESSAGES/tin.mo	17	%%NLS%%share/locale/et/LC_MESSAGES/tin.mo
18	share/locale/fr/LC_MESSAGES/tin.mo	18	%%NLS%%share/locale/fr/LC_MESSAGES/tin.mo

Return to bug 78990

Lines 8-15 Link Here

(-)chinese/tin/Makefile (-5 / +7 lines)
8		8
9	CATEGORIES= chinese	9	CATEGORIES= chinese
10		10
11	MASTERDIR= ${.CURDIR}/../../news/tin
12
13	MAINTAINER= yssu@CCCA.NCTU.edu.tw	11	MAINTAINER= yssu@CCCA.NCTU.edu.tw
14		12
15	EXTRA_PATCHES= ${.CURDIR}/files/patch-attrib.c \	13	EXTRA_PATCHES= ${.CURDIR}/files/patch-attrib.c \
Lines 18-24 Link Here
18	${.CURDIR}/files/patch-init.c \	16	${.CURDIR}/files/patch-init.c \
19	${.CURDIR}/files/patch-tin_defaults	17	${.CURDIR}/files/patch-tin_defaults
20		18
21	.include "${MASTERDIR}/Makefile"	19	MASTERDIR= ${.CURDIR}/../../news/tin
22		20
23	CONFIGURE_ARGS+= --disable-locale --with-screen=termcap \	21	MM_CHARSET= Big5
24	--with-mime-default-charset=Big5	22	SCREEN= termcap
		23
		24	CONFIGURE_ARGS= --disable-locale
		25
		26	.include "${MASTERDIR}/Makefile"

Lines 1-15 Link Here

(-)chinese/tin/files/patch-cook.c (-8 / +9 lines)
1	--- src/cook.c.orig Tue Aug 26 20:34:07 2003	1	--- src/cook.c.orig Wed Dec 1 18:48:37 2004
2	+++ src/cook.c Wed Oct 8 15:05:05 2003	2	+++ src/cook.c Fri Mar 18 23:34:58 2005
3	@@ -719,7 +719,12 @@	3	@@ -408,8 +408,13 @@
		4	if (!(line && strlen(line)))
4	break; /* premature end of file, file error etc. */	5	break; /* premature end of file, file error etc. */
5		6
6	/* convert network to local charset, tex2iso, iso2asc etc. */
7	+#ifndef CHARSET_CONVERSION	7	+#ifndef CHARSET_CONVERSION
8	process_charsets(&line, &max_line_len, get_param(part->params, "charset"), tinrc.mm_local_charset, CURR_GROUP.attribute->tex2iso_conv && art->tex2iso);	8	/* convert network to local charset, tex2iso, iso2asc etc. */
		9	process_charsets(&line, &max_line_len, get_param(part->params, "charset"), tinrc.mm_local_charset, curr_group->attribute->tex2iso_conv && art->tex2iso);
9	+#else	10	+#else
10	+ // force to use undeclared_charset first	11	+ // force to use undeclared_charset first
11	+ 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);	12	+ 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);
12	+#endif /* !CHARSET_CONVERSION */	13	+#endif /* !CHARSET_CONVERSION */
13		14
14	len = (int) strlen(line);	15	#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE)
15		16	if (IS_LOCAL_CHARSET("UTF-8"))