o Convert po from utf-8 to big5.

o Handle LC_* properly.
o Bump PORTREVISION.

PR:	ports/35728
Submitted by:	Yen-Ming Lee <leeym@utopia.leeym.com>

6 files changed, 294 insertions, 1 deletions

diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile
index 2518b7becbc5..9316be363e18 100644
--- a/chinese/zhcon/Makefile
+++ b/chinese/zhcon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zhcon
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/chinese/zhcon/files/extrapatch-aa b/chinese/zhcon/files/extrapatch-aa
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/chinese/zhcon/files/extrapatch-aa
+++ /dev/null
diff --git a/chinese/zhcon/files/patch-aa b/chinese/zhcon/files/patch-aa
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/chinese/zhcon/files/patch-aa
+++ /dev/null
diff --git a/chinese/zhcon/files/patch-ab b/chinese/zhcon/files/patch-ab
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/chinese/zhcon/files/patch-ab
+++ /dev/null
diff --git a/chinese/zhcon/files/patch-po::zh_TW.Big5.po b/chinese/zhcon/files/patch-po::zh_TW.Big5.po
new file mode 100644
index 000000000000..15f3580b58f9
--- /dev/null
+++ b/chinese/zhcon/files/patch-po::zh_TW.Big5.po
@@ -0,0 +1,285 @@
+--- po/zh_TW.Big5.po.orig	Tue Feb 19 12:58:16 2002
++++ po/zh_TW.Big5.po	Sun Feb 24 14:25:34 2002
+@@ -6,166 +6,165 @@
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "POT-Creation-Date: 2002-02-16 18:15+0000\n"
+-"PO-Revision-Date: 2001-10-26 22:22PRC\n"
++"PO-Revision-Date: 2002-02-24 14:30+0800\n"
+ "Last-Translator: ejoy <ejoy@users.sourceforge.net>\n"
+ "Language-Team: \n"
+ "MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Type: text/plain; charset=Big5\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Generator: KBabel 0.9.5\n"
+ 
+ #: src/overspotclient.cpp:67 src/overspotclient.cpp:72
+ #: src/overspotclient.cpp:215
+ msgid "["
+-msgstr ""
++msgstr "�i"
+ 
+ #: src/overspotclient.cpp:68
+ msgid "Full"
+-msgstr "��"
++msgstr "����"
+ 
+ #: src/overspotclient.cpp:68
+ msgid "Half"
+-msgstr "モ�"
++msgstr "�b��"
+ 
+ #: src/overspotclient.cpp:69
+ msgid "Ch"
+-msgstr "〈"
++msgstr "�C"
+ 
+ #: src/overspotclient.cpp:69
+ msgid "En"
+-msgstr "◇"
++msgstr ".,"
+ 
+ #: src/overspotclient.cpp:70 src/overspotclient.cpp:72
+ #: src/overspotclient.cpp:217
+ msgid "]"
+-msgstr ""
++msgstr "�j"
+ 
+ #: src/configserver.cpp:27
+ msgid "input option"
+-msgstr "输入法选项"
++msgstr "��J�k�ﶵ"
+ 
+ #: src/configserver.cpp:28
+ msgid "Select Encode"
+-msgstr "叫匡拒襟截よΑ:"
++msgstr "�s�X�覡"
+ 
+ #: src/configserver.cpp:29
+ msgid "Encode-Detect Method"
+-msgstr ""
++msgstr "�s�X�����覡"
+ 
+ #: src/configserver.cpp:30
+ msgid "Quit"
+-msgstr "退出菜单"
++msgstr "�h�X���"
+ 
+ #: src/configserver.cpp:34 src/configserver.cpp:170
+-#, fuzzy
+ msgid "Current Encode-Detect Method:"
+-msgstr "当前内码识别方式:"
++msgstr "�ثe�s�X�����覡:"
+ 
+ #: src/configserver.cpp:39 src/configserver.cpp:48 src/configserver.cpp:58
+ msgid "Back"
+-msgstr ""
++msgstr "��^�W�ſ��"
+ 
+ #: src/configserver.cpp:43
+ msgid "Input Option:"
+-msgstr "输入法选项:"
++msgstr "��J�k�ﶵ:"
+ 
+ #: src/configserver.cpp:44 src/configserver.cpp:235
+ msgid "Auto Select Unique Word"
+-msgstr "无重码自动上屏"
++msgstr "��W�r�۰ʿ��"
+ 
+ #: src/configserver.cpp:46
+ msgid "Input Encode"
+-msgstr "输入法选项"
++msgstr "��J�k�s�X"
+ 
+ #: src/configserver.cpp:52
+ msgid "Please Select Encode:"
+-msgstr "请选择编码方式:"
++msgstr "�п�ܽs�X�覡:"
+ 
+ #: src/configserver.cpp:63
+ msgid "System Menu"
+-msgstr "系统菜单"
++msgstr "�t��"
+ 
+ #: src/configserver.cpp:123
+ msgid "Current Encode:"
+-msgstr "当前编码方式:"
++msgstr "�ثe�s�X�覡:"
+ 
+ #: src/configserver.cpp:211
+ msgid "Current Input Encode(native only)"
+-msgstr "当前输入法编码(native only)"
++msgstr "�ثe��J�k�s�X(native only)"
+ 
+ #: src/zhcon.cpp:85
+ msgid "Please visit zhcon.gnuchina.org for more information."
+-msgstr ""
++msgstr "�аѦ�zhcon������zhcon.gnuchina.org�H��o��h��T�C"
+ 
+ #: src/zhcon.cpp:86
+ msgid "Zhcon supports GB2312,GBK,BIG5,JIS,KSCM encode."
+-msgstr ""
++msgstr "zhcon�䴩GB2312,GBK,BIG5,JIS,KSCM���ؽs�X�覡�C"
+ 
+ #: src/zhcon.cpp:87
+ msgid "You can use CTRL-ALT-0 to toggle prompt bar."
+-msgstr ""
++msgstr "�i�H�ϥ�CTRL-ALT-0�������ܱ��C"
+ 
+ #: src/zhcon.cpp:88
+ msgid "Press CTRL-ALT-H for online help."
+-msgstr ""
++msgstr "�Ы� CTRL-ALT-H ��ܨD�U�T���C"
+ 
+ #: src/zhcon.cpp:89
+ msgid "Zhcon supports 12,14,16,24 pixel fonts,you can change in zhcon.conf"
+-msgstr ""
++msgstr "zhcon�䴩12,14,16,24���h�ؤ��P�I�}�r��A�z�i�H�bzhcon.conf���]�w�r��C"
+ 
+ #: src/zhcon.cpp:90
+ msgid "You can use 24 pixel font on 17 monitor to get better visual effect."
+-msgstr ""
++msgstr "�b17�T����ܾ��W�i�H�ϥ�1024X768�M24�I�}�r�����o��n����ܮĪG�C"
+ 
+ #: src/zhcon.cpp:91
+ msgid "Hit CTRL-D to quit zhcon."
+-msgstr ""
++msgstr "�i�H�ϥ�CTRL-D�Ӱh�Xzhcon."
+ 
+ #: src/zhcon.cpp:92
+ msgid "You can find user manual in doc/."
+-msgstr ""
++msgstr "�ϥΤ�U�bdoc/�ؿ��U�C"
+ 
+ #: src/zhcon.cpp:93
+ msgid ""
+ "Zhcon can use input methods from Unicon[TurboLinux],read manual for detail."
+ msgstr ""
++"zhcon��ϥ�Unicon[TurboLinux]������J�k�A�о\\Ū��U�H��o��ԲӪ���T�C"
+ 
+ #: src/zhcon.cpp:94
+ msgid "Zhcon is optimized for running under Linux FrameBuffer."
+-msgstr ""
++msgstr "zhcon��Linux��FrameBuffer�X�ʧ@�F�̨ΤơA�bFrameBuffer�U�i�H�o��̨ήĪG�C"
+ 
+ #: src/zhcon.cpp:95
+ msgid "Press CTRL-F7 to change input style"
+-msgstr ""
++msgstr "�i�H��CTRL-F7������J����C"
+ 
+ #: src/zhcon.cpp:603
+ msgid "screen resolution"
+-msgstr ""
++msgstr "�ù��ѪR��"
+ 
+ #: src/zhcon.cpp:606
+-#, fuzzy
+ msgid "default encode"
+-msgstr "请选择编码方式:"
++msgstr "�w�]�s�X  "
+ 
+ #: src/inputmanager.cpp:706
+ msgid "Press CTRL-ALT-H to exit help"
+-msgstr ""
++msgstr "�� CTRL-ALT-H �h�X�D�U���f"
+ 
+ #: src/inputmanager.cpp:707
+ msgid "ALT -SPACE  Open/Close CJK mode"
+-msgstr ""
++msgstr "ALT-SPACE   ���}/����CJK�覡"
+ 
+ #: src/inputmanager.cpp:708
+ msgid "CTRL-SPACE  Open/Close input method"
+-msgstr ""
++msgstr "CTRL-SPACE  ���}/������J�k"
+ 
+ #: src/inputmanager.cpp:709
+ msgid "SHIFT-PageUp/PageDown/Up/Down   Scroll & Display History"
+-msgstr ""
++msgstr "SHIFT-PageUp/PageDown/Up/Down  �s�����v�ù�"
+ 
+ #: src/inputmanager.cpp:711
+ msgid "CTRL key:"
+-msgstr ""
++msgstr "CTRL �\\����:"
+ 
+ #: src/inputmanager.cpp:712
+ msgid "F1  GB2312"
+@@ -189,61 +188,60 @@
+ 
+ #: src/inputmanager.cpp:717
+ msgid "F9  Switch & Auto Detect"
+-msgstr ""
++msgstr "F9  �����۰ʰ����覡"
+ 
+ #: src/inputmanager.cpp:718
+-#, fuzzy
+ msgid "F10 Sys Menu"
+-msgstr "系统菜单"
++msgstr "F10 ���"
+ 
+ #: src/inputmanager.cpp:719
+ msgid "F7  Input Style"
+-msgstr ""
++msgstr "F7  ������J����"
+ 
+ #: src/inputmanager.cpp:720
+ msgid "D   Exit zhcon"
+-msgstr ""
++msgstr "D   �h�Xzhcon"
+ 
+ #: src/inputmanager.cpp:722
+ msgid "Chinese/English Mode:"
+-msgstr ""
++msgstr "���^��Ҧ�:"
+ 
+ #: src/inputmanager.cpp:723
+ msgid "CTRL-,  Full/Half Char"
+-msgstr ""
++msgstr "Ctrl-,  ��������/�b��"
+ 
+ #: src/inputmanager.cpp:724
+ msgid "CTRL-.  Full/Half Comma"
+-msgstr ""
++msgstr "Ctrl-.  ����������I"
+ 
+ #: src/inputmanager.cpp:726
+ msgid "CTRL-ALT-NUM:"
+-msgstr ""
++msgstr "CTRL-ALT-�Ʀr��:"
+ 
+ #: src/inputmanager.cpp:727
+ msgid "0      Prompt Mode"
+-msgstr ""
++msgstr "0      �i�J���ܪ��A"
+ 
+ #: src/inputmanager.cpp:728
+ msgid "1..9   Select IME 1..9"
+-msgstr ""
++msgstr "1..9   ��ܿ�J�k1..9"
+ 
+ #: src/inputmanager.cpp:730
+ msgid "Special Input Key:"
+-msgstr ""
++msgstr "��J�\\����:"
+ 
+ #: src/inputmanager.cpp:731
+ msgid "CTRL-SHIFT  Next IME"
+-msgstr ""
++msgstr "CTRL-SHIFT  �����U�@�ӿ�J�k"
+ 
+ #: src/inputmanager.cpp:732
+ msgid "SPACE       Select Number 0"
+-msgstr ""
++msgstr "SPACE     �ثe�~�r���"
+ 
+ #: src/inputmanager.cpp:733
+ msgid "+/-         Next/Prev page"
+-msgstr ""
++msgstr "+/-         �Կ�r�e��½��"
+ 
+ #: src/inputmanager.cpp:734
+ msgid "ESC         Reset Input Area"
+-msgstr ""
++msgstr "ESC       �M�ſ�J��"
diff --git a/chinese/zhcon/files/patch-src::zhcon.cpp b/chinese/zhcon/files/patch-src::zhcon.cpp
index acb3320dc494..c9e255cf6e68 100644
--- a/chinese/zhcon/files/patch-src::zhcon.cpp
+++ b/chinese/zhcon/files/patch-src::zhcon.cpp
@@ -17,7 +17,7 @@
      InitInputManager(f);
      if (f.GetOption("startupmsg",true))
          StartupMsg();
-@@ -489,23 +490,23 @@
+@@ -489,29 +490,30 @@
      string s;
      s = f.GetOption(string("defaultencode"), string("gb2312"));
      if (s == "gb2312") {
@@ -46,3 +46,10 @@
          setenv("LC_ALL", "ko", 1);
          mDefaultEncode = GBK;
      } else {
+         throw runtime_error("unable to set default encode!");
+     }
+ 
++    setenv("LC_CTYPE", getenv("LC_ALL"), 1);
+     s = f.GetOption(string("autoencode"), string("manual"));
+     if (s == "auto")
+         mAutoEncode = AUTO;