1 files changed, 246 insertions, 184 deletions

diff --git a/japanese/FreeWnn-server/pkg-plist b/japanese/FreeWnn-server/pkg-plist
index 114a7ec1b0a9..372afe9c5c30 100644
--- a/japanese/FreeWnn-server/pkg-plist
+++ b/japanese/FreeWnn-server/pkg-plist
@@ -22,6 +22,7 @@ lib/wnn/ja_JP/dic/src/fzk.con
 lib/wnn/ja_JP/dic/src/fzk.shuutan
 lib/wnn/ja_JP/dic/wnncons/tankan2.dic
 lib/wnn/ja_JP/dic/wnncons/tankan3.dic
+lib/wnn/ja_JP/dic/gerodic/g-jinmei.dic
 lib/wnn/ja_JP/jserverrc
 lib/wnn/ja_JP/hinsi.data
 lib/wnn/ja_JP/uum.msg
@@ -85,9 +86,45 @@ lib/wnn/lt_LN/uumrc
 lib/wnn/lt_LN/rk/2A_CTRL
 lib/wnn/lt_LN/rk/2B_LATIN
 lib/wnn/lt_LN/rk/mode
+@comment Xwnmo
+lib/wnn/ja_JP/uumrc_vi.xim
+lib/wnn/ja_JP/uumrc_e.xim
+lib/wnn/ja_JP/uumrc.xim
+lib/wnn/ja_JP/uumkey.xim
+lib/wnn/ja_JP/uumkey_v.xim
+lib/wnn/ja_JP/uumkey_e.xim
+lib/wnn/ja_JP/xim.msg
+lib/wnn/ja_JP/xjutil.msg
+lib/wnn/ko_KR/uumkey.xim
+lib/wnn/ko_KR/uumrc.xim
+lib/wnn/ko_KR/xim.msg
+lib/wnn/ko_KR/xjutil.msg
+lib/wnn/lt_LN/uumkey.xim
+lib/wnn/lt_LN/uumrc.xim
+lib/wnn/lt_LN/xim.msg
+lib/wnn/zh_CN/uumkey.xim
+lib/wnn/zh_CN/uumkey_p.xim
+lib/wnn/zh_CN/uumrc.xim
+lib/wnn/zh_CN/uumrc_p.xim
+lib/wnn/zh_CN/uumrc_z.xim
+lib/wnn/zh_CN/xim.msg
+lib/wnn/zh_CN/xjutil.msg
+lib/wnn/zh_TW/uumkey.xim
+lib/wnn/zh_TW/uumkey_p.xim
+lib/wnn/zh_TW/uumrc.xim
+lib/wnn/zh_TW/uumrc_p.xim
+lib/wnn/zh_TW/uumrc_z.xim
+lib/wnn/zh_TW/xim.msg
+lib/wnn/zh_TW/xjutil.msg
+lib/wnn/cvt_xim_tbl
+lib/wnn/ximconf
+lib/wnn/ximrc
+lib/wnn/ximrc_vi
+@comment END Xwnmo
 @dirrm lib/wnn/lt_LN/rk
 @dirrm lib/wnn/lt_LN
 @dirrm lib/wnn/ja_JP/dic/wnncons
+@dirrm lib/wnn/ja_JP/dic/gerodic/
 @dirrm lib/wnn/ja_JP/dic/usr
 @dirrm lib/wnn/ja_JP/dic/src
 @dirrm lib/wnn/ja_JP/dic/pubdic
@@ -95,6 +132,11 @@ lib/wnn/lt_LN/rk/mode
 @dirrm lib/wnn/ja_JP/rk.vi
 @dirrm lib/wnn/ja_JP/rk
 @dirrm lib/wnn/ja_JP
+@comment Xwnmo
+@dirrm lib/wnn/ko_KR
+@dirrm lib/wnn/zh_CN
+@dirrm lib/wnn/zh_TW
+@comment END Xwnmo
 @dirrm lib/wnn
 bin/Wnn4/jserver
 bin/Wnn4/uum
@@ -364,7 +406,17 @@ share/doc/ja-Wnn/manual.en/6.jutil/wddel
 @dirrm share/doc/ja-Wnn/manual
 @dirrm share/doc/ja-Wnn
 @cwd /usr/X11R6
+@comment Xwnmo
+bin/xwnmo
+bin/killxwnmo
+bin/xjutil
+lib/X11/app-defaults/Xwnmo
+@comment END Xwnmo
 lib/libwnn.a
+lib/libwnn4.so
+lib/libwnn4.so.1.0
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/libjd.a
 include/wnn/jllib.h
 include/wnn/jlib.h
@@ -376,187 +428,197 @@ include/wnn/cplib.h
 include/wnn/config.h
 include/wnn/msg.h
 @dirrm include/wnn
-man/man1/uum.1.gz
-man/man1/jserver.1.gz
-man/man1/wnnkill.1.gz
-man/man1/wnnstat.1.gz
-man/man1/atod.1.gz
-man/man1/atof.1.gz
-man/man1/dtoa.1.gz
-man/man1/wddel.1.gz
-man/man1/wdreg.1.gz
-man/man1/wnntouch.1.gz
-man/man1/oldatonewa.1.gz
-man/man3/jl_bun_suu.3.gz
-man/man3/jl_c_zenkouho.3.gz
-man/man3/jl_connect.3.gz
-man/man3/jl_close.3.gz
-man/man3/jl_connect_lang.3.gz
-man/man3/jl_dai_top.3.gz
-man/man3/jl_dic_add.3.gz
-man/man3/jl_dic_add_e.3.gz
-man/man3/jl_dic_comment_set_e.3.gz
-man/man3/jl_dic_delete.3.gz
-man/man3/jl_dic_comment_set.3.gz
-man/man3/jl_dic_delete_e.3.gz
-man/man3/jl_dic_save_all_e.3.gz
-man/man3/jl_dic_save_all.3.gz
-man/man3/jl_dic_list.3.gz
-man/man3/jl_dic_list_e.3.gz
-man/man3/jl_dic_save.3.gz
-man/man3/jl_dic_save_e.3.gz
-man/man3/jl_dic_use_e.3.gz
-man/man3/jl_dic_use.3.gz
-man/man3/jl_disconnect.3.gz
-man/man3/jl_env.3.gz
-man/man3/jl_env_un_sticky.3.gz
-man/man3/jl_env_un_sticky_e.3.gz
-man/man3/jl_env_set.3.gz
-man/man3/jl_env_get.3.gz
-man/man3/jl_env_sticky.3.gz
-man/man3/jl_env_sticky_e.3.gz
-man/man3/jl_fuzokugo_get.3.gz
-man/man3/jl_fuzokugo_get_e.3.gz
-man/man3/jl_fuzokugo_set.3.gz
-man/man3/jl_fuzokugo_set_e.3.gz
-man/man3/jl_get_kanji.3.gz
-man/man3/jl_get_yomi.3.gz
-man/man3/jl_hinsi_dicts.3.gz
-man/man3/jl_hinsi_dicts_e.3.gz
-man/man3/jl_get_zenkouho_kanji.3.gz
-man/man3/jl_hinsi_name.3.gz
-man/man3/jl_hinsi_list_e.3.gz
-man/man3/jl_hinsi_name_e.3.gz
-man/man3/jl_hinsi_list.3.gz
-man/man3/jl_hinsi_number_e.3.gz
-man/man3/jl_hinsi_number.3.gz
-man/man3/jl_isconnect_e.3.gz
-man/man3/jl_inspect.3.gz
-man/man3/jl_isconnect.3.gz
-man/man3/jl_kanji_len.3.gz
-man/man3/jl_yomi_len.3.gz
-man/man3/jl_jiri_len.3.gz
-man/man3/jl_kill.3.gz
-man/man3/jl_previous_dai.3.gz
-man/man3/jl_next.3.gz
-man/man3/jl_previous.3.gz
-man/man3/jl_next_dai.3.gz
-man/man3/jl_open.3.gz
-man/man3/jl_nobi_conv.3.gz
-man/man3/jl_param_set.3.gz
-man/man3/jl_param_get.3.gz
-man/man3/jl_param_get_e.3.gz
-man/man3/jl_param_set_e.3.gz
-man/man3/jl_open_lang.3.gz
-man/man3/jl_ren_conv.3.gz
-man/man3/jl_set_env_wnnrc.3.gz
-man/man3/jl_set_jikouho.3.gz
-man/man3/jl_set_jikouho_dai.3.gz
-man/man3/jl_tan_conv.3.gz
-man/man3/jl_update_hindo.3.gz
-man/man3/jl_word_comment_set_e.3.gz
-man/man3/jl_word_add_e.3.gz
-man/man3/jl_word_add.3.gz
-man/man3/jl_word_comment_set.3.gz
-man/man3/jl_word_delete.3.gz
-man/man3/jl_word_delete_e.3.gz
-man/man3/jl_word_search_by_env.3.gz
-man/man3/jl_word_info.3.gz
-man/man3/jl_word_info_e.3.gz
-man/man3/jl_word_search.3.gz
-man/man3/jl_word_search_e.3.gz
-man/man3/jl_word_search_by_env_e.3.gz
-man/man3/jl_word_use.3.gz
-man/man3/jl_word_use_e.3.gz
-man/man3/jl_zenkouho_bun.3.gz
-man/man3/jl_zenkouho.3.gz
-man/man3/jl_zenkouho_daip.3.gz
-man/man3/jl_zenkouho_suu.3.gz
-man/man3/jl_zenkouho_dai.3.gz
-man/man3/js_access.3.gz
-man/man3/js_connect.3.gz
-man/man3/js_close.3.gz
-man/man3/js_dic_add.3.gz
-man/man3/js_dic_file_create.3.gz
-man/man3/js_dic_file_create_client.3.gz
-man/man3/js_dic_info.3.gz
-man/man3/js_dic_list.3.gz
-man/man3/js_dic_delete.3.gz
-man/man3/js_disconnect.3.gz
-man/man3/js_dic_use.3.gz
-man/man3/js_dic_list_all.3.gz
-man/man3/js_env_exist.3.gz
-man/man3/js_env_list.3.gz
-man/man3/js_env_sticky.3.gz
-man/man3/js_env_un_sticky.3.gz
-man/man3/js_file_comment_set.3.gz
-man/man3/js_file_info.3.gz
-man/man3/js_file_discard.3.gz
-man/man3/js_file_list.3.gz
-man/man3/js_file_loaded.3.gz
-man/man3/js_file_list_all.3.gz
-man/man3/js_file_loaded_local.3.gz
-man/man3/js_file_password_set.3.gz
-man/man3/js_file_read.3.gz
-man/man3/js_file_remove.3.gz
-man/man3/js_file_receive.3.gz
-man/man3/js_file_remove_client.3.gz
-man/man3/js_file_write.3.gz
-man/man3/js_file_stat.3.gz
-man/man3/js_file_send.3.gz
-man/man3/js_fuzokugo_get.3.gz
-man/man3/js_fuzokugo_set.3.gz
-man/man3/js_hindo_file_create.3.gz
-man/man3/js_hindo_set.3.gz
-man/man3/js_hindo_file_create_client.3.gz
-man/man3/js_hinsi_dicts.3.gz
-man/man3/js_hinsi_name.3.gz
-man/man3/js_hinsi_list.3.gz
-man/man3/js_isconnect.3.gz
-man/man3/js_hinsi_number.3.gz
-man/man3/js_hinsi_table_set.3.gz
-man/man3/js_kanren.3.gz
-man/man3/js_kantan_dai.3.gz
-man/man3/js_kantan_sho.3.gz
-man/man3/js_kanzen_dai.3.gz
-man/man3/js_kanzen_sho.3.gz
-man/man3/js_kill.3.gz
-man/man3/js_mkdir.3.gz
-man/man3/js_param_get.3.gz
-man/man3/js_open.3.gz
-man/man3/js_open_lang.3.gz
-man/man3/js_param_set.3.gz
-man/man3/js_get_lang.3.gz
-man/man3/js_set_lang.3.gz
-man/man3/js_version.3.gz
-man/man3/js_who.3.gz
-man/man3/js_word_add.3.gz
-man/man3/js_word_comment_set.3.gz
-man/man3/js_word_delete.3.gz
-man/man3/js_word_info.3.gz
-man/man3/js_word_search.3.gz
-man/man3/js_word_search_by_env.3.gz
-man/man3/romkan_clear.3.gz
-man/man3/romkan_getc.3.gz
-man/man3/romkan_dispmode.3.gz
-man/man3/romkan_init.3.gz
-man/man3/romkan_next.3.gz
-man/man3/romkan_ungetc.3.gz
-man/man3/msg_open.3.gz
-man/man3/msg_get.3.gz
-man/man3/msg_close.3.gz
-man/man4/fzk.data.4.gz
-man/man4/2a_ctrl.4.gz
-man/man4/fzk.u.4.gz
-man/man4/jserverrc.4.gz
-man/man4/mode.4.gz
-man/man4/uumrc.4.gz
-man/man4/uumkey.4.gz
-man/man4/wnnenvrc.4.gz
-man/man4/ujis_dic.4.gz
-man/man4/2b_romkana.4.gz
-man/man4/cvt_key_tbl.4.gz
-man/man4/hinsi_data.4.gz
-man/man4/serverdefs.4.gz
-man/man5/pubdic.5.gz
-man/man5/usr_dic.5.gz
+man/ja/man1/uum.1.gz
+man/ja/man1/jserver.1.gz
+man/ja/man1/wnnkill.1.gz
+man/ja/man1/wnnstat.1.gz
+man/ja/man1/atod.1.gz
+man/ja/man1/atof.1.gz
+man/ja/man1/dtoa.1.gz
+man/ja/man1/wddel.1.gz
+man/ja/man1/wdreg.1.gz
+man/ja/man1/wnntouch.1.gz
+man/ja/man1/oldatonewa.1.gz
+man/ja/man3/jl_bun_suu.3.gz
+man/ja/man3/jl_c_zenkouho.3.gz
+man/ja/man3/jl_connect.3.gz
+man/ja/man3/jl_close.3.gz
+man/ja/man3/jl_connect_lang.3.gz
+man/ja/man3/jl_dai_top.3.gz
+man/ja/man3/jl_dic_add.3.gz
+man/ja/man3/jl_dic_add_e.3.gz
+man/ja/man3/jl_dic_comment_set_e.3.gz
+man/ja/man3/jl_dic_delete.3.gz
+man/ja/man3/jl_dic_comment_set.3.gz
+man/ja/man3/jl_dic_delete_e.3.gz
+man/ja/man3/jl_dic_save_all_e.3.gz
+man/ja/man3/jl_dic_save_all.3.gz
+man/ja/man3/jl_dic_list.3.gz
+man/ja/man3/jl_dic_list_e.3.gz
+man/ja/man3/jl_dic_save.3.gz
+man/ja/man3/jl_dic_save_e.3.gz
+man/ja/man3/jl_dic_use_e.3.gz
+man/ja/man3/jl_dic_use.3.gz
+man/ja/man3/jl_disconnect.3.gz
+man/ja/man3/jl_env.3.gz
+man/ja/man3/jl_env_un_sticky.3.gz
+man/ja/man3/jl_env_un_sticky_e.3.gz
+man/ja/man3/jl_env_set.3.gz
+man/ja/man3/jl_env_get.3.gz
+man/ja/man3/jl_env_sticky.3.gz
+man/ja/man3/jl_env_sticky_e.3.gz
+man/ja/man3/jl_fuzokugo_get.3.gz
+man/ja/man3/jl_fuzokugo_get_e.3.gz
+man/ja/man3/jl_fuzokugo_set.3.gz
+man/ja/man3/jl_fuzokugo_set_e.3.gz
+man/ja/man3/jl_get_kanji.3.gz
+man/ja/man3/jl_get_yomi.3.gz
+man/ja/man3/jl_hinsi_dicts.3.gz
+man/ja/man3/jl_hinsi_dicts_e.3.gz
+man/ja/man3/jl_get_zenkouho_kanji.3.gz
+man/ja/man3/jl_hinsi_name.3.gz
+man/ja/man3/jl_hinsi_list_e.3.gz
+man/ja/man3/jl_hinsi_name_e.3.gz
+man/ja/man3/jl_hinsi_list.3.gz
+man/ja/man3/jl_hinsi_number_e.3.gz
+man/ja/man3/jl_hinsi_number.3.gz
+man/ja/man3/jl_isconnect_e.3.gz
+man/ja/man3/jl_inspect.3.gz
+man/ja/man3/jl_isconnect.3.gz
+man/ja/man3/jl_kanji_len.3.gz
+man/ja/man3/jl_yomi_len.3.gz
+man/ja/man3/jl_jiri_len.3.gz
+man/ja/man3/jl_kill.3.gz
+man/ja/man3/jl_previous_dai.3.gz
+man/ja/man3/jl_next.3.gz
+man/ja/man3/jl_previous.3.gz
+man/ja/man3/jl_next_dai.3.gz
+man/ja/man3/jl_open.3.gz
+man/ja/man3/jl_nobi_conv.3.gz
+man/ja/man3/jl_param_set.3.gz
+man/ja/man3/jl_param_get.3.gz
+man/ja/man3/jl_param_get_e.3.gz
+man/ja/man3/jl_param_set_e.3.gz
+man/ja/man3/jl_open_lang.3.gz
+man/ja/man3/jl_ren_conv.3.gz
+man/ja/man3/jl_set_env_wnnrc.3.gz
+man/ja/man3/jl_set_jikouho.3.gz
+man/ja/man3/jl_set_jikouho_dai.3.gz
+man/ja/man3/jl_tan_conv.3.gz
+man/ja/man3/jl_update_hindo.3.gz
+man/ja/man3/jl_word_comment_set_e.3.gz
+man/ja/man3/jl_word_add_e.3.gz
+man/ja/man3/jl_word_add.3.gz
+man/ja/man3/jl_word_comment_set.3.gz
+man/ja/man3/jl_word_delete.3.gz
+man/ja/man3/jl_word_delete_e.3.gz
+man/ja/man3/jl_word_search_by_env.3.gz
+man/ja/man3/jl_word_info.3.gz
+man/ja/man3/jl_word_info_e.3.gz
+man/ja/man3/jl_word_search.3.gz
+man/ja/man3/jl_word_search_e.3.gz
+man/ja/man3/jl_word_search_by_env_e.3.gz
+man/ja/man3/jl_word_use.3.gz
+man/ja/man3/jl_word_use_e.3.gz
+man/ja/man3/jl_zenkouho_bun.3.gz
+man/ja/man3/jl_zenkouho.3.gz
+man/ja/man3/jl_zenkouho_daip.3.gz
+man/ja/man3/jl_zenkouho_suu.3.gz
+man/ja/man3/jl_zenkouho_dai.3.gz
+man/ja/man3/js_access.3.gz
+man/ja/man3/js_connect.3.gz
+man/ja/man3/js_close.3.gz
+man/ja/man3/js_dic_add.3.gz
+man/ja/man3/js_dic_file_create.3.gz
+man/ja/man3/js_dic_file_create_client.3.gz
+man/ja/man3/js_dic_info.3.gz
+man/ja/man3/js_dic_list.3.gz
+man/ja/man3/js_dic_delete.3.gz
+man/ja/man3/js_disconnect.3.gz
+man/ja/man3/js_dic_use.3.gz
+man/ja/man3/js_dic_list_all.3.gz
+man/ja/man3/js_env_exist.3.gz
+man/ja/man3/js_env_list.3.gz
+man/ja/man3/js_env_sticky.3.gz
+man/ja/man3/js_env_un_sticky.3.gz
+man/ja/man3/js_file_comment_set.3.gz
+man/ja/man3/js_file_info.3.gz
+man/ja/man3/js_file_discard.3.gz
+man/ja/man3/js_file_list.3.gz
+man/ja/man3/js_file_loaded.3.gz
+man/ja/man3/js_file_list_all.3.gz
+man/ja/man3/js_file_loaded_local.3.gz
+man/ja/man3/js_file_password_set.3.gz
+man/ja/man3/js_file_read.3.gz
+man/ja/man3/js_file_remove.3.gz
+man/ja/man3/js_file_receive.3.gz
+man/ja/man3/js_file_remove_client.3.gz
+man/ja/man3/js_file_write.3.gz
+man/ja/man3/js_file_stat.3.gz
+man/ja/man3/js_file_send.3.gz
+man/ja/man3/js_fuzokugo_get.3.gz
+man/ja/man3/js_fuzokugo_set.3.gz
+man/ja/man3/js_hindo_file_create.3.gz
+man/ja/man3/js_hindo_set.3.gz
+man/ja/man3/js_hindo_file_create_client.3.gz
+man/ja/man3/js_hinsi_dicts.3.gz
+man/ja/man3/js_hinsi_name.3.gz
+man/ja/man3/js_hinsi_list.3.gz
+man/ja/man3/js_isconnect.3.gz
+man/ja/man3/js_hinsi_number.3.gz
+man/ja/man3/js_hinsi_table_set.3.gz
+man/ja/man3/js_kanren.3.gz
+man/ja/man3/js_kantan_dai.3.gz
+man/ja/man3/js_kantan_sho.3.gz
+man/ja/man3/js_kanzen_dai.3.gz
+man/ja/man3/js_kanzen_sho.3.gz
+man/ja/man3/js_kill.3.gz
+man/ja/man3/js_mkdir.3.gz
+man/ja/man3/js_param_get.3.gz
+man/ja/man3/js_open.3.gz
+man/ja/man3/js_open_lang.3.gz
+man/ja/man3/js_param_set.3.gz
+man/ja/man3/js_get_lang.3.gz
+man/ja/man3/js_set_lang.3.gz
+man/ja/man3/js_version.3.gz
+man/ja/man3/js_who.3.gz
+man/ja/man3/js_word_add.3.gz
+man/ja/man3/js_word_comment_set.3.gz
+man/ja/man3/js_word_delete.3.gz
+man/ja/man3/js_word_info.3.gz
+man/ja/man3/js_word_search.3.gz
+man/ja/man3/js_word_search_by_env.3.gz
+man/ja/man3/romkan_clear.3.gz
+man/ja/man3/romkan_getc.3.gz
+man/ja/man3/romkan_dispmode.3.gz
+man/ja/man3/romkan_init.3.gz
+man/ja/man3/romkan_next.3.gz
+man/ja/man3/romkan_ungetc.3.gz
+man/ja/man3/msg_open.3.gz
+man/ja/man3/msg_get.3.gz
+man/ja/man3/msg_close.3.gz
+man/ja/man4/fzk.data.4.gz
+man/ja/man4/2a_ctrl.4.gz
+man/ja/man4/fzk.u.4.gz
+man/ja/man4/jserverrc.4.gz
+man/ja/man4/mode.4.gz
+man/ja/man4/uumrc.4.gz
+man/ja/man4/uumkey.4.gz
+man/ja/man4/wnnenvrc.4.gz
+man/ja/man4/ujis_dic.4.gz
+man/ja/man4/2b_romkana.4.gz
+man/ja/man4/cvt_key_tbl.4.gz
+man/ja/man4/hinsi_data.4.gz
+man/ja/man4/serverdefs.4.gz
+man/ja/man5/pubdic.5.gz
+man/ja/man5/usr_dic.5.gz
+@comment Xwnmo
+man/ja/man1/xwnmo.1.gz
+man/ja/man1/ximrc.1.gz
+man/ja/man1/ximconf.1.gz
+man/ja/man1/cvt_fun_tbl.1.gz
+man/ja/man1/cvt_meta_tbl.1.gz
+man/ja/man1/killxwnmo.1.gz
+man/ja/man1/cvt_xim_tbl.1.gz
+man/ja/man1/xjutil.1.gz
+@comment END Xwnmo