Fix Japanese message support, and enable multibyte character sets.

Note:  users of the meta key may want to "set nokanji" from now on.

Based on patches from Jun Yamashiro <yamajun@ofug.net> in PR 15274.

4 files changed, 47 insertions, 8 deletions

diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 6c379ec3d47..2c35224209d 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2002/08/10 13:02:56 kim Exp $
+# $NetBSD: Makefile,v 1.37 2002/08/11 05:11:17 kim Exp $
 #
 
 DISTNAME=	tcsh-6.12.00
@@ -41,7 +41,7 @@ post-install:
 	    german:ISO_8859-1:de:AT:CH:DE			\
 	    greek:ISO_8859-7:el:GR				\
 	    italian:ISO_8859-1:it:CH:IT				\
-	    ja:EUC:ja:JP					\
+	    ja:eucJP:ja:JP					\
 	    pl:ISO_8859-2:pl:PL					\
 	    russian:KOI8-R:ru:RU:SU				\
 	    spanish:ISO_8859-1:es:ES				\
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index 42d8afa6547..1323748b3a8 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2002/07/24 17:51:32 kim Exp $
+$NetBSD: distinfo,v 1.10 2002/08/11 05:11:17 kim Exp $
 
 SHA1 (tcsh-6.12.00.tar.gz) = c54fd7a6823a4d30a4195f0fb9f31c6e2ddbd8e5
 Size (tcsh-6.12.00.tar.gz) = 824297 bytes
 SHA1 (patch-aa) = 51b96fff19fcfb55e6c841460c7a771c4678978f
-SHA1 (patch-ad) = aa39de839e228bb1da8c38f67aa6f7019f040040
+SHA1 (patch-ad) = 8cc4426557057c347525f384d862f6820e165fe7
+SHA1 (patch-al) = abb131d38e0dc0e4970f3aaa0a026783949cd574
diff --git a/shells/tcsh/patches/patch-ad b/shells/tcsh/patches/patch-ad
index eb433c15c18..469132c5669 100644
--- a/shells/tcsh/patches/patch-ad
+++ b/shells/tcsh/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2002/04/11 15:26:47 abs Exp $
+$NetBSD: patch-ad,v 1.6 2002/08/11 05:11:18 kim Exp $
 
---- config_f.h.orig	Sun Jun 11 03:14:10 2000
-+++ config_f.h
-@@ -65,7 +65,11 @@
+--- config_f.h.orig	Fri Mar  8 12:36:45 2002
++++ config_f.h	Sun Aug 11 00:19:17 2002
+@@ -61,7 +61,11 @@
   *		if you don't have <nl_types.h>, you don't want
   *		to define this.
   */
@@ -15,3 +15,28 @@ $NetBSD: patch-ad,v 1.5 2002/04/11 15:26:47 abs Exp $
  
  /*
   * LOGINFIRST   Source ~/.login before ~/.cshrc
+@@ -113,14 +117,22 @@
+  *		be used with SHORT_STRINGS
+  *
+  */
+-#undef KANJI
++#if defined(__NetBSD__)
++# define KANJI
++#else
++# undef KANJI
++#endif
+ 
+ /*
+  * DSPMBYTE	add variable "dspmbyte" and display multi-byte string at
+  *		only output, when "dspmbyte" is set. Should be used with
+  *		KANJI
+  */
+-#undef DSPMBYTE
++#if defined(__NetBSD__)
++# define DSPMBYTE
++#else
++# undef DSPMBYTE
++#endif
+ 
+ /*
+  * MBYTEDEBUG	when "dspmbyte" is changed, set multi-byte checktable to
diff --git a/shells/tcsh/patches/patch-al b/shells/tcsh/patches/patch-al
new file mode 100644
index 00000000000..9038e168b03
--- /dev/null
+++ b/shells/tcsh/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2002/08/11 05:11:18 kim Exp $
+
+--- tc.const.c.orig	Sat Jul  6 18:21:07 2002
++++ tc.const.c	Sun Aug 11 00:31:39 2002
+@@ -157,7 +157,7 @@
+ 			    '\0' };
+ Char STRLANGEUCZH[]	= { '\0' };
+ Char STRLANGEUCZHB[]	= { '\0' };
+-#  elif defined(__FreeBSD__)
++#  elif (defined(__FreeBSD__) || defined(__NetBSD__))
+ Char STRLANGEUCJP[]	= { 'j', 'a', '_', 'J', 'P', '.', 'e', 'u', 'c', 'J',
+ 			    'P', '\0' };
+ Char STRLANGEUCJPB[]	= { 'j', 'a', '_', 'J', 'P', '.', 'E', 'U', 'C', '\0' };