>Number:         25634
>Category:       pkg
>Synopsis:       tcsh package's UTF-8 support broken
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed May 19 08:36:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Dave Huang
>Release:        NetBSD 2.0_BETA
>Organization:
Name: Dave Huang         |  Mammal, mammal / their names are called /
INet: khym@azeotrope.org |  they raise a paw / the bat, the cat /
FurryMUCK: Dahan         |  dolphin and dog / koala bear and hog -- TMBG
Dahan: Hani G Y+C 28 Y++ L+++ W- C++ T++ A+ E+ S++ V++ F- Q+++ P+ B+ PA+ PL++
>Environment:
	
	
System: NetBSD yerfable.azeotrope.org 2.0_BETA NetBSD 2.0_BETA (YERFABLE) #205: Wed May 12 21:06:04 CDT 2004 khym@yerfable.azeotrope.org:/usr2/obj.alpha/sys/arch/alpha/compile/YERFABLE alpha
Architecture: alpha
Machine: alpha
>Description:
	tcsh 6.12.00 has some UTF-8 support, but it doesn't work quite
right--I think it assumes that multibyte characters are either one or
two bytes long, which is not correct for UTF-8. Moving back and forth
through a commandline with Chinese characters, for example, will
corrupt the display.

	However, there is a patch that seems to fix the problems at:
ftp://ftp.tba.org.tohoku.ac.jp/pub/tcsh-6.12-utf8.patch.gz
>How-To-Repeat:
	Try to edit a commandline that contains Chinese characters (or
any other character that's 3 or more bytes long when encoded with
UTF-8).

>Fix:
	This updates the package to pull in the above UTF-8 patch.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/shells/tcsh/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- Makefile	18 Apr 2004 04:34:14 -0000	1.45
+++ Makefile	19 May 2004 08:33:15 -0000
@@ -2,12 +2,16 @@
 #
 
 DISTNAME=	tcsh-6.12.00
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/ \
 		ftp://ftp.gw.com/pub/unix/tcsh/ \
 		ftp://ftp.funet.fi/pub/unix/shells/tcsh/
 
+PATCH_SITES=	ftp://ftp.tba.org.tohoku.ac.jp/pub/
+PATCHFILES=	tcsh-6.12-utf8.patch.gz
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.tcsh.org/
 COMMENT=	Extended C-shell with many useful features
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/shells/tcsh/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo	15 Sep 2002 19:16:44 -0000	1.11
+++ distinfo	19 May 2004 08:33:15 -0000
@@ -2,8 +2,10 @@
 
 SHA1 (tcsh-6.12.00.tar.gz) = c54fd7a6823a4d30a4195f0fb9f31c6e2ddbd8e5
 Size (tcsh-6.12.00.tar.gz) = 824297 bytes
+SHA1 (tcsh-6.12-utf8.patch.gz) = d2fd12eb106a8e1dfb94cb02dba3e493659ae114
+Size (tcsh-6.12-utf8.patch.gz) = 7175 bytes
 SHA1 (patch-aa) = 51b96fff19fcfb55e6c841460c7a771c4678978f
-SHA1 (patch-ad) = 8cc4426557057c347525f384d862f6820e165fe7
+SHA1 (patch-ad) = aeef13e4ad4e7b7d718ab5f9a0a7a6d6bc3fd0eb
 SHA1 (patch-al) = abb131d38e0dc0e4970f3aaa0a026783949cd574
 SHA1 (patch-am) = f605aa65d75732c3950b8ba6c51eb5dfcc16d717
 SHA1 (patch-an) = faf86b1e81693d14cd9bd33839fa50bb91662ed6
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/shells/tcsh/patches/patch-ad,v
retrieving revision 1.6
diff -u -r1.6 patch-ad
--- patches/patch-ad	11 Aug 2002 05:11:18 -0000	1.6
+++ patches/patch-ad	19 May 2004 08:33:16 -0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.6 2002/08/11 05:11:18 kim Exp $
+$NetBSD$
 
---- config_f.h.orig	Fri Mar  8 12:36:45 2002
-+++ config_f.h	Sun Aug 11 00:19:17 2002
+--- config_f.h.orig	2004-05-19 03:14:38.000000000 -0500
++++ config_f.h	2004-05-19 03:13:11.000000000 -0500
 @@ -61,7 +61,11 @@
   *		if you don't have <nl_types.h>, you don't want
   *		to define this.
@@ -19,7 +19,7 @@
   *		be used with SHORT_STRINGS
   *
   */
--#undef KANJI
+-#define KANJI
 +#if defined(__NetBSD__)
 +# define KANJI
 +#else
@@ -31,7 +31,7 @@
   *		only output, when "dspmbyte" is set. Should be used with
   *		KANJI
   */
--#undef DSPMBYTE
+-#define DSPMBYTE
 +#if defined(__NetBSD__)
 +# define DSPMBYTE
 +#else

>Release-Note:
>Audit-Trail:
>Unformatted: