(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.

6 files changed, 14 insertions, 14 deletions

diff --git a/editors/xemacs21-mule-common/Makefile b/editors/xemacs21-mule-common/Makefile
index 41ebaba625a7..46e035401371 100644
--- a/editors/xemacs21-mule-common/Makefile
+++ b/editors/xemacs21-mule-common/Makefile
@@ -25,9 +25,9 @@ XEMACS_MAJOR_VER=	21
 .for dir in \
 	editors/xemacs${XEMACS_MAJOR_VER}-mule \
 	japanese/xemacs${XEMACS_MAJOR_VER}-canna \
-	japanese/xemacs${XEMACS_MAJOR_VER}-canna+wnn4 \
+	japanese/xemacs${XEMACS_MAJOR_VER}-canna+freewnn \
 	japanese/xemacs${XEMACS_MAJOR_VER}-canna+wnn6 \
-	japanese/xemacs${XEMACS_MAJOR_VER}-wnn4 \
+	japanese/xemacs${XEMACS_MAJOR_VER}-freewnn \
 	japanese/xemacs${XEMACS_MAJOR_VER}-wnn6
 .if exists(${WRKDIRPREFIX}${.CURDIR}/../../${dir}/work/.install_done)
 WRKDIR=	${WRKDIRPREFIX}${.CURDIR}/../../${dir}/work
diff --git a/editors/xemacs21-mule-common/files/DESCR.tmpl b/editors/xemacs21-mule-common/files/DESCR.tmpl
index 10f90be633ce..01c98a9be2bf 100644
--- a/editors/xemacs21-mule-common/files/DESCR.tmpl
+++ b/editors/xemacs21-mule-common/files/DESCR.tmpl
@@ -2,7 +2,7 @@ This is XEmacs lisp files, info pages, and so on (except executables)
 for XEmacs with Mule(version %%XEMACS_VER%%), the next generation of Emacs. 
 
 You must install one of packages, xemacs-mule-%%XEMACS_VER%%,
-ja-xemacs-*-%%XEMACS_VER%% (ja-xemacs-canna-%%XEMACS_VER%%, ja-xemacs-canna+wnn4-%%XEMACS_VER%%, etc.),
+ja-xemacs-*-%%XEMACS_VER%% (ja-xemacs-canna-%%XEMACS_VER%%, ja-xemacs-canna+freewnn-%%XEMACS_VER%%, etc.),
 each of which contains only the executables for XEmacs with Mule(vresion %%XEMACS_VER%%).
 
 This package and the above package of the executables *will* clobber any
diff --git a/editors/xemacs21-mule-common/pkg-descr b/editors/xemacs21-mule-common/pkg-descr
index aec26fc3e405..eab63151383a 100644
--- a/editors/xemacs21-mule-common/pkg-descr
+++ b/editors/xemacs21-mule-common/pkg-descr
@@ -2,7 +2,7 @@ This is XEmacs lisp files, info pages, and so on (except executables)
 for XEmacs with Mule(version 21.1.12), the next generation of Emacs. 
 
 You must install one of packages, xemacs-mule-21.1.12,
-ja-xemacs-*-21.1.12 (ja-xemacs-canna-21.1.12, ja-xemacs-canna+wnn4-21.1.12, etc.),
+ja-xemacs-*-21.1.12 (ja-xemacs-canna-21.1.12, ja-xemacs-canna+freewnn-21.1.12, etc.),
 each of which contains only the executables for XEmacs with Mule(vresion 21.1.12).
 
 This package and the above package of the executables *will* clobber any
diff --git a/editors/xemacs21-mule/files/DESCR.tmpl b/editors/xemacs21-mule/files/DESCR.tmpl
index 29eb7e59ee17..8ab19f82ef5e 100644
--- a/editors/xemacs21-mule/files/DESCR.tmpl
+++ b/editors/xemacs21-mule/files/DESCR.tmpl
@@ -8,7 +8,7 @@ XEmacs with Mule(version %%XEMACS_VER%%).
 This package is not built with any particular language support except for
 already built-in Imput Method - SKK and SJ3.  If you want other built-in
 input method, look into the xemacs ports in language- specific directories.
-Currently only Japanese (Canna,Wnn4 and Wnn6) is available.
+Currently only Japanese (Canna, FreeWnn and Wnn6) is available.
 
 This package and the package, xemacs-common-%%XEMACS_VER%% are designed
 *not* to clobber any existing emacs installation.  In particular, the
diff --git a/editors/xemacs21-mule/pkg-descr b/editors/xemacs21-mule/pkg-descr
index c970736de07b..26b29cdb2748 100644
--- a/editors/xemacs21-mule/pkg-descr
+++ b/editors/xemacs21-mule/pkg-descr
@@ -8,7 +8,7 @@ XEmacs with Mule(version 21.1.12).
 This package is not built with any particular language support except for
 already built-in Imput Method - SKK and SJ3.  If you want other built-in
 input method, look into the xemacs ports in language- specific directories.
-Currently only Japanese (Canna,Wnn4 and Wnn6) is available.
+Currently only Japanese (Canna, FreeWnn and Wnn6) is available.
 
 This package and the package, xemacs-common-21.1.12 are designed
 *not* to clobber any existing emacs installation.  In particular, the
diff --git a/editors/xemacs21-sumo/pkg-descr b/editors/xemacs21-sumo/pkg-descr
index fad3a4ce8939..4e5dc8d8b4ac 100644
--- a/editors/xemacs21-sumo/pkg-descr
+++ b/editors/xemacs21-sumo/pkg-descr
@@ -5,16 +5,16 @@ xemacs-mule-packages in addition).
 
 Each package except for xemacs21-sumo is built with Multilingual Imput
 Methods. Especially, Japanese input is supported by using SKK, SJ3, Canna,
-Wnn4 or Wnn6 as an external input engine . Each input method would be
+FreeWnn or Wnn6 as an external input engine . Each input method would be
 supported in following ports respectively:
 
-	editors/xemacs21-sumo ............... No input method supports
-	editors/xemacs21-mule-sumo .......... SKK, SJ3
-	japanese/xemacs21-sumo-canna ........ SKK, SJ3, Canna
-	japanese/xemacs21-sumo-canna+wnn4 ... SKK, SJ3, Canna, Wnn4
-	japanese/xemacs21-sumo-canna+wnn6 ... SKK, SJ3, Canna, Wnn6
-	japanese/xemacs21-sumo-wnn4 ......... SKK, SJ3, Wnn4
-	japanese/xemacs21-sumo-wnn6 ......... SKK, SJ3, Wnn6
+	editors/xemacs21-sumo ................. No input method supports
+	editors/xemacs21-mule-sumo ............ SKK, SJ3
+	japanese/xemacs21-sumo-canna .......... SKK, SJ3, Canna
+	japanese/xemacs21-sumo-canna+freewnn .. SKK, SJ3, Canna, FreeWnn
+	japanese/xemacs21-sumo-canna+wnn6 ..... SKK, SJ3, Canna, Wnn6
+	japanese/xemacs21-sumo-freewnn ........ SKK, SJ3, FreeWnn
+	japanese/xemacs21-sumo-wnn6 ........... SKK, SJ3, Wnn6
 
 If you use with SJ3 or SKK, you should be installed sj3serv or skkserv
 in advance. SKK is supported as already builtin. Also it will