Move share files needed by client/library from freewnn-server to freewnn-lib.

4 files changed, 122 insertions, 78 deletions

diff --git a/japanese/freewnn-lib/Makefile b/japanese/freewnn-lib/Makefile
index 3944ec1c77b..13ced24251c 100644
--- a/japanese/freewnn-lib/Makefile
+++ b/japanese/freewnn-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/08/02 05:50:10 sakamoto Exp $
+# $NetBSD: Makefile,v 1.2 1999/09/03 04:31:44 sakamoto Exp $
 #
 
 PKGNAME=	ja-FreeWnn-lib-1.10
@@ -6,6 +6,7 @@ CATEGORIES=	japanese
 
 WNNDIR=		Wnn
 WNN_TARGET=	LIBRARY
+WNN_LANG=	ja_JP
 
 MASTERDIR=	${.CURDIR}/../../misc/freewnn-common
 FILESDIR=	${MASTERDIR}/files
diff --git a/japanese/freewnn-lib/pkg/PLIST b/japanese/freewnn-lib/pkg/PLIST
index 7b0c824d2f2..ad2acf7e0e3 100644
--- a/japanese/freewnn-lib/pkg/PLIST
+++ b/japanese/freewnn-lib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/08/02 05:50:10 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/09/03 04:31:45 sakamoto Exp $
 include/wnn/commonhd.h
 include/wnn/config.h
 include/wnn/cplib.h
@@ -17,44 +17,80 @@ man/ja_JP.EUC/man3/jl_connect.3
 man/ja_JP.EUC/man3/jl_connect_lang.3
 man/ja_JP.EUC/man3/jl_dai_top.3
 man/ja_JP.EUC/man3/jl_dic_add.3
+man/ja_JP.EUC/man3/jl_dic_add_e.3
 man/ja_JP.EUC/man3/jl_dic_comment_set.3
+man/ja_JP.EUC/man3/jl_dic_comment_set_e.3
 man/ja_JP.EUC/man3/jl_dic_delete.3
+man/ja_JP.EUC/man3/jl_dic_delete_e.3
 man/ja_JP.EUC/man3/jl_dic_list.3
+man/ja_JP.EUC/man3/jl_dic_list_e.3
 man/ja_JP.EUC/man3/jl_dic_save.3
+man/ja_JP.EUC/man3/jl_dic_save_all.3
+man/ja_JP.EUC/man3/jl_dic_save_all_e.3
+man/ja_JP.EUC/man3/jl_dic_save_e.3
 man/ja_JP.EUC/man3/jl_dic_use.3
+man/ja_JP.EUC/man3/jl_dic_use_e.3
 man/ja_JP.EUC/man3/jl_disconnect.3
 man/ja_JP.EUC/man3/jl_env.3
 man/ja_JP.EUC/man3/jl_env_get.3
+man/ja_JP.EUC/man3/jl_env_set.3
 man/ja_JP.EUC/man3/jl_env_sticky.3
+man/ja_JP.EUC/man3/jl_env_sticky_e.3
+man/ja_JP.EUC/man3/jl_env_un_sticky.3
+man/ja_JP.EUC/man3/jl_env_un_sticky_e.3
 man/ja_JP.EUC/man3/jl_fuzokugo_get.3
+man/ja_JP.EUC/man3/jl_fuzokugo_get_e.3
 man/ja_JP.EUC/man3/jl_fuzokugo_set.3
+man/ja_JP.EUC/man3/jl_fuzokugo_set_e.3
 man/ja_JP.EUC/man3/jl_get_kanji.3
+man/ja_JP.EUC/man3/jl_get_yomi.3
 man/ja_JP.EUC/man3/jl_get_zenkouho_kanji.3
 man/ja_JP.EUC/man3/jl_hinsi_dicts.3
+man/ja_JP.EUC/man3/jl_hinsi_dicts_e.3
 man/ja_JP.EUC/man3/jl_hinsi_list.3
+man/ja_JP.EUC/man3/jl_hinsi_list_e.3
 man/ja_JP.EUC/man3/jl_hinsi_name.3
+man/ja_JP.EUC/man3/jl_hinsi_name_e.3
 man/ja_JP.EUC/man3/jl_hinsi_number.3
+man/ja_JP.EUC/man3/jl_hinsi_number_e.3
 man/ja_JP.EUC/man3/jl_inspect.3
 man/ja_JP.EUC/man3/jl_isconnect.3
+man/ja_JP.EUC/man3/jl_isconnect_e.3
 man/ja_JP.EUC/man3/jl_jiri_len.3
 man/ja_JP.EUC/man3/jl_kanji_len.3
 man/ja_JP.EUC/man3/jl_kill.3
 man/ja_JP.EUC/man3/jl_next.3
+man/ja_JP.EUC/man3/jl_next_dai.3
 man/ja_JP.EUC/man3/jl_nobi_conv.3
 man/ja_JP.EUC/man3/jl_open.3
 man/ja_JP.EUC/man3/jl_open_lang.3
 man/ja_JP.EUC/man3/jl_param_get.3
+man/ja_JP.EUC/man3/jl_param_get_e.3
+man/ja_JP.EUC/man3/jl_param_set.3
+man/ja_JP.EUC/man3/jl_param_set_e.3
+man/ja_JP.EUC/man3/jl_previous.3
+man/ja_JP.EUC/man3/jl_previous_dai.3
 man/ja_JP.EUC/man3/jl_ren_conv.3
 man/ja_JP.EUC/man3/jl_set_env_wnnrc.3
 man/ja_JP.EUC/man3/jl_set_jikouho.3
+man/ja_JP.EUC/man3/jl_set_jikouho_dai.3
 man/ja_JP.EUC/man3/jl_tan_conv.3
 man/ja_JP.EUC/man3/jl_update_hindo.3
 man/ja_JP.EUC/man3/jl_word_add.3
+man/ja_JP.EUC/man3/jl_word_add_e.3
 man/ja_JP.EUC/man3/jl_word_comment_set.3
+man/ja_JP.EUC/man3/jl_word_comment_set_e.3
 man/ja_JP.EUC/man3/jl_word_delete.3
+man/ja_JP.EUC/man3/jl_word_delete_e.3
 man/ja_JP.EUC/man3/jl_word_info.3
+man/ja_JP.EUC/man3/jl_word_info_e.3
 man/ja_JP.EUC/man3/jl_word_search.3
+man/ja_JP.EUC/man3/jl_word_search_by_env.3
+man/ja_JP.EUC/man3/jl_word_search_by_env_e.3
+man/ja_JP.EUC/man3/jl_word_search_e.3
 man/ja_JP.EUC/man3/jl_word_use.3
+man/ja_JP.EUC/man3/jl_word_use_e.3
+man/ja_JP.EUC/man3/jl_yomi_len.3
 man/ja_JP.EUC/man3/jl_zenkouho.3
 man/ja_JP.EUC/man3/jl_zenkouho_bun.3
 man/ja_JP.EUC/man3/jl_zenkouho_dai.3
@@ -75,6 +111,7 @@ man/ja_JP.EUC/man3/js_disconnect.3
 man/ja_JP.EUC/man3/js_env_exist.3
 man/ja_JP.EUC/man3/js_env_list.3
 man/ja_JP.EUC/man3/js_env_sticky.3
+man/ja_JP.EUC/man3/js_env_un_sticky.3
 man/ja_JP.EUC/man3/js_file_comment_set.3
 man/ja_JP.EUC/man3/js_file_discard.3
 man/ja_JP.EUC/man3/js_file_info.3
@@ -92,6 +129,7 @@ man/ja_JP.EUC/man3/js_file_stat.3
 man/ja_JP.EUC/man3/js_file_write.3
 man/ja_JP.EUC/man3/js_fuzokugo_get.3
 man/ja_JP.EUC/man3/js_fuzokugo_set.3
+man/ja_JP.EUC/man3/js_get_lang.3
 man/ja_JP.EUC/man3/js_hindo_file_create.3
 man/ja_JP.EUC/man3/js_hindo_file_create_client.3
 man/ja_JP.EUC/man3/js_hindo_set.3
@@ -111,6 +149,7 @@ man/ja_JP.EUC/man3/js_mkdir.3
 man/ja_JP.EUC/man3/js_open.3
 man/ja_JP.EUC/man3/js_open_lang.3
 man/ja_JP.EUC/man3/js_param_get.3
+man/ja_JP.EUC/man3/js_param_set.3
 man/ja_JP.EUC/man3/js_set_lang.3
 man/ja_JP.EUC/man3/js_version.3
 man/ja_JP.EUC/man3/js_who.3
@@ -119,6 +158,7 @@ man/ja_JP.EUC/man3/js_word_comment_set.3
 man/ja_JP.EUC/man3/js_word_delete.3
 man/ja_JP.EUC/man3/js_word_info.3
 man/ja_JP.EUC/man3/js_word_search.3
+man/ja_JP.EUC/man3/js_word_search_by_env.3
 man/ja_JP.EUC/man3/msg_close.3
 man/ja_JP.EUC/man3/msg_get.3
 man/ja_JP.EUC/man3/msg_open.3
@@ -128,4 +168,73 @@ man/ja_JP.EUC/man3/romkan_getc.3
 man/ja_JP.EUC/man3/romkan_init.3
 man/ja_JP.EUC/man3/romkan_next.3
 man/ja_JP.EUC/man3/romkan_ungetc.3
+share/wnn/cvt_key_empty
+share/wnn/cvt_key_tbl
+share/wnn/cvt_key_tbl.ST
+share/wnn/cvt_key_tbl.gm
+share/wnn/cvt_key_tbl.kt
+share/wnn/cvt_key_tbl.mv
+share/wnn/cvt_key_tbl.vt
+share/wnn/ja_JP/hinsi.data
+share/wnn/ja_JP/jserverrc
+share/wnn/ja_JP/libwnn.msg
+share/wnn/ja_JP/rk.vi/1B_newTOUPPER
+share/wnn/ja_JP/rk.vi/2A_CTRL
+share/wnn/ja_JP/rk.vi/2B_KEISEN
+share/wnn/ja_JP/rk.vi/2B_ROMKANA
+share/wnn/ja_JP/rk.vi/2C_KEISEN1
+share/wnn/ja_JP/rk.vi/2C_VI
+share/wnn/ja_JP/rk.vi/2C_VIEX
+share/wnn/ja_JP/rk.vi/2C_VISH
+share/wnn/ja_JP/rk.vi/2_VITHROW
+share/wnn/ja_JP/rk.vi/3B_ZENASC
+share/wnn/ja_JP/rk.vi/mode
+share/wnn/ja_JP/rk.vi/uumkey
+share/wnn/ja_JP/rk/1B_TOUPPER
+share/wnn/ja_JP/rk/1B_ZENHIRA
+share/wnn/ja_JP/rk/1B_ZENKATA
+share/wnn/ja_JP/rk/1B_newTOUPPER
+share/wnn/ja_JP/rk/2A_CTRL
+share/wnn/ja_JP/rk/2B_DAKUTEN
+share/wnn/ja_JP/rk/2B_JIS
+share/wnn/ja_JP/rk/2B_ROMKANA
+share/wnn/ja_JP/rk/2_TCODE
+share/wnn/ja_JP/rk/3B_HANKATA
+share/wnn/ja_JP/rk/3B_KATAKANA
+share/wnn/ja_JP/rk/3B_ZENKAKU
+share/wnn/ja_JP/rk/autork
+share/wnn/ja_JP/rk/mode
+share/wnn/ja_JP/rk/mode.hankata
+share/wnn/ja_JP/rk/mode.nohankata
+share/wnn/ja_JP/uum.msg
+share/wnn/ja_JP/uumkey
+share/wnn/ja_JP/uumkey.omr
+share/wnn/ja_JP/uumkey_e
+share/wnn/ja_JP/uumrc
+share/wnn/ja_JP/uumrc.omr
+share/wnn/ja_JP/uumrc.rev
+share/wnn/ja_JP/uumrc_e
+share/wnn/ja_JP/uumrc_vi
+share/wnn/ja_JP/wnnenvrc
+share/wnn/ja_JP/wnnenvrc.omr
+share/wnn/ja_JP/wnnenvrc.rem
+share/wnn/ja_JP/wnnenvrc.rev
+share/wnn/ja_JP/wnnenvrc_R
+share/wnn/ja_JP/wnnenvrc_R.omr
+share/wnn/ja_JP/wnnenvrc_R.rem
+share/wnn/ja_JP/wnnstat.msg
+share/wnn/lt_LN/rk/2A_CTRL
+share/wnn/lt_LN/rk/2B_LATIN
+share/wnn/lt_LN/rk/mode
+share/wnn/lt_LN/uum.msg
+share/wnn/lt_LN/uumkey
+share/wnn/lt_LN/uumkey_e
+share/wnn/lt_LN/uumrc
+share/wnn/serverdefs
+@dirrm share/wnn/lt_LN/rk
+@dirrm share/wnn/lt_LN
+@dirrm share/wnn/ja_JP/rk.vi
+@dirrm share/wnn/ja_JP/rk
+@dirrm share/wnn/ja_JP
+@dirrm share/wnn
 @dirrm include/wnn
diff --git a/japanese/freewnn-server/Makefile b/japanese/freewnn-server/Makefile
index bea30435bdf..8d460fd798b 100644
--- a/japanese/freewnn-server/Makefile
+++ b/japanese/freewnn-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/08/02 05:50:55 sakamoto Exp $
+# $NetBSD: Makefile,v 1.2 1999/09/03 04:31:45 sakamoto Exp $
 #
 
 PKGNAME=	ja-FreeWnn-server-1.10
@@ -7,6 +7,7 @@ DEPENDS+=	ja-FreeWnn-lib-1.10:../../japanese/freewnn-lib
 
 WNNDIR=		Wnn
 WNN_TARGET=	SERVER
+WNN_LANG=	ja_JP
 
 MASTERDIR=	${.CURDIR}/../../misc/freewnn-common
 FILESDIR=	${MASTERDIR}/files
diff --git a/japanese/freewnn-server/pkg/PLIST b/japanese/freewnn-server/pkg/PLIST
index 93c8adba219..6a0f7544ca3 100644
--- a/japanese/freewnn-server/pkg/PLIST
+++ b/japanese/freewnn-server/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/08/02 05:50:55 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/09/03 04:31:46 sakamoto Exp $
 @cwd ${DICT_DIR}
 @cwd ${DICT_DIR}
 wnn/ja_JP/pubdic/bio.dic
@@ -23,70 +23,12 @@ wnn/ja_JP/src/fzk.master
 wnn/ja_JP/src/fzk.shuutan
 wnn/ja_JP/wnncons/tankan2.dic
 wnn/ja_JP/wnncons/tankan3.dic
+@dirrm wnn/ja_JP/wnncons
+@dirrm wnn/ja_JP/src
+@dirrm wnn/ja_JP/pubdic
+@dirrm wnn/ja_JP
+@dirrm wnn
 @cwd ${PREFIX}
-share/wnn/cvt_key_empty
-share/wnn/cvt_key_tbl
-share/wnn/cvt_key_tbl.ST
-share/wnn/cvt_key_tbl.gm
-share/wnn/cvt_key_tbl.kt
-share/wnn/cvt_key_tbl.mv
-share/wnn/cvt_key_tbl.vt
-share/wnn/ja_JP/hinsi.data
-share/wnn/ja_JP/jserverrc
-share/wnn/ja_JP/libwnn.msg
-share/wnn/ja_JP/rk.vi/1B_newTOUPPER
-share/wnn/ja_JP/rk.vi/2A_CTRL
-share/wnn/ja_JP/rk.vi/2B_KEISEN
-share/wnn/ja_JP/rk.vi/2B_ROMKANA
-share/wnn/ja_JP/rk.vi/2C_KEISEN1
-share/wnn/ja_JP/rk.vi/2C_VI
-share/wnn/ja_JP/rk.vi/2C_VIEX
-share/wnn/ja_JP/rk.vi/2C_VISH
-share/wnn/ja_JP/rk.vi/2_VITHROW
-share/wnn/ja_JP/rk.vi/3B_ZENASC
-share/wnn/ja_JP/rk.vi/mode
-share/wnn/ja_JP/rk.vi/uumkey
-share/wnn/ja_JP/rk/1B_TOUPPER
-share/wnn/ja_JP/rk/1B_ZENHIRA
-share/wnn/ja_JP/rk/1B_ZENKATA
-share/wnn/ja_JP/rk/1B_newTOUPPER
-share/wnn/ja_JP/rk/2A_CTRL
-share/wnn/ja_JP/rk/2B_DAKUTEN
-share/wnn/ja_JP/rk/2B_JIS
-share/wnn/ja_JP/rk/2B_ROMKANA
-share/wnn/ja_JP/rk/2_TCODE
-share/wnn/ja_JP/rk/3B_HANKATA
-share/wnn/ja_JP/rk/3B_KATAKANA
-share/wnn/ja_JP/rk/3B_ZENKAKU
-share/wnn/ja_JP/rk/autork
-share/wnn/ja_JP/rk/mode
-share/wnn/ja_JP/rk/mode.hankata
-share/wnn/ja_JP/rk/mode.nohankata
-share/wnn/ja_JP/uum.msg
-share/wnn/ja_JP/uumkey
-share/wnn/ja_JP/uumkey.omr
-share/wnn/ja_JP/uumkey_e
-share/wnn/ja_JP/uumrc
-share/wnn/ja_JP/uumrc.omr
-share/wnn/ja_JP/uumrc.rev
-share/wnn/ja_JP/uumrc_e
-share/wnn/ja_JP/uumrc_vi
-share/wnn/ja_JP/wnnenvrc
-share/wnn/ja_JP/wnnenvrc.omr
-share/wnn/ja_JP/wnnenvrc.rem
-share/wnn/ja_JP/wnnenvrc.rev
-share/wnn/ja_JP/wnnenvrc_R
-share/wnn/ja_JP/wnnenvrc_R.omr
-share/wnn/ja_JP/wnnenvrc_R.rem
-share/wnn/ja_JP/wnnstat.msg
-share/wnn/lt_LN/rk/2A_CTRL
-share/wnn/lt_LN/rk/2B_LATIN
-share/wnn/lt_LN/rk/mode
-share/wnn/lt_LN/uum.msg
-share/wnn/lt_LN/uumkey
-share/wnn/lt_LN/uumkey_e
-share/wnn/lt_LN/uumrc
-share/wnn/serverdefs
 man/ja_JP.EUC/man1/atod.1
 man/ja_JP.EUC/man1/atof.1
 man/ja_JP.EUC/man1/dtoa.1
@@ -123,14 +65,5 @@ sbin/wdreg
 sbin/wnnkill
 sbin/wnnstat
 sbin/wnntouch
-@dirrm share/wnn/lt_LN/rk
-@dirrm share/wnn/lt_LN
-@dirrm share/wnn/ja_JP/rk.vi
-@dirrm share/wnn/ja_JP/rk
-@dirrm share/wnn/ja_JP
-@dirrm share/wnn
-@unexec rmdir ${DICT_DIR}/wnn/ja_JP/wnncons
-@unexec rmdir ${DICT_DIR}/wnn/ja_JP/src
-@unexec rmdir ${DICT_DIR}/wnn/ja_JP/pubdic
-@unexec rmdir ${DICT_DIR}/wnn/ja_JP
-@unexec rmdir ${DICT_DIR}/wnn
+@exec ln -s ${DICT_DIR}/wnn/ja_JP %D/share/wnn/ja_JP/dic
+@unexec rm %D/share/wnn/ja_JP/dic