Updated for the change of the following (1) and (2):

(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 editors/mule*, too (^_^;;

6 files changed, 86 insertions, 36 deletions

diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index 8efebe555c4a..bbd0bd270943 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	files except executables for mule 2.3@19.34
+# New ports collection makefile for:	files except executables for mule
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
@@ -28,20 +28,20 @@ EMACS_VERSION=	19.34
 
 WRKDIRBASE=	${WRKDIRPREFIX}${.CURDIR:S,/editors/mule-common$,,}
 
-.for dir in 	chinese/mule-wnn4 \
+.for dir in 	chinese/mule-freewnn \
 		editors/mule \
-		japanese/mule-canna+sj3+wnn4 \
+		japanese/mule-canna+freewnn+sj3 \
 		japanese/mule-canna+sj3+wnn6 \
 		japanese/mule-canna+sj3 \
-		japanese/mule-canna+wnn4 \
+		japanese/mule-freewnn+canna \
 		japanese/mule-canna+wnn6 \
 		japanese/mule-canna \
-		japanese/mule-sj3+wnn4 \
+		japanese/mule-freewnn+sj3 \
 		japanese/mule-sj3+wnn6 \
 		japanese/mule-sj3 \
-		japanese/mule-wnn4 \
+		japanese/mule-freewnn \
 		japanese/mule-wnn6 \
-		korean/mule-wnn4
+		korean/mule-freewnn
 .if exists(${WRKDIRBASE}/${dir}/work/.install_done)
 WRKDIR=		${WRKDIRBASE}/${dir}/work
 .elif exists(${WRKDIRBASE}/${dir}/work/.build_done)
diff --git a/editors/mule-common/files/patch-mm b/editors/mule-common/files/patch-mm
index 2adc98e6b2a5..f0b930462208 100644
--- a/editors/mule-common/files/patch-mm
+++ b/editors/mule-common/files/patch-mm
@@ -1,6 +1,25 @@
---- configure.orig	Sat Sep 19 23:06:14 1998
-+++ configure	Sat Sep 19 23:14:44 1998
-@@ -564,11 +564,11 @@
+--- configure.orig	Fri Sep  8 14:13:47 2000
++++ configure	Fri Sep  8 14:15:09 2000
+@@ -38,6 +38,10 @@
+ ac_help="$ac_help
+   --with-wnn6             Use Wnn6 library to input Japanese or Chinese"
+ ac_help="$ac_help
++  --with-cwnn4            Use Wnn4 library to input Chinese"
++ac_help="$ac_help
++  --with-kwnn4            Use Wnn4 library to input Korean"
++ac_help="$ac_help
+   --with-wnn-includes=DIR Search for WNN header files in DIR"
+ ac_help="$ac_help
+   --with-wnn-libraries=DIR Search for WNN libraries in DIR"
+@@ -92,6 +96,7 @@
+ infodir='${prefix}/info'
+ mandir='${prefix}/man'
+ 
++wnnlib='-lwnn'
+ # Initialize some other variables.
+ subdirs=
+ MFLAGS= MAKEFLAGS=
+@@ -564,11 +569,11 @@
  emacs_prefix=emacs
  lispdir='${datadir}/${emacs_prefix}/${version}/lisp'
  locallisppath='${datadir}/${emacs_prefix}/${version}/site-lisp:'\
@@ -14,3 +33,35 @@
  archlibdir='${libexecdir}/${emacs_prefix}/${version}/${configuration}'
  docdir='${datadir}/${emacs_prefix}/${version}/etc'
  
+@@ -671,9 +676,16 @@
+ 
+ fi
+ 
++if test "${with_cwnn4+set}" = set; then
++    wnnlib=-lcwnn
++elif test "${with_kwnn4+set}" = set; then
++    wnnlib=-lkwnn
++fi
++
+ # Check whether --with-wnn6 or --without-wnn6 was given.
+ if test "${with_wnn6+set}" = set; then
+   withval="$with_wnn6"
++  wnnlib=-lwnn6
+   with_wnn=${withval}; cat >> confdefs.h <<\EOF
+ #define WNN6 1
+ EOF
+@@ -3104,12 +3116,12 @@
+   if test -n "${with_wnn_libraries}" ; then
+     if test -d ${with_wnn_libraries} ; then
+       LD_SWITCH_WNN="-L${with_wnn_libraries}"
+-      LIBS_MULE="${LIBS_MULE} -lwnn"
++      LIBS_MULE="${LIBS_MULE} ${wnnlib}"
+     else
+       LIBS_MULE="${LIBS_MULE} ${with_wnn_libraries}"
+     fi
+   else
+-    LIBS_MULE="${LIBS_MULE} -lwnn"
++    LIBS_MULE="${LIBS_MULE} ${wnnlib}"
+   fi
+ fi
+ 
diff --git a/editors/mule-common/pkg-descr b/editors/mule-common/pkg-descr
index 429f7e802a1b..5a3d397da9f1 100644
--- a/editors/mule-common/pkg-descr
+++ b/editors/mule-common/pkg-descr
@@ -2,9 +2,9 @@ This is emacs lisp files, info pages, and so on (except executables)
 for mule-2.3, a multilingual editor based on emacs-19.34.
 
 You must install one of packages, mule-2.3, ja-mule-*-2.3 (
-ja-mule-canna-2.3, ja-mule-canna+sj3-2.3, etc.), zh-mule-wnn4-2.3 and
-ko-mule-wnn4-2.3, each of which contains only the executables for
-mule-2.3.
+ja-mule-canna-2.3, ja-mule-canna+sj3-2.3, etc.), zh-mule-freewnn-2.3
+and ko-mule-freewnn-2.3, each of which contains only the executables
+for mule-2.3.
 
 This package and the above package of the executables *will* clobber
 any existing emacs installation.  In particular, the executables and
diff --git a/editors/mule-common/pkg-install b/editors/mule-common/pkg-install
index 505983632b38..aae183f1499a 100644
--- a/editors/mule-common/pkg-install
+++ b/editors/mule-common/pkg-install
@@ -4,6 +4,6 @@ if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
 echo "############################################################"
 echo "You must install one of packages, mule-2.3, ja-mule-*-2.3"
 echo "(ja-mule-canna-2.3, ja-mule-canna+sj3-2.3, etc.),"
-echo "zh-mule-wnn4-2.3 and ko-mule-wnn4-2.3, each of"
+echo "zh-mule-freewnn-2.3 and ko-mule-freewnn-2.3, each of"
 echo "which contains only the executables for mule-2.3"
 echo "############################################################"
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 702fb8284f10..c610c100b98c 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	mule 2.3@19.34
+# New ports collection makefile for:	mule
 # Date created:		6 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
@@ -28,7 +28,7 @@ BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
 MULE_VERSION=	2.3
 EMACS_VERSION=	19.34
 
-SLAVEDIRS=	chinese/mule-wnn4
+SLAVEDIRS=	chinese/mule-freewnn
 
 USE_XLIB=	yes
 EXTRACT_ONLY=	emacs-${EMACS_VERSION}b${EXTRACT_SUFX}
@@ -64,22 +64,22 @@ WITH_INPUT_METHOD+=	--with-canna --with-canna-libraries=${PREFIX}/lib \
 BUILD_INPUT_METHOD+=sj3serv:${PORTSDIR}/japanese/sj3
 WITH_INPUT_METHOD+= --with-sj3
 .endif
-.if defined(WNN4)
-BUILD_INPUT_METHOD+=${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
-WITH_INPUT_METHOD+=	--with-wnn4 --with-wnn-libraries=${X11BASE}/lib \
-		--with-wnn-includes=${X11BASE}/include/wnn
-.elif defined(CWNN4)
-BUILD_INPUT_METHOD+=${PREFIX}/bin/cWnn4/cserver:${PORTSDIR}/chinese/Wnn
-WITH_INPUT_METHOD+=	--with-wnn4 --with-wnn-libraries=${X11BASE}/lib/libcwnn.a \
-		--with-wnn-includes=${X11BASE}/include/cwnn
-.elif defined(KWNN4)
-BUILD_INPUT_METHOD+=${PREFIX}/bin/kWnn4/kserver:${PORTSDIR}/korean/Wnn
-WITH_INPUT_METHOD+=	--with-wnn4 --with-wnn-libraries=${X11BASE}/lib/libkwnn.a \
-		--with-wnn-includes=${X11BASE}/include/kwnn
+.if defined(FREEWNN)
+LIB_INPUT_METHOD+=wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
+WITH_INPUT_METHOD+=	--with-wnn4 --with-wnn-libraries=${LOCALBASE}/lib \
+		--with-wnn-includes=${LOCALBASE}/include/wnn
+.elif defined(CFREEWNN)
+LIB_INPUT_METHOD+=cwnn.0:${PORTSDIR}/chinese/FreeWnn-lib
+WITH_INPUT_METHOD+=	--with-wnn4 --with-cwnn4 --with-wnn-libraries=${LOCALBASE}/lib \
+		--with-wnn-includes=${LOCALBASE}/include/cwnn
+.elif defined(KFREEWNN)
+LIB_INPUT_METHOD+=kwnn.0:${PORTSDIR}/korean/FreeWnn-lib
+WITH_INPUT_METHOD+=	--with-wnn4 --with-kwnn4 --with-wnn-libraries=${LOCALBASE}/lib \
+		--with-wnn-includes=${LOCALBASE}/include/kwnn
 .elif defined(WNN6)
-BUILD_INPUT_METHOD+=${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib
-WITH_INPUT_METHOD+=	--with-wnn6 --with-wnn-libraries=${PREFIX}/lib/libwnn.a \
-		--with-wnn-includes=${PREFIX}/include/wnn
+LIB_INPUT_METHOD+=wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
+WITH_INPUT_METHOD+=	--with-wnn6 --with-wnn-libraries=${LOCALBASE}/lib \
+		--with-wnn-includes=${LOCALBASE}/include/wnn6/wnn
 .endif
 COMP_ELC=	egg.elc wnn-egg.elc sj3-client.elc sj3-egg.elc canna.elc
 ELC_DIR=	../lisp
@@ -143,19 +143,19 @@ pre-install:
 
 post-install:
 	strip ${PREFIX}/bin/${EMACS_EXECUTABLE}-${EMACS_VERSION}
-# for wnn4+sj3 or wnn6+sj3
+# for freewnn+sj3 or wnn6+sj3
 	@if [ -e ${PKGDIR}/INSTALL ]; then \
 		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL; \
 	fi
 # Installing site-start.el
 #   (we redefun set-korean-environment etc)
-.if defined(CWNN4)
+.if defined(CFREEWNN)
 	 ${SED} -e 's/;;\(.*\);;CHINESE$$/\1;;CHINESE/' \
 		-e 's/;;\(.*\);;not KOREAN$$/\1;;not KOREAN/' \
 		-e 's,%%X11BASE%%,${X11BASE},' \
 		-e 's,%%LOCALBASE%%,${LOCALBASE},' \
 		 ${FILESDIR}/site-start.el.tmpl >> ${SITE_START}
-.elif defined(KWNN4)
+.elif defined(KFREEWNN)
 	 ${SED} -e 's/;;\(.*\);;KOREAN$$/\1;;KOREAN/' \
 		-e 's,%%X11BASE%%,${X11BASE},' \
 		-e 's,%%LOCALBASE%%,${LOCALBASE},' \
diff --git a/editors/mule/pkg-descr b/editors/mule/pkg-descr
index bf27f0aa0d86..579f0a8fba5e 100644
--- a/editors/mule/pkg-descr
+++ b/editors/mule/pkg-descr
@@ -6,8 +6,7 @@ files, info pages, and so on (except executables) for mule-2.3.
 
 This package is not built with any particular language support.  If
 you want a built-in input method, look into the mule ports in
-language- specific directories.  Currently only Japanese (Canna, SJ3,
-Wnn4 and Wnn6) is available.
+language- specific directories.
 
 This package and the package, mule-common-2.3 are designed *not* to
 clobber any existing emacs installation.  In particular, the