Rename zh_TW.big5 to zh_TW.Big5,

add some encoding map of Big5.

7 files changed, 920 insertions, 6 deletions

diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist
index 2985cea34135..66266a582026 100644
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
@@ -1709,7 +1709,7 @@ lib/X11/locale/vi_VN.viscii/Compose
 lib/X11/locale/vi_VN.viscii/XLC_LOCALE
 lib/X11/locale/zh/Compose
 lib/X11/locale/zh/XLC_LOCALE
-lib/X11/locale/zh_TW.big5/Compose
+lib/X11/locale/zh_TW.Big5/Compose
 lib/X11/locale/zh_TW/Compose
 lib/X11/locale/zh_TW/XLC_LOCALE
 lib/X11/rgb.txt
@@ -3322,7 +3322,7 @@ X11/xsm/system.xsm
 @dirrm lib/X11/locale/vi_VN.viscii
 @dirrm lib/X11/locale/zh
 @dirrm lib/X11/locale/zh_TW
-@dirrm lib/X11/locale/zh_TW.big5
+@dirrm lib/X11/locale/zh_TW.Big5
 @dirrm lib/X11/locale
 @dirrm lib/X11/x11perfcomp
 @dirrm lib/X11/xkb/compat
diff --git a/x11/XFree86-4-libraries/files/patch-f b/x11/XFree86-4-libraries/files/patch-f
new file mode 100644
index 000000000000..df8aca1cf623
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-f
@@ -0,0 +1,186 @@
+--- nls/compose.dir.orig	Sun Mar 19 23:18:49 2000
++++ nls/compose.dir	Sun Mar 19 23:19:10 2000
+@@ -179,7 +179,7 @@
+ vi_VN.tcvn/Compose	vi_VN.TCVN
+ iso8859-1/Compose	wa_BE.ISO8859-1
+ zh/Compose		zh_CN.eucCN
+-zh_TW.big5/Compose	zh_TW.big5
++zh_TW.Big5/Compose	zh_TW.Big5
+ zh_TW/Compose		zh_TW.eucTW
+ en_US.utf/Compose	en_US.utf
+ #endif /* R63_COMPAT */
+@@ -355,6 +355,6 @@
+ vi_VN.tcvn/Compose:	vi_VN.TCVN
+ iso8859-1/Compose:	wa_BE.ISO8859-1
+ zh/Compose:		zh_CN.eucCN
+-zh_TW.big5/Compose:	zh_TW.big5
++zh_TW.Big5/Compose:	zh_TW.Big5
+ zh_TW/Compose:		zh_TW.eucTW
+ en_US.utf/Compose:	en_US.utf
+--- nls/locale.alias.orig	Sun Mar 19 23:19:31 2000
++++ nls/locale.alias	Sun Mar 19 23:19:57 2000
+@@ -437,14 +437,14 @@
+ wa_BE.iso885915					wa_BE.ISO8859-15
+ zh						zh_CN.eucCN
+ zh_CN						zh_CN.eucCN
+-zh_CN.big5					zh_TW.big5
++zh_CN.Big5					zh_TW.Big5
+ zh_CN.EUC					zh_CN.eucCN
+ zh_CN.euc					zh_CN.eucCN
+ zh_CN.gb2312					zh_CN.eucCN
+-zh_TW						zh_TW.big5
++zh_TW						zh_TW.Big5
+ zh_TW.EUC					zh_TW.eucTW
+ zh_TW.euc					zh_TW.eucTW
+-zh_TW.big5					zh_TW.big5
++zh_TW.Big5					zh_TW.Big5
+ 
+ XCOMM The following locale names are used in SCO 3.0
+ english_uk.8859					en_GB.ISO8859-1
+@@ -933,14 +933,14 @@
+ wa_BE.iso885915:				wa_BE.ISO8859-15
+ zh:						zh_CN.eucCN
+ zh_CN:						zh_CN.eucCN
+-zh_CN.big5:					zh_TW.big5
++zh_CN.Big5:					zh_TW.Big5
+ zh_CN.EUC:					zh_CN.eucCN
+ zh_CN.euc:					zh_CN.eucCN
+ zh_CN.gb2312:					zh_CN.eucCN
+-zh_TW:						zh_TW.big5
++zh_TW:						zh_TW.Big5
+ zh_TW.EUC:					zh_TW.eucTW
+ zh_TW.euc:					zh_TW.eucTW
+-zh_TW.big5:					zh_TW.big5
++zh_TW.Big5:					zh_TW.Big5
+ 
+ XCOMM The following locale names are used in SCO 3.0
+ english_uk.8859:				en_GB.ISO8859-1
+--- nls/locale.dir.orig	Sun Mar 19 23:20:02 2000
++++ nls/locale.dir	Sun Mar 19 23:20:17 2000
+@@ -165,7 +165,7 @@
+ iso8859-1/XLC_LOCALE	wa_BE.ISO8859-1
+ iso8859-15/XLC_LOCALE	wa_BE.ISO8859-15
+ zh/XLC_LOCALE		zh_CN.eucCN
+-zh_TW.big5/XLC_LOCALE	zh_TW.big5
++zh_TW.Big5/XLC_LOCALE	zh_TW.Big5
+ zh_TW.cns11643/XLC_LOCALE	zh_TW.eucTW
+ en_US.utf/XLC_LOCALE	en_US.utf
+ XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress.
+@@ -447,7 +447,7 @@
+ iso8859-1/XLC_LOCALE:	wa_BE.ISO8859-1
+ iso8859-15/XLC_LOCALE:	wa_BE.ISO8859-15
+ zh/XLC_LOCALE:		zh_CN.eucCN
+-zh_TW.big5/XLC_LOCALE:	zh_TW.big5
++zh_TW.Big5/XLC_LOCALE:	zh_TW.Big5
+ zh_TW.cns11643/XLC_LOCALE:	zh_TW.eucTW
+ en_US.utf/XLC_LOCALE:	en_US.utf
+ XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress.
+--- nls/Compose/Imakefile.orig	Sun Aug 29 21:59:37 1999
++++ nls/Compose/Imakefile	Mon Mar 20 07:19:11 2000
+@@ -52,5 +52,5 @@
+ ComposeTarget(vi_VN.viscii)
+ ComposeTarget(zh)
+ ComposeTarget(zh_TW)
+-ComposeTarget(zh_TW.big5)
++ComposeTarget(zh_TW.Big5)
+ 
+--- nls/Compose/zh_TW.Big5.orig	Sun Mar 19 23:27:50 2000
++++ nls/Compose/zh_TW.Big5	Sat Aug 28 17:00:40 1999
+@@ -0,0 +1,15 @@
++#
++# zh_TW.big5 Compose Sequence
++#
++# Sequence Definition
++#
++# $XFree86: xc/nls/Compose/zh_TW.big5,v 1.1 1999/08/28 09:00:40 dawes Exp $
++#
++# This file currently has no entries.  It appears that a compose file (even
++# just an empty one) is required for the appropriate keysyms to work for
++# this encoding.
++#
++# <Multi_key> Means <Compose>
++# Special Character
++
++# End of Sequence Definition
+--- nls/XLC_LOCALE/Imakefile.orig	Sat Feb 12 14:28:24 2000
++++ nls/XLC_LOCALE/Imakefile	Mon Mar 20 07:21:26 2000
+@@ -76,6 +76,7 @@
+ LTarget(vi_VN.viscii)
+ LTarget(zh)
+ LTarget(zh_TW)
++LTarget(zh_TW.Big5)
+ LTarget(th_TH.TACTIS)
+ LTarget(en_US.utf)
+ LTarget(en_US.UTF-8)
+--- nls/XLC_LOCALE/zh_TW.Big5.orig	Sun Mar 19 23:27:55 2000
++++ nls/XLC_LOCALE/zh_TW.Big5	Sun Mar 19 23:27:33 2000
+@@ -0,0 +1,69 @@
++XCOMM
++XCOMM (c) 1996, X11R6 L10N for Taiwan and Big5 Encoding Project
++XCOMM
++XCOMM modified for X11R6.3 by Hung-Chi Chu <hcchu@r350.ee.ntu.edu.tw> 1998/01/10
++XCOMM
++XCOMM $XFree86: xc/nls/XLC_LOCALE/zh_TW.big5,v 1.1 1999/08/28 09:00:41 dawes Exp $
++XCOMM
++XCOMM	XLC_FONTSET category
++XCOMM
++XLC_FONTSET
++XCOMM       fs0 class (7 bit ASCII)
++fs0     {
++        charset {
++                name    ISO8859-1:GL
++        }
++        font    {
++                primary         ISO8859-1:GL
++                vertical_rotate all
++        }
++}
++XCOMM       fs1 class
++fs1     {
++        charset {
++                name    BIG5-0:GLGR
++        }
++        font    {
++                primary BIG5-0:GLGR
++        }
++}
++END XLC_FONTSET
++
++XCOMM
++XCOMM	XLC_XLOCALE category
++XCOMM
++XLC_XLOCALE
++
++encoding_name		zh_TW.big5
++mb_cur_max		2
++state_depend_encoding	False
++
++wc_encoding_mask	\x00008000
++wc_shift_bits		8
++
++XCOMMuse_stdc_env		False
++XCOMMforce_convert_to_mb	True
++
++XCOMM	cs0 class
++cs0	{
++	side		GL:Default
++	length		1
++	wc_encoding	\x00000000
++	ct_encoding	ISO8859-1:GL
++}
++
++XCOMM	cs1 class
++cs1	{
++	side		none
++	length		2
++	byte1		\xa1,\xf9
++	byte2		\x40,\x7e;\xa1,\xfe
++
++	wc_encoding	\x00008000
++	ct_encoding	BIG5-0:GLGR:\x1b\x25\x2f\x32\x80\x89\x42\x49\x47\x35\x2d\x30\x02
++
++	mb_conversion	[\xa140,\xf9fe]->\x2140
++	ct_conversion	[\x2140,\x79fe]->\xa140
++}
++
++END XLC_XLOCALE
diff --git a/x11/XFree86-4-libraries/files/patch-g b/x11/XFree86-4-libraries/files/patch-g
new file mode 100644
index 000000000000..946dc3e9f669
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-g
@@ -0,0 +1,271 @@
+--- extras/X-TrueType/BIG5/BIG5toUCS2.c.orig	Fri Feb 18 01:11:40 2000
++++ extras/X-TrueType/BIG5/BIG5toUCS2.c	Mon Mar 20 07:32:03 2000
+@@ -985,68 +985,68 @@
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, 0x30FE, 0x309D, 0x309E, 0x3005, 0x3041, 0x3042, 0x3043, 
+-    0x3044, 0x3045, 0x3046, 0x3047, 0x3048, 0x3049, 0x304A, 0x304B, 
+-    0x304C, 0x304D, 0x304E, 0x304F, 0x3050, 0x3051, 0x3052, 0x3053, 
+-    0x3054, 0x3055, 0x3056, 0x3057, 0x3058, 0x3059, 0x305A, 0x305B, 
+-    0x305C, 0x305D, 0x305E, 0x305F, 0x3060, 0x3061, 0x3062, 0x3063, 
+-    0x3064, 0x3065, 0x3066, 0x3067, 0x3068, 0x3069, 0x306A, 0x306B, 
+-    0x306C, 0x306D, 0x306E, 0x306F, 0x3070, 0x3071, 0x3072, 0x3073, 
+-    0x3074, 0x3075, 0x3076, 0x3077, 0x3078, 0x3079, 0x307A, 0x307B, 
+-    0x307C, 0x307D, 0x307E, 0x307F, 0x3080, 0x3081, 0x3082, 0x3083, 
+-    0x3084, 0x3085, 0x3086, 0x3087, 0x3088, 0x3089, 0x308A, 0x308B, 
+-    0x308C, 0x308D, 0x308E, 0x308F, 0x3090, 0x3091, 0x3092, 0x3093, 
+-    0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7, ALTCHR, 
+-/* 0xC740 - 0xC7FF */
+-    0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF, 
+-    0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7, 
+-    0x30B8, 0x30B9, 0x30BA, 0x30BB, 0x30BC, 0x30BD, 0x30BE, 0x30BF, 
+-    0x30C0, 0x30C1, 0x30C2, 0x30C3, 0x30C4, 0x30C5, 0x30C6, 0x30C7, 
+-    0x30C8, 0x30C9, 0x30CA, 0x30CB, 0x30CC, 0x30CD, 0x30CE, 0x30CF, 
+-    0x30D0, 0x30D1, 0x30D2, 0x30D3, 0x30D4, 0x30D5, 0x30D6, 0x30D7, 
+-    0x30D8, 0x30D9, 0x30DA, 0x30DB, 0x30DC, 0x30DD, 0x30DE, 0x30DF, 
+-    0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, 0x30E7, 0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC, 0x30ED, 
+-    0x30EE, 0x30EF, 0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 
+-    0x30F6, 0x0414, 0x0415, 0x0401, 0x0416, 0x0417, 0x0418, 0x0419, 
+-    0x041A, 0x041B, 0x041C, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 
+-    0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, 
+-    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451, 0x0436, 
+-    0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 
+-    0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 
+-    0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 
+-    0x044F, 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 
+-    0x2467, 0x2468, 0x2469, 0x2474, 0x2475, 0x2476, 0x2477, 0x2478, 
+-    0x2479, 0x247A, 0x247B, 0x247C, 0x247D, ALTCHR, ALTCHR, ALTCHR, 
+-/* 0xC840 - 0xC8FF */
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
++    ALTCHR, 0xF6B1, 0xF6B2, 0xF6B3, 0xF6B4, 0xF6B5, 0xF6B6, 0xF6B7, 
++    0xF6B8, 0xF6B9, 0xF6BA, 0xF6BB, 0xF6BC, 0xF6BD, 0xF6BE, 0xF6BF, 
++    0xF6C0, 0xF6C1, 0xF6C2, 0xF6C3, 0xF6C4, 0xF6C5, 0xF6C6, 0xF6C7, 
++    0xF6C8, 0xF6C9, 0xF6CA, 0xF6CB, 0xF6CC, 0xF6CD, 0xF6CE, 0xF6CF, 
++    0xF6D0, 0xF6D1, 0xF6D2, 0xF6D3, 0xF6D4, 0xF6D5, 0xF6D6, 0xF6D7, 
++    0xF6D8, 0xF6D9, 0xF6DA, 0xF6DB, 0xF6DC, 0xF6DD, 0xF6DE, 0xF6DF, 
++    0xF6E0, 0xF6E1, 0xF6E2, 0xF6E3, 0xF6E4, 0xF6E5, 0xF6E6, 0xF6E7, 
++    0xF6E8, 0xF6E9, 0xF6EA, 0xF6EB, 0xF6EC, 0xF6ED, 0xF6EE, 0xF6EF, 
++    0xF6F0, 0xF6F1, 0xF6F2, 0xF6F3, 0xF6F4, 0xF6F5, 0xF6F6, 0xF6F7, 
++    0xF6F8, 0xF6F9, 0xF6FA, 0xF6FB, 0xF6FC, 0xF6FD, 0xF6FE, 0xF6FF, 
++    0xF700, 0xF701, 0xF702, 0xF703, 0xF704, 0xF705, 0xF706, 0xF707, 
++    0xF708, 0xF709, 0xF70A, 0xF70B, 0xF70C, 0xF70D, 0xF70E, ALTCHR,
++/* 0xC740 - 0xC7FF */ 
++    0xF70F, 0xF710, 0xF711, 0xF712, 0xF713, 0xF714, 0xF715, 0xF716, 
++    0xF717, 0xF718, 0xF719, 0xF71A, 0xF71B, 0xF71C, 0xF71D, 0xF71E, 
++    0xF71F, 0xF720, 0xF721, 0xF722, 0xF723, 0xF724, 0xF725, 0xF726, 
++    0xF727, 0xF728, 0xF729, 0xF72A, 0xF72B, 0xF72C, 0xF72D, 0xF72E, 
++    0xF72F, 0xF730, 0xF731, 0xF732, 0xF733, 0xF734, 0xF735, 0xF736, 
++    0xF737, 0xF738, 0xF739, 0xF73A, 0xF73B, 0xF73C, 0xF73D, 0xF73E, 
++    0xF73F, 0xF740, 0xF741, 0xF742, 0xF743, 0xF744, 0xF745, 0xF746, 
++    0xF747, 0xF748, 0xF749, 0xF74A, 0xF74B, 0xF74C, 0xF74D, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
++    ALTCHR, 0xF74E, 0xF74F, 0xF750, 0xF751, 0xF752, 0xF753, 0xF754, 
++    0xF755, 0xF756, 0xF757, 0xF758, 0xF759, 0xF75A, 0xF75B, 0xF75C, 
++    0xF75D, 0xF75E, 0xF75F, 0xF760, 0xF761, 0xF762, 0xF763, 0xF764, 
++    0xF765, 0xF766, 0xF767, 0xF768, 0xF769, 0xF76A, 0xF76B, 0xF76C, 
++    0xF76D, 0xF76E, 0xF76F, 0xF770, 0xF771, 0xF772, 0xF773, 0xF774, 
++    0xF775, 0xF776, 0xF777, 0xF778, 0xF779, 0xF77A, 0xF77B, 0xF77C, 
++    0xF77D, 0xF77E, 0xF77F, 0xF780, 0xF781, 0xF782, 0xF783, 0xF784, 
++    0xF785, 0xF786, 0xF787, 0xF788, 0xF789, 0xF78A, 0xF78B, 0xF78C, 
++    0xF78D, 0xF78E, 0xF78F, 0xF790, 0xF791, 0xF792, 0xF793, 0xF794, 
++    0xF795, 0xF796, 0xF797, 0xF798, 0xF799, 0xF79A, 0xF79B, 0xF79C, 
++    0xF79D, 0xF79E, 0xF79F, 0xF7A0, 0xF7A1, 0xF7A2, 0xF7A3, 0xF7A4, 
++    0xF7A5, 0xF7A6, 0xF7A7, 0xF7A8, 0xF7A9, 0xF7AA, 0xF7AB, ALTCHR,
++/* 0xC840 - 0xC8FF */ 
++    0xF7AC, 0xF7AD, 0xF7AE, 0xF7AF, 0xF7B0, 0xF7B1, 0xF7B2, 0xF7B3, 
++    0xF7B4, 0xF7B5, 0xF7B6, 0xF7B7, 0xF7B8, 0xF7B9, 0xF7BA, 0xF7BB, 
++    0xF7BC, 0xF7BD, 0xF7BE, 0xF7BF, 0xF7C0, 0xF7C1, 0xF7C2, 0xF7C3, 
++    0xF7C4, 0xF7C5, 0xF7C6, 0xF7C7, 0xF7C8, 0xF7C9, 0xF7CA, 0xF7CB, 
++    0xF7CC, 0xF7CD, 0xF7CE, 0xF7CF, 0xF7D0, 0xF7D1, 0xF7D2, 0xF7D3, 
++    0xF7D4, 0xF7D5, 0xF7D6, 0xF7D7, 0xF7D8, 0xF7D9, 0xF7DA, 0xF7DB, 
++    0xF7DC, 0xF7DD, 0xF7DE, 0xF7DF, 0xF7E0, 0xF7E1, 0xF7E2, 0xF7E3, 
++    0xF7E4, 0xF7E5, 0xF7E6, 0xF7E7, 0xF7E8, 0xF7E9, 0xF7EA, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
++    ALTCHR, 0xF7EB, 0xF7EC, 0xF7ED, 0xF7EE, 0xF7EF, 0xF7F0, 0xF7F1, 
++    0xF7F2, 0xF7F3, 0xF7F4, 0xF7F5, 0xF7F6, 0xF7F7, 0xF7F8, 0xF7F9, 
++    0xF7FA, 0xF7FB, 0xF7FC, 0xF7FD, 0xF7FE, 0xF7FF, 0xF800, 0xF801, 
++    0xF802, 0xF803, 0xF804, 0xF805, 0xF806, 0xF807, 0xF808, 0xF809, 
++    0xF80A, 0xF80B, 0xF80C, 0xF80D, 0xF80E, 0xF80F, 0xF810, 0xF811, 
++    0xF812, 0xF813, 0xF814, 0xF815, 0xF816, 0xF817, 0xF818, 0xF819, 
++    0xF81A, 0xF81B, 0xF81C, 0xF81D, 0xF81E, 0xF81F, 0xF820, 0xF821, 
++    0xF822, 0xF823, 0xF824, 0xF825, 0xF826, 0xF827, 0xF828, 0xF829, 
++    0xF82A, 0xF82B, 0xF82C, 0xF82D, 0xF82E, 0xF82F, 0xF830, 0xF831, 
++    0xF832, 0xF833, 0xF834, 0xF835, 0xF836, 0xF837, 0xF838, 0xF839, 
++    0xF83A, 0xF83B, 0xF83C, 0xF83D, 0xF83E, 0xF83F, 0xF840, 0xF841, 
++    0xF842, 0xF843, 0xF844, 0xF845, 0xF846, 0xF847, 0xF848, ALTCHR,
+ /* 0xC940 - 0xC9FF */
+     0x4E42, 0x4E5C, 0x51F5, 0x531A, 0x5382, 0x4E07, 0x4E0C, 0x4E47, 
+     0x4E8D, 0x56D7, 0xFA0C, 0x5C6E, 0x5F73, 0x4E0F, 0x5187, 0x4E0E, 
+@@ -2266,17 +2266,142 @@
+     0x9E17, 0x9F48, 0x6207, 0x6B1E, 0x7227, 0x864C, 0x8EA8, 0x9482, 
+     0x9480, 0x9481, 0x9A69, 0x9A68, 0x9B2E, 0x9E19, 0x7229, 0x864B, 
+     0x8B9F, 0x9483, 0x9C79, 0x9EB7, 0x7675, 0x9A6B, 0x9C7A, 0x9E1D, 
+-    0x7069, 0x706A, 0x9EA4, 0x9F7E, 0x9F49, 0x9F98, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
++    0x7069, 0x706A, 0x9EA4, 0x9F7E, 0x9F49, 0x9F98, 0x7881, 0x92B9, 
++    0x88CF, 0x58BB, 0x6052, 0x7CA7, 0x5AFA, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
++/* 0xFA40 - 0xFAFF */  
++    0xE000, 0xE001, 0xE002, 0xE003, 0xE004, 0xE005, 0xE006, 0xE007,  
++    0xE008, 0xE009, 0xE00A, 0xE00B, 0xE00C, 0xE00D, 0xE00E, 0xE00F,  
++    0xE010, 0xE011, 0xE012, 0xE013, 0xE014, 0xE015, 0xE016, 0xE017,  
++    0xE018, 0xE019, 0xE01A, 0xE01B, 0xE01C, 0xE01D, 0xE01E, 0xE01F,  
++    0xE020, 0xE021, 0xE022, 0xE023, 0xE024, 0xE025, 0xE026, 0xE027,  
++    0xE028, 0xE029, 0xE02A, 0xE02B, 0xE02C, 0xE02D, 0xE02E, 0xE02F,  
++    0xE030, 0xE031, 0xE032, 0xE033, 0xE034, 0xE035, 0xE036, 0xE037,  
++    0xE038, 0xE039, 0xE03A, 0xE03B, 0xE03C, 0xE03D, 0xE03E, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, 0xE03F, 0xE040, 0xE041, 0xE042, 0xE043, 0xE044, 0xE045,  
++    0xE046, 0xE047, 0xE048, 0xE049, 0xE04A, 0xE04B, 0xE04C, 0xE04D,  
++    0xE04E, 0xE04F, 0xE050, 0xE051, 0xE052, 0xE053, 0xE054, 0xE055,  
++    0xE056, 0xE057, 0xE058, 0xE059, 0xE05A, 0xE05B, 0xE05C, 0xE05D,  
++    0xE05E, 0xE05F, 0xE060, 0xE061, 0xE062, 0xE063, 0xE064, 0xE065,  
++    0xE066, 0xE067, 0xE068, 0xE069, 0xE06A, 0xE06B, 0xE06C, 0xE06D,  
++    0xE06E, 0xE06F, 0xE070, 0xE071, 0xE072, 0xE073, 0xE074, 0xE075,  
++    0xE076, 0xE077, 0xE078, 0xE079, 0xE07A, 0xE07B, 0xE07C, 0xE07D,  
++    0xE07E, 0xE07F, 0xE080, 0xE081, 0xE082, 0xE083, 0xE084, 0xE085,  
++    0xE086, 0xE087, 0xE088, 0xE089, 0xE08A, 0xE08B, 0xE08C, 0xE08D,  
++    0xE08E, 0xE08F, 0xE090, 0xE091, 0xE092, 0xE093, 0xE094, 0xE095,  
++    0xE096, 0xE097, 0xE098, 0xE099, 0xE09A, 0xE09B, 0xE09C, ALTCHR,
++/* 0xFB40 - 0xFBFF */  
++    0xE09D, 0xE09E, 0xE09F, 0xE0A0, 0xE0A1, 0xE0A2, 0xE0A3, 0xE0A4,  
++    0xE0A5, 0xE0A6, 0xE0A7, 0xE0A8, 0xE0A9, 0xE0AA, 0xE0AB, 0xE0AC,  
++    0xE0AD, 0xE0AE, 0xE0AF, 0xE0B0, 0xE0B1, 0xE0B2, 0xE0B3, 0xE0B4,  
++    0xE0B5, 0xE0B6, 0xE0B7, 0xE0B8, 0xE0B9, 0xE0BA, 0xE0BB, 0xE0BC,  
++    0xE0BD, 0xE0BE, 0xE0BF, 0xE0C0, 0xE0C1, 0xE0C2, 0xE0C3, 0xE0C4,  
++    0xE0C5, 0xE0C6, 0xE0C7, 0xE0C8, 0xE0C9, 0xE0CA, 0xE0CB, 0xE0CC,  
++    0xE0CD, 0xE0CE, 0xE0CF, 0xE0D0, 0xE0D1, 0xE0D2, 0xE0D3, 0xE0D4,  
++    0xE0D5, 0xE0D6, 0xE0D7, 0xE0D8, 0xE0D9, 0xE0DA, 0xE0DB, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, 0xE0DC, 0xE0DD, 0xE0DE, 0xE0DF, 0xE0E0, 0xE0E1, 0xE0E2,  
++    0xE0E3, 0xE0E4, 0xE0E5, 0xE0E6, 0xE0E7, 0xE0E8, 0xE0E9, 0xE0EA,  
++    0xE0EB, 0xE0EC, 0xE0ED, 0xE0EE, 0xE0EF, 0xE0F0, 0xE0F1, 0xE0F2,  
++    0xE0F3, 0xE0F4, 0xE0F5, 0xE0F6, 0xE0F7, 0xE0F8, 0xE0F9, 0xE0FA,  
++    0xE0FB, 0xE0FC, 0xE0FD, 0xE0FE, 0xE0FF, 0xE100, 0xE101, 0xE102,  
++    0xE103, 0xE104, 0xE105, 0xE106, 0xE107, 0xE108, 0xE109, 0xE10A,  
++    0xE10B, 0xE10C, 0xE10D, 0xE10E, 0xE10F, 0xE110, 0xE111, 0xE112,  
++    0xE113, 0xE114, 0xE115, 0xE116, 0xE117, 0xE118, 0xE119, 0xE11A,  
++    0xE11B, 0xE11C, 0xE11D, 0xE11E, 0xE11F, 0xE120, 0xE121, 0xE122,  
++    0xE123, 0xE124, 0xE125, 0xE126, 0xE127, 0xE128, 0xE129, 0xE12A,  
++    0xE12B, 0xE12C, 0xE12D, 0xE12E, 0xE12F, 0xE130, 0xE131, 0xE132,  
++    0xE133, 0xE134, 0xE135, 0xE136, 0xE137, 0xE138, 0xE139, ALTCHR,
++/* 0xFC40 - 0xFCFF */  
++    0xE13A, 0xE13B, 0xE13C, 0xE13D, 0xE13E, 0xE13F, 0xE140, 0xE141,  
++    0xE142, 0xE143, 0xE144, 0xE145, 0xE146, 0xE147, 0xE148, 0xE149,  
++    0xE14A, 0xE14B, 0xE14C, 0xE14D, 0xE14E, 0xE14F, 0xE150, 0xE151,  
++    0xE152, 0xE153, 0xE154, 0xE155, 0xE156, 0xE157, 0xE158, 0xE159,  
++    0xE15A, 0xE15B, 0xE15C, 0xE15D, 0xE15E, 0xE15F, 0xE160, 0xE161,  
++    0xE162, 0xE163, 0xE164, 0xE165, 0xE166, 0xE167, 0xE168, 0xE169,  
++    0xE16A, 0xE16B, 0xE16C, 0xE16D, 0xE16E, 0xE16F, 0xE170, 0xE171,  
++    0xE172, 0xE173, 0xE174, 0xE175, 0xE176, 0xE177, 0xE178, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, 0xE179, 0xE17A, 0xE17B, 0xE17C, 0xE17D, 0xE17E, 0xE17F,  
++    0xE180, 0xE181, 0xE182, 0xE183, 0xE184, 0xE185, 0xE186, 0xE187,  
++    0xE188, 0xE189, 0xE18A, 0xE18B, 0xE18C, 0xE18D, 0xE18E, 0xE18F,  
++    0xE190, 0xE191, 0xE192, 0xE193, 0xE194, 0xE195, 0xE196, 0xE197,  
++    0xE198, 0xE199, 0xE19A, 0xE19B, 0xE19C, 0xE19D, 0xE19E, 0xE19F,  
++    0xE1A0, 0xE1A1, 0xE1A2, 0xE1A3, 0xE1A4, 0xE1A5, 0xE1A6, 0xE1A7,  
++    0xE1A8, 0xE1A9, 0xE1AA, 0xE1AB, 0xE1AC, 0xE1AD, 0xE1AE, 0xE1AF,  
++    0xE1B0, 0xE1B1, 0xE1B2, 0xE1B3, 0xE1B4, 0xE1B5, 0xE1B6, 0xE1B7,  
++    0xE1B8, 0xE1B9, 0xE1BA, 0xE1BB, 0xE1BC, 0xE1BD, 0xE1BE, 0xE1BF,  
++    0xE1C0, 0xE1C1, 0xE1C2, 0xE1C3, 0xE1C4, 0xE1C5, 0xE1C6, 0xE1C7,  
++    0xE1C8, 0xE1C9, 0xE1CA, 0xE1CB, 0xE1CC, 0xE1CD, 0xE1CE, 0xE1CF,  
++    0xE1D0, 0xE1D1, 0xE1D2, 0xE1D3, 0xE1D4, 0xE1D5, 0xE1D6, ALTCHR,
++/* 0xFD40 - 0xFDFF */  
++    0xE1D7, 0xE1D8, 0xE1D9, 0xE1DA, 0xE1DB, 0xE1DC, 0xE1DD, 0xE1DE,  
++    0xE1DF, 0xE1E0, 0xE1E1, 0xE1E2, 0xE1E3, 0xE1E4, 0xE1E5, 0xE1E6,  
++    0xE1E7, 0xE1E8, 0xE1E9, 0xE1EA, 0xE1EB, 0xE1EC, 0xE1ED, 0xE1EE,  
++    0xE1EF, 0xE1F0, 0xE1F1, 0xE1F2, 0xE1F3, 0xE1F4, 0xE1F5, 0xE1F6,  
++    0xE1F7, 0xE1F8, 0xE1F9, 0xE1FA, 0xE1FB, 0xE1FC, 0xE1FD, 0xE1FE,  
++    0xE1FF, 0xE200, 0xE201, 0xE202, 0xE203, 0xE204, 0xE205, 0xE206,  
++    0xE207, 0xE208, 0xE209, 0xE20A, 0xE20B, 0xE20C, 0xE20D, 0xE20E,  
++    0xE20F, 0xE210, 0xE211, 0xE212, 0xE213, 0xE214, 0xE215, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, 0xE216, 0xE217, 0xE218, 0xE219, 0xE21A, 0xE21B, 0xE21C,  
++    0xE21D, 0xE21E, 0xE21F, 0xE220, 0xE221, 0xE222, 0xE223, 0xE224,  
++    0xE225, 0xE226, 0xE227, 0xE228, 0xE229, 0xE22A, 0xE22B, 0xE22C,  
++    0xE22D, 0xE22E, 0xE22F, 0xE230, 0xE231, 0xE232, 0xE233, 0xE234,  
++    0xE235, 0xE236, 0xE237, 0xE238, 0xE239, 0xE23A, 0xE23B, 0xE23C,  
++    0xE23D, 0xE23E, 0xE23F, 0xE240, 0xE241, 0xE242, 0xE243, 0xE244,  
++    0xE245, 0xE246, 0xE247, 0xE248, 0xE249, 0xE24A, 0xE24B, 0xE24C,  
++    0xE24D, 0xE24E, 0xE24F, 0xE250, 0xE251, 0xE252, 0xE253, 0xE254,  
++    0xE255, 0xE256, 0xE257, 0xE258, 0xE259, 0xE25A, 0xE25B, 0xE25C,  
++    0xE25D, 0xE25E, 0xE25F, 0xE260, 0xE261, 0xE262, 0xE263, 0xE264,  
++    0xE265, 0xE266, 0xE267, 0xE268, 0xE269, 0xE26A, 0xE26B, 0xE26C,  
++    0xE26D, 0xE26E, 0xE26F, 0xE270, 0xE271, 0xE272, 0xE273, ALTCHR,
++/* 0xFE40 - 0xFEFF */  
++    0xE274, 0xE275, 0xE276, 0xE277, 0xE278, 0xE279, 0xE27A, 0xE27B,  
++    0xE27C, 0xE27D, 0xE27E, 0xE27F, 0xE280, 0xE281, 0xE282, 0xE283,  
++    0xE284, 0xE285, 0xE286, 0xE287, 0xE288, 0xE289, 0xE28A, 0xE28B,  
++    0xE28C, 0xE28D, 0xE28E, 0xE28F, 0xE290, 0xE291, 0xE292, 0xE293,  
++    0xE294, 0xE295, 0xE296, 0xE297, 0xE298, 0xE299, 0xE29A, 0xE29B,  
++    0xE29C, 0xE29D, 0xE29E, 0xE29F, 0xE2A0, 0xE2A1, 0xE2A2, 0xE2A3,  
++    0xE2A4, 0xE2A5, 0xE2A6, 0xE2A7, 0xE2A8, 0xE2A9, 0xE2AA, 0xE2AB,  
++    0xE2AC, 0xE2AD, 0xE2AE, 0xE2AF, 0xE2B0, 0xE2B1, 0xE2B2, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, 0xE2B3, 0xE2B4, 0xE2B5, 0xE2B6, 0xE2B7, 0xE2B8, 0xE2B9,  
++    0xE2BA, 0xE2BB, 0xE2BC, 0xE2BD, 0xE2BE, 0xE2BF, 0xE2C0, 0xE2C1,  
++    0xE2C2, 0xE2C3, 0xE2C4, 0xE2C5, 0xE2C6, 0xE2C7, 0xE2C8, 0xE2C9,  
++    0xE2CA, 0xE2CB, 0xE2CC, 0xE2CD, 0xE2CE, 0xE2CF, 0xE2D0, 0xE2D1,  
++    0xE2D2, 0xE2D3, 0xE2D4, 0xE2D5, 0xE2D6, 0xE2D7, 0xE2D8, 0xE2D9,  
++    0xE2DA, 0xE2DB, 0xE2DC, 0xE2DD, 0xE2DE, 0xE2DF, 0xE2E0, 0xE2E1,  
++    0xE2E2, 0xE2E3, 0xE2E4, 0xE2E5, 0xE2E6, 0xE2E7, 0xE2E8, 0xE2E9,  
++    0xE2EA, 0xE2EB, 0xE2EC, 0xE2ED, 0xE2EE, 0xE2EF, 0xE2F0, 0xE2F1,  
++    0xE2F2, 0xE2F3, 0xE2F4, 0xE2F5, 0xE2F6, 0xE2F7, 0xE2F8, 0xE2F9,  
++    0xE2FA, 0xE2FB, 0xE2FC, 0xE2FD, 0xE2FE, 0xE2FF, 0xE300, 0xE301,  
++    0xE302, 0xE303, 0xE304, 0xE305, 0xE306, 0xE307, 0xE308, 0xE309,  
++    0xE30A, 0xE30B, 0xE30C, 0xE30D, 0xE30E, 0xE30F, 0xE310, ALTCHR, 
+ };
+ 
+ CODE_CONV_TWO_OCTET_TO_UCS2(cc_big5_to_ucs2, /* function name */
+                             tblBig5ToUcs2, /* table name */
+-                            0x00A1, 0x00F9, /* code range (high byte) */
++                            0x00A1, 0x00FE, /* code range (high byte) */
+                             0x0040, 0x00FF, /* code range (low byte) */
+                             ALTCHR /* alt char code (on UCS2) */
+                             )
diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist
index 2985cea34135..66266a582026 100644
--- a/x11/XFree86-4-libraries/pkg-plist
+++ b/x11/XFree86-4-libraries/pkg-plist
@@ -1709,7 +1709,7 @@ lib/X11/locale/vi_VN.viscii/Compose
 lib/X11/locale/vi_VN.viscii/XLC_LOCALE
 lib/X11/locale/zh/Compose
 lib/X11/locale/zh/XLC_LOCALE
-lib/X11/locale/zh_TW.big5/Compose
+lib/X11/locale/zh_TW.Big5/Compose
 lib/X11/locale/zh_TW/Compose
 lib/X11/locale/zh_TW/XLC_LOCALE
 lib/X11/rgb.txt
@@ -3322,7 +3322,7 @@ X11/xsm/system.xsm
 @dirrm lib/X11/locale/vi_VN.viscii
 @dirrm lib/X11/locale/zh
 @dirrm lib/X11/locale/zh_TW
-@dirrm lib/X11/locale/zh_TW.big5
+@dirrm lib/X11/locale/zh_TW.Big5
 @dirrm lib/X11/locale
 @dirrm lib/X11/x11perfcomp
 @dirrm lib/X11/xkb/compat
diff --git a/x11/XFree86-4/files/patch-f b/x11/XFree86-4/files/patch-f
new file mode 100644
index 000000000000..df8aca1cf623
--- /dev/null
+++ b/x11/XFree86-4/files/patch-f
@@ -0,0 +1,186 @@
+--- nls/compose.dir.orig	Sun Mar 19 23:18:49 2000
++++ nls/compose.dir	Sun Mar 19 23:19:10 2000
+@@ -179,7 +179,7 @@
+ vi_VN.tcvn/Compose	vi_VN.TCVN
+ iso8859-1/Compose	wa_BE.ISO8859-1
+ zh/Compose		zh_CN.eucCN
+-zh_TW.big5/Compose	zh_TW.big5
++zh_TW.Big5/Compose	zh_TW.Big5
+ zh_TW/Compose		zh_TW.eucTW
+ en_US.utf/Compose	en_US.utf
+ #endif /* R63_COMPAT */
+@@ -355,6 +355,6 @@
+ vi_VN.tcvn/Compose:	vi_VN.TCVN
+ iso8859-1/Compose:	wa_BE.ISO8859-1
+ zh/Compose:		zh_CN.eucCN
+-zh_TW.big5/Compose:	zh_TW.big5
++zh_TW.Big5/Compose:	zh_TW.Big5
+ zh_TW/Compose:		zh_TW.eucTW
+ en_US.utf/Compose:	en_US.utf
+--- nls/locale.alias.orig	Sun Mar 19 23:19:31 2000
++++ nls/locale.alias	Sun Mar 19 23:19:57 2000
+@@ -437,14 +437,14 @@
+ wa_BE.iso885915					wa_BE.ISO8859-15
+ zh						zh_CN.eucCN
+ zh_CN						zh_CN.eucCN
+-zh_CN.big5					zh_TW.big5
++zh_CN.Big5					zh_TW.Big5
+ zh_CN.EUC					zh_CN.eucCN
+ zh_CN.euc					zh_CN.eucCN
+ zh_CN.gb2312					zh_CN.eucCN
+-zh_TW						zh_TW.big5
++zh_TW						zh_TW.Big5
+ zh_TW.EUC					zh_TW.eucTW
+ zh_TW.euc					zh_TW.eucTW
+-zh_TW.big5					zh_TW.big5
++zh_TW.Big5					zh_TW.Big5
+ 
+ XCOMM The following locale names are used in SCO 3.0
+ english_uk.8859					en_GB.ISO8859-1
+@@ -933,14 +933,14 @@
+ wa_BE.iso885915:				wa_BE.ISO8859-15
+ zh:						zh_CN.eucCN
+ zh_CN:						zh_CN.eucCN
+-zh_CN.big5:					zh_TW.big5
++zh_CN.Big5:					zh_TW.Big5
+ zh_CN.EUC:					zh_CN.eucCN
+ zh_CN.euc:					zh_CN.eucCN
+ zh_CN.gb2312:					zh_CN.eucCN
+-zh_TW:						zh_TW.big5
++zh_TW:						zh_TW.Big5
+ zh_TW.EUC:					zh_TW.eucTW
+ zh_TW.euc:					zh_TW.eucTW
+-zh_TW.big5:					zh_TW.big5
++zh_TW.Big5:					zh_TW.Big5
+ 
+ XCOMM The following locale names are used in SCO 3.0
+ english_uk.8859:				en_GB.ISO8859-1
+--- nls/locale.dir.orig	Sun Mar 19 23:20:02 2000
++++ nls/locale.dir	Sun Mar 19 23:20:17 2000
+@@ -165,7 +165,7 @@
+ iso8859-1/XLC_LOCALE	wa_BE.ISO8859-1
+ iso8859-15/XLC_LOCALE	wa_BE.ISO8859-15
+ zh/XLC_LOCALE		zh_CN.eucCN
+-zh_TW.big5/XLC_LOCALE	zh_TW.big5
++zh_TW.Big5/XLC_LOCALE	zh_TW.Big5
+ zh_TW.cns11643/XLC_LOCALE	zh_TW.eucTW
+ en_US.utf/XLC_LOCALE	en_US.utf
+ XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress.
+@@ -447,7 +447,7 @@
+ iso8859-1/XLC_LOCALE:	wa_BE.ISO8859-1
+ iso8859-15/XLC_LOCALE:	wa_BE.ISO8859-15
+ zh/XLC_LOCALE:		zh_CN.eucCN
+-zh_TW.big5/XLC_LOCALE:	zh_TW.big5
++zh_TW.Big5/XLC_LOCALE:	zh_TW.Big5
+ zh_TW.cns11643/XLC_LOCALE:	zh_TW.eucTW
+ en_US.utf/XLC_LOCALE:	en_US.utf
+ XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress.
+--- nls/Compose/Imakefile.orig	Sun Aug 29 21:59:37 1999
++++ nls/Compose/Imakefile	Mon Mar 20 07:19:11 2000
+@@ -52,5 +52,5 @@
+ ComposeTarget(vi_VN.viscii)
+ ComposeTarget(zh)
+ ComposeTarget(zh_TW)
+-ComposeTarget(zh_TW.big5)
++ComposeTarget(zh_TW.Big5)
+ 
+--- nls/Compose/zh_TW.Big5.orig	Sun Mar 19 23:27:50 2000
++++ nls/Compose/zh_TW.Big5	Sat Aug 28 17:00:40 1999
+@@ -0,0 +1,15 @@
++#
++# zh_TW.big5 Compose Sequence
++#
++# Sequence Definition
++#
++# $XFree86: xc/nls/Compose/zh_TW.big5,v 1.1 1999/08/28 09:00:40 dawes Exp $
++#
++# This file currently has no entries.  It appears that a compose file (even
++# just an empty one) is required for the appropriate keysyms to work for
++# this encoding.
++#
++# <Multi_key> Means <Compose>
++# Special Character
++
++# End of Sequence Definition
+--- nls/XLC_LOCALE/Imakefile.orig	Sat Feb 12 14:28:24 2000
++++ nls/XLC_LOCALE/Imakefile	Mon Mar 20 07:21:26 2000
+@@ -76,6 +76,7 @@
+ LTarget(vi_VN.viscii)
+ LTarget(zh)
+ LTarget(zh_TW)
++LTarget(zh_TW.Big5)
+ LTarget(th_TH.TACTIS)
+ LTarget(en_US.utf)
+ LTarget(en_US.UTF-8)
+--- nls/XLC_LOCALE/zh_TW.Big5.orig	Sun Mar 19 23:27:55 2000
++++ nls/XLC_LOCALE/zh_TW.Big5	Sun Mar 19 23:27:33 2000
+@@ -0,0 +1,69 @@
++XCOMM
++XCOMM (c) 1996, X11R6 L10N for Taiwan and Big5 Encoding Project
++XCOMM
++XCOMM modified for X11R6.3 by Hung-Chi Chu <hcchu@r350.ee.ntu.edu.tw> 1998/01/10
++XCOMM
++XCOMM $XFree86: xc/nls/XLC_LOCALE/zh_TW.big5,v 1.1 1999/08/28 09:00:41 dawes Exp $
++XCOMM
++XCOMM	XLC_FONTSET category
++XCOMM
++XLC_FONTSET
++XCOMM       fs0 class (7 bit ASCII)
++fs0     {
++        charset {
++                name    ISO8859-1:GL
++        }
++        font    {
++                primary         ISO8859-1:GL
++                vertical_rotate all
++        }
++}
++XCOMM       fs1 class
++fs1     {
++        charset {
++                name    BIG5-0:GLGR
++        }
++        font    {
++                primary BIG5-0:GLGR
++        }
++}
++END XLC_FONTSET
++
++XCOMM
++XCOMM	XLC_XLOCALE category
++XCOMM
++XLC_XLOCALE
++
++encoding_name		zh_TW.big5
++mb_cur_max		2
++state_depend_encoding	False
++
++wc_encoding_mask	\x00008000
++wc_shift_bits		8
++
++XCOMMuse_stdc_env		False
++XCOMMforce_convert_to_mb	True
++
++XCOMM	cs0 class
++cs0	{
++	side		GL:Default
++	length		1
++	wc_encoding	\x00000000
++	ct_encoding	ISO8859-1:GL
++}
++
++XCOMM	cs1 class
++cs1	{
++	side		none
++	length		2
++	byte1		\xa1,\xf9
++	byte2		\x40,\x7e;\xa1,\xfe
++
++	wc_encoding	\x00008000
++	ct_encoding	BIG5-0:GLGR:\x1b\x25\x2f\x32\x80\x89\x42\x49\x47\x35\x2d\x30\x02
++
++	mb_conversion	[\xa140,\xf9fe]->\x2140
++	ct_conversion	[\x2140,\x79fe]->\xa140
++}
++
++END XLC_XLOCALE
diff --git a/x11/XFree86-4/files/patch-g b/x11/XFree86-4/files/patch-g
new file mode 100644
index 000000000000..946dc3e9f669
--- /dev/null
+++ b/x11/XFree86-4/files/patch-g
@@ -0,0 +1,271 @@
+--- extras/X-TrueType/BIG5/BIG5toUCS2.c.orig	Fri Feb 18 01:11:40 2000
++++ extras/X-TrueType/BIG5/BIG5toUCS2.c	Mon Mar 20 07:32:03 2000
+@@ -985,68 +985,68 @@
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, 0x30FE, 0x309D, 0x309E, 0x3005, 0x3041, 0x3042, 0x3043, 
+-    0x3044, 0x3045, 0x3046, 0x3047, 0x3048, 0x3049, 0x304A, 0x304B, 
+-    0x304C, 0x304D, 0x304E, 0x304F, 0x3050, 0x3051, 0x3052, 0x3053, 
+-    0x3054, 0x3055, 0x3056, 0x3057, 0x3058, 0x3059, 0x305A, 0x305B, 
+-    0x305C, 0x305D, 0x305E, 0x305F, 0x3060, 0x3061, 0x3062, 0x3063, 
+-    0x3064, 0x3065, 0x3066, 0x3067, 0x3068, 0x3069, 0x306A, 0x306B, 
+-    0x306C, 0x306D, 0x306E, 0x306F, 0x3070, 0x3071, 0x3072, 0x3073, 
+-    0x3074, 0x3075, 0x3076, 0x3077, 0x3078, 0x3079, 0x307A, 0x307B, 
+-    0x307C, 0x307D, 0x307E, 0x307F, 0x3080, 0x3081, 0x3082, 0x3083, 
+-    0x3084, 0x3085, 0x3086, 0x3087, 0x3088, 0x3089, 0x308A, 0x308B, 
+-    0x308C, 0x308D, 0x308E, 0x308F, 0x3090, 0x3091, 0x3092, 0x3093, 
+-    0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7, ALTCHR, 
+-/* 0xC740 - 0xC7FF */
+-    0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF, 
+-    0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7, 
+-    0x30B8, 0x30B9, 0x30BA, 0x30BB, 0x30BC, 0x30BD, 0x30BE, 0x30BF, 
+-    0x30C0, 0x30C1, 0x30C2, 0x30C3, 0x30C4, 0x30C5, 0x30C6, 0x30C7, 
+-    0x30C8, 0x30C9, 0x30CA, 0x30CB, 0x30CC, 0x30CD, 0x30CE, 0x30CF, 
+-    0x30D0, 0x30D1, 0x30D2, 0x30D3, 0x30D4, 0x30D5, 0x30D6, 0x30D7, 
+-    0x30D8, 0x30D9, 0x30DA, 0x30DB, 0x30DC, 0x30DD, 0x30DE, 0x30DF, 
+-    0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, 0x30E7, 0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC, 0x30ED, 
+-    0x30EE, 0x30EF, 0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 
+-    0x30F6, 0x0414, 0x0415, 0x0401, 0x0416, 0x0417, 0x0418, 0x0419, 
+-    0x041A, 0x041B, 0x041C, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 
+-    0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, 
+-    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451, 0x0436, 
+-    0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 
+-    0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 
+-    0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 
+-    0x044F, 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 
+-    0x2467, 0x2468, 0x2469, 0x2474, 0x2475, 0x2476, 0x2477, 0x2478, 
+-    0x2479, 0x247A, 0x247B, 0x247C, 0x247D, ALTCHR, ALTCHR, ALTCHR, 
+-/* 0xC840 - 0xC8FF */
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
++    ALTCHR, 0xF6B1, 0xF6B2, 0xF6B3, 0xF6B4, 0xF6B5, 0xF6B6, 0xF6B7, 
++    0xF6B8, 0xF6B9, 0xF6BA, 0xF6BB, 0xF6BC, 0xF6BD, 0xF6BE, 0xF6BF, 
++    0xF6C0, 0xF6C1, 0xF6C2, 0xF6C3, 0xF6C4, 0xF6C5, 0xF6C6, 0xF6C7, 
++    0xF6C8, 0xF6C9, 0xF6CA, 0xF6CB, 0xF6CC, 0xF6CD, 0xF6CE, 0xF6CF, 
++    0xF6D0, 0xF6D1, 0xF6D2, 0xF6D3, 0xF6D4, 0xF6D5, 0xF6D6, 0xF6D7, 
++    0xF6D8, 0xF6D9, 0xF6DA, 0xF6DB, 0xF6DC, 0xF6DD, 0xF6DE, 0xF6DF, 
++    0xF6E0, 0xF6E1, 0xF6E2, 0xF6E3, 0xF6E4, 0xF6E5, 0xF6E6, 0xF6E7, 
++    0xF6E8, 0xF6E9, 0xF6EA, 0xF6EB, 0xF6EC, 0xF6ED, 0xF6EE, 0xF6EF, 
++    0xF6F0, 0xF6F1, 0xF6F2, 0xF6F3, 0xF6F4, 0xF6F5, 0xF6F6, 0xF6F7, 
++    0xF6F8, 0xF6F9, 0xF6FA, 0xF6FB, 0xF6FC, 0xF6FD, 0xF6FE, 0xF6FF, 
++    0xF700, 0xF701, 0xF702, 0xF703, 0xF704, 0xF705, 0xF706, 0xF707, 
++    0xF708, 0xF709, 0xF70A, 0xF70B, 0xF70C, 0xF70D, 0xF70E, ALTCHR,
++/* 0xC740 - 0xC7FF */ 
++    0xF70F, 0xF710, 0xF711, 0xF712, 0xF713, 0xF714, 0xF715, 0xF716, 
++    0xF717, 0xF718, 0xF719, 0xF71A, 0xF71B, 0xF71C, 0xF71D, 0xF71E, 
++    0xF71F, 0xF720, 0xF721, 0xF722, 0xF723, 0xF724, 0xF725, 0xF726, 
++    0xF727, 0xF728, 0xF729, 0xF72A, 0xF72B, 0xF72C, 0xF72D, 0xF72E, 
++    0xF72F, 0xF730, 0xF731, 0xF732, 0xF733, 0xF734, 0xF735, 0xF736, 
++    0xF737, 0xF738, 0xF739, 0xF73A, 0xF73B, 0xF73C, 0xF73D, 0xF73E, 
++    0xF73F, 0xF740, 0xF741, 0xF742, 0xF743, 0xF744, 0xF745, 0xF746, 
++    0xF747, 0xF748, 0xF749, 0xF74A, 0xF74B, 0xF74C, 0xF74D, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
++    ALTCHR, 0xF74E, 0xF74F, 0xF750, 0xF751, 0xF752, 0xF753, 0xF754, 
++    0xF755, 0xF756, 0xF757, 0xF758, 0xF759, 0xF75A, 0xF75B, 0xF75C, 
++    0xF75D, 0xF75E, 0xF75F, 0xF760, 0xF761, 0xF762, 0xF763, 0xF764, 
++    0xF765, 0xF766, 0xF767, 0xF768, 0xF769, 0xF76A, 0xF76B, 0xF76C, 
++    0xF76D, 0xF76E, 0xF76F, 0xF770, 0xF771, 0xF772, 0xF773, 0xF774, 
++    0xF775, 0xF776, 0xF777, 0xF778, 0xF779, 0xF77A, 0xF77B, 0xF77C, 
++    0xF77D, 0xF77E, 0xF77F, 0xF780, 0xF781, 0xF782, 0xF783, 0xF784, 
++    0xF785, 0xF786, 0xF787, 0xF788, 0xF789, 0xF78A, 0xF78B, 0xF78C, 
++    0xF78D, 0xF78E, 0xF78F, 0xF790, 0xF791, 0xF792, 0xF793, 0xF794, 
++    0xF795, 0xF796, 0xF797, 0xF798, 0xF799, 0xF79A, 0xF79B, 0xF79C, 
++    0xF79D, 0xF79E, 0xF79F, 0xF7A0, 0xF7A1, 0xF7A2, 0xF7A3, 0xF7A4, 
++    0xF7A5, 0xF7A6, 0xF7A7, 0xF7A8, 0xF7A9, 0xF7AA, 0xF7AB, ALTCHR,
++/* 0xC840 - 0xC8FF */ 
++    0xF7AC, 0xF7AD, 0xF7AE, 0xF7AF, 0xF7B0, 0xF7B1, 0xF7B2, 0xF7B3, 
++    0xF7B4, 0xF7B5, 0xF7B6, 0xF7B7, 0xF7B8, 0xF7B9, 0xF7BA, 0xF7BB, 
++    0xF7BC, 0xF7BD, 0xF7BE, 0xF7BF, 0xF7C0, 0xF7C1, 0xF7C2, 0xF7C3, 
++    0xF7C4, 0xF7C5, 0xF7C6, 0xF7C7, 0xF7C8, 0xF7C9, 0xF7CA, 0xF7CB, 
++    0xF7CC, 0xF7CD, 0xF7CE, 0xF7CF, 0xF7D0, 0xF7D1, 0xF7D2, 0xF7D3, 
++    0xF7D4, 0xF7D5, 0xF7D6, 0xF7D7, 0xF7D8, 0xF7D9, 0xF7DA, 0xF7DB, 
++    0xF7DC, 0xF7DD, 0xF7DE, 0xF7DF, 0xF7E0, 0xF7E1, 0xF7E2, 0xF7E3, 
++    0xF7E4, 0xF7E5, 0xF7E6, 0xF7E7, 0xF7E8, 0xF7E9, 0xF7EA, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
++    ALTCHR, 0xF7EB, 0xF7EC, 0xF7ED, 0xF7EE, 0xF7EF, 0xF7F0, 0xF7F1, 
++    0xF7F2, 0xF7F3, 0xF7F4, 0xF7F5, 0xF7F6, 0xF7F7, 0xF7F8, 0xF7F9, 
++    0xF7FA, 0xF7FB, 0xF7FC, 0xF7FD, 0xF7FE, 0xF7FF, 0xF800, 0xF801, 
++    0xF802, 0xF803, 0xF804, 0xF805, 0xF806, 0xF807, 0xF808, 0xF809, 
++    0xF80A, 0xF80B, 0xF80C, 0xF80D, 0xF80E, 0xF80F, 0xF810, 0xF811, 
++    0xF812, 0xF813, 0xF814, 0xF815, 0xF816, 0xF817, 0xF818, 0xF819, 
++    0xF81A, 0xF81B, 0xF81C, 0xF81D, 0xF81E, 0xF81F, 0xF820, 0xF821, 
++    0xF822, 0xF823, 0xF824, 0xF825, 0xF826, 0xF827, 0xF828, 0xF829, 
++    0xF82A, 0xF82B, 0xF82C, 0xF82D, 0xF82E, 0xF82F, 0xF830, 0xF831, 
++    0xF832, 0xF833, 0xF834, 0xF835, 0xF836, 0xF837, 0xF838, 0xF839, 
++    0xF83A, 0xF83B, 0xF83C, 0xF83D, 0xF83E, 0xF83F, 0xF840, 0xF841, 
++    0xF842, 0xF843, 0xF844, 0xF845, 0xF846, 0xF847, 0xF848, ALTCHR,
+ /* 0xC940 - 0xC9FF */
+     0x4E42, 0x4E5C, 0x51F5, 0x531A, 0x5382, 0x4E07, 0x4E0C, 0x4E47, 
+     0x4E8D, 0x56D7, 0xFA0C, 0x5C6E, 0x5F73, 0x4E0F, 0x5187, 0x4E0E, 
+@@ -2266,17 +2266,142 @@
+     0x9E17, 0x9F48, 0x6207, 0x6B1E, 0x7227, 0x864C, 0x8EA8, 0x9482, 
+     0x9480, 0x9481, 0x9A69, 0x9A68, 0x9B2E, 0x9E19, 0x7229, 0x864B, 
+     0x8B9F, 0x9483, 0x9C79, 0x9EB7, 0x7675, 0x9A6B, 0x9C7A, 0x9E1D, 
+-    0x7069, 0x706A, 0x9EA4, 0x9F7E, 0x9F49, 0x9F98, ALTCHR, ALTCHR, 
+-    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
++    0x7069, 0x706A, 0x9EA4, 0x9F7E, 0x9F49, 0x9F98, 0x7881, 0x92B9, 
++    0x88CF, 0x58BB, 0x6052, 0x7CA7, 0x5AFA, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
+     ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, 
++/* 0xFA40 - 0xFAFF */  
++    0xE000, 0xE001, 0xE002, 0xE003, 0xE004, 0xE005, 0xE006, 0xE007,  
++    0xE008, 0xE009, 0xE00A, 0xE00B, 0xE00C, 0xE00D, 0xE00E, 0xE00F,  
++    0xE010, 0xE011, 0xE012, 0xE013, 0xE014, 0xE015, 0xE016, 0xE017,  
++    0xE018, 0xE019, 0xE01A, 0xE01B, 0xE01C, 0xE01D, 0xE01E, 0xE01F,  
++    0xE020, 0xE021, 0xE022, 0xE023, 0xE024, 0xE025, 0xE026, 0xE027,  
++    0xE028, 0xE029, 0xE02A, 0xE02B, 0xE02C, 0xE02D, 0xE02E, 0xE02F,  
++    0xE030, 0xE031, 0xE032, 0xE033, 0xE034, 0xE035, 0xE036, 0xE037,  
++    0xE038, 0xE039, 0xE03A, 0xE03B, 0xE03C, 0xE03D, 0xE03E, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, 0xE03F, 0xE040, 0xE041, 0xE042, 0xE043, 0xE044, 0xE045,  
++    0xE046, 0xE047, 0xE048, 0xE049, 0xE04A, 0xE04B, 0xE04C, 0xE04D,  
++    0xE04E, 0xE04F, 0xE050, 0xE051, 0xE052, 0xE053, 0xE054, 0xE055,  
++    0xE056, 0xE057, 0xE058, 0xE059, 0xE05A, 0xE05B, 0xE05C, 0xE05D,  
++    0xE05E, 0xE05F, 0xE060, 0xE061, 0xE062, 0xE063, 0xE064, 0xE065,  
++    0xE066, 0xE067, 0xE068, 0xE069, 0xE06A, 0xE06B, 0xE06C, 0xE06D,  
++    0xE06E, 0xE06F, 0xE070, 0xE071, 0xE072, 0xE073, 0xE074, 0xE075,  
++    0xE076, 0xE077, 0xE078, 0xE079, 0xE07A, 0xE07B, 0xE07C, 0xE07D,  
++    0xE07E, 0xE07F, 0xE080, 0xE081, 0xE082, 0xE083, 0xE084, 0xE085,  
++    0xE086, 0xE087, 0xE088, 0xE089, 0xE08A, 0xE08B, 0xE08C, 0xE08D,  
++    0xE08E, 0xE08F, 0xE090, 0xE091, 0xE092, 0xE093, 0xE094, 0xE095,  
++    0xE096, 0xE097, 0xE098, 0xE099, 0xE09A, 0xE09B, 0xE09C, ALTCHR,
++/* 0xFB40 - 0xFBFF */  
++    0xE09D, 0xE09E, 0xE09F, 0xE0A0, 0xE0A1, 0xE0A2, 0xE0A3, 0xE0A4,  
++    0xE0A5, 0xE0A6, 0xE0A7, 0xE0A8, 0xE0A9, 0xE0AA, 0xE0AB, 0xE0AC,  
++    0xE0AD, 0xE0AE, 0xE0AF, 0xE0B0, 0xE0B1, 0xE0B2, 0xE0B3, 0xE0B4,  
++    0xE0B5, 0xE0B6, 0xE0B7, 0xE0B8, 0xE0B9, 0xE0BA, 0xE0BB, 0xE0BC,  
++    0xE0BD, 0xE0BE, 0xE0BF, 0xE0C0, 0xE0C1, 0xE0C2, 0xE0C3, 0xE0C4,  
++    0xE0C5, 0xE0C6, 0xE0C7, 0xE0C8, 0xE0C9, 0xE0CA, 0xE0CB, 0xE0CC,  
++    0xE0CD, 0xE0CE, 0xE0CF, 0xE0D0, 0xE0D1, 0xE0D2, 0xE0D3, 0xE0D4,  
++    0xE0D5, 0xE0D6, 0xE0D7, 0xE0D8, 0xE0D9, 0xE0DA, 0xE0DB, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, 0xE0DC, 0xE0DD, 0xE0DE, 0xE0DF, 0xE0E0, 0xE0E1, 0xE0E2,  
++    0xE0E3, 0xE0E4, 0xE0E5, 0xE0E6, 0xE0E7, 0xE0E8, 0xE0E9, 0xE0EA,  
++    0xE0EB, 0xE0EC, 0xE0ED, 0xE0EE, 0xE0EF, 0xE0F0, 0xE0F1, 0xE0F2,  
++    0xE0F3, 0xE0F4, 0xE0F5, 0xE0F6, 0xE0F7, 0xE0F8, 0xE0F9, 0xE0FA,  
++    0xE0FB, 0xE0FC, 0xE0FD, 0xE0FE, 0xE0FF, 0xE100, 0xE101, 0xE102,  
++    0xE103, 0xE104, 0xE105, 0xE106, 0xE107, 0xE108, 0xE109, 0xE10A,  
++    0xE10B, 0xE10C, 0xE10D, 0xE10E, 0xE10F, 0xE110, 0xE111, 0xE112,  
++    0xE113, 0xE114, 0xE115, 0xE116, 0xE117, 0xE118, 0xE119, 0xE11A,  
++    0xE11B, 0xE11C, 0xE11D, 0xE11E, 0xE11F, 0xE120, 0xE121, 0xE122,  
++    0xE123, 0xE124, 0xE125, 0xE126, 0xE127, 0xE128, 0xE129, 0xE12A,  
++    0xE12B, 0xE12C, 0xE12D, 0xE12E, 0xE12F, 0xE130, 0xE131, 0xE132,  
++    0xE133, 0xE134, 0xE135, 0xE136, 0xE137, 0xE138, 0xE139, ALTCHR,
++/* 0xFC40 - 0xFCFF */  
++    0xE13A, 0xE13B, 0xE13C, 0xE13D, 0xE13E, 0xE13F, 0xE140, 0xE141,  
++    0xE142, 0xE143, 0xE144, 0xE145, 0xE146, 0xE147, 0xE148, 0xE149,  
++    0xE14A, 0xE14B, 0xE14C, 0xE14D, 0xE14E, 0xE14F, 0xE150, 0xE151,  
++    0xE152, 0xE153, 0xE154, 0xE155, 0xE156, 0xE157, 0xE158, 0xE159,  
++    0xE15A, 0xE15B, 0xE15C, 0xE15D, 0xE15E, 0xE15F, 0xE160, 0xE161,  
++    0xE162, 0xE163, 0xE164, 0xE165, 0xE166, 0xE167, 0xE168, 0xE169,  
++    0xE16A, 0xE16B, 0xE16C, 0xE16D, 0xE16E, 0xE16F, 0xE170, 0xE171,  
++    0xE172, 0xE173, 0xE174, 0xE175, 0xE176, 0xE177, 0xE178, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, 0xE179, 0xE17A, 0xE17B, 0xE17C, 0xE17D, 0xE17E, 0xE17F,  
++    0xE180, 0xE181, 0xE182, 0xE183, 0xE184, 0xE185, 0xE186, 0xE187,  
++    0xE188, 0xE189, 0xE18A, 0xE18B, 0xE18C, 0xE18D, 0xE18E, 0xE18F,  
++    0xE190, 0xE191, 0xE192, 0xE193, 0xE194, 0xE195, 0xE196, 0xE197,  
++    0xE198, 0xE199, 0xE19A, 0xE19B, 0xE19C, 0xE19D, 0xE19E, 0xE19F,  
++    0xE1A0, 0xE1A1, 0xE1A2, 0xE1A3, 0xE1A4, 0xE1A5, 0xE1A6, 0xE1A7,  
++    0xE1A8, 0xE1A9, 0xE1AA, 0xE1AB, 0xE1AC, 0xE1AD, 0xE1AE, 0xE1AF,  
++    0xE1B0, 0xE1B1, 0xE1B2, 0xE1B3, 0xE1B4, 0xE1B5, 0xE1B6, 0xE1B7,  
++    0xE1B8, 0xE1B9, 0xE1BA, 0xE1BB, 0xE1BC, 0xE1BD, 0xE1BE, 0xE1BF,  
++    0xE1C0, 0xE1C1, 0xE1C2, 0xE1C3, 0xE1C4, 0xE1C5, 0xE1C6, 0xE1C7,  
++    0xE1C8, 0xE1C9, 0xE1CA, 0xE1CB, 0xE1CC, 0xE1CD, 0xE1CE, 0xE1CF,  
++    0xE1D0, 0xE1D1, 0xE1D2, 0xE1D3, 0xE1D4, 0xE1D5, 0xE1D6, ALTCHR,
++/* 0xFD40 - 0xFDFF */  
++    0xE1D7, 0xE1D8, 0xE1D9, 0xE1DA, 0xE1DB, 0xE1DC, 0xE1DD, 0xE1DE,  
++    0xE1DF, 0xE1E0, 0xE1E1, 0xE1E2, 0xE1E3, 0xE1E4, 0xE1E5, 0xE1E6,  
++    0xE1E7, 0xE1E8, 0xE1E9, 0xE1EA, 0xE1EB, 0xE1EC, 0xE1ED, 0xE1EE,  
++    0xE1EF, 0xE1F0, 0xE1F1, 0xE1F2, 0xE1F3, 0xE1F4, 0xE1F5, 0xE1F6,  
++    0xE1F7, 0xE1F8, 0xE1F9, 0xE1FA, 0xE1FB, 0xE1FC, 0xE1FD, 0xE1FE,  
++    0xE1FF, 0xE200, 0xE201, 0xE202, 0xE203, 0xE204, 0xE205, 0xE206,  
++    0xE207, 0xE208, 0xE209, 0xE20A, 0xE20B, 0xE20C, 0xE20D, 0xE20E,  
++    0xE20F, 0xE210, 0xE211, 0xE212, 0xE213, 0xE214, 0xE215, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, 0xE216, 0xE217, 0xE218, 0xE219, 0xE21A, 0xE21B, 0xE21C,  
++    0xE21D, 0xE21E, 0xE21F, 0xE220, 0xE221, 0xE222, 0xE223, 0xE224,  
++    0xE225, 0xE226, 0xE227, 0xE228, 0xE229, 0xE22A, 0xE22B, 0xE22C,  
++    0xE22D, 0xE22E, 0xE22F, 0xE230, 0xE231, 0xE232, 0xE233, 0xE234,  
++    0xE235, 0xE236, 0xE237, 0xE238, 0xE239, 0xE23A, 0xE23B, 0xE23C,  
++    0xE23D, 0xE23E, 0xE23F, 0xE240, 0xE241, 0xE242, 0xE243, 0xE244,  
++    0xE245, 0xE246, 0xE247, 0xE248, 0xE249, 0xE24A, 0xE24B, 0xE24C,  
++    0xE24D, 0xE24E, 0xE24F, 0xE250, 0xE251, 0xE252, 0xE253, 0xE254,  
++    0xE255, 0xE256, 0xE257, 0xE258, 0xE259, 0xE25A, 0xE25B, 0xE25C,  
++    0xE25D, 0xE25E, 0xE25F, 0xE260, 0xE261, 0xE262, 0xE263, 0xE264,  
++    0xE265, 0xE266, 0xE267, 0xE268, 0xE269, 0xE26A, 0xE26B, 0xE26C,  
++    0xE26D, 0xE26E, 0xE26F, 0xE270, 0xE271, 0xE272, 0xE273, ALTCHR,
++/* 0xFE40 - 0xFEFF */  
++    0xE274, 0xE275, 0xE276, 0xE277, 0xE278, 0xE279, 0xE27A, 0xE27B,  
++    0xE27C, 0xE27D, 0xE27E, 0xE27F, 0xE280, 0xE281, 0xE282, 0xE283,  
++    0xE284, 0xE285, 0xE286, 0xE287, 0xE288, 0xE289, 0xE28A, 0xE28B,  
++    0xE28C, 0xE28D, 0xE28E, 0xE28F, 0xE290, 0xE291, 0xE292, 0xE293,  
++    0xE294, 0xE295, 0xE296, 0xE297, 0xE298, 0xE299, 0xE29A, 0xE29B,  
++    0xE29C, 0xE29D, 0xE29E, 0xE29F, 0xE2A0, 0xE2A1, 0xE2A2, 0xE2A3,  
++    0xE2A4, 0xE2A5, 0xE2A6, 0xE2A7, 0xE2A8, 0xE2A9, 0xE2AA, 0xE2AB,  
++    0xE2AC, 0xE2AD, 0xE2AE, 0xE2AF, 0xE2B0, 0xE2B1, 0xE2B2, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,  
++    ALTCHR, 0xE2B3, 0xE2B4, 0xE2B5, 0xE2B6, 0xE2B7, 0xE2B8, 0xE2B9,  
++    0xE2BA, 0xE2BB, 0xE2BC, 0xE2BD, 0xE2BE, 0xE2BF, 0xE2C0, 0xE2C1,  
++    0xE2C2, 0xE2C3, 0xE2C4, 0xE2C5, 0xE2C6, 0xE2C7, 0xE2C8, 0xE2C9,  
++    0xE2CA, 0xE2CB, 0xE2CC, 0xE2CD, 0xE2CE, 0xE2CF, 0xE2D0, 0xE2D1,  
++    0xE2D2, 0xE2D3, 0xE2D4, 0xE2D5, 0xE2D6, 0xE2D7, 0xE2D8, 0xE2D9,  
++    0xE2DA, 0xE2DB, 0xE2DC, 0xE2DD, 0xE2DE, 0xE2DF, 0xE2E0, 0xE2E1,  
++    0xE2E2, 0xE2E3, 0xE2E4, 0xE2E5, 0xE2E6, 0xE2E7, 0xE2E8, 0xE2E9,  
++    0xE2EA, 0xE2EB, 0xE2EC, 0xE2ED, 0xE2EE, 0xE2EF, 0xE2F0, 0xE2F1,  
++    0xE2F2, 0xE2F3, 0xE2F4, 0xE2F5, 0xE2F6, 0xE2F7, 0xE2F8, 0xE2F9,  
++    0xE2FA, 0xE2FB, 0xE2FC, 0xE2FD, 0xE2FE, 0xE2FF, 0xE300, 0xE301,  
++    0xE302, 0xE303, 0xE304, 0xE305, 0xE306, 0xE307, 0xE308, 0xE309,  
++    0xE30A, 0xE30B, 0xE30C, 0xE30D, 0xE30E, 0xE30F, 0xE310, ALTCHR, 
+ };
+ 
+ CODE_CONV_TWO_OCTET_TO_UCS2(cc_big5_to_ucs2, /* function name */
+                             tblBig5ToUcs2, /* table name */
+-                            0x00A1, 0x00F9, /* code range (high byte) */
++                            0x00A1, 0x00FE, /* code range (high byte) */
+                             0x0040, 0x00FF, /* code range (low byte) */
+                             ALTCHR /* alt char code (on UCS2) */
+                             )
diff --git a/x11/XFree86-4/pkg-plist b/x11/XFree86-4/pkg-plist
index 2985cea34135..66266a582026 100644
--- a/x11/XFree86-4/pkg-plist
+++ b/x11/XFree86-4/pkg-plist
@@ -1709,7 +1709,7 @@ lib/X11/locale/vi_VN.viscii/Compose
 lib/X11/locale/vi_VN.viscii/XLC_LOCALE
 lib/X11/locale/zh/Compose
 lib/X11/locale/zh/XLC_LOCALE
-lib/X11/locale/zh_TW.big5/Compose
+lib/X11/locale/zh_TW.Big5/Compose
 lib/X11/locale/zh_TW/Compose
 lib/X11/locale/zh_TW/XLC_LOCALE
 lib/X11/rgb.txt
@@ -3322,7 +3322,7 @@ X11/xsm/system.xsm
 @dirrm lib/X11/locale/vi_VN.viscii
 @dirrm lib/X11/locale/zh
 @dirrm lib/X11/locale/zh_TW
-@dirrm lib/X11/locale/zh_TW.big5
+@dirrm lib/X11/locale/zh_TW.Big5
 @dirrm lib/X11/locale
 @dirrm lib/X11/x11perfcomp
 @dirrm lib/X11/xkb/compat