Add dictionaries and some fixes.

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

35 files changed, 1791 insertions, 672 deletions

diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index ee475394149b..8277b8817810 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -3,15 +3,16 @@
 # Date created:		20 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.20 1998/10/04 12:54:11 kuriyama Exp $
+# $Id: Makefile,v 1.21 1999/02/03 11:11:48 asami Exp $
 #
 
 DISTNAME=	Wnn4.2
 PKGNAME?=	ja-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
+		ftp://ftp.wg.omron.co.jp/pub/Wnn/dic/pubdic+/ \
+		http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/Wnn/
+DISTFILES=	Wnn4.2.tar.gz ${WNN_EXTRA_PATCH}
 
 MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
 
@@ -23,57 +24,128 @@ FILESDIR=	${.CURDIR}/../../japanese/Wnn/files
 PKGDIR=		${.CURDIR}/../../japanese/Wnn/pkg
 WRKSRC=		${WRKDIR}/Xsi
 
+WNN_EXTRA_PATCH= Wnn4.2.patch-981201.tar.gz
+MAKE_ENV+=	 PATH=/usr/bin:$${PATH} PORT_IMAKE_DEFINES='${WNN_DEF}'
+
 .if (${PKGNAME} == ja-Wnn-4.2)
+DISTFILES+=	pubdic+.tar.gz pubdic+-fix01.gz pubdic+.diff pubdic+.special.diff
 PORT_DOCDIR=	${PREFIX}/share/doc/ja-Wnn
 DOC_FROM=	${WRKSRC}/Wnn
-.elif (${PKGNAME} == zh-Wnn-4.2)
+BuildWnn=	YES
+BuildJlibV3=	YES
+LOCAL_MAN_LANG=	ja
+SHARED_LIB=	libwnn4
+.else
+BuildWnn=	NO
+.endif
+.if (${PKGNAME} == zh-Wnn-4.2)
 PORT_DOCDIR=	${PREFIX}/share/doc/zh-Wnn
 DOC_FROM=	${WRKSRC}/cWnn
-.endif  # kWnn has no manual.
+BuildCWnn=	YES
+SHARED_LIB=	libcwnn4
+.else
+BuildCWnn=	NO
+.endif
+.if (${PKGNAME} == ko-Wnn-4.2)
+# kWnn has no manual.
+BuildKWnn=	YES
+SHARED_LIB=	libkwnn4
+.else
+BuildKWnn=	NO
+.endif
+BuildXwnmo=	YES
+# pubdic+
+PUBDICPDIR=	${WRKSRC}/pubdic+
+WDICS=	bio.u computer.u kihon.u setsuji.u tankan.u \
+	chimei.u jinmei.u koyuu.u symbol.u special.u
+ATOD=	${WRKSRC}/Wnn/jutil/atod -h ${WRKSRC}/Wnn/jd/hinsi.data
+#WNN_DEF+=	-DBuildPubdic=NO
+# TOPDIR should be a full path provided we build a shared library.
+WNN_DEF+=	-DTOPDIR=${WRKSRC}
 
 post-extract:
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${_DISTDIR}/Wnn4.2.patch.tar.gz ${EXTRACT_AFTER_ARGS} \
+		${_DISTDIR}${WNN_EXTRA_PATCH} ${EXTRACT_AFTER_ARGS} \
 		-C ${WRKSRC}
 	${LN} -sf Project.tmpl ${WRKSRC}/config/X11.tmpl
+.if (${PKGNAME} == ja-Wnn-4.2)
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}pubdic+.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
+.endif
 
 pre-patch:
-	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Wnn4.2.patch
+	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Wnn-patch-01Dec98
 
-# Applying a patch for depending on language
+#### pubdic+
+.if (${PKGNAME} == ja-Wnn-4.2)
 post-patch:
-	case ${PKGNAME} in \
-	  ja-Wnn-4.2) \
-		LANG_PATCH=${FILESDIR}/patch-for-japanese;; \
-	  zh-Wnn-4.2) \
-		LANG_PATCH=${FILESDIR}/patch-for-chinese;; \
-	  ko-Wnn-4.2) \
-		LANG_PATCH=${FILESDIR}/patch-for-korean;; \
-	esac; \
-	(cd ${_DISTDIR}; \
-		${PATCH} ${PATCH_DIST_ARGS} < $${LANG_PATCH})
-
-# for PREFIX
-pre-build:
+	cd ${PUBDICPDIR}; \
+	${GZCAT} ${_DISTDIR}pubdic+-fix01.gz | ${PATCH} --quiet; \
+	${PATCH} --quiet < ${_DISTDIR}pubdic+.diff; \
+	${PATCH} --quiet < ${_DISTDIR}pubdic+.special.diff
+.endif
+
+pre-configure:
 	for file in ${WRKSRC}/config/Project.tmpl \
 		${WRKSRC}/Contrib/dic/gerodic/Makefile; do \
 	  ${MV} $$file $$file.orig2; \
-	  ${SED} 's!^\([ ]*PREFIX = \).*$$!\1${PREFIX}!' \
+	  ${SED} -e 's!^\([ ]*PREFIX = \).*$$!\1${PREFIX}!' \
+		-e 's!%%LOCAL_MAN_LANG%%!${LOCAL_MAN_LANG}!' \
+		-e 's!%%BuildWnn%%!${BuildWnn}!' \
+		-e 's!%%BuildCWnn%%!${BuildCWnn}!' \
+		-e 's!%%BuildKWnn%%!${BuildKWnn}!' \
+		-e 's!%%BuildXwnmo%%!${BuildXwnmo}!' \
+		-e 's!%%BuildJlibV3%%!${BuildJlibV3}!' \
 		$$file.orig2 > $$file; \
 	done
 
+do-configure:
+	 (cd ${WRKSRC}; \
+	 imake -DUseInstalled -I${WRKSRC}/config \
+		 -I${X11BASE}/lib/X11/config -DTOPDIR=${WRKSRC}; \
+	 ${MAKE} Makefiles; \
+	 ${MAKE} clean; \
+	 ${MAKE} includes; \
+	 ${MAKE} depend )
+
+pre-build:
+#### pubdic+
+.if (${PKGNAME} == ja-Wnn-4.2)
+	cd ${PUBDICPDIR}; ${XMKMF}; ${MAKE} wnn; \
+	cd ${WRKSRC}/Pubdic; \
+	for file in ${WDICS}; do \
+		${MV} -f $$file $$file.org; \
+		${MV} ../pubdic+/$$file . ; \
+		hdfile=`echo $$file | ${SED} 's/\\.u/.hd/'`; \
+		${MV} -f $$hdfile $$hdfile.org; \
+		${SED} 's,(pubdic),(pubdic+),' $$hdfile.org > $$hdfile; \
+	done
+.endif
+
 # These are necesary because this package uses a different Makefile for
 #  building and installing etc.
-do-build:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
+#do-build:
+#	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
+
+#### gerodic
+.if (${PKGNAME} == ja-Wnn-4.2)
+post-build:
+	cd ${WRKSRC}/Contrib/dic/gerodic; \
+	${ATOD} -h ${WRKSRC}/Pubdic/hinsi.data g-jinmei.dic < g-jinmei.u
+.endif
 
 pre-install:
 	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
 
 post-install:
+#### gerodic
+.if (${PKGNAME} == ja-Wnn-4.2)
+	cd ${WRKSRC}/Contrib/dic/gerodic; \
+	make all install
+.endif
+####
 # 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)
+	@cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 .if !defined(NOPORTDOCS)
@@ -84,5 +156,11 @@ post-install:
 	@chown -R bin.bin ${PORT_DOCDIR}
 .endif
 .endif
+### for the shared libray
+	if [ X"${PORTOBJFORMAT}" != Xelf ]; then \
+		${LN} -sf ${SHARED_LIB}.so.1.0 \
+			${X11BASE}/lib/${SHARED_LIB}.so; \
+	fi
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/japanese/FreeWnn-lib/distinfo b/japanese/FreeWnn-lib/distinfo
index 1571e84d8e7f..bc9146a2c6c5 100644
--- a/japanese/FreeWnn-lib/distinfo
+++ b/japanese/FreeWnn-lib/distinfo
@@ -1,2 +1,6 @@
 MD5 (Wnn4.2.tar.gz) = dcb6271403577199e8141d07cd54be73
-MD5 (Wnn4.2.patch.tar.gz) = 9cfd1547623774f2f8e92f05c1725da8
+MD5 (Wnn4.2.patch-981201.tar.gz) = 542847bff36e88f0ea588153b387e932
+MD5 (pubdic+.tar.gz) = 92dc7dfeae7eb3b637157fe2fd25480a
+MD5 (pubdic+-fix01.gz) = 2469f2e65ac5f3248dd4225ca5383c49
+MD5 (pubdic+.diff) = 51e53024862273f51d8f3c51a3ea70b2
+MD5 (pubdic+.special.diff) = acf3faa8ba8219ed97ca0c4e59030145
diff --git a/japanese/FreeWnn-lib/files/patch-aa b/japanese/FreeWnn-lib/files/patch-aa
deleted file mode 100644
index 2ac4202cc650..000000000000
--- a/japanese/FreeWnn-lib/files/patch-aa
+++ /dev/null
@@ -1,152 +0,0 @@
-diff -arcN ../Xsi.org/Wnn/jlib/js.c ./Wnn/jlib/js.c
-*** ../Xsi.org/Wnn/jlib/js.c	Fri Aug 19 10:30:48 1994
---- ./Wnn/jlib/js.c	Tue Aug 20 21:39:15 1996
-***************
-*** 221,227 ****
-  #endif
-  	return -1;
-      }
-!     if (connect(sd,(caddr_t)&saddr,strlen(saddr.sun_path)+sizeof(saddr.sun_family)) == ERROR) {
-  
-  #if DEBUG
-  	xerror("jslib:Can't connect socket.\n");
---- 221,227 ----
-  #endif
-  	return -1;
-      }
-!     if (connect(sd,(caddr_t)&saddr,SUN_LEN(&saddr)) == ERROR) {
-  
-  #if DEBUG
-  	xerror("jslib:Can't connect socket.\n");
-diff -arcN ../Xsi.org/Wnn/pubdic/Imakefile ./Wnn/pubdic/Imakefile
-*** ../Xsi.org/Wnn/pubdic/Imakefile	Tue Aug 23 11:21:30 1994
---- ./Wnn/pubdic/Imakefile	Wed Aug 21 20:13:36 1996
-***************
-*** 96,106 ****
-  instserver:: install
-  
-  WnnMakeDirectories(install,$(JWNNDICDIR))
-! #if WnnInstallDicForcibly
-  InstallMultiple($(DIC),$(JWNNPUBDICDIR))
-  
-  install::
-! 	@for i in $(DICS); \
-  	do \
-  		$(WNNTOUCH) $(DESTDIR)$(JWNNPUBDICDIR)/$$i ;\
-  	done
---- 96,112 ----
-  instserver:: install
-  
-  WnnMakeDirectories(install,$(JWNNDICDIR))
-! /*
-!  * Bugfix.
-!  * Because "NO" is same to "YES"!!
-!  * And some additional bugfix.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
-!  */
-! #if (WnnInstallDicForcibly == YES)
-  InstallMultiple($(DIC),$(JWNNPUBDICDIR))
-  
-  install::
-! 	@for i in $(DIC); \
-  	do \
-  		$(WNNTOUCH) $(DESTDIR)$(JWNNPUBDICDIR)/$$i ;\
-  	done
-***************
-*** 108,114 ****
---- 114,133 ----
-  #else
-  WnnInstallDicMultiple($(DIC),$(JWNNPUBDICDIR))
-  #endif
-+ 
-+ #if (WnnInstallDicForcibly == YES)
-  InstallMultiple($(FZKDATA),$(JWNNPUBDICDIR))
-+ 
-+ install::
-+ 	@for i in $(FZKDATA); \
-+ 	do \
-+ 		$(WNNTOUCH) $(DESTDIR)$(JWNNPUBDICDIR)/$$i ;\
-+ 	done
-+ 
-+ #else
-+ WnnInstallDicMultiple($(FZKDATA),$(JWNNPUBDICDIR))
-+ #endif
-+ 
-  InstallMultiple($(FZK_SRC),$(JWNNFZKSRCDIR))
-  
-  depend::
-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
-***************
-*** 389,394 ****
---- 389,396 ----
-  XCOMM -----------------------------------------------------------------------
-  XCOMM X Window System make variables; these need to be coordinated with rules
-  
-+     SYS_LIBRARIES = -lcrypt		/* For FreeBSD */
-+ 
-  /*
-   * This list must be reflected in the DIRS_TO_BUILD list in the top-level
-   * Makefile.
-***************
-*** 413,418 ****
---- 415,423 ----
-        XAPPLOADDIR = XAppLoadDir		/* application default resource dir */
-         FONTCFLAGS = FontCompilerFlags
-  
-+      INSTINCFLAGS = InstIncFlags -c     /* XXX - dirty hack by */
-+      INSTDATFLAGS = InstDatFlags -c     /* XXX -  Satoshi */
-+      INSTBINFLAGS = InstBinFlags -c     /* XXX -   Asami */
-       INSTAPPFLAGS = $(INSTDATFLAGS)	/* XXX - this should go away - XXX */
-  
-  #ifdef UseInstalled
-***************
-*** 1117,1126 ****
-  #undef ImakeSubCmdHelper
-  #endif 
-  
-  #ifdef UseInstalled
-! #define ImakeSubCmdHelper $(IMAKE) -DUseInstalled -I$$imakeprefix$(IMIRULESRC) -I$(IRULESRC) $(IMAKE_DEFINES)
-  #else
-! #define ImakeSubCmdHelper $$imakeprefix$(IMAKE) -I$$imakeprefix$(IMIRULESRC) -I$$imakeprefix$(IRULESRC) $(IMAKE_DEFINES)
-  #endif
-  
-  #define WnnInstallDicMultiple(list,dest)				@@\
---- 1122,1137 ----
-  #undef ImakeSubCmdHelper
-  #endif 
-  
-+ /*
-+  * Change a variavle's name from "$imakeprefix" to "$(IMAKEPREFIX)".
-+  * Because it caused a error on XFree86 3.1.2S and 3.1.2E.
-+  * The Imake rule of XFree86 3.1.2S and 3.1.2E FreeBSD was changed.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
-+  */
-  #ifdef UseInstalled
-! #define ImakeSubCmdHelper $(IMAKE) -DUseInstalled -I$(IMAKEPREFIX)$(IMIRULESRC) -I$(IRULESRC) $(IMAKE_DEFINES)
-  #else
-! #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IMIRULESRC) -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES)
-  #endif
-  
-  #define WnnInstallDicMultiple(list,dest)				@@\
-***************
-*** 1236,1243 ****
-  #else
-            IMTOP = $(CONTRIBSRC)/programs/Xsi
-  #endif
-!       WNNWNNDIR = /usr/local/lib/wnn
-!       WNNBINDIR = /usr/local/bin
-        WNNINCDIR = $(INCROOT)
-        WNNLIBDIR = $(USRLIBDIR)
-      WNNTERM_LIB = termLibrary
---- 1251,1259 ----
-  #else
-            IMTOP = $(CONTRIBSRC)/programs/Xsi
-  #endif
-!          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-ac b/japanese/FreeWnn-lib/files/patch-ac
deleted file mode 100644
index a5d7d6c8f550..000000000000
--- a/japanese/FreeWnn-lib/files/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Wnn/jserver/readfile.c.org	Thu Sep 24 15:35:47 1992
-+++ ./Wnn/jserver/readfile.c	Fri Feb 28 01:13:46 1997
-@@ -423,6 +423,7 @@
- 
-     jt2 = (struct JT *)malloc(sizeof(struct JT));
-     *jt2 = *jt1;
-+    jt2->node = 0;
- 
-     if(alloc_dict(jt2) == -1){
- 	free(jt2);
diff --git a/japanese/FreeWnn-lib/files/patch-ad b/japanese/FreeWnn-lib/files/patch-ad
deleted file mode 100644
index 0cbf0efb0822..000000000000
--- a/japanese/FreeWnn-lib/files/patch-ad
+++ /dev/null
@@ -1,40 +0,0 @@
---- ./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-af b/japanese/FreeWnn-lib/files/patch-af
index 7bda975ebb7d..577c5210fb5f 100644
--- a/japanese/FreeWnn-lib/files/patch-af
+++ b/japanese/FreeWnn-lib/files/patch-af
@@ -35,7 +35,7 @@
  #endif	/* JAPANESE */
  #ifdef	CHINESE
 -    fprintf(stderr, "wnnstat [-weEdDfFSUJBC] [-L lang_name] [server_name]\n");
-+    fprintf(stderr, "wnnstat [-weEdDfFUBCV] [-L lang_name] [server_name]\n");
++    fprintf(stderr, "cwnnstat [-weEdDfFUBCV] [-L lang_name] [server_name]\n");
  #endif	/* CHINESE */
  #ifdef KOREAN
 -    fprintf(stderr, "kwnnstat [-weEdDfFKU] [-L lang_name] [server_name]\n");
diff --git a/japanese/FreeWnn-lib/files/patch-ai b/japanese/FreeWnn-lib/files/patch-ai
index e7cf3360fbb4..451f9a9b4956 100644
--- a/japanese/FreeWnn-lib/files/patch-ai
+++ b/japanese/FreeWnn-lib/files/patch-ai
@@ -1,6 +1,6 @@
---- ./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 @@
+--- kWnn/jlib/Imakefile.orig	Wed Aug 17 10:11:40 1994
++++ kWnn/jlib/Imakefile	Tue Jan  5 23:06:15 1999
+@@ -1,7 +1,11 @@
  XCOMM
  XCOMM $Id: Imakefile,v 1.2 1994/08/17 01:11:40 kuwa Exp $
  XCOMM
@@ -8,9 +8,11 @@
 +XCOMM   -- S. Taoka
 +XCOMM
  #define DoNormalLib YES
++#define DoSharedLib YES
  
  #include <Library.tmpl>
-@@ -10,7 +13,9 @@
+ 
+@@ -10,7 +14,9 @@
  LINKS = getopt.c jl.c js.c wnnerrmsg.c
      JLIBDEFINES = -DWRITE_CHECK
         INCLUDES = -I$(KWNNINCLUDESRC) -I$(TOP)
@@ -21,7 +23,7 @@
     INSTALLFLAGS = $(INSTBINFLAGS)
         LINTLIBS = 
  
-@@ -28,6 +33,15 @@
+@@ -28,6 +34,15 @@
  OBJ4= strings.o
  SRC5= $(KWNNETCSRC)/bcopy.c
  OBJ5= bcopy.o
@@ -37,25 +39,69 @@
  LOCAL_RKSRCS= $(KWNNROMKANSRC)/rk_bltinfn.c \
  	$(KWNNROMKANSRC)/rk_main.c \
  	$(KWNNROMKANSRC)/rk_modread.c \
-@@ -40,8 +54,8 @@
+@@ -40,13 +55,26 @@
  	$(KWNNROMKANSRC)/rk_read.o \
  	$(KWNNROMKANSRC)/rk_vars.o
  
 -LOCAL_ETCSRCS = $(SRC4) $(SRC5)
 -LOCAL_ETCOBJS = $(OBJ4) $(OBJ5)
++UNSHARED_LOCAL_RKOBJS= $(KWNNROMKANSRC)/unshared/rk_bltinfn.o \
++	$(KWNNROMKANSRC)/unshared/rk_main.o \
++	$(KWNNROMKANSRC)/unshared/rk_modread.o \
++	$(KWNNROMKANSRC)/unshared/rk_read.o \
++	$(KWNNROMKANSRC)/unshared/rk_vars.o
++
 +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)
++UNSHAREDOBJS= $(OBJ1) $(OBJ3) $(LOCAL_ETCOBJS) $(UNSHARED_LOCAL_RKOBJS)
++
++SOKWNN4LIBREV=1.0
+ 
+ LibraryObjectRule()
++#if DoSharedLib
++AllTarget($(OBJS) libkwnn.a libkwnn4.so.$(SOKWNN4LIBREV))
++#else
+ AllTarget($(OBJS) libkwnn.a)
++#endif
+ 
+ includes:: $(LINKS)
+ 
+@@ -65,11 +93,19 @@
  
-@@ -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),)
+ NormalLintTarget($(SRC2))
+ 
+-NormalLibraryTarget(kwnn,$(OBJS))
++#if DoSharedLib
++SharedLibraryTarget(kwnn4,$(SOKWNN4LIBREV),$(OBJS),.,.)
++#endif
++
++UnsharedLibraryTarget(kwnn,$(UNSHAREDOBJS),unshared,..)
+ LintLibraryTarget(kwnn,$(SRCS))
+ 
+ instlib:: install
+ 
++#if DoSharedLib
++InstallSharedLibrary(kwnn4,$(SOKWNN4LIBREV),$(WNNLIBDIR))
++#endif
 +
+ InstallLibrary(kwnn,$(WNNLIBDIR))
+ 
+ #if ProfileLibJlib
+@@ -77,9 +113,12 @@
+ InstallLibrary(kwnn_p,$(WNNLIBDIR))
+ #endif
+ 
+-WnnSpecialObjectRule($(OBJ3),$(SRC3),$(KWNNETCSRC),)
+-WnnSpecialObjectRule($(OBJ4),$(SRC4),$(KWNNETCSRC),)
+-WnnSpecialObjectRule($(OBJ5),$(SRC5),$(KWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ3),$(SRC3),$(KWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ4),$(SRC4),$(KWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ5),$(SRC5),$(KWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ6),$(SRC6),$(KWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ7),$(SRC7),$(KWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ8),$(SRC8),$(KWNNETCSRC),)
  
  $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS)
  	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
diff --git a/japanese/FreeWnn-lib/files/patch-an b/japanese/FreeWnn-lib/files/patch-an
new file mode 100644
index 000000000000..885b931a2511
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-an
@@ -0,0 +1,66 @@
+--- Xwnmo/xwnmo/client.c.~1~	Mon Aug 23 11:06:16 1993
++++ Xwnmo/xwnmo/client.c	Fri Feb  6 06:44:03 1998
+@@ -53,7 +53,7 @@
+ {
+     char *p;
+     char ret = '\0';
+-    extern char *index();
++/*    extern char *index();*/
+ 
+     if ((p = romkan_dispmode()) == NULL) return(ret);
+     if ((p = (char*)index(p, ':')) == NULL) return(ret);
+--- Xwnmo/xwnmo/screen.c.~1~	Tue Dec  1 15:10:57 1992
++++ Xwnmo/xwnmo/screen.c	Fri Feb  6 06:48:15 1998
+@@ -361,7 +361,7 @@
+ get_rk_modes()
+ {
+     char        *p;
+-    extern char *index();
++/*    extern char *index();*/
+ 
+     strcpy(rk_modes, (NULL == (p = romkan_dispmode()) ? "[   ]" : p));
+     if ((p = (char*)index(rk_modes, ':')) != NULL && *(p + 1)) {
+--- Xwnmo/xwnmo/jhlp.c.~1~	Thu Aug  4 16:10:14 1994
++++ Xwnmo/xwnmo/jhlp.c	Fri Feb  6 06:50:24 1998
+@@ -415,7 +415,7 @@
+     XLCd xlc;
+ #endif /* X11R5 */
+     extern char *get_server_env();
+-    extern char *index();
++/*    extern char *index(); */
+ 
+     prgname = argv[0];
+     if (create_arg_string(argv, argc) == -1) exit(1);
+--- Xwnmo/xjutil/init_w.c.~1~	Thu Aug  4 16:10:10 1994
++++ Xwnmo/xjutil/init_w.c	Fri Feb  6 07:54:48 1998
+@@ -76,7 +76,7 @@
+     char *p;
+     char ret = '\0';
+ #ifndef SYSVR2
+-    extern char *index();
++/*    extern char *index(); */
+ #else
+     extern char *strchr();
+ #endif
+--- Xwnmo/xjutil/jutil.c.~1~	Thu Jan 21 17:05:44 1993
++++ Xwnmo/xjutil/jutil.c	Fri Feb  6 07:56:50 1998
+@@ -664,7 +664,7 @@
+     extern int srand();
+     extern long rand();
+ #else
+-    extern int srandom();
++/*    extern int srandom(); */
+     extern long random();
+ #endif
+     extern long time();
+--- Xwnmo/xjutil/kensaku.c.~1~	Tue Dec  1 14:59:48 1992
++++ Xwnmo/xjutil/kensaku.c	Fri Feb  6 07:58:54 1998
+@@ -154,7 +154,7 @@
+     static char message4[2048];
+     int ret;
+     char *table_t[6];
+-    extern int qsort();
++/*    extern int qsort();*/
+ 
+     if (get_env() == -1) return(NULL);
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-ao b/japanese/FreeWnn-lib/files/patch-ao
new file mode 100644
index 000000000000..c3aa020ff065
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-ao
@@ -0,0 +1,81 @@
+diff -ru Wnn.org/jd/jserverrc Wnn/jd/jserverrc
+--- Wnn.org/jd/jserverrc	Mon Sep  6 10:47:31 1993
++++ Wnn/jd/jserverrc	Tue Feb 10 07:58:43 1998
+@@ -20,7 +20,9 @@
+ ;readfile wnncons/tankan3.dic
+ 
+ ;         n nbun hindo len jiri flag jisho sbn dbn_len sbn_cnt suji kana eisuu kigou toji fuzoku kai
+-def_param 2 10   2     40  100  200  20    1   40      -40     40   -100 40    80    40   100    40
++;def_param 2 10   2     40  100  200  20    1   40      -40     40   -100 40    80    40   100    40
++; New Parameter
++def_param 2 10   2     45  100  200  5     1   40      -100    200  -100 200   80    200  200    200
+ 
+ ;set_giji_eisuu '-' '_' 0x20 \x5c ^M '変' 1234 012 \o12
+ set_giji_eisuu '-' '_' 0x20 '―' '＿' '￣' '!' '?' '.' ',' ':' ';' '：' '；' '？' '！' '，' '．' '・'
+diff -ru Wnn.org/jd/wnnenvrc.omr Wnn/jd/wnnenvrc.omr
+--- Wnn.org/jd/wnnenvrc.omr	Mon Sep  6 10:47:34 1993
++++ Wnn/jd/wnnenvrc.omr	Tue Feb 10 07:58:56 1998
+@@ -19,4 +19,7 @@
+ ;setdic wnncons/tankan3.dic	-			1 1 1 - - 0
+ 
+ ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
+-setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
++;setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
++; New Parameter
++setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
++
+diff -ru Wnn.org/jd/wnnenvrc.rem Wnn/jd/wnnenvrc.rem
+--- Wnn.org/jd/wnnenvrc.rem	Mon Sep  6 10:47:36 1993
++++ Wnn/jd/wnnenvrc.rem	Tue Feb 10 07:59:06 1998
+@@ -19,4 +19,6 @@
+ ;setdic wnncons/tankan3.dic -  1 1 1 - - 0
+ 
+ ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
+-setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
++;setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
++; New Parameter
++setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
+diff -ru Wnn.org/jd/wnnenvrc.rev Wnn/jd/wnnenvrc.rev
+--- Wnn.org/jd/wnnenvrc.rev	Mon Sep  6 10:47:37 1993
++++ Wnn/jd/wnnenvrc.rev	Tue Feb 10 07:59:15 1998
+@@ -19,4 +19,6 @@
+ ;setdic wnncons/tankan3.dic !@WNN_DIC_DIR/wnncons/tankan3.frq  1 1 1 - - 0
+ 
+ ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
+-setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
++;setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
++; New Parameter
++setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
+diff -ru Wnn.org/jd/wnnenvrc_R.omr Wnn/jd/wnnenvrc_R.omr
+--- Wnn.org/jd/wnnenvrc_R.omr	Wed Aug 25 15:11:40 1993
++++ Wnn/jd/wnnenvrc_R.omr	Tue Feb 10 07:59:24 1998
+@@ -19,4 +19,6 @@
+ ;setdic wnncons/tankan3.dic	-			1 1 1 - - 1
+ 
+ ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
+-setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
++;setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
++; New Parameter
++setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
+diff -ru Wnn.org/jd/wnnenvrc_R.rem Wnn/jd/wnnenvrc_R.rem
+--- Wnn.org/jd/wnnenvrc_R.rem	Wed Aug 25 15:11:48 1993
++++ Wnn/jd/wnnenvrc_R.rem	Tue Feb 10 07:59:34 1998
+@@ -19,4 +19,6 @@
+ ;setdic wnncons/tankan3.dic -  1 1 1 - - 1
+ 
+ ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
+-setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
++;setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
++; New Parameter
++setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
+diff -ru Wnn.org/jd/wnnenvrc_R.rev Wnn/jd/wnnenvrc_R.rev
+--- Wnn.org/jd/wnnenvrc_R.rev	Wed Aug 25 15:11:54 1993
++++ Wnn/jd/wnnenvrc_R.rev	Tue Feb 10 07:59:42 1998
+@@ -19,4 +19,6 @@
+ ;setdic wnncons/tankan3.dic -  1 1 1 - - 1
+ 
+ ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
+-setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
++;setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
++; New Parameter
++setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
diff --git a/japanese/FreeWnn-lib/files/patch-ap b/japanese/FreeWnn-lib/files/patch-ap
new file mode 100644
index 000000000000..17495e11a56e
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-ap
@@ -0,0 +1,25 @@
+--- Imakefile.~1~	Tue Oct  4 08:18:46 1994
++++ Imakefile	Tue Feb 10 11:29:58 1998
+@@ -4,7 +4,7 @@
+ #define IHaveSubdirs
+ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
+ 
+-#if BuildWnn || BuildXwnmo
++#if BuildWnn
+ WNNDIR = Wnn
+ #endif
+ #if BuildCWnn
+--- ./Xwnmo/jd/ximconf.~1~	Thu Feb 12 10:20:17 1998
++++ ./Xwnmo/jd/ximconf	Thu Feb 12 10:32:59 1998
+@@ -18,8 +18,8 @@
+ 		zh_TW	zh_TW.ucns	2,1,2	True	Yincoding
+ zh_CN.eucCN|zh_CN.ugb	\
+ 		zh_CN	zh_CN.ugb	2,1,2	True	Yincoding
+-ja|ja_JP.eucJP|ja_JP.ujis|ja_JP.mscode|ja_JP.SJIS|ja_JP.jis8|ja_JP.jis7|ja_JP.pjis \
+-		ja_JP	ja_JP.ujis	2,1,2	True	Normal
++ja|ja_JP.EUC|ja_JP.eucJP|ja_JP.ujis|ja_JP.mscode|ja_JP.SJIS|ja_JP.jis8|ja_JP.jis7|ja_JP.pjis \
++		ja_JP	ja_JP.EUC	2,1,2	True	Normal
+ 
+-setdefaultlocale	ja_JP.ujis
++setdefaultlocale	ja_JP.EUC
+ setworldlocale	wr_WR.ct
diff --git a/japanese/FreeWnn-lib/files/patch-aq b/japanese/FreeWnn-lib/files/patch-aq
new file mode 100644
index 000000000000..d476242347bd
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-aq
@@ -0,0 +1,26 @@
+--- Xwnmo/xwnmo/localalloc.c.~1~	Tue Dec  1 15:10:40 1992
++++ Xwnmo/xwnmo/localalloc.c	Thu Jun 25 12:11:29 1998
+@@ -112,6 +112,7 @@
+ {
+     char *ptr;
+     if (size == 0) return(NULL);
++    size += (sizeof(char *)-(size%sizeof(char *)));
+     if ((ptr = malloc(size)) == NULL) {
+ #ifdef ALLOC_DEBUG
+ 	print_out1("alloc failed with size = %d", size);
+@@ -134,6 +135,7 @@
+ unsigned size;
+ {
+     if (size == 0) return(ptr);
++    size += (sizeof(char *)-(size%sizeof(char *)));
+     if (ptr == NULL) return(Malloc(size));
+ #ifdef ALLOC_DEBUG
+     unregister_debug(ptr);
+@@ -153,6 +155,7 @@
+ {
+     char *ptr;
+     if (size == 0) return(NULL);
++    size += (sizeof(char *)-(size%sizeof(char *)));
+     if ((ptr = calloc(num, size)) == NULL) {
+ 	return(NULL);
+     }
diff --git a/japanese/FreeWnn-lib/pkg-descr b/japanese/FreeWnn-lib/pkg-descr
index 96e4fc921bdc..0c380213292d 100644
--- a/japanese/FreeWnn-lib/pkg-descr
+++ b/japanese/FreeWnn-lib/pkg-descr
@@ -2,7 +2,7 @@ This is Wnn4.2, a Japanese/Chinese/Korean input method.  It is
 included primarily so that we can compile mule-2.1, a multilingual
 emacs.
 
-Only the Japanese version is build for this port.
+Only the Japanese version is built for this port.
 
 Note that binaries and libraries go to /usr/local, while man pages and 
 includes go to /usr/X11R6.  That's the way it was designed, I don't
@@ -13,10 +13,10 @@ know why.
 
 -------------------------------------------------------------------
 
-This also include some patches for FreeBSD or bugfix.
-If use this patches, you can compile Wnn-4.2 under XFree86 3.1.2E
- or later(X11Release6.1).
-If there are any problem in this patches, please know me via E-mail.
+This also include some patches for FreeBSD or bugfixes.
+If use these patches, you can compile Wnn-4.2 under XFree86 3.1.2E
+ or later (X11Release6.1).
+If there are any problem in these patches, please tell me via E-mail.
 
 Hidekazu Kuroki
 (hidekazu@cs.titech.ac.jp)
@@ -24,14 +24,17 @@ Hidekazu Kuroki
 -------------------------------------------------------------------
 
 Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for Wnn4.2.
-Patches for those are in 'Wnn4.2.patch.tar.gz' and are applied in this
-port.
+Patches for those are in 'Wnn4.2.patch-YYMMDD.tar.gz' and are applied
+in this port.
 
 [Notice]
-When compiling by this ports, if $LOCALBASE is not '/usr/local' and/or
+(1) When compiling this port, if $LOCALBASE is not '/usr/local' and/or
 $X11BASE is not '/usr/X11R6' then you should properly change two lines
 '@cwd /usr/local' and '@cwd /usr/X11R6' in
 $PORTSDIR/japanese/Wnn/pkg/PLIST.
 
+(2) You must set a environment variable JSERVER if you use a client of
+Wnn.
+
 -- S. Taoka
 <taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/FreeWnn-lib/pkg-plist b/japanese/FreeWnn-lib/pkg-plist
index 114a7ec1b0a9..372afe9c5c30 100644
--- a/japanese/FreeWnn-lib/pkg-plist
+++ b/japanese/FreeWnn-lib/pkg-plist
@@ -22,6 +22,7 @@ lib/wnn/ja_JP/dic/src/fzk.con
 lib/wnn/ja_JP/dic/src/fzk.shuutan
 lib/wnn/ja_JP/dic/wnncons/tankan2.dic
 lib/wnn/ja_JP/dic/wnncons/tankan3.dic
+lib/wnn/ja_JP/dic/gerodic/g-jinmei.dic
 lib/wnn/ja_JP/jserverrc
 lib/wnn/ja_JP/hinsi.data
 lib/wnn/ja_JP/uum.msg
@@ -85,9 +86,45 @@ lib/wnn/lt_LN/uumrc
 lib/wnn/lt_LN/rk/2A_CTRL
 lib/wnn/lt_LN/rk/2B_LATIN
 lib/wnn/lt_LN/rk/mode
+@comment Xwnmo
+lib/wnn/ja_JP/uumrc_vi.xim
+lib/wnn/ja_JP/uumrc_e.xim
+lib/wnn/ja_JP/uumrc.xim
+lib/wnn/ja_JP/uumkey.xim
+lib/wnn/ja_JP/uumkey_v.xim
+lib/wnn/ja_JP/uumkey_e.xim
+lib/wnn/ja_JP/xim.msg
+lib/wnn/ja_JP/xjutil.msg
+lib/wnn/ko_KR/uumkey.xim
+lib/wnn/ko_KR/uumrc.xim
+lib/wnn/ko_KR/xim.msg
+lib/wnn/ko_KR/xjutil.msg
+lib/wnn/lt_LN/uumkey.xim
+lib/wnn/lt_LN/uumrc.xim
+lib/wnn/lt_LN/xim.msg
+lib/wnn/zh_CN/uumkey.xim
+lib/wnn/zh_CN/uumkey_p.xim
+lib/wnn/zh_CN/uumrc.xim
+lib/wnn/zh_CN/uumrc_p.xim
+lib/wnn/zh_CN/uumrc_z.xim
+lib/wnn/zh_CN/xim.msg
+lib/wnn/zh_CN/xjutil.msg
+lib/wnn/zh_TW/uumkey.xim
+lib/wnn/zh_TW/uumkey_p.xim
+lib/wnn/zh_TW/uumrc.xim
+lib/wnn/zh_TW/uumrc_p.xim
+lib/wnn/zh_TW/uumrc_z.xim
+lib/wnn/zh_TW/xim.msg
+lib/wnn/zh_TW/xjutil.msg
+lib/wnn/cvt_xim_tbl
+lib/wnn/ximconf
+lib/wnn/ximrc
+lib/wnn/ximrc_vi
+@comment END Xwnmo
 @dirrm lib/wnn/lt_LN/rk
 @dirrm lib/wnn/lt_LN
 @dirrm lib/wnn/ja_JP/dic/wnncons
+@dirrm lib/wnn/ja_JP/dic/gerodic/
 @dirrm lib/wnn/ja_JP/dic/usr
 @dirrm lib/wnn/ja_JP/dic/src
 @dirrm lib/wnn/ja_JP/dic/pubdic
@@ -95,6 +132,11 @@ lib/wnn/lt_LN/rk/mode
 @dirrm lib/wnn/ja_JP/rk.vi
 @dirrm lib/wnn/ja_JP/rk
 @dirrm lib/wnn/ja_JP
+@comment Xwnmo
+@dirrm lib/wnn/ko_KR
+@dirrm lib/wnn/zh_CN
+@dirrm lib/wnn/zh_TW
+@comment END Xwnmo
 @dirrm lib/wnn
 bin/Wnn4/jserver
 bin/Wnn4/uum
@@ -364,7 +406,17 @@ share/doc/ja-Wnn/manual.en/6.jutil/wddel
 @dirrm share/doc/ja-Wnn/manual
 @dirrm share/doc/ja-Wnn
 @cwd /usr/X11R6
+@comment Xwnmo
+bin/xwnmo
+bin/killxwnmo
+bin/xjutil
+lib/X11/app-defaults/Xwnmo
+@comment END Xwnmo
 lib/libwnn.a
+lib/libwnn4.so
+lib/libwnn4.so.1.0
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/libjd.a
 include/wnn/jllib.h
 include/wnn/jlib.h
@@ -376,187 +428,197 @@ include/wnn/cplib.h
 include/wnn/config.h
 include/wnn/msg.h
 @dirrm include/wnn
-man/man1/uum.1.gz
-man/man1/jserver.1.gz
-man/man1/wnnkill.1.gz
-man/man1/wnnstat.1.gz
-man/man1/atod.1.gz
-man/man1/atof.1.gz
-man/man1/dtoa.1.gz
-man/man1/wddel.1.gz
-man/man1/wdreg.1.gz
-man/man1/wnntouch.1.gz
-man/man1/oldatonewa.1.gz
-man/man3/jl_bun_suu.3.gz
-man/man3/jl_c_zenkouho.3.gz
-man/man3/jl_connect.3.gz
-man/man3/jl_close.3.gz
-man/man3/jl_connect_lang.3.gz
-man/man3/jl_dai_top.3.gz
-man/man3/jl_dic_add.3.gz
-man/man3/jl_dic_add_e.3.gz
-man/man3/jl_dic_comment_set_e.3.gz
-man/man3/jl_dic_delete.3.gz
-man/man3/jl_dic_comment_set.3.gz
-man/man3/jl_dic_delete_e.3.gz
-man/man3/jl_dic_save_all_e.3.gz
-man/man3/jl_dic_save_all.3.gz
-man/man3/jl_dic_list.3.gz
-man/man3/jl_dic_list_e.3.gz
-man/man3/jl_dic_save.3.gz
-man/man3/jl_dic_save_e.3.gz
-man/man3/jl_dic_use_e.3.gz
-man/man3/jl_dic_use.3.gz
-man/man3/jl_disconnect.3.gz
-man/man3/jl_env.3.gz
-man/man3/jl_env_un_sticky.3.gz
-man/man3/jl_env_un_sticky_e.3.gz
-man/man3/jl_env_set.3.gz
-man/man3/jl_env_get.3.gz
-man/man3/jl_env_sticky.3.gz
-man/man3/jl_env_sticky_e.3.gz
-man/man3/jl_fuzokugo_get.3.gz
-man/man3/jl_fuzokugo_get_e.3.gz
-man/man3/jl_fuzokugo_set.3.gz
-man/man3/jl_fuzokugo_set_e.3.gz
-man/man3/jl_get_kanji.3.gz
-man/man3/jl_get_yomi.3.gz
-man/man3/jl_hinsi_dicts.3.gz
-man/man3/jl_hinsi_dicts_e.3.gz
-man/man3/jl_get_zenkouho_kanji.3.gz
-man/man3/jl_hinsi_name.3.gz
-man/man3/jl_hinsi_list_e.3.gz
-man/man3/jl_hinsi_name_e.3.gz
-man/man3/jl_hinsi_list.3.gz
-man/man3/jl_hinsi_number_e.3.gz
-man/man3/jl_hinsi_number.3.gz
-man/man3/jl_isconnect_e.3.gz
-man/man3/jl_inspect.3.gz
-man/man3/jl_isconnect.3.gz
-man/man3/jl_kanji_len.3.gz
-man/man3/jl_yomi_len.3.gz
-man/man3/jl_jiri_len.3.gz
-man/man3/jl_kill.3.gz
-man/man3/jl_previous_dai.3.gz
-man/man3/jl_next.3.gz
-man/man3/jl_previous.3.gz
-man/man3/jl_next_dai.3.gz
-man/man3/jl_open.3.gz
-man/man3/jl_nobi_conv.3.gz
-man/man3/jl_param_set.3.gz
-man/man3/jl_param_get.3.gz
-man/man3/jl_param_get_e.3.gz
-man/man3/jl_param_set_e.3.gz
-man/man3/jl_open_lang.3.gz
-man/man3/jl_ren_conv.3.gz
-man/man3/jl_set_env_wnnrc.3.gz
-man/man3/jl_set_jikouho.3.gz
-man/man3/jl_set_jikouho_dai.3.gz
-man/man3/jl_tan_conv.3.gz
-man/man3/jl_update_hindo.3.gz
-man/man3/jl_word_comment_set_e.3.gz
-man/man3/jl_word_add_e.3.gz
-man/man3/jl_word_add.3.gz
-man/man3/jl_word_comment_set.3.gz
-man/man3/jl_word_delete.3.gz
-man/man3/jl_word_delete_e.3.gz
-man/man3/jl_word_search_by_env.3.gz
-man/man3/jl_word_info.3.gz
-man/man3/jl_word_info_e.3.gz
-man/man3/jl_word_search.3.gz
-man/man3/jl_word_search_e.3.gz
-man/man3/jl_word_search_by_env_e.3.gz
-man/man3/jl_word_use.3.gz
-man/man3/jl_word_use_e.3.gz
-man/man3/jl_zenkouho_bun.3.gz
-man/man3/jl_zenkouho.3.gz
-man/man3/jl_zenkouho_daip.3.gz
-man/man3/jl_zenkouho_suu.3.gz
-man/man3/jl_zenkouho_dai.3.gz
-man/man3/js_access.3.gz
-man/man3/js_connect.3.gz
-man/man3/js_close.3.gz
-man/man3/js_dic_add.3.gz
-man/man3/js_dic_file_create.3.gz
-man/man3/js_dic_file_create_client.3.gz
-man/man3/js_dic_info.3.gz
-man/man3/js_dic_list.3.gz
-man/man3/js_dic_delete.3.gz
-man/man3/js_disconnect.3.gz
-man/man3/js_dic_use.3.gz
-man/man3/js_dic_list_all.3.gz
-man/man3/js_env_exist.3.gz
-man/man3/js_env_list.3.gz
-man/man3/js_env_sticky.3.gz
-man/man3/js_env_un_sticky.3.gz
-man/man3/js_file_comment_set.3.gz
-man/man3/js_file_info.3.gz
-man/man3/js_file_discard.3.gz
-man/man3/js_file_list.3.gz
-man/man3/js_file_loaded.3.gz
-man/man3/js_file_list_all.3.gz
-man/man3/js_file_loaded_local.3.gz
-man/man3/js_file_password_set.3.gz
-man/man3/js_file_read.3.gz
-man/man3/js_file_remove.3.gz
-man/man3/js_file_receive.3.gz
-man/man3/js_file_remove_client.3.gz
-man/man3/js_file_write.3.gz
-man/man3/js_file_stat.3.gz
-man/man3/js_file_send.3.gz
-man/man3/js_fuzokugo_get.3.gz
-man/man3/js_fuzokugo_set.3.gz
-man/man3/js_hindo_file_create.3.gz
-man/man3/js_hindo_set.3.gz
-man/man3/js_hindo_file_create_client.3.gz
-man/man3/js_hinsi_dicts.3.gz
-man/man3/js_hinsi_name.3.gz
-man/man3/js_hinsi_list.3.gz
-man/man3/js_isconnect.3.gz
-man/man3/js_hinsi_number.3.gz
-man/man3/js_hinsi_table_set.3.gz
-man/man3/js_kanren.3.gz
-man/man3/js_kantan_dai.3.gz
-man/man3/js_kantan_sho.3.gz
-man/man3/js_kanzen_dai.3.gz
-man/man3/js_kanzen_sho.3.gz
-man/man3/js_kill.3.gz
-man/man3/js_mkdir.3.gz
-man/man3/js_param_get.3.gz
-man/man3/js_open.3.gz
-man/man3/js_open_lang.3.gz
-man/man3/js_param_set.3.gz
-man/man3/js_get_lang.3.gz
-man/man3/js_set_lang.3.gz
-man/man3/js_version.3.gz
-man/man3/js_who.3.gz
-man/man3/js_word_add.3.gz
-man/man3/js_word_comment_set.3.gz
-man/man3/js_word_delete.3.gz
-man/man3/js_word_info.3.gz
-man/man3/js_word_search.3.gz
-man/man3/js_word_search_by_env.3.gz
-man/man3/romkan_clear.3.gz
-man/man3/romkan_getc.3.gz
-man/man3/romkan_dispmode.3.gz
-man/man3/romkan_init.3.gz
-man/man3/romkan_next.3.gz
-man/man3/romkan_ungetc.3.gz
-man/man3/msg_open.3.gz
-man/man3/msg_get.3.gz
-man/man3/msg_close.3.gz
-man/man4/fzk.data.4.gz
-man/man4/2a_ctrl.4.gz
-man/man4/fzk.u.4.gz
-man/man4/jserverrc.4.gz
-man/man4/mode.4.gz
-man/man4/uumrc.4.gz
-man/man4/uumkey.4.gz
-man/man4/wnnenvrc.4.gz
-man/man4/ujis_dic.4.gz
-man/man4/2b_romkana.4.gz
-man/man4/cvt_key_tbl.4.gz
-man/man4/hinsi_data.4.gz
-man/man4/serverdefs.4.gz
-man/man5/pubdic.5.gz
-man/man5/usr_dic.5.gz
+man/ja/man1/uum.1.gz
+man/ja/man1/jserver.1.gz
+man/ja/man1/wnnkill.1.gz
+man/ja/man1/wnnstat.1.gz
+man/ja/man1/atod.1.gz
+man/ja/man1/atof.1.gz
+man/ja/man1/dtoa.1.gz
+man/ja/man1/wddel.1.gz
+man/ja/man1/wdreg.1.gz
+man/ja/man1/wnntouch.1.gz
+man/ja/man1/oldatonewa.1.gz
+man/ja/man3/jl_bun_suu.3.gz
+man/ja/man3/jl_c_zenkouho.3.gz
+man/ja/man3/jl_connect.3.gz
+man/ja/man3/jl_close.3.gz
+man/ja/man3/jl_connect_lang.3.gz
+man/ja/man3/jl_dai_top.3.gz
+man/ja/man3/jl_dic_add.3.gz
+man/ja/man3/jl_dic_add_e.3.gz
+man/ja/man3/jl_dic_comment_set_e.3.gz
+man/ja/man3/jl_dic_delete.3.gz
+man/ja/man3/jl_dic_comment_set.3.gz
+man/ja/man3/jl_dic_delete_e.3.gz
+man/ja/man3/jl_dic_save_all_e.3.gz
+man/ja/man3/jl_dic_save_all.3.gz
+man/ja/man3/jl_dic_list.3.gz
+man/ja/man3/jl_dic_list_e.3.gz
+man/ja/man3/jl_dic_save.3.gz
+man/ja/man3/jl_dic_save_e.3.gz
+man/ja/man3/jl_dic_use_e.3.gz
+man/ja/man3/jl_dic_use.3.gz
+man/ja/man3/jl_disconnect.3.gz
+man/ja/man3/jl_env.3.gz
+man/ja/man3/jl_env_un_sticky.3.gz
+man/ja/man3/jl_env_un_sticky_e.3.gz
+man/ja/man3/jl_env_set.3.gz
+man/ja/man3/jl_env_get.3.gz
+man/ja/man3/jl_env_sticky.3.gz
+man/ja/man3/jl_env_sticky_e.3.gz
+man/ja/man3/jl_fuzokugo_get.3.gz
+man/ja/man3/jl_fuzokugo_get_e.3.gz
+man/ja/man3/jl_fuzokugo_set.3.gz
+man/ja/man3/jl_fuzokugo_set_e.3.gz
+man/ja/man3/jl_get_kanji.3.gz
+man/ja/man3/jl_get_yomi.3.gz
+man/ja/man3/jl_hinsi_dicts.3.gz
+man/ja/man3/jl_hinsi_dicts_e.3.gz
+man/ja/man3/jl_get_zenkouho_kanji.3.gz
+man/ja/man3/jl_hinsi_name.3.gz
+man/ja/man3/jl_hinsi_list_e.3.gz
+man/ja/man3/jl_hinsi_name_e.3.gz
+man/ja/man3/jl_hinsi_list.3.gz
+man/ja/man3/jl_hinsi_number_e.3.gz
+man/ja/man3/jl_hinsi_number.3.gz
+man/ja/man3/jl_isconnect_e.3.gz
+man/ja/man3/jl_inspect.3.gz
+man/ja/man3/jl_isconnect.3.gz
+man/ja/man3/jl_kanji_len.3.gz
+man/ja/man3/jl_yomi_len.3.gz
+man/ja/man3/jl_jiri_len.3.gz
+man/ja/man3/jl_kill.3.gz
+man/ja/man3/jl_previous_dai.3.gz
+man/ja/man3/jl_next.3.gz
+man/ja/man3/jl_previous.3.gz
+man/ja/man3/jl_next_dai.3.gz
+man/ja/man3/jl_open.3.gz
+man/ja/man3/jl_nobi_conv.3.gz
+man/ja/man3/jl_param_set.3.gz
+man/ja/man3/jl_param_get.3.gz
+man/ja/man3/jl_param_get_e.3.gz
+man/ja/man3/jl_param_set_e.3.gz
+man/ja/man3/jl_open_lang.3.gz
+man/ja/man3/jl_ren_conv.3.gz
+man/ja/man3/jl_set_env_wnnrc.3.gz
+man/ja/man3/jl_set_jikouho.3.gz
+man/ja/man3/jl_set_jikouho_dai.3.gz
+man/ja/man3/jl_tan_conv.3.gz
+man/ja/man3/jl_update_hindo.3.gz
+man/ja/man3/jl_word_comment_set_e.3.gz
+man/ja/man3/jl_word_add_e.3.gz
+man/ja/man3/jl_word_add.3.gz
+man/ja/man3/jl_word_comment_set.3.gz
+man/ja/man3/jl_word_delete.3.gz
+man/ja/man3/jl_word_delete_e.3.gz
+man/ja/man3/jl_word_search_by_env.3.gz
+man/ja/man3/jl_word_info.3.gz
+man/ja/man3/jl_word_info_e.3.gz
+man/ja/man3/jl_word_search.3.gz
+man/ja/man3/jl_word_search_e.3.gz
+man/ja/man3/jl_word_search_by_env_e.3.gz
+man/ja/man3/jl_word_use.3.gz
+man/ja/man3/jl_word_use_e.3.gz
+man/ja/man3/jl_zenkouho_bun.3.gz
+man/ja/man3/jl_zenkouho.3.gz
+man/ja/man3/jl_zenkouho_daip.3.gz
+man/ja/man3/jl_zenkouho_suu.3.gz
+man/ja/man3/jl_zenkouho_dai.3.gz
+man/ja/man3/js_access.3.gz
+man/ja/man3/js_connect.3.gz
+man/ja/man3/js_close.3.gz
+man/ja/man3/js_dic_add.3.gz
+man/ja/man3/js_dic_file_create.3.gz
+man/ja/man3/js_dic_file_create_client.3.gz
+man/ja/man3/js_dic_info.3.gz
+man/ja/man3/js_dic_list.3.gz
+man/ja/man3/js_dic_delete.3.gz
+man/ja/man3/js_disconnect.3.gz
+man/ja/man3/js_dic_use.3.gz
+man/ja/man3/js_dic_list_all.3.gz
+man/ja/man3/js_env_exist.3.gz
+man/ja/man3/js_env_list.3.gz
+man/ja/man3/js_env_sticky.3.gz
+man/ja/man3/js_env_un_sticky.3.gz
+man/ja/man3/js_file_comment_set.3.gz
+man/ja/man3/js_file_info.3.gz
+man/ja/man3/js_file_discard.3.gz
+man/ja/man3/js_file_list.3.gz
+man/ja/man3/js_file_loaded.3.gz
+man/ja/man3/js_file_list_all.3.gz
+man/ja/man3/js_file_loaded_local.3.gz
+man/ja/man3/js_file_password_set.3.gz
+man/ja/man3/js_file_read.3.gz
+man/ja/man3/js_file_remove.3.gz
+man/ja/man3/js_file_receive.3.gz
+man/ja/man3/js_file_remove_client.3.gz
+man/ja/man3/js_file_write.3.gz
+man/ja/man3/js_file_stat.3.gz
+man/ja/man3/js_file_send.3.gz
+man/ja/man3/js_fuzokugo_get.3.gz
+man/ja/man3/js_fuzokugo_set.3.gz
+man/ja/man3/js_hindo_file_create.3.gz
+man/ja/man3/js_hindo_set.3.gz
+man/ja/man3/js_hindo_file_create_client.3.gz
+man/ja/man3/js_hinsi_dicts.3.gz
+man/ja/man3/js_hinsi_name.3.gz
+man/ja/man3/js_hinsi_list.3.gz
+man/ja/man3/js_isconnect.3.gz
+man/ja/man3/js_hinsi_number.3.gz
+man/ja/man3/js_hinsi_table_set.3.gz
+man/ja/man3/js_kanren.3.gz
+man/ja/man3/js_kantan_dai.3.gz
+man/ja/man3/js_kantan_sho.3.gz
+man/ja/man3/js_kanzen_dai.3.gz
+man/ja/man3/js_kanzen_sho.3.gz
+man/ja/man3/js_kill.3.gz
+man/ja/man3/js_mkdir.3.gz
+man/ja/man3/js_param_get.3.gz
+man/ja/man3/js_open.3.gz
+man/ja/man3/js_open_lang.3.gz
+man/ja/man3/js_param_set.3.gz
+man/ja/man3/js_get_lang.3.gz
+man/ja/man3/js_set_lang.3.gz
+man/ja/man3/js_version.3.gz
+man/ja/man3/js_who.3.gz
+man/ja/man3/js_word_add.3.gz
+man/ja/man3/js_word_comment_set.3.gz
+man/ja/man3/js_word_delete.3.gz
+man/ja/man3/js_word_info.3.gz
+man/ja/man3/js_word_search.3.gz
+man/ja/man3/js_word_search_by_env.3.gz
+man/ja/man3/romkan_clear.3.gz
+man/ja/man3/romkan_getc.3.gz
+man/ja/man3/romkan_dispmode.3.gz
+man/ja/man3/romkan_init.3.gz
+man/ja/man3/romkan_next.3.gz
+man/ja/man3/romkan_ungetc.3.gz
+man/ja/man3/msg_open.3.gz
+man/ja/man3/msg_get.3.gz
+man/ja/man3/msg_close.3.gz
+man/ja/man4/fzk.data.4.gz
+man/ja/man4/2a_ctrl.4.gz
+man/ja/man4/fzk.u.4.gz
+man/ja/man4/jserverrc.4.gz
+man/ja/man4/mode.4.gz
+man/ja/man4/uumrc.4.gz
+man/ja/man4/uumkey.4.gz
+man/ja/man4/wnnenvrc.4.gz
+man/ja/man4/ujis_dic.4.gz
+man/ja/man4/2b_romkana.4.gz
+man/ja/man4/cvt_key_tbl.4.gz
+man/ja/man4/hinsi_data.4.gz
+man/ja/man4/serverdefs.4.gz
+man/ja/man5/pubdic.5.gz
+man/ja/man5/usr_dic.5.gz
+@comment Xwnmo
+man/ja/man1/xwnmo.1.gz
+man/ja/man1/ximrc.1.gz
+man/ja/man1/ximconf.1.gz
+man/ja/man1/cvt_fun_tbl.1.gz
+man/ja/man1/cvt_meta_tbl.1.gz
+man/ja/man1/killxwnmo.1.gz
+man/ja/man1/cvt_xim_tbl.1.gz
+man/ja/man1/xjutil.1.gz
+@comment END Xwnmo
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index ee475394149b..8277b8817810 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -3,15 +3,16 @@
 # Date created:		20 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.20 1998/10/04 12:54:11 kuriyama Exp $
+# $Id: Makefile,v 1.21 1999/02/03 11:11:48 asami Exp $
 #
 
 DISTNAME=	Wnn4.2
 PKGNAME?=	ja-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
+		ftp://ftp.wg.omron.co.jp/pub/Wnn/dic/pubdic+/ \
+		http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/Wnn/
+DISTFILES=	Wnn4.2.tar.gz ${WNN_EXTRA_PATCH}
 
 MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
 
@@ -23,57 +24,128 @@ FILESDIR=	${.CURDIR}/../../japanese/Wnn/files
 PKGDIR=		${.CURDIR}/../../japanese/Wnn/pkg
 WRKSRC=		${WRKDIR}/Xsi
 
+WNN_EXTRA_PATCH= Wnn4.2.patch-981201.tar.gz
+MAKE_ENV+=	 PATH=/usr/bin:$${PATH} PORT_IMAKE_DEFINES='${WNN_DEF}'
+
 .if (${PKGNAME} == ja-Wnn-4.2)
+DISTFILES+=	pubdic+.tar.gz pubdic+-fix01.gz pubdic+.diff pubdic+.special.diff
 PORT_DOCDIR=	${PREFIX}/share/doc/ja-Wnn
 DOC_FROM=	${WRKSRC}/Wnn
-.elif (${PKGNAME} == zh-Wnn-4.2)
+BuildWnn=	YES
+BuildJlibV3=	YES
+LOCAL_MAN_LANG=	ja
+SHARED_LIB=	libwnn4
+.else
+BuildWnn=	NO
+.endif
+.if (${PKGNAME} == zh-Wnn-4.2)
 PORT_DOCDIR=	${PREFIX}/share/doc/zh-Wnn
 DOC_FROM=	${WRKSRC}/cWnn
-.endif  # kWnn has no manual.
+BuildCWnn=	YES
+SHARED_LIB=	libcwnn4
+.else
+BuildCWnn=	NO
+.endif
+.if (${PKGNAME} == ko-Wnn-4.2)
+# kWnn has no manual.
+BuildKWnn=	YES
+SHARED_LIB=	libkwnn4
+.else
+BuildKWnn=	NO
+.endif
+BuildXwnmo=	YES
+# pubdic+
+PUBDICPDIR=	${WRKSRC}/pubdic+
+WDICS=	bio.u computer.u kihon.u setsuji.u tankan.u \
+	chimei.u jinmei.u koyuu.u symbol.u special.u
+ATOD=	${WRKSRC}/Wnn/jutil/atod -h ${WRKSRC}/Wnn/jd/hinsi.data
+#WNN_DEF+=	-DBuildPubdic=NO
+# TOPDIR should be a full path provided we build a shared library.
+WNN_DEF+=	-DTOPDIR=${WRKSRC}
 
 post-extract:
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${_DISTDIR}/Wnn4.2.patch.tar.gz ${EXTRACT_AFTER_ARGS} \
+		${_DISTDIR}${WNN_EXTRA_PATCH} ${EXTRACT_AFTER_ARGS} \
 		-C ${WRKSRC}
 	${LN} -sf Project.tmpl ${WRKSRC}/config/X11.tmpl
+.if (${PKGNAME} == ja-Wnn-4.2)
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}pubdic+.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
+.endif
 
 pre-patch:
-	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Wnn4.2.patch
+	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Wnn-patch-01Dec98
 
-# Applying a patch for depending on language
+#### pubdic+
+.if (${PKGNAME} == ja-Wnn-4.2)
 post-patch:
-	case ${PKGNAME} in \
-	  ja-Wnn-4.2) \
-		LANG_PATCH=${FILESDIR}/patch-for-japanese;; \
-	  zh-Wnn-4.2) \
-		LANG_PATCH=${FILESDIR}/patch-for-chinese;; \
-	  ko-Wnn-4.2) \
-		LANG_PATCH=${FILESDIR}/patch-for-korean;; \
-	esac; \
-	(cd ${_DISTDIR}; \
-		${PATCH} ${PATCH_DIST_ARGS} < $${LANG_PATCH})
-
-# for PREFIX
-pre-build:
+	cd ${PUBDICPDIR}; \
+	${GZCAT} ${_DISTDIR}pubdic+-fix01.gz | ${PATCH} --quiet; \
+	${PATCH} --quiet < ${_DISTDIR}pubdic+.diff; \
+	${PATCH} --quiet < ${_DISTDIR}pubdic+.special.diff
+.endif
+
+pre-configure:
 	for file in ${WRKSRC}/config/Project.tmpl \
 		${WRKSRC}/Contrib/dic/gerodic/Makefile; do \
 	  ${MV} $$file $$file.orig2; \
-	  ${SED} 's!^\([ ]*PREFIX = \).*$$!\1${PREFIX}!' \
+	  ${SED} -e 's!^\([ ]*PREFIX = \).*$$!\1${PREFIX}!' \
+		-e 's!%%LOCAL_MAN_LANG%%!${LOCAL_MAN_LANG}!' \
+		-e 's!%%BuildWnn%%!${BuildWnn}!' \
+		-e 's!%%BuildCWnn%%!${BuildCWnn}!' \
+		-e 's!%%BuildKWnn%%!${BuildKWnn}!' \
+		-e 's!%%BuildXwnmo%%!${BuildXwnmo}!' \
+		-e 's!%%BuildJlibV3%%!${BuildJlibV3}!' \
 		$$file.orig2 > $$file; \
 	done
 
+do-configure:
+	 (cd ${WRKSRC}; \
+	 imake -DUseInstalled -I${WRKSRC}/config \
+		 -I${X11BASE}/lib/X11/config -DTOPDIR=${WRKSRC}; \
+	 ${MAKE} Makefiles; \
+	 ${MAKE} clean; \
+	 ${MAKE} includes; \
+	 ${MAKE} depend )
+
+pre-build:
+#### pubdic+
+.if (${PKGNAME} == ja-Wnn-4.2)
+	cd ${PUBDICPDIR}; ${XMKMF}; ${MAKE} wnn; \
+	cd ${WRKSRC}/Pubdic; \
+	for file in ${WDICS}; do \
+		${MV} -f $$file $$file.org; \
+		${MV} ../pubdic+/$$file . ; \
+		hdfile=`echo $$file | ${SED} 's/\\.u/.hd/'`; \
+		${MV} -f $$hdfile $$hdfile.org; \
+		${SED} 's,(pubdic),(pubdic+),' $$hdfile.org > $$hdfile; \
+	done
+.endif
+
 # These are necesary because this package uses a different Makefile for
 #  building and installing etc.
-do-build:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
+#do-build:
+#	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
+
+#### gerodic
+.if (${PKGNAME} == ja-Wnn-4.2)
+post-build:
+	cd ${WRKSRC}/Contrib/dic/gerodic; \
+	${ATOD} -h ${WRKSRC}/Pubdic/hinsi.data g-jinmei.dic < g-jinmei.u
+.endif
 
 pre-install:
 	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
 
 post-install:
+#### gerodic
+.if (${PKGNAME} == ja-Wnn-4.2)
+	cd ${WRKSRC}/Contrib/dic/gerodic; \
+	make all install
+.endif
+####
 # 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)
+	@cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 .if !defined(NOPORTDOCS)
@@ -84,5 +156,11 @@ post-install:
 	@chown -R bin.bin ${PORT_DOCDIR}
 .endif
 .endif
+### for the shared libray
+	if [ X"${PORTOBJFORMAT}" != Xelf ]; then \
+		${LN} -sf ${SHARED_LIB}.so.1.0 \
+			${X11BASE}/lib/${SHARED_LIB}.so; \
+	fi
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/japanese/FreeWnn-server/distinfo b/japanese/FreeWnn-server/distinfo
index 1571e84d8e7f..bc9146a2c6c5 100644
--- a/japanese/FreeWnn-server/distinfo
+++ b/japanese/FreeWnn-server/distinfo
@@ -1,2 +1,6 @@
 MD5 (Wnn4.2.tar.gz) = dcb6271403577199e8141d07cd54be73
-MD5 (Wnn4.2.patch.tar.gz) = 9cfd1547623774f2f8e92f05c1725da8
+MD5 (Wnn4.2.patch-981201.tar.gz) = 542847bff36e88f0ea588153b387e932
+MD5 (pubdic+.tar.gz) = 92dc7dfeae7eb3b637157fe2fd25480a
+MD5 (pubdic+-fix01.gz) = 2469f2e65ac5f3248dd4225ca5383c49
+MD5 (pubdic+.diff) = 51e53024862273f51d8f3c51a3ea70b2
+MD5 (pubdic+.special.diff) = acf3faa8ba8219ed97ca0c4e59030145
diff --git a/japanese/FreeWnn-server/files/patch-af b/japanese/FreeWnn-server/files/patch-af
index 7bda975ebb7d..577c5210fb5f 100644
--- a/japanese/FreeWnn-server/files/patch-af
+++ b/japanese/FreeWnn-server/files/patch-af
@@ -35,7 +35,7 @@
  #endif	/* JAPANESE */
  #ifdef	CHINESE
 -    fprintf(stderr, "wnnstat [-weEdDfFSUJBC] [-L lang_name] [server_name]\n");
-+    fprintf(stderr, "wnnstat [-weEdDfFUBCV] [-L lang_name] [server_name]\n");
++    fprintf(stderr, "cwnnstat [-weEdDfFUBCV] [-L lang_name] [server_name]\n");
  #endif	/* CHINESE */
  #ifdef KOREAN
 -    fprintf(stderr, "kwnnstat [-weEdDfFKU] [-L lang_name] [server_name]\n");
diff --git a/japanese/FreeWnn-server/files/patch-ai b/japanese/FreeWnn-server/files/patch-ai
index e7cf3360fbb4..451f9a9b4956 100644
--- a/japanese/FreeWnn-server/files/patch-ai
+++ b/japanese/FreeWnn-server/files/patch-ai
@@ -1,6 +1,6 @@
---- ./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 @@
+--- kWnn/jlib/Imakefile.orig	Wed Aug 17 10:11:40 1994
++++ kWnn/jlib/Imakefile	Tue Jan  5 23:06:15 1999
+@@ -1,7 +1,11 @@
  XCOMM
  XCOMM $Id: Imakefile,v 1.2 1994/08/17 01:11:40 kuwa Exp $
  XCOMM
@@ -8,9 +8,11 @@
 +XCOMM   -- S. Taoka
 +XCOMM
  #define DoNormalLib YES
++#define DoSharedLib YES
  
  #include <Library.tmpl>
-@@ -10,7 +13,9 @@
+ 
+@@ -10,7 +14,9 @@
  LINKS = getopt.c jl.c js.c wnnerrmsg.c
      JLIBDEFINES = -DWRITE_CHECK
         INCLUDES = -I$(KWNNINCLUDESRC) -I$(TOP)
@@ -21,7 +23,7 @@
     INSTALLFLAGS = $(INSTBINFLAGS)
         LINTLIBS = 
  
-@@ -28,6 +33,15 @@
+@@ -28,6 +34,15 @@
  OBJ4= strings.o
  SRC5= $(KWNNETCSRC)/bcopy.c
  OBJ5= bcopy.o
@@ -37,25 +39,69 @@
  LOCAL_RKSRCS= $(KWNNROMKANSRC)/rk_bltinfn.c \
  	$(KWNNROMKANSRC)/rk_main.c \
  	$(KWNNROMKANSRC)/rk_modread.c \
-@@ -40,8 +54,8 @@
+@@ -40,13 +55,26 @@
  	$(KWNNROMKANSRC)/rk_read.o \
  	$(KWNNROMKANSRC)/rk_vars.o
  
 -LOCAL_ETCSRCS = $(SRC4) $(SRC5)
 -LOCAL_ETCOBJS = $(OBJ4) $(OBJ5)
++UNSHARED_LOCAL_RKOBJS= $(KWNNROMKANSRC)/unshared/rk_bltinfn.o \
++	$(KWNNROMKANSRC)/unshared/rk_main.o \
++	$(KWNNROMKANSRC)/unshared/rk_modread.o \
++	$(KWNNROMKANSRC)/unshared/rk_read.o \
++	$(KWNNROMKANSRC)/unshared/rk_vars.o
++
 +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)
++UNSHAREDOBJS= $(OBJ1) $(OBJ3) $(LOCAL_ETCOBJS) $(UNSHARED_LOCAL_RKOBJS)
++
++SOKWNN4LIBREV=1.0
+ 
+ LibraryObjectRule()
++#if DoSharedLib
++AllTarget($(OBJS) libkwnn.a libkwnn4.so.$(SOKWNN4LIBREV))
++#else
+ AllTarget($(OBJS) libkwnn.a)
++#endif
+ 
+ includes:: $(LINKS)
+ 
+@@ -65,11 +93,19 @@
  
-@@ -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),)
+ NormalLintTarget($(SRC2))
+ 
+-NormalLibraryTarget(kwnn,$(OBJS))
++#if DoSharedLib
++SharedLibraryTarget(kwnn4,$(SOKWNN4LIBREV),$(OBJS),.,.)
++#endif
++
++UnsharedLibraryTarget(kwnn,$(UNSHAREDOBJS),unshared,..)
+ LintLibraryTarget(kwnn,$(SRCS))
+ 
+ instlib:: install
+ 
++#if DoSharedLib
++InstallSharedLibrary(kwnn4,$(SOKWNN4LIBREV),$(WNNLIBDIR))
++#endif
 +
+ InstallLibrary(kwnn,$(WNNLIBDIR))
+ 
+ #if ProfileLibJlib
+@@ -77,9 +113,12 @@
+ InstallLibrary(kwnn_p,$(WNNLIBDIR))
+ #endif
+ 
+-WnnSpecialObjectRule($(OBJ3),$(SRC3),$(KWNNETCSRC),)
+-WnnSpecialObjectRule($(OBJ4),$(SRC4),$(KWNNETCSRC),)
+-WnnSpecialObjectRule($(OBJ5),$(SRC5),$(KWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ3),$(SRC3),$(KWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ4),$(SRC4),$(KWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ5),$(SRC5),$(KWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ6),$(SRC6),$(KWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ7),$(SRC7),$(KWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ8),$(SRC8),$(KWNNETCSRC),)
  
  $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS)
  	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
diff --git a/japanese/FreeWnn-server/files/patch-an b/japanese/FreeWnn-server/files/patch-an
new file mode 100644
index 000000000000..885b931a2511
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-an
@@ -0,0 +1,66 @@
+--- Xwnmo/xwnmo/client.c.~1~	Mon Aug 23 11:06:16 1993
++++ Xwnmo/xwnmo/client.c	Fri Feb  6 06:44:03 1998
+@@ -53,7 +53,7 @@
+ {
+     char *p;
+     char ret = '\0';
+-    extern char *index();
++/*    extern char *index();*/
+ 
+     if ((p = romkan_dispmode()) == NULL) return(ret);
+     if ((p = (char*)index(p, ':')) == NULL) return(ret);
+--- Xwnmo/xwnmo/screen.c.~1~	Tue Dec  1 15:10:57 1992
++++ Xwnmo/xwnmo/screen.c	Fri Feb  6 06:48:15 1998
+@@ -361,7 +361,7 @@
+ get_rk_modes()
+ {
+     char        *p;
+-    extern char *index();
++/*    extern char *index();*/
+ 
+     strcpy(rk_modes, (NULL == (p = romkan_dispmode()) ? "[   ]" : p));
+     if ((p = (char*)index(rk_modes, ':')) != NULL && *(p + 1)) {
+--- Xwnmo/xwnmo/jhlp.c.~1~	Thu Aug  4 16:10:14 1994
++++ Xwnmo/xwnmo/jhlp.c	Fri Feb  6 06:50:24 1998
+@@ -415,7 +415,7 @@
+     XLCd xlc;
+ #endif /* X11R5 */
+     extern char *get_server_env();
+-    extern char *index();
++/*    extern char *index(); */
+ 
+     prgname = argv[0];
+     if (create_arg_string(argv, argc) == -1) exit(1);
+--- Xwnmo/xjutil/init_w.c.~1~	Thu Aug  4 16:10:10 1994
++++ Xwnmo/xjutil/init_w.c	Fri Feb  6 07:54:48 1998
+@@ -76,7 +76,7 @@
+     char *p;
+     char ret = '\0';
+ #ifndef SYSVR2
+-    extern char *index();
++/*    extern char *index(); */
+ #else
+     extern char *strchr();
+ #endif
+--- Xwnmo/xjutil/jutil.c.~1~	Thu Jan 21 17:05:44 1993
++++ Xwnmo/xjutil/jutil.c	Fri Feb  6 07:56:50 1998
+@@ -664,7 +664,7 @@
+     extern int srand();
+     extern long rand();
+ #else
+-    extern int srandom();
++/*    extern int srandom(); */
+     extern long random();
+ #endif
+     extern long time();
+--- Xwnmo/xjutil/kensaku.c.~1~	Tue Dec  1 14:59:48 1992
++++ Xwnmo/xjutil/kensaku.c	Fri Feb  6 07:58:54 1998
+@@ -154,7 +154,7 @@
+     static char message4[2048];
+     int ret;
+     char *table_t[6];
+-    extern int qsort();
++/*    extern int qsort();*/
+ 
+     if (get_env() == -1) return(NULL);
+ 
diff --git a/japanese/FreeWnn-server/files/patch-ao b/japanese/FreeWnn-server/files/patch-ao
new file mode 100644
index 000000000000..c3aa020ff065
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-ao
@@ -0,0 +1,81 @@
+diff -ru Wnn.org/jd/jserverrc Wnn/jd/jserverrc
+--- Wnn.org/jd/jserverrc	Mon Sep  6 10:47:31 1993
++++ Wnn/jd/jserverrc	Tue Feb 10 07:58:43 1998
+@@ -20,7 +20,9 @@
+ ;readfile wnncons/tankan3.dic
+ 
+ ;         n nbun hindo len jiri flag jisho sbn dbn_len sbn_cnt suji kana eisuu kigou toji fuzoku kai
+-def_param 2 10   2     40  100  200  20    1   40      -40     40   -100 40    80    40   100    40
++;def_param 2 10   2     40  100  200  20    1   40      -40     40   -100 40    80    40   100    40
++; New Parameter
++def_param 2 10   2     45  100  200  5     1   40      -100    200  -100 200   80    200  200    200
+ 
+ ;set_giji_eisuu '-' '_' 0x20 \x5c ^M '変' 1234 012 \o12
+ set_giji_eisuu '-' '_' 0x20 '―' '＿' '￣' '!' '?' '.' ',' ':' ';' '：' '；' '？' '！' '，' '．' '・'
+diff -ru Wnn.org/jd/wnnenvrc.omr Wnn/jd/wnnenvrc.omr
+--- Wnn.org/jd/wnnenvrc.omr	Mon Sep  6 10:47:34 1993
++++ Wnn/jd/wnnenvrc.omr	Tue Feb 10 07:58:56 1998
+@@ -19,4 +19,7 @@
+ ;setdic wnncons/tankan3.dic	-			1 1 1 - - 0
+ 
+ ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
+-setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
++;setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
++; New Parameter
++setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
++
+diff -ru Wnn.org/jd/wnnenvrc.rem Wnn/jd/wnnenvrc.rem
+--- Wnn.org/jd/wnnenvrc.rem	Mon Sep  6 10:47:36 1993
++++ Wnn/jd/wnnenvrc.rem	Tue Feb 10 07:59:06 1998
+@@ -19,4 +19,6 @@
+ ;setdic wnncons/tankan3.dic -  1 1 1 - - 0
+ 
+ ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
+-setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
++;setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
++; New Parameter
++setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
+diff -ru Wnn.org/jd/wnnenvrc.rev Wnn/jd/wnnenvrc.rev
+--- Wnn.org/jd/wnnenvrc.rev	Mon Sep  6 10:47:37 1993
++++ Wnn/jd/wnnenvrc.rev	Tue Feb 10 07:59:15 1998
+@@ -19,4 +19,6 @@
+ ;setdic wnncons/tankan3.dic !@WNN_DIC_DIR/wnncons/tankan3.frq  1 1 1 - - 0
+ 
+ ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
+-setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
++;setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
++; New Parameter
++setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
+diff -ru Wnn.org/jd/wnnenvrc_R.omr Wnn/jd/wnnenvrc_R.omr
+--- Wnn.org/jd/wnnenvrc_R.omr	Wed Aug 25 15:11:40 1993
++++ Wnn/jd/wnnenvrc_R.omr	Tue Feb 10 07:59:24 1998
+@@ -19,4 +19,6 @@
+ ;setdic wnncons/tankan3.dic	-			1 1 1 - - 1
+ 
+ ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
+-setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
++;setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
++; New Parameter
++setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
+diff -ru Wnn.org/jd/wnnenvrc_R.rem Wnn/jd/wnnenvrc_R.rem
+--- Wnn.org/jd/wnnenvrc_R.rem	Wed Aug 25 15:11:48 1993
++++ Wnn/jd/wnnenvrc_R.rem	Tue Feb 10 07:59:34 1998
+@@ -19,4 +19,6 @@
+ ;setdic wnncons/tankan3.dic -  1 1 1 - - 1
+ 
+ ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
+-setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
++;setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
++; New Parameter
++setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
+diff -ru Wnn.org/jd/wnnenvrc_R.rev Wnn/jd/wnnenvrc_R.rev
+--- Wnn.org/jd/wnnenvrc_R.rev	Wed Aug 25 15:11:54 1993
++++ Wnn/jd/wnnenvrc_R.rev	Tue Feb 10 07:59:42 1998
+@@ -19,4 +19,6 @@
+ ;setdic wnncons/tankan3.dic -  1 1 1 - - 1
+ 
+ ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
+-setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
++;setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
++; New Parameter
++setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
diff --git a/japanese/FreeWnn-server/files/patch-ap b/japanese/FreeWnn-server/files/patch-ap
new file mode 100644
index 000000000000..17495e11a56e
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-ap
@@ -0,0 +1,25 @@
+--- Imakefile.~1~	Tue Oct  4 08:18:46 1994
++++ Imakefile	Tue Feb 10 11:29:58 1998
+@@ -4,7 +4,7 @@
+ #define IHaveSubdirs
+ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
+ 
+-#if BuildWnn || BuildXwnmo
++#if BuildWnn
+ WNNDIR = Wnn
+ #endif
+ #if BuildCWnn
+--- ./Xwnmo/jd/ximconf.~1~	Thu Feb 12 10:20:17 1998
++++ ./Xwnmo/jd/ximconf	Thu Feb 12 10:32:59 1998
+@@ -18,8 +18,8 @@
+ 		zh_TW	zh_TW.ucns	2,1,2	True	Yincoding
+ zh_CN.eucCN|zh_CN.ugb	\
+ 		zh_CN	zh_CN.ugb	2,1,2	True	Yincoding
+-ja|ja_JP.eucJP|ja_JP.ujis|ja_JP.mscode|ja_JP.SJIS|ja_JP.jis8|ja_JP.jis7|ja_JP.pjis \
+-		ja_JP	ja_JP.ujis	2,1,2	True	Normal
++ja|ja_JP.EUC|ja_JP.eucJP|ja_JP.ujis|ja_JP.mscode|ja_JP.SJIS|ja_JP.jis8|ja_JP.jis7|ja_JP.pjis \
++		ja_JP	ja_JP.EUC	2,1,2	True	Normal
+ 
+-setdefaultlocale	ja_JP.ujis
++setdefaultlocale	ja_JP.EUC
+ setworldlocale	wr_WR.ct
diff --git a/japanese/FreeWnn-server/files/patch-aq b/japanese/FreeWnn-server/files/patch-aq
new file mode 100644
index 000000000000..d476242347bd
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-aq
@@ -0,0 +1,26 @@
+--- Xwnmo/xwnmo/localalloc.c.~1~	Tue Dec  1 15:10:40 1992
++++ Xwnmo/xwnmo/localalloc.c	Thu Jun 25 12:11:29 1998
+@@ -112,6 +112,7 @@
+ {
+     char *ptr;
+     if (size == 0) return(NULL);
++    size += (sizeof(char *)-(size%sizeof(char *)));
+     if ((ptr = malloc(size)) == NULL) {
+ #ifdef ALLOC_DEBUG
+ 	print_out1("alloc failed with size = %d", size);
+@@ -134,6 +135,7 @@
+ unsigned size;
+ {
+     if (size == 0) return(ptr);
++    size += (sizeof(char *)-(size%sizeof(char *)));
+     if (ptr == NULL) return(Malloc(size));
+ #ifdef ALLOC_DEBUG
+     unregister_debug(ptr);
+@@ -153,6 +155,7 @@
+ {
+     char *ptr;
+     if (size == 0) return(NULL);
++    size += (sizeof(char *)-(size%sizeof(char *)));
+     if ((ptr = calloc(num, size)) == NULL) {
+ 	return(NULL);
+     }
diff --git a/japanese/FreeWnn-server/files/patch-ba b/japanese/FreeWnn-server/files/patch-ba
new file mode 100644
index 000000000000..3b92501b6212
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-ba
@@ -0,0 +1,75 @@
+--- ../Wnn-4.2-patched/cWnn/cdic/Imakefile	Tue Aug 23 11:26:22 1994
++++ cWnn/cdic/Imakefile	Mon Nov  2 18:44:39 1998
+@@ -55,6 +55,12 @@
+ instserver:: install
+ 
+ WnnMakeDirectories(install,$(CWNNDICDIR))
++/*
++ * Bugfix.
++ * Because "NO" is same to "YES"!!
++ * And some additional bugfix.
++ */
++#if (WnnInstallDicForcibly == YES)
+ InstallMultiple($(ALLTGT),$(CWNNSYSDICDIR))
+ 
+ install::
+@@ -62,6 +68,9 @@
+ 	do \
+ 		$(WNNTOUCH) $(DESTDIR)$(CWNNSYSDICDIR)/$$i ;\
+ 	done
++#else
++WnnInstallDicMultiple($(ALLTGT),$(CWNNSYSDICDIR))
++#endif
+ 
+ depend::
+ 	@echo "skipping make in my dir"
+--- ../Wnn-4.2-patched/cWnn/tdic/Imakefile	Tue Aug 23 11:26:41 1994
++++ cWnn/tdic/Imakefile	Mon Nov  2 18:46:56 1998
+@@ -45,6 +45,12 @@
+ instserver:: install
+ 
+ WnnMakeDirectories(install,$(TWNNDICDIR))
++/*
++ * Bugfix.
++ * Because "NO" is same to "YES"!!
++ * And some additional bugfix.
++ */
++#if (WnnInstallDicForcibly == YES)
+ InstallMultiple($(ALLTGT),$(TWNNSYSDICDIR))
+ 
+ install::
+@@ -52,6 +58,9 @@
+ 	do \
+ 		$(WNNTOUCH) $(DESTDIR)$(TWNNSYSDICDIR)/$$i ;\
+ 	done
++#else
++WnnInstallDicMultiple($(ALLTGT),$(TWNNSYSDICDIR))
++#endif
+ 
+ depend::
+ 	@echo "skipping make in my dir"
+--- ../Wnn-4.2-patched/kWnn/kdic/Imakefile	Tue Aug 23 11:25:31 1994
++++ kWnn/kdic/Imakefile	Mon Nov  2 18:49:05 1998
+@@ -41,6 +41,12 @@
+ instserver:: install
+ 
+ WnnMakeDirectories(install,$(KWNNDICDIR))
++/*
++ * Bugfix.
++ * Because "NO" is same to "YES"!!
++ * And some additional bugfix.
++ */
++#if (WnnInstallDicForcibly == YES)
+ InstallMultiple($(ALLTGT),$(KWNNSYSDICDIR))
+ 
+ install::
+@@ -48,6 +54,9 @@
+ 	do \
+ 		$(WNNTOUCH) $(DESTDIR)$(KWNNSYSDICDIR)/$$i ;\
+ 	done
++#else
++WnnInstallDicMultiple($(ALLTGT),$(KWNNSYSDICDIR))
++#endif
+ 
+ depend::
+ 	@echo "skipping make in my dir"
diff --git a/japanese/FreeWnn-server/files/patch-bb b/japanese/FreeWnn-server/files/patch-bb
new file mode 100644
index 000000000000..1722ecbc2600
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-bb
@@ -0,0 +1,132 @@
+--- config/Project.tmpl.orig	Wed Jan  6 00:32:36 1999
++++ config/Project.tmpl	Wed Jan  6 02:36:03 1999
+@@ -389,6 +389,8 @@
+ XCOMM -----------------------------------------------------------------------
+ XCOMM X Window System make variables; these need to be coordinated with rules
+ 
++    SYS_LIBRARIES = -lcrypt		/* For FreeBSD */
++
+ /*
+  * This list must be reflected in the DIRS_TO_BUILD list in the top-level
+  * Makefile.
+@@ -413,6 +415,9 @@
+       XAPPLOADDIR = XAppLoadDir		/* application default resource dir */
+        FONTCFLAGS = FontCompilerFlags
+ 
++     INSTINCFLAGS = InstIncFlags -c     /* XXX - dirty hack by */
++     INSTDATFLAGS = InstDatFlags -c     /* XXX -  Satoshi */
++     INSTBINFLAGS = InstBinFlags -c     /* XXX -   Asami */
+      INSTAPPFLAGS = $(INSTDATFLAGS)	/* XXX - this should go away - XXX */
+ 
+ #ifdef UseInstalled
+@@ -465,6 +470,7 @@
+ #define ProfileLibX11		NO	/* profiled X library */
+ #endif
+           XLIBSRC = $(LIBSRC)/X11
++#ifndef XFree86Version
+ #if SharedLibX11
+ #ifndef SharedX11Rev
+ #define SharedX11Rev 6.0
+@@ -481,6 +487,16 @@
+ UnsharedLibReferences(XONLY,X11,$(XLIBSRC))
+ #endif
+ #endif
++#else
++#if SharedLibX11
++#ifndef SharedX11Rev
++#define SharedX11Rev 6.0
++#endif
++SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev)
++#else
++UnsharedLibReferences(XONLY,X11,$(XLIBSRC))
++#endif
++#endif
+          XLIBONLY = $(XONLYLIB)
+ 
+ #ifndef SharedLibXext
+@@ -1097,6 +1113,13 @@
+ obj : depends							@@\
+ 	$(CC) -c $(CFLAGS) define direct/`basename $@ .o`.c	@@\
+ 
++#define	WnnSpecialSharedObjectRule(obj, depends, direct, define)	@@\
++obj : depends								@@\
++	(cd unshared ; \						@@\
++	$(CC) -c $(CFLAGS) define direct/`basename $@ .o`.c)		@@\
++	$(CC) -c $(CFLAGS) define $(SHLIBDEF) $(SHAREDCODEDEF) \	@@\
++	  $(PICFLAGS) direct/`basename $@ .o`.c				@@\
++
+ #ifdef WnnMakeDirectories
+ #undef WnnMakeDirectories
+ #endif
+@@ -1117,10 +1140,16 @@
+ #undef ImakeSubCmdHelper
+ #endif 
+ 
++/*
++ * Change a variavle's name from "$imakeprefix" to "$(IMAKEPREFIX)".
++ * Because it caused a error on XFree86 3.1.2S and 3.1.2E.
++ * The Imake rule of XFree86 3.1.2S and 3.1.2E FreeBSD was changed.
++ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
++ */
+ #ifdef UseInstalled
+-#define ImakeSubCmdHelper $(IMAKE) -DUseInstalled -I$$imakeprefix$(IMIRULESRC) -I$(IRULESRC) $(IMAKE_DEFINES)
++#define ImakeSubCmdHelper $(IMAKE) -DUseInstalled -I$(IMAKEPREFIX)$(IMIRULESRC) -I$(IRULESRC) $(IMAKE_DEFINES)
+ #else
+-#define ImakeSubCmdHelper $$imakeprefix$(IMAKE) -I$$imakeprefix$(IMIRULESRC) -I$$imakeprefix$(IRULESRC) $(IMAKE_DEFINES)
++#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IMIRULESRC) -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES)
+ #endif
+ 
+ #define WnnInstallDicMultiple(list,dest)				@@\
+@@ -1135,16 +1164,16 @@
+ 	done
+ 
+ #ifndef BuildWnn
+-#define BuildWnn	YES
++#define BuildWnn	%%BuildWnn%%
+ #endif
+ #ifndef BuildCWnn
+-#define BuildCWnn	YES
++#define BuildCWnn	%%BuildCWnn%%
+ #endif
+ #ifndef BuildKWnn
+-#define BuildKWnn	YES
++#define BuildKWnn	%%BuildKWnn%%
+ #endif
+ #ifndef BuildXwnmo
+-#define BuildXwnmo	YES
++#define BuildXwnmo	%%BuildXwnmo%%
+ #endif
+ 
+ #ifndef BuildJserver
+@@ -1169,7 +1198,7 @@
+ #define BuildWnnMan	YES
+ #endif
+ #ifndef BuildJlibV3
+-#define BuildJlibV3	NO
++#define BuildJlibV3	%%BuildJlibV3%%
+ #endif
+ #if BuildPubdic || BuildWnnConsDic
+ #define BuildWnnDicUtilForCompile	YES
+@@ -1236,8 +1265,9 @@
+ #else
+           IMTOP = $(CONTRIBSRC)/programs/Xsi
+ #endif
+-      WNNWNNDIR = /usr/local/lib/wnn
+-      WNNBINDIR = /usr/local/bin
++         PREFIX = /usr/local
++      WNNWNNDIR = ${PREFIX}/lib/wnn
++      WNNBINDIR = ${PREFIX}/bin
+       WNNINCDIR = $(INCROOT)
+       WNNLIBDIR = $(USRLIBDIR)
+     WNNTERM_LIB = termLibrary
+@@ -1352,6 +1382,10 @@
+   XWNMOINCLUDES = -I$(XWNMOROMKANMSRC) -I$(WNNINCLUDESRC) $(XWNMOXLIBINC)
+       XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn_m.a
+  XWNMOLIBRARIES = $(XWNMOJLIB)
++
++XCOMM for FreeBSD port
++XCOMM
++MANPATH= /usr/X11R6/man/%%LOCAL_MAN_LANG%%
+ 
+        XWNMODEF = -DBC_X11R5
+ 
diff --git a/japanese/FreeWnn-server/files/patch-bc b/japanese/FreeWnn-server/files/patch-bc
new file mode 100644
index 000000000000..19651afd02b2
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-bc
@@ -0,0 +1,78 @@
+--- Wnn/jlib/Imakefile.orig	Wed Aug 17 10:10:03 1994
++++ Wnn/jlib/Imakefile	Wed Nov 18 01:17:23 1998
+@@ -2,6 +2,7 @@
+ XCOMM $Id: Imakefile,v 1.10 1994/08/17 01:10:03 kuwa Exp $
+ XCOMM
+ #define DoNormalLib YES
++#define DoSharedLib YES
+ 
+ #include <Library.tmpl>
+ 
+@@ -45,13 +46,26 @@
+ 	$(WNNROMKANSRC)/rk_read.o \
+ 	$(WNNROMKANSRC)/rk_vars.o
+ 
++UNSHARED_LOCAL_RKOBJS= $(WNNROMKANSRC)/unshared/rk_bltinfn.o \
++	$(WNNROMKANSRC)/unshared/rk_main.o \
++	$(WNNROMKANSRC)/unshared/rk_modread.o \
++	$(WNNROMKANSRC)/unshared/rk_read.o \
++	$(WNNROMKANSRC)/unshared/rk_vars.o
++
+ LOCAL_ETCSRCS = $(SRC3) $(SRC4) $(SRC5) $(SRC6) $(SRC7) $(SRC8)
+ LOCAL_ETCOBJS = $(OBJ3) $(OBJ4) $(OBJ5) $(OBJ6) $(OBJ7) $(OBJ8)
+ SRCS= $(SRC1) $(LOCAL_ETCSRCS)
+ OBJS= $(OBJ1) $(LOCAL_ETCOBJS) $(LOCAL_RKOBJS)
++UNSHAREDOBJS= $(OBJ1) $(LOCAL_ETCOBJS) $(UNSHARED_LOCAL_RKOBJS)
+ 
++SOWNN4LIBREV=1.0
++ 
+ LibraryObjectRule()
++#if DoSharedLib
++AllTarget($(OBJS) libwnn.a libwnn4.so.$(SOWNN4LIBREV))
++#else
+ AllTarget($(OBJS) libwnn.a)
++#endif
+ 
+ NormalLibraryTarget(getopt,$(OBJ2))
+ LintLibraryTarget(getopt,$(SRC2))
+@@ -65,11 +79,20 @@
+ 
+ SingleProgramTarget(kankana,kankana.o,$(WNNJLIB),)
+ 
+-NormalLibraryTarget(wnn,$(OBJS))
++
++#if DoSharedLib
++SharedLibraryTarget(wnn4,$(SOWNN4LIBREV),$(OBJS),.,.)
++#endif
++
++UnsharedLibraryTarget(wnn,$(UNSHAREDOBJS),unshared,..)
+ LintLibraryTarget(wnn,$(SRCS))
+ 
+ instlib:: install
+ 
++#if DoSharedLib
++InstallSharedLibrary(wnn4,$(SOWNN4LIBREV),$(WNNLIBDIR))
++#endif
++
+ InstallLibrary(wnn,$(WNNLIBDIR))
+ 
+ #if ProfileLibJlib
+@@ -77,12 +100,12 @@
+ InstallLibrary(wnn_p,$(WNNLIBDIR))
+ #endif
+ 
+-WnnSpecialObjectRule($(OBJ3),$(SRC3),$(WNNETCSRC),)
+-WnnSpecialObjectRule($(OBJ4),$(SRC4),$(WNNETCSRC),)
+-WnnSpecialObjectRule($(OBJ5),$(SRC5),$(WNNETCSRC),)
+-WnnSpecialObjectRule($(OBJ6),$(SRC6),$(WNNETCSRC),)
+-WnnSpecialObjectRule($(OBJ7),$(SRC7),$(WNNETCSRC),)
+-WnnSpecialObjectRule($(OBJ8),$(SRC8),$(WNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ3),$(SRC3),$(WNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ4),$(SRC4),$(WNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ5),$(SRC5),$(WNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ6),$(SRC6),$(WNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ7),$(SRC7),$(WNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ8),$(SRC8),$(WNNETCSRC),)
+ 
+ $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS)
+ 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
diff --git a/japanese/FreeWnn-server/files/patch-bd b/japanese/FreeWnn-server/files/patch-bd
new file mode 100644
index 000000000000..99c0d6cad591
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-bd
@@ -0,0 +1,10 @@
+--- Wnn/romkan/Imakefile.orig	Wed Aug 17 10:10:21 1994
++++ Wnn/romkan/Imakefile	Wed Nov 18 00:08:23 1998
+@@ -2,6 +2,7 @@
+ XCOMM $Id: Imakefile,v 1.4 1994/08/17 01:10:21 kuwa Exp $
+ XCOMM
+ #define DoNormalLib YES
++#define DoSharedLib YES
+ 
+ #include <Library.tmpl>
+ 
diff --git a/japanese/FreeWnn-server/files/patch-be b/japanese/FreeWnn-server/files/patch-be
new file mode 100644
index 000000000000..6d7e402faae7
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-be
@@ -0,0 +1,7 @@
+--- cWnn/jserver/Imakefile.ORG	Tue Aug 23 11:22:25 1994
++++ cWnn/jserver/Imakefile	Fri Apr 14 23:47:57 1995
+@@ -148,3 +148,3 @@
+ LinkDiffNameFile($(TSRC0),$(SRC0),.)
+-LinkDiffNameFile($(TSRCGETHINSI),$(SRCGETHINSI),$(CWNNETCSRC))
++LinkDiffNameFile($(TSRCGETHINSI),$(SRCGETHINSI),)
+ 
diff --git a/japanese/FreeWnn-server/files/patch-bf b/japanese/FreeWnn-server/files/patch-bf
new file mode 100644
index 000000000000..4b5ea855bc4e
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-bf
@@ -0,0 +1,79 @@
+--- ../../../work/Xsi/cWnn/jlib/Imakefile.~1~	Wed Aug 17 10:11:04 1994
++++ cWnn/jlib/Imakefile	Tue Jan  5 22:43:30 1999
+@@ -2,6 +2,7 @@
+ XCOMM $Id: Imakefile,v 1.9 1994/08/17 01:11:04 kuwa Exp $
+ XCOMM
+ #define DoNormalLib YES
++#define DoSharedLib YES
+ 
+ #include <Library.tmpl>
+ 
+@@ -46,13 +47,26 @@
+ 	$(CWNNROMKANSRC)/rk_read.o \
+ 	$(CWNNROMKANSRC)/rk_vars.o
+ 
++UNSHARED_LOCAL_RKOBJS= $(CWNNROMKANSRC)/unshared/rk_bltinfn.o \
++	$(CWNNROMKANSRC)/unshared/rk_main.o \
++	$(CWNNROMKANSRC)/unshared/rk_modread.o \
++	$(CWNNROMKANSRC)/unshared/rk_read.o \
++	$(CWNNROMKANSRC)/unshared/rk_vars.o
++
+ 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)
++UNSHAREDOBJS= $(OBJ1) $(OBJ3) $(LOCAL_ETCOBJS) $(UNSHARED_LOCAL_RKOBJS)
++
++SOCWNN4LIBREV=1.0
+ 
+ LibraryObjectRule()
++#if DoSharedLib
++AllTarget($(OBJS) libcwnn.a libcwnn4.so.$(SOCWNN4LIBREV))
++#else
+ AllTarget($(OBJS) libcwnn.a)
++#endif
+ 
+ includes:: $(LINKS)
+ 
+@@ -74,11 +88,19 @@
+ 
+ SingleProgramTarget(kankana,kankana.o,$(CWNNJLIB),)
+ 
+-NormalLibraryTarget(cwnn,$(OBJS))
++#if DoSharedLib
++SharedLibraryTarget(cwnn4,$(SOCWNN4LIBREV),$(OBJS),.,.)
++#endif
++
++UnsharedLibraryTarget(cwnn,$(UNSHAREDOBJS),unshared,..)
+ LintLibraryTarget(cwnn,$(SRCS))
+ 
+ instlib:: install
+ 
++#if DoSharedLib
++InstallSharedLibrary(cwnn4,$(SOCWNN4LIBREV),$(WNNLIBDIR))
++#endif
++
+ InstallLibrary(cwnn,$(WNNLIBDIR))
+ 
+ #if ProfileLibJlib
+@@ -86,13 +108,13 @@
+ InstallLibrary(cwnn_p,$(WNNLIBDIR))
+ #endif
+ 
+-WnnSpecialObjectRule($(OBJ3),$(SRC3),$(CWNNETCSRC),)
+-WnnSpecialObjectRule($(OBJ4),$(SRC4),$(CWNNETCSRC),)
+-WnnSpecialObjectRule($(OBJ5),$(SRC5),$(CWNNETCSRC),)
+-WnnSpecialObjectRule($(OBJ6),$(SRC6),$(CWNNETCSRC),)
+-WnnSpecialObjectRule($(OBJ7),$(SRC7),$(CWNNETCSRC),)
+-WnnSpecialObjectRule($(OBJ8),$(SRC8),$(CWNNETCSRC),)
+-
++WnnSpecialSharedObjectRule($(OBJ3),$(SRC3),$(CWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ4),$(SRC4),$(CWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ5),$(SRC5),$(CWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ6),$(SRC6),$(CWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ7),$(SRC7),$(CWNNETCSRC),)
++WnnSpecialSharedObjectRule($(OBJ8),$(SRC8),$(CWNNETCSRC),)
++ 
+ $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS)
+ 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
+ 	cd $(CWNNROMKANSRC); echo "making all in $(CWNNROMKANSRC)"; \
diff --git a/japanese/FreeWnn-server/files/patch-bg b/japanese/FreeWnn-server/files/patch-bg
new file mode 100644
index 000000000000..9bc269aeb834
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-bg
@@ -0,0 +1,10 @@
+--- ../../../work/Xsi/cWnn/romkan/Imakefile	Wed Aug 17 10:10:58 1994
++++ cWnn/romkan/Imakefile	Tue Jan  5 22:23:33 1999
+@@ -2,6 +2,7 @@
+ XCOMM $Id: Imakefile,v 1.4 1994/08/17 01:10:58 kuwa Exp $
+ XCOMM
+ #define DoNormalLib YES
++#define DoSharedLib YES
+ 
+ #include <Library.tmpl>
+ 
diff --git a/japanese/FreeWnn-server/files/patch-bi b/japanese/FreeWnn-server/files/patch-bi
new file mode 100644
index 000000000000..d2de8dbb1316
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-bi
@@ -0,0 +1,10 @@
+--- ../../../work/Xsi/kWnn/romkan/Imakefile	Wed Aug 17 10:11:47 1994
++++ kWnn/romkan/Imakefile	Tue Jan  5 22:57:27 1999
+@@ -2,6 +2,7 @@
+ XCOMM $Id: Imakefile,v 1.2 1994/08/17 01:11:47 kuwa Exp $
+ XCOMM
+ #define DoNormalLib YES
++#define DoSharedLib YES
+ 
+ #include <Library.tmpl>
+ 
diff --git a/japanese/FreeWnn-server/files/patch-bj b/japanese/FreeWnn-server/files/patch-bj
new file mode 100644
index 000000000000..6a171a63576c
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-bj
@@ -0,0 +1,43 @@
+--- Wnn/pubdic/Imakefile.orig	Tue Aug 23 11:21:30 1994
++++ Wnn/pubdic/Imakefile	Thu Jan  7 13:41:56 1999
+@@ -96,11 +96,17 @@
+ instserver:: install
+ 
+ WnnMakeDirectories(install,$(JWNNDICDIR))
+-#if WnnInstallDicForcibly
++/*
++ * Bugfix.
++ * Because "NO" is same to "YES"!!
++ * And some additional bugfix.
++ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
++ */
++#if (WnnInstallDicForcibly == YES)
+ InstallMultiple($(DIC),$(JWNNPUBDICDIR))
+ 
+ install::
+-	@for i in $(DICS); \
++	@for i in $(DIC); \
+ 	do \
+ 		$(WNNTOUCH) $(DESTDIR)$(JWNNPUBDICDIR)/$$i ;\
+ 	done
+@@ -108,7 +114,20 @@
+ #else
+ WnnInstallDicMultiple($(DIC),$(JWNNPUBDICDIR))
+ #endif
++
++#if (WnnInstallDicForcibly == YES)
+ InstallMultiple($(FZKDATA),$(JWNNPUBDICDIR))
++
++install::
++	@for i in $(FZKDATA); \
++	do \
++		$(WNNTOUCH) $(DESTDIR)$(JWNNPUBDICDIR)/$$i ;\
++	done
++
++#else
++WnnInstallDicMultiple($(FZKDATA),$(JWNNPUBDICDIR))
++#endif
++
+ InstallMultiple($(FZK_SRC),$(JWNNFZKSRCDIR))
+ 
+ depend::
diff --git a/japanese/FreeWnn-server/files/patch-bk b/japanese/FreeWnn-server/files/patch-bk
new file mode 100644
index 000000000000..2c89d581df34
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-bk
@@ -0,0 +1,21 @@
+By KATAYAMA Yoshio <kate@pfu.co.jp>
+
+--- Wnn/etc/pwd.c.ORG	Tue Sep 22 13:29:26 1992
++++ Wnn/etc/pwd.c	Mon Jan 25 13:14:27 1999
+@@ -68,7 +68,7 @@
+ char *src, *encd;
+ {
+     int i, x,c;
+-    char xx[2];
++    char xx[3];
+     char *cr;
+ 
+     if(encd == NULL)encd = src;
+@@ -76,6 +76,7 @@
+     x = time(NULL);
+     xx[0] = x & 0x3f;
+     xx[1] = (x & 0x3f00) >> 8;
++    xx[2] = '\0';  /* for MD5 (that requires terminator) */
+     for (i = 0; i < 2; i++) {
+ 	c = xx[i] + '.';
+ 	if (c > '9')
diff --git a/japanese/FreeWnn-server/files/patch-bl b/japanese/FreeWnn-server/files/patch-bl
new file mode 100644
index 000000000000..4e20a1c280ec
--- /dev/null
+++ b/japanese/FreeWnn-server/files/patch-bl
@@ -0,0 +1,47 @@
+By KATAYAMA Yoshio <kate@pfu.co.jp>
+
+--- Wnn/jserver/de_header.h.ORG	Tue Jun 28 11:06:53 1994
++++ Wnn/jserver/de_header.h	Sun Jan 24 14:45:58 1999
+@@ -240,6 +240,7 @@
+ extern int get4_cur();
+ extern int getc_cur();
+ extern void puts_cur();
++extern void puts_n_cur();
+ extern void putws_cur();
+ extern void putnws_cur();
+ extern void put2_cur();
+--- Wnn/jserver/do_dic_no.c.ORG	Tue Sep 22 13:49:03 1992
++++ Wnn/jserver/do_dic_no.c	Sun Jan 24 14:45:03 1999
+@@ -119,9 +119,9 @@
+     puts_cur(files[fid].name);
+     if(hfid >= 0) puts_cur(files[hfid].name);
+     else puts_cur("");
+-    puts_cur(files[fid].passwd);
+-    if(hfid >= 0) puts_cur(files[hfid].passwd);
+-    else puts_cur(jtl->hpasswd);
++    puts_n_cur(files[fid].passwd, WNN_PASSWD_LEN);
++    if(hfid >= 0) puts_n_cur(files[hfid].passwd, WNN_PASSWD_LEN);
++    else puts_n_cur(jtl->hpasswd, WNN_PASSWD_LEN);
+     put4_cur(jtl->syurui);
+     put4_cur(jtl->gosuu);
+     put4_cur(files[fid].localf);
+--- Wnn/jserver/de.c.98-10-12	Mon Oct 12 01:01:28 1998
++++ Wnn/jserver/de.c	Sun Jan 24 14:50:14 1999
+@@ -665,6 +665,17 @@
+ 
+ /**	**/
+ void
++puts_n_cur(p,n)
++char *p;
++int n;
++{
++    register int c;
++    while((c = *p++) && --n >= 0) putc_cur(c);
++    putc_cur(0);
++}
++
++/**	**/
++void
+ putws_cur(p)
+ w_char *p;
+ {
diff --git a/japanese/FreeWnn-server/pkg-descr b/japanese/FreeWnn-server/pkg-descr
index 96e4fc921bdc..0c380213292d 100644
--- a/japanese/FreeWnn-server/pkg-descr
+++ b/japanese/FreeWnn-server/pkg-descr
@@ -2,7 +2,7 @@ This is Wnn4.2, a Japanese/Chinese/Korean input method.  It is
 included primarily so that we can compile mule-2.1, a multilingual
 emacs.
 
-Only the Japanese version is build for this port.
+Only the Japanese version is built for this port.
 
 Note that binaries and libraries go to /usr/local, while man pages and 
 includes go to /usr/X11R6.  That's the way it was designed, I don't
@@ -13,10 +13,10 @@ know why.
 
 -------------------------------------------------------------------
 
-This also include some patches for FreeBSD or bugfix.
-If use this patches, you can compile Wnn-4.2 under XFree86 3.1.2E
- or later(X11Release6.1).
-If there are any problem in this patches, please know me via E-mail.
+This also include some patches for FreeBSD or bugfixes.
+If use these patches, you can compile Wnn-4.2 under XFree86 3.1.2E
+ or later (X11Release6.1).
+If there are any problem in these patches, please tell me via E-mail.
 
 Hidekazu Kuroki
 (hidekazu@cs.titech.ac.jp)
@@ -24,14 +24,17 @@ Hidekazu Kuroki
 -------------------------------------------------------------------
 
 Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for Wnn4.2.
-Patches for those are in 'Wnn4.2.patch.tar.gz' and are applied in this
-port.
+Patches for those are in 'Wnn4.2.patch-YYMMDD.tar.gz' and are applied
+in this port.
 
 [Notice]
-When compiling by this ports, if $LOCALBASE is not '/usr/local' and/or
+(1) When compiling this port, if $LOCALBASE is not '/usr/local' and/or
 $X11BASE is not '/usr/X11R6' then you should properly change two lines
 '@cwd /usr/local' and '@cwd /usr/X11R6' in
 $PORTSDIR/japanese/Wnn/pkg/PLIST.
 
+(2) You must set a environment variable JSERVER if you use a client of
+Wnn.
+
 -- S. Taoka
 <taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/FreeWnn-server/pkg-install b/japanese/FreeWnn-server/pkg-install
index 5776df6f5220..445b6a752e4f 100644
--- a/japanese/FreeWnn-server/pkg-install
+++ b/japanese/FreeWnn-server/pkg-install
@@ -93,23 +93,32 @@ POST-INSTALL)
       ja-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
+	wnntouch=${PKG_PREFIX}/bin/Wnn4/wnntouch
+	wnnstat=${PKG_PREFIX}/bin/Wnn4/wnnstat
 	wnnname=Wnn
+	wnn_socket=/tmp/jd_sockV4
+	wnn_lang=ja_JP
 	;;
       zh-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
+	wnntouch=${PKG_PREFIX}/bin/cWnn4/cwnntouch
+	wnnstat=${PKG_PREFIX}/bin/cWnn4/cwnnstat
 	wnnname=cWnn
+	wnn_socket=/tmp/cd_sockV4
+	wnn_lang=zh_CN
 	;;
       ko-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
+	wnntouch=${PKG_PREFIX}/bin/kWnn4/kwnntouch
+	wnnstat=${PKG_PREFIX}/bin/kWnn4/kwnnstat
 	wnnname=kWnn
+	wnn_socket=/tmp/kd_sockV4
+	wnn_lang=ko_KR
 	;;
     esac
 
@@ -129,10 +138,28 @@ POST-INSTALL)
       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 'if [ -x $wnn ]; then' >> ${startup_script};
+      echo "    ${wnnstat} -L ${wnn_lang} localhost > /dev/null 2>&1" >> ${startup_script};
+      echo '    if [ $? = 255 ]; then' >> ${startup_script};
+      echo "        rm -f ${wnn_socket}" >> ${startup_script};
+      echo "        echo -n ' ${wnnname}'" >> ${startup_script};
+      echo '        $wnn' >> ${startup_script};
+      echo "    fi" >> ${startup_script};
       echo "fi" >> ${startup_script};
+      if [ $1 = zh-Wnn-4.2 ]; then
+	wnnserver=${PKG_PREFIX}/bin/cWnn4/tserver
+	wnn_lang=zh_TW
+	wnn_socket=/tmp/td_sockV4
+	echo "wnn=${wnnserver}" >> ${startup_script};
+	echo 'if [ -x $wnn ]; then' >> ${startup_script};
+	echo "    ${wnnstat} -L ${wnn_lang} localhost > /dev/null 2>&1" >> ${startup_script};
+	echo '    if [ $? = 255 ]; then' >> ${startup_script};
+	echo "        rm -f ${wnn_socket}" >> ${startup_script};
+	echo "        echo -n ' ${wnnname}'" >> ${startup_script};
+	echo '        $wnn' >> ${startup_script};
+	echo "    fi" >> ${startup_script};
+	echo "fi" >> ${startup_script};
+      fi
       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 114a7ec1b0a9..372afe9c5c30 100644
--- a/japanese/FreeWnn-server/pkg-plist
+++ b/japanese/FreeWnn-server/pkg-plist
@@ -22,6 +22,7 @@ lib/wnn/ja_JP/dic/src/fzk.con
 lib/wnn/ja_JP/dic/src/fzk.shuutan
 lib/wnn/ja_JP/dic/wnncons/tankan2.dic
 lib/wnn/ja_JP/dic/wnncons/tankan3.dic
+lib/wnn/ja_JP/dic/gerodic/g-jinmei.dic
 lib/wnn/ja_JP/jserverrc
 lib/wnn/ja_JP/hinsi.data
 lib/wnn/ja_JP/uum.msg
@@ -85,9 +86,45 @@ lib/wnn/lt_LN/uumrc
 lib/wnn/lt_LN/rk/2A_CTRL
 lib/wnn/lt_LN/rk/2B_LATIN
 lib/wnn/lt_LN/rk/mode
+@comment Xwnmo
+lib/wnn/ja_JP/uumrc_vi.xim
+lib/wnn/ja_JP/uumrc_e.xim
+lib/wnn/ja_JP/uumrc.xim
+lib/wnn/ja_JP/uumkey.xim
+lib/wnn/ja_JP/uumkey_v.xim
+lib/wnn/ja_JP/uumkey_e.xim
+lib/wnn/ja_JP/xim.msg
+lib/wnn/ja_JP/xjutil.msg
+lib/wnn/ko_KR/uumkey.xim
+lib/wnn/ko_KR/uumrc.xim
+lib/wnn/ko_KR/xim.msg
+lib/wnn/ko_KR/xjutil.msg
+lib/wnn/lt_LN/uumkey.xim
+lib/wnn/lt_LN/uumrc.xim
+lib/wnn/lt_LN/xim.msg
+lib/wnn/zh_CN/uumkey.xim
+lib/wnn/zh_CN/uumkey_p.xim
+lib/wnn/zh_CN/uumrc.xim
+lib/wnn/zh_CN/uumrc_p.xim
+lib/wnn/zh_CN/uumrc_z.xim
+lib/wnn/zh_CN/xim.msg
+lib/wnn/zh_CN/xjutil.msg
+lib/wnn/zh_TW/uumkey.xim
+lib/wnn/zh_TW/uumkey_p.xim
+lib/wnn/zh_TW/uumrc.xim
+lib/wnn/zh_TW/uumrc_p.xim
+lib/wnn/zh_TW/uumrc_z.xim
+lib/wnn/zh_TW/xim.msg
+lib/wnn/zh_TW/xjutil.msg
+lib/wnn/cvt_xim_tbl
+lib/wnn/ximconf
+lib/wnn/ximrc
+lib/wnn/ximrc_vi
+@comment END Xwnmo
 @dirrm lib/wnn/lt_LN/rk
 @dirrm lib/wnn/lt_LN
 @dirrm lib/wnn/ja_JP/dic/wnncons
+@dirrm lib/wnn/ja_JP/dic/gerodic/
 @dirrm lib/wnn/ja_JP/dic/usr
 @dirrm lib/wnn/ja_JP/dic/src
 @dirrm lib/wnn/ja_JP/dic/pubdic
@@ -95,6 +132,11 @@ lib/wnn/lt_LN/rk/mode
 @dirrm lib/wnn/ja_JP/rk.vi
 @dirrm lib/wnn/ja_JP/rk
 @dirrm lib/wnn/ja_JP
+@comment Xwnmo
+@dirrm lib/wnn/ko_KR
+@dirrm lib/wnn/zh_CN
+@dirrm lib/wnn/zh_TW
+@comment END Xwnmo
 @dirrm lib/wnn
 bin/Wnn4/jserver
 bin/Wnn4/uum
@@ -364,7 +406,17 @@ share/doc/ja-Wnn/manual.en/6.jutil/wddel
 @dirrm share/doc/ja-Wnn/manual
 @dirrm share/doc/ja-Wnn
 @cwd /usr/X11R6
+@comment Xwnmo
+bin/xwnmo
+bin/killxwnmo
+bin/xjutil
+lib/X11/app-defaults/Xwnmo
+@comment END Xwnmo
 lib/libwnn.a
+lib/libwnn4.so
+lib/libwnn4.so.1.0
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/libjd.a
 include/wnn/jllib.h
 include/wnn/jlib.h
@@ -376,187 +428,197 @@ include/wnn/cplib.h
 include/wnn/config.h
 include/wnn/msg.h
 @dirrm include/wnn
-man/man1/uum.1.gz
-man/man1/jserver.1.gz
-man/man1/wnnkill.1.gz
-man/man1/wnnstat.1.gz
-man/man1/atod.1.gz
-man/man1/atof.1.gz
-man/man1/dtoa.1.gz
-man/man1/wddel.1.gz
-man/man1/wdreg.1.gz
-man/man1/wnntouch.1.gz
-man/man1/oldatonewa.1.gz
-man/man3/jl_bun_suu.3.gz
-man/man3/jl_c_zenkouho.3.gz
-man/man3/jl_connect.3.gz
-man/man3/jl_close.3.gz
-man/man3/jl_connect_lang.3.gz
-man/man3/jl_dai_top.3.gz
-man/man3/jl_dic_add.3.gz
-man/man3/jl_dic_add_e.3.gz
-man/man3/jl_dic_comment_set_e.3.gz
-man/man3/jl_dic_delete.3.gz
-man/man3/jl_dic_comment_set.3.gz
-man/man3/jl_dic_delete_e.3.gz
-man/man3/jl_dic_save_all_e.3.gz
-man/man3/jl_dic_save_all.3.gz
-man/man3/jl_dic_list.3.gz
-man/man3/jl_dic_list_e.3.gz
-man/man3/jl_dic_save.3.gz
-man/man3/jl_dic_save_e.3.gz
-man/man3/jl_dic_use_e.3.gz
-man/man3/jl_dic_use.3.gz
-man/man3/jl_disconnect.3.gz
-man/man3/jl_env.3.gz
-man/man3/jl_env_un_sticky.3.gz
-man/man3/jl_env_un_sticky_e.3.gz
-man/man3/jl_env_set.3.gz
-man/man3/jl_env_get.3.gz
-man/man3/jl_env_sticky.3.gz
-man/man3/jl_env_sticky_e.3.gz
-man/man3/jl_fuzokugo_get.3.gz
-man/man3/jl_fuzokugo_get_e.3.gz
-man/man3/jl_fuzokugo_set.3.gz
-man/man3/jl_fuzokugo_set_e.3.gz
-man/man3/jl_get_kanji.3.gz
-man/man3/jl_get_yomi.3.gz
-man/man3/jl_hinsi_dicts.3.gz
-man/man3/jl_hinsi_dicts_e.3.gz
-man/man3/jl_get_zenkouho_kanji.3.gz
-man/man3/jl_hinsi_name.3.gz
-man/man3/jl_hinsi_list_e.3.gz
-man/man3/jl_hinsi_name_e.3.gz
-man/man3/jl_hinsi_list.3.gz
-man/man3/jl_hinsi_number_e.3.gz
-man/man3/jl_hinsi_number.3.gz
-man/man3/jl_isconnect_e.3.gz
-man/man3/jl_inspect.3.gz
-man/man3/jl_isconnect.3.gz
-man/man3/jl_kanji_len.3.gz
-man/man3/jl_yomi_len.3.gz
-man/man3/jl_jiri_len.3.gz
-man/man3/jl_kill.3.gz
-man/man3/jl_previous_dai.3.gz
-man/man3/jl_next.3.gz
-man/man3/jl_previous.3.gz
-man/man3/jl_next_dai.3.gz
-man/man3/jl_open.3.gz
-man/man3/jl_nobi_conv.3.gz
-man/man3/jl_param_set.3.gz
-man/man3/jl_param_get.3.gz
-man/man3/jl_param_get_e.3.gz
-man/man3/jl_param_set_e.3.gz
-man/man3/jl_open_lang.3.gz
-man/man3/jl_ren_conv.3.gz
-man/man3/jl_set_env_wnnrc.3.gz
-man/man3/jl_set_jikouho.3.gz
-man/man3/jl_set_jikouho_dai.3.gz
-man/man3/jl_tan_conv.3.gz
-man/man3/jl_update_hindo.3.gz
-man/man3/jl_word_comment_set_e.3.gz
-man/man3/jl_word_add_e.3.gz
-man/man3/jl_word_add.3.gz
-man/man3/jl_word_comment_set.3.gz
-man/man3/jl_word_delete.3.gz
-man/man3/jl_word_delete_e.3.gz
-man/man3/jl_word_search_by_env.3.gz
-man/man3/jl_word_info.3.gz
-man/man3/jl_word_info_e.3.gz
-man/man3/jl_word_search.3.gz
-man/man3/jl_word_search_e.3.gz
-man/man3/jl_word_search_by_env_e.3.gz
-man/man3/jl_word_use.3.gz
-man/man3/jl_word_use_e.3.gz
-man/man3/jl_zenkouho_bun.3.gz
-man/man3/jl_zenkouho.3.gz
-man/man3/jl_zenkouho_daip.3.gz
-man/man3/jl_zenkouho_suu.3.gz
-man/man3/jl_zenkouho_dai.3.gz
-man/man3/js_access.3.gz
-man/man3/js_connect.3.gz
-man/man3/js_close.3.gz
-man/man3/js_dic_add.3.gz
-man/man3/js_dic_file_create.3.gz
-man/man3/js_dic_file_create_client.3.gz
-man/man3/js_dic_info.3.gz
-man/man3/js_dic_list.3.gz
-man/man3/js_dic_delete.3.gz
-man/man3/js_disconnect.3.gz
-man/man3/js_dic_use.3.gz
-man/man3/js_dic_list_all.3.gz
-man/man3/js_env_exist.3.gz
-man/man3/js_env_list.3.gz
-man/man3/js_env_sticky.3.gz
-man/man3/js_env_un_sticky.3.gz
-man/man3/js_file_comment_set.3.gz
-man/man3/js_file_info.3.gz
-man/man3/js_file_discard.3.gz
-man/man3/js_file_list.3.gz
-man/man3/js_file_loaded.3.gz
-man/man3/js_file_list_all.3.gz
-man/man3/js_file_loaded_local.3.gz
-man/man3/js_file_password_set.3.gz
-man/man3/js_file_read.3.gz
-man/man3/js_file_remove.3.gz
-man/man3/js_file_receive.3.gz
-man/man3/js_file_remove_client.3.gz
-man/man3/js_file_write.3.gz
-man/man3/js_file_stat.3.gz
-man/man3/js_file_send.3.gz
-man/man3/js_fuzokugo_get.3.gz
-man/man3/js_fuzokugo_set.3.gz
-man/man3/js_hindo_file_create.3.gz
-man/man3/js_hindo_set.3.gz
-man/man3/js_hindo_file_create_client.3.gz
-man/man3/js_hinsi_dicts.3.gz
-man/man3/js_hinsi_name.3.gz
-man/man3/js_hinsi_list.3.gz
-man/man3/js_isconnect.3.gz
-man/man3/js_hinsi_number.3.gz
-man/man3/js_hinsi_table_set.3.gz
-man/man3/js_kanren.3.gz
-man/man3/js_kantan_dai.3.gz
-man/man3/js_kantan_sho.3.gz
-man/man3/js_kanzen_dai.3.gz
-man/man3/js_kanzen_sho.3.gz
-man/man3/js_kill.3.gz
-man/man3/js_mkdir.3.gz
-man/man3/js_param_get.3.gz
-man/man3/js_open.3.gz
-man/man3/js_open_lang.3.gz
-man/man3/js_param_set.3.gz
-man/man3/js_get_lang.3.gz
-man/man3/js_set_lang.3.gz
-man/man3/js_version.3.gz
-man/man3/js_who.3.gz
-man/man3/js_word_add.3.gz
-man/man3/js_word_comment_set.3.gz
-man/man3/js_word_delete.3.gz
-man/man3/js_word_info.3.gz
-man/man3/js_word_search.3.gz
-man/man3/js_word_search_by_env.3.gz
-man/man3/romkan_clear.3.gz
-man/man3/romkan_getc.3.gz
-man/man3/romkan_dispmode.3.gz
-man/man3/romkan_init.3.gz
-man/man3/romkan_next.3.gz
-man/man3/romkan_ungetc.3.gz
-man/man3/msg_open.3.gz
-man/man3/msg_get.3.gz
-man/man3/msg_close.3.gz
-man/man4/fzk.data.4.gz
-man/man4/2a_ctrl.4.gz
-man/man4/fzk.u.4.gz
-man/man4/jserverrc.4.gz
-man/man4/mode.4.gz
-man/man4/uumrc.4.gz
-man/man4/uumkey.4.gz
-man/man4/wnnenvrc.4.gz
-man/man4/ujis_dic.4.gz
-man/man4/2b_romkana.4.gz
-man/man4/cvt_key_tbl.4.gz
-man/man4/hinsi_data.4.gz
-man/man4/serverdefs.4.gz
-man/man5/pubdic.5.gz
-man/man5/usr_dic.5.gz
+man/ja/man1/uum.1.gz
+man/ja/man1/jserver.1.gz
+man/ja/man1/wnnkill.1.gz
+man/ja/man1/wnnstat.1.gz
+man/ja/man1/atod.1.gz
+man/ja/man1/atof.1.gz
+man/ja/man1/dtoa.1.gz
+man/ja/man1/wddel.1.gz
+man/ja/man1/wdreg.1.gz
+man/ja/man1/wnntouch.1.gz
+man/ja/man1/oldatonewa.1.gz
+man/ja/man3/jl_bun_suu.3.gz
+man/ja/man3/jl_c_zenkouho.3.gz
+man/ja/man3/jl_connect.3.gz
+man/ja/man3/jl_close.3.gz
+man/ja/man3/jl_connect_lang.3.gz
+man/ja/man3/jl_dai_top.3.gz
+man/ja/man3/jl_dic_add.3.gz
+man/ja/man3/jl_dic_add_e.3.gz
+man/ja/man3/jl_dic_comment_set_e.3.gz
+man/ja/man3/jl_dic_delete.3.gz
+man/ja/man3/jl_dic_comment_set.3.gz
+man/ja/man3/jl_dic_delete_e.3.gz
+man/ja/man3/jl_dic_save_all_e.3.gz
+man/ja/man3/jl_dic_save_all.3.gz
+man/ja/man3/jl_dic_list.3.gz
+man/ja/man3/jl_dic_list_e.3.gz
+man/ja/man3/jl_dic_save.3.gz
+man/ja/man3/jl_dic_save_e.3.gz
+man/ja/man3/jl_dic_use_e.3.gz
+man/ja/man3/jl_dic_use.3.gz
+man/ja/man3/jl_disconnect.3.gz
+man/ja/man3/jl_env.3.gz
+man/ja/man3/jl_env_un_sticky.3.gz
+man/ja/man3/jl_env_un_sticky_e.3.gz
+man/ja/man3/jl_env_set.3.gz
+man/ja/man3/jl_env_get.3.gz
+man/ja/man3/jl_env_sticky.3.gz
+man/ja/man3/jl_env_sticky_e.3.gz
+man/ja/man3/jl_fuzokugo_get.3.gz
+man/ja/man3/jl_fuzokugo_get_e.3.gz
+man/ja/man3/jl_fuzokugo_set.3.gz
+man/ja/man3/jl_fuzokugo_set_e.3.gz
+man/ja/man3/jl_get_kanji.3.gz
+man/ja/man3/jl_get_yomi.3.gz
+man/ja/man3/jl_hinsi_dicts.3.gz
+man/ja/man3/jl_hinsi_dicts_e.3.gz
+man/ja/man3/jl_get_zenkouho_kanji.3.gz
+man/ja/man3/jl_hinsi_name.3.gz
+man/ja/man3/jl_hinsi_list_e.3.gz
+man/ja/man3/jl_hinsi_name_e.3.gz
+man/ja/man3/jl_hinsi_list.3.gz
+man/ja/man3/jl_hinsi_number_e.3.gz
+man/ja/man3/jl_hinsi_number.3.gz
+man/ja/man3/jl_isconnect_e.3.gz
+man/ja/man3/jl_inspect.3.gz
+man/ja/man3/jl_isconnect.3.gz
+man/ja/man3/jl_kanji_len.3.gz
+man/ja/man3/jl_yomi_len.3.gz
+man/ja/man3/jl_jiri_len.3.gz
+man/ja/man3/jl_kill.3.gz
+man/ja/man3/jl_previous_dai.3.gz
+man/ja/man3/jl_next.3.gz
+man/ja/man3/jl_previous.3.gz
+man/ja/man3/jl_next_dai.3.gz
+man/ja/man3/jl_open.3.gz
+man/ja/man3/jl_nobi_conv.3.gz
+man/ja/man3/jl_param_set.3.gz
+man/ja/man3/jl_param_get.3.gz
+man/ja/man3/jl_param_get_e.3.gz
+man/ja/man3/jl_param_set_e.3.gz
+man/ja/man3/jl_open_lang.3.gz
+man/ja/man3/jl_ren_conv.3.gz
+man/ja/man3/jl_set_env_wnnrc.3.gz
+man/ja/man3/jl_set_jikouho.3.gz
+man/ja/man3/jl_set_jikouho_dai.3.gz
+man/ja/man3/jl_tan_conv.3.gz
+man/ja/man3/jl_update_hindo.3.gz
+man/ja/man3/jl_word_comment_set_e.3.gz
+man/ja/man3/jl_word_add_e.3.gz
+man/ja/man3/jl_word_add.3.gz
+man/ja/man3/jl_word_comment_set.3.gz
+man/ja/man3/jl_word_delete.3.gz
+man/ja/man3/jl_word_delete_e.3.gz
+man/ja/man3/jl_word_search_by_env.3.gz
+man/ja/man3/jl_word_info.3.gz
+man/ja/man3/jl_word_info_e.3.gz
+man/ja/man3/jl_word_search.3.gz
+man/ja/man3/jl_word_search_e.3.gz
+man/ja/man3/jl_word_search_by_env_e.3.gz
+man/ja/man3/jl_word_use.3.gz
+man/ja/man3/jl_word_use_e.3.gz
+man/ja/man3/jl_zenkouho_bun.3.gz
+man/ja/man3/jl_zenkouho.3.gz
+man/ja/man3/jl_zenkouho_daip.3.gz
+man/ja/man3/jl_zenkouho_suu.3.gz
+man/ja/man3/jl_zenkouho_dai.3.gz
+man/ja/man3/js_access.3.gz
+man/ja/man3/js_connect.3.gz
+man/ja/man3/js_close.3.gz
+man/ja/man3/js_dic_add.3.gz
+man/ja/man3/js_dic_file_create.3.gz
+man/ja/man3/js_dic_file_create_client.3.gz
+man/ja/man3/js_dic_info.3.gz
+man/ja/man3/js_dic_list.3.gz
+man/ja/man3/js_dic_delete.3.gz
+man/ja/man3/js_disconnect.3.gz
+man/ja/man3/js_dic_use.3.gz
+man/ja/man3/js_dic_list_all.3.gz
+man/ja/man3/js_env_exist.3.gz
+man/ja/man3/js_env_list.3.gz
+man/ja/man3/js_env_sticky.3.gz
+man/ja/man3/js_env_un_sticky.3.gz
+man/ja/man3/js_file_comment_set.3.gz
+man/ja/man3/js_file_info.3.gz
+man/ja/man3/js_file_discard.3.gz
+man/ja/man3/js_file_list.3.gz
+man/ja/man3/js_file_loaded.3.gz
+man/ja/man3/js_file_list_all.3.gz
+man/ja/man3/js_file_loaded_local.3.gz
+man/ja/man3/js_file_password_set.3.gz
+man/ja/man3/js_file_read.3.gz
+man/ja/man3/js_file_remove.3.gz
+man/ja/man3/js_file_receive.3.gz
+man/ja/man3/js_file_remove_client.3.gz
+man/ja/man3/js_file_write.3.gz
+man/ja/man3/js_file_stat.3.gz
+man/ja/man3/js_file_send.3.gz
+man/ja/man3/js_fuzokugo_get.3.gz
+man/ja/man3/js_fuzokugo_set.3.gz
+man/ja/man3/js_hindo_file_create.3.gz
+man/ja/man3/js_hindo_set.3.gz
+man/ja/man3/js_hindo_file_create_client.3.gz
+man/ja/man3/js_hinsi_dicts.3.gz
+man/ja/man3/js_hinsi_name.3.gz
+man/ja/man3/js_hinsi_list.3.gz
+man/ja/man3/js_isconnect.3.gz
+man/ja/man3/js_hinsi_number.3.gz
+man/ja/man3/js_hinsi_table_set.3.gz
+man/ja/man3/js_kanren.3.gz
+man/ja/man3/js_kantan_dai.3.gz
+man/ja/man3/js_kantan_sho.3.gz
+man/ja/man3/js_kanzen_dai.3.gz
+man/ja/man3/js_kanzen_sho.3.gz
+man/ja/man3/js_kill.3.gz
+man/ja/man3/js_mkdir.3.gz
+man/ja/man3/js_param_get.3.gz
+man/ja/man3/js_open.3.gz
+man/ja/man3/js_open_lang.3.gz
+man/ja/man3/js_param_set.3.gz
+man/ja/man3/js_get_lang.3.gz
+man/ja/man3/js_set_lang.3.gz
+man/ja/man3/js_version.3.gz
+man/ja/man3/js_who.3.gz
+man/ja/man3/js_word_add.3.gz
+man/ja/man3/js_word_comment_set.3.gz
+man/ja/man3/js_word_delete.3.gz
+man/ja/man3/js_word_info.3.gz
+man/ja/man3/js_word_search.3.gz
+man/ja/man3/js_word_search_by_env.3.gz
+man/ja/man3/romkan_clear.3.gz
+man/ja/man3/romkan_getc.3.gz
+man/ja/man3/romkan_dispmode.3.gz
+man/ja/man3/romkan_init.3.gz
+man/ja/man3/romkan_next.3.gz
+man/ja/man3/romkan_ungetc.3.gz
+man/ja/man3/msg_open.3.gz
+man/ja/man3/msg_get.3.gz
+man/ja/man3/msg_close.3.gz
+man/ja/man4/fzk.data.4.gz
+man/ja/man4/2a_ctrl.4.gz
+man/ja/man4/fzk.u.4.gz
+man/ja/man4/jserverrc.4.gz
+man/ja/man4/mode.4.gz
+man/ja/man4/uumrc.4.gz
+man/ja/man4/uumkey.4.gz
+man/ja/man4/wnnenvrc.4.gz
+man/ja/man4/ujis_dic.4.gz
+man/ja/man4/2b_romkana.4.gz
+man/ja/man4/cvt_key_tbl.4.gz
+man/ja/man4/hinsi_data.4.gz
+man/ja/man4/serverdefs.4.gz
+man/ja/man5/pubdic.5.gz
+man/ja/man5/usr_dic.5.gz
+@comment Xwnmo
+man/ja/man1/xwnmo.1.gz
+man/ja/man1/ximrc.1.gz
+man/ja/man1/ximconf.1.gz
+man/ja/man1/cvt_fun_tbl.1.gz
+man/ja/man1/cvt_meta_tbl.1.gz
+man/ja/man1/killxwnmo.1.gz
+man/ja/man1/cvt_xim_tbl.1.gz
+man/ja/man1/xjutil.1.gz
+@comment END Xwnmo