4 files changed, 136 insertions, 14 deletions

diff --git a/korean/FreeWnn-lib/pkg-descr b/korean/FreeWnn-lib/pkg-descr
index ebff613a950f..776b3eaacbb9 100644
--- a/korean/FreeWnn-lib/pkg-descr
+++ b/korean/FreeWnn-lib/pkg-descr
@@ -2,7 +2,7 @@ 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.
 
-Only the Korean version is build for this port.
+Only the Korean version is built for this port.
 
 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
@@ -13,10 +13,10 @@ know why.
 
 -------------------------------------------------------------------
 
-This also include some patches for FreeBSD or bugfix.
-If use this patches, you can compile Wnn-4.2 under XFree86 3.1.2E
- or later(X11Release6.1).
-If there are any problem in this patches, please know me via E-mail.
+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)
@@ -24,11 +24,11 @@ Hidekazu Kuroki
 -------------------------------------------------------------------
 
 Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for Wnn4.2.
-Patches for those are in 'Wnn4.2.patch.tar.gz' and are applied in this
+Patches for those are in 'Wnn4.2.patch-YYMMDD.tar.gz' and are applied in this
 port.
 
 [Notice]
-When compiling by this ports, if $LOCALBASE is not '/usr/local' and/or
+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.
diff --git a/korean/FreeWnn-lib/pkg-plist b/korean/FreeWnn-lib/pkg-plist
index f366cdbd84fe..f382d726a6be 100644
--- a/korean/FreeWnn-lib/pkg-plist
+++ b/korean/FreeWnn-lib/pkg-plist
@@ -29,12 +29,53 @@ 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
@@ -47,6 +88,16 @@ 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
@@ -56,3 +107,13 @@ 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
diff --git a/korean/FreeWnn-server/pkg-descr b/korean/FreeWnn-server/pkg-descr
index ebff613a950f..776b3eaacbb9 100644
--- a/korean/FreeWnn-server/pkg-descr
+++ b/korean/FreeWnn-server/pkg-descr
@@ -2,7 +2,7 @@ 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.
 
-Only the Korean version is build for this port.
+Only the Korean version is built for this port.
 
 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
@@ -13,10 +13,10 @@ know why.
 
 -------------------------------------------------------------------
 
-This also include some patches for FreeBSD or bugfix.
-If use this patches, you can compile Wnn-4.2 under XFree86 3.1.2E
- or later(X11Release6.1).
-If there are any problem in this patches, please know me via E-mail.
+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)
@@ -24,11 +24,11 @@ Hidekazu Kuroki
 -------------------------------------------------------------------
 
 Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for Wnn4.2.
-Patches for those are in 'Wnn4.2.patch.tar.gz' and are applied in this
+Patches for those are in 'Wnn4.2.patch-YYMMDD.tar.gz' and are applied in this
 port.
 
 [Notice]
-When compiling by this ports, if $LOCALBASE is not '/usr/local' and/or
+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.
diff --git a/korean/FreeWnn-server/pkg-plist b/korean/FreeWnn-server/pkg-plist
index f366cdbd84fe..f382d726a6be 100644
--- a/korean/FreeWnn-server/pkg-plist
+++ b/korean/FreeWnn-server/pkg-plist
@@ -29,12 +29,53 @@ 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
@@ -47,6 +88,16 @@ 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
@@ -56,3 +107,13 @@ 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