diff options
51 files changed, 1485 insertions, 3145 deletions
diff --git a/chinese/FreeWnn-lib/Makefile b/chinese/FreeWnn-lib/Makefile index e79a9f3870f3..4ff48ce7d363 100644 --- a/chinese/FreeWnn-lib/Makefile +++ b/chinese/FreeWnn-lib/Makefile @@ -1,17 +1,14 @@ -# New ports collection makefile for: Wnn for Chinese -# Date created: 20 July 1997 -# Whom: Satoshi Taoka <taoka@FreeBSD.org> +# New ports collection makefile for: libraries of FreeWnn +# Date created: 00/08/25 +# Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # +PKGNAMESUFFIX= -lib CATEGORIES= chinese - -## COMMENT, DESCR, PLIST is used in a local 'pkg' directory -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR -PLIST= ${.CURDIR}/pkg/PLIST - -MASTERDIR= ${.CURDIR}/../../japanese/Wnn +MASTERDIR= ${.CURDIR}/../../japanese/FreeWnn-lib +PKGDIR= ${.CURDIR}/pkg +WNN= cWnn .include "${MASTERDIR}/Makefile" diff --git a/chinese/FreeWnn-lib/pkg-comment b/chinese/FreeWnn-lib/pkg-comment index eea0c6971df2..4805d5e1b426 100644 --- a/chinese/FreeWnn-lib/pkg-comment +++ b/chinese/FreeWnn-lib/pkg-comment @@ -1 +1 @@ -A Japanese/Chinese/Korean input method (only Chinese built) +A Japanese/Chinese/Korean input method (Chinese client libraries) diff --git a/chinese/FreeWnn-lib/pkg-descr b/chinese/FreeWnn-lib/pkg-descr index 92576b60805c..c3a16429bd01 100644 --- a/chinese/FreeWnn-lib/pkg-descr +++ b/chinese/FreeWnn-lib/pkg-descr @@ -1,48 +1,13 @@ -This is Wnn4.2, a Japanese/Chinese/Korean input method. It is -included primarily so that we can compile mule-2.1, a multilingual -emacs. +FreeWnn is a Japanese/Chinese/Korean input method. -Only the Chinese version is built for this port. +WWW: www.freewnn.org -Note that binaries and libraries go to /usr/local, while man pages and -includes go to /usr/X11R6. That's the way it was designed, I don't -know why. +This port has only libraries for a Chinese imput method. The libraries +containes a archive file (libcwnn.a), header files and files which are +used to a client. -- Satoshi -(asami@cs.berkeley.edu) - -------------------------------------------------------------------- - -This also include some patches for FreeBSD or bugfixes. -If use these patches, you can compile Wnn-4.2 under XFree86 3.1.2E - or later (X11Release6.1). -If there are any problem in these patches, please tell me via E-mail. - -Hidekazu Kuroki -(hidekazu@cs.titech.ac.jp) - -------------------------------------------------------------------- - -Hisashi ITO <his@kuro.is.sci.toho-u.ac.jp> made a patch for -Xsi/jserver/b_index.c. This code is only used in a Chinese method -'cWnn'. But you are not able to use 'Qianma' very well. - -That bug is caused by what cWnn has codes depend on architectures -about small-endian and big-endian machines. - -If there are any problem in this patch, please tell Mr. Ito via -E-mail. - - -Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for Wnn4.2. -Patches for those are in 'Wnn4.2.patch-YYMMDD.tar.gz' and are applied -in this port. - -[Notice] -When compiling this port, if $LOCALBASE is not '/usr/local' and/or -$X11BASE is not '/usr/X11R6' then you should properly change two lines -'@cwd /usr/local' and '@cwd /usr/X11R6' in -$PORTSDIR/chinese/Wnn/pkg/PLIST. +Note that you must set a environment variable CSERVER or TSERVER if +you use a client of Wnn. -- S. Taoka <taoka@FreeBSD.org> diff --git a/chinese/FreeWnn-lib/pkg-plist b/chinese/FreeWnn-lib/pkg-plist index 05f4c86e4704..b915b79365dd 100644 --- a/chinese/FreeWnn-lib/pkg-plist +++ b/chinese/FreeWnn-lib/pkg-plist @@ -1,22 +1,22 @@ -@cwd /usr/local -etc/rc.d/cWnn.sh -lib/wnn/zh_CN/cserverrc +include/cwnn/commonhd.h +include/cwnn/cplib.h +include/cwnn/jllib.h +include/cwnn/jslib.h +include/cwnn/msg.h +include/cwnn/rk_spclval.h +include/cwnn/wnnerror.h +@dirrm include/cwnn +lib/wnn/cvt_key_empty +lib/wnn/cvt_key_tbl +lib/wnn/cvt_key_tbl.ST +lib/wnn/cvt_key_tbl.gm +lib/wnn/cvt_key_tbl.kt +lib/wnn/cvt_key_tbl.mv +lib/wnn/cvt_key_tbl.vt +lib/wnn/serverdefs lib/wnn/zh_CN/cixing.data -lib/wnn/zh_CN/uum.msg -lib/wnn/zh_CN/uumkey -lib/wnn/zh_CN/uumkey_e -lib/wnn/zh_CN/uumkey_p -lib/wnn/zh_CN/uumrc -lib/wnn/zh_CN/uumrc_p -lib/wnn/zh_CN/uumrc_z -lib/wnn/zh_CN/wnnstat.msg +lib/wnn/zh_CN/cserverrc lib/wnn/zh_CN/libwnn.msg -lib/wnn/zh_CN/wnnenvrc -lib/wnn/zh_CN/wnnenvrc_Qi -lib/wnn/zh_CN/wnnenvrc_QiR -lib/wnn/zh_CN/wnnenvrc_R -lib/wnn/zh_CN/wnnenvrc_Wu -lib/wnn/zh_CN/wnnenvrc_WuR lib/wnn/zh_CN/rk/1B_BS lib/wnn/zh_CN/rk/1B_TOLOWER lib/wnn/zh_CN/rk/1B_TOUPPER @@ -70,29 +70,29 @@ lib/wnn/zh_CN/rk_z/2Z_tail lib/wnn/zh_CN/rk_z/2Z_tail_X lib/wnn/zh_CN/rk_z/3B_quanjiao lib/wnn/zh_CN/rk_z/mode -lib/wnn/zh_CN/dic/sys/full.con -lib/wnn/zh_CN/dic/sys/full.conR -lib/wnn/zh_CN/dic/sys/basic.dic -lib/wnn/zh_CN/dic/sys/level_1.dic -lib/wnn/zh_CN/dic/sys/level_2.dic -lib/wnn/zh_CN/dic/sys/computer.dic -lib/wnn/zh_CN/dic/sys/cwnn.dic -lib/wnn/zh_CN/dic/sys/WuBi.dic -lib/wnn/zh_CN/dic/sys/QianMa.dic -lib/wnn/cvt_key_empty -lib/wnn/cvt_key_tbl -lib/wnn/cvt_key_tbl.ST -lib/wnn/cvt_key_tbl.gm -lib/wnn/cvt_key_tbl.kt -lib/wnn/cvt_key_tbl.mv -lib/wnn/cvt_key_tbl.vt -lib/wnn/serverdefs -lib/wnn/zh_TW/dic/sys/full.con -lib/wnn/zh_TW/dic/sys/full.conR -lib/wnn/zh_TW/dic/sys/cns_ch.dic -lib/wnn/zh_TW/dic/sys/cns_wd.dic -lib/wnn/zh_TW/tserverrc +lib/wnn/zh_CN/uum.msg +lib/wnn/zh_CN/uumkey +lib/wnn/zh_CN/uumkey_e +lib/wnn/zh_CN/uumkey_p +lib/wnn/zh_CN/uumrc +lib/wnn/zh_CN/uumrc_p +lib/wnn/zh_CN/uumrc_z +lib/wnn/zh_CN/wnnenvrc +lib/wnn/zh_CN/wnnenvrc_Qi +lib/wnn/zh_CN/wnnenvrc_QiR +lib/wnn/zh_CN/wnnenvrc_R +lib/wnn/zh_CN/wnnenvrc_Wu +lib/wnn/zh_CN/wnnenvrc_WuR +lib/wnn/zh_CN/wnnstat.msg lib/wnn/zh_TW/cixing.data +lib/wnn/zh_TW/libwnn.msg +lib/wnn/zh_TW/rk/2A_CTRL +lib/wnn/zh_TW/rk/mode +lib/wnn/zh_TW/rk_p/2A_CTRL +lib/wnn/zh_TW/rk_p/mode +lib/wnn/zh_TW/rk_z/2A_CTRL +lib/wnn/zh_TW/rk_z/mode +lib/wnn/zh_TW/tserverrc lib/wnn/zh_TW/uum.msg lib/wnn/zh_TW/uumkey lib/wnn/zh_TW/uumkey_e @@ -100,190 +100,18 @@ lib/wnn/zh_TW/uumkey_p lib/wnn/zh_TW/uumrc lib/wnn/zh_TW/uumrc_p lib/wnn/zh_TW/uumrc_z -lib/wnn/zh_TW/wnnstat.msg -lib/wnn/zh_TW/libwnn.msg lib/wnn/zh_TW/wnnenvrc lib/wnn/zh_TW/wnnenvrc_R -lib/wnn/zh_TW/rk/mode -lib/wnn/zh_TW/rk/2A_CTRL -lib/wnn/zh_TW/rk_p/mode -lib/wnn/zh_TW/rk_p/2A_CTRL -lib/wnn/zh_TW/rk_z/mode -lib/wnn/zh_TW/rk_z/2A_CTRL -@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/zh_CN/rk_z -@dirrm lib/wnn/zh_CN/rk_p -@dirrm lib/wnn/zh_CN/rk -@dirrm lib/wnn/zh_CN/dic/sys -@dirrm lib/wnn/zh_CN/dic/usr -@dirrm lib/wnn/zh_CN/dic -@dirrm lib/wnn/zh_CN +lib/wnn/zh_TW/wnnstat.msg +lib/libcwnn.a +lib/libcwnn.so +lib/libcwnn.so.0 @dirrm lib/wnn/zh_TW/rk_z @dirrm lib/wnn/zh_TW/rk_p @dirrm lib/wnn/zh_TW/rk -@dirrm lib/wnn/zh_TW/dic/sys -@dirrm lib/wnn/zh_TW/dic/usr -@dirrm lib/wnn/zh_TW/dic @dirrm lib/wnn/zh_TW -@comment Xwnmo -@dirrm lib/wnn/ja_JP -@dirrm lib/wnn/lt_LN -@dirrm lib/wnn/ko_KR -@comment END Xwnmo +@dirrm lib/wnn/zh_CN/rk_z +@dirrm lib/wnn/zh_CN/rk_p +@dirrm lib/wnn/zh_CN/rk +@dirrm lib/wnn/zh_CN @dirrm lib/wnn -bin/cWnn4/cserver -bin/cWnn4/tserver -bin/cWnn4/cuum -bin/cWnn4/cwnnstat -bin/cWnn4/cwnnkill -bin/cWnn4/cwddel -bin/cWnn4/cwdreg -bin/cWnn4/cdtoa -bin/cWnn4/catod -bin/cWnn4/catof -bin/cWnn4/cwnntouch -@dirrm bin/cWnn4 -share/doc/zh-Wnn/manual/README -share/doc/zh-Wnn/manual/app -share/doc/zh-Wnn/manual/chap1 -share/doc/zh-Wnn/manual/chap2 -share/doc/zh-Wnn/manual/chap3 -share/doc/zh-Wnn/manual/chap4 -share/doc/zh-Wnn/manual/chap5 -share/doc/zh-Wnn/manual/chap6 -share/doc/zh-Wnn/manual/chap7 -share/doc/zh-Wnn/manual/chap8 -share/doc/zh-Wnn/manual/contents -share/doc/zh-Wnn/manual/glossary -share/doc/zh-Wnn/manual/index -share/doc/zh-Wnn/manual/preface -share/doc/zh-Wnn/manual.en/README -share/doc/zh-Wnn/manual.en/Table-a-2.1.Z -share/doc/zh-Wnn/manual.en/Table-a-2.2.Z -share/doc/zh-Wnn/manual.en/Table-a-2.3.Z -share/doc/zh-Wnn/manual.en/Table-a-3.1.Z -share/doc/zh-Wnn/manual.en/Table-a-3.2.Z -share/doc/zh-Wnn/manual.en/Table-a-3.3.Z -share/doc/zh-Wnn/manual.en/Table-a-4.1.Z -share/doc/zh-Wnn/manual.en/Table-a-4.2.Z -share/doc/zh-Wnn/manual.en/Table-a-4.3.Z -share/doc/zh-Wnn/manual.en/Table-a-4.4.Z -share/doc/zh-Wnn/manual.en/Table-a-6.1.Z -share/doc/zh-Wnn/manual.en/Table-a-6.2.Z -share/doc/zh-Wnn/manual.en/Table-c-2.1.Z -share/doc/zh-Wnn/manual.en/Table-c-2.2.Z -share/doc/zh-Wnn/manual.en/Table-c-2.3.Z -share/doc/zh-Wnn/manual.en/Table-c-2.4.Z -share/doc/zh-Wnn/manual.en/Table-c-2.5.Z -share/doc/zh-Wnn/manual.en/Table-c-2.6.Z -share/doc/zh-Wnn/manual.en/Table-c-2.7.Z -share/doc/zh-Wnn/manual.en/app -share/doc/zh-Wnn/manual.en/chap1 -share/doc/zh-Wnn/manual.en/Table-c-2.8.Z -share/doc/zh-Wnn/manual.en/Table-c-3.1.Z -share/doc/zh-Wnn/manual.en/Table-c-3.2.Z -share/doc/zh-Wnn/manual.en/Table-c-3.3.Z -share/doc/zh-Wnn/manual.en/Table-c-3.4.Z -share/doc/zh-Wnn/manual.en/Table-c-3.5.Z -share/doc/zh-Wnn/manual.en/Table-c-5.1.Z -share/doc/zh-Wnn/manual.en/Table-c-6.1.Z -share/doc/zh-Wnn/manual.en/Table-c-6.2.Z -share/doc/zh-Wnn/manual.en/Table-c-6.3.Z -share/doc/zh-Wnn/manual.en/Table-c-6.4.Z -share/doc/zh-Wnn/manual.en/Table-c-6.5.Z -share/doc/zh-Wnn/manual.en/Table-c-6.6.Z -share/doc/zh-Wnn/manual.en/Table-c-6.7.Z -share/doc/zh-Wnn/manual.en/Table-c-6.8.Z -share/doc/zh-Wnn/manual.en/Table-c-7.1.Z -share/doc/zh-Wnn/manual.en/Table-c-7.2.Z -share/doc/zh-Wnn/manual.en/chap2 -share/doc/zh-Wnn/manual.en/chap3 -share/doc/zh-Wnn/manual.en/chap4 -share/doc/zh-Wnn/manual.en/chap5 -share/doc/zh-Wnn/manual.en/chap6 -share/doc/zh-Wnn/manual.en/chap7 -share/doc/zh-Wnn/manual.en/content -share/doc/zh-Wnn/manual.en/cover -share/doc/zh-Wnn/manual.en/index -share/doc/zh-Wnn/manual.en/preface -@dirrm share/doc/zh-Wnn/manual.en -@dirrm share/doc/zh-Wnn/manual -@dirrm share/doc/zh-Wnn -@cwd /usr/X11R6 -@comment Xwnmo -bin/xwnmo -bin/killxwnmo -bin/xjutil -lib/X11/app-defaults/Xwnmo -@comment END Xwnmo -lib/libcwnn4.so -lib/libcwnn4.so.1.0 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -lib/libcwnn.a -include/cwnn/jllib.h -include/cwnn/jslib.h -include/cwnn/rk_spclval.h -include/cwnn/wnnerror.h -include/cwnn/commonhd.h -include/cwnn/cplib.h -include/cwnn/msg.h -@dirrm include/cwnn -man/man1/cwdreg.1.gz -man/man1/cdicsort.1.gz -man/man1/cwddel.1.gz -man/man1/cdtoa.1.gz -man/man1/catof.1.gz -man/man1/catod.1.gz -man/man1/cwnnstat.1.gz -man/man1/cwnnkill.1.gz -man/man1/cuum.1.gz -man/man1/cserver.1.gz -man/man4/cst_end.4.gz -man/man4/cwnn.4.gz -man/man4/cenv.4.gz -man/man4/ckey.4.gz -@comment Xwnmo -man/man1/xwnmo.1.gz -man/man1/ximrc.1.gz -man/man1/ximconf.1.gz -man/man1/cvt_fun_tbl.1.gz -man/man1/cvt_meta_tbl.1.gz -man/man1/killxwnmo.1.gz -man/man1/cvt_xim_tbl.1.gz -man/man1/xjutil.1.gz -@comment END Xwnmo diff --git a/chinese/FreeWnn-server/Makefile b/chinese/FreeWnn-server/Makefile index e79a9f3870f3..538297254026 100644 --- a/chinese/FreeWnn-server/Makefile +++ b/chinese/FreeWnn-server/Makefile @@ -1,17 +1,15 @@ -# New ports collection makefile for: Wnn for Chinese -# Date created: 20 July 1997 -# Whom: Satoshi Taoka <taoka@FreeBSD.org> +# New ports collection makefile for: server of FreeWnn +# Date created: 00/08/25 +# Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # +PKGNAMESUFFIX= -server CATEGORIES= chinese - -## COMMENT, DESCR, PLIST is used in a local 'pkg' directory -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR -PLIST= ${.CURDIR}/pkg/PLIST - -MASTERDIR= ${.CURDIR}/../../japanese/Wnn +MASTERDIR= ${.CURDIR}/../../japanese/FreeWnn-lib +PKGDIR= ${.CURDIR}/pkg +PKGINSTALL= ${.CURDIR}/../../japanese/FreeWnn-server/pkg/INSTALL +WNN= cWnn .include "${MASTERDIR}/Makefile" diff --git a/chinese/FreeWnn-server/pkg-comment b/chinese/FreeWnn-server/pkg-comment index eea0c6971df2..8b4a413c2957 100644 --- a/chinese/FreeWnn-server/pkg-comment +++ b/chinese/FreeWnn-server/pkg-comment @@ -1 +1 @@ -A Japanese/Chinese/Korean input method (only Chinese built) +A Japanese/Chinese/Korean input method (Japanese server) diff --git a/chinese/FreeWnn-server/pkg-descr b/chinese/FreeWnn-server/pkg-descr index 92576b60805c..8f0b91d25af2 100644 --- a/chinese/FreeWnn-server/pkg-descr +++ b/chinese/FreeWnn-server/pkg-descr @@ -1,48 +1,9 @@ -This is Wnn4.2, a Japanese/Chinese/Korean input method. It is -included primarily so that we can compile mule-2.1, a multilingual -emacs. +FreeWnn is a Japanese/Chinese/Korean input method. -Only the Chinese version is built for this port. +WWW: www.freewnn.org -Note that binaries and libraries go to /usr/local, while man pages and -includes go to /usr/X11R6. That's the way it was designed, I don't -know why. - -- Satoshi -(asami@cs.berkeley.edu) - -------------------------------------------------------------------- - -This also include some patches for FreeBSD or bugfixes. -If use these patches, you can compile Wnn-4.2 under XFree86 3.1.2E - or later (X11Release6.1). -If there are any problem in these patches, please tell me via E-mail. - -Hidekazu Kuroki -(hidekazu@cs.titech.ac.jp) - -------------------------------------------------------------------- - -Hisashi ITO <his@kuro.is.sci.toho-u.ac.jp> made a patch for -Xsi/jserver/b_index.c. This code is only used in a Chinese method -'cWnn'. But you are not able to use 'Qianma' very well. - -That bug is caused by what cWnn has codes depend on architectures -about small-endian and big-endian machines. - -If there are any problem in this patch, please tell Mr. Ito via -E-mail. - - -Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for Wnn4.2. -Patches for those are in 'Wnn4.2.patch-YYMMDD.tar.gz' and are applied -in this port. - -[Notice] -When compiling this port, if $LOCALBASE is not '/usr/local' and/or -$X11BASE is not '/usr/X11R6' then you should properly change two lines -'@cwd /usr/local' and '@cwd /usr/X11R6' in -$PORTSDIR/chinese/Wnn/pkg/PLIST. +This port has only a server and dictionaries used the server for a +Chinese imput method. -- S. Taoka <taoka@FreeBSD.org> diff --git a/chinese/FreeWnn-server/pkg-plist b/chinese/FreeWnn-server/pkg-plist index 05f4c86e4704..abc8dd6f3540 100644 --- a/chinese/FreeWnn-server/pkg-plist +++ b/chinese/FreeWnn-server/pkg-plist @@ -1,289 +1,34 @@ -@cwd /usr/local +bin/cWnn4/catod +bin/cWnn4/catof +bin/cWnn4/cdtoa +bin/cWnn4/cserver +bin/cWnn4/cwddel +bin/cWnn4/cwdreg +bin/cWnn4/cwnnkill +bin/cWnn4/cwnnstat +bin/cWnn4/cwnntouch +bin/cWnn4/tserver +@dirrm bin/cWnn4 etc/rc.d/cWnn.sh -lib/wnn/zh_CN/cserverrc -lib/wnn/zh_CN/cixing.data -lib/wnn/zh_CN/uum.msg -lib/wnn/zh_CN/uumkey -lib/wnn/zh_CN/uumkey_e -lib/wnn/zh_CN/uumkey_p -lib/wnn/zh_CN/uumrc -lib/wnn/zh_CN/uumrc_p -lib/wnn/zh_CN/uumrc_z -lib/wnn/zh_CN/wnnstat.msg -lib/wnn/zh_CN/libwnn.msg -lib/wnn/zh_CN/wnnenvrc -lib/wnn/zh_CN/wnnenvrc_Qi -lib/wnn/zh_CN/wnnenvrc_QiR -lib/wnn/zh_CN/wnnenvrc_R -lib/wnn/zh_CN/wnnenvrc_Wu -lib/wnn/zh_CN/wnnenvrc_WuR -lib/wnn/zh_CN/rk/1B_BS -lib/wnn/zh_CN/rk/1B_TOLOWER -lib/wnn/zh_CN/rk/1B_TOUPPER -lib/wnn/zh_CN/rk/1Z_ZhuYin -lib/wnn/zh_CN/rk/2A_CTRL -lib/wnn/zh_CN/rk/2B_WuBi -lib/wnn/zh_CN/rk/2P_QuanPin -lib/wnn/zh_CN/rk/2P_RongCuo -lib/wnn/zh_CN/rk/2Z_ZhuYin -lib/wnn/zh_CN/rk/2Z_tail -lib/wnn/zh_CN/rk/2Z_tail_ma -lib/wnn/zh_CN/rk/2Z_tail_pin -lib/wnn/zh_CN/rk/3B_quanjiao -lib/wnn/zh_CN/rk/mode -lib/wnn/zh_CN/rk_p/1B_BS -lib/wnn/zh_CN/rk_p/1B_TOLOWER -lib/wnn/zh_CN/rk_p/1B_TOUPPER -lib/wnn/zh_CN/rk_p/1F_select -lib/wnn/zh_CN/rk_p/2A_CTRL -lib/wnn/zh_CN/rk_p/2B_QianMa -lib/wnn/zh_CN/rk_p/2B_WuBi -lib/wnn/zh_CN/rk_p/2B_ch_yo_zi -lib/wnn/zh_CN/rk_p/2B_ma_GuoBi -lib/wnn/zh_CN/rk_p/2B_ma_NeiMa -lib/wnn/zh_CN/rk_p/2B_ma_QuWei -lib/wnn/zh_CN/rk_p/2F_restart -lib/wnn/zh_CN/rk_p/2F_select -lib/wnn/zh_CN/rk_p/2P_ErPin -lib/wnn/zh_CN/rk_p/2P_ErPin_3K -lib/wnn/zh_CN/rk_p/2P_ErPin_P -lib/wnn/zh_CN/rk_p/2P_ErPin_P3K -lib/wnn/zh_CN/rk_p/2P_QuanPin -lib/wnn/zh_CN/rk_p/2P_RC2 -lib/wnn/zh_CN/rk_p/2P_RC2_P -lib/wnn/zh_CN/rk_p/2P_RongCuo -lib/wnn/zh_CN/rk_p/2Z_tail_ma -lib/wnn/zh_CN/rk_p/2Z_tail_pin -lib/wnn/zh_CN/rk_p/3B_quanjiao -lib/wnn/zh_CN/rk_p/3P_ErPin -lib/wnn/zh_CN/rk_p/3P_ErPin_P -lib/wnn/zh_CN/rk_p/mode -lib/wnn/zh_CN/rk_z/1B_TOUPPER -lib/wnn/zh_CN/rk_z/1F_select -lib/wnn/zh_CN/rk_z/1Z_ZhuYin -lib/wnn/zh_CN/rk_z/1Z_ZhuYin_X -lib/wnn/zh_CN/rk_z/2A_CTRL -lib/wnn/zh_CN/rk_z/2F_select -lib/wnn/zh_CN/rk_z/2Z_ZhuYin -lib/wnn/zh_CN/rk_z/2Z_ZhuYin_X -lib/wnn/zh_CN/rk_z/2Z_tail -lib/wnn/zh_CN/rk_z/2Z_tail_X -lib/wnn/zh_CN/rk_z/3B_quanjiao -lib/wnn/zh_CN/rk_z/mode +lib/wnn/zh_CN/dic/sys/QianMa.dic +lib/wnn/zh_CN/dic/sys/WuBi.dic +lib/wnn/zh_CN/dic/sys/basic.dic +lib/wnn/zh_CN/dic/sys/computer.dic +lib/wnn/zh_CN/dic/sys/cwnn.dic lib/wnn/zh_CN/dic/sys/full.con lib/wnn/zh_CN/dic/sys/full.conR -lib/wnn/zh_CN/dic/sys/basic.dic lib/wnn/zh_CN/dic/sys/level_1.dic lib/wnn/zh_CN/dic/sys/level_2.dic -lib/wnn/zh_CN/dic/sys/computer.dic -lib/wnn/zh_CN/dic/sys/cwnn.dic -lib/wnn/zh_CN/dic/sys/WuBi.dic -lib/wnn/zh_CN/dic/sys/QianMa.dic -lib/wnn/cvt_key_empty -lib/wnn/cvt_key_tbl -lib/wnn/cvt_key_tbl.ST -lib/wnn/cvt_key_tbl.gm -lib/wnn/cvt_key_tbl.kt -lib/wnn/cvt_key_tbl.mv -lib/wnn/cvt_key_tbl.vt -lib/wnn/serverdefs -lib/wnn/zh_TW/dic/sys/full.con -lib/wnn/zh_TW/dic/sys/full.conR lib/wnn/zh_TW/dic/sys/cns_ch.dic lib/wnn/zh_TW/dic/sys/cns_wd.dic -lib/wnn/zh_TW/tserverrc -lib/wnn/zh_TW/cixing.data -lib/wnn/zh_TW/uum.msg -lib/wnn/zh_TW/uumkey -lib/wnn/zh_TW/uumkey_e -lib/wnn/zh_TW/uumkey_p -lib/wnn/zh_TW/uumrc -lib/wnn/zh_TW/uumrc_p -lib/wnn/zh_TW/uumrc_z -lib/wnn/zh_TW/wnnstat.msg -lib/wnn/zh_TW/libwnn.msg -lib/wnn/zh_TW/wnnenvrc -lib/wnn/zh_TW/wnnenvrc_R -lib/wnn/zh_TW/rk/mode -lib/wnn/zh_TW/rk/2A_CTRL -lib/wnn/zh_TW/rk_p/mode -lib/wnn/zh_TW/rk_p/2A_CTRL -lib/wnn/zh_TW/rk_z/mode -lib/wnn/zh_TW/rk_z/2A_CTRL -@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/zh_CN/rk_z -@dirrm lib/wnn/zh_CN/rk_p -@dirrm lib/wnn/zh_CN/rk +lib/wnn/zh_TW/dic/sys/full.con +lib/wnn/zh_TW/dic/sys/full.conR @dirrm lib/wnn/zh_CN/dic/sys @dirrm lib/wnn/zh_CN/dic/usr @dirrm lib/wnn/zh_CN/dic -@dirrm lib/wnn/zh_CN -@dirrm lib/wnn/zh_TW/rk_z -@dirrm lib/wnn/zh_TW/rk_p -@dirrm lib/wnn/zh_TW/rk @dirrm lib/wnn/zh_TW/dic/sys @dirrm lib/wnn/zh_TW/dic/usr @dirrm lib/wnn/zh_TW/dic +@dirrm lib/wnn/zh_CN @dirrm lib/wnn/zh_TW -@comment Xwnmo -@dirrm lib/wnn/ja_JP -@dirrm lib/wnn/lt_LN -@dirrm lib/wnn/ko_KR -@comment END Xwnmo @dirrm lib/wnn -bin/cWnn4/cserver -bin/cWnn4/tserver -bin/cWnn4/cuum -bin/cWnn4/cwnnstat -bin/cWnn4/cwnnkill -bin/cWnn4/cwddel -bin/cWnn4/cwdreg -bin/cWnn4/cdtoa -bin/cWnn4/catod -bin/cWnn4/catof -bin/cWnn4/cwnntouch -@dirrm bin/cWnn4 -share/doc/zh-Wnn/manual/README -share/doc/zh-Wnn/manual/app -share/doc/zh-Wnn/manual/chap1 -share/doc/zh-Wnn/manual/chap2 -share/doc/zh-Wnn/manual/chap3 -share/doc/zh-Wnn/manual/chap4 -share/doc/zh-Wnn/manual/chap5 -share/doc/zh-Wnn/manual/chap6 -share/doc/zh-Wnn/manual/chap7 -share/doc/zh-Wnn/manual/chap8 -share/doc/zh-Wnn/manual/contents -share/doc/zh-Wnn/manual/glossary -share/doc/zh-Wnn/manual/index -share/doc/zh-Wnn/manual/preface -share/doc/zh-Wnn/manual.en/README -share/doc/zh-Wnn/manual.en/Table-a-2.1.Z -share/doc/zh-Wnn/manual.en/Table-a-2.2.Z -share/doc/zh-Wnn/manual.en/Table-a-2.3.Z -share/doc/zh-Wnn/manual.en/Table-a-3.1.Z -share/doc/zh-Wnn/manual.en/Table-a-3.2.Z -share/doc/zh-Wnn/manual.en/Table-a-3.3.Z -share/doc/zh-Wnn/manual.en/Table-a-4.1.Z -share/doc/zh-Wnn/manual.en/Table-a-4.2.Z -share/doc/zh-Wnn/manual.en/Table-a-4.3.Z -share/doc/zh-Wnn/manual.en/Table-a-4.4.Z -share/doc/zh-Wnn/manual.en/Table-a-6.1.Z -share/doc/zh-Wnn/manual.en/Table-a-6.2.Z -share/doc/zh-Wnn/manual.en/Table-c-2.1.Z -share/doc/zh-Wnn/manual.en/Table-c-2.2.Z -share/doc/zh-Wnn/manual.en/Table-c-2.3.Z -share/doc/zh-Wnn/manual.en/Table-c-2.4.Z -share/doc/zh-Wnn/manual.en/Table-c-2.5.Z -share/doc/zh-Wnn/manual.en/Table-c-2.6.Z -share/doc/zh-Wnn/manual.en/Table-c-2.7.Z -share/doc/zh-Wnn/manual.en/app -share/doc/zh-Wnn/manual.en/chap1 -share/doc/zh-Wnn/manual.en/Table-c-2.8.Z -share/doc/zh-Wnn/manual.en/Table-c-3.1.Z -share/doc/zh-Wnn/manual.en/Table-c-3.2.Z -share/doc/zh-Wnn/manual.en/Table-c-3.3.Z -share/doc/zh-Wnn/manual.en/Table-c-3.4.Z -share/doc/zh-Wnn/manual.en/Table-c-3.5.Z -share/doc/zh-Wnn/manual.en/Table-c-5.1.Z -share/doc/zh-Wnn/manual.en/Table-c-6.1.Z -share/doc/zh-Wnn/manual.en/Table-c-6.2.Z -share/doc/zh-Wnn/manual.en/Table-c-6.3.Z -share/doc/zh-Wnn/manual.en/Table-c-6.4.Z -share/doc/zh-Wnn/manual.en/Table-c-6.5.Z -share/doc/zh-Wnn/manual.en/Table-c-6.6.Z -share/doc/zh-Wnn/manual.en/Table-c-6.7.Z -share/doc/zh-Wnn/manual.en/Table-c-6.8.Z -share/doc/zh-Wnn/manual.en/Table-c-7.1.Z -share/doc/zh-Wnn/manual.en/Table-c-7.2.Z -share/doc/zh-Wnn/manual.en/chap2 -share/doc/zh-Wnn/manual.en/chap3 -share/doc/zh-Wnn/manual.en/chap4 -share/doc/zh-Wnn/manual.en/chap5 -share/doc/zh-Wnn/manual.en/chap6 -share/doc/zh-Wnn/manual.en/chap7 -share/doc/zh-Wnn/manual.en/content -share/doc/zh-Wnn/manual.en/cover -share/doc/zh-Wnn/manual.en/index -share/doc/zh-Wnn/manual.en/preface -@dirrm share/doc/zh-Wnn/manual.en -@dirrm share/doc/zh-Wnn/manual -@dirrm share/doc/zh-Wnn -@cwd /usr/X11R6 -@comment Xwnmo -bin/xwnmo -bin/killxwnmo -bin/xjutil -lib/X11/app-defaults/Xwnmo -@comment END Xwnmo -lib/libcwnn4.so -lib/libcwnn4.so.1.0 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -lib/libcwnn.a -include/cwnn/jllib.h -include/cwnn/jslib.h -include/cwnn/rk_spclval.h -include/cwnn/wnnerror.h -include/cwnn/commonhd.h -include/cwnn/cplib.h -include/cwnn/msg.h -@dirrm include/cwnn -man/man1/cwdreg.1.gz -man/man1/cdicsort.1.gz -man/man1/cwddel.1.gz -man/man1/cdtoa.1.gz -man/man1/catof.1.gz -man/man1/catod.1.gz -man/man1/cwnnstat.1.gz -man/man1/cwnnkill.1.gz -man/man1/cuum.1.gz -man/man1/cserver.1.gz -man/man4/cst_end.4.gz -man/man4/cwnn.4.gz -man/man4/cenv.4.gz -man/man4/ckey.4.gz -@comment Xwnmo -man/man1/xwnmo.1.gz -man/man1/ximrc.1.gz -man/man1/ximconf.1.gz -man/man1/cvt_fun_tbl.1.gz -man/man1/cvt_meta_tbl.1.gz -man/man1/killxwnmo.1.gz -man/man1/cvt_xim_tbl.1.gz -man/man1/xjutil.1.gz -@comment END Xwnmo diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile index 125964b36ad4..9de6f4b163a8 100644 --- a/japanese/FreeWnn-lib/Makefile +++ b/japanese/FreeWnn-lib/Makefile @@ -1,175 +1,127 @@ -# New ports collection makefile for: Wnn for Japanese -# Date created: 20 July 1997 -# Whom: Satoshi Taoka <taoka@FreeBSD.org> +# New ports collection makefile for: FreeWnn for Japanese +# Date created: 20 July 1997 +# Whom: Satoshi Taoka <taoka@FreeBSD.org> # # $FreeBSD$ # -PORTNAME= Wnn -PORTVERSION= 4.2 -CATEGORIES?= japanese -MASTER_SITES= ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/ \ - ftp://ftp.wg.omron.co.jp/pub/Wnn/dic/pubdic+/ \ - http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/Wnn/ -DISTNAME= ${PORTNAME}${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${WNN_EXTRA_PATCH} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER= taoka@FreeBSD.org - -BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 - -USE_XLIB= yes -INSTALLS_SHLIB= yes -PATCHDIR= ${.CURDIR}/../../japanese/Wnn/patches -FILESDIR= ${.CURDIR}/../../japanese/Wnn/files -PKGDIR= ${.CURDIR}/../../japanese/Wnn/pkg -WRKSRC= ${WRKDIR}/Xsi - -WNN_EXTRA_PATCH= ${DISTNAME}.patch-981201.tar.gz -MAKE_ENV+= PATH=/usr/bin:$${PATH} PORT_IMAKE_DEFINES='${WNN_DEF}' - -.if defined(BATCH) -BATCH= yes # make sure it's not empty +PORTNAME= FreeWnn +PORTVERSION= ${WMMVERSION:S/-/./} +CATEGORIES?= japanese +MASTER_SITES= ftp://ftp.freewnn.org/pub/FreeWnn/ \ + ftp://ftp.etl.go.jp/pub/FreeWnn/alpha/ +PKGNAMESUFFIX?= -lib +DISTNAME= ${PORTNAME}-${WMMVERSION} + +MAINTAINER= taoka@FreeBSD.org + +WRKSRC= ${WRKDIR}/${DISTNAME}/Xsi +ALL_TARGET= includes all +INSTALL_TARGET= install install.man +GNU_CONFIGURE= yes +USE_AUTOCONF= yes +USE_LIBTOOL= yes + +WMMVERSION= 1.1.1-a017 + +WNN?= Wnn +.if (${PKGNAMESUFFIX} == -lib) +CONFIGURE_ARGS= --enable-server=no +## I must use MLINKS, but .... +NOMANCOMPRESS= yes +.else +CONFIGURE_ARGS= --enable-libraries=no .endif -.include <bsd.port.pre.mk> - -.if ${PKGNAMEPREFIX} == ja- -DISTFILES+= pubdic+.tar.gz pubdic+-fix01.gz pubdic+.diff pubdic+.special.diff -PORT_DOCDIR= ${PREFIX}/share/doc/ja-Wnn -DOC_FROM= ${WRKSRC}/Wnn -BuildWnn= YES -BuildJlibV3= YES -LOCAL_MAN_LANG= ja -SHARED_LIB= libwnn4 +.if (${WNN} == Wnn) +CONFIGURE_ARGS+= --enable-cWnn=no --enable-kWnn=no +MANLANG= ja +CONFIGURE_ARGS+= --mandir=${PREFIX}/man/ja +.if (${PKGNAMESUFFIX} == -lib) +MAN3= jl_bun_suu.3 jl_c_zenkouho.3 jl_close.3 jl_connect.3 jl_connect_lang.3 \ + jl_dai_top.3 jl_dic_add.3 jl_dic_add_e.3 jl_dic_comment_set.3 \ + jl_dic_comment_set_e.3 jl_dic_delete.3 jl_dic_delete_e.3 jl_dic_list.3 \ + jl_dic_list_e.3 jl_dic_save.3 jl_dic_save_all.3 jl_dic_save_all_e.3 \ + jl_dic_save_e.3 jl_dic_use.3 jl_dic_use_e.3 jl_disconnect.3 jl_env.3 \ + jl_env_get.3 jl_env_set.3 jl_env_sticky.3 jl_env_sticky_e.3 \ + jl_env_un_sticky.3 jl_env_un_sticky_e.3 jl_fuzokugo_get.3 \ + jl_fuzokugo_get_e.3 jl_fuzokugo_set.3 jl_fuzokugo_set_e.3 jl_get_kanji.3 \ + jl_get_yomi.3 jl_get_zenkouho_kanji.3 jl_hinsi_dicts.3 jl_hinsi_dicts_e.3 \ + jl_hinsi_list.3 jl_hinsi_list_e.3 jl_hinsi_name.3 jl_hinsi_name_e.3 \ + jl_hinsi_number.3 jl_hinsi_number_e.3 jl_inspect.3 jl_isconnect.3 \ + jl_isconnect_e.3 jl_jiri_len.3 jl_kanji_len.3 jl_kill.3 jl_next.3 \ + jl_next_dai.3 jl_nobi_conv.3 jl_open.3 jl_open_lang.3 jl_param_get.3 \ + jl_param_get_e.3 jl_param_set.3 jl_param_set_e.3 jl_previous.3 \ + jl_previous_dai.3 jl_ren_conv.3 jl_set_env_wnnrc.3 jl_set_jikouho.3 \ + jl_set_jikouho_dai.3 jl_tan_conv.3 jl_update_hindo.3 jl_word_add.3 \ + jl_word_add_e.3 jl_word_comment_set.3 jl_word_comment_set_e.3 \ + jl_word_delete.3 jl_word_delete_e.3 jl_word_info.3 jl_word_info_e.3 \ + jl_word_search.3 jl_word_search_by_env.3 jl_word_search_by_env_e.3 \ + jl_word_search_e.3 jl_word_use.3 jl_word_use_e.3 jl_yomi_len.3 \ + jl_zenkouho.3 jl_zenkouho_bun.3 jl_zenkouho_dai.3 jl_zenkouho_daip.3 \ + jl_zenkouho_suu.3 js_access.3 js_close.3 js_connect.3 js_dic_add.3 \ + js_dic_delete.3 js_dic_file_create.3 js_dic_file_create_client.3 \ + js_dic_info.3 js_dic_list.3 js_dic_list_all.3 js_dic_use.3 js_disconnect.3 \ + js_env_exist.3 js_env_list.3 js_env_sticky.3 js_env_un_sticky.3 \ + js_file_comment_set.3 js_file_discard.3 js_file_info.3 js_file_list.3 \ + js_file_list_all.3 js_file_loaded.3 js_file_loaded_local.3 \ + js_file_password_set.3 js_file_read.3 js_file_receive.3 js_file_remove.3 \ + js_file_remove_client.3 js_file_send.3 js_file_stat.3 js_file_write.3 \ + js_fuzokugo_get.3 js_fuzokugo_set.3 js_get_lang.3 js_hindo_file_create.3 \ + js_hindo_file_create_client.3 js_hindo_set.3 js_hinsi_dicts.3 \ + js_hinsi_list.3 js_hinsi_name.3 js_hinsi_number.3 js_hinsi_table_set.3 \ + js_isconnect.3 js_kanren.3 js_kantan_dai.3 js_kantan_sho.3 \ + js_kanzen_dai.3 js_kanzen_sho.3 js_kill.3 js_mkdir.3 js_open.3 \ + js_open_lang.3 js_param_get.3 js_param_set.3 js_set_lang.3 \ + js_version.3 js_who.3 js_word_add.3 js_word_comment_set.3 \ + js_word_delete.3 js_word_info.3 js_word_search.3 js_word_search_by_env.3 \ + msg_close.3 msg_get.3 msg_open.3 romkan_clear.3 romkan_dispmode.3 \ + romkan_getc.3 romkan_init.3 romkan_next.3 romkan_ungetc.3 .else -BuildWnn= NO +#BUILD_DEPENDS= ${LOCALBASE}/lib/libwnn.a:${PORTSDIR}/japanese/FreeWnn-lib +#RUN_DEPENDS= ${LOCALBASE}/lib/wnn/ja_JP/jserverrc:${PORTSDIR}/japanese/FreeWnn-lib +LIB_DEPENDS= wnn.0:${PORTSDIR}/japanese/FreeWnn-lib +CONFIGURE_ARGS+= --with-libwnn=-lwnn --with-wnn-libraries="${PREFIX}/lib" +MAN1= atod.1 atof.1 dtoa.1 jserver.1 oldatonewa.1 uum.1 wddel.1 wdreg.1 \ + wnnkill.1 wnnstat.1 wnntouch.1 +MAN4= 2a_ctrl.4 2b_romkana.4 cvt_key_tbl.4 fzk.data.4 fzk.u.4 hinsi_data.4 \ + jserverrc.4 mode.4 serverdefs.4 ujis_dic.4 uumkey.4 uumrc.4 wnnenvrc.4 +MAN5= pubdic.5 usr_dic.5 .endif -.if ${PKGNAMEPREFIX} == zh- -PORT_DOCDIR= ${PREFIX}/share/doc/zh-Wnn -DOC_FROM= ${WRKSRC}/cWnn -BuildCWnn= YES -SHARED_LIB= libcwnn4 -.else -BuildCWnn= NO +.elif (${WNN} == cWnn) +CONFIGURE_ARGS+= --enable-Wnn=no --enable-kWnn=no +.if (${PKGNAMESUFFIX} == -server) +#BUILD_DEPENDS= ${LOCALBASE}/lib/libcwnn.a:${PORTSDIR}/chinese/FreeWnn-lib +#RUN_DEPENDS= ${LOCALBASE}/lib/wnn/zh_CN/cserverrc:${PORTSDIR}/chinese/FreeWnn-lib +LIB_DEPENDS= cwnn.0:${PORTSDIR}/chinese/FreeWnn-lib +MAN1= cserver.1 cuum.1 cwnnkill.1 cwnnstat.1 catod.1 catof.1 cdicsort.1 \ + cdtoa.1 cwddel.1 cwdreg.1 cwnntouch.1 +MAN4= cst_end.4 cwnn.4 cenv.4 ckey.4 +CONFIGURE_ARGS+= --with-libcwnn=-lcwnn --with-cwnn-libraries="${PREFIX}/lib" .endif -.if ${PKGNAMEPREFIX} == ko- -# kWnn has no manual. -BuildKWnn= YES -SHARED_LIB= libkwnn4 -.else -BuildKWnn= NO +.elif (${WNN} == kWnn) +CONFIGURE_ARGS+= --enable-Wnn=no --enable-cWnn=no +.if (${PKGNAMESUFFIX} == -server) +#BUILD_DEPENDS= ${LOCALBASE}/lib/libkwnn.a:${PORTSDIR}/korean/FreeWnn-lib +#RUN_DEPENDS= ${LOCALBASE}/lib/wnn/ko_KR/kserverrc:${PORTSDIR}/korean/FreeWnn-lib +LIB_DEPENDS= kwnn.0:${PORTSDIR}/korean/FreeWnn-lib +CONFIGURE_ARGS+= --with-libkwnn=-lkwnn --with-kwnn-libraries="${PREFIX}/lib" .endif -BuildXwnmo= YES -# pubdic+ -PUBDICPDIR= ${WRKSRC}/pubdic+ -WDICS= bio.u computer.u kihon.u setsuji.u tankan.u \ - chimei.u jinmei.u koyuu.u symbol.u special.u -ATOD= ${WRKSRC}/Wnn/jutil/atod -h ${WRKSRC}/Wnn/jd/hinsi.data -#WNN_DEF+= -DBuildPubdic=NO -# TOPDIR should be a full path provided we build a shared library. -WNN_DEF+= -DTOPDIR=${WRKSRC} - -post-extract: - ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${_DISTDIR}${WNN_EXTRA_PATCH} ${EXTRACT_AFTER_ARGS} \ - -C ${WRKSRC} - ${LN} -sf Project.tmpl ${WRKSRC}/config/X11.tmpl -.if ${PKGNAMEPREFIX} == ja- - ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}pubdic+.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC} .endif -pre-patch: - cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Wnn-patch-01Dec98 - -#### pubdic+ -.if ${PKGNAMEPREFIX} == ja- -post-patch: - cd ${PUBDICPDIR}; \ - ${GZCAT} ${_DISTDIR}pubdic+-fix01.gz | ${PATCH} --quiet; \ - ${PATCH} --quiet < ${_DISTDIR}pubdic+.diff; \ - ${PATCH} --quiet < ${_DISTDIR}pubdic+.special.diff -.endif - -pre-configure: - for file in ${WRKSRC}/config/Project.tmpl \ - ${WRKSRC}/Contrib/dic/gerodic/Makefile; do \ - ${MV} $$file $$file.orig2; \ - ${SED} -e 's!^\([ ]*PREFIX = \).*$$!\1${PREFIX}!' \ - -e 's!%%LOCAL_MAN_LANG%%!${LOCAL_MAN_LANG}!' \ - -e 's!%%BuildWnn%%!${BuildWnn}!' \ - -e 's!%%BuildCWnn%%!${BuildCWnn}!' \ - -e 's!%%BuildKWnn%%!${BuildKWnn}!' \ - -e 's!%%BuildXwnmo%%!${BuildXwnmo}!' \ - -e 's!%%BuildJlibV3%%!${BuildJlibV3}!' \ - $$file.orig2 > $$file; \ - done - -do-configure: - (cd ${WRKSRC}; \ - imake -DUseInstalled -I${WRKSRC}/config \ - -I${X11BASE}/lib/X11/config -DTOPDIR=${WRKSRC}; \ - ${MAKE} Makefiles; \ - ${MAKE} clean; \ - ${MAKE} includes; \ - ${MAKE} depend ) - -pre-build: -#### pubdic+ -.if ${PKGNAMEPREFIX} == ja- - cd ${PUBDICPDIR}; ${XMKMF}; ${MAKE} wnn; \ - cd ${WRKSRC}/Pubdic; \ - for file in ${WDICS}; do \ - ${MV} -f $$file $$file.org; \ - ${MV} ../pubdic+/$$file . ; \ - hdfile=`echo $$file | ${SED} 's/\\.u/.hd/'`; \ - ${MV} -f $$hdfile $$hdfile.org; \ - ${SED} 's,(pubdic),(pubdic+),' $$hdfile.org > $$hdfile; \ - done -.endif - -# These are necesary because this package uses a different Makefile for -# building and installing etc. -#do-build: -# @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.inst World) - -#### gerodic -.if ${PKGNAMEPREFIX} == ja- -post-build: - cd ${WRKSRC}/Contrib/dic/gerodic; \ - ${ATOD} -h ${WRKSRC}/Pubdic/hinsi.data g-jinmei.dic < g-jinmei.u -.endif +post-extract: + ${CP} ${LOCALBASE}/share/libtool/libltdl/aclocal.m4 ${WRKSRC} + ${CP} ${LOCALBASE}/share/autoconf/config.sub ${WRKSRC} + ${CP} ${LOCALBASE}/share/autoconf/config.guess ${WRKSRC} +.if (${PKGNAMESUFFIX} == -server) pre-install: - @${SETENV} BATCH=${BATCH} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + ${SETENV} BATCH=${BATCH} \ + ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: -#### gerodic -.if ${PKGNAMEPREFIX} == ja- - cd ${WRKSRC}/Contrib/dic/gerodic; \ - make all install -.endif -#### -# This package uses imake's "install.man" target to install man pages but -# I can't define USE_IMAKE because it doesn't involve xmkmf - @cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man - @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL -.if !defined(NOPORTDOCS) -.if defined(PORT_DOCDIR) - ${MKDIR} ${PORT_DOCDIR} - @(cd ${DOC_FROM}; tar cvf - manual manual.en | \ - (cd ${PORT_DOCDIR}; tar xf -)) - @${CHOWN} -R bin.bin ${PORT_DOCDIR} -.endif + ${SETENV} PKG_PREFIX=${PREFIX} \ + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif -### for the shared libray - if [ X"${PORTOBJFORMAT}" != Xelf ]; then \ - ${LN} -sf ${SHARED_LIB}.so.1.0 \ - ${X11BASE}/lib/${SHARED_LIB}.so; \ - fi -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/FreeWnn-lib/distinfo b/japanese/FreeWnn-lib/distinfo index bc9146a2c6c5..640428c294c2 100644 --- a/japanese/FreeWnn-lib/distinfo +++ b/japanese/FreeWnn-lib/distinfo @@ -1,6 +1 @@ -MD5 (Wnn4.2.tar.gz) = dcb6271403577199e8141d07cd54be73 -MD5 (Wnn4.2.patch-981201.tar.gz) = 542847bff36e88f0ea588153b387e932 -MD5 (pubdic+.tar.gz) = 92dc7dfeae7eb3b637157fe2fd25480a -MD5 (pubdic+-fix01.gz) = 2469f2e65ac5f3248dd4225ca5383c49 -MD5 (pubdic+.diff) = 51e53024862273f51d8f3c51a3ea70b2 -MD5 (pubdic+.special.diff) = acf3faa8ba8219ed97ca0c4e59030145 +MD5 (FreeWnn-1.1.1-a017.tar.gz) = cf7cb1fa5ac5b624c559469de17282f9 diff --git a/japanese/FreeWnn-lib/files/patch-aa b/japanese/FreeWnn-lib/files/patch-aa new file mode 100644 index 000000000000..3ed5d77c97d4 --- /dev/null +++ b/japanese/FreeWnn-lib/files/patch-aa @@ -0,0 +1,188 @@ +--- configure.in.orig Fri Mar 17 01:15:32 2000 ++++ configure.in Fri Sep 1 01:13:50 2000 +@@ -48,7 +48,185 @@ + esac + AC_SUBST(abs_top_srcdir) + ++dnl ==================================================================== ++dnl Check optional features ++dnl ==================================================================== + ++AM_PROG_LIBTOOL ++ ++AC_ARG_ENABLE(sharedlib, ++[ --enable-sharedlib build shared library using GNU libtool], ++ [if test "$enableval" = yes ++ then ++ use_sharedlib=yes ++ else ++ use_sharedlib=no ++ fi], [use_sharedlib=default]) ++ ++ ++dnl build and install libraries or server ++ ++AC_ARG_ENABLE(libraries, ++[ --enable-libraries build and install libraries [default=yes]], ++[case "${enableval}" in ++ yes) libraries=true ;; ++ no) libraries=false ;; ++ *) AC_MSG_ERROR(bad value for --enable-libraries) ;; ++esac], libraries=true) ++ ++AC_ARG_ENABLE(server, ++[ --enable-server build and install server [default=yes]], ++[case "${enableval}" in ++ yes) server=true ;; ++ no) server=false ;; ++ *) AC_MSG_ERROR(bad value for --enable-server) ;; ++esac], server=true) ++ ++ ++if test $libraries = true; then ++ SUBDIRS="\$(LIB_SUBDIRS)" ++ WNNMANDIR="\$(LIB_WNNMANDIR)" ++fi ++if test $server = true; then ++ SUBDIRS="$SUBDIRS \$(SERVER_SUBDIRS)" ++ WNNMANDIR="$WNNMANDIR \$(SERVER_WNNMANDIR)" ++fi ++ ++AC_SUBST(SUBDIRS) ++AC_SUBST(WNNMANDIR) ++ ++dnl For Severs ++ ++AC_ARG_ENABLE(Wnn, ++[ --enable-Wnn build and install Wnn [default=true]], ++[case "${enableval}" in ++ yes) Wnn="Wnn";; ++ no) Wnn="" ;; ++ *) AC_MSG_ERROR(bad value for --enable-Wnn) ;; ++esac], Wnn="Wnn") ++AC_SUBST(Wnn) ++ ++if test "$server" = true -a "$Wnn" = Wnn; then ++ JSERVER_SUBDIRS1="\$(JSERVER_SUBDIRS1)" ++ JSERVER_SUBDIRS2="\$(JSERVER_SUBDIRS2)" ++else ++ JSERVER_SUBDIRS1="" ++ JSERVER_SUBDIRS2="" ++fi ++AC_SUBST(JSERVER_SUBDIRS1) ++AC_SUBST(JSERVER_SUBDIRS2) ++ ++AC_ARG_ENABLE(cWnn, ++[ --enable-cWnn build and install cWnn [default=true]], ++[case "${enableval}" in ++ yes) cWnn="cWnn" ;; ++ no) cWnn="" ;; ++ *) AC_MSG_ERROR(bad value for --enable-cWnn) ;; ++esac], cWnn="cWnn") ++AC_SUBST(cWnn) ++ ++AC_ARG_ENABLE(kWnn, ++[ --enable-kWnn build and install kWnn [default=true]], ++[case "${enableval}" in ++ yes) kWnn="kWnn" ;; ++ no) kWnn="" ;; ++ *) AC_MSG_ERROR(bad value for --enable-kWnn) ;; ++esac], kWnn="kWnn") ++AC_SUBST(kWnn) ++ ++dnl For a library libwnn ++ ++dnl AC_ARG_WITH(libwnn, ++dnl [ --with-libwnn use installed Wnn library [default=no]], ++dnl [case "${withval}" in ++dnl yes|no) with_libwnn=${withval};; ++dnl *) AC_MSG_ERROR(invalid argument to --with-libwnn) ;; ++dnl esac], with_libwnn=no) ++dnl ++ ++AC_ARG_WITH(libwnn, ++[ --with-libwnn use installed Wnn library [default=no]], ++[ with_libwnn="${withval}" ++AC_ARG_WITH(wnn-includes, ++[ --with-wnn-includes=DIR WNN include files are in DIR], ++[wnnincludedir="-I${withval}"], [wnnincludedir='']) ++AC_ARG_WITH(wnn-libraries, ++[ --with-wnn-libraries=DIR Search for WNN libraries in DIR[default=/usr/local/lib]], ++[wnnlibdir="${withval}"], [wnnlibdir='/usr/local/lib']) ++ if test "X${with_libwnn}" = X-lwnn; then ++ WNNJLIB="-L${wnnlibdir} -lwnn" ++ elif test X"`echo ${with_libwnn} | grep '^/.*'`" != X ; then ++ WNNJLIB="${with_libwnn}" ++ else ++ WNNJLIB="${wnnlibdir}/libwnn.a" ++ fi ++ DEPWNNJLIB="" ++ HINSI_DATA="\$(JWNNWNNDIR)/hinsi.data" ++], ++[ WNNJLIB="\$(WNNJLIBSRC)/libwnn.la" ++ DEPWNNJLIB="\$(WNNJLIB)" ++ HINSI_DATA="\$(WNNJDSRC)/hinsi.data" ++]) ++AC_SUBST(WNNJLIB) ++AC_SUBST(DEPWNNJLIB) ++AC_SUBST(HINSI_DATA) ++ ++AC_ARG_WITH(libcwnn, ++[ --with-libcwnn use installed cWnn library [default=no]], ++[ ++AC_ARG_WITH(cwnn-includes, ++[ --with-cwnn-includes=DIR CWNN include files are in DIR], ++[cwnnincludedir="-I${withval}"], [cwnnincludedir='']) ++AC_ARG_WITH(cwnn-libraries, ++[ --with-cwnn-libraries=DIR Search for CWNN libraries in DIR[default=/usr/local/lib]], ++[cwnnlibdir="${withval}"], [cwnnlibdir='/usr/local/lib']) ++ if test "X${with_libcwnn}" = X-lcwnn; then ++ CWNNJLIB="-L${cwnnlibdir} -lcwnn" ++ elif test X"`echo ${with_libcwnn} | grep '^/.*'`" != X ; then ++ CWNNJLIB="${with_libcwnn}" ++ else ++ CWNNJLIB="${cwnnlibdir}/libcwnn.a" ++ fi ++ DEPCWNNJLIB="" ++ CHINSI_DATA="\$(CWNNWNNDIR)/cixing.data" ++ THINSI_DATA="\$(TWNNTDSRC)/cixing.data" ++], ++[ CWNNJLIB="\$(CWNNJLIBSRC)/libcwnn.la" ++ DEPCWNNJLIB="\$(CWNNJLIB)" ++ CHINSI_DATA="\$(CWNNCDSRC)/cixing.data" ++ THINSI_DATA="\$(TWNNTDSRC)/cixing.data" ++]) ++AC_SUBST(CWNNJLIB) ++AC_SUBST(DEPCWNNJLIB) ++AC_SUBST(CHINSI_DATA) ++AC_SUBST(THINSI_DATA) ++ ++AC_ARG_WITH(libkwnn, ++[ --with-libkwnn use installed kWnn library [default=no]], ++[ ++AC_ARG_WITH(kwnn-includes, ++[ --with-kwnn-includes=DIR KWNN include files are in DIR], ++[kwnnincludedir="-I${withval}"], [kwnnincludedir='']) ++AC_ARG_WITH(kwnn-libraries, ++[ --with-kwnn-libraries=DIR Search for KWNN libraries in DIR[default=/usr/local/lib]], ++[kwnnlibdir="${withval}"], [kwnnlibdir='/usr/local/lib']) ++ if test "X${with_libkwnn}" = X-lkwnn; then ++ KWNNJLIB="-L${kwnnlibdir} -lkwnn" ++ elif test X"`echo ${with_libkwnn} | grep '^/.*'`" != X ; then ++ KWNNJLIB="${with_libkwnn}" ++ else ++ KWNNJLIB="${kwnnlibdir}/libkwnn.a" ++ fi ++ DEPKWNNJLIB="" ++ KHINSI_DATA="\$(KWNNWNNDIR)/hinsi.data" ++], ++[ KWNNJLIB="\$(KWNNJLIBSRC)/libkwnn.la" ++ DEPKWNNJLIB="\$(KWNNJLIB)" ++ KHINSI_DATA="\$(KWNNKDSRC)/hinsi.data" ++]) ++AC_SUBST(KWNNJLIB) ++AC_SUBST(DEPKWNNJLIB) ++AC_SUBST(KHINSI_DATA) + + dnl + dnl Checks for cc and cpp. diff --git a/japanese/FreeWnn-lib/files/patch-ab b/japanese/FreeWnn-lib/files/patch-ab index c811c85af5e8..30db318a07f9 100644 --- a/japanese/FreeWnn-lib/files/patch-ab +++ b/japanese/FreeWnn-lib/files/patch-ab @@ -1,64 +1,29 @@ ---- Wnn/jserver/de.c~ Fri Aug 19 10:31:23 1994 -+++ Wnn/jserver/de.c Fri Mar 10 00:44:42 2000 -@@ -65,6 +65,9 @@ +--- Makefile.in.orig Tue Feb 1 22:18:59 2000 ++++ Makefile.in Tue Aug 29 14:32:22 2000 +@@ -31,13 +31,22 @@ - #include <sys/ioctl.h> + include @top_srcdir@/makerule.mk -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif - #ifdef SYSVR2 - #include <sys/param.h> - #ifndef SIGCHLD -@@ -264,7 +267,16 @@ - fclose(stdin); - fclose(stdout); - if(!noisy){ -+#if !(defined(BSD) && (BSD >= 199306)) /* !4.4BSD-Lite by Taoka */ - fclose(stderr); -+#else /* 4.4BSD-Lite */ -+ int fd = open("/dev/null", O_WRONLY); -+ if (fd < 0) { -+ xerror("Cannot open /dev/null\n"); -+ } -+ dup2(fd, 2); -+ close(fd); -+#endif /* 4.4BSD-Lite */ - } +-WNNDIR = Wnn ++WNNDIR = @Wnn@ - #if defined(hpux) || defined(SOLARIS) -@@ -542,10 +554,14 @@ +-CWNNDIR = cWnn ++CWNNDIR = @cWnn@ - /** **/ - void --gets_cur(cp) -+gets_cur(cp, len) - register char *cp; -+int len; - { -- while((*cp++ = getc_cur()) != '\0'); -+ int i; -+ -+ for (i = 0; i < len; i++) -+ if ((*(cp + i) = getc_cur()) == '\0') break; - } +-KWNNDIR = kWnn ++KWNNDIR = @kWnn@ - /** **/ -@@ -648,6 +664,17 @@ - { - register int c; - while(c= *p++) putc_cur(c); -+ putc_cur(0); -+} +-SUBDIRS= PubdicPlus $(WNNDIR) Contrib/dic/gerodic $(CWNNDIR) $(KWNNDIR) ++LIB_SUBDIRS = ++SEVER_SUBDIRS = ++ ++# PubdicPlus¤ÈContrib/dic/gerodic¤òSERVER_SUBDIRS¤Ë¤Þ¤È¤á¤¤¤È¤³¤í¤À¤¬¡¢ ++# SUBDIRS¤Î½èÍý½ç¤ò¤¦¤Þ¤¯¤·¤Ê¤¤¤ÈWnn/pubdicplus¤Îmake¤Ë¼ºÇÔ¤¹¤ë¤Î¤Ç»ÅÊý ++# ¤Ê¤¤ ++JSERVER_SUBDIRS1 = PubdicPlus ++JSERVER_SUBDIRS2 = Contrib/dic/gerodic + -+/** **/ -+void -+puts_n_cur(p,n) -+char *p; -+int n; -+{ -+ register int c; -+ while((c = *p++) && --n >= 0) putc_cur(c); - putc_cur(0); - } ++SUBDIRS= @JSERVER_SUBDIRS1@ $(WNNDIR) @JSERVER_SUBDIRS2@ $(CWNNDIR) $(KWNNDIR) @SUBDIRS@ + World:: + @echo "" diff --git a/japanese/FreeWnn-lib/files/patch-ac b/japanese/FreeWnn-lib/files/patch-ac new file mode 100644 index 000000000000..1ff09596b5a4 --- /dev/null +++ b/japanese/FreeWnn-lib/files/patch-ac @@ -0,0 +1,15 @@ +--- Wnn/Makefile.in.orig Sun Jan 30 13:32:01 2000 ++++ Wnn/Makefile.in Mon Aug 28 02:12:51 2000 +@@ -53,7 +53,11 @@ + + JLIBV3DIR = jlib.V3 + +-SUBDIRS = $(JDDIR) $(JSERVERDIR) $(JLIBDIR) $(WNNCLIENTSDIR) $(WNNJUTILDIR) $(PUBDICPLUSDIR) $(WNNCONSDIR) $(WNNMANDIR) $(WNNENVDIR) $(JLIBV3DIR) ++LIB_SUBDIRS = $(JDDIR) $(JLIBDIR) $(WNNCLIENTSDIR) $(WNNMANDIR) $(WNNENVDIR) $(JLIBV3DIR) ++ ++SERVER_SUBDIRS = $(JSERVERDIR) $(WNNJUTILDIR) $(PUBDICPLUSDIR) $(WNNCONSDIR) $(WNNMANDIR) ++ ++SUBDIRS = @SUBDIRS@ + + install:: + @for flag in ${MAKEFLAGS} ''; do \ diff --git a/japanese/FreeWnn-lib/files/patch-ad b/japanese/FreeWnn-lib/files/patch-ad new file mode 100644 index 000000000000..36309e2d5793 --- /dev/null +++ b/japanese/FreeWnn-lib/files/patch-ad @@ -0,0 +1,17 @@ +--- cWnn/Makefile.in.orig Sun Jan 30 15:47:47 2000 ++++ cWnn/Makefile.in Tue Aug 29 13:48:56 2000 +@@ -51,7 +51,13 @@ + + WNNMANDIR = man + +-SUBDIRS = $(JLIBDIR) $(CDDIR) $(JSERVERDIR) $(WNNCLIENTSDIR) $(WNNJUTILDIR) $(CDICDIR) $(TDICDIR) $(WNNMANDIR) $(TDDIR) ++LIB_SUBDIRS = $(JLIBDIR) $(CDDIR) $(WNNCLIENTSDIR) $(TDDIR) ++ ++SERVER_SUBDIRS = $(JSERVERDIR) $(WNNJUTILDIR) $(CDICDIR) $(TDICDIR) $(WNNMANDIR) ++ ++SUBDIRS = @SUBDIRS@ ++ ++ALL_SUBDIRS = $(LIB_SUBDIRS) $(SERVER_SUBDIRS) + + install:: + @for flag in ${MAKEFLAGS} ''; do \ diff --git a/japanese/FreeWnn-lib/files/patch-ae b/japanese/FreeWnn-lib/files/patch-ae index 7ea048b9903a..8e0e5584551c 100644 --- a/japanese/FreeWnn-lib/files/patch-ae +++ b/japanese/FreeWnn-lib/files/patch-ae @@ -1,14 +1,25 @@ ---- ./Contrib/dic/gerodic/Makefile.orig Sun Jun 27 00:09:13 1993 -+++ ./Contrib/dic/gerodic/Makefile Tue Jul 29 12:06:28 1997 -@@ -4,8 +4,9 @@ - # Jun. 26th '93 Wnn Consortium - # +--- kWnn/Makefile.in.orig Tue Feb 1 23:12:42 2000 ++++ kWnn/Makefile.in Fri Sep 1 02:54:36 2000 +@@ -39,13 +39,19 @@ --WNNBINDIR=/usr/local/bin/Wnn4 --WNNWNNDIR=/usr/local/lib/wnn -+PREFIX = /usr/local -+WNNBINDIR=${PREFIX}/bin/Wnn4 -+WNNWNNDIR=${PREFIX}/lib/wnn + WNNCLIENTSDIR = conv - WNNOWNER=wnn +-JLIBDIR = romkan jlib ++JLIBDIR = include etc romkan jlib + KDICDIR = kdic + +-KDDIR = include kd ++KDDIR = kd + +-SUBDIRS = $(KDDIR) etc $(JLIBDIR) $(JSERVERDIR) $(WNNCLIENTSDIR) $(WNNJUTILDIR) $(KDICDIR) $(WNNMANDIR) ++LIB_SUBDIRS = $(KDDIR) $(JLIBDIR) $(WNNCLIENTSDIR) ++ ++SERVER_SUBDIRS = $(JSERVERDIR) $(WNNJUTILDIR) $(KDICDIR) $(WNNMANDIR) ++ ++SUBDIRS = @SUBDIRS@ ++ ++ALL_SUBDIRS = $(LIB_SUBDIRS) $(SERVER_SUBDIRS) + + install:: + @for flag in ${MAKEFLAGS} ''; do \ diff --git a/japanese/FreeWnn-lib/files/patch-af b/japanese/FreeWnn-lib/files/patch-af index 577c5210fb5f..d94fbdc19573 100644 --- a/japanese/FreeWnn-lib/files/patch-af +++ b/japanese/FreeWnn-lib/files/patch-af @@ -1,45 +1,13 @@ ---- Wnn/jutil/wnnstat.c.orig Tue Jul 29 01:21:32 1997 -+++ Wnn/jutil/wnnstat.c Tue Jul 29 01:41:42 1997 -@@ -69,7 +69,7 @@ - #define W_DIC_ALL 5 - #define W_VERSION 6 +--- Wnn/man/Makefile.in.~1~ Sun Jan 30 14:36:27 2000 ++++ Wnn/man/Makefile.in Mon Aug 28 02:13:36 2000 +@@ -31,5 +31,9 @@ --#ifdef JAPANSE -+#ifdef JAPANESE - extern int eujis_to_jis8(), eujis_to_sjis(); - #endif - #ifdef CHINESE -@@ -129,13 +129,13 @@ - strcpy(lang, WNN_DEFAULT_LANG); + include @top_srcdir@/makerule.mk + +-SUBDIRS = 2.env 3.libwnn 4.cmd 6.jutil ++LIB_WNNMANDIR = 3.libwnn ++ ++SERVER_WNNMANDIR = 2.env 4.cmd 6.jutil ++ ++SUBDIRS = @WNNMANDIR@ - #ifdef JAPANESE -- while ((c = getopt(argc,argv,"EewdDfFUSJVL:K")) != EOF) { -+ while ((c = getopt(argc,argv,"weEdDfFUSJVL:")) != EOF) { - #endif - #ifdef CHINESE -- while ((c = getopt(argc,argv,"EewdDfFUBCVL:K")) != EOF) { -+ while ((c = getopt(argc,argv,"weEdDfFUBCVL:")) != EOF) { - #endif - # ifdef KOREAN -- while ((c = getopt(argc,argv,"EewdDfFUVL:K")) != EOF) { -+ while ((c = getopt(argc,argv,"weEdDfFUKVL:")) != EOF) { - #endif - switch(c){ - case 'w': -@@ -317,13 +317,13 @@ - usage() - { - #ifdef JAPANESE -- fprintf(stderr, "wnnstat [-weEdDfFKSUJ] [-L lang_name] [server_name]\n"); -+ fprintf(stderr, "wnnstat [-weEdDfFUSJV] [-L lang_name] [server_name]\n"); - #endif /* JAPANESE */ - #ifdef CHINESE -- fprintf(stderr, "wnnstat [-weEdDfFSUJBC] [-L lang_name] [server_name]\n"); -+ fprintf(stderr, "cwnnstat [-weEdDfFUBCV] [-L lang_name] [server_name]\n"); - #endif /* CHINESE */ - #ifdef KOREAN -- fprintf(stderr, "kwnnstat [-weEdDfFKU] [-L lang_name] [server_name]\n"); -+ fprintf(stderr, "kwnnstat [-weEdDfFUKV] [-L lang_name] [server_name]\n"); - #endif /* KOREAN */ - exit(-1); - } diff --git a/japanese/FreeWnn-lib/files/patch-ag b/japanese/FreeWnn-lib/files/patch-ag index d11ee32a427b..ea8f84ae47df 100644 --- a/japanese/FreeWnn-lib/files/patch-ag +++ b/japanese/FreeWnn-lib/files/patch-ag @@ -1,11 +1,79 @@ ---- ./kWnn/kd/uumrc.orig Tue Jun 28 11:29:51 1994 -+++ ./kWnn/kd/uumrc Sat Jul 19 02:48:17 1997 -@@ -8,7 +8,7 @@ - setconvenv @LIBDIR/@LANG/wnnenvrc - setkankanaenv @LIBDIR/@LANG/wnnenvrc_R +--- makerule.mk.in.orig Sun Feb 13 18:15:54 2000 ++++ makerule.mk.in Fri Sep 1 01:18:47 2000 +@@ -39,6 +39,8 @@ + DEPEND = gccmakedep + MKDIRHIER = mkdir -p --setjishopath @LIBDIR/@LANG/dic/pubdic/ -+setjishopath @LIBDIR/@LANG/dic/sys/ - sethindopath @LIBDIR/@LANG/dic/usr/@USR/ ++# for libtool (AM_PROG_LIBTOOL) ++ top_builddir = @abs_top_srcdir@ + + MANDIR = @mandir@/man$(MANSUFFIX) + LIBMANDIR = @mandir@/man$(LIBMANSUFFIX) +@@ -68,6 +70,8 @@ + RANLIB = @RANLIB@ + RANLIBINSTFLAGS = + ++ LIBTOOL = @LIBTOOL@ ++ + RM = rm -f + TBL = tbl + +@@ -145,7 +149,8 @@ + WNNCNVFILEDIR = $(WNNJDSRC)/./bsd + WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC) + WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\" +- WNNJLIB = $(WNNJLIBSRC)/libwnn.a ++ WNNJLIB = @WNNJLIB@ ++ WNNJLIBVERSION = 0:0 + WNNCONVLIB = $(WNNCONVSRC)/libconvkey.a + + CWNNTOP = $(IMTOP)/cWnn +@@ -168,7 +173,8 @@ + CWNNCNVFILEDIR = $(CWNNCDSRC)/./bsd + CWNNINCLUDES = -I$(CWNNINCLUDESRC) -I$(CWNNROMKANMSRC) + CWNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\" +- CWNNJLIB = $(CWNNJLIBSRC)/libcwnn.a ++ CWNNJLIB = @CWNNJLIB@ ++CWNNJLIBVERSION = 0:0 + CWNNCONVLIB = $(CWNNCONVSRC)/libconvkey.a + + KWNNTOP = $(IMTOP)/kWnn +@@ -191,7 +197,8 @@ + KWNNCNVFILEDIR = $(KWNNCDSRC)/./bsd + KWNNINCLUDES = -I$(KWNNINCLUDESRC) -I$(KWNNROMKANMSRC) + KWNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\" +- KWNNJLIB = $(KWNNJLIBSRC)/libkwnn.a ++ KWNNJLIB = @KWNNJLIB@ ++KWNNJLIBVERSION = 0:0 + KWNNCONVLIB = $(KWNNCONVSRC)/libconvkey.a + + TWNNLANG = zh_TW +@@ -245,6 +252,19 @@ + || if [ $$cont -eq 0 ]; then exit 1; fi; \ + done + ++includes:: ++ @cont=0; \ ++ for flag in ${MAKEFLAGS} ''; do \ ++ case "$$flag" in *=*) ;; *[ik]*) cont=1;; esac; done; \ ++ SUBDIRS="$(ALL_SUBDIRS)" ;\ ++ for i in $$SUBDIRS ;\ ++ do \ ++ echo "making" all "in $(CURRENT_DIR)/$$i..."; \ ++ (cd $$i && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ ++ 'CDEBUGFLAGS=$(CDEBUGFLAGS)' includes) \ ++ || if [ $$cont -eq 0 ]; then exit 1; fi; \ ++ done ++ + install:: + @cont=0; \ + for flag in ${MAKEFLAGS} ''; do \ +@@ -328,8 +348,6 @@ + @echo "install.linkkit in $(CURRENT_DIR) done" + + Makefiles:: +- +-includes:: + + depend:: - setuumkey @LIBDIR/@LANG/uumkey diff --git a/japanese/FreeWnn-lib/files/patch-ah b/japanese/FreeWnn-lib/files/patch-ah index fb8ec376e5df..52b33e5af906 100644 --- a/japanese/FreeWnn-lib/files/patch-ah +++ b/japanese/FreeWnn-lib/files/patch-ah @@ -1,39 +1,102 @@ ---- ./kWnn/etc/Imakefile.orig Wed Aug 17 10:11:33 1994 -+++ ./kWnn/etc/Imakefile Sat Jul 19 23:53:01 1997 -@@ -3,4 +3,6 @@ - XCOMM -+XCOMM For Mule, add sources (yincoding.c py_table.c zy_table.c) 1 -+XCOMM -- S. Taoka - #define DoNormalLib YES - - #include <Library.tmpl> -@@ -19,6 +21,9 @@ - xutoj.c \ - dic_atojis.c \ - msg.c \ -+ yincoding.c \ -+ py_table.c \ -+ zy_table.c \ - server_env.c - - OBJS= strings.o \ -@@ -32,6 +37,9 @@ - xutoj.o \ - dic_atojis.o \ - msg.o \ -+ yincoding.o \ -+ py_table.o \ -+ zy_table.o \ - server_env.o - - LibraryObjectRule() -@@ -51,6 +59,9 @@ - LinkSourceFile(xutoj.c,$(WNNETCSRC)) - LinkSourceFile(dic_atojis.c,$(WNNETCSRC)) - LinkSourceFile(msg.c,$(WNNETCSRC)) -+LinkSourceFile(yincoding.c,$(WNNETCSRC)) -+LinkSourceFile(py_table.c,$(WNNETCSRC)) -+LinkSourceFile(zy_table.c,$(WNNETCSRC)) - LinkSourceFile(server_env.c,$(WNNETCSRC)) - - DependTarget() +--- ../Xsi.org/Wnn/jutil/Makefile.in Sun Jan 30 12:50:59 2000 ++++ Wnn/jutil/Makefile.in Thu Aug 31 10:03:49 2000 +@@ -108,72 +108,76 @@ + + all:: $(PROGRAMS) + ++clean:: ++ $(RM) -r .libs ++ $(RM) *.lo *.la ++ + atod: $(OBJATOD) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@ + + clean:: + $(RM) atod + + atof: $(OBJATOF) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@ + + clean:: + $(RM) atof + + wnntouch: $(OBJTOUCH) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@ + + clean:: + $(RM) wnntouch + + dicsort: $(OBJSORT) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT) ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT) + + clean:: + $(RM) dicsort + + oldatonewa: $(OBJOLDTONEW) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJOLDTONEW) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJOLDTONEW) @LIBS@ + + clean:: + $(RM) oldatonewa + + dtoa: $(OBJDTOA) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@ + + clean:: + $(RM) dtoa + +-wnnstat: $(OBJSTAT) $(WNNJLIB) ++wnnstat: $(OBJSTAT) @DEPWNNJLIB@ + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(WNNJLIB) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(WNNJLIB) @LIBS@ + + clean:: + $(RM) wnnstat + +-wnnkill: $(OBJKILL) $(WNNJLIB) ++wnnkill: $(OBJKILL) @DEPWNNJLIB@ + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(WNNJLIB) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(WNNJLIB) @LIBS@ + + clean:: + $(RM) wnnkill + +-wddel: $(OBJWDDEL) $(WNNJLIB) ++wddel: $(OBJWDDEL) @DEPWNNJLIB@ + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(WNNJLIB) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(WNNJLIB) @LIBS@ + + clean:: + $(RM) wddel + +-wdreg: $(OBJWDREG) $(WNNJLIB) ++wdreg: $(OBJWDREG) @DEPWNNJLIB@ + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(WNNJLIB) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(WNNJLIB) @LIBS@ + + clean:: + $(RM) wdreg +@@ -184,7 +188,7 @@ + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \ + for i in $(PROGRAMS); do \ +- (set -x; $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(JWNNBINDIR)); \ ++ (set -x; $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(JWNNBINDIR)); \ + done + + $(OBJ1) : $(SRC1) diff --git a/japanese/FreeWnn-lib/files/patch-ai b/japanese/FreeWnn-lib/files/patch-ai index 87fae7aaadb3..f4f2dd8de246 100644 --- a/japanese/FreeWnn-lib/files/patch-ai +++ b/japanese/FreeWnn-lib/files/patch-ai @@ -1,105 +1,94 @@ ---- kWnn/jlib/Imakefile.orig Wed Aug 17 10:11:40 1994 -+++ kWnn/jlib/Imakefile Tue Jan 5 23:06:15 1999 -@@ -3,5 +3,9 @@ - XCOMM -+XCOMM For Mule, add sources (yincoding.c py_table.c zy_table.c) 1 -+XCOMM -- S. Taoka -+XCOMM - #define DoNormalLib YES -+#define DoSharedLib YES - - #include <Library.tmpl> - -@@ -10,7 +14,9 @@ - LINKS = getopt.c jl.c js.c wnnerrmsg.c - JLIBDEFINES = -DWRITE_CHECK - INCLUDES = -I$(KWNNINCLUDESRC) -I$(TOP) -- DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) $(JLIBDEFINES) -+ DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) $(CWNNLANGDEF) $(JLIBDEFINES) -+XCOMM # for Mule -+XCOMM # -- S. Taoka - INSTALLFLAGS = $(INSTBINFLAGS) - LINTLIBS = - -@@ -28,6 +34,15 @@ - OBJ4= strings.o - SRC5= $(KWNNETCSRC)/bcopy.c - OBJ5= bcopy.o -+SRC6= $(KWNNETCSRC)/yincoding.c -+XCOMM for Mule -+XCOMM -- S. Taoka -+OBJ6= yincoding.o -+SRC7= $(KWNNETCSRC)/py_table.c -+OBJ7= py_table.o -+SRC8= $(KWNNETCSRC)/zy_table.c -+OBJ8= zy_table.o -+ - LOCAL_RKSRCS= $(KWNNROMKANSRC)/rk_bltinfn.c \ - $(KWNNROMKANSRC)/rk_main.c \ - $(KWNNROMKANSRC)/rk_modread.c \ -@@ -40,13 +55,26 @@ - $(KWNNROMKANSRC)/rk_read.o \ - $(KWNNROMKANSRC)/rk_vars.o - --LOCAL_ETCSRCS = $(SRC4) $(SRC5) --LOCAL_ETCOBJS = $(OBJ4) $(OBJ5) -+UNSHARED_LOCAL_RKOBJS= $(KWNNROMKANSRC)/unshared/rk_bltinfn.o \ -+ $(KWNNROMKANSRC)/unshared/rk_main.o \ -+ $(KWNNROMKANSRC)/unshared/rk_modread.o \ -+ $(KWNNROMKANSRC)/unshared/rk_read.o \ -+ $(KWNNROMKANSRC)/unshared/rk_vars.o -+ -+LOCAL_ETCSRCS = $(SRC4) $(SRC5) $(SRC6) $(SRC7) $(SRC8) -+LOCAL_ETCOBJS = $(OBJ4) $(OBJ5) $(OBJ6) $(OBJ7) $(OBJ8) - SRCS= $(SRC1) $(SRC3) $(LOCAL_ETCSRCS) - OBJS= $(OBJ1) $(OBJ3) $(LOCAL_ETCOBJS) $(LOCAL_RKOBJS) -+UNSHAREDOBJS= $(OBJ1) $(OBJ3) $(LOCAL_ETCOBJS) $(UNSHARED_LOCAL_RKOBJS) +--- ../Xsi.org/cWnn/jutil/Makefile.in Sun Jan 30 14:54:49 2000 ++++ cWnn/jutil/Makefile.in Thu Aug 31 10:07:33 2000 +@@ -108,65 +108,69 @@ + + all:: $(PROGRAMS) + ++clean:: ++ $(RM) -r .libs ++ $(RM) *.lo *.la + -+SOKWNN4LIBREV=1.0 + catod: $(OBJATOD) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@ - LibraryObjectRule() -+#if DoSharedLib -+AllTarget($(OBJS) libkwnn.a libkwnn4.so.$(SOKWNN4LIBREV)) -+#else - AllTarget($(OBJS) libkwnn.a) -+#endif + clean:: + $(RM) catod - includes:: $(LINKS) + catof: $(OBJATOF) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@ -@@ -65,11 +93,19 @@ + clean:: + $(RM) catof - NormalLintTarget($(SRC2)) + cwnntouch: $(OBJTOUCH) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@ --NormalLibraryTarget(kwnn,$(OBJS)) -+#if DoSharedLib -+SharedLibraryTarget(kwnn4,$(SOKWNN4LIBREV),$(OBJS),.,.) -+#endif -+ -+UnsharedLibraryTarget(kwnn,$(UNSHAREDOBJS),unshared,..) - LintLibraryTarget(kwnn,$(SRCS)) + clean:: + $(RM) cwnntouch - instlib:: install + cdicsort: $(OBJSORT) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT) ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT) -+#if DoSharedLib -+InstallSharedLibrary(kwnn4,$(SOKWNN4LIBREV),$(WNNLIBDIR)) -+#endif -+ - InstallLibrary(kwnn,$(WNNLIBDIR)) - - #if ProfileLibJlib -@@ -77,9 +113,12 @@ - InstallLibrary(kwnn_p,$(WNNLIBDIR)) - #endif - --WnnSpecialObjectRule($(OBJ3),$(SRC3),$(KWNNETCSRC),) --WnnSpecialObjectRule($(OBJ4),$(SRC4),$(KWNNETCSRC),) --WnnSpecialObjectRule($(OBJ5),$(SRC5),$(KWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ3),$(SRC3),$(KWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ4),$(SRC4),$(KWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ5),$(SRC5),$(KWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ6),$(SRC6),$(KWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ7),$(SRC7),$(KWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ8),$(SRC8),$(KWNNETCSRC),) - - $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS) - @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ + clean:: + $(RM) cdicsort + + cdtoa: $(OBJDTOA) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@ + + clean:: + $(RM) cdtoa + +-cwnnstat: $(OBJSTAT) $(CWNNJLIB) ++cwnnstat: $(OBJSTAT) @DEPCWNNJLIB@ + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(CWNNJLIB) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(CWNNJLIB) @LIBS@ + + clean:: + $(RM) cwnnstat + +-cwnnkill: $(OBJKILL) $(CWNNJLIB) ++cwnnkill: $(OBJKILL) @DEPCWNNJLIB@ + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(CWNNJLIB) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(CWNNJLIB) @LIBS@ + + clean:: + $(RM) cwnnkill + +-cwddel: $(OBJWDDEL) $(CWNNJLIB) ++cwddel: $(OBJWDDEL) @DEPCWNNJLIB@ + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(CWNNJLIB) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(CWNNJLIB) @LIBS@ + + clean:: + $(RM) cwddel + +-cwdreg: $(OBJWDREG) $(CWNNJLIB) ++cwdreg: $(OBJWDREG) @DEPCWNNJLIB@ + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(CWNNJLIB) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(CWNNJLIB) @LIBS@ + + clean:: + $(RM) cwdreg +@@ -324,7 +328,7 @@ + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \ + for i in $(PROGRAMS); do \ +- (set -x; $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(CWNNBINDIR)); \ ++ (set -x; $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(CWNNBINDIR)); \ + done + + $(OBJ1) : $(SRC1) diff --git a/japanese/FreeWnn-lib/files/patch-aj b/japanese/FreeWnn-lib/files/patch-aj index 53e082d82d66..ffae7afdfd44 100644 --- a/japanese/FreeWnn-lib/files/patch-aj +++ b/japanese/FreeWnn-lib/files/patch-aj @@ -1,28 +1,94 @@ ---- ./Wnn/jlib.V3/Imakefile.orig Wed Aug 17 10:10:13 1994 -+++ ./Wnn/jlib.V3/Imakefile Fri Aug 1 14:11:09 1997 -@@ -19,6 +19,10 @@ - OBJ3= sstrings.o - SRCS= $(SRC1) $(SRC2) $(SRC3) - OBJS= $(OBJ1) $(OBJ2) $(OBJ3) -+SRC4= $(WNNETCSRC)/xutoj.c -+OBJ4= xutoj.o -+SRCS= $(SRC1) $(SRC2) $(SRC3) $(SRC4) -+OBJS= $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) - - LibraryObjectRule() - -@@ -31,7 +35,7 @@ - - LintLibraryTarget(jd,$(SRCS)) - InstallLibrary(jd,$(WNNLIBDIR)) --InstallNonExecFile($(WNNINCLUDESRC)/jlib.h,$(JWNNINCDIR)) -+InstallNonExecFile(jlib.h,$(JWNNINCDIR)) - - #if DebugLibJd - DebuggedLibraryTarget(jd,$(OBJS)) -@@ -42,4 +46,5 @@ - - WnnSpecialObjectRule($(OBJ2),$(SRC2),$(WNNETCSRC),) - WnnSpecialObjectRule($(OBJ3),$(SRC3),$(WNNETCSRC),) -+WnnSpecialObjectRule($(OBJ4),$(SRC4),$(WNNETCSRC),) - DependTarget() +--- ../Xsi.org/kWnn/jutil/Makefile.in Sun Jan 30 16:02:26 2000 ++++ kWnn/jutil/Makefile.in Thu Aug 31 10:10:02 2000 +@@ -105,65 +105,69 @@ + + all:: $(PROGRAMS) + ++clean:: ++ $(RM) -r .libs ++ $(RM) *.lo *.la ++ + katod: $(OBJATOD) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@ + + clean:: + $(RM) katod + + katof: $(OBJATOF) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@ + + clean:: + $(RM) katof + + kwnntouch: $(OBJTOUCH) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@ + + clean:: + $(RM) kwnntouch + + kdicsort: $(OBJSORT) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT) ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT) + + clean:: + $(RM) kdicsort + + kdtoa: $(OBJDTOA) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@ + + clean:: + $(RM) kdtoa + +-kwnnstat: $(OBJSTAT) $(KWNNJLIB) ++kwnnstat: $(OBJSTAT) @DEPKWNNJLIB@ + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(KWNNJLIB) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(KWNNJLIB) @LIBS@ + + clean:: + $(RM) kwnnstat + +-kwnnkill: $(OBJKILL) $(KWNNJLIB) ++kwnnkill: $(OBJKILL) @DEPKWNNJLIB@ + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(KWNNJLIB) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(KWNNJLIB) @LIBS@ + + clean:: + $(RM) kwnnkill + +-kwddel: $(OBJWDDEL) $(KWNNJLIB) ++kwddel: $(OBJWDDEL) @DEPKWNNJLIB@ + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(KWNNJLIB) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(KWNNJLIB) @LIBS@ + + clean:: + $(RM) kwddel + +-kwdreg: $(OBJWDREG) $(KWNNJLIB) ++kwdreg: $(OBJWDREG) @DEPKWNNJLIB@ + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(KWNNJLIB) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(KWNNJLIB) @LIBS@ + + clean:: + $(RM) kwdreg +@@ -321,7 +325,7 @@ + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \ + for i in $(PROGRAMS); do \ +- (set -x; $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(KWNNBINDIR)); \ ++ (set -x; $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(KWNNBINDIR)); \ + done + + $(OBJ1) : $(SRC1) diff --git a/japanese/FreeWnn-lib/files/patch-ak b/japanese/FreeWnn-lib/files/patch-ak index 407a45f207c7..10c85c559fba 100644 --- a/japanese/FreeWnn-lib/files/patch-ak +++ b/japanese/FreeWnn-lib/files/patch-ak @@ -1,160 +1,11 @@ ---- Wnn/uum/jhlp.c.orig Thu Mar 9 16:34:56 2000 -+++ Wnn/uum/jhlp.c Thu Mar 9 16:44:26 2000 -@@ -80,6 +80,9 @@ - - jmp_buf kk_env; - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif - #ifdef SYSVR2 - # include <sys/param.h> - #endif /* SYSVR2 */ -@@ -168,12 +171,14 @@ - - strcpy(username, getpwuid(getuid())->pw_name); - if((name = getenv(WNN_USERNAME_ENV)) != NULL){ -- strcpy(username, name); -+ strncpy(username, name, PATHNAMELEN - 1); -+ username[PATHNAMELEN - 1] = '\0'; - } - for (i = 1; i < argc;) { - if (!strcmp(argv[i++], "-L")) { - if (i >= argc || argv[i][0] == '-') default_usage(); -- strcpy(lang_dir, argv[i++]); -+ strncpy(lang_dir, argv[i++], 31); -+ lang_dir[31] = '\0'; - for (;i < argc; i++) { - argv[i - 2] = argv[i]; - } -@@ -233,8 +238,9 @@ - server_env = WNN_DEF_SERVER_ENV; - } - if(name = getenv(server_env)) { -- strcpy(def_servername, name); -- strcpy(def_reverse_servername, name); -+ strncpy(def_servername, name, PATHNAMELEN - 1); -+ def_servername[PATHNAMELEN - 1] = '\0'; -+ strcpy(def_reverse_servername, def_servername); - } - } - -@@ -263,9 +269,11 @@ - - - #if defined(BSD42) && !defined(DGUX) -+#if !(defined(BSD) && (BSD >= 199306)) - if (saveutmp() < 0) { - puts("Can't save utmp\n"); - } -+#endif - #endif /* BSD42 */ - - -@@ -492,7 +500,8 @@ - - static int do_k_opt() - { -- strcpy(uumkey_name_in_uumrc, optarg); -+ strncpy(uumkey_name_in_uumrc, optarg, PATHNAMELEN - 1); -+ uumkey_name_in_uumrc[PATHNAMELEN - 1] = '\0'; - if (*uumkey_name_in_uumrc == '\0') { - return -1; - } -@@ -502,7 +511,8 @@ - - static int do_c_opt() - { -- strcpy(convkey_name_in_uumrc, optarg); -+ strncpy(convkey_name_in_uumrc, optarg, PATHNAMELEN - 1); -+ convkey_name_in_uumrc[PATHNAMELEN - 1] = '\0'; - if (*convkey_name_in_uumrc == '\0') { - return -1; - } -@@ -512,7 +522,8 @@ - - static int do_r_opt() - { -- strcpy(rkfile_name_in_uumrc, optarg); -+ strncpy(rkfile_name_in_uumrc, optarg, PATHNAMELEN - 1); -+ rkfile_name_in_uumrc[PATHNAMELEN - 1] = '\0'; - if (*rkfile_name_in_uumrc == '\0') { - return -1; - } -@@ -528,8 +539,9 @@ - - static int do_D_opt() - { -- strcpy(def_servername, optarg); -- strcpy(def_reverse_servername, optarg); -+ strncpy(def_servername, optarg, PATHNAMELEN - 1); -+ def_servername[PATHNAMELEN - 1] = '\0'; -+ strcpy(def_reverse_servername, def_servername); - if (*def_servername == '\0') { - return -1; - } -@@ -538,7 +550,8 @@ - - static int do_n_opt() - { -- strcpy(username, optarg); -+ strncpy(username, optarg, PATHNAMELEN - 1); -+ username[PATHNAMELEN - 1] = '\0'; - if (*username == '\0') { - return -1; - } -@@ -771,7 +784,12 @@ - #endif - int pid; - -- if ((pid = wait3(&status, WNOHANG | WUNTRACED, NULL)) == child_id) { -+/* -+ * Remove warning. -+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20 -+ */ -+/* if ((pid = wait3(&status, WNOHANG | WUNTRACED, NULL)) == child_id) { */ -+ if ((pid = wait3((int *)&status, WNOHANG | WUNTRACED, NULL)) == child_id) { - if (WIFSTOPPED(status)) { - #ifdef SIGCONT - kill(pid, SIGCONT); -@@ -1140,9 +1158,11 @@ - setpgrp(0, pid); - #endif /* BSD42 */ - -+#if !(defined(BSD) && (BSD >= 199306)) - if (setutmp(ttypfd) == ERROR) { - puts("Can't set utmp."); - } -+#endif - - #ifdef linux - setsid(); -@@ -1562,9 +1582,11 @@ - perror(prog); - } - -+#if !(defined(BSD) && (BSD >= 199306)) - if (resetutmp(ttypfd) == ERROR) { - printf("Can't reset utmp."); - } -+#endif - #ifdef TIOCSSIZE - pty_rowcol.ts_lines = 0; - pty_rowcol.ts_cols = 0; -@@ -1636,7 +1658,16 @@ - char *b, *pty; - int no; - { -+/* -+ * Change pseudo-devices. -+ * Because FreeBSD's master pseudo-devices are pty[p-sP-S][0-9a-v]. -+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20 -+ */ -+#if (defined(BSD) && (BSD >= 199306)) /* 4.4BSD-Lite by Taoka */ -+ sprintf(b, "%s%1c%1c", pty, "pqrsPQRS"[(no >> 5)], ((no & 0x1f > 9)? 'a' : '0') + (no & 0x1f)); -+#else /* ! 4.4BSD-Lite */ - sprintf(b, "%s%1c%1x", pty, 'p' + (no >> 4), no & 0x0f); -+#endif /* ! 4.4BSD-Lite */ - } - #endif /* !sgi */ +--- Wnn/wnncons/dic/Makefile.in.~1~ Sun Jan 30 12:47:39 2000 ++++ Wnn/wnncons/dic/Makefile.in Tue Aug 29 09:19:40 2000 +@@ -36,7 +36,7 @@ + INSTALLFLAGS = $(INSTLIBFLAGS) -o $(WNNOWNER) + ATOD = $(WNNJUTILSRC)/atod + WNNTOUCH = $(WNNJUTILSRC)/wnntouch +- HINSI = $(WNNJDSRC)/hinsi.data ++ HINSI = @HINSI_DATA@ + + LINKS = tankan2.u tankan3.u diff --git a/japanese/FreeWnn-lib/files/patch-al b/japanese/FreeWnn-lib/files/patch-al index d4423556f7af..cf45f9e59562 100644 --- a/japanese/FreeWnn-lib/files/patch-al +++ b/japanese/FreeWnn-lib/files/patch-al @@ -1,20 +1,11 @@ ---- ./Wnn/jlib.V3/jlib.h.orig Tue Sep 17 06:30:30 1991 -+++ ./Wnn/jlib.V3/jlib.h Fri Sep 5 21:37:24 1997 -@@ -51,12 +51,14 @@ - /* - Nihongo Henkan Library Header File - */ --/* - #include <setjmp.h> --*/ -- - - #define w_char unsigned short -+#ifndef WCHAR_T -+#define wchar_t w_char -+#define wchar w_char -+#define WCHAR_T -+#endif - - #define JLIB +--- Wnn/pubdicplus/Makefile.in.~1~ Sun Jan 30 12:49:35 2000 ++++ Wnn/pubdicplus/Makefile.in Tue Aug 29 09:25:58 2000 +@@ -37,7 +37,7 @@ + ATOD = $(WNNJUTILSRC)/atod + ATOF = $(WNNJUTILSRC)/atof + WNNTOUCH = $(WNNJUTILSRC)/wnntouch +- HINSI = $(WNNJDSRC)/hinsi.data ++ HINSI = @HINSI_DATA@ + FZK_FLAG = + LINKS = Version bio.hd bio.u chimei.hd chimei.u computer.hd computer.u fzk.attr fzk.con fzk.fzkattr fzk.jirattr fzk.jircon fzk.master fzk.shuutan jinmei.hd jinmei.u kihon.hd kihon.u koyuu.hd koyuu.u setsuji.hd setsuji.u special.hd special.u symbol.hd symbol.u tankan.hd tankan.u diff --git a/japanese/FreeWnn-lib/files/patch-am b/japanese/FreeWnn-lib/files/patch-am new file mode 100644 index 000000000000..62819bda9ca8 --- /dev/null +++ b/japanese/FreeWnn-lib/files/patch-am @@ -0,0 +1,11 @@ +--- cWnn/cdic/Makefile.in.~1~ Sun Sep 12 23:01:35 1999 ++++ cWnn/cdic/Makefile.in Tue Aug 29 09:31:05 2000 +@@ -30,7 +30,7 @@ + ATOD = $(CWNNJUTILSRC)/catod + ATOF = $(CWNNJUTILSRC)/catof + WNNTOUCH = $(CWNNJUTILSRC)/cwnntouch +- HINSI = $(CWNNCDSRC)/cixing.data ++ HINSI = @CHINSI_DATA@ + # HINSI = ./cixing.data + FZK_FLAG = + diff --git a/japanese/FreeWnn-lib/files/patch-an b/japanese/FreeWnn-lib/files/patch-an index 3d1848c7f010..d8948ce74626 100644 --- a/japanese/FreeWnn-lib/files/patch-an +++ b/japanese/FreeWnn-lib/files/patch-an @@ -1,55 +1,11 @@ ---- Xwnmo/xwnmo/client.c.~1~ Mon Aug 23 11:06:16 1993 -+++ Xwnmo/xwnmo/client.c Fri Feb 6 06:44:03 1998 -@@ -53,7 +53,7 @@ - { - char *p; - char ret = '\0'; -- extern char *index(); -+/* extern char *index();*/ - - if ((p = romkan_dispmode()) == NULL) return(ret); - if ((p = (char*)index(p, ':')) == NULL) return(ret); ---- Xwnmo/xwnmo/screen.c.~1~ Tue Dec 1 15:10:57 1992 -+++ Xwnmo/xwnmo/screen.c Fri Feb 6 06:48:15 1998 -@@ -361,7 +361,7 @@ - get_rk_modes() - { - char *p; -- extern char *index(); -+/* extern char *index();*/ - - strcpy(rk_modes, (NULL == (p = romkan_dispmode()) ? "[ ]" : p)); - if ((p = (char*)index(rk_modes, ':')) != NULL && *(p + 1)) { ---- Xwnmo/xwnmo/jhlp.c.~1~ Thu Aug 4 16:10:14 1994 -+++ Xwnmo/xwnmo/jhlp.c Fri Feb 6 06:50:24 1998 -@@ -415,7 +415,7 @@ - XLCd xlc; - #endif /* X11R5 */ - extern char *get_server_env(); -- extern char *index(); -+/* extern char *index(); */ - - prgname = argv[0]; - if (create_arg_string(argv, argc) == -1) exit(1); ---- Xwnmo/xjutil/init_w.c.~1~ Thu Aug 4 16:10:10 1994 -+++ Xwnmo/xjutil/init_w.c Fri Feb 6 07:54:48 1998 -@@ -76,7 +76,7 @@ - char *p; - char ret = '\0'; - #ifndef SYSVR2 -- extern char *index(); -+/* extern char *index(); */ - #else - extern char *strchr(); - #endif ---- Xwnmo/xjutil/kensaku.c.~1~ Tue Dec 1 14:59:48 1992 -+++ Xwnmo/xjutil/kensaku.c Fri Feb 6 07:58:54 1998 -@@ -154,7 +154,7 @@ - static char message4[2048]; - int ret; - char *table_t[6]; -- extern int qsort(); -+/* extern int qsort();*/ - - if (get_env() == -1) return(NULL); +--- cWnn/tdic/Makefile.in.~1~ Sun Sep 12 23:01:35 1999 ++++ cWnn/tdic/Makefile.in Tue Aug 29 09:32:37 2000 +@@ -30,7 +30,7 @@ + ATOD = $(CWNNJUTILSRC)/catod + ATOF = $(CWNNJUTILSRC)/catof + WNNTOUCH = $(CWNNJUTILSRC)/cwnntouch +- HINSI = $(TWNNTDSRC)/cixing.data ++ HINSI = @THINSI_DATA@ + # HINSI = ./cixing.data + FZK_FLAG = diff --git a/japanese/FreeWnn-lib/files/patch-ao b/japanese/FreeWnn-lib/files/patch-ao index c3aa020ff065..04195d764537 100644 --- a/japanese/FreeWnn-lib/files/patch-ao +++ b/japanese/FreeWnn-lib/files/patch-ao @@ -1,81 +1,11 @@ -diff -ru Wnn.org/jd/jserverrc Wnn/jd/jserverrc ---- Wnn.org/jd/jserverrc Mon Sep 6 10:47:31 1993 -+++ Wnn/jd/jserverrc Tue Feb 10 07:58:43 1998 -@@ -20,7 +20,9 @@ - ;readfile wnncons/tankan3.dic - - ; n nbun hindo len jiri flag jisho sbn dbn_len sbn_cnt suji kana eisuu kigou toji fuzoku kai --def_param 2 10 2 40 100 200 20 1 40 -40 40 -100 40 80 40 100 40 -+;def_param 2 10 2 40 100 200 20 1 40 -40 40 -100 40 80 40 100 40 -+; New Parameter -+def_param 2 10 2 45 100 200 5 1 40 -100 200 -100 200 80 200 200 200 - - ;set_giji_eisuu '-' '_' 0x20 \x5c ^M 'ÊÑ' 1234 012 \o12 - set_giji_eisuu '-' '_' 0x20 '¡½' '¡²' '¡±' '!' '?' '.' ',' ':' ';' '¡§' '¡¨' '¡©' '¡ª' '¡¤' '¡¥' '¡¦' -diff -ru Wnn.org/jd/wnnenvrc.omr Wnn/jd/wnnenvrc.omr ---- Wnn.org/jd/wnnenvrc.omr Mon Sep 6 10:47:34 1993 -+++ Wnn/jd/wnnenvrc.omr Tue Feb 10 07:58:56 1998 -@@ -19,4 +19,7 @@ - ;setdic wnncons/tankan3.dic - 1 1 1 - - 0 - - ;; N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko --setparam 2 10 2 40 100 200 20 1 40 -40 40 -100 40 80 40 100 40 -+;setparam 2 10 2 40 100 200 20 1 40 -40 40 -100 40 80 40 100 40 -+; New Parameter -+setparam 2 10 2 45 100 200 5 1 40 -100 200 -100 200 80 200 200 200 -+ -diff -ru Wnn.org/jd/wnnenvrc.rem Wnn/jd/wnnenvrc.rem ---- Wnn.org/jd/wnnenvrc.rem Mon Sep 6 10:47:36 1993 -+++ Wnn/jd/wnnenvrc.rem Tue Feb 10 07:59:06 1998 -@@ -19,4 +19,6 @@ - ;setdic wnncons/tankan3.dic - 1 1 1 - - 0 - - ;; N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko --setparam 2 10 2 40 100 200 20 1 40 -40 40 -100 40 80 40 100 40 -+;setparam 2 10 2 40 100 200 20 1 40 -40 40 -100 40 80 40 100 40 -+; New Parameter -+setparam 2 10 2 45 100 200 5 1 40 -100 200 -100 200 80 200 200 200 -diff -ru Wnn.org/jd/wnnenvrc.rev Wnn/jd/wnnenvrc.rev ---- Wnn.org/jd/wnnenvrc.rev Mon Sep 6 10:47:37 1993 -+++ Wnn/jd/wnnenvrc.rev Tue Feb 10 07:59:15 1998 -@@ -19,4 +19,6 @@ - ;setdic wnncons/tankan3.dic !@WNN_DIC_DIR/wnncons/tankan3.frq 1 1 1 - - 0 - - ;; N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko --setparam 2 10 2 40 100 200 20 1 40 -40 40 -100 40 80 40 100 40 -+;setparam 2 10 2 40 100 200 20 1 40 -40 40 -100 40 80 40 100 40 -+; New Parameter -+setparam 2 10 2 45 100 200 5 1 40 -100 200 -100 200 80 200 200 200 -diff -ru Wnn.org/jd/wnnenvrc_R.omr Wnn/jd/wnnenvrc_R.omr ---- Wnn.org/jd/wnnenvrc_R.omr Wed Aug 25 15:11:40 1993 -+++ Wnn/jd/wnnenvrc_R.omr Tue Feb 10 07:59:24 1998 -@@ -19,4 +19,6 @@ - ;setdic wnncons/tankan3.dic - 1 1 1 - - 1 - - ;; N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko --setparam 2 10 2 45 1 80 5 1 50 -20 400 -10 100 -100 200 0 200 -+;setparam 2 10 2 45 1 80 5 1 50 -20 400 -10 100 -100 200 0 200 -+; New Parameter -+setparam 2 10 2 45 100 200 5 1 40 -100 200 -100 200 80 200 200 200 -diff -ru Wnn.org/jd/wnnenvrc_R.rem Wnn/jd/wnnenvrc_R.rem ---- Wnn.org/jd/wnnenvrc_R.rem Wed Aug 25 15:11:48 1993 -+++ Wnn/jd/wnnenvrc_R.rem Tue Feb 10 07:59:34 1998 -@@ -19,4 +19,6 @@ - ;setdic wnncons/tankan3.dic - 1 1 1 - - 1 - - ;; N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko --setparam 2 10 2 45 1 80 5 1 50 -20 400 -10 100 -100 200 0 200 -+;setparam 2 10 2 45 1 80 5 1 50 -20 400 -10 100 -100 200 0 200 -+; New Parameter -+setparam 2 10 2 45 100 200 5 1 40 -100 200 -100 200 80 200 200 200 -diff -ru Wnn.org/jd/wnnenvrc_R.rev Wnn/jd/wnnenvrc_R.rev ---- Wnn.org/jd/wnnenvrc_R.rev Wed Aug 25 15:11:54 1993 -+++ Wnn/jd/wnnenvrc_R.rev Tue Feb 10 07:59:42 1998 -@@ -19,4 +19,6 @@ - ;setdic wnncons/tankan3.dic - 1 1 1 - - 1 - - ;; N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko --setparam 2 10 2 45 1 80 5 1 50 -20 400 -10 100 -100 200 0 200 -+;setparam 2 10 2 45 1 80 5 1 50 -20 400 -10 100 -100 200 0 200 -+; New Parameter -+setparam 2 10 2 45 100 200 5 1 40 -100 200 -100 200 80 200 200 200 +--- kWnn/kdic/Makefile.in.~1~ Sun Sep 12 23:01:35 1999 ++++ kWnn/kdic/Makefile.in Tue Aug 29 09:34:33 2000 +@@ -29,7 +29,7 @@ + ATOD = $(KWNNJUTILSRC)/katod + ATOF = $(KWNNJUTILSRC)/katof + WNNTOUCH = $(KWNNJUTILSRC)/kwnntouch +- HINSI = $(KWNNKDSRC)/hinsi.data ++ HINSI = @KHINSI_DATA@ + FZK_FLAG = + + INSTALLFLAGS = -m 644 -o $(WNNOWNER) diff --git a/japanese/FreeWnn-lib/files/patch-ap b/japanese/FreeWnn-lib/files/patch-ap index 17495e11a56e..0add98f308f1 100644 --- a/japanese/FreeWnn-lib/files/patch-ap +++ b/japanese/FreeWnn-lib/files/patch-ap @@ -1,25 +1,82 @@ ---- Imakefile.~1~ Tue Oct 4 08:18:46 1994 -+++ Imakefile Tue Feb 10 11:29:58 1998 -@@ -4,7 +4,7 @@ - #define IHaveSubdirs - #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' - --#if BuildWnn || BuildXwnmo -+#if BuildWnn - WNNDIR = Wnn - #endif - #if BuildCWnn ---- ./Xwnmo/jd/ximconf.~1~ Thu Feb 12 10:20:17 1998 -+++ ./Xwnmo/jd/ximconf Thu Feb 12 10:32:59 1998 -@@ -18,8 +18,8 @@ - zh_TW zh_TW.ucns 2,1,2 True Yincoding - zh_CN.eucCN|zh_CN.ugb \ - zh_CN zh_CN.ugb 2,1,2 True Yincoding --ja|ja_JP.eucJP|ja_JP.ujis|ja_JP.mscode|ja_JP.SJIS|ja_JP.jis8|ja_JP.jis7|ja_JP.pjis \ -- ja_JP ja_JP.ujis 2,1,2 True Normal -+ja|ja_JP.EUC|ja_JP.eucJP|ja_JP.ujis|ja_JP.mscode|ja_JP.SJIS|ja_JP.jis8|ja_JP.jis7|ja_JP.pjis \ -+ ja_JP ja_JP.EUC 2,1,2 True Normal - --setdefaultlocale ja_JP.ujis -+setdefaultlocale ja_JP.EUC - setworldlocale wr_WR.ct +--- Wnn/jlib/Makefile.in.orig Tue Mar 21 01:21:11 2000 ++++ Wnn/jlib/Makefile.in Fri Sep 1 01:25:52 2000 +@@ -81,11 +81,13 @@ + + .c.o: + $(RM) $@ +- $(CC) -c $(CFLAGS) $(_NOOP_) $*.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c + + clean:: ++ $(RM) -r .libs ++ $(RM) *.lo *.la + +-all:: $(OBJS) libwnn.a ++all:: $(OBJS) libwnn.la + + all:: libgetopt.a + +@@ -109,17 +111,15 @@ + + kankana: kankana.o + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) kankana.o $(WNNJLIB) ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) kankana.o $(WNNJLIB) + + clean:: + $(RM) kankana + +-all:: libwnn.a ++all:: libwnn.la + +-libwnn.a: $(OBJS) $(EXTRALIBRARYDEPS) +- $(RM) $@ +- $(AR) $@ $(OBJS) +- $(RANLIB) $@ ++libwnn.la: $(OBJS) $(EXTRALIBRARYDEPS) ++ $(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(DESTDIR)$(WNNLIBDIR) -version-info $(WNNJLIBVERSION) + + lintlib:: llib-lwnn.ln + +@@ -129,32 +129,31 @@ + + instlib:: install + +-install:: libwnn.a ++install:: libwnn.la + @if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi +- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libwnn.a $(DESTDIR)$(WNNLIBDIR) +- $(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(WNNLIBDIR)/libwnn.a ++ $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libwnn.la $(DESTDIR)$(WNNLIBDIR) + + $(OBJ3) : $(SRC3) +- $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c + + $(OBJ4) : $(SRC4) +- $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c + + $(OBJ5) : $(SRC5) +- $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c + + $(OBJ6) : $(SRC6) +- $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c + + $(OBJ7) : $(SRC7) +- $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c + + $(OBJ8) : $(SRC8) +- $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c + + $(OBJ9) : $(SRC9) +- $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c + + $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS) + @case '${MFLAGS}' in *[ik]*) set +e;; esac; cd $(WNNROMKANSRC); echo "making all in $(WNNROMKANSRC)"; $(MAKE) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(MFLAGS) diff --git a/japanese/FreeWnn-lib/files/patch-aq b/japanese/FreeWnn-lib/files/patch-aq index d476242347bd..c50f5ac01581 100644 --- a/japanese/FreeWnn-lib/files/patch-aq +++ b/japanese/FreeWnn-lib/files/patch-aq @@ -1,26 +1,80 @@ ---- Xwnmo/xwnmo/localalloc.c.~1~ Tue Dec 1 15:10:40 1992 -+++ Xwnmo/xwnmo/localalloc.c Thu Jun 25 12:11:29 1998 -@@ -112,6 +112,7 @@ - { - char *ptr; - if (size == 0) return(NULL); -+ size += (sizeof(char *)-(size%sizeof(char *))); - if ((ptr = malloc(size)) == NULL) { - #ifdef ALLOC_DEBUG - print_out1("alloc failed with size = %d", size); -@@ -134,6 +135,7 @@ - unsigned size; - { - if (size == 0) return(ptr); -+ size += (sizeof(char *)-(size%sizeof(char *))); - if (ptr == NULL) return(Malloc(size)); - #ifdef ALLOC_DEBUG - unregister_debug(ptr); -@@ -153,6 +155,7 @@ - { - char *ptr; - if (size == 0) return(NULL); -+ size += (sizeof(char *)-(size%sizeof(char *))); - if ((ptr = calloc(num, size)) == NULL) { - return(NULL); - } +--- Wnn/jlib.V3/Makefile.in.orig Fri Jan 21 01:00:28 2000 ++++ Wnn/jlib.V3/Makefile.in Fri Sep 1 10:21:03 2000 +@@ -51,8 +51,24 @@ + OBJ3= sstrings.o + SRC4= $(WNNETCSRC)/xutoj.c + OBJ4= xutoj.o ++LOCAL_RKSRCS= $(WNNROMKANSRC)/rk_bltinfn.c $(WNNROMKANSRC)/rk_main.c $(WNNROMKANSRC)/rk_modread.c $(WNNROMKANSRC)/rk_read.c $(WNNROMKANSRC)/rk_vars.c ++ ++LOCAL_RKOBJS= $(WNNROMKANSRC)/rk_bltinfn.o $(WNNROMKANSRC)/rk_main.o $(WNNROMKANSRC)/rk_modread.o $(WNNROMKANSRC)/rk_read.o $(WNNROMKANSRC)/rk_vars.o ++ ++LOCAL_ETCSRCS= $(WNNETCSRC)/msg.c $(WNNETCSRC)/yincoding.c $(WNNETCSRC)/py_table.c $(WNNETCSRC)/zy_table.c $(WNNETCSRC)/strings.c $(WNNETCSRC)/bcopy.c $(WNNETCSRC)/mkdir.c ++ ++LOCAL_ETCOBJS= $(WNNJLIBSRC)/msg.o $(WNNJLIBSRC)/yincoding.o $(WNNJLIBSRC)/py_table.o $(WNNJLIBSRC)/zy_table.o $(WNNJLIBSRC)/strings.o $(WNNJLIBSRC)/bcopy.o $(WNNJLIBSRC)/mkdir.o ++ ++LOCAL_JLIBSRCS= $(WNNJLIBSRC)/js.c $(WNNJLIBSRC)/wnnerrmsg.c $(WNNJLIBSRC)/jl.c $(WNNJLIBSRC)/getopt.c ++ ++LOCAL_JLIBOBJS= $(WNNJLIBSRC)/js.o $(WNNJLIBSRC)/wnnerrmsg.o $(WNNJLIBSRC)/jl.o $(WNNJLIBSRC)/getopt.o ++ + SRCS= $(SRC1) $(SRC2) $(SRC3) $(SRC4) +-OBJS= $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) ++OBJS= $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(LOCAL_ETCOBJS) $(LOCAL_RKOBJS) $(LOCAL_JLIBOBJS) ++ ++clean:: ++ $(RM) -r .libs ++ $(RM) *.lo *.la + + all:: + +@@ -60,16 +76,12 @@ + + .c.o: + $(RM) $@ +- $(CC) -c $(CFLAGS) $(_NOOP_) $*.c +- +-clean:: ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c + +-all:: libjd.a ++all:: libjd.la + +-libjd.a: $(OBJS) $(WNNJLIB) +- cp $(WNNJLIB) $@ +- ar rv $@ $(OBJS) +- $(RANLIB) $@ ++libjd.la: $(OBJS) $(EXTRALIBRARYDEPS) ++ $(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(DESTDIR)$(WNNLIBDIR) -version-info $(WNNJLIBVERSION) + + lintlib:: llib-ljd.ln + +@@ -77,11 +89,10 @@ + $(RM) $@ + $(LINT) $(LINTLIBFLAG)jd $(LINTFLAGS) $(SRCS) + +-install:: libjd.a ++install:: libjd.la + @if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi +- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libjd.a $(DESTDIR)$(WNNLIBDIR) +- $(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(WNNLIBDIR)/libjd.a ++ $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libjd.la $(DESTDIR)$(WNNLIBDIR) + + install:: jlib.h + @if [ -d $(DESTDIR)$(JWNNINCDIR) ]; then set +x; \ +@@ -104,13 +115,13 @@ + done + + $(OBJ2) : $(SRC2) +- $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c + + $(OBJ3) : $(SRC3) +- $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c + + $(OBJ4) : $(SRC4) +- $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c + + depend:: .depend + diff --git a/japanese/FreeWnn-lib/files/patch-ar b/japanese/FreeWnn-lib/files/patch-ar new file mode 100644 index 000000000000..3943159ae669 --- /dev/null +++ b/japanese/FreeWnn-lib/files/patch-ar @@ -0,0 +1,24 @@ +--- ../Xsi.org/Wnn/jserver/Makefile.in Tue Mar 21 02:34:04 2000 ++++ Wnn/jserver/Makefile.in Thu Aug 31 09:54:43 2000 +@@ -83,17 +83,19 @@ + + jserver: $(OBJS) + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) @LIBS@ ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) @LIBS@ + + clean:: + $(RM) jserver ++ $(RM) -r .libs ++ $(RM) *.lo *.la + + instserver:: install + + install:: jserver + @if [ -d $(DESTDIR)$(JWNNBINDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNBINDIR)); fi +- $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) jserver $(DESTDIR)$(JWNNBINDIR)/jserver ++ $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) jserver $(DESTDIR)$(JWNNBINDIR)/jserver + + $(OBJ0) : $(SRC0) + $(CC) -c $(CFLAGS) $(SERVERINITDEF) $(FORKDEF) $(SOLINGERDEFS) ./`basename $@ .o`.c diff --git a/japanese/FreeWnn-lib/files/patch-as b/japanese/FreeWnn-lib/files/patch-as new file mode 100644 index 000000000000..2a45ab3125a1 --- /dev/null +++ b/japanese/FreeWnn-lib/files/patch-as @@ -0,0 +1,15 @@ +--- ../Xsi.org/Wnn/romkan/Makefile.in Sun Jan 30 12:48:51 2000 ++++ Wnn/romkan/Makefile.in Thu Aug 31 09:54:43 2000 +@@ -51,9 +51,11 @@ + + .c.o: + $(RM) $@ +- $(CC) -c $(CFLAGS) $(_NOOP_) $*.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c + + clean:: ++ $(RM) -r .libs ++ $(RM) *.lo *.la + + all:: $(OBJS) + diff --git a/japanese/FreeWnn-lib/files/patch-at b/japanese/FreeWnn-lib/files/patch-at new file mode 100644 index 000000000000..b274daf263d9 --- /dev/null +++ b/japanese/FreeWnn-lib/files/patch-at @@ -0,0 +1,82 @@ +--- cWnn/jlib/Makefile.in.orig Tue Mar 21 01:21:12 2000 ++++ cWnn/jlib/Makefile.in Fri Sep 1 01:30:47 2000 +@@ -82,11 +82,13 @@ + + .c.o: + $(RM) $@ +- $(CC) -c $(CFLAGS) $(_NOOP_) $*.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c + + clean:: ++ $(RM) -r .libs ++ $(RM) *.lo *.la + +-all:: $(LINKS) $(OBJS) libcwnn.a ++all:: $(LINKS) $(OBJS) libcwnn.la + + includes:: $(LINKS) + +@@ -167,17 +169,15 @@ + + kankana: kankana.o + $(RM) $@ +- $(CCLINK) -o $@ $(LDOPTIONS) kankana.o $(CWNNJLIB) ++ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) kankana.o $(CWNNJLIB) + + clean:: + $(RM) kankana + +-all:: libcwnn.a ++all:: libcwnn.la + +-libcwnn.a: $(OBJS) $(EXTRALIBRARYDEPS) +- $(RM) $@ +- $(AR) $@ $(OBJS) +- $(RANLIB) $@ ++libcwnn.la: $(OBJS) $(EXTRALIBRARYDEPS) ++ $(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(DESTDIR)$(WNNLIBDIR) -version-info $(CWNNJLIBVERSION) + + lintlib:: llib-lcwnn.ln + +@@ -187,32 +187,31 @@ + + instlib:: install + +-install:: libcwnn.a ++install:: libcwnn.la + @if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi +- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libcwnn.a $(DESTDIR)$(WNNLIBDIR) +- $(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(WNNLIBDIR)/libcwnn.a ++ $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libcwnn.la $(DESTDIR)$(WNNLIBDIR) + + $(OBJ3) : $(SRC3) +- $(CC) -c $(CFLAGS) $(CWNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(CWNNETCSRC)/`basename $@ .o`.c + + $(OBJ4) : $(SRC4) +- $(CC) -c $(CFLAGS) $(CWNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(CWNNETCSRC)/`basename $@ .o`.c + + $(OBJ5) : $(SRC5) +- $(CC) -c $(CFLAGS) $(CWNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(CWNNETCSRC)/`basename $@ .o`.c + + $(OBJ6) : $(SRC6) +- $(CC) -c $(CFLAGS) $(CWNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(CWNNETCSRC)/`basename $@ .o`.c + + $(OBJ7) : $(SRC7) +- $(CC) -c $(CFLAGS) $(CWNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(CWNNETCSRC)/`basename $@ .o`.c + + $(OBJ8) : $(SRC8) +- $(CC) -c $(CFLAGS) $(CWNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(CWNNETCSRC)/`basename $@ .o`.c + + $(OBJ9) : $(SRC9) +- $(CC) -c $(CFLAGS) $(CWNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(CWNNETCSRC)/`basename $@ .o`.c + + $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS) + @case '${MFLAGS}' in *[ik]*) set +e;; esac; cd $(CWNNROMKANSRC); echo "making all in $(CWNNROMKANSRC)"; $(MAKE) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(MFLAGS) diff --git a/japanese/FreeWnn-lib/files/patch-au b/japanese/FreeWnn-lib/files/patch-au new file mode 100644 index 000000000000..d3524772ab70 --- /dev/null +++ b/japanese/FreeWnn-lib/files/patch-au @@ -0,0 +1,34 @@ +--- ../Xsi.org/cWnn/jserver/Makefile.in Tue Mar 21 01:21:12 2000 ++++ cWnn/jserver/Makefile.in Thu Aug 31 09:54:43 2000 +@@ -102,6 +102,8 @@ + + clean:: + $(RM) cserver ++ $(RM) -r .libs ++ $(RM) *.lo *.la + + tserver: $(TOBJS) + $(RM) $@ +@@ -109,18 +111,20 @@ + + clean:: + $(RM) tserver ++ $(RM) -r .libs ++ $(RM) *.lo *.la + + instserver:: install + + install:: cserver + @if [ -d $(DESTDIR)$(CWNNBINDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(CWNNBINDIR)); fi +- $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) cserver $(DESTDIR)$(CWNNBINDIR)/cserver ++ $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) cserver $(DESTDIR)$(CWNNBINDIR)/cserver + + install:: tserver + @if [ -d $(DESTDIR)$(CWNNBINDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(CWNNBINDIR)); fi +- $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) tserver $(DESTDIR)$(CWNNBINDIR)/tserver ++ $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) tserver $(DESTDIR)$(CWNNBINDIR)/tserver + + includes:: $(HDRS) $(SRC0) $(SRC1) $(TSRCS) + diff --git a/japanese/FreeWnn-lib/files/patch-av b/japanese/FreeWnn-lib/files/patch-av new file mode 100644 index 000000000000..777118e448b6 --- /dev/null +++ b/japanese/FreeWnn-lib/files/patch-av @@ -0,0 +1,15 @@ +--- ../Xsi.org/cWnn/romkan/Makefile.in Sun Jan 30 14:53:39 2000 ++++ cWnn/romkan/Makefile.in Thu Aug 31 09:54:43 2000 +@@ -53,9 +53,11 @@ + + .c.o: + $(RM) $@ +- $(CC) -c $(CFLAGS) $(_NOOP_) $*.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c + + clean:: ++ $(RM) -r .libs ++ $(RM) *.lo *.la + + all:: $(HDRS) $(SRCS) $(OBJS) + diff --git a/japanese/FreeWnn-lib/files/patch-aw b/japanese/FreeWnn-lib/files/patch-aw new file mode 100644 index 000000000000..40f477a9f6cc --- /dev/null +++ b/japanese/FreeWnn-lib/files/patch-aw @@ -0,0 +1,76 @@ +--- kWnn/jlib/Makefile.in.orig Tue Mar 21 01:21:12 2000 ++++ kWnn/jlib/Makefile.in Fri Sep 1 01:32:41 2000 +@@ -86,11 +86,13 @@ + + .c.o: + $(RM) $@ +- $(CC) -c $(CFLAGS) $(_NOOP_) $*.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c + + clean:: ++ $(RM) -r .libs ++ $(RM) *.lo *.la + +-all:: $(LINKS) $(OBJS) libkwnn.a ++all:: $(LINKS) $(OBJS) libkwnn.la + + includes:: $(LINKS) + +@@ -158,12 +160,10 @@ + lint1: + $(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS) + +-all:: libkwnn.a ++all:: libkwnn.la + +-libkwnn.a: $(OBJS) $(EXTRALIBRARYDEPS) +- $(RM) $@ +- $(AR) $@ $(OBJS) +- $(RANLIB) $@ ++libkwnn.la: $(OBJS) $(EXTRALIBRARYDEPS) ++ $(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(DESTDIR)$(WNNLIBDIR) -version-info $(KWNNJLIBVERSION) + + lintlib:: llib-lkwnn.ln + +@@ -173,32 +173,31 @@ + + instlib:: install + +-install:: libkwnn.a ++install:: libkwnn.la + @if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi +- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libkwnn.a $(DESTDIR)$(WNNLIBDIR) +- $(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(WNNLIBDIR)/libkwnn.a ++ $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libkwnn.la $(DESTDIR)$(WNNLIBDIR) + + $(OBJ3) : $(SRC3) +- $(CC) -c $(CFLAGS) $(KWNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(KWNNETCSRC)/`basename $@ .o`.c + + $(OBJ4) : $(SRC4) +- $(CC) -c $(CFLAGS) $(KWNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(KWNNETCSRC)/`basename $@ .o`.c + + $(OBJ5) : $(SRC5) +- $(CC) -c $(CFLAGS) $(KWNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(KWNNETCSRC)/`basename $@ .o`.c + + $(OBJ6) : $(SRC6) +- $(CC) -c $(CFLAGS) $(KWNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(KWNNETCSRC)/`basename $@ .o`.c + + $(OBJ7) : $(SRC7) +- $(CC) -c $(CFLAGS) $(KWNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(KWNNETCSRC)/`basename $@ .o`.c + + $(OBJ8) : $(SRC8) +- $(CC) -c $(CFLAGS) $(KWNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(KWNNETCSRC)/`basename $@ .o`.c + + $(OBJ9) : $(SRC9) +- $(CC) -c $(CFLAGS) $(KWNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(KWNNETCSRC)/`basename $@ .o`.c + + $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS) + @case '${MFLAGS}' in *[ik]*) set +e;; esac; cd $(KWNNROMKANSRC); echo "making all in $(KWNNROMKANSRC)"; $(MAKE) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(MFLAGS) diff --git a/japanese/FreeWnn-lib/files/patch-ax b/japanese/FreeWnn-lib/files/patch-ax new file mode 100644 index 000000000000..179c77bc4bfb --- /dev/null +++ b/japanese/FreeWnn-lib/files/patch-ax @@ -0,0 +1,19 @@ +--- ../Xsi.org/kWnn/jserver/Makefile.in Tue Mar 21 01:21:12 2000 ++++ kWnn/jserver/Makefile.in Thu Aug 31 09:54:43 2000 +@@ -90,13 +90,15 @@ + + clean:: + $(RM) kserver ++ $(RM) -r .libs ++ $(RM) *.lo *.la + + instserver:: install + + install:: kserver + @if [ -d $(DESTDIR)$(KWNNBINDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(KWNNBINDIR)); fi +- $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) kserver $(DESTDIR)$(KWNNBINDIR)/kserver ++ $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) kserver $(DESTDIR)$(KWNNBINDIR)/kserver + + includes:: $(HDRS) $(SRC0) $(SRC1) + diff --git a/japanese/FreeWnn-lib/files/patch-ay b/japanese/FreeWnn-lib/files/patch-ay new file mode 100644 index 000000000000..102f7eff77bb --- /dev/null +++ b/japanese/FreeWnn-lib/files/patch-ay @@ -0,0 +1,15 @@ +--- ../Xsi.org/kWnn/romkan/Makefile.in Sun Jan 30 15:50:24 2000 ++++ kWnn/romkan/Makefile.in Thu Aug 31 09:54:43 2000 +@@ -53,9 +53,11 @@ + + .c.o: + $(RM) $@ +- $(CC) -c $(CFLAGS) $(_NOOP_) $*.c ++ $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c + + clean:: ++ $(RM) -r .libs ++ $(RM) *.lo *.la + + all:: $(HDRS) $(SRCS) $(OBJS) + diff --git a/japanese/FreeWnn-lib/pkg-comment b/japanese/FreeWnn-lib/pkg-comment index e1acebef346b..40b66b40a603 100644 --- a/japanese/FreeWnn-lib/pkg-comment +++ b/japanese/FreeWnn-lib/pkg-comment @@ -1 +1 @@ -A Japanese/Chinese/Korean input method (only Japanese built) +A Japanese/Chinese/Korean input method (Japanese client libraries) diff --git a/japanese/FreeWnn-lib/pkg-descr b/japanese/FreeWnn-lib/pkg-descr index ad7add57bb5b..c99a897392e2 100644 --- a/japanese/FreeWnn-lib/pkg-descr +++ b/japanese/FreeWnn-lib/pkg-descr @@ -1,40 +1,13 @@ -This is Wnn4.2, a Japanese/Chinese/Korean input method. It is -included primarily so that we can compile mule-2.1, a multilingual -emacs. +FreeWnn is a Japanese/Chinese/Korean input method. -Only the Japanese version is built for this port. +WWW: www.freewnn.org -Note that binaries and libraries go to /usr/local, while man pages and -includes go to /usr/X11R6. That's the way it was designed, I don't -know why. +This port has only libraries for a Japanese imput method. The +libraries containes a archive file (libwnn.a), header files and files +which are used to a client. -- Satoshi -(asami@cs.berkeley.edu) - -------------------------------------------------------------------- - -This also include some patches for FreeBSD or bugfixes. -If use these patches, you can compile Wnn-4.2 under XFree86 3.1.2E - or later (X11Release6.1). -If there are any problem in these patches, please tell me via E-mail. - -Hidekazu Kuroki -(hidekazu@cs.titech.ac.jp) - -------------------------------------------------------------------- - -Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for Wnn4.2. -Patches for those are in 'Wnn4.2.patch-YYMMDD.tar.gz' and are applied -in this port. - -[Notice] -(1) When compiling this port, if $LOCALBASE is not '/usr/local' and/or -$X11BASE is not '/usr/X11R6' then you should properly change two lines -'@cwd /usr/local' and '@cwd /usr/X11R6' in -$PORTSDIR/japanese/Wnn/pkg/PLIST. - -(2) You must set a environment variable JSERVER if you use a client of -Wnn. +Note that you must set a environment variable JSERVER if you use a +client of Wnn. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/FreeWnn-lib/pkg-plist b/japanese/FreeWnn-lib/pkg-plist index e4b16f198878..6dd7181fb7ed 100644 --- a/japanese/FreeWnn-lib/pkg-plist +++ b/japanese/FreeWnn-lib/pkg-plist @@ -1,48 +1,14 @@ -@cwd /usr/local -etc/rc.d/Wnn.sh -lib/wnn/ja_JP/dic/pubdic/bio.dic -lib/wnn/ja_JP/dic/pubdic/chimei.dic -lib/wnn/ja_JP/dic/pubdic/computer.dic -lib/wnn/ja_JP/dic/pubdic/jinmei.dic -lib/wnn/ja_JP/dic/pubdic/kihon.dic -lib/wnn/ja_JP/dic/pubdic/koyuu.dic -lib/wnn/ja_JP/dic/pubdic/setsuji.dic -lib/wnn/ja_JP/dic/pubdic/special.dic -lib/wnn/ja_JP/dic/pubdic/symbol.dic -lib/wnn/ja_JP/dic/pubdic/tankan.dic -lib/wnn/ja_JP/dic/pubdic/full.fzk -lib/wnn/ja_JP/dic/pubdic/kougo.fzk -lib/wnn/ja_JP/dic/pubdic/std.fzk -lib/wnn/ja_JP/dic/src/fzk.master -lib/wnn/ja_JP/dic/src/fzk.attr -lib/wnn/ja_JP/dic/src/fzk.jirattr -lib/wnn/ja_JP/dic/src/fzk.fzkattr -lib/wnn/ja_JP/dic/src/fzk.jircon -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 -lib/wnn/ja_JP/uumkey -lib/wnn/ja_JP/uumkey.omr -lib/wnn/ja_JP/uumkey_e -lib/wnn/ja_JP/uumrc -lib/wnn/ja_JP/uumrc.omr -lib/wnn/ja_JP/uumrc.rev -lib/wnn/ja_JP/uumrc_e -lib/wnn/ja_JP/uumrc_vi -lib/wnn/ja_JP/wnnstat.msg -lib/wnn/ja_JP/libwnn.msg -lib/wnn/ja_JP/wnnenvrc -lib/wnn/ja_JP/wnnenvrc.omr -lib/wnn/ja_JP/wnnenvrc.rem -lib/wnn/ja_JP/wnnenvrc.rev -lib/wnn/ja_JP/wnnenvrc_R -lib/wnn/ja_JP/wnnenvrc_R.omr -lib/wnn/ja_JP/wnnenvrc_R.rem +include/wnn/commonhd.h +include/wnn/config.h +include/wnn/cplib.h +include/wnn/jlib.h +include/wnn/jllib.h +include/wnn/jslib.h +include/wnn/msg.h +include/wnn/rk_spclval.h +include/wnn/wnn_config.h +include/wnn/wnnerror.h +@dirrm include/wnn lib/wnn/ja_JP/rk/1B_TOUPPER lib/wnn/ja_JP/rk/1B_ZENHIRA lib/wnn/ja_JP/rk/1B_ZENKATA @@ -71,6 +37,26 @@ lib/wnn/ja_JP/rk.vi/2_VITHROW lib/wnn/ja_JP/rk.vi/3B_ZENASC lib/wnn/ja_JP/rk.vi/mode lib/wnn/ja_JP/rk.vi/uumkey +lib/wnn/ja_JP/jserverrc +lib/wnn/ja_JP/hinsi.data +lib/wnn/ja_JP/uum.msg +lib/wnn/ja_JP/uumkey +lib/wnn/ja_JP/uumkey.omr +lib/wnn/ja_JP/uumkey_e +lib/wnn/ja_JP/uumrc +lib/wnn/ja_JP/uumrc.omr +lib/wnn/ja_JP/uumrc.rev +lib/wnn/ja_JP/uumrc_e +lib/wnn/ja_JP/uumrc_vi +lib/wnn/ja_JP/wnnstat.msg +lib/wnn/ja_JP/libwnn.msg +lib/wnn/ja_JP/wnnenvrc +lib/wnn/ja_JP/wnnenvrc.omr +lib/wnn/ja_JP/wnnenvrc.rem +lib/wnn/ja_JP/wnnenvrc.rev +lib/wnn/ja_JP/wnnenvrc_R +lib/wnn/ja_JP/wnnenvrc_R.omr +lib/wnn/ja_JP/wnnenvrc_R.rem lib/wnn/cvt_key_empty lib/wnn/cvt_key_tbl lib/wnn/cvt_key_tbl.ST @@ -79,544 +65,22 @@ lib/wnn/cvt_key_tbl.kt lib/wnn/cvt_key_tbl.mv lib/wnn/cvt_key_tbl.vt lib/wnn/serverdefs +lib/wnn/lt_LN/rk/2A_CTRL +lib/wnn/lt_LN/rk/2B_LATIN +lib/wnn/lt_LN/rk/mode lib/wnn/lt_LN/uum.msg lib/wnn/lt_LN/uumkey lib/wnn/lt_LN/uumkey_e 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 -@dirrm lib/wnn/ja_JP/dic -@dirrm lib/wnn/ja_JP/rk.vi +lib/libjd.a +lib/libjd.so +lib/libjd.so.0 +lib/libwnn.a +lib/libwnn.so +lib/libwnn.so.0 @dirrm lib/wnn/ja_JP/rk +@dirrm lib/wnn/ja_JP/rk.vi @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/lt_LN/rk +@dirrm lib/wnn/lt_LN @dirrm lib/wnn -bin/Wnn4/jserver -bin/Wnn4/uum -bin/Wnn4/wnnstat -bin/Wnn4/wnnkill -bin/Wnn4/wddel -bin/Wnn4/wdreg -bin/Wnn4/oldatonewa -bin/Wnn4/dtoa -bin/Wnn4/atod -bin/Wnn4/atof -bin/Wnn4/wnntouch -@dirrm bin/Wnn4 -share/doc/ja-Wnn/manual/0/contents -share/doc/ja-Wnn/manual/1.intro/Intro1 -share/doc/ja-Wnn/manual/1.intro/Intro2 -share/doc/ja-Wnn/manual/1.intro/Intro3 -share/doc/ja-Wnn/manual/2.env/Intro -share/doc/ja-Wnn/manual/2.env/dic/pubdic -share/doc/ja-Wnn/manual/2.env/dic/usr_dic -share/doc/ja-Wnn/manual/2.env/dic/ujis_dic -share/doc/ja-Wnn/manual/2.env/wnn/2a_ctrl -share/doc/ja-Wnn/manual/2.env/wnn/2b_romkana -share/doc/ja-Wnn/manual/2.env/wnn/cvt_key -share/doc/ja-Wnn/manual/2.env/wnn/fzk.data -share/doc/ja-Wnn/manual/2.env/wnn/fzk.u -share/doc/ja-Wnn/manual/2.env/wnn/hinsi_data -share/doc/ja-Wnn/manual/2.env/wnn/jserverrc -share/doc/ja-Wnn/manual/2.env/wnn/mode -share/doc/ja-Wnn/manual/2.env/wnn/serverdefs -share/doc/ja-Wnn/manual/2.env/wnn/uumkey -share/doc/ja-Wnn/manual/2.env/wnn/uumrc -share/doc/ja-Wnn/manual/2.env/wnn/wnnenvrc -share/doc/ja-Wnn/manual/3.libwnn/Intro -share/doc/ja-Wnn/manual/3.libwnn/include -share/doc/ja-Wnn/manual/3.libwnn/j_intro -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/TITLE.DOC -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/bun_suu -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/c_zenkouho -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/close -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/connect -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/connect_lang -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/dai_top -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/dic_add -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/dic_comment_se -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/dic_delete -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/dic_list -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/dic_save -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/dic_use -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/disconnect -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/env -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/env_set -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/env_sticky -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/fuzokugo_get -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/fuzokugo_set -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/get_kanji -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/get_zenkouho_k -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/hinsi_dicts -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/hinsi_list -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/hinsi_name -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/hinsi_number -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/inspect -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/isconnect -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/jiri_len -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/kanji_len -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/kill -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/next -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/nobi_conv -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/open -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/open_lang -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/param_get -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/ren_conv -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/set_env_wnnrc -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/set_jikouho -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/tan_conv -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/update_hindo -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/word_add -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/word_comment_s -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/word_delete -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/word_info -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/word_search -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/word_use -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/zenkouho -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/zenkouho_bun -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/zenkouho_dai -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/zenkouho_daip -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/zenkouho_suu -share/doc/ja-Wnn/manual/3.libwnn/js_lib/TITLE.DOC -share/doc/ja-Wnn/manual/3.libwnn/js_lib/access -share/doc/ja-Wnn/manual/3.libwnn/js_lib/close -share/doc/ja-Wnn/manual/3.libwnn/js_lib/connect -share/doc/ja-Wnn/manual/3.libwnn/js_lib/dic_add -share/doc/ja-Wnn/manual/3.libwnn/js_lib/dic_creat -share/doc/ja-Wnn/manual/3.libwnn/js_lib/dic_creat_cl -share/doc/ja-Wnn/manual/3.libwnn/js_lib/dic_delete -share/doc/ja-Wnn/manual/3.libwnn/js_lib/dic_info -share/doc/ja-Wnn/manual/3.libwnn/js_lib/dic_list -share/doc/ja-Wnn/manual/3.libwnn/js_lib/dic_list_all -share/doc/ja-Wnn/manual/3.libwnn/js_lib/dic_use -share/doc/ja-Wnn/manual/3.libwnn/js_lib/disconnect -share/doc/ja-Wnn/manual/3.libwnn/js_lib/env_exist -share/doc/ja-Wnn/manual/3.libwnn/js_lib/env_list -share/doc/ja-Wnn/manual/3.libwnn/js_lib/env_sticky -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_comment_s -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_discard -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_info -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_list -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_list_all -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_loaded -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_loaded_lo -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_passwd_s -share/doc/ja-Wnn/manual/3.libwnn/js_lib/kanren -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_read -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_receive -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_remove -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_remove_cl -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_send -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_stat -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_write -share/doc/ja-Wnn/manual/3.libwnn/js_lib/fuzokugo_get -share/doc/ja-Wnn/manual/3.libwnn/js_lib/fuzokugo_set -share/doc/ja-Wnn/manual/3.libwnn/js_lib/hindo_creat -share/doc/ja-Wnn/manual/3.libwnn/js_lib/hindo_creat_cl -share/doc/ja-Wnn/manual/3.libwnn/js_lib/hindo_set -share/doc/ja-Wnn/manual/3.libwnn/js_lib/hinsi_dicts -share/doc/ja-Wnn/manual/3.libwnn/js_lib/hinsi_list -share/doc/ja-Wnn/manual/3.libwnn/js_lib/hinsi_name -share/doc/ja-Wnn/manual/3.libwnn/js_lib/hinsi_number -share/doc/ja-Wnn/manual/3.libwnn/js_lib/hinsi_table_s -share/doc/ja-Wnn/manual/3.libwnn/js_lib/isconnect -share/doc/ja-Wnn/manual/3.libwnn/js_lib/kantan_dai -share/doc/ja-Wnn/manual/3.libwnn/js_lib/kantan_sho -share/doc/ja-Wnn/manual/3.libwnn/js_lib/kanzen_sho -share/doc/ja-Wnn/manual/3.libwnn/js_lib/kanzen_dai -share/doc/ja-Wnn/manual/3.libwnn/js_lib/kill -share/doc/ja-Wnn/manual/3.libwnn/js_lib/who -share/doc/ja-Wnn/manual/3.libwnn/js_lib/mkdir -share/doc/ja-Wnn/manual/3.libwnn/js_lib/open -share/doc/ja-Wnn/manual/3.libwnn/js_lib/open_lang -share/doc/ja-Wnn/manual/3.libwnn/js_lib/param_get -share/doc/ja-Wnn/manual/3.libwnn/js_lib/set_lang -share/doc/ja-Wnn/manual/3.libwnn/js_lib/version -share/doc/ja-Wnn/manual/3.libwnn/js_lib/word_add -share/doc/ja-Wnn/manual/3.libwnn/js_lib/word_comment_s -share/doc/ja-Wnn/manual/3.libwnn/js_lib/word_delete -share/doc/ja-Wnn/manual/3.libwnn/js_lib/word_info -share/doc/ja-Wnn/manual/3.libwnn/js_lib/word_search -share/doc/ja-Wnn/manual/3.libwnn/rk_lib/romkan_clear -share/doc/ja-Wnn/manual/3.libwnn/rk_lib/romkan_dispmod -share/doc/ja-Wnn/manual/3.libwnn/rk_lib/romkan_getc -share/doc/ja-Wnn/manual/3.libwnn/rk_lib/romkan_init -share/doc/ja-Wnn/manual/3.libwnn/rk_lib/romkan_next -share/doc/ja-Wnn/manual/3.libwnn/rk_lib/romkan_ungetc -share/doc/ja-Wnn/manual/3.libwnn/rk_lib/Intro -share/doc/ja-Wnn/manual/3.libwnn/misc_lib/msg_close -share/doc/ja-Wnn/manual/3.libwnn/misc_lib/msg_get -share/doc/ja-Wnn/manual/3.libwnn/misc_lib/msg_open -share/doc/ja-Wnn/manual/4.cmd/uum -share/doc/ja-Wnn/manual/4.cmd/wnnkill -share/doc/ja-Wnn/manual/4.cmd/wnnstat -share/doc/ja-Wnn/manual/4.cmd/jserver -share/doc/ja-Wnn/manual/5.op/Intro -share/doc/ja-Wnn/manual/5.op/op1.1 -share/doc/ja-Wnn/manual/5.op/op1.2 -share/doc/ja-Wnn/manual/5.op/op1.3 -share/doc/ja-Wnn/manual/5.op/op2.1 -share/doc/ja-Wnn/manual/5.op/op2.2 -share/doc/ja-Wnn/manual/5.op/op2.2.1 -share/doc/ja-Wnn/manual/5.op/op2.3 -share/doc/ja-Wnn/manual/5.op/op2.4 -share/doc/ja-Wnn/manual/5.op/op3.1 -share/doc/ja-Wnn/manual/5.op/op3.3 -share/doc/ja-Wnn/manual/5.op/op3.5 -share/doc/ja-Wnn/manual/5.op/op3.7 -share/doc/ja-Wnn/manual/5.op/op3.8 -share/doc/ja-Wnn/manual/5.op/op3.83 -share/doc/ja-Wnn/manual/5.op/op3.85 -share/doc/ja-Wnn/manual/5.op/op3.87 -share/doc/ja-Wnn/manual/5.op/op3.88 -share/doc/ja-Wnn/manual/6.jutil/Intro -share/doc/ja-Wnn/manual/6.jutil/atod -share/doc/ja-Wnn/manual/6.jutil/atof -share/doc/ja-Wnn/manual/6.jutil/dictionary -share/doc/ja-Wnn/manual/6.jutil/dtoa -share/doc/ja-Wnn/manual/6.jutil/wddel -share/doc/ja-Wnn/manual/6.jutil/wdreg -share/doc/ja-Wnn/manual/6.jutil/wnntouch -share/doc/ja-Wnn/manual/6.jutil/oldatonewa -share/doc/ja-Wnn/manual/intro -share/doc/ja-Wnn/manual/v3tov4/v3tov4 -share/doc/ja-Wnn/manual/7.Protocol/KKTP -share/doc/ja-Wnn/manual.en/2.env/wnn/serverdefs -share/doc/ja-Wnn/manual.en/2.env/wnn/jserverrc -share/doc/ja-Wnn/manual.en/2.env/wnn/uumrc -share/doc/ja-Wnn/manual.en/2.env/wnn/wnnenvrc -share/doc/ja-Wnn/manual.en/2.env/wnn/uumkey -share/doc/ja-Wnn/manual.en/2.env/wnn/mode -share/doc/ja-Wnn/manual.en/2.env/wnn/2a_ctrl -share/doc/ja-Wnn/manual.en/2.env/wnn/2b_romkana -share/doc/ja-Wnn/manual.en/2.env/wnn/full.fzk -share/doc/ja-Wnn/manual.en/4.cmd/jserver -share/doc/ja-Wnn/manual.en/4.cmd/uum -share/doc/ja-Wnn/manual.en/4.cmd/wnnkill -share/doc/ja-Wnn/manual.en/4.cmd/wnnstat -share/doc/ja-Wnn/manual.en/5.op/README.en -share/doc/ja-Wnn/manual.en/5.op/README.ja -share/doc/ja-Wnn/manual.en/5.op/contents -share/doc/ja-Wnn/manual.en/5.op/contents.2 -share/doc/ja-Wnn/manual.en/5.op/op1 -share/doc/ja-Wnn/manual.en/5.op/fig2.2.1.Z -share/doc/ja-Wnn/manual.en/5.op/op2.1 -share/doc/ja-Wnn/manual.en/5.op/op2.2 -share/doc/ja-Wnn/manual.en/5.op/op2.3 -share/doc/ja-Wnn/manual.en/5.op/op2.4 -share/doc/ja-Wnn/manual.en/5.op/op2.5 -share/doc/ja-Wnn/manual.en/5.op/op2.6 -share/doc/ja-Wnn/manual.en/5.op/op2.7 -share/doc/ja-Wnn/manual.en/5.op/op2.8 -share/doc/ja-Wnn/manual.en/5.op/op2.9 -share/doc/ja-Wnn/manual.en/5.op/op3.1 -share/doc/ja-Wnn/manual.en/5.op/op3.2 -share/doc/ja-Wnn/manual.en/5.op/op3.3 -share/doc/ja-Wnn/manual.en/5.op/op3.4 -share/doc/ja-Wnn/manual.en/5.op/op3.5 -share/doc/ja-Wnn/manual.en/5.op/op3.6 -share/doc/ja-Wnn/manual.en/5.op/op3.7 -share/doc/ja-Wnn/manual.en/5.op/op3.8 -share/doc/ja-Wnn/manual.en/5.op/op3.9 -share/doc/ja-Wnn/manual.en/5.op/fig2.2.2.Z -share/doc/ja-Wnn/manual.en/5.op/fig2.3.1.Z -share/doc/ja-Wnn/manual.en/5.op/fig2.3.11.Z -share/doc/ja-Wnn/manual.en/5.op/fig2.3.18.Z -share/doc/ja-Wnn/manual.en/5.op/fig2.3.3.Z -share/doc/ja-Wnn/manual.en/5.op/fig2.3.4.Z -share/doc/ja-Wnn/manual.en/5.op/table2.2.1.Z -share/doc/ja-Wnn/manual.en/6.jutil/atod -share/doc/ja-Wnn/manual.en/6.jutil/wdreg -share/doc/ja-Wnn/manual.en/6.jutil/dtoa -share/doc/ja-Wnn/manual.en/6.jutil/atof -share/doc/ja-Wnn/manual.en/6.jutil/wnntouch -share/doc/ja-Wnn/manual.en/6.jutil/wddel -@dirrm share/doc/ja-Wnn/manual/v3tov4 -@dirrm share/doc/ja-Wnn/manual/7.Protocol -@dirrm share/doc/ja-Wnn/manual/6.jutil -@dirrm share/doc/ja-Wnn/manual/5.op -@dirrm share/doc/ja-Wnn/manual/4.cmd -@dirrm share/doc/ja-Wnn/manual/3.libwnn/rk_lib -@dirrm share/doc/ja-Wnn/manual/3.libwnn/misc_lib -@dirrm share/doc/ja-Wnn/manual/3.libwnn/js_lib -@dirrm share/doc/ja-Wnn/manual/3.libwnn/jl_lib -@dirrm share/doc/ja-Wnn/manual/3.libwnn -@dirrm share/doc/ja-Wnn/manual/2.env/wnn -@dirrm share/doc/ja-Wnn/manual/2.env/dic -@dirrm share/doc/ja-Wnn/manual/2.env -@dirrm share/doc/ja-Wnn/manual/1.intro -@dirrm share/doc/ja-Wnn/manual/0 -@dirrm share/doc/ja-Wnn/manual.en/6.jutil -@dirrm share/doc/ja-Wnn/manual.en/5.op -@dirrm share/doc/ja-Wnn/manual.en/4.cmd -@dirrm share/doc/ja-Wnn/manual.en/3.libwnn -@dirrm share/doc/ja-Wnn/manual.en/2.env/wnn -@dirrm share/doc/ja-Wnn/manual.en/2.env/dic -@dirrm share/doc/ja-Wnn/manual.en/2.env -@dirrm share/doc/ja-Wnn/manual.en/1.intro -@dirrm share/doc/ja-Wnn/manual.en/0 -@dirrm share/doc/ja-Wnn/manual.en -@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 -lib/libjd.a -include/wnn/jllib.h -include/wnn/jlib.h -include/wnn/jslib.h -include/wnn/rk_spclval.h -include/wnn/wnnerror.h -include/wnn/commonhd.h -include/wnn/cplib.h -include/wnn/config.h -include/wnn/msg.h -@dirrm include/wnn -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 diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile index 125964b36ad4..91b3e8dede4e 100644 --- a/japanese/FreeWnn-server/Makefile +++ b/japanese/FreeWnn-server/Makefile @@ -1,175 +1,13 @@ -# New ports collection makefile for: Wnn for Japanese -# Date created: 20 July 1997 -# Whom: Satoshi Taoka <taoka@FreeBSD.org> +# New ports collection makefile for: server of FreeWnn +# Date created: 00/08/25 +# Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # -PORTNAME= Wnn -PORTVERSION= 4.2 -CATEGORIES?= japanese -MASTER_SITES= ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/ \ - ftp://ftp.wg.omron.co.jp/pub/Wnn/dic/pubdic+/ \ - http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/Wnn/ -DISTNAME= ${PORTNAME}${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${WNN_EXTRA_PATCH} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +PKGNAMESUFFIX= -server -MAINTAINER= taoka@FreeBSD.org +MASTERDIR= ${.CURDIR}/../FreeWnn-lib +PKGDIR= ${.CURDIR}/pkg -BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 - -USE_XLIB= yes -INSTALLS_SHLIB= yes -PATCHDIR= ${.CURDIR}/../../japanese/Wnn/patches -FILESDIR= ${.CURDIR}/../../japanese/Wnn/files -PKGDIR= ${.CURDIR}/../../japanese/Wnn/pkg -WRKSRC= ${WRKDIR}/Xsi - -WNN_EXTRA_PATCH= ${DISTNAME}.patch-981201.tar.gz -MAKE_ENV+= PATH=/usr/bin:$${PATH} PORT_IMAKE_DEFINES='${WNN_DEF}' - -.if defined(BATCH) -BATCH= yes # make sure it's not empty -.endif - -.include <bsd.port.pre.mk> - -.if ${PKGNAMEPREFIX} == ja- -DISTFILES+= pubdic+.tar.gz pubdic+-fix01.gz pubdic+.diff pubdic+.special.diff -PORT_DOCDIR= ${PREFIX}/share/doc/ja-Wnn -DOC_FROM= ${WRKSRC}/Wnn -BuildWnn= YES -BuildJlibV3= YES -LOCAL_MAN_LANG= ja -SHARED_LIB= libwnn4 -.else -BuildWnn= NO -.endif -.if ${PKGNAMEPREFIX} == zh- -PORT_DOCDIR= ${PREFIX}/share/doc/zh-Wnn -DOC_FROM= ${WRKSRC}/cWnn -BuildCWnn= YES -SHARED_LIB= libcwnn4 -.else -BuildCWnn= NO -.endif -.if ${PKGNAMEPREFIX} == ko- -# kWnn has no manual. -BuildKWnn= YES -SHARED_LIB= libkwnn4 -.else -BuildKWnn= NO -.endif -BuildXwnmo= YES -# pubdic+ -PUBDICPDIR= ${WRKSRC}/pubdic+ -WDICS= bio.u computer.u kihon.u setsuji.u tankan.u \ - chimei.u jinmei.u koyuu.u symbol.u special.u -ATOD= ${WRKSRC}/Wnn/jutil/atod -h ${WRKSRC}/Wnn/jd/hinsi.data -#WNN_DEF+= -DBuildPubdic=NO -# TOPDIR should be a full path provided we build a shared library. -WNN_DEF+= -DTOPDIR=${WRKSRC} - -post-extract: - ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${_DISTDIR}${WNN_EXTRA_PATCH} ${EXTRACT_AFTER_ARGS} \ - -C ${WRKSRC} - ${LN} -sf Project.tmpl ${WRKSRC}/config/X11.tmpl -.if ${PKGNAMEPREFIX} == ja- - ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}pubdic+.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC} -.endif - -pre-patch: - cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Wnn-patch-01Dec98 - -#### pubdic+ -.if ${PKGNAMEPREFIX} == ja- -post-patch: - cd ${PUBDICPDIR}; \ - ${GZCAT} ${_DISTDIR}pubdic+-fix01.gz | ${PATCH} --quiet; \ - ${PATCH} --quiet < ${_DISTDIR}pubdic+.diff; \ - ${PATCH} --quiet < ${_DISTDIR}pubdic+.special.diff -.endif - -pre-configure: - for file in ${WRKSRC}/config/Project.tmpl \ - ${WRKSRC}/Contrib/dic/gerodic/Makefile; do \ - ${MV} $$file $$file.orig2; \ - ${SED} -e 's!^\([ ]*PREFIX = \).*$$!\1${PREFIX}!' \ - -e 's!%%LOCAL_MAN_LANG%%!${LOCAL_MAN_LANG}!' \ - -e 's!%%BuildWnn%%!${BuildWnn}!' \ - -e 's!%%BuildCWnn%%!${BuildCWnn}!' \ - -e 's!%%BuildKWnn%%!${BuildKWnn}!' \ - -e 's!%%BuildXwnmo%%!${BuildXwnmo}!' \ - -e 's!%%BuildJlibV3%%!${BuildJlibV3}!' \ - $$file.orig2 > $$file; \ - done - -do-configure: - (cd ${WRKSRC}; \ - imake -DUseInstalled -I${WRKSRC}/config \ - -I${X11BASE}/lib/X11/config -DTOPDIR=${WRKSRC}; \ - ${MAKE} Makefiles; \ - ${MAKE} clean; \ - ${MAKE} includes; \ - ${MAKE} depend ) - -pre-build: -#### pubdic+ -.if ${PKGNAMEPREFIX} == ja- - cd ${PUBDICPDIR}; ${XMKMF}; ${MAKE} wnn; \ - cd ${WRKSRC}/Pubdic; \ - for file in ${WDICS}; do \ - ${MV} -f $$file $$file.org; \ - ${MV} ../pubdic+/$$file . ; \ - hdfile=`echo $$file | ${SED} 's/\\.u/.hd/'`; \ - ${MV} -f $$hdfile $$hdfile.org; \ - ${SED} 's,(pubdic),(pubdic+),' $$hdfile.org > $$hdfile; \ - done -.endif - -# These are necesary because this package uses a different Makefile for -# building and installing etc. -#do-build: -# @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.inst World) - -#### gerodic -.if ${PKGNAMEPREFIX} == ja- -post-build: - cd ${WRKSRC}/Contrib/dic/gerodic; \ - ${ATOD} -h ${WRKSRC}/Pubdic/hinsi.data g-jinmei.dic < g-jinmei.u -.endif - -pre-install: - @${SETENV} BATCH=${BATCH} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL - -post-install: -#### gerodic -.if ${PKGNAMEPREFIX} == ja- - cd ${WRKSRC}/Contrib/dic/gerodic; \ - make all install -.endif -#### -# This package uses imake's "install.man" target to install man pages but -# I can't define USE_IMAKE because it doesn't involve xmkmf - @cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man - @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL -.if !defined(NOPORTDOCS) -.if defined(PORT_DOCDIR) - ${MKDIR} ${PORT_DOCDIR} - @(cd ${DOC_FROM}; tar cvf - manual manual.en | \ - (cd ${PORT_DOCDIR}; tar xf -)) - @${CHOWN} -R bin.bin ${PORT_DOCDIR} -.endif -.endif -### for the shared libray - if [ X"${PORTOBJFORMAT}" != Xelf ]; then \ - ${LN} -sf ${SHARED_LIB}.so.1.0 \ - ${X11BASE}/lib/${SHARED_LIB}.so; \ - fi - -.include <bsd.port.post.mk> +.include "${MASTERDIR}/Makefile" diff --git a/japanese/FreeWnn-server/pkg-comment b/japanese/FreeWnn-server/pkg-comment index e1acebef346b..8b4a413c2957 100644 --- a/japanese/FreeWnn-server/pkg-comment +++ b/japanese/FreeWnn-server/pkg-comment @@ -1 +1 @@ -A Japanese/Chinese/Korean input method (only Japanese built) +A Japanese/Chinese/Korean input method (Japanese server) diff --git a/japanese/FreeWnn-server/pkg-descr b/japanese/FreeWnn-server/pkg-descr index ad7add57bb5b..2a3a32716972 100644 --- a/japanese/FreeWnn-server/pkg-descr +++ b/japanese/FreeWnn-server/pkg-descr @@ -1,40 +1,9 @@ -This is Wnn4.2, a Japanese/Chinese/Korean input method. It is -included primarily so that we can compile mule-2.1, a multilingual -emacs. +FreeWnn is a Japanese/Chinese/Korean input method. -Only the Japanese version is built for this port. +WWW: www.freewnn.org -Note that binaries and libraries go to /usr/local, while man pages and -includes go to /usr/X11R6. That's the way it was designed, I don't -know why. - -- Satoshi -(asami@cs.berkeley.edu) - -------------------------------------------------------------------- - -This also include some patches for FreeBSD or bugfixes. -If use these patches, you can compile Wnn-4.2 under XFree86 3.1.2E - or later (X11Release6.1). -If there are any problem in these patches, please tell me via E-mail. - -Hidekazu Kuroki -(hidekazu@cs.titech.ac.jp) - -------------------------------------------------------------------- - -Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for Wnn4.2. -Patches for those are in 'Wnn4.2.patch-YYMMDD.tar.gz' and are applied -in this port. - -[Notice] -(1) When compiling this port, if $LOCALBASE is not '/usr/local' and/or -$X11BASE is not '/usr/X11R6' then you should properly change two lines -'@cwd /usr/local' and '@cwd /usr/X11R6' in -$PORTSDIR/japanese/Wnn/pkg/PLIST. - -(2) You must set a environment variable JSERVER if you use a client of -Wnn. +This port has only a server and dictionaries used the server for a +Japanese imput method. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/FreeWnn-server/pkg-install b/japanese/FreeWnn-server/pkg-install index 612660afd0e0..57df408c734a 100644 --- a/japanese/FreeWnn-server/pkg-install +++ b/japanese/FreeWnn-server/pkg-install @@ -97,7 +97,7 @@ EOF POST-INSTALL) case $1 in - ja-Wnn-4.2) + ja-FreeWnn-*) sys_dirs="${PKG_PREFIX}/lib/wnn/ja_JP/dic/pubdic ${PKG_PREFIX}/lib/wnn/ja_JP/dic/wnncons ${PKG_PREFIX}/lib/wnn/ja_JP/dic/gerodic" usr_dirs=${PKG_PREFIX}/lib/wnn/ja_JP/dic/usr wnnserver=${PKG_PREFIX}/bin/Wnn4/jserver @@ -107,7 +107,7 @@ POST-INSTALL) wnn_socket=/tmp/jd_sockV4 wnn_lang=ja_JP ;; - zh-Wnn-4.2) + zh-FreeWnn-*) sys_dirs="${PKG_PREFIX}/lib/wnn/zh_CN/dic/sys ${PKG_PREFIX}/lib/wnn/zh_TW/dic/sys" usr_dirs="${PKG_PREFIX}/lib/wnn/zh_CN/dic/usr ${PKG_PREFIX}/lib/wnn/zh_TW/dic/usr" wnnserver=${PKG_PREFIX}/bin/cWnn4/cserver @@ -117,7 +117,7 @@ POST-INSTALL) wnn_socket=/tmp/cd_sockV4 wnn_lang=zh_CN ;; - ko-Wnn-4.2) + ko-FreeWnn-*) sys_dirs="${PKG_PREFIX}/lib/wnn/ko_KR/dic/sys" usr_dirs=${PKG_PREFIX}/lib/wnn/ko_KR/dic/usr wnnserver=${PKG_PREFIX}/bin/kWnn4/kserver @@ -145,41 +145,29 @@ POST-INSTALL) if [ ! -f ${startup_script} ]; then echo "Installing ${startup_script} startup file."; echo '#!/bin/sh' > ${startup_script}; - echo 'case $1 in' >> ${startup_script}; - echo 'start)' >> ${startup_script}; - echo " wnn=${wnnserver}" >> ${startup_script}; - echo ' if [ -x $wnn ]; then' >> ${startup_script}; - echo " ${wnnstat} -L ${wnn_lang} localhost > /dev/null 2>&1" >> ${startup_script}; - echo ' if [ $? = 255 ]; then' >> ${startup_script}; - echo " rm -f ${wnn_socket}" >> ${startup_script}; - echo " echo -n ' ${wnnname}'" >> ${startup_script}; - echo ' $wnn' >> ${startup_script}; - echo " fi" >> ${startup_script}; + echo "wnn=${wnnserver}" >> ${startup_script}; + echo 'if [ -x $wnn ]; then' >> ${startup_script}; + echo " ${wnnstat} -L ${wnn_lang} localhost > /dev/null 2>&1" >> ${startup_script}; + echo ' if [ $? = 255 ]; then' >> ${startup_script}; + echo " rm -f ${wnn_socket}" >> ${startup_script}; + echo " echo -n ' ${wnnname}'" >> ${startup_script}; + echo ' $wnn' >> ${startup_script}; echo " fi" >> ${startup_script}; + echo "fi" >> ${startup_script}; if [ $1 = zh-Wnn-4.2 ]; then wnnserver=${PKG_PREFIX}/bin/cWnn4/tserver wnn_lang=zh_TW wnn_socket=/tmp/td_sockV4 - echo " wnn=${wnnserver}" >> ${startup_script}; - echo ' if [ -x $wnn ]; then' >> ${startup_script}; - echo " ${wnnstat} -L ${wnn_lang} localhost > /dev/null 2>&1" >> ${startup_script}; - echo ' if [ $? = 255 ]; then' >> ${startup_script}; - echo " rm -f ${wnn_socket}" >> ${startup_script}; - echo " echo -n ' ${wnnname}'" >> ${startup_script}; - echo ' $wnn' >> ${startup_script}; - echo " fi" >> ${startup_script}; + echo "wnn=${wnnserver}" >> ${startup_script}; + echo 'if [ -x $wnn ]; then' >> ${startup_script}; + echo " ${wnnstat} -L ${wnn_lang} localhost > /dev/null 2>&1" >> ${startup_script}; + echo ' if [ $? = 255 ]; then' >> ${startup_script}; + echo " rm -f ${wnn_socket}" >> ${startup_script}; + echo " echo -n ' ${wnnname}'" >> ${startup_script}; + echo ' $wnn' >> ${startup_script}; echo " fi" >> ${startup_script}; + echo "fi" >> ${startup_script}; fi - echo ' ;;' >> ${startup_script}; - echo 'stop)' >> ${startup_script}; - echo ' killall $wnn' >> ${startup_script}; - echo " echo -n ' ${wnnname}'" >> ${startup_script}; - echo ' ;;' >> ${startup_script}; - echo '*)' >> ${startup_script}; - echo ' echo "Usage: `basename $0` {start|stop}" >&2' >> ${startup_script}; - echo ' ;;' >> ${startup_script}; - echo 'esac' >> ${startup_script}; - echo 'exit 0' >> ${startup_script}; chmod 755 ${startup_script}; chown bin.bin ${startup_script}; fi diff --git a/japanese/FreeWnn-server/pkg-plist b/japanese/FreeWnn-server/pkg-plist index e4b16f198878..30704aff3ff8 100644 --- a/japanese/FreeWnn-server/pkg-plist +++ b/japanese/FreeWnn-server/pkg-plist @@ -1,622 +1,43 @@ -@cwd /usr/local +bin/Wnn4/atod +bin/Wnn4/atof +bin/Wnn4/dtoa +bin/Wnn4/jserver +bin/Wnn4/oldatonewa +bin/Wnn4/wddel +bin/Wnn4/wdreg +bin/Wnn4/wnnkill +bin/Wnn4/wnnstat +bin/Wnn4/wnntouch +@dirrm bin/Wnn4 etc/rc.d/Wnn.sh +lib/wnn/ja_JP/dic/gerodic/g-jinmei.dic lib/wnn/ja_JP/dic/pubdic/bio.dic lib/wnn/ja_JP/dic/pubdic/chimei.dic lib/wnn/ja_JP/dic/pubdic/computer.dic +lib/wnn/ja_JP/dic/pubdic/full.fzk lib/wnn/ja_JP/dic/pubdic/jinmei.dic lib/wnn/ja_JP/dic/pubdic/kihon.dic +lib/wnn/ja_JP/dic/pubdic/kougo.fzk lib/wnn/ja_JP/dic/pubdic/koyuu.dic lib/wnn/ja_JP/dic/pubdic/setsuji.dic lib/wnn/ja_JP/dic/pubdic/special.dic +lib/wnn/ja_JP/dic/pubdic/std.fzk lib/wnn/ja_JP/dic/pubdic/symbol.dic lib/wnn/ja_JP/dic/pubdic/tankan.dic -lib/wnn/ja_JP/dic/pubdic/full.fzk -lib/wnn/ja_JP/dic/pubdic/kougo.fzk -lib/wnn/ja_JP/dic/pubdic/std.fzk -lib/wnn/ja_JP/dic/src/fzk.master lib/wnn/ja_JP/dic/src/fzk.attr -lib/wnn/ja_JP/dic/src/fzk.jirattr +lib/wnn/ja_JP/dic/src/fzk.con lib/wnn/ja_JP/dic/src/fzk.fzkattr +lib/wnn/ja_JP/dic/src/fzk.jirattr lib/wnn/ja_JP/dic/src/fzk.jircon -lib/wnn/ja_JP/dic/src/fzk.con +lib/wnn/ja_JP/dic/src/fzk.master 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 -lib/wnn/ja_JP/uumkey -lib/wnn/ja_JP/uumkey.omr -lib/wnn/ja_JP/uumkey_e -lib/wnn/ja_JP/uumrc -lib/wnn/ja_JP/uumrc.omr -lib/wnn/ja_JP/uumrc.rev -lib/wnn/ja_JP/uumrc_e -lib/wnn/ja_JP/uumrc_vi -lib/wnn/ja_JP/wnnstat.msg -lib/wnn/ja_JP/libwnn.msg -lib/wnn/ja_JP/wnnenvrc -lib/wnn/ja_JP/wnnenvrc.omr -lib/wnn/ja_JP/wnnenvrc.rem -lib/wnn/ja_JP/wnnenvrc.rev -lib/wnn/ja_JP/wnnenvrc_R -lib/wnn/ja_JP/wnnenvrc_R.omr -lib/wnn/ja_JP/wnnenvrc_R.rem -lib/wnn/ja_JP/rk/1B_TOUPPER -lib/wnn/ja_JP/rk/1B_ZENHIRA -lib/wnn/ja_JP/rk/1B_ZENKATA -lib/wnn/ja_JP/rk/1B_newTOUPPER -lib/wnn/ja_JP/rk/2A_CTRL -lib/wnn/ja_JP/rk/2B_DAKUTEN -lib/wnn/ja_JP/rk/2B_JIS -lib/wnn/ja_JP/rk/2B_ROMKANA -lib/wnn/ja_JP/rk/2_TCODE -lib/wnn/ja_JP/rk/3B_HANKATA -lib/wnn/ja_JP/rk/3B_KATAKANA -lib/wnn/ja_JP/rk/3B_ZENKAKU -lib/wnn/ja_JP/rk/autork -lib/wnn/ja_JP/rk/mode -lib/wnn/ja_JP/rk/mode.hankata -lib/wnn/ja_JP/rk/mode.nohankata -lib/wnn/ja_JP/rk.vi/1B_newTOUPPER -lib/wnn/ja_JP/rk.vi/2A_CTRL -lib/wnn/ja_JP/rk.vi/2B_KEISEN -lib/wnn/ja_JP/rk.vi/2B_ROMKANA -lib/wnn/ja_JP/rk.vi/2C_KEISEN1 -lib/wnn/ja_JP/rk.vi/2C_VI -lib/wnn/ja_JP/rk.vi/2C_VIEX -lib/wnn/ja_JP/rk.vi/2C_VISH -lib/wnn/ja_JP/rk.vi/2_VITHROW -lib/wnn/ja_JP/rk.vi/3B_ZENASC -lib/wnn/ja_JP/rk.vi/mode -lib/wnn/ja_JP/rk.vi/uumkey -lib/wnn/cvt_key_empty -lib/wnn/cvt_key_tbl -lib/wnn/cvt_key_tbl.ST -lib/wnn/cvt_key_tbl.gm -lib/wnn/cvt_key_tbl.kt -lib/wnn/cvt_key_tbl.mv -lib/wnn/cvt_key_tbl.vt -lib/wnn/serverdefs -lib/wnn/lt_LN/uum.msg -lib/wnn/lt_LN/uumkey -lib/wnn/lt_LN/uumkey_e -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/gerodic @dirrm lib/wnn/ja_JP/dic/pubdic +@dirrm lib/wnn/ja_JP/dic/src +@dirrm lib/wnn/ja_JP/dic/usr +@dirrm lib/wnn/ja_JP/dic/wnncons @dirrm lib/wnn/ja_JP/dic -@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 -bin/Wnn4/wnnstat -bin/Wnn4/wnnkill -bin/Wnn4/wddel -bin/Wnn4/wdreg -bin/Wnn4/oldatonewa -bin/Wnn4/dtoa -bin/Wnn4/atod -bin/Wnn4/atof -bin/Wnn4/wnntouch -@dirrm bin/Wnn4 -share/doc/ja-Wnn/manual/0/contents -share/doc/ja-Wnn/manual/1.intro/Intro1 -share/doc/ja-Wnn/manual/1.intro/Intro2 -share/doc/ja-Wnn/manual/1.intro/Intro3 -share/doc/ja-Wnn/manual/2.env/Intro -share/doc/ja-Wnn/manual/2.env/dic/pubdic -share/doc/ja-Wnn/manual/2.env/dic/usr_dic -share/doc/ja-Wnn/manual/2.env/dic/ujis_dic -share/doc/ja-Wnn/manual/2.env/wnn/2a_ctrl -share/doc/ja-Wnn/manual/2.env/wnn/2b_romkana -share/doc/ja-Wnn/manual/2.env/wnn/cvt_key -share/doc/ja-Wnn/manual/2.env/wnn/fzk.data -share/doc/ja-Wnn/manual/2.env/wnn/fzk.u -share/doc/ja-Wnn/manual/2.env/wnn/hinsi_data -share/doc/ja-Wnn/manual/2.env/wnn/jserverrc -share/doc/ja-Wnn/manual/2.env/wnn/mode -share/doc/ja-Wnn/manual/2.env/wnn/serverdefs -share/doc/ja-Wnn/manual/2.env/wnn/uumkey -share/doc/ja-Wnn/manual/2.env/wnn/uumrc -share/doc/ja-Wnn/manual/2.env/wnn/wnnenvrc -share/doc/ja-Wnn/manual/3.libwnn/Intro -share/doc/ja-Wnn/manual/3.libwnn/include -share/doc/ja-Wnn/manual/3.libwnn/j_intro -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/TITLE.DOC -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/bun_suu -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/c_zenkouho -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/close -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/connect -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/connect_lang -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/dai_top -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/dic_add -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/dic_comment_se -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/dic_delete -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/dic_list -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/dic_save -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/dic_use -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/disconnect -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/env -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/env_set -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/env_sticky -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/fuzokugo_get -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/fuzokugo_set -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/get_kanji -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/get_zenkouho_k -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/hinsi_dicts -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/hinsi_list -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/hinsi_name -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/hinsi_number -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/inspect -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/isconnect -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/jiri_len -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/kanji_len -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/kill -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/next -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/nobi_conv -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/open -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/open_lang -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/param_get -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/ren_conv -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/set_env_wnnrc -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/set_jikouho -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/tan_conv -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/update_hindo -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/word_add -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/word_comment_s -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/word_delete -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/word_info -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/word_search -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/word_use -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/zenkouho -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/zenkouho_bun -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/zenkouho_dai -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/zenkouho_daip -share/doc/ja-Wnn/manual/3.libwnn/jl_lib/zenkouho_suu -share/doc/ja-Wnn/manual/3.libwnn/js_lib/TITLE.DOC -share/doc/ja-Wnn/manual/3.libwnn/js_lib/access -share/doc/ja-Wnn/manual/3.libwnn/js_lib/close -share/doc/ja-Wnn/manual/3.libwnn/js_lib/connect -share/doc/ja-Wnn/manual/3.libwnn/js_lib/dic_add -share/doc/ja-Wnn/manual/3.libwnn/js_lib/dic_creat -share/doc/ja-Wnn/manual/3.libwnn/js_lib/dic_creat_cl -share/doc/ja-Wnn/manual/3.libwnn/js_lib/dic_delete -share/doc/ja-Wnn/manual/3.libwnn/js_lib/dic_info -share/doc/ja-Wnn/manual/3.libwnn/js_lib/dic_list -share/doc/ja-Wnn/manual/3.libwnn/js_lib/dic_list_all -share/doc/ja-Wnn/manual/3.libwnn/js_lib/dic_use -share/doc/ja-Wnn/manual/3.libwnn/js_lib/disconnect -share/doc/ja-Wnn/manual/3.libwnn/js_lib/env_exist -share/doc/ja-Wnn/manual/3.libwnn/js_lib/env_list -share/doc/ja-Wnn/manual/3.libwnn/js_lib/env_sticky -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_comment_s -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_discard -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_info -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_list -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_list_all -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_loaded -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_loaded_lo -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_passwd_s -share/doc/ja-Wnn/manual/3.libwnn/js_lib/kanren -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_read -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_receive -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_remove -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_remove_cl -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_send -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_stat -share/doc/ja-Wnn/manual/3.libwnn/js_lib/file_write -share/doc/ja-Wnn/manual/3.libwnn/js_lib/fuzokugo_get -share/doc/ja-Wnn/manual/3.libwnn/js_lib/fuzokugo_set -share/doc/ja-Wnn/manual/3.libwnn/js_lib/hindo_creat -share/doc/ja-Wnn/manual/3.libwnn/js_lib/hindo_creat_cl -share/doc/ja-Wnn/manual/3.libwnn/js_lib/hindo_set -share/doc/ja-Wnn/manual/3.libwnn/js_lib/hinsi_dicts -share/doc/ja-Wnn/manual/3.libwnn/js_lib/hinsi_list -share/doc/ja-Wnn/manual/3.libwnn/js_lib/hinsi_name -share/doc/ja-Wnn/manual/3.libwnn/js_lib/hinsi_number -share/doc/ja-Wnn/manual/3.libwnn/js_lib/hinsi_table_s -share/doc/ja-Wnn/manual/3.libwnn/js_lib/isconnect -share/doc/ja-Wnn/manual/3.libwnn/js_lib/kantan_dai -share/doc/ja-Wnn/manual/3.libwnn/js_lib/kantan_sho -share/doc/ja-Wnn/manual/3.libwnn/js_lib/kanzen_sho -share/doc/ja-Wnn/manual/3.libwnn/js_lib/kanzen_dai -share/doc/ja-Wnn/manual/3.libwnn/js_lib/kill -share/doc/ja-Wnn/manual/3.libwnn/js_lib/who -share/doc/ja-Wnn/manual/3.libwnn/js_lib/mkdir -share/doc/ja-Wnn/manual/3.libwnn/js_lib/open -share/doc/ja-Wnn/manual/3.libwnn/js_lib/open_lang -share/doc/ja-Wnn/manual/3.libwnn/js_lib/param_get -share/doc/ja-Wnn/manual/3.libwnn/js_lib/set_lang -share/doc/ja-Wnn/manual/3.libwnn/js_lib/version -share/doc/ja-Wnn/manual/3.libwnn/js_lib/word_add -share/doc/ja-Wnn/manual/3.libwnn/js_lib/word_comment_s -share/doc/ja-Wnn/manual/3.libwnn/js_lib/word_delete -share/doc/ja-Wnn/manual/3.libwnn/js_lib/word_info -share/doc/ja-Wnn/manual/3.libwnn/js_lib/word_search -share/doc/ja-Wnn/manual/3.libwnn/rk_lib/romkan_clear -share/doc/ja-Wnn/manual/3.libwnn/rk_lib/romkan_dispmod -share/doc/ja-Wnn/manual/3.libwnn/rk_lib/romkan_getc -share/doc/ja-Wnn/manual/3.libwnn/rk_lib/romkan_init -share/doc/ja-Wnn/manual/3.libwnn/rk_lib/romkan_next -share/doc/ja-Wnn/manual/3.libwnn/rk_lib/romkan_ungetc -share/doc/ja-Wnn/manual/3.libwnn/rk_lib/Intro -share/doc/ja-Wnn/manual/3.libwnn/misc_lib/msg_close -share/doc/ja-Wnn/manual/3.libwnn/misc_lib/msg_get -share/doc/ja-Wnn/manual/3.libwnn/misc_lib/msg_open -share/doc/ja-Wnn/manual/4.cmd/uum -share/doc/ja-Wnn/manual/4.cmd/wnnkill -share/doc/ja-Wnn/manual/4.cmd/wnnstat -share/doc/ja-Wnn/manual/4.cmd/jserver -share/doc/ja-Wnn/manual/5.op/Intro -share/doc/ja-Wnn/manual/5.op/op1.1 -share/doc/ja-Wnn/manual/5.op/op1.2 -share/doc/ja-Wnn/manual/5.op/op1.3 -share/doc/ja-Wnn/manual/5.op/op2.1 -share/doc/ja-Wnn/manual/5.op/op2.2 -share/doc/ja-Wnn/manual/5.op/op2.2.1 -share/doc/ja-Wnn/manual/5.op/op2.3 -share/doc/ja-Wnn/manual/5.op/op2.4 -share/doc/ja-Wnn/manual/5.op/op3.1 -share/doc/ja-Wnn/manual/5.op/op3.3 -share/doc/ja-Wnn/manual/5.op/op3.5 -share/doc/ja-Wnn/manual/5.op/op3.7 -share/doc/ja-Wnn/manual/5.op/op3.8 -share/doc/ja-Wnn/manual/5.op/op3.83 -share/doc/ja-Wnn/manual/5.op/op3.85 -share/doc/ja-Wnn/manual/5.op/op3.87 -share/doc/ja-Wnn/manual/5.op/op3.88 -share/doc/ja-Wnn/manual/6.jutil/Intro -share/doc/ja-Wnn/manual/6.jutil/atod -share/doc/ja-Wnn/manual/6.jutil/atof -share/doc/ja-Wnn/manual/6.jutil/dictionary -share/doc/ja-Wnn/manual/6.jutil/dtoa -share/doc/ja-Wnn/manual/6.jutil/wddel -share/doc/ja-Wnn/manual/6.jutil/wdreg -share/doc/ja-Wnn/manual/6.jutil/wnntouch -share/doc/ja-Wnn/manual/6.jutil/oldatonewa -share/doc/ja-Wnn/manual/intro -share/doc/ja-Wnn/manual/v3tov4/v3tov4 -share/doc/ja-Wnn/manual/7.Protocol/KKTP -share/doc/ja-Wnn/manual.en/2.env/wnn/serverdefs -share/doc/ja-Wnn/manual.en/2.env/wnn/jserverrc -share/doc/ja-Wnn/manual.en/2.env/wnn/uumrc -share/doc/ja-Wnn/manual.en/2.env/wnn/wnnenvrc -share/doc/ja-Wnn/manual.en/2.env/wnn/uumkey -share/doc/ja-Wnn/manual.en/2.env/wnn/mode -share/doc/ja-Wnn/manual.en/2.env/wnn/2a_ctrl -share/doc/ja-Wnn/manual.en/2.env/wnn/2b_romkana -share/doc/ja-Wnn/manual.en/2.env/wnn/full.fzk -share/doc/ja-Wnn/manual.en/4.cmd/jserver -share/doc/ja-Wnn/manual.en/4.cmd/uum -share/doc/ja-Wnn/manual.en/4.cmd/wnnkill -share/doc/ja-Wnn/manual.en/4.cmd/wnnstat -share/doc/ja-Wnn/manual.en/5.op/README.en -share/doc/ja-Wnn/manual.en/5.op/README.ja -share/doc/ja-Wnn/manual.en/5.op/contents -share/doc/ja-Wnn/manual.en/5.op/contents.2 -share/doc/ja-Wnn/manual.en/5.op/op1 -share/doc/ja-Wnn/manual.en/5.op/fig2.2.1.Z -share/doc/ja-Wnn/manual.en/5.op/op2.1 -share/doc/ja-Wnn/manual.en/5.op/op2.2 -share/doc/ja-Wnn/manual.en/5.op/op2.3 -share/doc/ja-Wnn/manual.en/5.op/op2.4 -share/doc/ja-Wnn/manual.en/5.op/op2.5 -share/doc/ja-Wnn/manual.en/5.op/op2.6 -share/doc/ja-Wnn/manual.en/5.op/op2.7 -share/doc/ja-Wnn/manual.en/5.op/op2.8 -share/doc/ja-Wnn/manual.en/5.op/op2.9 -share/doc/ja-Wnn/manual.en/5.op/op3.1 -share/doc/ja-Wnn/manual.en/5.op/op3.2 -share/doc/ja-Wnn/manual.en/5.op/op3.3 -share/doc/ja-Wnn/manual.en/5.op/op3.4 -share/doc/ja-Wnn/manual.en/5.op/op3.5 -share/doc/ja-Wnn/manual.en/5.op/op3.6 -share/doc/ja-Wnn/manual.en/5.op/op3.7 -share/doc/ja-Wnn/manual.en/5.op/op3.8 -share/doc/ja-Wnn/manual.en/5.op/op3.9 -share/doc/ja-Wnn/manual.en/5.op/fig2.2.2.Z -share/doc/ja-Wnn/manual.en/5.op/fig2.3.1.Z -share/doc/ja-Wnn/manual.en/5.op/fig2.3.11.Z -share/doc/ja-Wnn/manual.en/5.op/fig2.3.18.Z -share/doc/ja-Wnn/manual.en/5.op/fig2.3.3.Z -share/doc/ja-Wnn/manual.en/5.op/fig2.3.4.Z -share/doc/ja-Wnn/manual.en/5.op/table2.2.1.Z -share/doc/ja-Wnn/manual.en/6.jutil/atod -share/doc/ja-Wnn/manual.en/6.jutil/wdreg -share/doc/ja-Wnn/manual.en/6.jutil/dtoa -share/doc/ja-Wnn/manual.en/6.jutil/atof -share/doc/ja-Wnn/manual.en/6.jutil/wnntouch -share/doc/ja-Wnn/manual.en/6.jutil/wddel -@dirrm share/doc/ja-Wnn/manual/v3tov4 -@dirrm share/doc/ja-Wnn/manual/7.Protocol -@dirrm share/doc/ja-Wnn/manual/6.jutil -@dirrm share/doc/ja-Wnn/manual/5.op -@dirrm share/doc/ja-Wnn/manual/4.cmd -@dirrm share/doc/ja-Wnn/manual/3.libwnn/rk_lib -@dirrm share/doc/ja-Wnn/manual/3.libwnn/misc_lib -@dirrm share/doc/ja-Wnn/manual/3.libwnn/js_lib -@dirrm share/doc/ja-Wnn/manual/3.libwnn/jl_lib -@dirrm share/doc/ja-Wnn/manual/3.libwnn -@dirrm share/doc/ja-Wnn/manual/2.env/wnn -@dirrm share/doc/ja-Wnn/manual/2.env/dic -@dirrm share/doc/ja-Wnn/manual/2.env -@dirrm share/doc/ja-Wnn/manual/1.intro -@dirrm share/doc/ja-Wnn/manual/0 -@dirrm share/doc/ja-Wnn/manual.en/6.jutil -@dirrm share/doc/ja-Wnn/manual.en/5.op -@dirrm share/doc/ja-Wnn/manual.en/4.cmd -@dirrm share/doc/ja-Wnn/manual.en/3.libwnn -@dirrm share/doc/ja-Wnn/manual.en/2.env/wnn -@dirrm share/doc/ja-Wnn/manual.en/2.env/dic -@dirrm share/doc/ja-Wnn/manual.en/2.env -@dirrm share/doc/ja-Wnn/manual.en/1.intro -@dirrm share/doc/ja-Wnn/manual.en/0 -@dirrm share/doc/ja-Wnn/manual.en -@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 -lib/libjd.a -include/wnn/jllib.h -include/wnn/jlib.h -include/wnn/jslib.h -include/wnn/rk_spclval.h -include/wnn/wnnerror.h -include/wnn/commonhd.h -include/wnn/cplib.h -include/wnn/config.h -include/wnn/msg.h -@dirrm include/wnn -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 diff --git a/korean/FreeWnn-lib/Makefile b/korean/FreeWnn-lib/Makefile index 052a2dca71e0..f842be88047c 100644 --- a/korean/FreeWnn-lib/Makefile +++ b/korean/FreeWnn-lib/Makefile @@ -1,16 +1,14 @@ -# New ports collection makefile for: Wnn for Korea -# Date created: 20 July 1997 -# Whom: Satoshi Taoka <taoka@FreeBSD.org> +# New ports collection makefile for: libraries of FreeWnn +# Date created: 00/08/25 +# Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # +PKGNAMESUFFIX= -lib CATEGORIES= korean - -## COMMENT, DESCR, PLIST is used in a local 'pkg' directory -MASTERDIR= ${.CURDIR}/../../japanese/Wnn -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR -PLIST= ${.CURDIR}/pkg/PLIST +MASTERDIR= ${.CURDIR}/../../japanese/FreeWnn-lib +PKGDIR= ${.CURDIR}/pkg +WNN= kWnn .include "${MASTERDIR}/Makefile" diff --git a/korean/FreeWnn-lib/pkg-comment b/korean/FreeWnn-lib/pkg-comment index e6a4e4ded10e..40b66b40a603 100644 --- a/korean/FreeWnn-lib/pkg-comment +++ b/korean/FreeWnn-lib/pkg-comment @@ -1 +1 @@ -A Japanese/Chinese/Korean input method (only Korean built) +A Japanese/Chinese/Korean input method (Japanese client libraries) diff --git a/korean/FreeWnn-lib/pkg-descr b/korean/FreeWnn-lib/pkg-descr index eea5b72eb52d..641c03a5a4e8 100644 --- a/korean/FreeWnn-lib/pkg-descr +++ b/korean/FreeWnn-lib/pkg-descr @@ -1,37 +1,13 @@ -This is Wnn4.2, a Japanese/Chinese/Korean input method. It is -included primarily so that we can compile mule-2.1, a multilingual -emacs. +FreeWnn is a Japanese/Chinese/Korean input method. -Only the Korean version is built for this port. +WWW: www.freewnn.org -Note that binaries and libraries go to /usr/local, while man pages and -includes go to /usr/X11R6. That's the way it was designed, I don't -know why. +This port has only libraries for a Korean imput method. The libraries +containes a archive file (libkwnn.a), header files and files which are +used to a client. -- Satoshi -(asami@cs.berkeley.edu) - -------------------------------------------------------------------- - -This also include some patches for FreeBSD or bugfixes. -If use these patches, you can compile Wnn-4.2 under XFree86 3.1.2E - or later (X11Release6.1). -If there are any problem in these patches, please tell me via E-mail. - -Hidekazu Kuroki -(hidekazu@cs.titech.ac.jp) - -------------------------------------------------------------------- - -Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for Wnn4.2. -Patches for those are in 'Wnn4.2.patch-YYMMDD.tar.gz' and are applied in this -port. - -[Notice] -When compiling this port, if $LOCALBASE is not '/usr/local' and/or -$X11BASE is not '/usr/X11R6' then you should properly change two lines -'@cwd /usr/local' and '@cwd /usr/X11R6' in -$PORTSDIR/korean/Wnn/pkg/PLIST. +Note that you must set a environment variable KSERVER if you use a +client of Wnn. -- S. Taoka <taoka@FreeBSD.org> diff --git a/korean/FreeWnn-lib/pkg-plist b/korean/FreeWnn-lib/pkg-plist index f382d726a6be..3e358522b2cc 100644 --- a/korean/FreeWnn-lib/pkg-plist +++ b/korean/FreeWnn-lib/pkg-plist @@ -1,5 +1,11 @@ -@cwd /usr/local -etc/rc.d/kWnn.sh +include/kwnn/commonhd.h +include/kwnn/cplib.h +include/kwnn/jllib.h +include/kwnn/jslib.h +include/kwnn/msg.h +include/kwnn/rk_spclval.h +include/kwnn/wnnerror.h +@dirrm include/kwnn lib/wnn/cvt_key_empty lib/wnn/cvt_key_tbl lib/wnn/cvt_key_tbl.ST @@ -7,9 +13,6 @@ lib/wnn/cvt_key_tbl.gm lib/wnn/cvt_key_tbl.kt lib/wnn/cvt_key_tbl.mv lib/wnn/cvt_key_tbl.vt -lib/wnn/ko_KR/dic/sys/full.fzk -lib/wnn/ko_KR/dic/sys/hword.dic -lib/wnn/ko_KR/dic/sys/single.dic lib/wnn/ko_KR/hinsi.data lib/wnn/ko_KR/kserverrc lib/wnn/ko_KR/libwnn.msg @@ -29,91 +32,9 @@ lib/wnn/ko_KR/wnnenvrc lib/wnn/ko_KR/wnnenvrc_R lib/wnn/ko_KR/wnnstat.msg lib/wnn/serverdefs -@comment for 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 for Xwnmo +lib/libkwnn.a +lib/libkwnn.so +lib/libkwnn.so.0 @dirrm lib/wnn/ko_KR/rk -@dirrm lib/wnn/ko_KR/dic/sys -@dirrm lib/wnn/ko_KR/dic/usr -@dirrm lib/wnn/ko_KR/dic @dirrm lib/wnn/ko_KR -@comment for Xwnmo -@dirrm lib/wnn/ja_JP -@dirrm lib/wnn/lt_LN -@dirrm lib/wnn/zh_CN -@dirrm lib/wnn/zh_TW -@dirrm lib/wnn -@comment END for Xwnmo -bin/kWnn4/katod -bin/kWnn4/katof -bin/kWnn4/kdtoa -bin/kWnn4/kserver -bin/kWnn4/kuum -bin/kWnn4/kwddel -bin/kWnn4/kwdreg -bin/kWnn4/kwnnkill -bin/kWnn4/kwnnstat -bin/kWnn4/kwnntouch -@dirrm bin/kWnn4 -@cwd /usr/X11R6 -@comment for Xwnmo -bin/xwnmo -bin/killxwnmo -bin/xjutil -lib/X11/app-defaults/Xwnmo -@comment END for Xwnmo -lib/libkwnn4.so -lib/libkwnn4.so.1.0 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -lib/libkwnn.a -include/kwnn/commonhd.h -include/kwnn/cplib.h -include/kwnn/jllib.h -include/kwnn/jslib.h -include/kwnn/msg.h -include/kwnn/rk_spclval.h -include/kwnn/wnnerror.h -@dirrm include/kwnn -@comment for Xwnmo -man/man1/xwnmo.1.gz -man/man1/ximrc.1.gz -man/man1/ximconf.1.gz -man/man1/cvt_fun_tbl.1.gz -man/man1/cvt_meta_tbl.1.gz -man/man1/killxwnmo.1.gz -man/man1/cvt_xim_tbl.1.gz -man/man1/xjutil.1.gz -@comment END for Xwnmo +@dirrm lib/wnn/ diff --git a/korean/FreeWnn-server/Makefile b/korean/FreeWnn-server/Makefile index 052a2dca71e0..342f72070045 100644 --- a/korean/FreeWnn-server/Makefile +++ b/korean/FreeWnn-server/Makefile @@ -1,16 +1,15 @@ -# New ports collection makefile for: Wnn for Korea -# Date created: 20 July 1997 -# Whom: Satoshi Taoka <taoka@FreeBSD.org> +# New ports collection makefile for: server of FreeWnn +# Date created: 00/08/25 +# Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # +PKGNAMESUFFIX= -server CATEGORIES= korean - -## COMMENT, DESCR, PLIST is used in a local 'pkg' directory -MASTERDIR= ${.CURDIR}/../../japanese/Wnn -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR -PLIST= ${.CURDIR}/pkg/PLIST +MASTERDIR= ${.CURDIR}/../../japanese/FreeWnn-lib +PKGDIR= ${.CURDIR}/pkg +PKGINSTALL= ${.CURDIR}/../../japanese/FreeWnn-server/pkg/INSTALL +WNN= kWnn .include "${MASTERDIR}/Makefile" diff --git a/korean/FreeWnn-server/pkg-comment b/korean/FreeWnn-server/pkg-comment index e6a4e4ded10e..4cb4a75398e4 100644 --- a/korean/FreeWnn-server/pkg-comment +++ b/korean/FreeWnn-server/pkg-comment @@ -1 +1 @@ -A Japanese/Chinese/Korean input method (only Korean built) +A Japanese/Chinese/Korean input method (Korean server) diff --git a/korean/FreeWnn-server/pkg-descr b/korean/FreeWnn-server/pkg-descr index eea5b72eb52d..c8ac04867e31 100644 --- a/korean/FreeWnn-server/pkg-descr +++ b/korean/FreeWnn-server/pkg-descr @@ -1,37 +1,9 @@ -This is Wnn4.2, a Japanese/Chinese/Korean input method. It is -included primarily so that we can compile mule-2.1, a multilingual -emacs. +FreeWnn is a Japanese/Chinese/Korean input method. -Only the Korean version is built for this port. +WWW: www.freewnn.org -Note that binaries and libraries go to /usr/local, while man pages and -includes go to /usr/X11R6. That's the way it was designed, I don't -know why. - -- Satoshi -(asami@cs.berkeley.edu) - -------------------------------------------------------------------- - -This also include some patches for FreeBSD or bugfixes. -If use these patches, you can compile Wnn-4.2 under XFree86 3.1.2E - or later (X11Release6.1). -If there are any problem in these patches, please tell me via E-mail. - -Hidekazu Kuroki -(hidekazu@cs.titech.ac.jp) - -------------------------------------------------------------------- - -Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for Wnn4.2. -Patches for those are in 'Wnn4.2.patch-YYMMDD.tar.gz' and are applied in this -port. - -[Notice] -When compiling this port, if $LOCALBASE is not '/usr/local' and/or -$X11BASE is not '/usr/X11R6' then you should properly change two lines -'@cwd /usr/local' and '@cwd /usr/X11R6' in -$PORTSDIR/korean/Wnn/pkg/PLIST. +This port has only a server and dictionaries used the server for a +Korean imput method. -- S. Taoka <taoka@FreeBSD.org> diff --git a/korean/FreeWnn-server/pkg-plist b/korean/FreeWnn-server/pkg-plist index f382d726a6be..0088a7c7acd8 100644 --- a/korean/FreeWnn-server/pkg-plist +++ b/korean/FreeWnn-server/pkg-plist @@ -1,119 +1,19 @@ -@cwd /usr/local -etc/rc.d/kWnn.sh -lib/wnn/cvt_key_empty -lib/wnn/cvt_key_tbl -lib/wnn/cvt_key_tbl.ST -lib/wnn/cvt_key_tbl.gm -lib/wnn/cvt_key_tbl.kt -lib/wnn/cvt_key_tbl.mv -lib/wnn/cvt_key_tbl.vt -lib/wnn/ko_KR/dic/sys/full.fzk -lib/wnn/ko_KR/dic/sys/hword.dic -lib/wnn/ko_KR/dic/sys/single.dic -lib/wnn/ko_KR/hinsi.data -lib/wnn/ko_KR/kserverrc -lib/wnn/ko_KR/libwnn.msg -lib/wnn/ko_KR/rk/1B_TOUPPER -lib/wnn/ko_KR/rk/2A_CTRL -lib/wnn/ko_KR/rk/2C_HANGUL.KEY -lib/wnn/ko_KR/rk/2C_HANGUL.ROM -lib/wnn/ko_KR/rk/2C_KSC -lib/wnn/ko_KR/rk/3B_JEONKAK -lib/wnn/ko_KR/rk/mode -lib/wnn/ko_KR/rk/mode.key -lib/wnn/ko_KR/rk/mode.rom -lib/wnn/ko_KR/uum.msg -lib/wnn/ko_KR/uumkey -lib/wnn/ko_KR/uumrc -lib/wnn/ko_KR/wnnenvrc -lib/wnn/ko_KR/wnnenvrc_R -lib/wnn/ko_KR/wnnstat.msg -lib/wnn/serverdefs -@comment for 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 for Xwnmo -@dirrm lib/wnn/ko_KR/rk -@dirrm lib/wnn/ko_KR/dic/sys -@dirrm lib/wnn/ko_KR/dic/usr -@dirrm lib/wnn/ko_KR/dic -@dirrm lib/wnn/ko_KR -@comment for Xwnmo -@dirrm lib/wnn/ja_JP -@dirrm lib/wnn/lt_LN -@dirrm lib/wnn/zh_CN -@dirrm lib/wnn/zh_TW -@dirrm lib/wnn -@comment END for Xwnmo bin/kWnn4/katod bin/kWnn4/katof bin/kWnn4/kdtoa bin/kWnn4/kserver -bin/kWnn4/kuum bin/kWnn4/kwddel bin/kWnn4/kwdreg bin/kWnn4/kwnnkill bin/kWnn4/kwnnstat bin/kWnn4/kwnntouch @dirrm bin/kWnn4 -@cwd /usr/X11R6 -@comment for Xwnmo -bin/xwnmo -bin/killxwnmo -bin/xjutil -lib/X11/app-defaults/Xwnmo -@comment END for Xwnmo -lib/libkwnn4.so -lib/libkwnn4.so.1.0 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -lib/libkwnn.a -include/kwnn/commonhd.h -include/kwnn/cplib.h -include/kwnn/jllib.h -include/kwnn/jslib.h -include/kwnn/msg.h -include/kwnn/rk_spclval.h -include/kwnn/wnnerror.h -@dirrm include/kwnn -@comment for Xwnmo -man/man1/xwnmo.1.gz -man/man1/ximrc.1.gz -man/man1/ximconf.1.gz -man/man1/cvt_fun_tbl.1.gz -man/man1/cvt_meta_tbl.1.gz -man/man1/killxwnmo.1.gz -man/man1/cvt_xim_tbl.1.gz -man/man1/xjutil.1.gz -@comment END for Xwnmo +etc/rc.d/kWnn.sh +lib/wnn/ko_KR/dic/sys/full.fzk +lib/wnn/ko_KR/dic/sys/hword.dic +lib/wnn/ko_KR/dic/sys/single.dic +@dirrm lib/wnn/ko_KR/dic/sys +@dirrm lib/wnn/ko_KR/dic/usr +@dirrm lib/wnn/ko_KR/dic +@dirrm lib/wnn/ko_KR +@dirrm lib/wnn |