(1) {chinese,korean,japanese}/Wnn (Wnn 4.2) was updated as follows:

  (a) Its name was changed from Wnn to FreeWnn because Wnn6 which is a
      commercial software exits
  (b) Its license was changed to GPL.
  (c) The method to configure was changed from imake to GNU configure.
  (d) Relatively to the original Wnn, the Wnn in the ports tree were
      modified by me a lot. Most of the modifications were adopted
      into FreeWnn.
  (c) Header and library files are installed into
      ${LOCALBASE}/{lib,include} instead of ${X11BASE}/{lib,include}.

(2) FreeWnn is divided into two ports FreeWnn-lib and FreeWnn-server
in chinese, korean and japanese categories. The former is for libwnn
and header files to compile client commands, and the files used in
client commands.  The latter is for a server to convert KANA to KANJI
(Chinese character), and dictionaries and files used by the server.

Notice: I forgot to commit FreeWnn-{lib,server} (^_^;;

8 files changed, 49 insertions, 283 deletions

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