Attachment 52107 Details for Bug 78990 – tin.diff

[patch] tin.diff

tin.diff (text/plain), 5.01 KB, created by Yen-Ming Lee on 2005-03-18 18:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yen-Ming Lee

Created: 2005-03-18 18:10:00 UTC

Size: 5.01 KB

patch

obsolete

>Index: chinese/tin/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/chinese/tin/Makefile,v
>retrieving revision 1.33
>diff -u -r1.33 Makefile
>--- chinese/tin/Makefile	9 Oct 2003 14:14:43 -0000	1.33
>+++ chinese/tin/Makefile	18 Mar 2005 17:56:46 -0000
>@@ -8,8 +8,6 @@
> 
> CATEGORIES=	chinese
> 
>-MASTERDIR=	${.CURDIR}/../../news/tin
>-
> MAINTAINER=	yssu@CCCA.NCTU.edu.tw
> 
> EXTRA_PATCHES=	${.CURDIR}/files/patch-attrib.c \
>@@ -18,7 +16,11 @@
> 		${.CURDIR}/files/patch-init.c \
> 		${.CURDIR}/files/patch-tin_defaults
> 
>-.include "${MASTERDIR}/Makefile"
>+MASTERDIR=	${.CURDIR}/../../news/tin
> 
>-CONFIGURE_ARGS+=	--disable-locale --with-screen=termcap \
>-			--with-mime-default-charset=Big5
>+MM_CHARSET=	Big5
>+SCREEN=		termcap
>+
>+CONFIGURE_ARGS=	--disable-locale
>+
>+.include "${MASTERDIR}/Makefile"
>Index: chinese/tin/files/patch-cook.c
>===================================================================
>RCS file: /home/pcvs/ports/chinese/tin/files/patch-cook.c,v
>retrieving revision 1.5
>diff -u -r1.5 patch-cook.c
>--- chinese/tin/files/patch-cook.c	9 Oct 2003 04:14:26 -0000	1.5
>+++ chinese/tin/files/patch-cook.c	18 Mar 2005 17:56:46 -0000
>@@ -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"))
>Index: news/tin/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/news/tin/Makefile,v
>retrieving revision 1.126
>diff -u -r1.126 Makefile
>--- news/tin/Makefile	11 Mar 2005 15:24:03 -0000	1.126
>+++ news/tin/Makefile	18 Mar 2005 17:56:46 -0000
>@@ -24,7 +24,10 @@
> USE_GMAKE=	yes
> USE_ICONV=	yes
> GNU_CONFIGURE=	yes
>-TIN_EDITOR?=	/usr/bin/ee
>+
>+EDITOR?=	/usr/bin/ee
>+MM_CHARSET?=	US-ASCII
>+SCREEN?=	ncurses
> 
> # --with-mime-default-charset=US-ASCII needed to build tin in the non-ascii
> # national environment.
>@@ -32,13 +35,12 @@
> 		--with-spooldir=/var/news \
> 		--with-libdir=${PREFIX}/news/lib \
> 		--with-defaults-dir=${PREFIX}/etc \
>-		--with-editor=${TIN_EDITOR} \
>-		--enable-nls \
>+		--with-editor=${EDITOR} \
> 		--with-pcre=yes \
>-		--with-screen=ncurses \
>+		--with-screen=${SCREEN} \
> 		--enable-break-long-lines \
> 		--with-libiconv-prefix=${LOCALBASE} \
>-		--with-mime-default-charset=US-ASCII
>+		--with-mime-default-charset=${MM_CHARSET}
> CONFIGURE_ENV=	CFLAGS='${CFLAGS} -DNNTP_SERVER_FILE="\"${PREFIX}/etc/nntpserver\""' \
> 		CPPFLAGS='${CPPFLAGS} -I${LOCALBASE}/include' \
> 		LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib'
>@@ -47,6 +49,13 @@
> MAN5=		tin.5 mbox.5 mmdf.5
> MLINKS=		tin.1 rtin.1
> 
>+.if !defined(WITHOUT_NLS)
>+PLIST_SUB+=	NLS=""
>+.else
>+PLIST_SUB+=	NLS="@comment "
>+CONFIGURE_ARGS+=--disable-nls
>+.endif
>+
> .if defined(WITH_TIN_NNTP_ONLY)
> CONFIGURE_ARGS+=	--enable-nntp-only
> .endif
>@@ -107,7 +116,9 @@
> .endif
> 
> post-build:
>+.if !defined(WITHOUT_NLS)
> 	cd ${WRKSRC}/po; ${GMAKE}
>+.endif
> 
> post-install:
> 	cd ${WRKSRC}/doc; ${INSTALL_DATA} tin.defaults ${PREFIX}/etc/tin.defaults.dist
>Index: news/tin/pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/news/tin/pkg-plist,v
>retrieving revision 1.13
>diff -u -r1.13 pkg-plist
>--- news/tin/pkg-plist	11 Mar 2005 15:24:03 -0000	1.13
>+++ news/tin/pkg-plist	18 Mar 2005 17:56:46 -0000
>@@ -12,7 +12,7 @@
> @exec [ -f %B/tin.defaults ] || cp %B/%f %B/tin.defaults
> etc/tin.mime.types.dist
> @exec [ -f %B/mime.types ] || cp %B/%f %B/mime.types
>-share/locale/de/LC_MESSAGES/tin.mo
>-share/locale/en_GB/LC_MESSAGES/tin.mo
>-share/locale/et/LC_MESSAGES/tin.mo
>-share/locale/fr/LC_MESSAGES/tin.mo
>+%%NLS%%share/locale/de/LC_MESSAGES/tin.mo
>+%%NLS%%share/locale/en_GB/LC_MESSAGES/tin.mo
>+%%NLS%%share/locale/et/LC_MESSAGES/tin.mo
>+%%NLS%%share/locale/fr/LC_MESSAGES/tin.mo

Actions: View | Diff

Attachments on bug 78990: 52107