Upgrade to 3.5b2.

This upgrade is based on submissions from several people over years.
I have been reluctant to upgrade this port primarily because
I was never sure about the shared lib compatibility.
Thanks to those who submitted the patch as well as tested the new version.

33 files changed, 348 insertions, 1257 deletions

diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile
index 2043c8bb5222..6754d7dd7609 100644
--- a/japanese/Canna/Makefile
+++ b/japanese/Canna/Makefile
@@ -7,21 +7,29 @@
 #
 
 PORTNAME=	Canna
-PORTVERSION=	3.2.2
+PORTVERSION=	3.5.b2
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna32/
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:S/./p/}
+MASTER_SITES=	ftp://ftp.tokyonet.ad.jp/pub/misc/Canna/Canna35/ \
+		ftp://ftp.meshnet.or.jp/pub/tool/Canna/Canna35/ \
+		ftp://ftp.sra.co.jp/pub/misc/canna/ \
+		ftp://ftp.habi.or.jp/pub/Tools/Canna/Canna35/ \
+		ftp://ftp.hans.or.jp/pub/Tools/Canna/Canna35/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 
-MAINTAINER=	max@FreeBSD.org
+PATCH_SITES=	http://www.jaist.ac.jp/~fujieda/canna/
+PATCHFILES=	Canna35b2-unoff1.patch.gz Canna35b2-unoff2.patch.gz \
+		Canna35b2-hack1.patch.gz
+PATCH_DIST_STRIP=	-p1
 
-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
+MAINTAINER=	max@FreeBSD.org
 
+USE_IMAKE=	yes
+USE_X_PREFIX=	no
+ALL_TARGET=	canna
 INSTALLS_SHLIB=	yes
 
-ALL_TARGET=	canna
-INSTALL_TARGET=	install install.man
 MAN1=	addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \
-	canvert.1 catdic.1 cpdic.1 cshost.1 ctow.1 delwords.1 dicar.1 \
+	catdic.1 cpdic.1 cshost.1 ctow.1 delwords.1 dicar.1 \
 	dpbindic.1 dpromdic.1 lsdic.1 mkbindic.1 mkdic.1 mkromdic.1 \
 	mvdic.1 rmdic.1 splitword.1 wtoc.1
 MAN3=	RkCloseRoma.3 RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3 \
@@ -30,36 +38,27 @@ MAN3=	RkCloseRoma.3 RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3 \
 	RkGetStat.3 RkGetYomi.3 RkGoto.3 RkInitialize.3 RkIntro.3 RkLeft.3 \
 	RkMapPhonogram.3 RkMapRoma.3 RkMountD.3 RkNext.3 RkNfer.3 \
 	RkOpenRoma.3 RkPrev.3 RkRemountDic.3 RkResize.3 RkRgnBun.3 RkRight.3 \
-	RkShorten.3 RkStoreYomi.3 RkUnmountDic.3 RkXfer.3 \
-	XKanjiControl.3 XLookupKanjiString.3 cannalib.3 uilib.3 \
-	jrKanjiControl.3 jrKanjiString.3
-
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
+	RkShorten.3 RkStoreYomi.3 RkUnmountDic.3 RkXfer.3 cannalib.3 uilib.3
+MANCOMPRESSED=	no
+XFREE86_HTML_MAN=	no
 
-.SILENT:
+MLINKS=		uilibs.3 XKanjiControl.3  uilibs.3 XLookupKanjiString.3 \
+		uilibs.3 jrKanjiControl.3  uilibs.3 jrKanjiString.3
 
-.include <bsd.port.pre.mk>
-
-do-configure:
-	@(cd ${WRKSRC}; ${XMKMF})
-	@${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/canna.sh.in \
-		>${WRKDIR}/canna.sh
+STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
 
 pre-install:
 	${MKDIR} /var/run/canna
-	${CHOWN} bin:bin /var/run/canna
+	${CHOWN} bin.bin /var/run/canna
+	@${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/canna.sh.in \
+		>${WRKDIR}/canna.sh
 
 post-install:
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libRKC.so.1.0 ${PREFIX}/lib/libRKC.so
-	${LN} -sf libRKC16.so.1.0 ${PREFIX}/lib/libRKC16.so
-	${LN} -sf libcanna.so.1.0 ${PREFIX}/lib/libcanna.so
-	${LN} -sf libcanna16.so.1.0 ${PREFIX}/lib/libcanna16.so
-.endif
+#	@${LDCONFIG} -m ${PREFIX}/lib
 	if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
 		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; 	\
 		${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT};	\
 	fi
-	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/Canna/distinfo b/japanese/Canna/distinfo
index a844d290c415..f505d5a8f499 100644
--- a/japanese/Canna/distinfo
+++ b/japanese/Canna/distinfo
@@ -1 +1,4 @@
-MD5 (Canna32p2.tar.gz) = fc5016ed531512618b0541db67d2c2dd
+MD5 (Canna35b2.tar.gz) = 09ae4dd3a5d33168ba17470ad9242cf3
+MD5 (Canna35b2-unoff1.patch.gz) = 88de4ac6a46697e4f664f1a362ecd1d2
+MD5 (Canna35b2-unoff2.patch.gz) = 7253b322dd6224376e03a95bec8a1c8f
+MD5 (Canna35b2-hack1.patch.gz) = a3969af8317798d1b586f7a68089ff4a
diff --git a/japanese/Canna/files/patch-aa b/japanese/Canna/files/patch-aa
deleted file mode 100644
index d649f0f8b812..000000000000
--- a/japanese/Canna/files/patch-aa
+++ /dev/null
@@ -1,67 +0,0 @@
-*** canna/protodefs.h.orig	Wed Mar  9 16:01:53 1994
---- canna/protodefs.h	Sun Aug 11 06:54:35 1996
-***************
-*** 77,82 ****
---- 77,83 ----
-  #define I16toI32(x) (x)
-  #define I8toI32(x) (((x) & 0x80) ? ((x) | 0xffffff80) : (x))
-  
-+ #if 0
-  #ifdef HTONS			/* hir, 1993.1.2 */
-  #undef HTONS
-  #endif
-***************
-*** 85,90 ****
---- 86,92 ----
-  	work = htons( (len) ) ; \
-  	bcopy( (char *)&work, (char *)(data), sizeof( short ) ) ; \
-  }
-+ #endif
-  
-  #ifndef MIN
-  #define MIN( n, m )	( ((unsigned)(n) > (unsigned)(m)) ? (m) : (n) )
-*** canna/widedef.h.orig	Mon Jul  5 20:11:01 1993
---- canna/widedef.h	Sun Aug 11 06:54:35 1996
-***************
-*** 27,32 ****
---- 27,36 ----
-  #ifndef _WIDEDEF_H_
-  #define _WIDEDEF_H_
-       
-+ #if defined(__FreeBSD__) || defined(__NetBSD__)
-+ # include <machine/ansi.h>
-+ #endif
-+ 
-  #if __STDC__ || defined(SVR4) || defined(sun) /* This may be wrong. */
-  # if !defined(WCHAR16) && !defined(CANNA_WCHAR)
-  #  define HAVE_WCHAR_OPERATION
-***************
-*** 40,45 ****
---- 44,61 ----
-  #endif
-  #endif /* HAVE_WCHAR_OPERATION */
-  
-+ #if defined(__FreeBSD__) || defined(__NetBSD__)
-+ # ifdef _BSD_WCHAR_T_
-+ #  undef _BSD_WCHAR_T_
-+ #  ifdef WCHAR16
-+ #   define _BSD_WCHAR_T_ unsigned short
-+ #  else
-+ #   define _BSD_WCHAR_T_ unsigned long
-+ #  endif
-+ #  include <stddef.h>
-+ #  define _WCHAR_T
-+ # endif
-+ #else
-  #if !defined(WCHAR_T) && !defined(_WCHAR_T) && !defined(_WCHAR_T_) \
-   && !defined(__WCHAR_T) && !defined(_GCC_WCHAR_T)
-  # ifdef WCHAR16
-***************
-*** 54,58 ****
---- 70,75 ----
-  # define __WCHAR_T
-  # define _GCC_WCHAR_T
-  #endif
-+ #endif /* __FreeBSD__ || __NetBSD__ */
-  
-  #endif /* _WIDEDEF_H_ */
diff --git a/japanese/Canna/files/patch-ab b/japanese/Canna/files/patch-ab
deleted file mode 100644
index 9a734c3b8142..000000000000
--- a/japanese/Canna/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-*** misc/Imakefile.orig	Fri Jan 28 14:36:42 1994
---- misc/Imakefile	Sun Aug 11 09:02:42 1996
-***************
-*** 37,43 ****
-  #endif /* nec_ews_svr4 */
-  
-  InstallNamedNonExec(default.ca,default.canna,$(cannaLibDir))
-! InstallNamedNonExec(Readme,Readme,$(LockDir))
-  InstallNonExec(is.c,$(cannaLibDir)/sample/src)
-  InstallNonExec(premountdics,$(DicDir))
-  
---- 37,43 ----
-  #endif /* nec_ews_svr4 */
-  
-  InstallNamedNonExec(default.ca,default.canna,$(cannaLibDir))
-! /* InstallNamedNonExec(Readme,Readme,$(LockDir)) */
-  InstallNonExec(is.c,$(cannaLibDir)/sample/src)
-  InstallNonExec(premountdics,$(DicDir))
-  
diff --git a/japanese/Canna/files/patch-ac b/japanese/Canna/files/patch-ac
index 07d73f0cf670..f16c082cb612 100644
--- a/japanese/Canna/files/patch-ac
+++ b/japanese/Canna/files/patch-ac
@@ -1,7 +1,7 @@
---- Canna.conf.orig	Wed Apr 12 22:15:03 1995
-+++ Canna.conf	Fri Oct 17 23:05:25 1997
-@@ -114,15 +114,15 @@
-  * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $
+--- Canna.conf.orig	Thu Nov 28 04:27:01 1996
++++ Canna.conf	Wed Nov 14 18:14:10 2001
+@@ -128,14 +128,15 @@
+  * $Id: Canna.conf,v 3.13 1996/11/28 10:27:01 kon Exp $
   */
  
 -cannaBinDir = /usr/local/canna/bin
@@ -10,6 +10,7 @@
 -cannaManDir = /usr/local/canna/man
 -cannaIncDir = /usr/local/canna/include/canna
 -libCannaDir = /usr/lib
++PREFIX?= /usr/local
 +cannaBinDir = ${PREFIX}/bin
 +cannaSrvDir = ${PREFIX}/sbin
 +cannaLibDir = ${PREFIX}/lib/canna
@@ -18,22 +19,20 @@
 +libCannaDir = ${PREFIX}/lib
  
 -ErrDir  = /usr/spool/canna
--LockDir = /usr/spool/canna/lock
 +ErrDir  = /var/log
-+LockDir = /var/run/canna
  
  wcharDefinition = -DCANNA_WCHAR
  Wlib =
-@@ -135,7 +135,7 @@
+@@ -148,7 +149,7 @@
  
  pointerIntegerDef =
  
 -cannaDsoRev = 1
 +cannaDsoRev = 1.0
- sharedLibExtension = so.$(cannaDsoRev)
- 
- /* 以下の３つは root にならないでインストールするのであれば echo に
-@@ -145,7 +145,7 @@
+     /* SunOS 4.x をお使いの方で shared object を利用する場合には
+             cannaDsoRev = 1.1
+     と指定してください。また、FreeBSD を利用する場合は、
+@@ -167,7 +168,7 @@
  CHMOD = chmod
  
  /* 日本語マニュアルを使わないのであればコメントアウト */
@@ -42,33 +41,3 @@
  
  /* locale ディレクトリを持っている場合は以下を記述する */
  /* #define LOCALE_DIR /usr/lib/locale */
-@@ -178,7 +178,7 @@
- #define UseInstalledLibCanna NO
- 
- DicDir   = $(cannaLibDir)/dic
--LockFile = .CANNALOCK
-+LockFile = Canna.pid
- 
- #ifdef NeXT
- #define NO_X_ENV
-@@ -311,13 +311,13 @@
- #endif
- #define InstallLibManPageAliases(file,destdir,aliases)			@@\
- install.man::								@@\
--        @(TMP=/tmp/tmp.$$$$; \						@@\
--        $(RM) $${TMP}; \						@@\
--        echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
--        for i in aliases; do (set -x; \					@@\
--        $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
--        done; \								@@\
--        $(RM) $${TMP})
-+	@(TMP=/tmp/tmp.$$$$; \						@@\
-+	$(RM) $${TMP}; \						@@\
-+	echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
-+	for i in aliases; do (set -x; \					@@\
-+	$(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
-+	done; \								@@\
-+	$(RM) $${TMP})
- #ifndef MakeDirectoriesLong
- #define MakeDirectoriesLong(step,dirs,owner,group)			@@\
- step::									@@\
diff --git a/japanese/Canna/files/patch-ad b/japanese/Canna/files/patch-ad
deleted file mode 100644
index 8e1aca7e0f46..000000000000
--- a/japanese/Canna/files/patch-ad
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -cr cmd/cannakill/cannakill.man  cmd/cannakill/cannakill.man
-*** cmd/cannakill/cannakill.man	Thu Jan 27 19:45:37 1994
----  cmd/cannakill/cannakill.man	Thu Sep 19 18:31:07 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: cannakill.man,v 1.5 1994/01/27 10:45:37 misao Exp $
-  .TH CANNAKILL 1M
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: cannakill.man,v 1.5 1994/01/27 10:45:37 misao Exp $
-  .TH CANNAKILL 1M
-  .SH "NAME"
-diff -cr cmd/catdic/addwords.man  cmd/catdic/addwords.man
-*** cmd/catdic/addwords.man	Mon May 16 19:12:49 1994
----  cmd/catdic/addwords.man	Thu Sep 19 18:31:11 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: addwords.man,v 1.4 1994/05/16 10:12:49 hamada Exp $
-  .TH ADDWORDS 1
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: addwords.man,v 1.4 1994/05/16 10:12:49 hamada Exp $
-  .TH ADDWORDS 1
-  .SH "NAME"
-diff -cr cmd/catdic/catdic.man  cmd/catdic/catdic.man
-*** cmd/catdic/catdic.man	Thu Jan 27 19:46:29 1994
----  cmd/catdic/catdic.man	Thu Sep 19 18:31:49 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: catdic.man,v 1.2 1994/01/27 10:46:29 misao Exp $
-  .TH CATDIC 1        
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: catdic.man,v 1.2 1994/01/27 10:46:29 misao Exp $
-  .TH CATDIC 1        
-  .SH "NAME"
-diff -cr cmd/catdic/cpdic.man  cmd/catdic/cpdic.man
-*** cmd/catdic/cpdic.man	Thu Jan 27 19:46:34 1994
----  cmd/catdic/cpdic.man	Thu Sep 19 18:31:42 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: cpdic.man,v 1.2 1994/01/27 10:46:34 misao Exp $
-  .TH CPDIC 1
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: cpdic.man,v 1.2 1994/01/27 10:46:34 misao Exp $
-  .TH CPDIC 1
-  .SH "NAME"
-diff -cr cmd/catdic/delwords.man  cmd/catdic/delwords.man
-*** cmd/catdic/delwords.man	Thu Oct  6 17:52:32 1994
----  cmd/catdic/delwords.man	Thu Sep 19 18:31:26 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: delwords.man,v 1.4 1994/10/06 08:52:32 misao Exp $
-  .TH DELWORDS 1
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: delwords.man,v 1.4 1994/10/06 08:52:32 misao Exp $
-  .TH DELWORDS 1
-  .SH "NAME"
-diff -cr cmd/catdic/lsdic.man  cmd/catdic/lsdic.man
-*** cmd/catdic/lsdic.man	Thu Jan 27 19:46:45 1994
----  cmd/catdic/lsdic.man	Thu Sep 19 18:32:07 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: lsdic.man,v 1.2 1994/01/27 10:46:45 misao Exp $
-  .TH LSDIC 1         
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: lsdic.man,v 1.2 1994/01/27 10:46:45 misao Exp $
-  .TH LSDIC 1         
-  .SH "NAME"
-diff -cr cmd/catdic/mkdic.man  cmd/catdic/mkdic.man
-*** cmd/catdic/mkdic.man	Thu Jan 27 19:46:50 1994
----  cmd/catdic/mkdic.man	Thu Sep 19 18:31:56 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: mkdic.man,v 1.2 1994/01/27 10:46:50 misao Exp $
-  .TH MKDIC 1
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: mkdic.man,v 1.2 1994/01/27 10:46:50 misao Exp $
-  .TH MKDIC 1
-  .SH "NAME"
-diff -cr cmd/catdic/mvdic.man  cmd/catdic/mvdic.man
-*** cmd/catdic/mvdic.man	Thu Jan 27 19:46:54 1994
----  cmd/catdic/mvdic.man	Thu Sep 19 18:31:34 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: mvdic.man,v 1.2 1994/01/27 10:46:54 misao Exp $
-  .TH MVDIC 1
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: mvdic.man,v 1.2 1994/01/27 10:46:54 misao Exp $
-  .TH MVDIC 1
-  .SH "NAME"
diff --git a/japanese/Canna/files/patch-ae b/japanese/Canna/files/patch-ae
deleted file mode 100644
index eebf300dd058..000000000000
--- a/japanese/Canna/files/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./dic/ideo/user/Imakefile.org	Sat Feb  5 05:21:06 1994
-+++ ./dic/ideo/user/Imakefile	Wed Jun 11 04:46:51 1997
-@@ -10,8 +10,8 @@
-                   DICS = chimei.t dics.dir katakana.t necgaiji.t \
- 			 software.t user.t
- 
--all:
-+all::
- 
- MakeDirectories(install,$(USERDICDIR))
- 
- install::
diff --git a/japanese/Canna/files/patch-af b/japanese/Canna/files/patch-af
deleted file mode 100644
index 48328fc6e459..000000000000
--- a/japanese/Canna/files/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
---- server/misc.c~	Fri Jul 29 12:03:54 1994
-+++ server/misc.c	Fri Jun 30 10:16:39 2000
-@@ -788,12 +788,19 @@
- 
-     if (client->username && client->username[0]) {
-       if (client->groupname && client->groupname[0]) {
-+	if (strlen(DDUSER) + strlen(client->username) +
-+	    strlen(DDGROUP) + strlen(client->groupname) +
-+	    strlen(DDPATH) + 4 >= 256)
-+	  return ( -1 );
- 	sprintf(dichome, "%s/%s:%s/%s:%s",
- 		DDUSER, client->username,
- 		DDGROUP, client->groupname,
- 		DDPATH);
-       }
-       else {
-+	if (strlen(DDUSER) + strlen(client->username) +
-+	    strlen(DDPATH) + 2 >= 256)
-+	  return ( -1 );
- 	sprintf(dichome, "%s/%s:%s",
- 		DDUSER, client->username,
- 		DDPATH);
diff --git a/japanese/Canna/files/patch-ag b/japanese/Canna/files/patch-ag
new file mode 100644
index 000000000000..307d095222d5
--- /dev/null
+++ b/japanese/Canna/files/patch-ag
@@ -0,0 +1,18 @@
+--- cmd/catdic/Imakefile.orig	Mon Oct 29 01:41:09 2001
++++ cmd/catdic/Imakefile	Mon Oct 29 01:42:13 2001
+@@ -84,7 +84,7 @@
+ 	$(RM) $(cannaBinDir)/chmoddic
+ 	$(RM) $(cannaBinDir)/addwords
+ 	$(RM) $(cannaBinDir)/delwords
+-	$(RM) $(cannaBinDir)/cannakill
++	$(RM) $(cannaSrvDir)/cannakill
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cpdic
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/lsdic
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mkdic
+@@ -93,5 +93,5 @@
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/syncdic
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/addwords
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/delwords
+-	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cannakill
++	$(LN) $(cannaBinDir)/catdic $(cannaSrvDir)/cannakill
+ #endif
diff --git a/japanese/Canna/pkg-descr b/japanese/Canna/pkg-descr
index 14268d789915..16e586f12733 100644
--- a/japanese/Canna/pkg-descr
+++ b/japanese/Canna/pkg-descr
@@ -2,12 +2,14 @@ Canna is a Kana-Kanji conversion server.
 Support Mule(Multi-lingal extention Emacs), kinput2 X11 input method,
 cannum front end and some others.
 
-  To use from Mule (CANNA version), in .emacs file:
+  To use from Mule (CANNA version), add the following to your .emacs file:
 
      (if (and (boundp 'CANNA) CANNA) ; Is it CANNA MULE?
         (progn
          (load-library "canna")
          (canna) ))
 
-  Then kana-kanji conversion begin to `C-o' key. Show more detail
-Info, and/or documents.
+  Then use the `C-o' key to begin kana-kanji conversion.  Refer to the
+Info file and the documents for more detail.
+
+- Max
diff --git a/japanese/Canna/pkg-plist b/japanese/Canna/pkg-plist
index e5d09cb8a60f..b3b48620199c 100644
--- a/japanese/Canna/pkg-plist
+++ b/japanese/Canna/pkg-plist
@@ -2,12 +2,9 @@ bin/addwords
 bin/canlisp
 bin/cannacheck
 bin/cannastat
-bin/canvert
 bin/catdic
-bin/chmoddic
 bin/cpdic
 bin/crfreq
-bin/crrdic
 bin/crxdic
 bin/crxgram
 bin/cshost
@@ -16,11 +13,9 @@ bin/delwords
 bin/dicar
 bin/dpbindic
 bin/dpromdic
-bin/dpwdic
 bin/dpxdic
 bin/forcpp
 bin/forsort
-bin/itoc
 bin/kpdic
 bin/lsdic
 bin/mergeword
@@ -38,75 +33,68 @@ include/canna/jrkanji.h
 include/canna/keydef.h
 include/canna/mfdef.h
 lib/canna/default.canna
-lib/canna/dic/canna/bushu.fq
+lib/canna/dic/canna/bushu.cld
+lib/canna/dic/canna/chimei.ctd
 lib/canna/dic/canna/dics.dir
-lib/canna/dic/canna/fuzokugo.d
-lib/canna/dic/canna/fuzokugo.fq
-lib/canna/dic/canna/hojomwd.t
-lib/canna/dic/canna/hojoswd.t
-lib/canna/dic/canna/iroha.d
-lib/canna/dic/canna/iroha.fq
-lib/canna/dic/canna/number.t
-lib/canna/dic/canna/suffix.t
-lib/canna/dic/canna/yuubin.fq
-lib/canna/dic/default.kp
-lib/canna/dic/default.rdic
-lib/canna/dic/english.kp
-lib/canna/dic/hyoujun.gram
-lib/canna/dic/jdaemon.kp
-lib/canna/dic/jdaemon.rdic
-lib/canna/dic/just.kp
-lib/canna/dic/just.rdic
-lib/canna/dic/kaisoku.kp
-lib/canna/dic/kana.kp
-lib/canna/dic/kana.rdic
-lib/canna/dic/lan5.kp
-lib/canna/dic/newjis.kp
-lib/canna/dic/newjis.rdic
-lib/canna/dic/premountdics
-lib/canna/dic/romaji.kp
-lib/canna/dic/sokuon.kp
-lib/canna/dic/tut.kp
-lib/canna/dic/user/user/chimei.t
-lib/canna/dic/user/user/dics.dir
-lib/canna/dic/user/user/katakana.t
-lib/canna/dic/user/user/necgaiji.t
-lib/canna/dic/user/user/software.t
-lib/canna/dic/user/user/user.t
+lib/canna/dic/canna/fuzokugo.cbd
+lib/canna/dic/canna/fuzokugo.cld
+lib/canna/dic/canna/hojomwd.ctd
+lib/canna/dic/canna/hojoswd.ctd
+lib/canna/dic/canna/iroha.cbd
+lib/canna/dic/canna/iroha.cld
+lib/canna/dic/canna/kanasmpl.ctd
+lib/canna/dic/canna/katakana.ctd
+lib/canna/dic/canna/keishiki.ctd
+lib/canna/dic/canna/necgaiji.ctd
+lib/canna/dic/canna/number.ctd
+lib/canna/dic/canna/software.ctd
+lib/canna/dic/canna/suffix.ctd
+lib/canna/dic/default.cbp
+lib/canna/dic/english.cbp
+lib/canna/dic/jdaemon.cbp
+lib/canna/dic/just.cbp
+lib/canna/dic/kaisoku.cbp
+lib/canna/dic/kana.cbp
+lib/canna/dic/lan5.cbp
+lib/canna/dic/matsu.cbp
+lib/canna/dic/newjis.cbp
+lib/canna/dic/romaji.cbp
+lib/canna/dic/sokuon.cbp
+lib/canna/dic/tut.cbp
+lib/canna/dic/vje.cbp
+lib/canna/dic/wx2+.cbp
 lib/canna/engine.cf
 lib/canna/sample/1.1.canna
-lib/canna/sample/1.1.iroha
 lib/canna/sample/1.2.canna
 lib/canna/sample/default.canna
-lib/canna/sample/default.iroha
 lib/canna/sample/fixer.canna
-lib/canna/sample/fixer.iroha
 lib/canna/sample/jdemon.canna
-lib/canna/sample/jdemon.iroha
 lib/canna/sample/just.canna
-lib/canna/sample/just.iroha
 lib/canna/sample/lan5.canna
+lib/canna/sample/matsu.canna
 lib/canna/sample/modes.canna
-lib/canna/sample/modes.iroha
 lib/canna/sample/sample.canna
-lib/canna/sample/sample.iroha
+lib/canna/sample/skk.canna
 lib/canna/sample/src/Makefile
-lib/canna/sample/src/default.kpdef
-lib/canna/sample/src/english.kpdef
+lib/canna/sample/src/default.ctd
+lib/canna/sample/src/english.ctd
 lib/canna/sample/src/is.c
-lib/canna/sample/src/jdaemon.kpdef
-lib/canna/sample/src/just.kpdef
-lib/canna/sample/src/kaisoku.kpdef
-lib/canna/sample/src/kana.kpdef
-lib/canna/sample/src/lan5.kpdef
-lib/canna/sample/src/newjis.kpdef
-lib/canna/sample/src/romaji.kpdef
-lib/canna/sample/src/sokuon.kpdef
-lib/canna/sample/src/tut.kpdef
+lib/canna/sample/src/jdaemon.ctd
+lib/canna/sample/src/just.ctd
+lib/canna/sample/src/kaisoku.ctd
+lib/canna/sample/src/kana.ctd
+lib/canna/sample/src/lan5.ctd
+lib/canna/sample/src/matsu.ctd
+lib/canna/sample/src/newjis.ctd
+lib/canna/sample/src/romaji.ctd
+lib/canna/sample/src/sokuon.ctd
+lib/canna/sample/src/tut.ctd
+lib/canna/sample/src/vje.ctd
+lib/canna/sample/src/wx2+.ctd
 lib/canna/sample/tut.canna
 lib/canna/sample/unix.canna
 lib/canna/sample/vje.canna
-lib/canna/sample/vje.iroha
+lib/canna/sample/wx2+.canna
 lib/libRKC.a
 lib/libRKC.so
 lib/libRKC.so.1
@@ -119,21 +107,19 @@ lib/libcanna.so.1
 lib/libcanna16.a
 lib/libcanna16.so
 lib/libcanna16.so.1
-sbin/cannakill
 sbin/cannaserver
-@exec mkdir -p /var/run/canna
-@exec chown bin:bin /var/run/canna
-@exec chown bin:bin %D/lib/canna/dic/canna
+sbin/cannakill
+@exec mkdir /var/run/canna
+@exec chown bin.bin /var/run/canna
+@exec chown bin.bin %D/lib/canna/dic/canna
 @exec chmod 775 %D/lib/canna/dic/canna
 @exec chown bin.bin %D/lib/canna/dic
 @exec chmod 775 %D/lib/canna/dic
-@exec chown bin:bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user
+@exec chown bin.bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user
 @exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user
 @unexec /bin/rmdir /var/run/canna
 @dirrm lib/canna/sample/src
 @dirrm lib/canna/sample
-@dirrm lib/canna/dic/user/user
-@dirrm lib/canna/dic/user
 @dirrm lib/canna/dic/canna
 @dirrm lib/canna/dic
 @dirrm lib/canna
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index 2043c8bb5222..6754d7dd7609 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -7,21 +7,29 @@
 #
 
 PORTNAME=	Canna
-PORTVERSION=	3.2.2
+PORTVERSION=	3.5.b2
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna32/
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:S/./p/}
+MASTER_SITES=	ftp://ftp.tokyonet.ad.jp/pub/misc/Canna/Canna35/ \
+		ftp://ftp.meshnet.or.jp/pub/tool/Canna/Canna35/ \
+		ftp://ftp.sra.co.jp/pub/misc/canna/ \
+		ftp://ftp.habi.or.jp/pub/Tools/Canna/Canna35/ \
+		ftp://ftp.hans.or.jp/pub/Tools/Canna/Canna35/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 
-MAINTAINER=	max@FreeBSD.org
+PATCH_SITES=	http://www.jaist.ac.jp/~fujieda/canna/
+PATCHFILES=	Canna35b2-unoff1.patch.gz Canna35b2-unoff2.patch.gz \
+		Canna35b2-hack1.patch.gz
+PATCH_DIST_STRIP=	-p1
 
-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
+MAINTAINER=	max@FreeBSD.org
 
+USE_IMAKE=	yes
+USE_X_PREFIX=	no
+ALL_TARGET=	canna
 INSTALLS_SHLIB=	yes
 
-ALL_TARGET=	canna
-INSTALL_TARGET=	install install.man
 MAN1=	addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \
-	canvert.1 catdic.1 cpdic.1 cshost.1 ctow.1 delwords.1 dicar.1 \
+	catdic.1 cpdic.1 cshost.1 ctow.1 delwords.1 dicar.1 \
 	dpbindic.1 dpromdic.1 lsdic.1 mkbindic.1 mkdic.1 mkromdic.1 \
 	mvdic.1 rmdic.1 splitword.1 wtoc.1
 MAN3=	RkCloseRoma.3 RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3 \
@@ -30,36 +38,27 @@ MAN3=	RkCloseRoma.3 RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3 \
 	RkGetStat.3 RkGetYomi.3 RkGoto.3 RkInitialize.3 RkIntro.3 RkLeft.3 \
 	RkMapPhonogram.3 RkMapRoma.3 RkMountD.3 RkNext.3 RkNfer.3 \
 	RkOpenRoma.3 RkPrev.3 RkRemountDic.3 RkResize.3 RkRgnBun.3 RkRight.3 \
-	RkShorten.3 RkStoreYomi.3 RkUnmountDic.3 RkXfer.3 \
-	XKanjiControl.3 XLookupKanjiString.3 cannalib.3 uilib.3 \
-	jrKanjiControl.3 jrKanjiString.3
-
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
+	RkShorten.3 RkStoreYomi.3 RkUnmountDic.3 RkXfer.3 cannalib.3 uilib.3
+MANCOMPRESSED=	no
+XFREE86_HTML_MAN=	no
 
-.SILENT:
+MLINKS=		uilibs.3 XKanjiControl.3  uilibs.3 XLookupKanjiString.3 \
+		uilibs.3 jrKanjiControl.3  uilibs.3 jrKanjiString.3
 
-.include <bsd.port.pre.mk>
-
-do-configure:
-	@(cd ${WRKSRC}; ${XMKMF})
-	@${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/canna.sh.in \
-		>${WRKDIR}/canna.sh
+STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
 
 pre-install:
 	${MKDIR} /var/run/canna
-	${CHOWN} bin:bin /var/run/canna
+	${CHOWN} bin.bin /var/run/canna
+	@${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/canna.sh.in \
+		>${WRKDIR}/canna.sh
 
 post-install:
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libRKC.so.1.0 ${PREFIX}/lib/libRKC.so
-	${LN} -sf libRKC16.so.1.0 ${PREFIX}/lib/libRKC16.so
-	${LN} -sf libcanna.so.1.0 ${PREFIX}/lib/libcanna.so
-	${LN} -sf libcanna16.so.1.0 ${PREFIX}/lib/libcanna16.so
-.endif
+#	@${LDCONFIG} -m ${PREFIX}/lib
 	if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
 		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; 	\
 		${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT};	\
 	fi
-	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/canna-lib/distinfo b/japanese/canna-lib/distinfo
index a844d290c415..f505d5a8f499 100644
--- a/japanese/canna-lib/distinfo
+++ b/japanese/canna-lib/distinfo
@@ -1 +1,4 @@
-MD5 (Canna32p2.tar.gz) = fc5016ed531512618b0541db67d2c2dd
+MD5 (Canna35b2.tar.gz) = 09ae4dd3a5d33168ba17470ad9242cf3
+MD5 (Canna35b2-unoff1.patch.gz) = 88de4ac6a46697e4f664f1a362ecd1d2
+MD5 (Canna35b2-unoff2.patch.gz) = 7253b322dd6224376e03a95bec8a1c8f
+MD5 (Canna35b2-hack1.patch.gz) = a3969af8317798d1b586f7a68089ff4a
diff --git a/japanese/canna-lib/files/patch-aa b/japanese/canna-lib/files/patch-aa
deleted file mode 100644
index d649f0f8b812..000000000000
--- a/japanese/canna-lib/files/patch-aa
+++ /dev/null
@@ -1,67 +0,0 @@
-*** canna/protodefs.h.orig	Wed Mar  9 16:01:53 1994
---- canna/protodefs.h	Sun Aug 11 06:54:35 1996
-***************
-*** 77,82 ****
---- 77,83 ----
-  #define I16toI32(x) (x)
-  #define I8toI32(x) (((x) & 0x80) ? ((x) | 0xffffff80) : (x))
-  
-+ #if 0
-  #ifdef HTONS			/* hir, 1993.1.2 */
-  #undef HTONS
-  #endif
-***************
-*** 85,90 ****
---- 86,92 ----
-  	work = htons( (len) ) ; \
-  	bcopy( (char *)&work, (char *)(data), sizeof( short ) ) ; \
-  }
-+ #endif
-  
-  #ifndef MIN
-  #define MIN( n, m )	( ((unsigned)(n) > (unsigned)(m)) ? (m) : (n) )
-*** canna/widedef.h.orig	Mon Jul  5 20:11:01 1993
---- canna/widedef.h	Sun Aug 11 06:54:35 1996
-***************
-*** 27,32 ****
---- 27,36 ----
-  #ifndef _WIDEDEF_H_
-  #define _WIDEDEF_H_
-       
-+ #if defined(__FreeBSD__) || defined(__NetBSD__)
-+ # include <machine/ansi.h>
-+ #endif
-+ 
-  #if __STDC__ || defined(SVR4) || defined(sun) /* This may be wrong. */
-  # if !defined(WCHAR16) && !defined(CANNA_WCHAR)
-  #  define HAVE_WCHAR_OPERATION
-***************
-*** 40,45 ****
---- 44,61 ----
-  #endif
-  #endif /* HAVE_WCHAR_OPERATION */
-  
-+ #if defined(__FreeBSD__) || defined(__NetBSD__)
-+ # ifdef _BSD_WCHAR_T_
-+ #  undef _BSD_WCHAR_T_
-+ #  ifdef WCHAR16
-+ #   define _BSD_WCHAR_T_ unsigned short
-+ #  else
-+ #   define _BSD_WCHAR_T_ unsigned long
-+ #  endif
-+ #  include <stddef.h>
-+ #  define _WCHAR_T
-+ # endif
-+ #else
-  #if !defined(WCHAR_T) && !defined(_WCHAR_T) && !defined(_WCHAR_T_) \
-   && !defined(__WCHAR_T) && !defined(_GCC_WCHAR_T)
-  # ifdef WCHAR16
-***************
-*** 54,58 ****
---- 70,75 ----
-  # define __WCHAR_T
-  # define _GCC_WCHAR_T
-  #endif
-+ #endif /* __FreeBSD__ || __NetBSD__ */
-  
-  #endif /* _WIDEDEF_H_ */
diff --git a/japanese/canna-lib/files/patch-ab b/japanese/canna-lib/files/patch-ab
deleted file mode 100644
index 9a734c3b8142..000000000000
--- a/japanese/canna-lib/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-*** misc/Imakefile.orig	Fri Jan 28 14:36:42 1994
---- misc/Imakefile	Sun Aug 11 09:02:42 1996
-***************
-*** 37,43 ****
-  #endif /* nec_ews_svr4 */
-  
-  InstallNamedNonExec(default.ca,default.canna,$(cannaLibDir))
-! InstallNamedNonExec(Readme,Readme,$(LockDir))
-  InstallNonExec(is.c,$(cannaLibDir)/sample/src)
-  InstallNonExec(premountdics,$(DicDir))
-  
---- 37,43 ----
-  #endif /* nec_ews_svr4 */
-  
-  InstallNamedNonExec(default.ca,default.canna,$(cannaLibDir))
-! /* InstallNamedNonExec(Readme,Readme,$(LockDir)) */
-  InstallNonExec(is.c,$(cannaLibDir)/sample/src)
-  InstallNonExec(premountdics,$(DicDir))
-  
diff --git a/japanese/canna-lib/files/patch-ac b/japanese/canna-lib/files/patch-ac
index 07d73f0cf670..f16c082cb612 100644
--- a/japanese/canna-lib/files/patch-ac
+++ b/japanese/canna-lib/files/patch-ac
@@ -1,7 +1,7 @@
---- Canna.conf.orig	Wed Apr 12 22:15:03 1995
-+++ Canna.conf	Fri Oct 17 23:05:25 1997
-@@ -114,15 +114,15 @@
-  * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $
+--- Canna.conf.orig	Thu Nov 28 04:27:01 1996
++++ Canna.conf	Wed Nov 14 18:14:10 2001
+@@ -128,14 +128,15 @@
+  * $Id: Canna.conf,v 3.13 1996/11/28 10:27:01 kon Exp $
   */
  
 -cannaBinDir = /usr/local/canna/bin
@@ -10,6 +10,7 @@
 -cannaManDir = /usr/local/canna/man
 -cannaIncDir = /usr/local/canna/include/canna
 -libCannaDir = /usr/lib
++PREFIX?= /usr/local
 +cannaBinDir = ${PREFIX}/bin
 +cannaSrvDir = ${PREFIX}/sbin
 +cannaLibDir = ${PREFIX}/lib/canna
@@ -18,22 +19,20 @@
 +libCannaDir = ${PREFIX}/lib
  
 -ErrDir  = /usr/spool/canna
--LockDir = /usr/spool/canna/lock
 +ErrDir  = /var/log
-+LockDir = /var/run/canna
  
  wcharDefinition = -DCANNA_WCHAR
  Wlib =
-@@ -135,7 +135,7 @@
+@@ -148,7 +149,7 @@
  
  pointerIntegerDef =
  
 -cannaDsoRev = 1
 +cannaDsoRev = 1.0
- sharedLibExtension = so.$(cannaDsoRev)
- 
- /* 以下の３つは root にならないでインストールするのであれば echo に
-@@ -145,7 +145,7 @@
+     /* SunOS 4.x をお使いの方で shared object を利用する場合には
+             cannaDsoRev = 1.1
+     と指定してください。また、FreeBSD を利用する場合は、
+@@ -167,7 +168,7 @@
  CHMOD = chmod
  
  /* 日本語マニュアルを使わないのであればコメントアウト */
@@ -42,33 +41,3 @@
  
  /* locale ディレクトリを持っている場合は以下を記述する */
  /* #define LOCALE_DIR /usr/lib/locale */
-@@ -178,7 +178,7 @@
- #define UseInstalledLibCanna NO
- 
- DicDir   = $(cannaLibDir)/dic
--LockFile = .CANNALOCK
-+LockFile = Canna.pid
- 
- #ifdef NeXT
- #define NO_X_ENV
-@@ -311,13 +311,13 @@
- #endif
- #define InstallLibManPageAliases(file,destdir,aliases)			@@\
- install.man::								@@\
--        @(TMP=/tmp/tmp.$$$$; \						@@\
--        $(RM) $${TMP}; \						@@\
--        echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
--        for i in aliases; do (set -x; \					@@\
--        $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
--        done; \								@@\
--        $(RM) $${TMP})
-+	@(TMP=/tmp/tmp.$$$$; \						@@\
-+	$(RM) $${TMP}; \						@@\
-+	echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
-+	for i in aliases; do (set -x; \					@@\
-+	$(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
-+	done; \								@@\
-+	$(RM) $${TMP})
- #ifndef MakeDirectoriesLong
- #define MakeDirectoriesLong(step,dirs,owner,group)			@@\
- step::									@@\
diff --git a/japanese/canna-lib/files/patch-ad b/japanese/canna-lib/files/patch-ad
deleted file mode 100644
index 8e1aca7e0f46..000000000000
--- a/japanese/canna-lib/files/patch-ad
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -cr cmd/cannakill/cannakill.man  cmd/cannakill/cannakill.man
-*** cmd/cannakill/cannakill.man	Thu Jan 27 19:45:37 1994
----  cmd/cannakill/cannakill.man	Thu Sep 19 18:31:07 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: cannakill.man,v 1.5 1994/01/27 10:45:37 misao Exp $
-  .TH CANNAKILL 1M
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: cannakill.man,v 1.5 1994/01/27 10:45:37 misao Exp $
-  .TH CANNAKILL 1M
-  .SH "NAME"
-diff -cr cmd/catdic/addwords.man  cmd/catdic/addwords.man
-*** cmd/catdic/addwords.man	Mon May 16 19:12:49 1994
----  cmd/catdic/addwords.man	Thu Sep 19 18:31:11 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: addwords.man,v 1.4 1994/05/16 10:12:49 hamada Exp $
-  .TH ADDWORDS 1
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: addwords.man,v 1.4 1994/05/16 10:12:49 hamada Exp $
-  .TH ADDWORDS 1
-  .SH "NAME"
-diff -cr cmd/catdic/catdic.man  cmd/catdic/catdic.man
-*** cmd/catdic/catdic.man	Thu Jan 27 19:46:29 1994
----  cmd/catdic/catdic.man	Thu Sep 19 18:31:49 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: catdic.man,v 1.2 1994/01/27 10:46:29 misao Exp $
-  .TH CATDIC 1        
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: catdic.man,v 1.2 1994/01/27 10:46:29 misao Exp $
-  .TH CATDIC 1        
-  .SH "NAME"
-diff -cr cmd/catdic/cpdic.man  cmd/catdic/cpdic.man
-*** cmd/catdic/cpdic.man	Thu Jan 27 19:46:34 1994
----  cmd/catdic/cpdic.man	Thu Sep 19 18:31:42 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: cpdic.man,v 1.2 1994/01/27 10:46:34 misao Exp $
-  .TH CPDIC 1
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: cpdic.man,v 1.2 1994/01/27 10:46:34 misao Exp $
-  .TH CPDIC 1
-  .SH "NAME"
-diff -cr cmd/catdic/delwords.man  cmd/catdic/delwords.man
-*** cmd/catdic/delwords.man	Thu Oct  6 17:52:32 1994
----  cmd/catdic/delwords.man	Thu Sep 19 18:31:26 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: delwords.man,v 1.4 1994/10/06 08:52:32 misao Exp $
-  .TH DELWORDS 1
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: delwords.man,v 1.4 1994/10/06 08:52:32 misao Exp $
-  .TH DELWORDS 1
-  .SH "NAME"
-diff -cr cmd/catdic/lsdic.man  cmd/catdic/lsdic.man
-*** cmd/catdic/lsdic.man	Thu Jan 27 19:46:45 1994
----  cmd/catdic/lsdic.man	Thu Sep 19 18:32:07 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: lsdic.man,v 1.2 1994/01/27 10:46:45 misao Exp $
-  .TH LSDIC 1         
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: lsdic.man,v 1.2 1994/01/27 10:46:45 misao Exp $
-  .TH LSDIC 1         
-  .SH "NAME"
-diff -cr cmd/catdic/mkdic.man  cmd/catdic/mkdic.man
-*** cmd/catdic/mkdic.man	Thu Jan 27 19:46:50 1994
----  cmd/catdic/mkdic.man	Thu Sep 19 18:31:56 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: mkdic.man,v 1.2 1994/01/27 10:46:50 misao Exp $
-  .TH MKDIC 1
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: mkdic.man,v 1.2 1994/01/27 10:46:50 misao Exp $
-  .TH MKDIC 1
-  .SH "NAME"
-diff -cr cmd/catdic/mvdic.man  cmd/catdic/mvdic.man
-*** cmd/catdic/mvdic.man	Thu Jan 27 19:46:54 1994
----  cmd/catdic/mvdic.man	Thu Sep 19 18:31:34 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: mvdic.man,v 1.2 1994/01/27 10:46:54 misao Exp $
-  .TH MVDIC 1
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: mvdic.man,v 1.2 1994/01/27 10:46:54 misao Exp $
-  .TH MVDIC 1
-  .SH "NAME"
diff --git a/japanese/canna-lib/files/patch-ae b/japanese/canna-lib/files/patch-ae
deleted file mode 100644
index eebf300dd058..000000000000
--- a/japanese/canna-lib/files/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./dic/ideo/user/Imakefile.org	Sat Feb  5 05:21:06 1994
-+++ ./dic/ideo/user/Imakefile	Wed Jun 11 04:46:51 1997
-@@ -10,8 +10,8 @@
-                   DICS = chimei.t dics.dir katakana.t necgaiji.t \
- 			 software.t user.t
- 
--all:
-+all::
- 
- MakeDirectories(install,$(USERDICDIR))
- 
- install::
diff --git a/japanese/canna-lib/files/patch-af b/japanese/canna-lib/files/patch-af
deleted file mode 100644
index 48328fc6e459..000000000000
--- a/japanese/canna-lib/files/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
---- server/misc.c~	Fri Jul 29 12:03:54 1994
-+++ server/misc.c	Fri Jun 30 10:16:39 2000
-@@ -788,12 +788,19 @@
- 
-     if (client->username && client->username[0]) {
-       if (client->groupname && client->groupname[0]) {
-+	if (strlen(DDUSER) + strlen(client->username) +
-+	    strlen(DDGROUP) + strlen(client->groupname) +
-+	    strlen(DDPATH) + 4 >= 256)
-+	  return ( -1 );
- 	sprintf(dichome, "%s/%s:%s/%s:%s",
- 		DDUSER, client->username,
- 		DDGROUP, client->groupname,
- 		DDPATH);
-       }
-       else {
-+	if (strlen(DDUSER) + strlen(client->username) +
-+	    strlen(DDPATH) + 2 >= 256)
-+	  return ( -1 );
- 	sprintf(dichome, "%s/%s:%s",
- 		DDUSER, client->username,
- 		DDPATH);
diff --git a/japanese/canna-lib/files/patch-ag b/japanese/canna-lib/files/patch-ag
new file mode 100644
index 000000000000..307d095222d5
--- /dev/null
+++ b/japanese/canna-lib/files/patch-ag
@@ -0,0 +1,18 @@
+--- cmd/catdic/Imakefile.orig	Mon Oct 29 01:41:09 2001
++++ cmd/catdic/Imakefile	Mon Oct 29 01:42:13 2001
+@@ -84,7 +84,7 @@
+ 	$(RM) $(cannaBinDir)/chmoddic
+ 	$(RM) $(cannaBinDir)/addwords
+ 	$(RM) $(cannaBinDir)/delwords
+-	$(RM) $(cannaBinDir)/cannakill
++	$(RM) $(cannaSrvDir)/cannakill
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cpdic
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/lsdic
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mkdic
+@@ -93,5 +93,5 @@
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/syncdic
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/addwords
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/delwords
+-	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cannakill
++	$(LN) $(cannaBinDir)/catdic $(cannaSrvDir)/cannakill
+ #endif
diff --git a/japanese/canna-lib/pkg-descr b/japanese/canna-lib/pkg-descr
index 14268d789915..16e586f12733 100644
--- a/japanese/canna-lib/pkg-descr
+++ b/japanese/canna-lib/pkg-descr
@@ -2,12 +2,14 @@ Canna is a Kana-Kanji conversion server.
 Support Mule(Multi-lingal extention Emacs), kinput2 X11 input method,
 cannum front end and some others.
 
-  To use from Mule (CANNA version), in .emacs file:
+  To use from Mule (CANNA version), add the following to your .emacs file:
 
      (if (and (boundp 'CANNA) CANNA) ; Is it CANNA MULE?
         (progn
          (load-library "canna")
          (canna) ))
 
-  Then kana-kanji conversion begin to `C-o' key. Show more detail
-Info, and/or documents.
+  Then use the `C-o' key to begin kana-kanji conversion.  Refer to the
+Info file and the documents for more detail.
+
+- Max
diff --git a/japanese/canna-lib/pkg-plist b/japanese/canna-lib/pkg-plist
index e5d09cb8a60f..b3b48620199c 100644
--- a/japanese/canna-lib/pkg-plist
+++ b/japanese/canna-lib/pkg-plist
@@ -2,12 +2,9 @@ bin/addwords
 bin/canlisp
 bin/cannacheck
 bin/cannastat
-bin/canvert
 bin/catdic
-bin/chmoddic
 bin/cpdic
 bin/crfreq
-bin/crrdic
 bin/crxdic
 bin/crxgram
 bin/cshost
@@ -16,11 +13,9 @@ bin/delwords
 bin/dicar
 bin/dpbindic
 bin/dpromdic
-bin/dpwdic
 bin/dpxdic
 bin/forcpp
 bin/forsort
-bin/itoc
 bin/kpdic
 bin/lsdic
 bin/mergeword
@@ -38,75 +33,68 @@ include/canna/jrkanji.h
 include/canna/keydef.h
 include/canna/mfdef.h
 lib/canna/default.canna
-lib/canna/dic/canna/bushu.fq
+lib/canna/dic/canna/bushu.cld
+lib/canna/dic/canna/chimei.ctd
 lib/canna/dic/canna/dics.dir
-lib/canna/dic/canna/fuzokugo.d
-lib/canna/dic/canna/fuzokugo.fq
-lib/canna/dic/canna/hojomwd.t
-lib/canna/dic/canna/hojoswd.t
-lib/canna/dic/canna/iroha.d
-lib/canna/dic/canna/iroha.fq
-lib/canna/dic/canna/number.t
-lib/canna/dic/canna/suffix.t
-lib/canna/dic/canna/yuubin.fq
-lib/canna/dic/default.kp
-lib/canna/dic/default.rdic
-lib/canna/dic/english.kp
-lib/canna/dic/hyoujun.gram
-lib/canna/dic/jdaemon.kp
-lib/canna/dic/jdaemon.rdic
-lib/canna/dic/just.kp
-lib/canna/dic/just.rdic
-lib/canna/dic/kaisoku.kp
-lib/canna/dic/kana.kp
-lib/canna/dic/kana.rdic
-lib/canna/dic/lan5.kp
-lib/canna/dic/newjis.kp
-lib/canna/dic/newjis.rdic
-lib/canna/dic/premountdics
-lib/canna/dic/romaji.kp
-lib/canna/dic/sokuon.kp
-lib/canna/dic/tut.kp
-lib/canna/dic/user/user/chimei.t
-lib/canna/dic/user/user/dics.dir
-lib/canna/dic/user/user/katakana.t
-lib/canna/dic/user/user/necgaiji.t
-lib/canna/dic/user/user/software.t
-lib/canna/dic/user/user/user.t
+lib/canna/dic/canna/fuzokugo.cbd
+lib/canna/dic/canna/fuzokugo.cld
+lib/canna/dic/canna/hojomwd.ctd
+lib/canna/dic/canna/hojoswd.ctd
+lib/canna/dic/canna/iroha.cbd
+lib/canna/dic/canna/iroha.cld
+lib/canna/dic/canna/kanasmpl.ctd
+lib/canna/dic/canna/katakana.ctd
+lib/canna/dic/canna/keishiki.ctd
+lib/canna/dic/canna/necgaiji.ctd
+lib/canna/dic/canna/number.ctd
+lib/canna/dic/canna/software.ctd
+lib/canna/dic/canna/suffix.ctd
+lib/canna/dic/default.cbp
+lib/canna/dic/english.cbp
+lib/canna/dic/jdaemon.cbp
+lib/canna/dic/just.cbp
+lib/canna/dic/kaisoku.cbp
+lib/canna/dic/kana.cbp
+lib/canna/dic/lan5.cbp
+lib/canna/dic/matsu.cbp
+lib/canna/dic/newjis.cbp
+lib/canna/dic/romaji.cbp
+lib/canna/dic/sokuon.cbp
+lib/canna/dic/tut.cbp
+lib/canna/dic/vje.cbp
+lib/canna/dic/wx2+.cbp
 lib/canna/engine.cf
 lib/canna/sample/1.1.canna
-lib/canna/sample/1.1.iroha
 lib/canna/sample/1.2.canna
 lib/canna/sample/default.canna
-lib/canna/sample/default.iroha
 lib/canna/sample/fixer.canna
-lib/canna/sample/fixer.iroha
 lib/canna/sample/jdemon.canna
-lib/canna/sample/jdemon.iroha
 lib/canna/sample/just.canna
-lib/canna/sample/just.iroha
 lib/canna/sample/lan5.canna
+lib/canna/sample/matsu.canna
 lib/canna/sample/modes.canna
-lib/canna/sample/modes.iroha
 lib/canna/sample/sample.canna
-lib/canna/sample/sample.iroha
+lib/canna/sample/skk.canna
 lib/canna/sample/src/Makefile
-lib/canna/sample/src/default.kpdef
-lib/canna/sample/src/english.kpdef
+lib/canna/sample/src/default.ctd
+lib/canna/sample/src/english.ctd
 lib/canna/sample/src/is.c
-lib/canna/sample/src/jdaemon.kpdef
-lib/canna/sample/src/just.kpdef
-lib/canna/sample/src/kaisoku.kpdef
-lib/canna/sample/src/kana.kpdef
-lib/canna/sample/src/lan5.kpdef
-lib/canna/sample/src/newjis.kpdef
-lib/canna/sample/src/romaji.kpdef
-lib/canna/sample/src/sokuon.kpdef
-lib/canna/sample/src/tut.kpdef
+lib/canna/sample/src/jdaemon.ctd
+lib/canna/sample/src/just.ctd
+lib/canna/sample/src/kaisoku.ctd
+lib/canna/sample/src/kana.ctd
+lib/canna/sample/src/lan5.ctd
+lib/canna/sample/src/matsu.ctd
+lib/canna/sample/src/newjis.ctd
+lib/canna/sample/src/romaji.ctd
+lib/canna/sample/src/sokuon.ctd
+lib/canna/sample/src/tut.ctd
+lib/canna/sample/src/vje.ctd
+lib/canna/sample/src/wx2+.ctd
 lib/canna/sample/tut.canna
 lib/canna/sample/unix.canna
 lib/canna/sample/vje.canna
-lib/canna/sample/vje.iroha
+lib/canna/sample/wx2+.canna
 lib/libRKC.a
 lib/libRKC.so
 lib/libRKC.so.1
@@ -119,21 +107,19 @@ lib/libcanna.so.1
 lib/libcanna16.a
 lib/libcanna16.so
 lib/libcanna16.so.1
-sbin/cannakill
 sbin/cannaserver
-@exec mkdir -p /var/run/canna
-@exec chown bin:bin /var/run/canna
-@exec chown bin:bin %D/lib/canna/dic/canna
+sbin/cannakill
+@exec mkdir /var/run/canna
+@exec chown bin.bin /var/run/canna
+@exec chown bin.bin %D/lib/canna/dic/canna
 @exec chmod 775 %D/lib/canna/dic/canna
 @exec chown bin.bin %D/lib/canna/dic
 @exec chmod 775 %D/lib/canna/dic
-@exec chown bin:bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user
+@exec chown bin.bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user
 @exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user
 @unexec /bin/rmdir /var/run/canna
 @dirrm lib/canna/sample/src
 @dirrm lib/canna/sample
-@dirrm lib/canna/dic/user/user
-@dirrm lib/canna/dic/user
 @dirrm lib/canna/dic/canna
 @dirrm lib/canna/dic
 @dirrm lib/canna
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index 2043c8bb5222..6754d7dd7609 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -7,21 +7,29 @@
 #
 
 PORTNAME=	Canna
-PORTVERSION=	3.2.2
+PORTVERSION=	3.5.b2
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna32/
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:S/./p/}
+MASTER_SITES=	ftp://ftp.tokyonet.ad.jp/pub/misc/Canna/Canna35/ \
+		ftp://ftp.meshnet.or.jp/pub/tool/Canna/Canna35/ \
+		ftp://ftp.sra.co.jp/pub/misc/canna/ \
+		ftp://ftp.habi.or.jp/pub/Tools/Canna/Canna35/ \
+		ftp://ftp.hans.or.jp/pub/Tools/Canna/Canna35/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 
-MAINTAINER=	max@FreeBSD.org
+PATCH_SITES=	http://www.jaist.ac.jp/~fujieda/canna/
+PATCHFILES=	Canna35b2-unoff1.patch.gz Canna35b2-unoff2.patch.gz \
+		Canna35b2-hack1.patch.gz
+PATCH_DIST_STRIP=	-p1
 
-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
+MAINTAINER=	max@FreeBSD.org
 
+USE_IMAKE=	yes
+USE_X_PREFIX=	no
+ALL_TARGET=	canna
 INSTALLS_SHLIB=	yes
 
-ALL_TARGET=	canna
-INSTALL_TARGET=	install install.man
 MAN1=	addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \
-	canvert.1 catdic.1 cpdic.1 cshost.1 ctow.1 delwords.1 dicar.1 \
+	catdic.1 cpdic.1 cshost.1 ctow.1 delwords.1 dicar.1 \
 	dpbindic.1 dpromdic.1 lsdic.1 mkbindic.1 mkdic.1 mkromdic.1 \
 	mvdic.1 rmdic.1 splitword.1 wtoc.1
 MAN3=	RkCloseRoma.3 RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3 \
@@ -30,36 +38,27 @@ MAN3=	RkCloseRoma.3 RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3 \
 	RkGetStat.3 RkGetYomi.3 RkGoto.3 RkInitialize.3 RkIntro.3 RkLeft.3 \
 	RkMapPhonogram.3 RkMapRoma.3 RkMountD.3 RkNext.3 RkNfer.3 \
 	RkOpenRoma.3 RkPrev.3 RkRemountDic.3 RkResize.3 RkRgnBun.3 RkRight.3 \
-	RkShorten.3 RkStoreYomi.3 RkUnmountDic.3 RkXfer.3 \
-	XKanjiControl.3 XLookupKanjiString.3 cannalib.3 uilib.3 \
-	jrKanjiControl.3 jrKanjiString.3
-
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
+	RkShorten.3 RkStoreYomi.3 RkUnmountDic.3 RkXfer.3 cannalib.3 uilib.3
+MANCOMPRESSED=	no
+XFREE86_HTML_MAN=	no
 
-.SILENT:
+MLINKS=		uilibs.3 XKanjiControl.3  uilibs.3 XLookupKanjiString.3 \
+		uilibs.3 jrKanjiControl.3  uilibs.3 jrKanjiString.3
 
-.include <bsd.port.pre.mk>
-
-do-configure:
-	@(cd ${WRKSRC}; ${XMKMF})
-	@${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/canna.sh.in \
-		>${WRKDIR}/canna.sh
+STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
 
 pre-install:
 	${MKDIR} /var/run/canna
-	${CHOWN} bin:bin /var/run/canna
+	${CHOWN} bin.bin /var/run/canna
+	@${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/canna.sh.in \
+		>${WRKDIR}/canna.sh
 
 post-install:
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libRKC.so.1.0 ${PREFIX}/lib/libRKC.so
-	${LN} -sf libRKC16.so.1.0 ${PREFIX}/lib/libRKC16.so
-	${LN} -sf libcanna.so.1.0 ${PREFIX}/lib/libcanna.so
-	${LN} -sf libcanna16.so.1.0 ${PREFIX}/lib/libcanna16.so
-.endif
+#	@${LDCONFIG} -m ${PREFIX}/lib
 	if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
 		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; 	\
 		${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT};	\
 	fi
-	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/canna-server/distinfo b/japanese/canna-server/distinfo
index a844d290c415..f505d5a8f499 100644
--- a/japanese/canna-server/distinfo
+++ b/japanese/canna-server/distinfo
@@ -1 +1,4 @@
-MD5 (Canna32p2.tar.gz) = fc5016ed531512618b0541db67d2c2dd
+MD5 (Canna35b2.tar.gz) = 09ae4dd3a5d33168ba17470ad9242cf3
+MD5 (Canna35b2-unoff1.patch.gz) = 88de4ac6a46697e4f664f1a362ecd1d2
+MD5 (Canna35b2-unoff2.patch.gz) = 7253b322dd6224376e03a95bec8a1c8f
+MD5 (Canna35b2-hack1.patch.gz) = a3969af8317798d1b586f7a68089ff4a
diff --git a/japanese/canna-server/files/patch-aa b/japanese/canna-server/files/patch-aa
deleted file mode 100644
index d649f0f8b812..000000000000
--- a/japanese/canna-server/files/patch-aa
+++ /dev/null
@@ -1,67 +0,0 @@
-*** canna/protodefs.h.orig	Wed Mar  9 16:01:53 1994
---- canna/protodefs.h	Sun Aug 11 06:54:35 1996
-***************
-*** 77,82 ****
---- 77,83 ----
-  #define I16toI32(x) (x)
-  #define I8toI32(x) (((x) & 0x80) ? ((x) | 0xffffff80) : (x))
-  
-+ #if 0
-  #ifdef HTONS			/* hir, 1993.1.2 */
-  #undef HTONS
-  #endif
-***************
-*** 85,90 ****
---- 86,92 ----
-  	work = htons( (len) ) ; \
-  	bcopy( (char *)&work, (char *)(data), sizeof( short ) ) ; \
-  }
-+ #endif
-  
-  #ifndef MIN
-  #define MIN( n, m )	( ((unsigned)(n) > (unsigned)(m)) ? (m) : (n) )
-*** canna/widedef.h.orig	Mon Jul  5 20:11:01 1993
---- canna/widedef.h	Sun Aug 11 06:54:35 1996
-***************
-*** 27,32 ****
---- 27,36 ----
-  #ifndef _WIDEDEF_H_
-  #define _WIDEDEF_H_
-       
-+ #if defined(__FreeBSD__) || defined(__NetBSD__)
-+ # include <machine/ansi.h>
-+ #endif
-+ 
-  #if __STDC__ || defined(SVR4) || defined(sun) /* This may be wrong. */
-  # if !defined(WCHAR16) && !defined(CANNA_WCHAR)
-  #  define HAVE_WCHAR_OPERATION
-***************
-*** 40,45 ****
---- 44,61 ----
-  #endif
-  #endif /* HAVE_WCHAR_OPERATION */
-  
-+ #if defined(__FreeBSD__) || defined(__NetBSD__)
-+ # ifdef _BSD_WCHAR_T_
-+ #  undef _BSD_WCHAR_T_
-+ #  ifdef WCHAR16
-+ #   define _BSD_WCHAR_T_ unsigned short
-+ #  else
-+ #   define _BSD_WCHAR_T_ unsigned long
-+ #  endif
-+ #  include <stddef.h>
-+ #  define _WCHAR_T
-+ # endif
-+ #else
-  #if !defined(WCHAR_T) && !defined(_WCHAR_T) && !defined(_WCHAR_T_) \
-   && !defined(__WCHAR_T) && !defined(_GCC_WCHAR_T)
-  # ifdef WCHAR16
-***************
-*** 54,58 ****
---- 70,75 ----
-  # define __WCHAR_T
-  # define _GCC_WCHAR_T
-  #endif
-+ #endif /* __FreeBSD__ || __NetBSD__ */
-  
-  #endif /* _WIDEDEF_H_ */
diff --git a/japanese/canna-server/files/patch-ab b/japanese/canna-server/files/patch-ab
deleted file mode 100644
index 9a734c3b8142..000000000000
--- a/japanese/canna-server/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-*** misc/Imakefile.orig	Fri Jan 28 14:36:42 1994
---- misc/Imakefile	Sun Aug 11 09:02:42 1996
-***************
-*** 37,43 ****
-  #endif /* nec_ews_svr4 */
-  
-  InstallNamedNonExec(default.ca,default.canna,$(cannaLibDir))
-! InstallNamedNonExec(Readme,Readme,$(LockDir))
-  InstallNonExec(is.c,$(cannaLibDir)/sample/src)
-  InstallNonExec(premountdics,$(DicDir))
-  
---- 37,43 ----
-  #endif /* nec_ews_svr4 */
-  
-  InstallNamedNonExec(default.ca,default.canna,$(cannaLibDir))
-! /* InstallNamedNonExec(Readme,Readme,$(LockDir)) */
-  InstallNonExec(is.c,$(cannaLibDir)/sample/src)
-  InstallNonExec(premountdics,$(DicDir))
-  
diff --git a/japanese/canna-server/files/patch-ac b/japanese/canna-server/files/patch-ac
index 07d73f0cf670..f16c082cb612 100644
--- a/japanese/canna-server/files/patch-ac
+++ b/japanese/canna-server/files/patch-ac
@@ -1,7 +1,7 @@
---- Canna.conf.orig	Wed Apr 12 22:15:03 1995
-+++ Canna.conf	Fri Oct 17 23:05:25 1997
-@@ -114,15 +114,15 @@
-  * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $
+--- Canna.conf.orig	Thu Nov 28 04:27:01 1996
++++ Canna.conf	Wed Nov 14 18:14:10 2001
+@@ -128,14 +128,15 @@
+  * $Id: Canna.conf,v 3.13 1996/11/28 10:27:01 kon Exp $
   */
  
 -cannaBinDir = /usr/local/canna/bin
@@ -10,6 +10,7 @@
 -cannaManDir = /usr/local/canna/man
 -cannaIncDir = /usr/local/canna/include/canna
 -libCannaDir = /usr/lib
++PREFIX?= /usr/local
 +cannaBinDir = ${PREFIX}/bin
 +cannaSrvDir = ${PREFIX}/sbin
 +cannaLibDir = ${PREFIX}/lib/canna
@@ -18,22 +19,20 @@
 +libCannaDir = ${PREFIX}/lib
  
 -ErrDir  = /usr/spool/canna
--LockDir = /usr/spool/canna/lock
 +ErrDir  = /var/log
-+LockDir = /var/run/canna
  
  wcharDefinition = -DCANNA_WCHAR
  Wlib =
-@@ -135,7 +135,7 @@
+@@ -148,7 +149,7 @@
  
  pointerIntegerDef =
  
 -cannaDsoRev = 1
 +cannaDsoRev = 1.0
- sharedLibExtension = so.$(cannaDsoRev)
- 
- /* 以下の３つは root にならないでインストールするのであれば echo に
-@@ -145,7 +145,7 @@
+     /* SunOS 4.x をお使いの方で shared object を利用する場合には
+             cannaDsoRev = 1.1
+     と指定してください。また、FreeBSD を利用する場合は、
+@@ -167,7 +168,7 @@
  CHMOD = chmod
  
  /* 日本語マニュアルを使わないのであればコメントアウト */
@@ -42,33 +41,3 @@
  
  /* locale ディレクトリを持っている場合は以下を記述する */
  /* #define LOCALE_DIR /usr/lib/locale */
-@@ -178,7 +178,7 @@
- #define UseInstalledLibCanna NO
- 
- DicDir   = $(cannaLibDir)/dic
--LockFile = .CANNALOCK
-+LockFile = Canna.pid
- 
- #ifdef NeXT
- #define NO_X_ENV
-@@ -311,13 +311,13 @@
- #endif
- #define InstallLibManPageAliases(file,destdir,aliases)			@@\
- install.man::								@@\
--        @(TMP=/tmp/tmp.$$$$; \						@@\
--        $(RM) $${TMP}; \						@@\
--        echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
--        for i in aliases; do (set -x; \					@@\
--        $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
--        done; \								@@\
--        $(RM) $${TMP})
-+	@(TMP=/tmp/tmp.$$$$; \						@@\
-+	$(RM) $${TMP}; \						@@\
-+	echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
-+	for i in aliases; do (set -x; \					@@\
-+	$(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
-+	done; \								@@\
-+	$(RM) $${TMP})
- #ifndef MakeDirectoriesLong
- #define MakeDirectoriesLong(step,dirs,owner,group)			@@\
- step::									@@\
diff --git a/japanese/canna-server/files/patch-ad b/japanese/canna-server/files/patch-ad
deleted file mode 100644
index 8e1aca7e0f46..000000000000
--- a/japanese/canna-server/files/patch-ad
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -cr cmd/cannakill/cannakill.man  cmd/cannakill/cannakill.man
-*** cmd/cannakill/cannakill.man	Thu Jan 27 19:45:37 1994
----  cmd/cannakill/cannakill.man	Thu Sep 19 18:31:07 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: cannakill.man,v 1.5 1994/01/27 10:45:37 misao Exp $
-  .TH CANNAKILL 1M
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: cannakill.man,v 1.5 1994/01/27 10:45:37 misao Exp $
-  .TH CANNAKILL 1M
-  .SH "NAME"
-diff -cr cmd/catdic/addwords.man  cmd/catdic/addwords.man
-*** cmd/catdic/addwords.man	Mon May 16 19:12:49 1994
----  cmd/catdic/addwords.man	Thu Sep 19 18:31:11 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: addwords.man,v 1.4 1994/05/16 10:12:49 hamada Exp $
-  .TH ADDWORDS 1
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: addwords.man,v 1.4 1994/05/16 10:12:49 hamada Exp $
-  .TH ADDWORDS 1
-  .SH "NAME"
-diff -cr cmd/catdic/catdic.man  cmd/catdic/catdic.man
-*** cmd/catdic/catdic.man	Thu Jan 27 19:46:29 1994
----  cmd/catdic/catdic.man	Thu Sep 19 18:31:49 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: catdic.man,v 1.2 1994/01/27 10:46:29 misao Exp $
-  .TH CATDIC 1        
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: catdic.man,v 1.2 1994/01/27 10:46:29 misao Exp $
-  .TH CATDIC 1        
-  .SH "NAME"
-diff -cr cmd/catdic/cpdic.man  cmd/catdic/cpdic.man
-*** cmd/catdic/cpdic.man	Thu Jan 27 19:46:34 1994
----  cmd/catdic/cpdic.man	Thu Sep 19 18:31:42 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: cpdic.man,v 1.2 1994/01/27 10:46:34 misao Exp $
-  .TH CPDIC 1
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: cpdic.man,v 1.2 1994/01/27 10:46:34 misao Exp $
-  .TH CPDIC 1
-  .SH "NAME"
-diff -cr cmd/catdic/delwords.man  cmd/catdic/delwords.man
-*** cmd/catdic/delwords.man	Thu Oct  6 17:52:32 1994
----  cmd/catdic/delwords.man	Thu Sep 19 18:31:26 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: delwords.man,v 1.4 1994/10/06 08:52:32 misao Exp $
-  .TH DELWORDS 1
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: delwords.man,v 1.4 1994/10/06 08:52:32 misao Exp $
-  .TH DELWORDS 1
-  .SH "NAME"
-diff -cr cmd/catdic/lsdic.man  cmd/catdic/lsdic.man
-*** cmd/catdic/lsdic.man	Thu Jan 27 19:46:45 1994
----  cmd/catdic/lsdic.man	Thu Sep 19 18:32:07 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: lsdic.man,v 1.2 1994/01/27 10:46:45 misao Exp $
-  .TH LSDIC 1         
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: lsdic.man,v 1.2 1994/01/27 10:46:45 misao Exp $
-  .TH LSDIC 1         
-  .SH "NAME"
-diff -cr cmd/catdic/mkdic.man  cmd/catdic/mkdic.man
-*** cmd/catdic/mkdic.man	Thu Jan 27 19:46:50 1994
----  cmd/catdic/mkdic.man	Thu Sep 19 18:31:56 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: mkdic.man,v 1.2 1994/01/27 10:46:50 misao Exp $
-  .TH MKDIC 1
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: mkdic.man,v 1.2 1994/01/27 10:46:50 misao Exp $
-  .TH MKDIC 1
-  .SH "NAME"
-diff -cr cmd/catdic/mvdic.man  cmd/catdic/mvdic.man
-*** cmd/catdic/mvdic.man	Thu Jan 27 19:46:54 1994
----  cmd/catdic/mvdic.man	Thu Sep 19 18:31:34 1996
-***************
-*** 18,24 ****
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! 
-  .\" $Id: mvdic.man,v 1.2 1994/01/27 10:46:54 misao Exp $
-  .TH MVDIC 1
-  .SH "NAME"
---- 18,24 ----
-  .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  .\" PERFORMANCE OF THIS SOFTWARE.
-! .\"
-  .\" $Id: mvdic.man,v 1.2 1994/01/27 10:46:54 misao Exp $
-  .TH MVDIC 1
-  .SH "NAME"
diff --git a/japanese/canna-server/files/patch-ae b/japanese/canna-server/files/patch-ae
deleted file mode 100644
index eebf300dd058..000000000000
--- a/japanese/canna-server/files/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./dic/ideo/user/Imakefile.org	Sat Feb  5 05:21:06 1994
-+++ ./dic/ideo/user/Imakefile	Wed Jun 11 04:46:51 1997
-@@ -10,8 +10,8 @@
-                   DICS = chimei.t dics.dir katakana.t necgaiji.t \
- 			 software.t user.t
- 
--all:
-+all::
- 
- MakeDirectories(install,$(USERDICDIR))
- 
- install::
diff --git a/japanese/canna-server/files/patch-af b/japanese/canna-server/files/patch-af
deleted file mode 100644
index 48328fc6e459..000000000000
--- a/japanese/canna-server/files/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
---- server/misc.c~	Fri Jul 29 12:03:54 1994
-+++ server/misc.c	Fri Jun 30 10:16:39 2000
-@@ -788,12 +788,19 @@
- 
-     if (client->username && client->username[0]) {
-       if (client->groupname && client->groupname[0]) {
-+	if (strlen(DDUSER) + strlen(client->username) +
-+	    strlen(DDGROUP) + strlen(client->groupname) +
-+	    strlen(DDPATH) + 4 >= 256)
-+	  return ( -1 );
- 	sprintf(dichome, "%s/%s:%s/%s:%s",
- 		DDUSER, client->username,
- 		DDGROUP, client->groupname,
- 		DDPATH);
-       }
-       else {
-+	if (strlen(DDUSER) + strlen(client->username) +
-+	    strlen(DDPATH) + 2 >= 256)
-+	  return ( -1 );
- 	sprintf(dichome, "%s/%s:%s",
- 		DDUSER, client->username,
- 		DDPATH);
diff --git a/japanese/canna-server/files/patch-ag b/japanese/canna-server/files/patch-ag
new file mode 100644
index 000000000000..307d095222d5
--- /dev/null
+++ b/japanese/canna-server/files/patch-ag
@@ -0,0 +1,18 @@
+--- cmd/catdic/Imakefile.orig	Mon Oct 29 01:41:09 2001
++++ cmd/catdic/Imakefile	Mon Oct 29 01:42:13 2001
+@@ -84,7 +84,7 @@
+ 	$(RM) $(cannaBinDir)/chmoddic
+ 	$(RM) $(cannaBinDir)/addwords
+ 	$(RM) $(cannaBinDir)/delwords
+-	$(RM) $(cannaBinDir)/cannakill
++	$(RM) $(cannaSrvDir)/cannakill
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cpdic
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/lsdic
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mkdic
+@@ -93,5 +93,5 @@
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/syncdic
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/addwords
+ 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/delwords
+-	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cannakill
++	$(LN) $(cannaBinDir)/catdic $(cannaSrvDir)/cannakill
+ #endif
diff --git a/japanese/canna-server/pkg-descr b/japanese/canna-server/pkg-descr
index 14268d789915..16e586f12733 100644
--- a/japanese/canna-server/pkg-descr
+++ b/japanese/canna-server/pkg-descr
@@ -2,12 +2,14 @@ Canna is a Kana-Kanji conversion server.
 Support Mule(Multi-lingal extention Emacs), kinput2 X11 input method,
 cannum front end and some others.
 
-  To use from Mule (CANNA version), in .emacs file:
+  To use from Mule (CANNA version), add the following to your .emacs file:
 
      (if (and (boundp 'CANNA) CANNA) ; Is it CANNA MULE?
         (progn
          (load-library "canna")
          (canna) ))
 
-  Then kana-kanji conversion begin to `C-o' key. Show more detail
-Info, and/or documents.
+  Then use the `C-o' key to begin kana-kanji conversion.  Refer to the
+Info file and the documents for more detail.
+
+- Max
diff --git a/japanese/canna-server/pkg-plist b/japanese/canna-server/pkg-plist
index e5d09cb8a60f..b3b48620199c 100644
--- a/japanese/canna-server/pkg-plist
+++ b/japanese/canna-server/pkg-plist
@@ -2,12 +2,9 @@ bin/addwords
 bin/canlisp
 bin/cannacheck
 bin/cannastat
-bin/canvert
 bin/catdic
-bin/chmoddic
 bin/cpdic
 bin/crfreq
-bin/crrdic
 bin/crxdic
 bin/crxgram
 bin/cshost
@@ -16,11 +13,9 @@ bin/delwords
 bin/dicar
 bin/dpbindic
 bin/dpromdic
-bin/dpwdic
 bin/dpxdic
 bin/forcpp
 bin/forsort
-bin/itoc
 bin/kpdic
 bin/lsdic
 bin/mergeword
@@ -38,75 +33,68 @@ include/canna/jrkanji.h
 include/canna/keydef.h
 include/canna/mfdef.h
 lib/canna/default.canna
-lib/canna/dic/canna/bushu.fq
+lib/canna/dic/canna/bushu.cld
+lib/canna/dic/canna/chimei.ctd
 lib/canna/dic/canna/dics.dir
-lib/canna/dic/canna/fuzokugo.d
-lib/canna/dic/canna/fuzokugo.fq
-lib/canna/dic/canna/hojomwd.t
-lib/canna/dic/canna/hojoswd.t
-lib/canna/dic/canna/iroha.d
-lib/canna/dic/canna/iroha.fq
-lib/canna/dic/canna/number.t
-lib/canna/dic/canna/suffix.t
-lib/canna/dic/canna/yuubin.fq
-lib/canna/dic/default.kp
-lib/canna/dic/default.rdic
-lib/canna/dic/english.kp
-lib/canna/dic/hyoujun.gram
-lib/canna/dic/jdaemon.kp
-lib/canna/dic/jdaemon.rdic
-lib/canna/dic/just.kp
-lib/canna/dic/just.rdic
-lib/canna/dic/kaisoku.kp
-lib/canna/dic/kana.kp
-lib/canna/dic/kana.rdic
-lib/canna/dic/lan5.kp
-lib/canna/dic/newjis.kp
-lib/canna/dic/newjis.rdic
-lib/canna/dic/premountdics
-lib/canna/dic/romaji.kp
-lib/canna/dic/sokuon.kp
-lib/canna/dic/tut.kp
-lib/canna/dic/user/user/chimei.t
-lib/canna/dic/user/user/dics.dir
-lib/canna/dic/user/user/katakana.t
-lib/canna/dic/user/user/necgaiji.t
-lib/canna/dic/user/user/software.t
-lib/canna/dic/user/user/user.t
+lib/canna/dic/canna/fuzokugo.cbd
+lib/canna/dic/canna/fuzokugo.cld
+lib/canna/dic/canna/hojomwd.ctd
+lib/canna/dic/canna/hojoswd.ctd
+lib/canna/dic/canna/iroha.cbd
+lib/canna/dic/canna/iroha.cld
+lib/canna/dic/canna/kanasmpl.ctd
+lib/canna/dic/canna/katakana.ctd
+lib/canna/dic/canna/keishiki.ctd
+lib/canna/dic/canna/necgaiji.ctd
+lib/canna/dic/canna/number.ctd
+lib/canna/dic/canna/software.ctd
+lib/canna/dic/canna/suffix.ctd
+lib/canna/dic/default.cbp
+lib/canna/dic/english.cbp
+lib/canna/dic/jdaemon.cbp
+lib/canna/dic/just.cbp
+lib/canna/dic/kaisoku.cbp
+lib/canna/dic/kana.cbp
+lib/canna/dic/lan5.cbp
+lib/canna/dic/matsu.cbp
+lib/canna/dic/newjis.cbp
+lib/canna/dic/romaji.cbp
+lib/canna/dic/sokuon.cbp
+lib/canna/dic/tut.cbp
+lib/canna/dic/vje.cbp
+lib/canna/dic/wx2+.cbp
 lib/canna/engine.cf
 lib/canna/sample/1.1.canna
-lib/canna/sample/1.1.iroha
 lib/canna/sample/1.2.canna
 lib/canna/sample/default.canna
-lib/canna/sample/default.iroha
 lib/canna/sample/fixer.canna
-lib/canna/sample/fixer.iroha
 lib/canna/sample/jdemon.canna
-lib/canna/sample/jdemon.iroha
 lib/canna/sample/just.canna
-lib/canna/sample/just.iroha
 lib/canna/sample/lan5.canna
+lib/canna/sample/matsu.canna
 lib/canna/sample/modes.canna
-lib/canna/sample/modes.iroha
 lib/canna/sample/sample.canna
-lib/canna/sample/sample.iroha
+lib/canna/sample/skk.canna
 lib/canna/sample/src/Makefile
-lib/canna/sample/src/default.kpdef
-lib/canna/sample/src/english.kpdef
+lib/canna/sample/src/default.ctd
+lib/canna/sample/src/english.ctd
 lib/canna/sample/src/is.c
-lib/canna/sample/src/jdaemon.kpdef
-lib/canna/sample/src/just.kpdef
-lib/canna/sample/src/kaisoku.kpdef
-lib/canna/sample/src/kana.kpdef
-lib/canna/sample/src/lan5.kpdef
-lib/canna/sample/src/newjis.kpdef
-lib/canna/sample/src/romaji.kpdef
-lib/canna/sample/src/sokuon.kpdef
-lib/canna/sample/src/tut.kpdef
+lib/canna/sample/src/jdaemon.ctd
+lib/canna/sample/src/just.ctd
+lib/canna/sample/src/kaisoku.ctd
+lib/canna/sample/src/kana.ctd
+lib/canna/sample/src/lan5.ctd
+lib/canna/sample/src/matsu.ctd
+lib/canna/sample/src/newjis.ctd
+lib/canna/sample/src/romaji.ctd
+lib/canna/sample/src/sokuon.ctd
+lib/canna/sample/src/tut.ctd
+lib/canna/sample/src/vje.ctd
+lib/canna/sample/src/wx2+.ctd
 lib/canna/sample/tut.canna
 lib/canna/sample/unix.canna
 lib/canna/sample/vje.canna
-lib/canna/sample/vje.iroha
+lib/canna/sample/wx2+.canna
 lib/libRKC.a
 lib/libRKC.so
 lib/libRKC.so.1
@@ -119,21 +107,19 @@ lib/libcanna.so.1
 lib/libcanna16.a
 lib/libcanna16.so
 lib/libcanna16.so.1
-sbin/cannakill
 sbin/cannaserver
-@exec mkdir -p /var/run/canna
-@exec chown bin:bin /var/run/canna
-@exec chown bin:bin %D/lib/canna/dic/canna
+sbin/cannakill
+@exec mkdir /var/run/canna
+@exec chown bin.bin /var/run/canna
+@exec chown bin.bin %D/lib/canna/dic/canna
 @exec chmod 775 %D/lib/canna/dic/canna
 @exec chown bin.bin %D/lib/canna/dic
 @exec chmod 775 %D/lib/canna/dic
-@exec chown bin:bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user
+@exec chown bin.bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user
 @exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user
 @unexec /bin/rmdir /var/run/canna
 @dirrm lib/canna/sample/src
 @dirrm lib/canna/sample
-@dirrm lib/canna/dic/user/user
-@dirrm lib/canna/dic/user
 @dirrm lib/canna/dic/canna
 @dirrm lib/canna/dic
 @dirrm lib/canna