6 files changed, 548 insertions, 293 deletions

diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index 6c65f0d0ecec..d932855ba980 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -13,26 +13,50 @@ CATEGORIES+=	japanese
 MASTER_SITES=	ftp://ftp.nec.co.jp/pub/packages/Canna32/ \
 		ftp://ftp.cdrom.com/pub/japanese/titech/Canna32/
 
-MAINTAINER=	asami@FreeBSD.ORG
+MAINTAINER=	max@FreeBSD.ORG
 
-PATCH_STRIP=	-p1
+USE_IMAKE=	yes
+PREFIX?=	/usr/local
 ALL_TARGET=	canna
 
-pre-configure:
-	@(cd ${WRKSRC}; xmkmf)
+MAN3PAGES= 	RkRgnBun.3 RkDefineDic.3 RkDeleteDic.3 RkEndBun.3 \
+		RkEnlarge.3 RkFinalize.3 RkGetDicList.3 RkGetKanji.3 \
+		RkGetLex.3 RkGetStat.3 RkGetYomi.3 RkGoto.3 RkInitialize.3 \
+		RkIntro.3 RkLeft.3 RkMountD.3 RkNext.3 RkNfer.3 RkPrev.3 \
+		RkRemountDic.3 RkResize.3 RkRight.3 RkShorten.3 RkStoreYomi.3 \
+		RkUnmountDic.3 RkXfer.3 cannalib.3 uilib.3 RkCloseRoma.3 \
+		RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3 RkCvtRoma.3 \
+		RkCvtZen.3 RkMapPhonogram.3 RkMapRoma.3 RkOpenRoma.3
+MAN1PAGES=	cannaserver.1 ctow.1 dicar.1 dpromdic.1 splitword.1 wtoc.1 \
+		mkromdic.1 mkbindic.1 dpbindic.1 cannakill.1 canvert.1 \
+		cannacheck.1 cannastat.1 cshost.1 catdic.1 cpdic.1 lsdic.1 \
+		mkdic.1 mvdic.1 rmdic.1 addwords.1 delwords.1
+
+STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
 
 post-install:
 	/sbin/ldconfig -m ${PREFIX}/lib
-	@if [ ! -f ${PREFIX}/etc/rc.d/canna.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/canna.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/canna.sh; \
-		echo "canna=/usr/local/canna/bin/cannaserver" >> ${PREFIX}/etc/rc.d/canna.sh ;\
-		echo 'if [ -f $$canna ]; then' >> ${PREFIX}/etc/rc.d/canna.sh ;\
-		echo "    rm -f /var/spool/canna/lock/.CANNALOCK*" >> ${PREFIX}/etc/rc.d/canna.sh ;\
-		echo "    echo -n ' Canna'" >> ${PREFIX}/etc/rc.d/canna.sh ;\
-		echo '$$canna' >> ${PREFIX}/etc/rc.d/canna.sh ;\
-		echo "fi" >> ${PREFIX}/etc/rc.d/canna.sh ;\
-		chmod 755 ${PREFIX}/etc/rc.d/canna.sh ;\
+.if !defined(NOMANCOMPRESS)
+	for f in ${MAN3PAGES} ; do gzip -9nf ${PREFIX}/man/man3/$$f ; done
+	for f in ${MAN1PAGES} ; do gzip -9nf ${PREFIX}/man/man1/$$f ; done
+.endif
+	@if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
+		echo "Installing ${STARTUP_SCRIPT} startup file."; 	\
+		echo '#!/bin/sh' > ${STARTUP_SCRIPT}; 			\
+		echo 'canna=${PREFIX}/sbin/cannaserver' 		\
+		  >> ${STARTUP_SCRIPT} ;				\
+		echo 'if [ -f $$canna ]; then' >> ${STARTUP_SCRIPT} ;	\
+		echo '    rm -f /var/run/Canna.pid' >> ${STARTUP_SCRIPT};\
+		echo "    echo -n ' Canna'" >> ${STARTUP_SCRIPT};	\
+		echo '     $$canna' >> ${STARTUP_SCRIPT} ;		\
+		echo "fi" >> ${STARTUP_SCRIPT} ;			\
+		chmod 755 ${STARTUP_SCRIPT} ;				\
+		chown bin.bin ${STARTUP_SCRIPT};			\
 	fi
+	@(grep -v ^# /etc/services | grep canna >/dev/null) || \
+	(echo "Now, you need to add following entry to your /etc/services:" ;\
+	 echo ;\
+	 echo "	canna           5680/tcp" ;\
+	 echo )
 
 .include <bsd.port.mk>
diff --git a/japanese/canna-server/files/patch-aa b/japanese/canna-server/files/patch-aa
index 603875c8bca1..d649f0f8b812 100644
--- a/japanese/canna-server/files/patch-aa
+++ b/japanese/canna-server/files/patch-aa
@@ -1,149 +1,67 @@
-Index: canna/Canna.conf
-diff -u canna/Canna.conf:1.1.1.1 canna/Canna.conf:1.2
---- canna/Canna.conf:1.1.1.1	Tue Jun 20 09:45:46 1995
-+++ canna/Canna.conf	Tue Jun 20 09:59:41 1995
-@@ -119,10 +119,10 @@
- cannaLibDir = /usr/local/canna/lib
- cannaManDir = /usr/local/canna/man
- cannaIncDir = /usr/local/canna/include/canna
--libCannaDir = /usr/lib
-+libCannaDir = /usr/local/lib
- 
--ErrDir  = /usr/spool/canna
--LockDir = /usr/spool/canna/lock
-+ErrDir  = /var/spool/canna
-+LockDir = /var/spool/canna/lock
- 
- wcharDefinition = -DCANNA_WCHAR
- Wlib =
-@@ -135,7 +135,7 @@
- 
- pointerIntegerDef =
- 
--cannaDsoRev = 1
-+cannaDsoRev = 1.0
- sharedLibExtension = so.$(cannaDsoRev)
- 
- /* 以下の３つは root にならないでインストールするのであれば echo に
-@@ -145,7 +145,7 @@
- CHMOD = chmod
- 
- /* 日本語マニュアルを使わないのであればコメントアウト */
--#define JAPANESEMAN
-+/* #define JAPANESEMAN */
- 
- /* locale ディレクトリを持っている場合は以下を記述する */
- /* #define LOCALE_DIR /usr/lib/locale */
-Index: canna/canna/protodefs.h
-diff -u canna/canna/protodefs.h:1.1.1.1 canna/canna/protodefs.h:1.2
---- canna/canna/protodefs.h:1.1.1.1	Tue Jun 20 09:45:47 1995
-+++ canna/canna/protodefs.h	Tue Jun 20 09:59:47 1995
-@@ -77,6 +77,7 @@
- #define I16toI32(x) (x)
- #define I8toI32(x) (((x) & 0x80) ? ((x) | 0xffffff80) : (x))
- 
-+#if 0
- #ifdef HTONS			/* hir, 1993.1.2 */
- #undef HTONS
- #endif
-@@ -85,6 +86,7 @@
- 	work = htons( (len) ) ; \
- 	bcopy( (char *)&work, (char *)(data), sizeof( short ) ) ; \
- }
-+#endif
- 
- #ifndef MIN
- #define MIN( n, m )	( ((unsigned)(n) > (unsigned)(m)) ? (m) : (n) )
-Index: canna/canna/widedef.h
-diff -u canna/canna/widedef.h:1.1.1.1 canna/canna/widedef.h:1.2
---- canna/canna/widedef.h:1.1.1.1	Tue Jun 20 09:45:48 1995
-+++ canna/canna/widedef.h	Tue Jun 20 09:59:48 1995
-@@ -27,6 +27,10 @@
- #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,6 +44,18 @@
- #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,5 +70,6 @@
- # define __WCHAR_T
- # define _GCC_WCHAR_T
- #endif
-+#endif /* __FreeBSD__ || __NetBSD__ */
- 
- #endif /* _WIDEDEF_H_ */
-Index: canna/lib/RKC/Imakefile
-diff -u canna/lib/RKC/Imakefile:1.1.1.1 canna/lib/RKC/Imakefile:1.2
---- canna/lib/RKC/Imakefile:1.1.1.1	Tue Jun 20 09:46:30 1995
-+++ canna/lib/RKC/Imakefile	Tue Jun 20 10:00:01 1995
-@@ -26,7 +26,7 @@
- 
- #if ProjectX > 5
- #define LibName RKC
--#define SoRev		cannaDsoRev
-+#define SoRev cannaDsoRev
- #define SHLIBDIR	libCannaDir
- #define USRLIBDIR	libCannaDir
- #define LibHeaders 0
-Index: canna/lib/RKC16/Imakefile
-diff -u canna/lib/RKC16/Imakefile:1.1.1.1 canna/lib/RKC16/Imakefile:1.2
---- canna/lib/RKC16/Imakefile:1.1.1.1	Tue Jun 20 09:46:31 1995
-+++ canna/lib/RKC16/Imakefile	Tue Jun 20 10:00:03 1995
-@@ -23,7 +23,7 @@
- 
- #if ProjectX > 5
- #define LibName RKC16
--#define SoRev		cannaDsoRev
-+#define SoRev cannaDsoRev
- #define SHLIBDIR	libCannaDir
- #define USRLIBDIR	libCannaDir
- #define LibHeaders 0
-Index: canna/lib/canna/Imakefile
-diff -u canna/lib/canna/Imakefile:1.1.1.1 canna/lib/canna/Imakefile:1.2
---- canna/lib/canna/Imakefile:1.1.1.1	Tue Jun 20 09:46:33 1995
-+++ canna/lib/canna/Imakefile	Tue Jun 20 10:00:06 1995
-@@ -56,7 +56,7 @@
- 
- #if ProjectX > 5
- #define LibName canna
--#define SoRev		cannaDsoRev
-+#define SoRev cannaDsoRev
- #define SHLIBDIR	libCannaDir
- #define USRLIBDIR	libCannaDir
- #define LibHeaders 0
-Index: canna/lib/canna16/Imakefile
-diff -u canna/lib/canna16/Imakefile:1.1.1.1 canna/lib/canna16/Imakefile:1.2
---- canna/lib/canna16/Imakefile:1.1.1.1	Tue Jun 20 09:46:43 1995
-+++ canna/lib/canna16/Imakefile	Tue Jun 20 10:00:08 1995
-@@ -58,7 +58,7 @@
- 
- #if ProjectX > 5
- #define LibName canna16
--#define SoRev		cannaDsoRev
-+#define SoRev cannaDsoRev
- #define SHLIBDIR	libCannaDir
- #define USRLIBDIR	libCannaDir
- #define LibHeaders 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
new file mode 100644
index 000000000000..9a734c3b8142
--- /dev/null
+++ b/japanese/canna-server/files/patch-ab
@@ -0,0 +1,19 @@
+*** 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
new file mode 100644
index 000000000000..ae6d5ad8aa87
--- /dev/null
+++ b/japanese/canna-server/files/patch-ac
@@ -0,0 +1,86 @@
+*** Canna.conf.orig	Wed Apr 12 22:15:03 1995
+--- Canna.conf	Wed Sep 18 07:05:18 1996
+***************
+*** 114,128 ****
+   * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $
+   */
+  
+! cannaBinDir = /usr/local/canna/bin
+! cannaSrvDir = /usr/local/canna/bin
+! cannaLibDir = /usr/local/canna/lib
+! cannaManDir = /usr/local/canna/man
+! cannaIncDir = /usr/local/canna/include/canna
+! libCannaDir = /usr/lib
+  
+! ErrDir  = /usr/spool/canna
+! LockDir = /usr/spool/canna/lock
+  
+  wcharDefinition = -DCANNA_WCHAR
+  Wlib =
+--- 114,128 ----
+   * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $
+   */
+  
+! cannaBinDir = ${PREFIX}/bin
+! cannaSrvDir = ${PREFIX}/sbin
+! cannaLibDir = ${PREFIX}/lib/canna
+! cannaManDir = ${PREFIX}/man
+! cannaIncDir = ${PREFIX}/include/canna
+! libCannaDir = ${PREFIX}/lib
+  
+! ErrDir  = /var/log
+! LockDir = /var/run
+  
+  wcharDefinition = -DCANNA_WCHAR
+  Wlib =
+***************
+*** 135,141 ****
+  
+  pointerIntegerDef =
+  
+! cannaDsoRev = 1
+  sharedLibExtension = so.$(cannaDsoRev)
+  
+  /* 以下の３つは root にならないでインストールするのであれば echo に
+--- 135,141 ----
+  
+  pointerIntegerDef =
+  
+! cannaDsoRev = 1.0
+  sharedLibExtension = so.$(cannaDsoRev)
+  
+  /* 以下の３つは root にならないでインストールするのであれば echo に
+***************
+*** 145,151 ****
+  CHMOD = chmod
+  
+  /* 日本語マニュアルを使わないのであればコメントアウト */
+! #define JAPANESEMAN
+  
+  /* locale ディレクトリを持っている場合は以下を記述する */
+  /* #define LOCALE_DIR /usr/lib/locale */
+--- 145,151 ----
+  CHMOD = chmod
+  
+  /* 日本語マニュアルを使わないのであればコメントアウト */
+! /* #define JAPANESEMAN */
+  
+  /* locale ディレクトリを持っている場合は以下を記述する */
+  /* #define LOCALE_DIR /usr/lib/locale */
+***************
+*** 178,184 ****
+  #define UseInstalledLibCanna NO
+  
+  DicDir   = $(cannaLibDir)/dic
+! LockFile = .CANNALOCK
+  
+  #ifdef NeXT
+  #define NO_X_ENV
+--- 178,184 ----
+  #define UseInstalledLibCanna NO
+  
+  DicDir   = $(cannaLibDir)/dic
+! LockFile = Canna.pid
+  
+  #ifdef NeXT
+  #define NO_X_ENV
diff --git a/japanese/canna-server/files/patch-ad b/japanese/canna-server/files/patch-ad
new file mode 100644
index 000000000000..ee597a8a40f7
--- /dev/null
+++ b/japanese/canna-server/files/patch-ad
@@ -0,0 +1,152 @@
+*** cmd/cannakill/cannakill.man.orig	Thu Jan 27 19:45:37 1994
+--- cmd/cannakill/cannakill.man	Wed Aug 14 14:19:25 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"
+*** cmd/catdic/addwords.man.orig	Mon May 16 19:12:49 1994
+--- cmd/catdic/addwords.man	Wed Aug 14 14:21:02 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"
+*** cmd/catdic/delwords.man.orig	Thu Oct  6 17:52:32 1994
+--- cmd/catdic/delwords.man	Wed Aug 14 14:21:54 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"
+*** cmd/catdic/mvdic.man.orig	Thu Jan 27 19:46:54 1994
+--- cmd/catdic/mvdic.man	Wed Aug 14 14:23:06 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"
+*** cmd/catdic/cpdic.man.orig	Thu Jan 27 19:46:34 1994
+--- cmd/catdic/cpdic.man	Wed Aug 14 14:23:37 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"
+*** cmd/catdic/catdic.man.orig	Thu Jan 27 19:46:29 1994
+--- cmd/catdic/catdic.man	Wed Aug 14 14:24:25 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"
+*** cmd/catdic/mkdic.man.orig	Thu Jan 27 19:46:50 1994
+--- cmd/catdic/mkdic.man	Wed Aug 14 14:25:02 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"
+*** cmd/catdic/lsdic.man.orig	Thu Jan 27 19:46:45 1994
+--- cmd/catdic/lsdic.man	Wed Aug 14 14:25:32 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 --git a/japanese/canna-server/pkg-plist b/japanese/canna-server/pkg-plist
index 6f89ff5cb18c..bc61ccc3eab5 100644
--- a/japanese/canna-server/pkg-plist
+++ b/japanese/canna-server/pkg-plist
@@ -1,130 +1,186 @@
-@cwd /usr/local
-canna/bin/addwords
-canna/bin/canlisp
-canna/bin/cannacheck
-canna/bin/cannakill
-canna/bin/cannaserver
-canna/bin/cannastat
-canna/bin/canvert
-canna/bin/catdic
-canna/bin/chmoddic
-canna/bin/cpdic
-canna/bin/crfreq
-canna/bin/crrdic
-canna/bin/crxdic
-canna/bin/crxgram
-canna/bin/cshost
-canna/bin/ctow
-canna/bin/delwords
-canna/bin/dicar
-canna/bin/dpbindic
-canna/bin/dpromdic
-canna/bin/dpwdic
-canna/bin/dpxdic
-canna/bin/forcpp
-canna/bin/forsort
-canna/bin/itoc
-canna/bin/kpdic
-canna/bin/lsdic
-canna/bin/mergeword
-canna/bin/mkbindic
-canna/bin/mkdic
-canna/bin/mkromdic
-canna/bin/mvdic
-canna/bin/rmdic
-canna/bin/splitword
-canna/bin/syncdic
-canna/bin/wtoc
-canna/include/canna/RK.h
-canna/include/canna/jrkanji.h
-canna/include/canna/keydef.h
-canna/include/canna/mfdef.h
-canna/lib/default.canna
-canna/lib/dic/canna/bushu.fq
-canna/lib/dic/canna/dics.dir
-canna/lib/dic/canna/fuzokugo.d
-canna/lib/dic/canna/fuzokugo.fq
-canna/lib/dic/canna/hojomwd.t
-canna/lib/dic/canna/hojoswd.t
-canna/lib/dic/canna/iroha.d
-canna/lib/dic/canna/iroha.fq
-canna/lib/dic/canna/number.t
-canna/lib/dic/canna/suffix.t
-canna/lib/dic/canna/yuubin.fq
-canna/lib/dic/default.kp
-canna/lib/dic/default.rdic
-canna/lib/dic/english.kp
-canna/lib/dic/hyoujun.gram
-canna/lib/dic/jdaemon.kp
-canna/lib/dic/jdaemon.rdic
-canna/lib/dic/just.kp
-canna/lib/dic/just.rdic
-canna/lib/dic/kaisoku.kp
-canna/lib/dic/kana.kp
-canna/lib/dic/kana.rdic
-canna/lib/dic/lan5.kp
-canna/lib/dic/newjis.kp
-canna/lib/dic/newjis.rdic
-canna/lib/dic/premountdics
-canna/lib/dic/romaji.kp
-canna/lib/dic/sokuon.kp
-canna/lib/dic/tut.kp
-canna/lib/dic/user/user/chimei.t
-canna/lib/dic/user/user/dics.dir
-canna/lib/dic/user/user/katakana.t
-canna/lib/dic/user/user/necgaiji.t
-canna/lib/dic/user/user/software.t
-canna/lib/dic/user/user/user.t
-canna/lib/engine.cf
-canna/lib/sample/1.1.canna
-canna/lib/sample/1.1.iroha
-canna/lib/sample/1.2.canna
-canna/lib/sample/default.canna
-canna/lib/sample/default.iroha
-canna/lib/sample/fixer.canna
-canna/lib/sample/fixer.iroha
-canna/lib/sample/jdemon.canna
-canna/lib/sample/jdemon.iroha
-canna/lib/sample/just.canna
-canna/lib/sample/just.iroha
-canna/lib/sample/lan5.canna
-canna/lib/sample/modes.canna
-canna/lib/sample/modes.iroha
-canna/lib/sample/sample.canna
-canna/lib/sample/sample.iroha
-canna/lib/sample/src/Makefile
-canna/lib/sample/src/default.kpdef
-canna/lib/sample/src/english.kpdef
-canna/lib/sample/src/is.c
-canna/lib/sample/src/jdaemon.kpdef
-canna/lib/sample/src/just.kpdef
-canna/lib/sample/src/kaisoku.kpdef
-canna/lib/sample/src/kana.kpdef
-canna/lib/sample/src/lan5.kpdef
-canna/lib/sample/src/newjis.kpdef
-canna/lib/sample/src/romaji.kpdef
-canna/lib/sample/src/sokuon.kpdef
-canna/lib/sample/src/tut.kpdef
-canna/lib/sample/tut.canna
-canna/lib/sample/unix.canna
-canna/lib/sample/vje.canna
-canna/lib/sample/vje.iroha
-lib/libRKC.a
-lib/libRKC.so.1.0
-lib/libRKC16.a
-lib/libRKC16.so.1.0
-lib/libcanna.a
-lib/libcanna.so.1.0
-lib/libcanna16.a
-lib/libcanna16.so.1.0
-etc/rc.d/canna.sh
-@exec ldconfig -m %B
-@exec chown bin.bin %D/canna/lib/dic/canna
-@exec chmod ug+w %D/canna/lib/dic/canna
-@exec chown bin.bin %D/canna/lib/dic
-@exec chmod ug+w %D/canna/lib/dic
-@exec chown bin.bin %D/canna/lib/dic/user/user %D/canna/lib/dic/user
-@exec chmod ug+w %D/canna/lib/dic/user/user %D/canna/lib/dic/user
-@cwd /var/spool
-canna/lock/Readme
-@exec chown bin.bin %D/canna %D/canna/lock
+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

+bin/ctow

+bin/delwords

+bin/dicar

+bin/dpbindic

+bin/dpromdic

+bin/dpwdic

+bin/dpxdic

+bin/forcpp

+bin/forsort

+bin/itoc

+bin/kpdic

+bin/lsdic

+bin/mergeword

+bin/mkbindic

+bin/mkdic

+bin/mkromdic

+bin/mvdic

+bin/rmdic

+bin/splitword

+bin/syncdic

+bin/wtoc

+etc/rc.d/canna.sh

+include/canna/RK.h

+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/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/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/modes.canna

+lib/canna/sample/modes.iroha

+lib/canna/sample/sample.canna

+lib/canna/sample/sample.iroha

+lib/canna/sample/src/Makefile

+lib/canna/sample/src/default.kpdef

+lib/canna/sample/src/english.kpdef

+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/tut.canna

+lib/canna/sample/unix.canna

+lib/canna/sample/vje.canna

+lib/canna/sample/vje.iroha

+lib/libRKC.a

+lib/libRKC.so.1.0

+lib/libRKC16.a

+lib/libRKC16.so.1.0

+lib/libcanna.a

+lib/libcanna.so.1.0

+lib/libcanna16.a

+lib/libcanna16.so.1.0

+@exec ldconfig -m %B

+man/man1/addwords.1.gz

+man/man1/cannacheck.1.gz

+man/man1/cannakill.1.gz

+man/man1/cannaserver.1.gz

+man/man1/cannastat.1.gz

+man/man1/canvert.1.gz

+man/man1/catdic.1.gz

+man/man1/cpdic.1.gz

+man/man1/cshost.1.gz

+man/man1/ctow.1.gz

+man/man1/delwords.1.gz

+man/man1/dicar.1.gz

+man/man1/dpbindic.1.gz

+man/man1/dpromdic.1.gz

+man/man1/lsdic.1.gz

+man/man1/mkbindic.1.gz

+man/man1/mkdic.1.gz

+man/man1/mkromdic.1.gz

+man/man1/mvdic.1.gz

+man/man1/rmdic.1.gz

+man/man1/splitword.1.gz

+man/man1/wtoc.1.gz

+man/man3/RkCloseRoma.3.gz

+man/man3/RkCvtEuc.3.gz

+man/man3/RkCvtHan.3.gz

+man/man3/RkCvtHira.3.gz

+man/man3/RkCvtKana.3.gz

+man/man3/RkCvtRoma.3.gz

+man/man3/RkCvtZen.3.gz

+man/man3/RkDefineDic.3.gz

+man/man3/RkDeleteDic.3.gz

+man/man3/RkEndBun.3.gz

+man/man3/RkEnlarge.3.gz

+man/man3/RkFinalize.3.gz

+man/man3/RkGetDicList.3.gz

+man/man3/RkGetKanji.3.gz

+man/man3/RkGetLex.3.gz

+man/man3/RkGetStat.3.gz

+man/man3/RkGetYomi.3.gz

+man/man3/RkGoto.3.gz

+man/man3/RkInitialize.3.gz

+man/man3/RkIntro.3.gz

+man/man3/RkLeft.3.gz

+man/man3/RkMapPhonogram.3.gz

+man/man3/RkMapRoma.3.gz

+man/man3/RkMountD.3.gz

+man/man3/RkNext.3.gz

+man/man3/RkNfer.3.gz

+man/man3/RkOpenRoma.3.gz

+man/man3/RkPrev.3.gz

+man/man3/RkRemountDic.3.gz

+man/man3/RkResize.3.gz

+man/man3/RkRgnBun.3.gz

+man/man3/RkRight.3.gz

+man/man3/RkShorten.3.gz

+man/man3/RkStoreYomi.3.gz

+man/man3/RkUnmountDic.3.gz

+man/man3/RkXfer.3.gz

+man/man3/cannalib.3.gz

+man/man3/uilib.3.gz

+sbin/cannakill

+sbin/cannaserver

+@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 chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user