Fix many bugs. Share files that can be shared.

PR:		4409
Submitted by:	Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>

41 files changed, 2436 insertions, 158 deletions

diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index bafef6824aba..3d3042e83374 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -1,32 +1,85 @@
-# New ports collection makefile for:	Wnn
+# New ports collection makefile for:	Wnn for Japanese
 # Version required:	4.2
-# Date created:		22 November 1994
-# Whom:			asami
+# Date created:		20 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.15 1997/04/16 05:00:02 asami Exp $
+# $Id: Makefile,v 1.16 1997/06/19 11:26:07 asami Exp $
 #
 
 DISTNAME=	Wnn4.2
-PKGNAME=	jp-Wnn-4.2
-CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/
+PKGNAME?=	jp-Wnn-4.2
+CATEGORIES?=	japanese
+MASTER_SITES=	ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/ \
+		ftp://ports.jp.FreeBSD.org/pub/incoming/distfiles/
+DISTFILES=	Wnn4.2.tar.gz Wnn4.2.patch.tar.gz
 
-MAINTAINER=	asami@FreeBSD.ORG
+MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
 
+EXTRACT_ONLY=	Wnn4.2.tar.gz
+PATCHDIR=	${.CURDIR}/../../japanese/Wnn/patches
+FILESDIR=	${.CURDIR}/../../japanese/Wnn/files
+PKGDIR=		${.CURDIR}/../../japanese/Wnn/pkg
 WRKSRC=		${WRKDIR}/Xsi
 IS_INTERACTIVE=	yes	# needs "wnn" user
 
+.if (${PKGNAME} == jp-Wnn-4.2)
+PORT_DOCDIR=	${PREFIX}/share/doc/jp-Wnn
+DOC_FROM=	${WRKSRC}/Wnn
+.elif (${PKGNAME} == cn-Wnn-4.2)
+PORT_DOCDIR=	${PREFIX}/share/doc/cn-Wnn
+DOC_FROM=	${WRKSRC}/cWnn
+.endif  # kWnn has no manual.
+
 post-extract:
+	${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} \
+		${_DISTDIR}/Wnn4.2.patch.tar.gz
 	/bin/ln -sf Project.tmpl ${WRKSRC}/config/X11.tmpl
 
+pre-patch:
+	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Wnn4.2.patch
+
+# Applying a patch for depending on language
+post-patch:
+	case ${PKGNAME} in \
+	  jp-Wnn-4.2) \
+		LANG_PATCH=${FILESDIR}/patch-for-japanese;; \
+	  cn-Wnn-4.2) \
+		LANG_PATCH=${FILESDIR}/patch-for-chinese;; \
+	  kr-Wnn-4.2) \
+		LANG_PATCH=${FILESDIR}/patch-for-korean;; \
+	esac; \
+	(cd ${_DISTDIR}; \
+		${PATCH} ${PATCH_DIST_ARGS} < $${LANG_PATCH})
+
+# for PREFIX
+pre-build:
+	for file in ${WRKSRC}/config/Project.tmpl \
+		${WRKSRC}/Contrib/dic/gerodic/Makefile; do \
+	  mv $$file $$file.orig2; \
+	  sed 's!^\([ ]*PREFIX = \).*$$!\1${PREFIX}!' \
+		$$file.orig2 > $$file; \
+	done
+
 # These are necesary because this package uses a different Makefile for
 #  building and installing etc.
 do-build:
-	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
+
+pre-install:
+	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 
 post-install:
 # 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
 
 .include <bsd.port.mk>
diff --git a/japanese/FreeWnn-lib/distinfo b/japanese/FreeWnn-lib/distinfo
index a8a59701e1d9..1571e84d8e7f 100644
--- a/japanese/FreeWnn-lib/distinfo
+++ b/japanese/FreeWnn-lib/distinfo
@@ -1 +1,2 @@
 MD5 (Wnn4.2.tar.gz) = dcb6271403577199e8141d07cd54be73
+MD5 (Wnn4.2.patch.tar.gz) = 9cfd1547623774f2f8e92f05c1725da8
diff --git a/japanese/FreeWnn-lib/files/patch-aa b/japanese/FreeWnn-lib/files/patch-aa
index f7bd47d50fc8..2ac4202cc650 100644
--- a/japanese/FreeWnn-lib/files/patch-aa
+++ b/japanese/FreeWnn-lib/files/patch-aa
@@ -75,50 +75,6 @@ diff -arcN ../Xsi.org/Wnn/pubdic/Imakefile ./Wnn/pubdic/Imakefile
   InstallMultiple($(FZK_SRC),$(JWNNFZKSRCDIR))
   
   depend::
-diff -arcN ../Xsi.org/Wnn/uum/jhlp.c ./Wnn/uum/jhlp.c
-*** ../Xsi.org/Wnn/uum/jhlp.c	Fri Aug 19 10:32:12 1994
---- ./Wnn/uum/jhlp.c	Wed Aug 21 20:19:26 1996
-***************
-*** 771,777 ****
-  #endif
-      int pid;
-  
-!     if ((pid = wait3(&status, WNOHANG | WUNTRACED, NULL)) == child_id) {
-  	if (WIFSTOPPED(status)) {
-  #ifdef SIGCONT
-  	    kill(pid, SIGCONT);
---- 771,782 ----
-  #endif
-      int pid;
-  
-! /*
-!  * 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);
-***************
-*** 1636,1642 ****
---- 1641,1656 ----
-  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
-+  */
-+ #ifdef __FreeBSD__
-+     sprintf(b, "%s%1c%1c", pty, "pqrsPQRS"[(no >> 5)], ((no & 0x1f > 9)? 'a' : '0') + (no & 0x1f));
-+ #else /* ! __FreeBSD__ */
-      sprintf(b, "%s%1c%1x", pty, 'p' + (no >> 4), no & 0x0f);
-+ #endif /* ! __FreeBSD__ */
-  }
-  #endif /* !sgi */
-  
 diff -arcN ../Xsi.org/config/Project.tmpl ./config/Project.tmpl
 *** ../Xsi.org/config/Project.tmpl	Mon Aug 29 17:40:17 1994
 --- ./config/Project.tmpl	Wed Aug 21 20:07:05 1996
@@ -175,43 +131,22 @@ diff -arcN ../Xsi.org/config/Project.tmpl ./config/Project.tmpl
   
   #define WnnInstallDicMultiple(list,dest)				@@\
 ***************
-*** 1134,1150 ****
-  		$(WNNTOUCH) $(DESTDIR)dest/$$i); fi \			@@\
-  	done
-  
-  #ifndef BuildWnn
-  #define BuildWnn	YES
-  #endif
-  #ifndef BuildCWnn
-! #define BuildCWnn	YES
-  #endif
-  #ifndef BuildKWnn
-! #define BuildKWnn	YES
-  #endif
-  #ifndef BuildXwnmo
-! #define BuildXwnmo	YES
-  #endif
-  
-  #ifndef BuildJserver
---- 1145,1165 ----
-  		$(WNNTOUCH) $(DESTDIR)dest/$$i); fi \			@@\
-  	done
-  
-+ /*
-+  *  Only Japanese
-+  *    - Satoshi
-+  */
-  #ifndef BuildWnn
-  #define BuildWnn	YES
-  #endif
-  #ifndef BuildCWnn
-! #define BuildCWnn	NO
-  #endif
-  #ifndef BuildKWnn
-! #define BuildKWnn	NO
+*** 1236,1243 ****
+  #else
+            IMTOP = $(CONTRIBSRC)/programs/Xsi
   #endif
-  #ifndef BuildXwnmo
-! #define BuildXwnmo	NO
+!       WNNWNNDIR = /usr/local/lib/wnn
+!       WNNBINDIR = /usr/local/bin
+        WNNINCDIR = $(INCROOT)
+        WNNLIBDIR = $(USRLIBDIR)
+      WNNTERM_LIB = termLibrary
+--- 1251,1259 ----
+  #else
+            IMTOP = $(CONTRIBSRC)/programs/Xsi
   #endif
-  
-  #ifndef BuildJserver
+!          PREFIX = /usr/local
+!       WNNWNNDIR = ${PREFIX}/lib/wnn
+!       WNNBINDIR = ${PREFIX}/bin
+        WNNINCDIR = $(INCROOT)
+        WNNLIBDIR = $(USRLIBDIR)
+      WNNTERM_LIB = termLibrary
diff --git a/japanese/FreeWnn-lib/files/patch-ab b/japanese/FreeWnn-lib/files/patch-ab
index 5bcae60ee528..92af97ad2933 100644
--- a/japanese/FreeWnn-lib/files/patch-ab
+++ b/japanese/FreeWnn-lib/files/patch-ab
@@ -1,19 +1,29 @@
---- ./Wnn/jserver/de.c.org	Thu Aug 18 18:31:23 1994
-+++ ./Wnn/jserver/de.c	Fri Feb 28 01:13:16 1997
-@@ -264,7 +264,16 @@
+--- ./Wnn/jserver/de.c.orig	Fri Aug 19 10:31:23 1994
++++ ./Wnn/jserver/de.c	Fri Aug  1 18:54:55 1997
+@@ -65,6 +65,9 @@
+ 
+ #include <sys/ioctl.h>
+ 
++#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){
-+#ifndef __FreeBSD__
++#if !(defined(BSD) && (BSD >= 199306)) /* !4.4BSD-Lite by Taoka */
  	    fclose(stderr);
-+#else /* __FreeBSD__ */
++#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 /* __FreeBSD__ */
++#endif /* 4.4BSD-Lite */
  	}
  
  #if defined(hpux) || defined(SOLARIS)
diff --git a/japanese/FreeWnn-lib/files/patch-ad b/japanese/FreeWnn-lib/files/patch-ad
new file mode 100644
index 000000000000..0cbf0efb0822
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-ad
@@ -0,0 +1,40 @@
+--- ./Wnn/jserver/b_index.c.orig	Tue Jun 28 11:06:49 1994
++++ ./Wnn/jserver/b_index.c	Sat Jul 19 00:45:21 1997
+@@ -99,8 +99,8 @@
+ 
+ 	/** For each tuple in ri1[0] create b_nodes */
+ 	for (i=0; i<jt->maxri1[0]; i++){	
+-		serial = (jt->ri1[0]+i)->pter;
+-	    	yomi = KANJI_str(jt->ri2[serial].kanjipter + jt->kanji, 0);
++		serial = ntohs((jt->ri1[0]+i)->pter);
++	    	yomi = KANJI_str(ntohs(jt->ri2[serial].kanjipter) + jt->kanji, 0);
+ 		b_index_add(jt, yomi, serial);
+ 	}
+ 	return(b_cnt);
+@@ -133,7 +133,7 @@
+ int   serial;
+ {
+ 	w_char *yomi;
+-	yomi = KANJI_str(jt->ri2[serial].kanjipter + jt->kanji, 0);
++	yomi = KANJI_str(ntohs(jt->ri2[serial].kanjipter) + jt->kanji, 0);
+ 	delete_b_node(jt, yomi, 0, 0 );
+ }
+ 
+@@ -160,7 +160,7 @@
+ 			tmp_node = jt->bind[tmp_node].pter_son;
+ 		}
+ 		yo_kanji = KANJI_str( 
+-		jt->ri2[jt->bind[tmp_node].pter].kanjipter+jt->kanji, 0);
++		ntohs(jt->ri2[jt->bind[tmp_node].pter].kanjipter)+jt->kanji, 0);
+ 		if  ( yomi[level] > yo_kanji[level] ) {
+ 			buf_node1 = buf_node2;
+ 			buf_node2 = jt->bind[buf_node2].pter_next ;
+@@ -216,7 +216,7 @@
+ 			tmp_node = jt->bind[tmp_node].pter_son;
+ 		}
+ 		yo_kanji = KANJI_str( 
+-		jt->ri2[jt->bind[tmp_node].pter].kanjipter+jt->kanji, 0);
++		ntohs(jt->ri2[jt->bind[tmp_node].pter].kanjipter)+jt->kanji, 0);
+ 
+ 		if  ( yomi[level] > yo_kanji[level] ) {
+ 			buf_node1 = buf_node2;
diff --git a/japanese/FreeWnn-lib/files/patch-ae b/japanese/FreeWnn-lib/files/patch-ae
new file mode 100644
index 000000000000..7ea048b9903a
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-ae
@@ -0,0 +1,14 @@
+--- ./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
+ #
+ 
+-WNNBINDIR=/usr/local/bin/Wnn4
+-WNNWNNDIR=/usr/local/lib/wnn
++PREFIX = /usr/local
++WNNBINDIR=${PREFIX}/bin/Wnn4
++WNNWNNDIR=${PREFIX}/lib/wnn
+ 
+ WNNOWNER=wnn
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-af b/japanese/FreeWnn-lib/files/patch-af
new file mode 100644
index 000000000000..7bda975ebb7d
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-af
@@ -0,0 +1,45 @@
+--- 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
+ 
+-#ifdef JAPANSE
++#ifdef JAPANESE
+ extern  int eujis_to_jis8(), eujis_to_sjis();
+ #endif
+ #ifdef CHINESE
+@@ -129,13 +129,13 @@
+ 	strcpy(lang, WNN_DEFAULT_LANG);
+ 
+ #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, "wnnstat [-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
new file mode 100644
index 000000000000..d11ee32a427b
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-ag
@@ -0,0 +1,11 @@
+--- ./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
+ 
+-setjishopath    @LIBDIR/@LANG/dic/pubdic/
++setjishopath    @LIBDIR/@LANG/dic/sys/
+ sethindopath    @LIBDIR/@LANG/dic/usr/@USR/
+ 
+ setuumkey	@LIBDIR/@LANG/uumkey
diff --git a/japanese/FreeWnn-lib/files/patch-ah b/japanese/FreeWnn-lib/files/patch-ah
new file mode 100644
index 000000000000..a4fa296159c4
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-ah
@@ -0,0 +1,41 @@
+--- ./kWnn/etc/Imakefile.orig	Wed Aug 17 10:11:33 1994
++++ ./kWnn/etc/Imakefile	Sat Jul 19 23:53:01 1997
+@@ -1,6 +1,8 @@
+ XCOMM
+ XCOMM $Id: Imakefile,v 1.2 1994/08/17 01:11:33 kuwa Exp $
+ 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()
diff --git a/japanese/FreeWnn-lib/files/patch-ai b/japanese/FreeWnn-lib/files/patch-ai
new file mode 100644
index 000000000000..e7cf3360fbb4
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-ai
@@ -0,0 +1,61 @@
+--- ./kWnn/jlib/Imakefile.orig	Wed Aug 17 10:11:40 1994
++++ ./kWnn/jlib/Imakefile	Sat Jul 19 23:55:17 1997
+@@ -1,6 +1,9 @@
+ XCOMM
+ XCOMM $Id: Imakefile,v 1.2 1994/08/17 01:11:40 kuwa Exp $
+ XCOMM
++XCOMM For Mule, add sources (yincoding.c py_table.c zy_table.c) 1
++XCOMM   -- S. Taoka
++XCOMM
+ #define DoNormalLib YES
+ 
+ #include <Library.tmpl>
+@@ -10,7 +13,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 +33,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,8 +54,8 @@
+ 	$(KWNNROMKANSRC)/rk_read.o \
+ 	$(KWNNROMKANSRC)/rk_vars.o
+ 
+-LOCAL_ETCSRCS = $(SRC4) $(SRC5)
+-LOCAL_ETCOBJS = $(OBJ4) $(OBJ5)
++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)
+ 
+@@ -80,6 +94,10 @@
+ WnnSpecialObjectRule($(OBJ3),$(SRC3),$(KWNNETCSRC),)
+ WnnSpecialObjectRule($(OBJ4),$(SRC4),$(KWNNETCSRC),)
+ WnnSpecialObjectRule($(OBJ5),$(SRC5),$(KWNNETCSRC),)
++WnnSpecialObjectRule($(OBJ6),$(SRC6),$(KWNNETCSRC),)
++WnnSpecialObjectRule($(OBJ7),$(SRC7),$(KWNNETCSRC),)
++WnnSpecialObjectRule($(OBJ8),$(SRC8),$(KWNNETCSRC),)
++
+ 
+ $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS)
+ 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
diff --git a/japanese/FreeWnn-lib/files/patch-aj b/japanese/FreeWnn-lib/files/patch-aj
new file mode 100644
index 000000000000..53e082d82d66
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-aj
@@ -0,0 +1,28 @@
+--- ./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()
diff --git a/japanese/FreeWnn-lib/files/patch-ak b/japanese/FreeWnn-lib/files/patch-ak
new file mode 100644
index 000000000000..1181bb7434f6
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-ak
@@ -0,0 +1,79 @@
+--- ../Xsi.orig/Wnn/uum/jhlp.c	Fri Aug 19 10:32:12 1994
++++ ./Wnn/uum/jhlp.c	Fri Aug  1 18:54:18 1997
+@@ -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 */
+@@ -263,9 +266,11 @@
+ 
+ 
+ #if defined(BSD42) && !defined(DGUX)
++#if !(defined(BSD) && (BSD >= 199306))
+     if (saveutmp() < 0) {
+ 	puts("Can't save utmp\n");
+     }
++#endif
+ #endif /* BSD42 */
+ 
+ 
+@@ -771,7 +776,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 +1150,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 +1574,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 +1650,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 */
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-al b/japanese/FreeWnn-lib/files/patch-al
new file mode 100644
index 000000000000..d4423556f7af
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-al
@@ -0,0 +1,20 @@
+--- ./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
+ 
diff --git a/japanese/FreeWnn-lib/pkg-descr b/japanese/FreeWnn-lib/pkg-descr
index 60092fe9c5ac..88f516557c04 100644
--- a/japanese/FreeWnn-lib/pkg-descr
+++ b/japanese/FreeWnn-lib/pkg-descr
@@ -20,3 +20,12 @@ If there are any problem in this patches, please know 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.tar.gz' and are applied in this
+port.
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/FreeWnn-lib/pkg-plist b/japanese/FreeWnn-lib/pkg-plist
index fd5464ef594e..38a8ffed7d74 100644
--- a/japanese/FreeWnn-lib/pkg-plist
+++ b/japanese/FreeWnn-lib/pkg-plist
@@ -1,5 +1,5 @@
-@cwd /usr/local
-@exec mkdir -p %D/lib/wnn/ja_JP/dic/usr
+@cwd %%LOCALBASE%%
+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
@@ -108,9 +108,266 @@ bin/Wnn4/atod
 bin/Wnn4/atof
 bin/Wnn4/wnntouch
 @dirrm bin/Wnn4
-@cwd /usr/X11R6
+share/doc/jp-Wnn/manual/0/contents
+share/doc/jp-Wnn/manual/1.intro/Intro1
+share/doc/jp-Wnn/manual/1.intro/Intro2
+share/doc/jp-Wnn/manual/1.intro/Intro3
+share/doc/jp-Wnn/manual/2.env/Intro
+share/doc/jp-Wnn/manual/2.env/dic/pubdic
+share/doc/jp-Wnn/manual/2.env/dic/usr_dic
+share/doc/jp-Wnn/manual/2.env/dic/ujis_dic
+share/doc/jp-Wnn/manual/2.env/wnn/2a_ctrl
+share/doc/jp-Wnn/manual/2.env/wnn/2b_romkana
+share/doc/jp-Wnn/manual/2.env/wnn/cvt_key
+share/doc/jp-Wnn/manual/2.env/wnn/fzk.data
+share/doc/jp-Wnn/manual/2.env/wnn/fzk.u
+share/doc/jp-Wnn/manual/2.env/wnn/hinsi_data
+share/doc/jp-Wnn/manual/2.env/wnn/jserverrc
+share/doc/jp-Wnn/manual/2.env/wnn/mode
+share/doc/jp-Wnn/manual/2.env/wnn/serverdefs
+share/doc/jp-Wnn/manual/2.env/wnn/uumkey
+share/doc/jp-Wnn/manual/2.env/wnn/uumrc
+share/doc/jp-Wnn/manual/2.env/wnn/wnnenvrc
+share/doc/jp-Wnn/manual/3.libwnn/Intro
+share/doc/jp-Wnn/manual/3.libwnn/include
+share/doc/jp-Wnn/manual/3.libwnn/j_intro
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/TITLE.DOC
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/bun_suu
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/c_zenkouho
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/close
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/connect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/connect_lang
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dai_top
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_add
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_comment_se
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_delete
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_list
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_save
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_use
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/disconnect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/env
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/env_set
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/env_sticky
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/fuzokugo_get
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/fuzokugo_set
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/get_kanji
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/get_zenkouho_k
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_dicts
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_list
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_name
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_number
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/inspect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/isconnect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/jiri_len
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/kanji_len
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/kill
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/next
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/nobi_conv
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/open
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/open_lang
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/param_get
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/ren_conv
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/set_env_wnnrc
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/set_jikouho
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/tan_conv
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/update_hindo
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_add
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_comment_s
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_delete
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_info
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_search
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_use
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_bun
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_dai
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_daip
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_suu
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/TITLE.DOC
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/access
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/close
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/connect
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_add
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_creat
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_creat_cl
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_delete
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_info
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_list_all
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_use
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/disconnect
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/env_exist
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/env_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/env_sticky
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_comment_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_discard
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_info
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_list_all
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_loaded
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_loaded_lo
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_passwd_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kanren
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_read
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_receive
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_remove
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_remove_cl
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_send
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_stat
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_write
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/fuzokugo_get
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/fuzokugo_set
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hindo_creat
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hindo_creat_cl
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hindo_set
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_dicts
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_name
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_number
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_table_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/isconnect
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kantan_dai
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kantan_sho
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kanzen_sho
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kanzen_dai
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kill
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/who
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/mkdir
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/open
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/open_lang
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/param_get
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/set_lang
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/version
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_add
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_comment_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_delete
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_info
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_search
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_clear
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_dispmod
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_getc
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_init
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_next
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_ungetc
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/Intro
+share/doc/jp-Wnn/manual/3.libwnn/misc_lib/msg_close
+share/doc/jp-Wnn/manual/3.libwnn/misc_lib/msg_get
+share/doc/jp-Wnn/manual/3.libwnn/misc_lib/msg_open
+share/doc/jp-Wnn/manual/4.cmd/uum
+share/doc/jp-Wnn/manual/4.cmd/wnnkill
+share/doc/jp-Wnn/manual/4.cmd/wnnstat
+share/doc/jp-Wnn/manual/4.cmd/jserver
+share/doc/jp-Wnn/manual/5.op/Intro
+share/doc/jp-Wnn/manual/5.op/op1.1
+share/doc/jp-Wnn/manual/5.op/op1.2
+share/doc/jp-Wnn/manual/5.op/op1.3
+share/doc/jp-Wnn/manual/5.op/op2.1
+share/doc/jp-Wnn/manual/5.op/op2.2
+share/doc/jp-Wnn/manual/5.op/op2.2.1
+share/doc/jp-Wnn/manual/5.op/op2.3
+share/doc/jp-Wnn/manual/5.op/op2.4
+share/doc/jp-Wnn/manual/5.op/op3.1
+share/doc/jp-Wnn/manual/5.op/op3.3
+share/doc/jp-Wnn/manual/5.op/op3.5
+share/doc/jp-Wnn/manual/5.op/op3.7
+share/doc/jp-Wnn/manual/5.op/op3.8
+share/doc/jp-Wnn/manual/5.op/op3.83
+share/doc/jp-Wnn/manual/5.op/op3.85
+share/doc/jp-Wnn/manual/5.op/op3.87
+share/doc/jp-Wnn/manual/5.op/op3.88
+share/doc/jp-Wnn/manual/6.jutil/Intro
+share/doc/jp-Wnn/manual/6.jutil/atod
+share/doc/jp-Wnn/manual/6.jutil/atof
+share/doc/jp-Wnn/manual/6.jutil/dictionary
+share/doc/jp-Wnn/manual/6.jutil/dtoa
+share/doc/jp-Wnn/manual/6.jutil/wddel
+share/doc/jp-Wnn/manual/6.jutil/wdreg
+share/doc/jp-Wnn/manual/6.jutil/wnntouch
+share/doc/jp-Wnn/manual/6.jutil/oldatonewa
+share/doc/jp-Wnn/manual/intro
+share/doc/jp-Wnn/manual/v3tov4/v3tov4
+share/doc/jp-Wnn/manual/7.Protocol/KKTP
+share/doc/jp-Wnn/manual.en/2.env/wnn/serverdefs
+share/doc/jp-Wnn/manual.en/2.env/wnn/jserverrc
+share/doc/jp-Wnn/manual.en/2.env/wnn/uumrc
+share/doc/jp-Wnn/manual.en/2.env/wnn/wnnenvrc
+share/doc/jp-Wnn/manual.en/2.env/wnn/uumkey
+share/doc/jp-Wnn/manual.en/2.env/wnn/mode
+share/doc/jp-Wnn/manual.en/2.env/wnn/2a_ctrl
+share/doc/jp-Wnn/manual.en/2.env/wnn/2b_romkana
+share/doc/jp-Wnn/manual.en/2.env/wnn/full.fzk
+share/doc/jp-Wnn/manual.en/4.cmd/jserver
+share/doc/jp-Wnn/manual.en/4.cmd/uum
+share/doc/jp-Wnn/manual.en/4.cmd/wnnkill
+share/doc/jp-Wnn/manual.en/4.cmd/wnnstat
+share/doc/jp-Wnn/manual.en/5.op/README.en
+share/doc/jp-Wnn/manual.en/5.op/README.ja
+share/doc/jp-Wnn/manual.en/5.op/contents
+share/doc/jp-Wnn/manual.en/5.op/contents.2
+share/doc/jp-Wnn/manual.en/5.op/op1
+share/doc/jp-Wnn/manual.en/5.op/fig2.2.1.Z
+share/doc/jp-Wnn/manual.en/5.op/op2.1
+share/doc/jp-Wnn/manual.en/5.op/op2.2
+share/doc/jp-Wnn/manual.en/5.op/op2.3
+share/doc/jp-Wnn/manual.en/5.op/op2.4
+share/doc/jp-Wnn/manual.en/5.op/op2.5
+share/doc/jp-Wnn/manual.en/5.op/op2.6
+share/doc/jp-Wnn/manual.en/5.op/op2.7
+share/doc/jp-Wnn/manual.en/5.op/op2.8
+share/doc/jp-Wnn/manual.en/5.op/op2.9
+share/doc/jp-Wnn/manual.en/5.op/op3.1
+share/doc/jp-Wnn/manual.en/5.op/op3.2
+share/doc/jp-Wnn/manual.en/5.op/op3.3
+share/doc/jp-Wnn/manual.en/5.op/op3.4
+share/doc/jp-Wnn/manual.en/5.op/op3.5
+share/doc/jp-Wnn/manual.en/5.op/op3.6
+share/doc/jp-Wnn/manual.en/5.op/op3.7
+share/doc/jp-Wnn/manual.en/5.op/op3.8
+share/doc/jp-Wnn/manual.en/5.op/op3.9
+share/doc/jp-Wnn/manual.en/5.op/fig2.2.2.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.1.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.11.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.18.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.3.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.4.Z
+share/doc/jp-Wnn/manual.en/5.op/table2.2.1.Z
+share/doc/jp-Wnn/manual.en/6.jutil/atod
+share/doc/jp-Wnn/manual.en/6.jutil/wdreg
+share/doc/jp-Wnn/manual.en/6.jutil/dtoa
+share/doc/jp-Wnn/manual.en/6.jutil/atof
+share/doc/jp-Wnn/manual.en/6.jutil/wnntouch
+share/doc/jp-Wnn/manual.en/6.jutil/wddel
+@dirrm share/doc/jp-Wnn/manual/v3tov4
+@dirrm share/doc/jp-Wnn/manual/7.Protocol
+@dirrm share/doc/jp-Wnn/manual/6.jutil
+@dirrm share/doc/jp-Wnn/manual/5.op
+@dirrm share/doc/jp-Wnn/manual/4.cmd
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/rk_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/misc_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/js_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/jl_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn
+@dirrm share/doc/jp-Wnn/manual/2.env/wnn
+@dirrm share/doc/jp-Wnn/manual/2.env/dic
+@dirrm share/doc/jp-Wnn/manual/2.env
+@dirrm share/doc/jp-Wnn/manual/1.intro
+@dirrm share/doc/jp-Wnn/manual/0
+@dirrm share/doc/jp-Wnn/manual.en/6.jutil
+@dirrm share/doc/jp-Wnn/manual.en/5.op
+@dirrm share/doc/jp-Wnn/manual.en/4.cmd
+@dirrm share/doc/jp-Wnn/manual.en/3.libwnn
+@dirrm share/doc/jp-Wnn/manual.en/2.env/wnn
+@dirrm share/doc/jp-Wnn/manual.en/2.env/dic
+@dirrm share/doc/jp-Wnn/manual.en/2.env
+@dirrm share/doc/jp-Wnn/manual.en/1.intro
+@dirrm share/doc/jp-Wnn/manual.en/0
+@dirrm share/doc/jp-Wnn/manual.en
+@dirrm share/doc/jp-Wnn/manual
+@dirrm share/doc/jp-Wnn
+@cwd %%X11BASE%%
 lib/libwnn.a
+lib/libjd.a
 include/wnn/jllib.h
+include/wnn/jlib.h
 include/wnn/jslib.h
 include/wnn/rk_spclval.h
 include/wnn/wnnerror.h
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index bafef6824aba..3d3042e83374 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -1,32 +1,85 @@
-# New ports collection makefile for:	Wnn
+# New ports collection makefile for:	Wnn for Japanese
 # Version required:	4.2
-# Date created:		22 November 1994
-# Whom:			asami
+# Date created:		20 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.15 1997/04/16 05:00:02 asami Exp $
+# $Id: Makefile,v 1.16 1997/06/19 11:26:07 asami Exp $
 #
 
 DISTNAME=	Wnn4.2
-PKGNAME=	jp-Wnn-4.2
-CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/
+PKGNAME?=	jp-Wnn-4.2
+CATEGORIES?=	japanese
+MASTER_SITES=	ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/ \
+		ftp://ports.jp.FreeBSD.org/pub/incoming/distfiles/
+DISTFILES=	Wnn4.2.tar.gz Wnn4.2.patch.tar.gz
 
-MAINTAINER=	asami@FreeBSD.ORG
+MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
 
+EXTRACT_ONLY=	Wnn4.2.tar.gz
+PATCHDIR=	${.CURDIR}/../../japanese/Wnn/patches
+FILESDIR=	${.CURDIR}/../../japanese/Wnn/files
+PKGDIR=		${.CURDIR}/../../japanese/Wnn/pkg
 WRKSRC=		${WRKDIR}/Xsi
 IS_INTERACTIVE=	yes	# needs "wnn" user
 
+.if (${PKGNAME} == jp-Wnn-4.2)
+PORT_DOCDIR=	${PREFIX}/share/doc/jp-Wnn
+DOC_FROM=	${WRKSRC}/Wnn
+.elif (${PKGNAME} == cn-Wnn-4.2)
+PORT_DOCDIR=	${PREFIX}/share/doc/cn-Wnn
+DOC_FROM=	${WRKSRC}/cWnn
+.endif  # kWnn has no manual.
+
 post-extract:
+	${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} \
+		${_DISTDIR}/Wnn4.2.patch.tar.gz
 	/bin/ln -sf Project.tmpl ${WRKSRC}/config/X11.tmpl
 
+pre-patch:
+	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Wnn4.2.patch
+
+# Applying a patch for depending on language
+post-patch:
+	case ${PKGNAME} in \
+	  jp-Wnn-4.2) \
+		LANG_PATCH=${FILESDIR}/patch-for-japanese;; \
+	  cn-Wnn-4.2) \
+		LANG_PATCH=${FILESDIR}/patch-for-chinese;; \
+	  kr-Wnn-4.2) \
+		LANG_PATCH=${FILESDIR}/patch-for-korean;; \
+	esac; \
+	(cd ${_DISTDIR}; \
+		${PATCH} ${PATCH_DIST_ARGS} < $${LANG_PATCH})
+
+# for PREFIX
+pre-build:
+	for file in ${WRKSRC}/config/Project.tmpl \
+		${WRKSRC}/Contrib/dic/gerodic/Makefile; do \
+	  mv $$file $$file.orig2; \
+	  sed 's!^\([ ]*PREFIX = \).*$$!\1${PREFIX}!' \
+		$$file.orig2 > $$file; \
+	done
+
 # These are necesary because this package uses a different Makefile for
 #  building and installing etc.
 do-build:
-	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
+
+pre-install:
+	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 
 post-install:
 # 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
 
 .include <bsd.port.mk>
diff --git a/japanese/FreeWnn-server/distinfo b/japanese/FreeWnn-server/distinfo
index a8a59701e1d9..1571e84d8e7f 100644
--- a/japanese/FreeWnn-server/distinfo
+++ b/japanese/FreeWnn-server/distinfo
@@ -1 +1,2 @@
 MD5 (Wnn4.2.tar.gz) = dcb6271403577199e8141d07cd54be73
+MD5 (Wnn4.2.patch.tar.gz) = 9cfd1547623774f2f8e92f05c1725da8
diff --git a/japanese/FreeWnn-server/files/patch-ab b/japanese/FreeWnn-server/files/patch-ab
index 5bcae60ee528..92af97ad2933 100644
--- a/japanese/FreeWnn-server/files/patch-ab
+++ b/japanese/FreeWnn-server/files/patch-ab
@@ -1,19 +1,29 @@
---- ./Wnn/jserver/de.c.org	Thu Aug 18 18:31:23 1994
-+++ ./Wnn/jserver/de.c	Fri Feb 28 01:13:16 1997
-@@ -264,7 +264,16 @@
+--- ./Wnn/jserver/de.c.orig	Fri Aug 19 10:31:23 1994
++++ ./Wnn/jserver/de.c	Fri Aug  1 18:54:55 1997
+@@ -65,6 +65,9 @@
+ 
+ #include <sys/ioctl.h>
+ 
++#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){
-+#ifndef __FreeBSD__
++#if !(defined(BSD) && (BSD >= 199306)) /* !4.4BSD-Lite by Taoka */
  	    fclose(stderr);
-+#else /* __FreeBSD__ */
++#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 /* __FreeBSD__ */
++#endif /* 4.4BSD-Lite */
  	}
  
  #if defined(hpux) || defined(SOLARIS)
diff --git a/japanese/FreeWnn-server/files/patch-ae b/japanese/FreeWnn-server/files/patch-ae
new file mode 100644
index 000000000000..7ea048b9903a
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-ae
@@ -0,0 +1,14 @@
+--- ./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
+ #
+ 
+-WNNBINDIR=/usr/local/bin/Wnn4
+-WNNWNNDIR=/usr/local/lib/wnn
++PREFIX = /usr/local
++WNNBINDIR=${PREFIX}/bin/Wnn4
++WNNWNNDIR=${PREFIX}/lib/wnn
+ 
+ WNNOWNER=wnn
+ 
diff --git a/japanese/FreeWnn-server/files/patch-af b/japanese/FreeWnn-server/files/patch-af
new file mode 100644
index 000000000000..7bda975ebb7d
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-af
@@ -0,0 +1,45 @@
+--- 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
+ 
+-#ifdef JAPANSE
++#ifdef JAPANESE
+ extern  int eujis_to_jis8(), eujis_to_sjis();
+ #endif
+ #ifdef CHINESE
+@@ -129,13 +129,13 @@
+ 	strcpy(lang, WNN_DEFAULT_LANG);
+ 
+ #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, "wnnstat [-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-server/files/patch-ag b/japanese/FreeWnn-server/files/patch-ag
new file mode 100644
index 000000000000..d11ee32a427b
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-ag
@@ -0,0 +1,11 @@
+--- ./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
+ 
+-setjishopath    @LIBDIR/@LANG/dic/pubdic/
++setjishopath    @LIBDIR/@LANG/dic/sys/
+ sethindopath    @LIBDIR/@LANG/dic/usr/@USR/
+ 
+ setuumkey	@LIBDIR/@LANG/uumkey
diff --git a/japanese/FreeWnn-server/files/patch-ah b/japanese/FreeWnn-server/files/patch-ah
new file mode 100644
index 000000000000..a4fa296159c4
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-ah
@@ -0,0 +1,41 @@
+--- ./kWnn/etc/Imakefile.orig	Wed Aug 17 10:11:33 1994
++++ ./kWnn/etc/Imakefile	Sat Jul 19 23:53:01 1997
+@@ -1,6 +1,8 @@
+ XCOMM
+ XCOMM $Id: Imakefile,v 1.2 1994/08/17 01:11:33 kuwa Exp $
+ 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()
diff --git a/japanese/FreeWnn-server/files/patch-ai b/japanese/FreeWnn-server/files/patch-ai
new file mode 100644
index 000000000000..e7cf3360fbb4
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-ai
@@ -0,0 +1,61 @@
+--- ./kWnn/jlib/Imakefile.orig	Wed Aug 17 10:11:40 1994
++++ ./kWnn/jlib/Imakefile	Sat Jul 19 23:55:17 1997
+@@ -1,6 +1,9 @@
+ XCOMM
+ XCOMM $Id: Imakefile,v 1.2 1994/08/17 01:11:40 kuwa Exp $
+ XCOMM
++XCOMM For Mule, add sources (yincoding.c py_table.c zy_table.c) 1
++XCOMM   -- S. Taoka
++XCOMM
+ #define DoNormalLib YES
+ 
+ #include <Library.tmpl>
+@@ -10,7 +13,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 +33,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,8 +54,8 @@
+ 	$(KWNNROMKANSRC)/rk_read.o \
+ 	$(KWNNROMKANSRC)/rk_vars.o
+ 
+-LOCAL_ETCSRCS = $(SRC4) $(SRC5)
+-LOCAL_ETCOBJS = $(OBJ4) $(OBJ5)
++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)
+ 
+@@ -80,6 +94,10 @@
+ WnnSpecialObjectRule($(OBJ3),$(SRC3),$(KWNNETCSRC),)
+ WnnSpecialObjectRule($(OBJ4),$(SRC4),$(KWNNETCSRC),)
+ WnnSpecialObjectRule($(OBJ5),$(SRC5),$(KWNNETCSRC),)
++WnnSpecialObjectRule($(OBJ6),$(SRC6),$(KWNNETCSRC),)
++WnnSpecialObjectRule($(OBJ7),$(SRC7),$(KWNNETCSRC),)
++WnnSpecialObjectRule($(OBJ8),$(SRC8),$(KWNNETCSRC),)
++
+ 
+ $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS)
+ 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
diff --git a/japanese/FreeWnn-server/files/patch-aj b/japanese/FreeWnn-server/files/patch-aj
new file mode 100644
index 000000000000..53e082d82d66
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-aj
@@ -0,0 +1,28 @@
+--- ./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()
diff --git a/japanese/FreeWnn-server/files/patch-ak b/japanese/FreeWnn-server/files/patch-ak
new file mode 100644
index 000000000000..1181bb7434f6
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-ak
@@ -0,0 +1,79 @@
+--- ../Xsi.orig/Wnn/uum/jhlp.c	Fri Aug 19 10:32:12 1994
++++ ./Wnn/uum/jhlp.c	Fri Aug  1 18:54:18 1997
+@@ -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 */
+@@ -263,9 +266,11 @@
+ 
+ 
+ #if defined(BSD42) && !defined(DGUX)
++#if !(defined(BSD) && (BSD >= 199306))
+     if (saveutmp() < 0) {
+ 	puts("Can't save utmp\n");
+     }
++#endif
+ #endif /* BSD42 */
+ 
+ 
+@@ -771,7 +776,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 +1150,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 +1574,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 +1650,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 */
+ 
diff --git a/japanese/FreeWnn-server/files/patch-al b/japanese/FreeWnn-server/files/patch-al
new file mode 100644
index 000000000000..d4423556f7af
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-al
@@ -0,0 +1,20 @@
+--- ./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
+ 
diff --git a/japanese/FreeWnn-server/pkg-descr b/japanese/FreeWnn-server/pkg-descr
index 60092fe9c5ac..88f516557c04 100644
--- a/japanese/FreeWnn-server/pkg-descr
+++ b/japanese/FreeWnn-server/pkg-descr
@@ -20,3 +20,12 @@ If there are any problem in this patches, please know 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.tar.gz' and are applied in this
+port.
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/FreeWnn-server/pkg-install b/japanese/FreeWnn-server/pkg-install
index 886c0d288dda..95ce1b02c06e 100644
--- a/japanese/FreeWnn-server/pkg-install
+++ b/japanese/FreeWnn-server/pkg-install
@@ -1,6 +1,49 @@
 #!/bin/sh
 # installation script for Wnn4.2
-if [ "$2" != "POST-INSTALL" ]; then
+if [ X"$2" != X"POST-INSTALL" ]; then
   exit 0
 fi
-${PKG_PREFIX}/bin/Wnn4/wnntouch ${PKG_PREFIX}/lib/wnn/ja_JP/dic/pubdic/*
+case $1 in
+  jp-Wnn-4.2)
+    sys_dirs="${PKG_PREFIX}/lib/wnn/ja_JP/dic/pubdic ${PKG_PREFIX}/lib/wnn/ja_JP/dic/wnncons"
+    usr_dirs=${PKG_PREFIX}/lib/wnn/ja_JP/dic/usr
+    wnntouch=${PKG_PREFIX}/bin/Wnn4/wnntouch
+    wnnserver=${PKG_PREFIX}/bin/Wnn4/jserver
+    wnnname=Wnn
+    ;;
+  cn-Wnn-4.2)
+    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"
+    wnntouch=${PKG_PREFIX}/bin/cWnn4/cwnntouch
+    wnnserver=${PKG_PREFIX}/bin/cWnn4/cserver
+    wnnname=cWnn
+    ;;
+  kr-Wnn-4.2)
+    sys_dirs="${PKG_PREFIX}/lib/wnn/ko_KR/dic/sys"
+    usr_dirs=${PKG_PREFIX}/lib/wnn/ko_KR/dic/usr
+    wnntouch=${PKG_PREFIX}/bin/kWnn4/kwnntouch
+    wnnserver=${PKG_PREFIX}/bin/kWnn4/kserver
+    wnnname=kWnn
+    ;;
+esac
+for dir in $sys_dirs; do
+  $wnntouch $dir/*
+done
+for dir in $usr_dirs; do
+  if [ ! -d $dir ]; then
+    mkdir -p $dir
+  fi
+  chown wnn $dir
+done
+startup_script=${PKG_PREFIX}/etc/rc.d/${wnnname}.sh
+if [ ! -f ${startup_script} ]; then
+  echo "Installing ${startup_script} startup file.";
+  echo '#!/bin/sh' > ${startup_script};
+  echo "wnn=${wnnserver}" >> ${startup_script};
+  echo 'if [ -f $wnn ]; then' >> ${startup_script};
+  echo "    echo -n ' ${wnnname}'" >> ${startup_script};
+  echo '     $wnn' >> ${startup_script};
+  echo "fi" >> ${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 fd5464ef594e..38a8ffed7d74 100644
--- a/japanese/FreeWnn-server/pkg-plist
+++ b/japanese/FreeWnn-server/pkg-plist
@@ -1,5 +1,5 @@
-@cwd /usr/local
-@exec mkdir -p %D/lib/wnn/ja_JP/dic/usr
+@cwd %%LOCALBASE%%
+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
@@ -108,9 +108,266 @@ bin/Wnn4/atod
 bin/Wnn4/atof
 bin/Wnn4/wnntouch
 @dirrm bin/Wnn4
-@cwd /usr/X11R6
+share/doc/jp-Wnn/manual/0/contents
+share/doc/jp-Wnn/manual/1.intro/Intro1
+share/doc/jp-Wnn/manual/1.intro/Intro2
+share/doc/jp-Wnn/manual/1.intro/Intro3
+share/doc/jp-Wnn/manual/2.env/Intro
+share/doc/jp-Wnn/manual/2.env/dic/pubdic
+share/doc/jp-Wnn/manual/2.env/dic/usr_dic
+share/doc/jp-Wnn/manual/2.env/dic/ujis_dic
+share/doc/jp-Wnn/manual/2.env/wnn/2a_ctrl
+share/doc/jp-Wnn/manual/2.env/wnn/2b_romkana
+share/doc/jp-Wnn/manual/2.env/wnn/cvt_key
+share/doc/jp-Wnn/manual/2.env/wnn/fzk.data
+share/doc/jp-Wnn/manual/2.env/wnn/fzk.u
+share/doc/jp-Wnn/manual/2.env/wnn/hinsi_data
+share/doc/jp-Wnn/manual/2.env/wnn/jserverrc
+share/doc/jp-Wnn/manual/2.env/wnn/mode
+share/doc/jp-Wnn/manual/2.env/wnn/serverdefs
+share/doc/jp-Wnn/manual/2.env/wnn/uumkey
+share/doc/jp-Wnn/manual/2.env/wnn/uumrc
+share/doc/jp-Wnn/manual/2.env/wnn/wnnenvrc
+share/doc/jp-Wnn/manual/3.libwnn/Intro
+share/doc/jp-Wnn/manual/3.libwnn/include
+share/doc/jp-Wnn/manual/3.libwnn/j_intro
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/TITLE.DOC
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/bun_suu
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/c_zenkouho
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/close
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/connect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/connect_lang
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dai_top
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_add
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_comment_se
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_delete
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_list
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_save
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_use
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/disconnect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/env
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/env_set
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/env_sticky
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/fuzokugo_get
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/fuzokugo_set
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/get_kanji
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/get_zenkouho_k
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_dicts
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_list
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_name
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_number
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/inspect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/isconnect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/jiri_len
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/kanji_len
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/kill
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/next
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/nobi_conv
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/open
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/open_lang
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/param_get
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/ren_conv
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/set_env_wnnrc
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/set_jikouho
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/tan_conv
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/update_hindo
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_add
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_comment_s
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_delete
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_info
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_search
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_use
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_bun
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_dai
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_daip
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_suu
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/TITLE.DOC
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/access
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/close
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/connect
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_add
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_creat
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_creat_cl
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_delete
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_info
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_list_all
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_use
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/disconnect
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/env_exist
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/env_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/env_sticky
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_comment_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_discard
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_info
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_list_all
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_loaded
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_loaded_lo
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_passwd_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kanren
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_read
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_receive
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_remove
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_remove_cl
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_send
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_stat
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_write
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/fuzokugo_get
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/fuzokugo_set
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hindo_creat
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hindo_creat_cl
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hindo_set
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_dicts
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_name
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_number
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_table_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/isconnect
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kantan_dai
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kantan_sho
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kanzen_sho
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kanzen_dai
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kill
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/who
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/mkdir
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/open
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/open_lang
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/param_get
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/set_lang
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/version
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_add
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_comment_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_delete
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_info
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_search
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_clear
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_dispmod
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_getc
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_init
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_next
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_ungetc
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/Intro
+share/doc/jp-Wnn/manual/3.libwnn/misc_lib/msg_close
+share/doc/jp-Wnn/manual/3.libwnn/misc_lib/msg_get
+share/doc/jp-Wnn/manual/3.libwnn/misc_lib/msg_open
+share/doc/jp-Wnn/manual/4.cmd/uum
+share/doc/jp-Wnn/manual/4.cmd/wnnkill
+share/doc/jp-Wnn/manual/4.cmd/wnnstat
+share/doc/jp-Wnn/manual/4.cmd/jserver
+share/doc/jp-Wnn/manual/5.op/Intro
+share/doc/jp-Wnn/manual/5.op/op1.1
+share/doc/jp-Wnn/manual/5.op/op1.2
+share/doc/jp-Wnn/manual/5.op/op1.3
+share/doc/jp-Wnn/manual/5.op/op2.1
+share/doc/jp-Wnn/manual/5.op/op2.2
+share/doc/jp-Wnn/manual/5.op/op2.2.1
+share/doc/jp-Wnn/manual/5.op/op2.3
+share/doc/jp-Wnn/manual/5.op/op2.4
+share/doc/jp-Wnn/manual/5.op/op3.1
+share/doc/jp-Wnn/manual/5.op/op3.3
+share/doc/jp-Wnn/manual/5.op/op3.5
+share/doc/jp-Wnn/manual/5.op/op3.7
+share/doc/jp-Wnn/manual/5.op/op3.8
+share/doc/jp-Wnn/manual/5.op/op3.83
+share/doc/jp-Wnn/manual/5.op/op3.85
+share/doc/jp-Wnn/manual/5.op/op3.87
+share/doc/jp-Wnn/manual/5.op/op3.88
+share/doc/jp-Wnn/manual/6.jutil/Intro
+share/doc/jp-Wnn/manual/6.jutil/atod
+share/doc/jp-Wnn/manual/6.jutil/atof
+share/doc/jp-Wnn/manual/6.jutil/dictionary
+share/doc/jp-Wnn/manual/6.jutil/dtoa
+share/doc/jp-Wnn/manual/6.jutil/wddel
+share/doc/jp-Wnn/manual/6.jutil/wdreg
+share/doc/jp-Wnn/manual/6.jutil/wnntouch
+share/doc/jp-Wnn/manual/6.jutil/oldatonewa
+share/doc/jp-Wnn/manual/intro
+share/doc/jp-Wnn/manual/v3tov4/v3tov4
+share/doc/jp-Wnn/manual/7.Protocol/KKTP
+share/doc/jp-Wnn/manual.en/2.env/wnn/serverdefs
+share/doc/jp-Wnn/manual.en/2.env/wnn/jserverrc
+share/doc/jp-Wnn/manual.en/2.env/wnn/uumrc
+share/doc/jp-Wnn/manual.en/2.env/wnn/wnnenvrc
+share/doc/jp-Wnn/manual.en/2.env/wnn/uumkey
+share/doc/jp-Wnn/manual.en/2.env/wnn/mode
+share/doc/jp-Wnn/manual.en/2.env/wnn/2a_ctrl
+share/doc/jp-Wnn/manual.en/2.env/wnn/2b_romkana
+share/doc/jp-Wnn/manual.en/2.env/wnn/full.fzk
+share/doc/jp-Wnn/manual.en/4.cmd/jserver
+share/doc/jp-Wnn/manual.en/4.cmd/uum
+share/doc/jp-Wnn/manual.en/4.cmd/wnnkill
+share/doc/jp-Wnn/manual.en/4.cmd/wnnstat
+share/doc/jp-Wnn/manual.en/5.op/README.en
+share/doc/jp-Wnn/manual.en/5.op/README.ja
+share/doc/jp-Wnn/manual.en/5.op/contents
+share/doc/jp-Wnn/manual.en/5.op/contents.2
+share/doc/jp-Wnn/manual.en/5.op/op1
+share/doc/jp-Wnn/manual.en/5.op/fig2.2.1.Z
+share/doc/jp-Wnn/manual.en/5.op/op2.1
+share/doc/jp-Wnn/manual.en/5.op/op2.2
+share/doc/jp-Wnn/manual.en/5.op/op2.3
+share/doc/jp-Wnn/manual.en/5.op/op2.4
+share/doc/jp-Wnn/manual.en/5.op/op2.5
+share/doc/jp-Wnn/manual.en/5.op/op2.6
+share/doc/jp-Wnn/manual.en/5.op/op2.7
+share/doc/jp-Wnn/manual.en/5.op/op2.8
+share/doc/jp-Wnn/manual.en/5.op/op2.9
+share/doc/jp-Wnn/manual.en/5.op/op3.1
+share/doc/jp-Wnn/manual.en/5.op/op3.2
+share/doc/jp-Wnn/manual.en/5.op/op3.3
+share/doc/jp-Wnn/manual.en/5.op/op3.4
+share/doc/jp-Wnn/manual.en/5.op/op3.5
+share/doc/jp-Wnn/manual.en/5.op/op3.6
+share/doc/jp-Wnn/manual.en/5.op/op3.7
+share/doc/jp-Wnn/manual.en/5.op/op3.8
+share/doc/jp-Wnn/manual.en/5.op/op3.9
+share/doc/jp-Wnn/manual.en/5.op/fig2.2.2.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.1.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.11.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.18.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.3.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.4.Z
+share/doc/jp-Wnn/manual.en/5.op/table2.2.1.Z
+share/doc/jp-Wnn/manual.en/6.jutil/atod
+share/doc/jp-Wnn/manual.en/6.jutil/wdreg
+share/doc/jp-Wnn/manual.en/6.jutil/dtoa
+share/doc/jp-Wnn/manual.en/6.jutil/atof
+share/doc/jp-Wnn/manual.en/6.jutil/wnntouch
+share/doc/jp-Wnn/manual.en/6.jutil/wddel
+@dirrm share/doc/jp-Wnn/manual/v3tov4
+@dirrm share/doc/jp-Wnn/manual/7.Protocol
+@dirrm share/doc/jp-Wnn/manual/6.jutil
+@dirrm share/doc/jp-Wnn/manual/5.op
+@dirrm share/doc/jp-Wnn/manual/4.cmd
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/rk_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/misc_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/js_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/jl_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn
+@dirrm share/doc/jp-Wnn/manual/2.env/wnn
+@dirrm share/doc/jp-Wnn/manual/2.env/dic
+@dirrm share/doc/jp-Wnn/manual/2.env
+@dirrm share/doc/jp-Wnn/manual/1.intro
+@dirrm share/doc/jp-Wnn/manual/0
+@dirrm share/doc/jp-Wnn/manual.en/6.jutil
+@dirrm share/doc/jp-Wnn/manual.en/5.op
+@dirrm share/doc/jp-Wnn/manual.en/4.cmd
+@dirrm share/doc/jp-Wnn/manual.en/3.libwnn
+@dirrm share/doc/jp-Wnn/manual.en/2.env/wnn
+@dirrm share/doc/jp-Wnn/manual.en/2.env/dic
+@dirrm share/doc/jp-Wnn/manual.en/2.env
+@dirrm share/doc/jp-Wnn/manual.en/1.intro
+@dirrm share/doc/jp-Wnn/manual.en/0
+@dirrm share/doc/jp-Wnn/manual.en
+@dirrm share/doc/jp-Wnn/manual
+@dirrm share/doc/jp-Wnn
+@cwd %%X11BASE%%
 lib/libwnn.a
+lib/libjd.a
 include/wnn/jllib.h
+include/wnn/jlib.h
 include/wnn/jslib.h
 include/wnn/rk_spclval.h
 include/wnn/wnnerror.h
diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile
index bafef6824aba..3d3042e83374 100644
--- a/japanese/Wnn6-lib/Makefile
+++ b/japanese/Wnn6-lib/Makefile
@@ -1,32 +1,85 @@
-# New ports collection makefile for:	Wnn
+# New ports collection makefile for:	Wnn for Japanese
 # Version required:	4.2
-# Date created:		22 November 1994
-# Whom:			asami
+# Date created:		20 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.15 1997/04/16 05:00:02 asami Exp $
+# $Id: Makefile,v 1.16 1997/06/19 11:26:07 asami Exp $
 #
 
 DISTNAME=	Wnn4.2
-PKGNAME=	jp-Wnn-4.2
-CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/
+PKGNAME?=	jp-Wnn-4.2
+CATEGORIES?=	japanese
+MASTER_SITES=	ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/ \
+		ftp://ports.jp.FreeBSD.org/pub/incoming/distfiles/
+DISTFILES=	Wnn4.2.tar.gz Wnn4.2.patch.tar.gz
 
-MAINTAINER=	asami@FreeBSD.ORG
+MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
 
+EXTRACT_ONLY=	Wnn4.2.tar.gz
+PATCHDIR=	${.CURDIR}/../../japanese/Wnn/patches
+FILESDIR=	${.CURDIR}/../../japanese/Wnn/files
+PKGDIR=		${.CURDIR}/../../japanese/Wnn/pkg
 WRKSRC=		${WRKDIR}/Xsi
 IS_INTERACTIVE=	yes	# needs "wnn" user
 
+.if (${PKGNAME} == jp-Wnn-4.2)
+PORT_DOCDIR=	${PREFIX}/share/doc/jp-Wnn
+DOC_FROM=	${WRKSRC}/Wnn
+.elif (${PKGNAME} == cn-Wnn-4.2)
+PORT_DOCDIR=	${PREFIX}/share/doc/cn-Wnn
+DOC_FROM=	${WRKSRC}/cWnn
+.endif  # kWnn has no manual.
+
 post-extract:
+	${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} \
+		${_DISTDIR}/Wnn4.2.patch.tar.gz
 	/bin/ln -sf Project.tmpl ${WRKSRC}/config/X11.tmpl
 
+pre-patch:
+	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Wnn4.2.patch
+
+# Applying a patch for depending on language
+post-patch:
+	case ${PKGNAME} in \
+	  jp-Wnn-4.2) \
+		LANG_PATCH=${FILESDIR}/patch-for-japanese;; \
+	  cn-Wnn-4.2) \
+		LANG_PATCH=${FILESDIR}/patch-for-chinese;; \
+	  kr-Wnn-4.2) \
+		LANG_PATCH=${FILESDIR}/patch-for-korean;; \
+	esac; \
+	(cd ${_DISTDIR}; \
+		${PATCH} ${PATCH_DIST_ARGS} < $${LANG_PATCH})
+
+# for PREFIX
+pre-build:
+	for file in ${WRKSRC}/config/Project.tmpl \
+		${WRKSRC}/Contrib/dic/gerodic/Makefile; do \
+	  mv $$file $$file.orig2; \
+	  sed 's!^\([ ]*PREFIX = \).*$$!\1${PREFIX}!' \
+		$$file.orig2 > $$file; \
+	done
+
 # These are necesary because this package uses a different Makefile for
 #  building and installing etc.
 do-build:
-	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
+
+pre-install:
+	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 
 post-install:
 # 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
 
 .include <bsd.port.mk>
diff --git a/japanese/Wnn6-lib/distinfo b/japanese/Wnn6-lib/distinfo
index a8a59701e1d9..1571e84d8e7f 100644
--- a/japanese/Wnn6-lib/distinfo
+++ b/japanese/Wnn6-lib/distinfo
@@ -1 +1,2 @@
 MD5 (Wnn4.2.tar.gz) = dcb6271403577199e8141d07cd54be73
+MD5 (Wnn4.2.patch.tar.gz) = 9cfd1547623774f2f8e92f05c1725da8
diff --git a/japanese/Wnn6-lib/pkg-descr b/japanese/Wnn6-lib/pkg-descr
index 60092fe9c5ac..88f516557c04 100644
--- a/japanese/Wnn6-lib/pkg-descr
+++ b/japanese/Wnn6-lib/pkg-descr
@@ -20,3 +20,12 @@ If there are any problem in this patches, please know 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.tar.gz' and are applied in this
+port.
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/Wnn6-lib/pkg-plist b/japanese/Wnn6-lib/pkg-plist
index fd5464ef594e..38a8ffed7d74 100644
--- a/japanese/Wnn6-lib/pkg-plist
+++ b/japanese/Wnn6-lib/pkg-plist
@@ -1,5 +1,5 @@
-@cwd /usr/local
-@exec mkdir -p %D/lib/wnn/ja_JP/dic/usr
+@cwd %%LOCALBASE%%
+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
@@ -108,9 +108,266 @@ bin/Wnn4/atod
 bin/Wnn4/atof
 bin/Wnn4/wnntouch
 @dirrm bin/Wnn4
-@cwd /usr/X11R6
+share/doc/jp-Wnn/manual/0/contents
+share/doc/jp-Wnn/manual/1.intro/Intro1
+share/doc/jp-Wnn/manual/1.intro/Intro2
+share/doc/jp-Wnn/manual/1.intro/Intro3
+share/doc/jp-Wnn/manual/2.env/Intro
+share/doc/jp-Wnn/manual/2.env/dic/pubdic
+share/doc/jp-Wnn/manual/2.env/dic/usr_dic
+share/doc/jp-Wnn/manual/2.env/dic/ujis_dic
+share/doc/jp-Wnn/manual/2.env/wnn/2a_ctrl
+share/doc/jp-Wnn/manual/2.env/wnn/2b_romkana
+share/doc/jp-Wnn/manual/2.env/wnn/cvt_key
+share/doc/jp-Wnn/manual/2.env/wnn/fzk.data
+share/doc/jp-Wnn/manual/2.env/wnn/fzk.u
+share/doc/jp-Wnn/manual/2.env/wnn/hinsi_data
+share/doc/jp-Wnn/manual/2.env/wnn/jserverrc
+share/doc/jp-Wnn/manual/2.env/wnn/mode
+share/doc/jp-Wnn/manual/2.env/wnn/serverdefs
+share/doc/jp-Wnn/manual/2.env/wnn/uumkey
+share/doc/jp-Wnn/manual/2.env/wnn/uumrc
+share/doc/jp-Wnn/manual/2.env/wnn/wnnenvrc
+share/doc/jp-Wnn/manual/3.libwnn/Intro
+share/doc/jp-Wnn/manual/3.libwnn/include
+share/doc/jp-Wnn/manual/3.libwnn/j_intro
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/TITLE.DOC
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/bun_suu
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/c_zenkouho
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/close
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/connect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/connect_lang
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dai_top
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_add
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_comment_se
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_delete
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_list
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_save
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_use
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/disconnect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/env
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/env_set
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/env_sticky
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/fuzokugo_get
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/fuzokugo_set
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/get_kanji
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/get_zenkouho_k
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_dicts
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_list
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_name
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_number
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/inspect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/isconnect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/jiri_len
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/kanji_len
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/kill
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/next
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/nobi_conv
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/open
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/open_lang
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/param_get
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/ren_conv
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/set_env_wnnrc
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/set_jikouho
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/tan_conv
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/update_hindo
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_add
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_comment_s
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_delete
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_info
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_search
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_use
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_bun
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_dai
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_daip
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_suu
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/TITLE.DOC
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/access
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/close
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/connect
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_add
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_creat
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_creat_cl
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_delete
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_info
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_list_all
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_use
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/disconnect
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/env_exist
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/env_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/env_sticky
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_comment_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_discard
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_info
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_list_all
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_loaded
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_loaded_lo
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_passwd_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kanren
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_read
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_receive
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_remove
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_remove_cl
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_send
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_stat
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_write
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/fuzokugo_get
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/fuzokugo_set
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hindo_creat
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hindo_creat_cl
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hindo_set
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_dicts
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_name
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_number
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_table_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/isconnect
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kantan_dai
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kantan_sho
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kanzen_sho
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kanzen_dai
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kill
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/who
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/mkdir
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/open
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/open_lang
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/param_get
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/set_lang
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/version
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_add
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_comment_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_delete
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_info
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_search
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_clear
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_dispmod
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_getc
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_init
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_next
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_ungetc
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/Intro
+share/doc/jp-Wnn/manual/3.libwnn/misc_lib/msg_close
+share/doc/jp-Wnn/manual/3.libwnn/misc_lib/msg_get
+share/doc/jp-Wnn/manual/3.libwnn/misc_lib/msg_open
+share/doc/jp-Wnn/manual/4.cmd/uum
+share/doc/jp-Wnn/manual/4.cmd/wnnkill
+share/doc/jp-Wnn/manual/4.cmd/wnnstat
+share/doc/jp-Wnn/manual/4.cmd/jserver
+share/doc/jp-Wnn/manual/5.op/Intro
+share/doc/jp-Wnn/manual/5.op/op1.1
+share/doc/jp-Wnn/manual/5.op/op1.2
+share/doc/jp-Wnn/manual/5.op/op1.3
+share/doc/jp-Wnn/manual/5.op/op2.1
+share/doc/jp-Wnn/manual/5.op/op2.2
+share/doc/jp-Wnn/manual/5.op/op2.2.1
+share/doc/jp-Wnn/manual/5.op/op2.3
+share/doc/jp-Wnn/manual/5.op/op2.4
+share/doc/jp-Wnn/manual/5.op/op3.1
+share/doc/jp-Wnn/manual/5.op/op3.3
+share/doc/jp-Wnn/manual/5.op/op3.5
+share/doc/jp-Wnn/manual/5.op/op3.7
+share/doc/jp-Wnn/manual/5.op/op3.8
+share/doc/jp-Wnn/manual/5.op/op3.83
+share/doc/jp-Wnn/manual/5.op/op3.85
+share/doc/jp-Wnn/manual/5.op/op3.87
+share/doc/jp-Wnn/manual/5.op/op3.88
+share/doc/jp-Wnn/manual/6.jutil/Intro
+share/doc/jp-Wnn/manual/6.jutil/atod
+share/doc/jp-Wnn/manual/6.jutil/atof
+share/doc/jp-Wnn/manual/6.jutil/dictionary
+share/doc/jp-Wnn/manual/6.jutil/dtoa
+share/doc/jp-Wnn/manual/6.jutil/wddel
+share/doc/jp-Wnn/manual/6.jutil/wdreg
+share/doc/jp-Wnn/manual/6.jutil/wnntouch
+share/doc/jp-Wnn/manual/6.jutil/oldatonewa
+share/doc/jp-Wnn/manual/intro
+share/doc/jp-Wnn/manual/v3tov4/v3tov4
+share/doc/jp-Wnn/manual/7.Protocol/KKTP
+share/doc/jp-Wnn/manual.en/2.env/wnn/serverdefs
+share/doc/jp-Wnn/manual.en/2.env/wnn/jserverrc
+share/doc/jp-Wnn/manual.en/2.env/wnn/uumrc
+share/doc/jp-Wnn/manual.en/2.env/wnn/wnnenvrc
+share/doc/jp-Wnn/manual.en/2.env/wnn/uumkey
+share/doc/jp-Wnn/manual.en/2.env/wnn/mode
+share/doc/jp-Wnn/manual.en/2.env/wnn/2a_ctrl
+share/doc/jp-Wnn/manual.en/2.env/wnn/2b_romkana
+share/doc/jp-Wnn/manual.en/2.env/wnn/full.fzk
+share/doc/jp-Wnn/manual.en/4.cmd/jserver
+share/doc/jp-Wnn/manual.en/4.cmd/uum
+share/doc/jp-Wnn/manual.en/4.cmd/wnnkill
+share/doc/jp-Wnn/manual.en/4.cmd/wnnstat
+share/doc/jp-Wnn/manual.en/5.op/README.en
+share/doc/jp-Wnn/manual.en/5.op/README.ja
+share/doc/jp-Wnn/manual.en/5.op/contents
+share/doc/jp-Wnn/manual.en/5.op/contents.2
+share/doc/jp-Wnn/manual.en/5.op/op1
+share/doc/jp-Wnn/manual.en/5.op/fig2.2.1.Z
+share/doc/jp-Wnn/manual.en/5.op/op2.1
+share/doc/jp-Wnn/manual.en/5.op/op2.2
+share/doc/jp-Wnn/manual.en/5.op/op2.3
+share/doc/jp-Wnn/manual.en/5.op/op2.4
+share/doc/jp-Wnn/manual.en/5.op/op2.5
+share/doc/jp-Wnn/manual.en/5.op/op2.6
+share/doc/jp-Wnn/manual.en/5.op/op2.7
+share/doc/jp-Wnn/manual.en/5.op/op2.8
+share/doc/jp-Wnn/manual.en/5.op/op2.9
+share/doc/jp-Wnn/manual.en/5.op/op3.1
+share/doc/jp-Wnn/manual.en/5.op/op3.2
+share/doc/jp-Wnn/manual.en/5.op/op3.3
+share/doc/jp-Wnn/manual.en/5.op/op3.4
+share/doc/jp-Wnn/manual.en/5.op/op3.5
+share/doc/jp-Wnn/manual.en/5.op/op3.6
+share/doc/jp-Wnn/manual.en/5.op/op3.7
+share/doc/jp-Wnn/manual.en/5.op/op3.8
+share/doc/jp-Wnn/manual.en/5.op/op3.9
+share/doc/jp-Wnn/manual.en/5.op/fig2.2.2.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.1.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.11.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.18.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.3.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.4.Z
+share/doc/jp-Wnn/manual.en/5.op/table2.2.1.Z
+share/doc/jp-Wnn/manual.en/6.jutil/atod
+share/doc/jp-Wnn/manual.en/6.jutil/wdreg
+share/doc/jp-Wnn/manual.en/6.jutil/dtoa
+share/doc/jp-Wnn/manual.en/6.jutil/atof
+share/doc/jp-Wnn/manual.en/6.jutil/wnntouch
+share/doc/jp-Wnn/manual.en/6.jutil/wddel
+@dirrm share/doc/jp-Wnn/manual/v3tov4
+@dirrm share/doc/jp-Wnn/manual/7.Protocol
+@dirrm share/doc/jp-Wnn/manual/6.jutil
+@dirrm share/doc/jp-Wnn/manual/5.op
+@dirrm share/doc/jp-Wnn/manual/4.cmd
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/rk_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/misc_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/js_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/jl_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn
+@dirrm share/doc/jp-Wnn/manual/2.env/wnn
+@dirrm share/doc/jp-Wnn/manual/2.env/dic
+@dirrm share/doc/jp-Wnn/manual/2.env
+@dirrm share/doc/jp-Wnn/manual/1.intro
+@dirrm share/doc/jp-Wnn/manual/0
+@dirrm share/doc/jp-Wnn/manual.en/6.jutil
+@dirrm share/doc/jp-Wnn/manual.en/5.op
+@dirrm share/doc/jp-Wnn/manual.en/4.cmd
+@dirrm share/doc/jp-Wnn/manual.en/3.libwnn
+@dirrm share/doc/jp-Wnn/manual.en/2.env/wnn
+@dirrm share/doc/jp-Wnn/manual.en/2.env/dic
+@dirrm share/doc/jp-Wnn/manual.en/2.env
+@dirrm share/doc/jp-Wnn/manual.en/1.intro
+@dirrm share/doc/jp-Wnn/manual.en/0
+@dirrm share/doc/jp-Wnn/manual.en
+@dirrm share/doc/jp-Wnn/manual
+@dirrm share/doc/jp-Wnn
+@cwd %%X11BASE%%
 lib/libwnn.a
+lib/libjd.a
 include/wnn/jllib.h
+include/wnn/jlib.h
 include/wnn/jslib.h
 include/wnn/rk_spclval.h
 include/wnn/wnnerror.h
diff --git a/japanese/Wnn6/Makefile b/japanese/Wnn6/Makefile
index bafef6824aba..3d3042e83374 100644
--- a/japanese/Wnn6/Makefile
+++ b/japanese/Wnn6/Makefile
@@ -1,32 +1,85 @@
-# New ports collection makefile for:	Wnn
+# New ports collection makefile for:	Wnn for Japanese
 # Version required:	4.2
-# Date created:		22 November 1994
-# Whom:			asami
+# Date created:		20 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.15 1997/04/16 05:00:02 asami Exp $
+# $Id: Makefile,v 1.16 1997/06/19 11:26:07 asami Exp $
 #
 
 DISTNAME=	Wnn4.2
-PKGNAME=	jp-Wnn-4.2
-CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/
+PKGNAME?=	jp-Wnn-4.2
+CATEGORIES?=	japanese
+MASTER_SITES=	ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/ \
+		ftp://ports.jp.FreeBSD.org/pub/incoming/distfiles/
+DISTFILES=	Wnn4.2.tar.gz Wnn4.2.patch.tar.gz
 
-MAINTAINER=	asami@FreeBSD.ORG
+MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
 
+EXTRACT_ONLY=	Wnn4.2.tar.gz
+PATCHDIR=	${.CURDIR}/../../japanese/Wnn/patches
+FILESDIR=	${.CURDIR}/../../japanese/Wnn/files
+PKGDIR=		${.CURDIR}/../../japanese/Wnn/pkg
 WRKSRC=		${WRKDIR}/Xsi
 IS_INTERACTIVE=	yes	# needs "wnn" user
 
+.if (${PKGNAME} == jp-Wnn-4.2)
+PORT_DOCDIR=	${PREFIX}/share/doc/jp-Wnn
+DOC_FROM=	${WRKSRC}/Wnn
+.elif (${PKGNAME} == cn-Wnn-4.2)
+PORT_DOCDIR=	${PREFIX}/share/doc/cn-Wnn
+DOC_FROM=	${WRKSRC}/cWnn
+.endif  # kWnn has no manual.
+
 post-extract:
+	${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} \
+		${_DISTDIR}/Wnn4.2.patch.tar.gz
 	/bin/ln -sf Project.tmpl ${WRKSRC}/config/X11.tmpl
 
+pre-patch:
+	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Wnn4.2.patch
+
+# Applying a patch for depending on language
+post-patch:
+	case ${PKGNAME} in \
+	  jp-Wnn-4.2) \
+		LANG_PATCH=${FILESDIR}/patch-for-japanese;; \
+	  cn-Wnn-4.2) \
+		LANG_PATCH=${FILESDIR}/patch-for-chinese;; \
+	  kr-Wnn-4.2) \
+		LANG_PATCH=${FILESDIR}/patch-for-korean;; \
+	esac; \
+	(cd ${_DISTDIR}; \
+		${PATCH} ${PATCH_DIST_ARGS} < $${LANG_PATCH})
+
+# for PREFIX
+pre-build:
+	for file in ${WRKSRC}/config/Project.tmpl \
+		${WRKSRC}/Contrib/dic/gerodic/Makefile; do \
+	  mv $$file $$file.orig2; \
+	  sed 's!^\([ ]*PREFIX = \).*$$!\1${PREFIX}!' \
+		$$file.orig2 > $$file; \
+	done
+
 # These are necesary because this package uses a different Makefile for
 #  building and installing etc.
 do-build:
-	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
+
+pre-install:
+	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 
 post-install:
 # 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
 
 .include <bsd.port.mk>
diff --git a/japanese/Wnn6/pkg-descr b/japanese/Wnn6/pkg-descr
index 60092fe9c5ac..88f516557c04 100644
--- a/japanese/Wnn6/pkg-descr
+++ b/japanese/Wnn6/pkg-descr
@@ -20,3 +20,12 @@ If there are any problem in this patches, please know 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.tar.gz' and are applied in this
+port.
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/Wnn6/pkg-install b/japanese/Wnn6/pkg-install
index 886c0d288dda..95ce1b02c06e 100644
--- a/japanese/Wnn6/pkg-install
+++ b/japanese/Wnn6/pkg-install
@@ -1,6 +1,49 @@
 #!/bin/sh
 # installation script for Wnn4.2
-if [ "$2" != "POST-INSTALL" ]; then
+if [ X"$2" != X"POST-INSTALL" ]; then
   exit 0
 fi
-${PKG_PREFIX}/bin/Wnn4/wnntouch ${PKG_PREFIX}/lib/wnn/ja_JP/dic/pubdic/*
+case $1 in
+  jp-Wnn-4.2)
+    sys_dirs="${PKG_PREFIX}/lib/wnn/ja_JP/dic/pubdic ${PKG_PREFIX}/lib/wnn/ja_JP/dic/wnncons"
+    usr_dirs=${PKG_PREFIX}/lib/wnn/ja_JP/dic/usr
+    wnntouch=${PKG_PREFIX}/bin/Wnn4/wnntouch
+    wnnserver=${PKG_PREFIX}/bin/Wnn4/jserver
+    wnnname=Wnn
+    ;;
+  cn-Wnn-4.2)
+    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"
+    wnntouch=${PKG_PREFIX}/bin/cWnn4/cwnntouch
+    wnnserver=${PKG_PREFIX}/bin/cWnn4/cserver
+    wnnname=cWnn
+    ;;
+  kr-Wnn-4.2)
+    sys_dirs="${PKG_PREFIX}/lib/wnn/ko_KR/dic/sys"
+    usr_dirs=${PKG_PREFIX}/lib/wnn/ko_KR/dic/usr
+    wnntouch=${PKG_PREFIX}/bin/kWnn4/kwnntouch
+    wnnserver=${PKG_PREFIX}/bin/kWnn4/kserver
+    wnnname=kWnn
+    ;;
+esac
+for dir in $sys_dirs; do
+  $wnntouch $dir/*
+done
+for dir in $usr_dirs; do
+  if [ ! -d $dir ]; then
+    mkdir -p $dir
+  fi
+  chown wnn $dir
+done
+startup_script=${PKG_PREFIX}/etc/rc.d/${wnnname}.sh
+if [ ! -f ${startup_script} ]; then
+  echo "Installing ${startup_script} startup file.";
+  echo '#!/bin/sh' > ${startup_script};
+  echo "wnn=${wnnserver}" >> ${startup_script};
+  echo 'if [ -f $wnn ]; then' >> ${startup_script};
+  echo "    echo -n ' ${wnnname}'" >> ${startup_script};
+  echo '     $wnn' >> ${startup_script};
+  echo "fi" >> ${startup_script};
+  chmod 755 ${startup_script};
+  chown bin.bin ${startup_script};
+fi
diff --git a/japanese/Wnn6/pkg-plist b/japanese/Wnn6/pkg-plist
index fd5464ef594e..38a8ffed7d74 100644
--- a/japanese/Wnn6/pkg-plist
+++ b/japanese/Wnn6/pkg-plist
@@ -1,5 +1,5 @@
-@cwd /usr/local
-@exec mkdir -p %D/lib/wnn/ja_JP/dic/usr
+@cwd %%LOCALBASE%%
+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
@@ -108,9 +108,266 @@ bin/Wnn4/atod
 bin/Wnn4/atof
 bin/Wnn4/wnntouch
 @dirrm bin/Wnn4
-@cwd /usr/X11R6
+share/doc/jp-Wnn/manual/0/contents
+share/doc/jp-Wnn/manual/1.intro/Intro1
+share/doc/jp-Wnn/manual/1.intro/Intro2
+share/doc/jp-Wnn/manual/1.intro/Intro3
+share/doc/jp-Wnn/manual/2.env/Intro
+share/doc/jp-Wnn/manual/2.env/dic/pubdic
+share/doc/jp-Wnn/manual/2.env/dic/usr_dic
+share/doc/jp-Wnn/manual/2.env/dic/ujis_dic
+share/doc/jp-Wnn/manual/2.env/wnn/2a_ctrl
+share/doc/jp-Wnn/manual/2.env/wnn/2b_romkana
+share/doc/jp-Wnn/manual/2.env/wnn/cvt_key
+share/doc/jp-Wnn/manual/2.env/wnn/fzk.data
+share/doc/jp-Wnn/manual/2.env/wnn/fzk.u
+share/doc/jp-Wnn/manual/2.env/wnn/hinsi_data
+share/doc/jp-Wnn/manual/2.env/wnn/jserverrc
+share/doc/jp-Wnn/manual/2.env/wnn/mode
+share/doc/jp-Wnn/manual/2.env/wnn/serverdefs
+share/doc/jp-Wnn/manual/2.env/wnn/uumkey
+share/doc/jp-Wnn/manual/2.env/wnn/uumrc
+share/doc/jp-Wnn/manual/2.env/wnn/wnnenvrc
+share/doc/jp-Wnn/manual/3.libwnn/Intro
+share/doc/jp-Wnn/manual/3.libwnn/include
+share/doc/jp-Wnn/manual/3.libwnn/j_intro
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/TITLE.DOC
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/bun_suu
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/c_zenkouho
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/close
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/connect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/connect_lang
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dai_top
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_add
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_comment_se
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_delete
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_list
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_save
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_use
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/disconnect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/env
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/env_set
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/env_sticky
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/fuzokugo_get
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/fuzokugo_set
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/get_kanji
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/get_zenkouho_k
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_dicts
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_list
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_name
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_number
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/inspect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/isconnect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/jiri_len
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/kanji_len
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/kill
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/next
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/nobi_conv
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/open
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/open_lang
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/param_get
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/ren_conv
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/set_env_wnnrc
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/set_jikouho
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/tan_conv
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/update_hindo
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_add
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_comment_s
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_delete
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_info
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_search
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_use
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_bun
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_dai
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_daip
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_suu
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/TITLE.DOC
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/access
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/close
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/connect
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_add
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_creat
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_creat_cl
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_delete
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_info
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_list_all
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_use
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/disconnect
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/env_exist
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/env_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/env_sticky
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_comment_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_discard
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_info
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_list_all
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_loaded
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_loaded_lo
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_passwd_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kanren
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_read
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_receive
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_remove
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_remove_cl
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_send
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_stat
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_write
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/fuzokugo_get
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/fuzokugo_set
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hindo_creat
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hindo_creat_cl
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hindo_set
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_dicts
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_name
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_number
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_table_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/isconnect
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kantan_dai
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kantan_sho
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kanzen_sho
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kanzen_dai
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kill
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/who
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/mkdir
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/open
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/open_lang
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/param_get
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/set_lang
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/version
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_add
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_comment_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_delete
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_info
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_search
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_clear
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_dispmod
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_getc
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_init
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_next
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_ungetc
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/Intro
+share/doc/jp-Wnn/manual/3.libwnn/misc_lib/msg_close
+share/doc/jp-Wnn/manual/3.libwnn/misc_lib/msg_get
+share/doc/jp-Wnn/manual/3.libwnn/misc_lib/msg_open
+share/doc/jp-Wnn/manual/4.cmd/uum
+share/doc/jp-Wnn/manual/4.cmd/wnnkill
+share/doc/jp-Wnn/manual/4.cmd/wnnstat
+share/doc/jp-Wnn/manual/4.cmd/jserver
+share/doc/jp-Wnn/manual/5.op/Intro
+share/doc/jp-Wnn/manual/5.op/op1.1
+share/doc/jp-Wnn/manual/5.op/op1.2
+share/doc/jp-Wnn/manual/5.op/op1.3
+share/doc/jp-Wnn/manual/5.op/op2.1
+share/doc/jp-Wnn/manual/5.op/op2.2
+share/doc/jp-Wnn/manual/5.op/op2.2.1
+share/doc/jp-Wnn/manual/5.op/op2.3
+share/doc/jp-Wnn/manual/5.op/op2.4
+share/doc/jp-Wnn/manual/5.op/op3.1
+share/doc/jp-Wnn/manual/5.op/op3.3
+share/doc/jp-Wnn/manual/5.op/op3.5
+share/doc/jp-Wnn/manual/5.op/op3.7
+share/doc/jp-Wnn/manual/5.op/op3.8
+share/doc/jp-Wnn/manual/5.op/op3.83
+share/doc/jp-Wnn/manual/5.op/op3.85
+share/doc/jp-Wnn/manual/5.op/op3.87
+share/doc/jp-Wnn/manual/5.op/op3.88
+share/doc/jp-Wnn/manual/6.jutil/Intro
+share/doc/jp-Wnn/manual/6.jutil/atod
+share/doc/jp-Wnn/manual/6.jutil/atof
+share/doc/jp-Wnn/manual/6.jutil/dictionary
+share/doc/jp-Wnn/manual/6.jutil/dtoa
+share/doc/jp-Wnn/manual/6.jutil/wddel
+share/doc/jp-Wnn/manual/6.jutil/wdreg
+share/doc/jp-Wnn/manual/6.jutil/wnntouch
+share/doc/jp-Wnn/manual/6.jutil/oldatonewa
+share/doc/jp-Wnn/manual/intro
+share/doc/jp-Wnn/manual/v3tov4/v3tov4
+share/doc/jp-Wnn/manual/7.Protocol/KKTP
+share/doc/jp-Wnn/manual.en/2.env/wnn/serverdefs
+share/doc/jp-Wnn/manual.en/2.env/wnn/jserverrc
+share/doc/jp-Wnn/manual.en/2.env/wnn/uumrc
+share/doc/jp-Wnn/manual.en/2.env/wnn/wnnenvrc
+share/doc/jp-Wnn/manual.en/2.env/wnn/uumkey
+share/doc/jp-Wnn/manual.en/2.env/wnn/mode
+share/doc/jp-Wnn/manual.en/2.env/wnn/2a_ctrl
+share/doc/jp-Wnn/manual.en/2.env/wnn/2b_romkana
+share/doc/jp-Wnn/manual.en/2.env/wnn/full.fzk
+share/doc/jp-Wnn/manual.en/4.cmd/jserver
+share/doc/jp-Wnn/manual.en/4.cmd/uum
+share/doc/jp-Wnn/manual.en/4.cmd/wnnkill
+share/doc/jp-Wnn/manual.en/4.cmd/wnnstat
+share/doc/jp-Wnn/manual.en/5.op/README.en
+share/doc/jp-Wnn/manual.en/5.op/README.ja
+share/doc/jp-Wnn/manual.en/5.op/contents
+share/doc/jp-Wnn/manual.en/5.op/contents.2
+share/doc/jp-Wnn/manual.en/5.op/op1
+share/doc/jp-Wnn/manual.en/5.op/fig2.2.1.Z
+share/doc/jp-Wnn/manual.en/5.op/op2.1
+share/doc/jp-Wnn/manual.en/5.op/op2.2
+share/doc/jp-Wnn/manual.en/5.op/op2.3
+share/doc/jp-Wnn/manual.en/5.op/op2.4
+share/doc/jp-Wnn/manual.en/5.op/op2.5
+share/doc/jp-Wnn/manual.en/5.op/op2.6
+share/doc/jp-Wnn/manual.en/5.op/op2.7
+share/doc/jp-Wnn/manual.en/5.op/op2.8
+share/doc/jp-Wnn/manual.en/5.op/op2.9
+share/doc/jp-Wnn/manual.en/5.op/op3.1
+share/doc/jp-Wnn/manual.en/5.op/op3.2
+share/doc/jp-Wnn/manual.en/5.op/op3.3
+share/doc/jp-Wnn/manual.en/5.op/op3.4
+share/doc/jp-Wnn/manual.en/5.op/op3.5
+share/doc/jp-Wnn/manual.en/5.op/op3.6
+share/doc/jp-Wnn/manual.en/5.op/op3.7
+share/doc/jp-Wnn/manual.en/5.op/op3.8
+share/doc/jp-Wnn/manual.en/5.op/op3.9
+share/doc/jp-Wnn/manual.en/5.op/fig2.2.2.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.1.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.11.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.18.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.3.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.4.Z
+share/doc/jp-Wnn/manual.en/5.op/table2.2.1.Z
+share/doc/jp-Wnn/manual.en/6.jutil/atod
+share/doc/jp-Wnn/manual.en/6.jutil/wdreg
+share/doc/jp-Wnn/manual.en/6.jutil/dtoa
+share/doc/jp-Wnn/manual.en/6.jutil/atof
+share/doc/jp-Wnn/manual.en/6.jutil/wnntouch
+share/doc/jp-Wnn/manual.en/6.jutil/wddel
+@dirrm share/doc/jp-Wnn/manual/v3tov4
+@dirrm share/doc/jp-Wnn/manual/7.Protocol
+@dirrm share/doc/jp-Wnn/manual/6.jutil
+@dirrm share/doc/jp-Wnn/manual/5.op
+@dirrm share/doc/jp-Wnn/manual/4.cmd
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/rk_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/misc_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/js_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/jl_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn
+@dirrm share/doc/jp-Wnn/manual/2.env/wnn
+@dirrm share/doc/jp-Wnn/manual/2.env/dic
+@dirrm share/doc/jp-Wnn/manual/2.env
+@dirrm share/doc/jp-Wnn/manual/1.intro
+@dirrm share/doc/jp-Wnn/manual/0
+@dirrm share/doc/jp-Wnn/manual.en/6.jutil
+@dirrm share/doc/jp-Wnn/manual.en/5.op
+@dirrm share/doc/jp-Wnn/manual.en/4.cmd
+@dirrm share/doc/jp-Wnn/manual.en/3.libwnn
+@dirrm share/doc/jp-Wnn/manual.en/2.env/wnn
+@dirrm share/doc/jp-Wnn/manual.en/2.env/dic
+@dirrm share/doc/jp-Wnn/manual.en/2.env
+@dirrm share/doc/jp-Wnn/manual.en/1.intro
+@dirrm share/doc/jp-Wnn/manual.en/0
+@dirrm share/doc/jp-Wnn/manual.en
+@dirrm share/doc/jp-Wnn/manual
+@dirrm share/doc/jp-Wnn
+@cwd %%X11BASE%%
 lib/libwnn.a
+lib/libjd.a
 include/wnn/jllib.h
+include/wnn/jlib.h
 include/wnn/jslib.h
 include/wnn/rk_spclval.h
 include/wnn/wnnerror.h
diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile
index bafef6824aba..3d3042e83374 100644
--- a/japanese/Wnn7-lib/Makefile
+++ b/japanese/Wnn7-lib/Makefile
@@ -1,32 +1,85 @@
-# New ports collection makefile for:	Wnn
+# New ports collection makefile for:	Wnn for Japanese
 # Version required:	4.2
-# Date created:		22 November 1994
-# Whom:			asami
+# Date created:		20 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.15 1997/04/16 05:00:02 asami Exp $
+# $Id: Makefile,v 1.16 1997/06/19 11:26:07 asami Exp $
 #
 
 DISTNAME=	Wnn4.2
-PKGNAME=	jp-Wnn-4.2
-CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/
+PKGNAME?=	jp-Wnn-4.2
+CATEGORIES?=	japanese
+MASTER_SITES=	ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/ \
+		ftp://ports.jp.FreeBSD.org/pub/incoming/distfiles/
+DISTFILES=	Wnn4.2.tar.gz Wnn4.2.patch.tar.gz
 
-MAINTAINER=	asami@FreeBSD.ORG
+MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
 
+EXTRACT_ONLY=	Wnn4.2.tar.gz
+PATCHDIR=	${.CURDIR}/../../japanese/Wnn/patches
+FILESDIR=	${.CURDIR}/../../japanese/Wnn/files
+PKGDIR=		${.CURDIR}/../../japanese/Wnn/pkg
 WRKSRC=		${WRKDIR}/Xsi
 IS_INTERACTIVE=	yes	# needs "wnn" user
 
+.if (${PKGNAME} == jp-Wnn-4.2)
+PORT_DOCDIR=	${PREFIX}/share/doc/jp-Wnn
+DOC_FROM=	${WRKSRC}/Wnn
+.elif (${PKGNAME} == cn-Wnn-4.2)
+PORT_DOCDIR=	${PREFIX}/share/doc/cn-Wnn
+DOC_FROM=	${WRKSRC}/cWnn
+.endif  # kWnn has no manual.
+
 post-extract:
+	${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} \
+		${_DISTDIR}/Wnn4.2.patch.tar.gz
 	/bin/ln -sf Project.tmpl ${WRKSRC}/config/X11.tmpl
 
+pre-patch:
+	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Wnn4.2.patch
+
+# Applying a patch for depending on language
+post-patch:
+	case ${PKGNAME} in \
+	  jp-Wnn-4.2) \
+		LANG_PATCH=${FILESDIR}/patch-for-japanese;; \
+	  cn-Wnn-4.2) \
+		LANG_PATCH=${FILESDIR}/patch-for-chinese;; \
+	  kr-Wnn-4.2) \
+		LANG_PATCH=${FILESDIR}/patch-for-korean;; \
+	esac; \
+	(cd ${_DISTDIR}; \
+		${PATCH} ${PATCH_DIST_ARGS} < $${LANG_PATCH})
+
+# for PREFIX
+pre-build:
+	for file in ${WRKSRC}/config/Project.tmpl \
+		${WRKSRC}/Contrib/dic/gerodic/Makefile; do \
+	  mv $$file $$file.orig2; \
+	  sed 's!^\([ ]*PREFIX = \).*$$!\1${PREFIX}!' \
+		$$file.orig2 > $$file; \
+	done
+
 # These are necesary because this package uses a different Makefile for
 #  building and installing etc.
 do-build:
-	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
+
+pre-install:
+	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 
 post-install:
 # 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
 
 .include <bsd.port.mk>
diff --git a/japanese/Wnn7-lib/distinfo b/japanese/Wnn7-lib/distinfo
index a8a59701e1d9..1571e84d8e7f 100644
--- a/japanese/Wnn7-lib/distinfo
+++ b/japanese/Wnn7-lib/distinfo
@@ -1 +1,2 @@
 MD5 (Wnn4.2.tar.gz) = dcb6271403577199e8141d07cd54be73
+MD5 (Wnn4.2.patch.tar.gz) = 9cfd1547623774f2f8e92f05c1725da8
diff --git a/japanese/Wnn7-lib/pkg-descr b/japanese/Wnn7-lib/pkg-descr
index 60092fe9c5ac..88f516557c04 100644
--- a/japanese/Wnn7-lib/pkg-descr
+++ b/japanese/Wnn7-lib/pkg-descr
@@ -20,3 +20,12 @@ If there are any problem in this patches, please know 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.tar.gz' and are applied in this
+port.
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/Wnn7-lib/pkg-plist b/japanese/Wnn7-lib/pkg-plist
index fd5464ef594e..38a8ffed7d74 100644
--- a/japanese/Wnn7-lib/pkg-plist
+++ b/japanese/Wnn7-lib/pkg-plist
@@ -1,5 +1,5 @@
-@cwd /usr/local
-@exec mkdir -p %D/lib/wnn/ja_JP/dic/usr
+@cwd %%LOCALBASE%%
+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
@@ -108,9 +108,266 @@ bin/Wnn4/atod
 bin/Wnn4/atof
 bin/Wnn4/wnntouch
 @dirrm bin/Wnn4
-@cwd /usr/X11R6
+share/doc/jp-Wnn/manual/0/contents
+share/doc/jp-Wnn/manual/1.intro/Intro1
+share/doc/jp-Wnn/manual/1.intro/Intro2
+share/doc/jp-Wnn/manual/1.intro/Intro3
+share/doc/jp-Wnn/manual/2.env/Intro
+share/doc/jp-Wnn/manual/2.env/dic/pubdic
+share/doc/jp-Wnn/manual/2.env/dic/usr_dic
+share/doc/jp-Wnn/manual/2.env/dic/ujis_dic
+share/doc/jp-Wnn/manual/2.env/wnn/2a_ctrl
+share/doc/jp-Wnn/manual/2.env/wnn/2b_romkana
+share/doc/jp-Wnn/manual/2.env/wnn/cvt_key
+share/doc/jp-Wnn/manual/2.env/wnn/fzk.data
+share/doc/jp-Wnn/manual/2.env/wnn/fzk.u
+share/doc/jp-Wnn/manual/2.env/wnn/hinsi_data
+share/doc/jp-Wnn/manual/2.env/wnn/jserverrc
+share/doc/jp-Wnn/manual/2.env/wnn/mode
+share/doc/jp-Wnn/manual/2.env/wnn/serverdefs
+share/doc/jp-Wnn/manual/2.env/wnn/uumkey
+share/doc/jp-Wnn/manual/2.env/wnn/uumrc
+share/doc/jp-Wnn/manual/2.env/wnn/wnnenvrc
+share/doc/jp-Wnn/manual/3.libwnn/Intro
+share/doc/jp-Wnn/manual/3.libwnn/include
+share/doc/jp-Wnn/manual/3.libwnn/j_intro
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/TITLE.DOC
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/bun_suu
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/c_zenkouho
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/close
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/connect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/connect_lang
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dai_top
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_add
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_comment_se
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_delete
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_list
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_save
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/dic_use
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/disconnect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/env
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/env_set
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/env_sticky
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/fuzokugo_get
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/fuzokugo_set
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/get_kanji
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/get_zenkouho_k
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_dicts
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_list
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_name
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/hinsi_number
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/inspect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/isconnect
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/jiri_len
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/kanji_len
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/kill
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/next
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/nobi_conv
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/open
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/open_lang
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/param_get
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/ren_conv
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/set_env_wnnrc
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/set_jikouho
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/tan_conv
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/update_hindo
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_add
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_comment_s
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_delete
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_info
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_search
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/word_use
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_bun
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_dai
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_daip
+share/doc/jp-Wnn/manual/3.libwnn/jl_lib/zenkouho_suu
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/TITLE.DOC
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/access
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/close
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/connect
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_add
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_creat
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_creat_cl
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_delete
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_info
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_list_all
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/dic_use
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/disconnect
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/env_exist
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/env_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/env_sticky
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_comment_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_discard
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_info
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_list_all
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_loaded
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_loaded_lo
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_passwd_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kanren
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_read
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_receive
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_remove
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_remove_cl
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_send
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_stat
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/file_write
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/fuzokugo_get
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/fuzokugo_set
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hindo_creat
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hindo_creat_cl
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hindo_set
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_dicts
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_list
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_name
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_number
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/hinsi_table_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/isconnect
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kantan_dai
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kantan_sho
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kanzen_sho
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kanzen_dai
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/kill
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/who
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/mkdir
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/open
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/open_lang
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/param_get
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/set_lang
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/version
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_add
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_comment_s
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_delete
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_info
+share/doc/jp-Wnn/manual/3.libwnn/js_lib/word_search
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_clear
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_dispmod
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_getc
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_init
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_next
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/romkan_ungetc
+share/doc/jp-Wnn/manual/3.libwnn/rk_lib/Intro
+share/doc/jp-Wnn/manual/3.libwnn/misc_lib/msg_close
+share/doc/jp-Wnn/manual/3.libwnn/misc_lib/msg_get
+share/doc/jp-Wnn/manual/3.libwnn/misc_lib/msg_open
+share/doc/jp-Wnn/manual/4.cmd/uum
+share/doc/jp-Wnn/manual/4.cmd/wnnkill
+share/doc/jp-Wnn/manual/4.cmd/wnnstat
+share/doc/jp-Wnn/manual/4.cmd/jserver
+share/doc/jp-Wnn/manual/5.op/Intro
+share/doc/jp-Wnn/manual/5.op/op1.1
+share/doc/jp-Wnn/manual/5.op/op1.2
+share/doc/jp-Wnn/manual/5.op/op1.3
+share/doc/jp-Wnn/manual/5.op/op2.1
+share/doc/jp-Wnn/manual/5.op/op2.2
+share/doc/jp-Wnn/manual/5.op/op2.2.1
+share/doc/jp-Wnn/manual/5.op/op2.3
+share/doc/jp-Wnn/manual/5.op/op2.4
+share/doc/jp-Wnn/manual/5.op/op3.1
+share/doc/jp-Wnn/manual/5.op/op3.3
+share/doc/jp-Wnn/manual/5.op/op3.5
+share/doc/jp-Wnn/manual/5.op/op3.7
+share/doc/jp-Wnn/manual/5.op/op3.8
+share/doc/jp-Wnn/manual/5.op/op3.83
+share/doc/jp-Wnn/manual/5.op/op3.85
+share/doc/jp-Wnn/manual/5.op/op3.87
+share/doc/jp-Wnn/manual/5.op/op3.88
+share/doc/jp-Wnn/manual/6.jutil/Intro
+share/doc/jp-Wnn/manual/6.jutil/atod
+share/doc/jp-Wnn/manual/6.jutil/atof
+share/doc/jp-Wnn/manual/6.jutil/dictionary
+share/doc/jp-Wnn/manual/6.jutil/dtoa
+share/doc/jp-Wnn/manual/6.jutil/wddel
+share/doc/jp-Wnn/manual/6.jutil/wdreg
+share/doc/jp-Wnn/manual/6.jutil/wnntouch
+share/doc/jp-Wnn/manual/6.jutil/oldatonewa
+share/doc/jp-Wnn/manual/intro
+share/doc/jp-Wnn/manual/v3tov4/v3tov4
+share/doc/jp-Wnn/manual/7.Protocol/KKTP
+share/doc/jp-Wnn/manual.en/2.env/wnn/serverdefs
+share/doc/jp-Wnn/manual.en/2.env/wnn/jserverrc
+share/doc/jp-Wnn/manual.en/2.env/wnn/uumrc
+share/doc/jp-Wnn/manual.en/2.env/wnn/wnnenvrc
+share/doc/jp-Wnn/manual.en/2.env/wnn/uumkey
+share/doc/jp-Wnn/manual.en/2.env/wnn/mode
+share/doc/jp-Wnn/manual.en/2.env/wnn/2a_ctrl
+share/doc/jp-Wnn/manual.en/2.env/wnn/2b_romkana
+share/doc/jp-Wnn/manual.en/2.env/wnn/full.fzk
+share/doc/jp-Wnn/manual.en/4.cmd/jserver
+share/doc/jp-Wnn/manual.en/4.cmd/uum
+share/doc/jp-Wnn/manual.en/4.cmd/wnnkill
+share/doc/jp-Wnn/manual.en/4.cmd/wnnstat
+share/doc/jp-Wnn/manual.en/5.op/README.en
+share/doc/jp-Wnn/manual.en/5.op/README.ja
+share/doc/jp-Wnn/manual.en/5.op/contents
+share/doc/jp-Wnn/manual.en/5.op/contents.2
+share/doc/jp-Wnn/manual.en/5.op/op1
+share/doc/jp-Wnn/manual.en/5.op/fig2.2.1.Z
+share/doc/jp-Wnn/manual.en/5.op/op2.1
+share/doc/jp-Wnn/manual.en/5.op/op2.2
+share/doc/jp-Wnn/manual.en/5.op/op2.3
+share/doc/jp-Wnn/manual.en/5.op/op2.4
+share/doc/jp-Wnn/manual.en/5.op/op2.5
+share/doc/jp-Wnn/manual.en/5.op/op2.6
+share/doc/jp-Wnn/manual.en/5.op/op2.7
+share/doc/jp-Wnn/manual.en/5.op/op2.8
+share/doc/jp-Wnn/manual.en/5.op/op2.9
+share/doc/jp-Wnn/manual.en/5.op/op3.1
+share/doc/jp-Wnn/manual.en/5.op/op3.2
+share/doc/jp-Wnn/manual.en/5.op/op3.3
+share/doc/jp-Wnn/manual.en/5.op/op3.4
+share/doc/jp-Wnn/manual.en/5.op/op3.5
+share/doc/jp-Wnn/manual.en/5.op/op3.6
+share/doc/jp-Wnn/manual.en/5.op/op3.7
+share/doc/jp-Wnn/manual.en/5.op/op3.8
+share/doc/jp-Wnn/manual.en/5.op/op3.9
+share/doc/jp-Wnn/manual.en/5.op/fig2.2.2.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.1.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.11.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.18.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.3.Z
+share/doc/jp-Wnn/manual.en/5.op/fig2.3.4.Z
+share/doc/jp-Wnn/manual.en/5.op/table2.2.1.Z
+share/doc/jp-Wnn/manual.en/6.jutil/atod
+share/doc/jp-Wnn/manual.en/6.jutil/wdreg
+share/doc/jp-Wnn/manual.en/6.jutil/dtoa
+share/doc/jp-Wnn/manual.en/6.jutil/atof
+share/doc/jp-Wnn/manual.en/6.jutil/wnntouch
+share/doc/jp-Wnn/manual.en/6.jutil/wddel
+@dirrm share/doc/jp-Wnn/manual/v3tov4
+@dirrm share/doc/jp-Wnn/manual/7.Protocol
+@dirrm share/doc/jp-Wnn/manual/6.jutil
+@dirrm share/doc/jp-Wnn/manual/5.op
+@dirrm share/doc/jp-Wnn/manual/4.cmd
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/rk_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/misc_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/js_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn/jl_lib
+@dirrm share/doc/jp-Wnn/manual/3.libwnn
+@dirrm share/doc/jp-Wnn/manual/2.env/wnn
+@dirrm share/doc/jp-Wnn/manual/2.env/dic
+@dirrm share/doc/jp-Wnn/manual/2.env
+@dirrm share/doc/jp-Wnn/manual/1.intro
+@dirrm share/doc/jp-Wnn/manual/0
+@dirrm share/doc/jp-Wnn/manual.en/6.jutil
+@dirrm share/doc/jp-Wnn/manual.en/5.op
+@dirrm share/doc/jp-Wnn/manual.en/4.cmd
+@dirrm share/doc/jp-Wnn/manual.en/3.libwnn
+@dirrm share/doc/jp-Wnn/manual.en/2.env/wnn
+@dirrm share/doc/jp-Wnn/manual.en/2.env/dic
+@dirrm share/doc/jp-Wnn/manual.en/2.env
+@dirrm share/doc/jp-Wnn/manual.en/1.intro
+@dirrm share/doc/jp-Wnn/manual.en/0
+@dirrm share/doc/jp-Wnn/manual.en
+@dirrm share/doc/jp-Wnn/manual
+@dirrm share/doc/jp-Wnn
+@cwd %%X11BASE%%
 lib/libwnn.a
+lib/libjd.a
 include/wnn/jllib.h
+include/wnn/jlib.h
 include/wnn/jslib.h
 include/wnn/rk_spclval.h
 include/wnn/wnnerror.h