10 files changed, 852 insertions, 61 deletions

diff --git a/chinese/eterm/Makefile b/chinese/eterm/Makefile
index ce3f4e818192..144f9012fba1 100644
--- a/chinese/eterm/Makefile
+++ b/chinese/eterm/Makefile
@@ -15,13 +15,15 @@ DISTNAME=	Eterm-${PORTVERSION}
 MAINTAINER=	keichii@iteration.net
 
 BUILD_DEPENDS=	man2html:${PORTSDIR}/textproc/man2html
+RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_IMLIB=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--enable-trans=imlib --enable-utmp --enable-multi-charset=kanji \
+CONFIGURE_ARGS=	--enable-trans=imlib --enable-multi-charset=big5 \
 		--enable-xim --with-theme-update
+
 CONFIGURE_ENV=	LIBS="-lxpg4"
 
 MAN1=		Eterm.1
diff --git a/chinese/eterm/files/patch-at b/chinese/eterm/files/patch-at
index d6fe33afeabf..91cbca5dfc4a 100644
--- a/chinese/eterm/files/patch-at
+++ b/chinese/eterm/files/patch-at
@@ -1,28 +1,495 @@
---- configure.orig	Mon Feb  7 22:00:40 2000
-+++ configure	Mon Feb  7 22:04:47 2000
-@@ -4835,16 +4835,16 @@
- 
- 	      DEF_FONT_IDX=0
- 	      MULTICHAR_ENCODING="eucj"
--	      FONT0="fixed"
--              FONT1="8x16"
--              FONT2="9x18"
--              FONT3="12x24"
--              FONT4="13x26"
-+	      FONT0="7x14"
-+              FONT1="a10"
-+              FONT2="r12"
-+              FONT3="8x16"
-+              FONT4="12x24"
- 	      MFONT0="k14"
--              MFONT1="jiskan16"
--              MFONT2="jiskan18"
--              MFONT3="jiskan24"
--              MFONT4="jiskan26"
-+              MFONT1="k10"
-+              MFONT2="k12"
-+              MFONT3="kanji16"
-+              MFONT4="kanji24"
-             elif test "$enableval" = "euc-kr" -o "$enableval" = "euckr"; then 
-               echo "$ac_t""euckr" 1>&6
-               cat >> confdefs.h <<\EOF
+--- configure.orig	Sat Jan 29 03:29:45 2000
++++ configure	Mon Dec 25 13:29:58 2000
+@@ -4881,6 +4881,18 @@
+               FONT2="fixed"
+               FONT3="8x13"
+               FONT4="9x15"
++            elif test "$enableval" = "big5" -o "$enableval" = "big5"; then 
++              echo "$ac_t""big5" 1>&6
++              cat >> confdefs.h <<\EOF
++#define MULTI_CHARSET 1
++EOF
++
++              DEF_FONT_IDX=0
++	      MULTICHAR_ENCODING="big5"
++              MFONT0="kc15f"
++              MFONT1="kc24f"
++              FONT0="kc8x15"
++              FONT1="kc12x24"
+             elif test "$enableval" = "no"; then
+               echo "$ac_t""no" 1>&6
+               DEF_FONT_IDX=2
+@@ -4973,7 +4985,7 @@
+ 
+ 
+ echo $ac_n "checking for XIM support""... $ac_c" 1>&6
+-echo "configure:4977: checking for XIM support" >&5
++echo "configure:4989: checking for XIM support" >&5
+ # Check whether --enable-xim or --disable-xim was given.
+ if test "${enable_xim+set}" = set; then
+   enableval="$enable_xim"
+@@ -4994,7 +5006,7 @@
+ fi
+ 
+ echo $ac_n "checking for Greek keyboard support""... $ac_c" 1>&6
+-echo "configure:4998: checking for Greek keyboard support" >&5
++echo "configure:5010: checking for Greek keyboard support" >&5
+ # Check whether --enable-greek or --disable-greek was given.
+ if test "${enable_greek+set}" = set; then
+   enableval="$enable_greek"
+@@ -5029,7 +5041,7 @@
+ 
+ 
+ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
+-echo "configure:5033: checking for XOpenDisplay in -lX11" >&5
++echo "configure:5045: checking for XOpenDisplay in -lX11" >&5
+ ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5037,7 +5049,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lX11 $X_LIBS $SUBLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5041 "configure"
++#line 5053 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5048,7 +5060,7 @@
+ XOpenDisplay()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5075,7 +5087,7 @@
+ fi
+ 
+ echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6
+-echo "configure:5079: checking for XextAddDisplay in -lXext" >&5
++echo "configure:5091: checking for XextAddDisplay in -lXext" >&5
+ ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5083,7 +5095,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXext $X_LIBS $SUBLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5087 "configure"
++#line 5099 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5094,7 +5106,7 @@
+ XextAddDisplay()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5122,7 +5134,7 @@
+ 
+ 
+ echo $ac_n "checking for XShapeQueryExtension in -lXext""... $ac_c" 1>&6
+-echo "configure:5126: checking for XShapeQueryExtension in -lXext" >&5
++echo "configure:5138: checking for XShapeQueryExtension in -lXext" >&5
+ ac_lib_var=`echo Xext'_'XShapeQueryExtension | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5130,7 +5142,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXext $X_LIBS $SUBLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5134 "configure"
++#line 5146 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5141,7 +5153,7 @@
+ XShapeQueryExtension()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5167,7 +5179,7 @@
+ 
+ # check if we need X_LOCALE definition
+ echo $ac_n "checking for _Xsetlocale in -lX11""... $ac_c" 1>&6
+-echo "configure:5171: checking for _Xsetlocale in -lX11" >&5
++echo "configure:5183: checking for _Xsetlocale in -lX11" >&5
+ ac_lib_var=`echo X11'_'_Xsetlocale | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5175,7 +5187,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lX11  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5179 "configure"
++#line 5191 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5186,7 +5198,7 @@
+ _Xsetlocale()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5221,7 +5233,7 @@
+ # check X11R6 for XIM
+ if test "$XIM" = "TRUE"; then
+   echo $ac_n "checking for XRegisterIMInstantiateCallback in -lX11""... $ac_c" 1>&6
+-echo "configure:5225: checking for XRegisterIMInstantiateCallback in -lX11" >&5
++echo "configure:5237: checking for XRegisterIMInstantiateCallback in -lX11" >&5
+ ac_lib_var=`echo X11'_'XRegisterIMInstantiateCallback | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5229,7 +5241,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lX11 $X_LIBS $SUBLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5233 "configure"
++#line 5245 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5240,7 +5252,7 @@
+ XRegisterIMInstantiateCallback()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5270,7 +5282,7 @@
+   # Extract the first word of "imlib-config", so it can be a program name with args.
+ set dummy imlib-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5274: checking for $ac_word" >&5
++echo "configure:5286: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_IMLIB_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5302,18 +5314,18 @@
+ 
+     if test "$prefix" = "NONE"; then
+       echo $ac_n "checking imlib-config for prefix""... $ac_c" 1>&6
+-echo "configure:5306: checking imlib-config for prefix" >&5
++echo "configure:5318: checking imlib-config for prefix" >&5
+       prefix="`$IMLIB_CONFIG --prefix`"
+       echo "$ac_t""$prefix" 1>&6
+     fi
+ 
+     echo $ac_n "checking imlib-config for the value of CFLAGS""... $ac_c" 1>&6
+-echo "configure:5312: checking imlib-config for the value of CFLAGS" >&5
++echo "configure:5324: checking imlib-config for the value of CFLAGS" >&5
+     CFLAGS="$CFLAGS `$IMLIB_CONFIG --cflags`"
+     echo "$ac_t""$CFLAGS" 1>&6
+ 
+     echo $ac_n "checking imlib-config for the value of GRLIBS""... $ac_c" 1>&6
+-echo "configure:5317: checking imlib-config for the value of GRLIBS" >&5
++echo "configure:5329: checking imlib-config for the value of GRLIBS" >&5
+     GRLIBS="$GRLIBS `$IMLIB_CONFIG --libs`"
+     echo "$ac_t""$GRLIBS" 1>&6
+ 
+@@ -5321,16 +5333,16 @@
+     LIBS="$GRLIBS"
+ 
+     echo $ac_n "checking the sanity of new compile/link flags""... $ac_c" 1>&6
+-echo "configure:5325: checking the sanity of new compile/link flags" >&5
++echo "configure:5337: checking the sanity of new compile/link flags" >&5
+     cat > conftest.$ac_ext <<EOF
+-#line 5327 "configure"
++#line 5339 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   echo "yes"
+ else
+@@ -5350,7 +5362,7 @@
+   if test "$IMLIB_CONFIG" = "no"; then
+ 
+     echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
+-echo "configure:5354: checking for png_get_valid in -lpng" >&5
++echo "configure:5366: checking for png_get_valid in -lpng" >&5
+ ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5358,7 +5370,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpng $SUBLIBS $X_LIBS -lz -lm $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5362 "configure"
++#line 5374 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5369,7 +5381,7 @@
+ png_get_valid()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5390,7 +5402,7 @@
+ fi
+ 
+     echo $ac_n "checking for jpeg_read_scanlines in -ljpeg""... $ac_c" 1>&6
+-echo "configure:5394: checking for jpeg_read_scanlines in -ljpeg" >&5
++echo "configure:5406: checking for jpeg_read_scanlines in -ljpeg" >&5
+ ac_lib_var=`echo jpeg'_'jpeg_read_scanlines | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5398,7 +5410,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ljpeg $SUBLIBS $X_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5402 "configure"
++#line 5414 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5409,7 +5421,7 @@
+ jpeg_read_scanlines()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5430,7 +5442,7 @@
+ fi
+ 
+     echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
+-echo "configure:5434: checking for TIFFOpen in -ltiff" >&5
++echo "configure:5446: checking for TIFFOpen in -ltiff" >&5
+ ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5438,7 +5450,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ltiff $SUBLIBS $X_LIBS -lm $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5442 "configure"
++#line 5454 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5449,7 +5461,7 @@
+ TIFFOpen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5470,7 +5482,7 @@
+ fi
+ 
+     echo $ac_n "checking for DGifOpenFileName in -lgif""... $ac_c" 1>&6
+-echo "configure:5474: checking for DGifOpenFileName in -lgif" >&5
++echo "configure:5486: checking for DGifOpenFileName in -lgif" >&5
+ ac_lib_var=`echo gif'_'DGifOpenFileName | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5478,7 +5490,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgif $SUBLIBS $X_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5482 "configure"
++#line 5494 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5489,7 +5501,7 @@
+ DGifOpenFileName()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5510,7 +5522,7 @@
+ fi
+ 
+     echo $ac_n "checking for DGifOpenFileName in -lungif""... $ac_c" 1>&6
+-echo "configure:5514: checking for DGifOpenFileName in -lungif" >&5
++echo "configure:5526: checking for DGifOpenFileName in -lungif" >&5
+ ac_lib_var=`echo ungif'_'DGifOpenFileName | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5518,7 +5530,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lungif $SUBLIBS $X_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5522 "configure"
++#line 5534 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5529,7 +5541,7 @@
+ DGifOpenFileName()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5550,7 +5562,7 @@
+ fi
+ 
+     echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
+-echo "configure:5554: checking for Imlib_init in -lImlib" >&5
++echo "configure:5566: checking for Imlib_init in -lImlib" >&5
+ ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5558,7 +5570,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lImlib $GRLIBS $SUBLIBS $X_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5562 "configure"
++#line 5574 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5569,7 +5581,7 @@
+ Imlib_init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5611,7 +5623,7 @@
+ # Extract the first word of "Eterm", so it can be a program name with args.
+ set dummy Eterm; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5615: checking for $ac_word" >&5
++echo "configure:5627: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_ETERM'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5653,7 +5665,7 @@
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5657: checking for $ac_word" >&5
++echo "configure:5669: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GCC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5715,7 +5727,7 @@
+   # Extract the first word of "dbx", so it can be a program name with args.
+ set dummy dbx; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5719: checking for $ac_word" >&5
++echo "configure:5731: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_DBX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5757,7 +5769,7 @@
+   # Extract the first word of "gdb", so it can be a program name with args.
+ set dummy gdb; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5761: checking for $ac_word" >&5
++echo "configure:5773: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GDB'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5799,7 +5811,7 @@
+   # Extract the first word of "pstack", so it can be a program name with args.
+ set dummy pstack; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5803: checking for $ac_word" >&5
++echo "configure:5815: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PSTACK'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5839,7 +5851,7 @@
+ 
+   fi
+   echo $ac_n "checking for U_STACK_TRACE in -lcl""... $ac_c" 1>&6
+-echo "configure:5843: checking for U_STACK_TRACE in -lcl" >&5
++echo "configure:5855: checking for U_STACK_TRACE in -lcl" >&5
+ ac_lib_var=`echo cl'_'U_STACK_TRACE | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5847,7 +5859,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5851 "configure"
++#line 5863 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5858,7 +5870,7 @@
+ U_STACK_TRACE()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5881,7 +5893,7 @@
+ fi
+ 
+ echo $ac_n "checking for Linux 2.1 or higher""... $ac_c" 1>&6
+-echo "configure:5885: checking for Linux 2.1 or higher" >&5
++echo "configure:5897: checking for Linux 2.1 or higher" >&5
+ OS_NAME=`uname -s`
+ if test "$OS_NAME" = "Linux"; then
+   OS_REV=`uname -r`
+@@ -5911,7 +5923,7 @@
+ 
+ if test -z "$HUMOR"; then
+ echo $ac_n "checking for life_signs in -lKenny""... $ac_c" 1>&6
+-echo "configure:5915: checking for life_signs in -lKenny" >&5
++echo "configure:5927: checking for life_signs in -lKenny" >&5
+ ac_lib_var=`echo Kenny'_'life_signs | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5919,7 +5931,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lKenny  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5923 "configure"
++#line 5935 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5930,7 +5942,7 @@
+ life_signs()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
diff --git a/chinese/eterm/files/patch-au b/chinese/eterm/files/patch-au
index 9bf3d08b3b68..514df442b2f5 100644
--- a/chinese/eterm/files/patch-au
+++ b/chinese/eterm/files/patch-au
@@ -1,6 +1,37 @@
---- themes/Eterm/theme.cfg.in.orig	Mon Feb  7 21:54:05 2000
-+++ themes/Eterm/theme.cfg.in	Mon Feb  7 21:55:37 2000
-@@ -248,10 +248,10 @@
+--- themes/Eterm/theme.cfg.in.orig	Fri Jan  7 23:51:12 2000
++++ themes/Eterm/theme.cfg.in	Mon Dec 25 13:33:16 2000
+@@ -84,25 +84,17 @@
+     font default @DEF_FONT_IDX@
+     font 0 @FONT0@
+     font 1 @FONT1@
+-    font 2 @FONT2@
+-    font 3 @FONT3@
+-    font 4 @FONT4@
+-    font 5 10x20
+-    font 6 12x24
+ #    font bold 7x14
+   end attributes
+ 
+ # The Multichar support options.  Same goes for these fonts as for the normal
+ # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
+ # or big5 or gb
+-#  begin multichar
+-#    font 0 @MFONT0@
+-#    font 1 @MFONT1@
+-#    font 2 @MFONT2@
+-#    font 3 @MFONT3@
+-#    font 4 @MFONT4@
+-#    encoding @MULTICHAR_ENCODING@
+-#  end multichar
++  begin multichar
++    font 0 @MFONT0@
++    font 1 @MFONT1@
++    encoding @MULTICHAR_ENCODING@
++  end multichar
+ 
+ # Define the imageclasses.
+   begin imageclasses
+@@ -248,10 +240,10 @@
  # The XIM support options.
  # input_method: set the name of your favorate input method program
  # preedit_type: OverTheSpot or OffTheSpot or Root
@@ -9,9 +40,18 @@
 -#    preedit_type OverTheSpot
 -#  end xim
 +  begin xim
-+    input_method kinput2
++    input_method xcin
 +    preedit_type OverTheSpot
 +  end xim
  
  # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
  # "off", or "false" for FALSE.
+@@ -342,7 +334,7 @@
+ #    line_space 2
+ 
+ # Value to use for $TERM
+-    term_name xterm
++    term_name xterm-color
+ 
+ # Program to exec (intended for use with themes)
+ #    exec foo
diff --git a/chinese/eterm/files/patch-av b/chinese/eterm/files/patch-av
index 5b1a54d147e5..7067cb9206bd 100644
--- a/chinese/eterm/files/patch-av
+++ b/chinese/eterm/files/patch-av
@@ -1,6 +1,37 @@
---- themes/auto/theme.cfg.in.orig	Mon Feb  7 22:07:25 2000
-+++ themes/auto/theme.cfg.in	Mon Feb  7 22:08:35 2000
-@@ -248,10 +248,10 @@
+--- themes/auto/theme.cfg.in.orig	Fri Jan  7 23:51:14 2000
++++ themes/auto/theme.cfg.in	Mon Dec 25 13:35:29 2000
+@@ -84,25 +84,16 @@
+     font default @DEF_FONT_IDX@
+     font 0 @FONT0@
+     font 1 @FONT1@
+-    font 2 @FONT2@
+-    font 3 @FONT3@
+-    font 4 @FONT4@
+-    font 5 10x20
+-    font 6 12x24
+-#    font bold 7x14
+   end attributes
+ 
+ # The Multichar support options.  Same goes for these fonts as for the normal
+ # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
+ # or big5 or gb
+-#  begin multichar
+-#    font 0 @MFONT0@
+-#    font 1 @MFONT1@
+-#    font 2 @MFONT2@
+-#    font 3 @MFONT3@
+-#    font 4 @MFONT4@
+-#    encoding @MULTICHAR_ENCODING@
+-#  end multichar
++  begin multichar
++    font 0 @MFONT0@
++    font 1 @MFONT1@
++    encoding @MULTICHAR_ENCODING@
++  end multichar
+ 
+ # Define the imageclasses.
+   begin imageclasses
+@@ -248,10 +239,10 @@
  # The XIM support options.
  # input_method: set the name of your favorate input method program
  # preedit_type: OverTheSpot or OffTheSpot or Root
@@ -9,9 +40,18 @@
 -#    preedit_type OverTheSpot
 -#  end xim
 +  begin xim
-+    input_method kinput2
++    input_method xcin
 +    preedit_type OverTheSpot
 +  end xim
  
  # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
  # "off", or "false" for FALSE.
+@@ -337,7 +328,7 @@
+ #    line_space 2
+ 
+ # Value to use for $TERM
+-    term_name xterm
++    term_name xterm-color
+ 
+ # Program to exec (intended for use with themes)
+ #    exec foo
diff --git a/chinese/eterm/files/patch-aw b/chinese/eterm/files/patch-aw
index 2c1af79a6e4b..0e6cbe2da619 100644
--- a/chinese/eterm/files/patch-aw
+++ b/chinese/eterm/files/patch-aw
@@ -1,6 +1,37 @@
---- themes/cEterm/theme.cfg.in.orig	Mon Feb  7 22:09:32 2000
-+++ themes/cEterm/theme.cfg.in	Mon Feb  7 22:10:07 2000
-@@ -247,10 +247,10 @@
+--- themes/cEterm/theme.cfg.in.orig	Fri Jan  7 23:51:16 2000
++++ themes/cEterm/theme.cfg.in	Mon Dec 25 13:36:20 2000
+@@ -83,25 +83,16 @@
+     font default @DEF_FONT_IDX@
+     font 0 @FONT0@
+     font 1 @FONT1@
+-    font 2 @FONT2@
+-    font 3 @FONT3@
+-    font 4 @FONT4@
+-    font 5 10x20
+-    font 6 12x24
+-#    font bold 7x14
+   end attributes
+ 
+ # The Multichar support options.  Same goes for these fonts as for the normal
+ # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
+ # or big5 or gb
+-#  begin multichar
+-#    font 0 @MFONT0@
+-#    font 1 @MFONT1@
+-#    font 2 @MFONT2@
+-#    font 3 @MFONT3@
+-#    font 4 @MFONT4@
+-#    encoding @MULTICHAR_ENCODING@
+-#  end multichar
++  begin multichar
++    font 0 @MFONT0@
++    font 1 @MFONT1@
++    encoding @MULTICHAR_ENCODING@
++  end multichar
+ 
+ # Define the imageclasses.
+   begin imageclasses
+@@ -247,10 +238,10 @@
  # The XIM support options.
  # input_method: set the name of your favorate input method program
  # preedit_type: OverTheSpot or OffTheSpot or Root
@@ -9,9 +40,18 @@
 -#    preedit_type OverTheSpot
 -#  end xim
 +  begin xim
-+    input_method kinput2
++    input_method xim
 +    preedit_type OverTheSpot
 +  end xim
  
  # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
  # "off", or "false" for FALSE.
+@@ -331,7 +322,7 @@
+ #    line_space 2
+ 
+ # Value to use for $TERM
+-    term_name xterm
++    term_name xterm-color
+ 
+ # Program to exec (intended for use with themes)
+ #    exec foo
diff --git a/chinese/eterm/files/patch-ax b/chinese/eterm/files/patch-ax
index 5480ef1fe617..8fde9d7f8025 100644
--- a/chinese/eterm/files/patch-ax
+++ b/chinese/eterm/files/patch-ax
@@ -1,6 +1,37 @@
---- themes/chooser/theme.cfg.in.orig	Mon Feb  7 22:10:53 2000
-+++ themes/chooser/theme.cfg.in	Mon Feb  7 22:11:31 2000
-@@ -248,10 +248,10 @@
+--- themes/chooser/theme.cfg.in.orig	Fri Jan  7 23:51:17 2000
++++ themes/chooser/theme.cfg.in	Mon Dec 25 13:36:58 2000
+@@ -84,25 +84,16 @@
+     font default @DEF_FONT_IDX@
+     font 0 @FONT0@
+     font 1 @FONT1@
+-    font 2 @FONT2@
+-    font 3 @FONT3@
+-    font 4 @FONT4@
+-    font 5 10x20
+-    font 6 12x24
+-#    font bold 7x14
+   end attributes
+ 
+ # The Multichar support options.  Same goes for these fonts as for the normal
+ # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
+ # or big5 or gb
+-#  begin multichar
+-#    font 0 @MFONT0@
+-#    font 1 @MFONT1@
+-#    font 2 @MFONT2@
+-#    font 3 @MFONT3@
+-#    font 4 @MFONT4@
+-#    encoding @MULTICHAR_ENCODING@
+-#  end multichar
++  begin multichar
++    font 0 @MFONT0@
++    font 1 @MFONT1@
++    encoding @MULTICHAR_ENCODING@
++  end multichar
+ 
+ # Define the imageclasses.
+   begin imageclasses
+@@ -248,10 +239,10 @@
  # The XIM support options.
  # input_method: set the name of your favorate input method program
  # preedit_type: OverTheSpot or OffTheSpot or Root
@@ -9,9 +40,18 @@
 -#    preedit_type OverTheSpot
 -#  end xim
 +  begin xim
-+    input_method kinput2
++    input_method xcin
 +    preedit_type OverTheSpot
 +  end xim
  
  # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
  # "off", or "false" for FALSE.
+@@ -332,7 +323,7 @@
+ #    line_space 2
+ 
+ # Value to use for $TERM
+-    term_name xterm
++    term_name xterm-color
+ 
+ # Program to exec (intended for use with themes)
+ #    exec foo
diff --git a/chinese/eterm/files/patch-ay b/chinese/eterm/files/patch-ay
index 3522c58bfcf5..65e707523509 100644
--- a/chinese/eterm/files/patch-ay
+++ b/chinese/eterm/files/patch-ay
@@ -1,6 +1,37 @@
---- themes/emacs/theme.cfg.in.orig	Mon Feb  7 22:12:28 2000
-+++ themes/emacs/theme.cfg.in	Mon Feb  7 22:12:49 2000
-@@ -248,10 +248,10 @@
+--- themes/emacs/theme.cfg.in.orig	Fri Jan  7 23:51:19 2000
++++ themes/emacs/theme.cfg.in	Mon Dec 25 13:37:28 2000
+@@ -84,25 +84,16 @@
+     font default @DEF_FONT_IDX@
+     font 0 @FONT0@
+     font 1 @FONT1@
+-    font 2 @FONT2@
+-    font 3 @FONT3@
+-    font 4 @FONT4@
+-    font 5 10x20
+-    font 6 12x24
+-#    font bold 7x14
+   end attributes
+ 
+ # The Multichar support options.  Same goes for these fonts as for the normal
+ # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
+ # or big5 or gb
+-#  begin multichar
+-#    font 0 @MFONT0@
+-#    font 1 @MFONT1@
+-#    font 2 @MFONT2@
+-#    font 3 @MFONT3@
+-#    font 4 @MFONT4@
+-#    encoding @MULTICHAR_ENCODING@
+-#  end multichar
++  begin multichar
++    font 0 @MFONT0@
++    font 1 @MFONT1@
++    encoding @MULTICHAR_ENCODING@
++  end multichar
+ 
+ # Define the imageclasses.
+   begin imageclasses
+@@ -248,10 +239,10 @@
  # The XIM support options.
  # input_method: set the name of your favorate input method program
  # preedit_type: OverTheSpot or OffTheSpot or Root
@@ -9,9 +40,18 @@
 -#    preedit_type OverTheSpot
 -#  end xim
 +  begin xim
-+    input_method kinput2
++    input_method xcin
 +    preedit_type OverTheSpot
 +  end xim
  
  # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
  # "off", or "false" for FALSE.
+@@ -332,7 +323,7 @@
+ #    line_space 2
+ 
+ # Value to use for $TERM
+-    term_name xterm
++    term_name xterm-color
+ 
+ # Program to exec (intended for use with themes)
+     exec emacs -nw
diff --git a/chinese/eterm/files/patch-az b/chinese/eterm/files/patch-az
index 6a71a95f1e1a..a577c3116f48 100644
--- a/chinese/eterm/files/patch-az
+++ b/chinese/eterm/files/patch-az
@@ -1,6 +1,39 @@
---- themes/irc/theme.cfg.in.orig	Mon Feb  7 22:13:53 2000
-+++ themes/irc/theme.cfg.in	Mon Feb  7 22:14:09 2000
-@@ -250,10 +250,10 @@
+--- themes/irc/theme.cfg.in.orig	Fri Jan  7 23:51:21 2000
++++ themes/irc/theme.cfg.in	Mon Dec 25 13:38:03 2000
+@@ -84,27 +84,16 @@
+     font default @DEF_FONT_IDX@
+     font 0 @FONT0@
+     font 1 @FONT1@
+-    font 2 @FONT2@
+-    font 3 @FONT3@
+-    font 4 @FONT4@
+-    font 5 8x13
+-    font 6 9x15
+-    font 7 10x20
+-    font 8 12x24
+-#    font bold 7x14
+   end attributes
+ 
+ # The Multichar support options.  Same goes for these fonts as for the normal
+ # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
+ # or big5 or gb
+-#  begin multichar
+-#    font 0 @MFONT0@
+-#    font 1 @MFONT1@
+-#    font 2 @MFONT2@
+-#    font 3 @MFONT3@
+-#    font 4 @MFONT4@
+-#    encoding @MULTICHAR_ENCODING@
+-#  end multichar
++  begin multichar
++    font 0 @MFONT0@
++    font 1 @MFONT1@
++    encoding @MULTICHAR_ENCODING@
++  end multichar
+ 
+ # Define the imageclasses.
+   begin imageclasses
+@@ -250,10 +239,10 @@
  # The XIM support options.
  # input_method: set the name of your favorate input method program
  # preedit_type: OverTheSpot or OffTheSpot or Root
@@ -9,9 +42,18 @@
 -#    preedit_type OverTheSpot
 -#  end xim
 +  begin xim
-+    input_method Ami
++    input_method xcin
 +    preedit_type OverTheSpot
 +  end xim
  
  # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
  # "off", or "false" for FALSE.
+@@ -339,7 +328,7 @@
+ #    line_space 2
+ 
+ # Value to use for $TERM
+-    term_name xterm
++    term_name xterm-color
+ 
+ # Program to exec (intended for use with themes)
+     exec irc
diff --git a/chinese/eterm/files/patch-ba b/chinese/eterm/files/patch-ba
index b50e94671e07..cc025c102627 100644
--- a/chinese/eterm/files/patch-ba
+++ b/chinese/eterm/files/patch-ba
@@ -1,6 +1,37 @@
---- themes/mutt/theme.cfg.in.orig	Mon Feb  7 22:14:53 2000
-+++ themes/mutt/theme.cfg.in	Mon Feb  7 22:15:08 2000
-@@ -194,10 +194,10 @@
+--- themes/mutt/theme.cfg.in.orig	Fri Jan  7 23:51:21 2000
++++ themes/mutt/theme.cfg.in	Mon Dec 25 13:38:25 2000
+@@ -84,25 +84,16 @@
+     font default @DEF_FONT_IDX@
+     font 0 @FONT0@
+     font 1 @FONT1@
+-    font 2 @FONT2@
+-    font 3 @FONT3@
+-    font 4 @FONT4@
+-    font 5 10x20
+-    font 6 12x24
+-#    font bold 7x14
+   end attributes
+ 
+ # The Multichar support options.  Same goes for these fonts as for the normal
+ # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
+ # or big5 or gb
+-#  begin multichar
+-#    font 0 @MFONT0@
+-#    font 1 @MFONT1@
+-#    font 2 @MFONT2@
+-#    font 3 @MFONT3@
+-#    font 4 @MFONT4@
+-#    encoding @MULTICHAR_ENCODING@
+-#  end multichar
++  begin multichar
++    font 0 @MFONT0@
++    font 1 @MFONT1@
++    encoding @MULTICHAR_ENCODING@
++  end multichar
+ 
+ # Define the imageclasses.
+   begin imageclasses
+@@ -194,10 +185,10 @@
  # The XIM support options.
  # input_method: set the name of your favorate input method program
  # preedit_type: OverTheSpot or OffTheSpot or Root
@@ -9,9 +40,18 @@
 -#    preedit_type OverTheSpot
 -#  end xim
 +  begin xim
-+    input_method Ami
++    input_method xcin
 +    preedit_type OverTheSpot
 +  end xim
  
  # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
  # "off", or "false" for FALSE.
+@@ -283,7 +274,7 @@
+ #    line_space 2
+ 
+ # Value to use for $TERM
+-    term_name xterm
++    term_name xterm-color
+ 
+ # Program to exec (intended for use with themes)
+     exec mutt
diff --git a/chinese/eterm/files/patch-bb b/chinese/eterm/files/patch-bb
index 0b3888c0affe..890664351213 100644
--- a/chinese/eterm/files/patch-bb
+++ b/chinese/eterm/files/patch-bb
@@ -1,6 +1,37 @@
---- themes/trans/theme.cfg.in.orig	Mon Feb  7 22:29:10 2000
-+++ themes/trans/theme.cfg.in	Mon Feb  7 22:29:27 2000
-@@ -248,10 +248,10 @@
+--- themes/trans/theme.cfg.in.orig	Fri Jan  7 23:51:22 2000
++++ themes/trans/theme.cfg.in	Mon Dec 25 13:38:51 2000
+@@ -84,25 +84,16 @@
+     font default @DEF_FONT_IDX@
+     font 0 @FONT0@
+     font 1 @FONT1@
+-    font 2 @FONT2@
+-    font 3 @FONT3@
+-    font 4 @FONT4@
+-    font 5 10x20
+-    font 6 12x24
+-#    font bold 7x14
+   end attributes
+ 
+ # The Multichar support options.  Same goes for these fonts as for the normal
+ # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
+ # or big5 or gb
+-#  begin multichar
+-#    font 0 @MFONT0@
+-#    font 1 @MFONT1@
+-#    font 2 @MFONT2@
+-#    font 3 @MFONT3@
+-#    font 4 @MFONT4@
+-#    encoding @MULTICHAR_ENCODING@
+-#  end multichar
++  begin multichar
++    font 0 @MFONT0@
++    font 1 @MFONT1@
++    encoding @MULTICHAR_ENCODING@
++  end multichar
+ 
+ # Define the imageclasses.
+   begin imageclasses
+@@ -248,10 +239,10 @@
  # The XIM support options.
  # input_method: set the name of your favorate input method program
  # preedit_type: OverTheSpot or OffTheSpot or Root
@@ -9,9 +40,18 @@
 -#    preedit_type OverTheSpot
 -#  end xim
 +  begin xim
-+    input_method kinput2
++    input_method xcin
 +    preedit_type OverTheSpot
 +  end xim
  
  # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
  # "off", or "false" for FALSE.
+@@ -335,7 +326,7 @@
+ #    line_space 2
+ 
+ # Value to use for $TERM
+-    term_name xterm
++    term_name xterm-color
+ 
+ # Program to exec (intended for use with themes)
+ #    exec foo