From owner-ports-jp@jp.freebsd.org  Fri Aug 27 10:50:01 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id KAA08302;
	Fri, 27 Aug 1999 10:50:01 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from psi.c.oka-pu.ac.jp (psi.c.oka-pu.ac.jp [163.225.213.86])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id KAA08287
	for <ports-jp@jp.freebsd.org>; Fri, 27 Aug 1999 10:50:00 +0900 (JST)
	(envelope-from kunishi@c.oka-pu.ac.jp)
Received: from localhost by psi.c.oka-pu.ac.jp (8.9.3+3.2W/3.7W:psi:99060419) id KAA63875; Fri, 27 Aug 1999 10:49:58 +0900 (JST)
	(envelope-from kunishi@c.oka-pu.ac.jp)
To: ports-jp@jp.freebsd.org
In-Reply-To: <19990826150238O.kiri@pis.toba-cmt.ac.jp>
References: <19990826150238O.kiri@pis.toba-cmt.ac.jp>
X-Mailer: Mew version 1.94b54 on Emacs 20.4 / Mule 4.0 (HANANOEN)
X-URL: http://psi.c.oka-pu.ac.jp/~kunishi/
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
 boundary="--Next_Part(Fri_Aug_27_10:47:20_1999_663)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19990827104905G.kunishi@aquamarine.c.oka-pu.ac.jp>
Date: Fri, 27 Aug 1999 10:49:05 +0900
From: KUNISHIMA Takeo <kunishi@c.oka-pu.ac.jp>
X-Dispatcher: imput version 990823(IM125)
Lines: 849
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990727
X-Sequence: ports-jp 7343
Subject: [ports-jp 7343] ja-Canna-3.5b2 (Re: How about Printing around ports?)
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: kunishi@c.oka-pu.ac.jp

----Next_Part(Fri_Aug_27_10:47:20_1999_663)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

$B9qEg$G$9!#(B

From: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
Subject: [ports-jp 7340] Re: How about Printing around ports?
Date: Thu, 26 Aug 1999 15:02:38 +0900

> > $B$=$l$O$=$l$H$7$F!"$7$P$i$/A0$+$i!"(Bjapanese/Canna $B$r(B Canna35b2
> > $BMQ$K<jD>$7$7$F;H$C$F$^$9!#I,MW$J$i!"$?$?$-Bf$H$7$FJ|=P$7$^$9!#(B
> $B$h$m$7$/$*4j$$$7$^$9!#$=$l$K9g$;$F(B canuum $B$*$h$S(B vftool $B$rJQ99$7$^$9!#(B

$B$^$@5$$K$J$k$H$3$m$b$"$k$N$G$9$,!"$H$j$"$($:=P$7$F$_$^$9!#(B
-current $B$+$i$N(B diff $B$rE:IU$7$^$9!#(B

$BF0:n3NG'(B:
  4.0-current $B$G(B make install; make package; pkg_delete; pkg_add; 
  pkg_delete $B$N=g$G!"%U%!%$%k$,;D$i$J$$$3$H!"F0:n$r3NG'!#(B
  portlint $B%A%'%C%/:Q$_!#(B

$BCm0U;v9`(B:
$B!&(Bpatches/ $B$N2<$N%Q%C%A$,$$$/$D$+ITMW$K$J$C$F$$$^$9!#%Q%C%A$rEv$F$?$"$H$G(B
  size 0 $B$N%U%!%$%k$,$"$C$?$i!">C$7$F$d$C$F$/$@$5$$!#(B
$B!&(B${PREFIX}/lib/canna $B$N$J$$>uBV$G(B make install $B$7$F$/$@$5$$!#(B
  ($B$&$A$G$O!"(Bpkg_delete ja-Canna-3.2.2 $B$7$F$b$$$/$D$+%U%!%$%k$,;D$C$F(B
  $B$7$^$$$^$7$?(B)
$B!&(Bcannaserver $B$N(B lock file $B$,ITMW$K$J$C$F$$$^$9!#$^$?!"(Bcannaserver $B$N(B
  $B5/F0;~$K(B Canna.pid $B$r=q$-=P$7$F$/$l$k$N$+!"$$$^$$$AITL@$G$9!#(B
  $B$N$G!"(B/var/run/canna/ $B$O:n$i$J$$$h$&$K$7$F$"$j$^$9!#(B

To Do:
$B!&(B${PREFIX}/lib/canna/dic/{user,group}/$B$r(B @unexec $B$G6/@)E*$K(B rm -rf 
  $B$7$F$$$k$,!"$3$l$G$h$$(B?
  # $BIaCJ(B Wnn6 $B$J?M$J$N$G!"$3$N$X$s$h!<$o$+$i$s$N$G$9(B(^^;)
$B!&(BPLIST $B$N(B brush up (@dirrm $B$,B-$j$J$$$+$b(B)
$B!&%I%-%e%a%s%H$N%$%s%9%H!<%k(B ($B$G$b!"E:IU$N%I%-%e%a%s%H$O(B 3.2p2 $BMQ$N(B
  $B$b$N$N$h$&$J5$$,$9$k(B)
$B!&(Bpubdic+ $B$rAH$_9~$_$d$9$/$J$C$?$=$&$J$N$G!"$d$C$F$_$k$+(B? ($B>-Mh$N2]Bj(B)
 
> $B!t(B $BCf:,$5$s$O$*$=$i$/8fK;$7$$$H;W$$$^$9$N$G(B japanese/Canna $B$O9qEg$5$s$NC4Ev$K(B
> $B!t(B $B$J$k$H;W$$$^$9(B :)

$B$`$`(B(^^;)
Canna $B$O(B nvi-iso-2022-jp $B$r;H$&$H$-$/$i$$$7$+;H$C$F$J$$$N$G$9$,!"(B
$B$=$l$G$b$h$m$7$$$N$G$7$g$&$+(B? :-)

-- 
$B9qEg>f@8(B
Internet: kunishi@c.oka-pu.ac.jp, NIFTY SERVE: QYG06054
Homepage: http://psi.c.oka-pu.ac.jp/~kunishi/


----Next_Part(Fri_Aug_27_10:47:20_1999_663)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="canna.diff"

diff -ruN --exclude=CVS /usr/ports/japanese/Canna/Makefile ./Makefile
--- /usr/ports/japanese/Canna/Makefile	Wed Aug 25 22:28:16 1999
+++ ./Makefile	Fri Aug 27 00:44:52 1999
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	Canna
-# Version required:	3.2p2
+# Version required:	3.5b2
 # Date created:		3 November 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
@@ -7,19 +7,23 @@
 # $FreeBSD: ports/japanese/Canna/Makefile,v 1.27 1999/08/25 05:23:22 obrien Exp $
 #
 
-DISTNAME=	Canna32p2
-PKGNAME=	ja-Canna-3.2.2
+DISTNAME=	Canna35b2
+PKGNAME=	ja-Canna-3.5b2
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna32/
+MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna35/
+
+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
 
 MAINTAINER=	max@FreeBSD.ORG
 
 BUILD_DEPENDS=	imake:${PORTSDIR}/x11/XFree86
 
-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 \
@@ -28,7 +32,9 @@
 	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 cannalib.3 uilib.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
 
@@ -37,13 +43,9 @@
 .include <bsd.port.pre.mk>
 
 do-configure:
-	@(cd ${WRKSRC}; ${XMKMF})
+	@(cd ${WRKSRC}; ${SETENV} PREFIX=${PREFIX} ${XMKMF})
 	@${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/canna.sh.in \
 		>${WRKDIR}/canna.sh
-
-pre-install:
-	${MKDIR} /var/run/canna
-	${CHOWN} bin.bin /var/run/canna
 
 post-install:
 .if ${PORTOBJFORMAT} == "aout"
diff -ruN --exclude=CVS /usr/ports/japanese/Canna/files/canna.sh.in ./files/canna.sh.in
--- /usr/ports/japanese/Canna/files/canna.sh.in	Tue Jan  5 05:21:59 1999
+++ ./files/canna.sh.in	Fri Aug 27 00:44:52 1999
@@ -1,10 +1,8 @@
 #!/bin/sh
 canna=@PREFIX@/sbin/cannaserver
 if [ -f $canna ]; then
-	rm -f /var/run/canna/Canna.pid
-	mkdir -p /var/run/canna
 	touch /var/log/CANNA0msgs
-	chown bin:bin /var/run/canna /var/log/CANNA0msgs
+	chown bin:bin /var/log/CANNA0msgs
 	echo -n ' Canna'
 	$canna
 fi
diff -ruN --exclude=CVS /usr/ports/japanese/Canna/files/md5 ./files/md5
--- /usr/ports/japanese/Canna/files/md5	Fri Dec  4 00:54:11 1998
+++ ./files/md5	Fri Aug 27 00:44:52 1999
@@ -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 -ruN --exclude=CVS /usr/ports/japanese/Canna/patches/patch-aa ./patches/patch-aa
--- /usr/ports/japanese/Canna/patches/patch-aa	Fri Dec  4 00:54:13 1998
+++ ./patches/patch-aa	Thu Jan  1 09:00:00 1970
@@ -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 -ruN --exclude=CVS /usr/ports/japanese/Canna/patches/patch-ab ./patches/patch-ab
--- /usr/ports/japanese/Canna/patches/patch-ab	Fri Dec  4 00:54:13 1998
+++ ./patches/patch-ab	Thu Jan  1 09:00:00 1970
@@ -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 -ruN --exclude=CVS /usr/ports/japanese/Canna/patches/patch-ac ./patches/patch-ac
--- /usr/ports/japanese/Canna/patches/patch-ac	Fri Dec  4 00:54:13 1998
+++ ./patches/patch-ac	Fri Aug 27 00:44:52 1999
@@ -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: patch-ac,v 1.3 1997/10/17 15:59:04 itojun Exp $
+--- Canna.conf.orig	Thu Nov 28 19:27:01 1996
++++ Canna.conf	Thu Aug 26 20:14:37 1999
+@@ -128,14 +128,17 @@
+  * $Id: Canna.conf,v 3.13 1996/11/28 10:27:01 kon Exp $
   */
  
 -cannaBinDir = /usr/local/canna/bin
@@ -14,26 +14,27 @@
 +cannaSrvDir = ${PREFIX}/sbin
 +cannaLibDir = ${PREFIX}/lib/canna
 +cannaManDir = ${PREFIX}/man
++cannaEtcDir = ${PREFIX}/etc
 +cannaIncDir = ${PREFIX}/include/canna
 +libCannaDir = ${PREFIX}/lib
  
 -ErrDir  = /usr/spool/canna
--LockDir = /usr/spool/canna/lock
 +ErrDir  = /var/log
-+LockDir = /var/run/canna
++
++Access_File = ${cannaEtcDir}/hosts.canna
  
  wcharDefinition = -DCANNA_WCHAR
  Wlib =
-@@ -135,7 +135,7 @@
+@@ -148,7 +151,7 @@
  
  pointerIntegerDef =
  
 -cannaDsoRev = 1
 +cannaDsoRev = 1.0
- sharedLibExtension = so.$(cannaDsoRev)
- 
- /* $B0J2<$N#3$D$O(B root $B$K$J$i$J$$$G%$%s%9%H!<%k$9$k$N$G$"$l$P(B echo $B$K(B
-@@ -145,7 +145,7 @@
+     /* SunOS 4.x $B$r$*;H$$$NJ}$G(B shared object $B$rMxMQ$9$k>l9g$K$O(B
+             cannaDsoRev = 1.1
+     $B$H;XDj$7$F$/$@$5$$!#$^$?!"(BFreeBSD $B$rMxMQ$9$k>l9g$O!"(B
+@@ -167,7 +170,7 @@
  CHMOD = chmod
  
  /* $BF|K\8l%^%K%e%"%k$r;H$o$J$$$N$G$"$l$P%3%a%s%H%"%&%H(B */
@@ -42,33 +43,35 @@
  
  /* locale $B%G%#%l%/%H%j$r;}$C$F$$$k>l9g$O0J2<$r5-=R$9$k(B */
  /* #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::									@@\
+@@ -304,6 +307,7 @@
+ 	(echo "s%@(cannaBinDir)%$(cannaBinDir)%g"; \			@@\
+ 	 echo "s%@(cannaLibDir)%$(cannaLibDir)%g"; \			@@\
+ 	 echo "s%@(cannaIncDir)%$(cannaIncDir)%g"; \			@@\
++	 echo "s%@(cannaEtcDir)%$(cannaEtcDir)%g"; \			@@\
+ 	 echo "s%@(ErrDir)%$(ErrDir)%g") > $(MANUALSED)			@@\
+ clean::									@@\
+ 	$(RM) $(MANUALSED)
+@@ -317,6 +321,7 @@
+ 	echo "s%@(cannaBinDir)%$(cannaBinDir)%g" > $(MANUALSED)		@@\
+ 	echo "s%@(cannaLibDir)%$(cannaLibDir)%g" >> $(MANUALSED)	@@\
+ 	echo "s%@(cannaIncDir)%$(cannaIncDir)%g" >> $(MANUALSED)	@@\
++	echo "s%@(cannaEtcDir)%$(cannaEtcDir)%g" >> $(MANUALSED)	@@\
+ 	echo "s%@(ErrDir)%$(ErrDir)%g" >> $(MANUALSED)			@@\
+ clean::									@@\
+ 	$(RM) $(MANUALSED)
+@@ -417,6 +422,7 @@
+ 	echo "/* for cannaserver */" > junk				@@\
+ 	echo "#define DICHOME '$(DicDir)'" >> junk			@@\
+ 	echo "#define ERRDIR '$(ErrDir)'" >> junk			@@\
++	echo "#define ACCESS_FILE \"$(Access_File)\"";	\		@@\
+ 	echo "#define USE_INET_SOCKET" >> junk				@@\
+ 	echo "/* for lib/RKC */" >> junk				@@\
+ 	echo "#define JAPANESE_LOCALE '$(JapaneseLocale)'" >> junk	@@\
+@@ -439,6 +445,7 @@
+ 	(echo "/* for cannaserver */";\					@@\
+ 	 echo "#define DICHOME \"$(DicDir)\"";  \			@@\
+ 	 echo "#define ERRDIR \"$(ErrDir)\"";   \			@@\
++	 echo "#define ACCESS_FILE \"$(Access_File)\"";	\		@@\
+ 	 echo "#define USE_UNIX_SOCKET"; \                              @@\
+ 	 echo "#define USE_INET_SOCKET"; \                              @@\
+ 	 echo "/* for lib/RKC */";\					@@\
diff -ruN --exclude=CVS /usr/ports/japanese/Canna/patches/patch-ad ./patches/patch-ad
--- /usr/ports/japanese/Canna/patches/patch-ad	Thu Sep 19 21:08:28 1996
+++ ./patches/patch-ad	Thu Jan  1 09:00:00 1970
@@ -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 -ruN --exclude=CVS /usr/ports/japanese/Canna/patches/patch-ae ./patches/patch-ae
--- /usr/ports/japanese/Canna/patches/patch-ae	Fri Dec  4 00:54:13 1998
+++ ./patches/patch-ae	Thu Jan  1 09:00:00 1970
@@ -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 -ruN --exclude=CVS /usr/ports/japanese/Canna/patches/patch-af ./patches/patch-af
--- /usr/ports/japanese/Canna/patches/patch-af	Thu Jan  1 09:00:00 1970
+++ ./patches/patch-af	Fri Aug 27 00:44:52 1999
@@ -0,0 +1,12 @@
+--- server/misc.c.orig	Wed Nov 27 16:30:30 1996
++++ server/misc.c	Thu Aug 26 19:42:03 1999
+@@ -65,7 +65,9 @@
+ #define ERRFILE     "CANNA"
+ #define ERRFILE2    "msgs"
+ #define ERRSIZE     64
++#ifndef ACCESS_FILE
+ #define ACCESS_FILE "/etc/hosts.canna"
++#endif
+ 
+ extern void CheckConnections();
+ 
diff -ruN --exclude=CVS /usr/ports/japanese/Canna/patches/patch-ag ./patches/patch-ag
--- /usr/ports/japanese/Canna/patches/patch-ag	Thu Jan  1 09:00:00 1970
+++ ./patches/patch-ag	Fri Aug 27 00:44:52 1999
@@ -0,0 +1,53 @@
+--- server/server.man.orig	Thu Jan 27 20:12:12 1994
++++ server/server.man	Thu Aug 26 20:45:58 1999
+@@ -30,25 +30,12 @@
+ cannaserver provides the Kana-Kanji conversion service.  Usually all
+ users on the network can access cannaserver(1M).  The scope of
+ accessing sources (hosts, users) can be restricted using the
+-/etc/hosts.canna file.
++@(cannaEtcDir)/hosts.canna file.
+ .PP
+ After starting, cannaserver(1M) immediately forks and enters the
+ background process.  Thus, you do not need to use '&' to set the
+ background process explicitly.
+ .PP
+-When starting, cannaserver(1M) creates the lock file
+-@(LockDir)/@(LockFile) to avoid its duplicate starting.  The
+-lock file is deleted automatically at the end of cannaserver(1M) if no
+-trouble occurs.  The lock file may exist although cannaserver(1M) is
+-not in operation (because cannaserver(1M) terminates abnormally, for
+-example).  In this case, delete the file manually.
+-.PP
+-When starting, cannaserver(1M) examines
+-@(cannaLibDir)/dic/premountdics and mounts the dictionaries described
+-there before processing.  This enables a quick response to return
+-after a request to use a premounted dictionary is received from a
+-client.
+-.PP
+ Specification of the dictionary to use is determined by referencing
+ the dics.dir file of the dictionary directory according to the
+ request from the client.
+@@ -56,21 +43,17 @@
+ .IP "\fIddpath\fP" 12
+ Specifies the directory that contains the dictionary.
+ .IP "\-l \fIn\fP" 12
+-Outputs the cannaserver(1M) log to /tmp/canna.log.  n (1 to 5)
++Outputs the cannaserver(1M) log to @(ErrDir)/canna.log.  n (1 to 5)
+ specifies the log level.
+ .IP "\-d" 12
+ Starts cannaserver(1M) in debug mode.  It is executed as the
+ foreground process.  Log data at log level 5 is output to the standard
+ output.
+ .SH "FILES"
+-.IP "@(LockDir)/@(LockFile)" 36
+-Lock file
+ .IP "@(cannaLibDir)/dic/*/dics.dir" 36
+ Dictionary directory
+-.IP "/etc/hosts.canna" 36
++.IP "@(cannaEtcDir)/hosts.canna" 36
+ Access control file
+-.IP "@(cannaLibDir)/dic/premountdics" 36
+-Premount dictionary list
+ .SH "SEE ALSO"
+ .PP
+ cannakill(1M), cannastat(1), cannacheck(1)
diff -ruN --exclude=CVS /usr/ports/japanese/Canna/patches/patch-ah ./patches/patch-ah
--- /usr/ports/japanese/Canna/patches/patch-ah	Thu Jan  1 09:00:00 1970
+++ ./patches/patch-ah	Fri Aug 27 00:44:52 1999
@@ -0,0 +1,52 @@
+--- server/server.jmn.orig	Thu Jan 27 20:12:10 1994
++++ server/server.jmn	Thu Aug 26 20:44:27 1999
+@@ -32,31 +32,20 @@
+ $B$+$J4A;zJQ49%5!<%S%9$rDs6!$7$^$9!#DL>o(B cannaserver(1M)$B$O(B/etc/rc$B%U%!%$%k(B
+ $B$h$j5/F0$5$l%f!<%6$K$h$j5/F0$5$l$k$3$H$O$"$j$^$;$s!#(B
+ $B$^$?!"(Bcannaserver(1M)$B$ODL>o!"%M%C%H%o!<%/>e(B
+-$B$N$9$Y$F$N%f!<%6$,%"%/%;%9$9$k$3$H$,2DG=$G$9$,!$(B/etc/hosts.canna $B%U%!%$(B
++$B$N$9$Y$F$N%f!<%6$,%"%/%;%9$9$k$3$H$,2DG=$G$9$,!$(B@(cannaEtcDir)/etc/hosts.canna $B%U%!%$(B
+ $B%k$K$h$j!$%"%/%;%9$G$-$k%[%9%H!$%f!<%6$r@)8f$9$k$3$H$b$G$-$^$9!#(B
+ .PP
+ cannaserver(1M) $B$O5/F0$9$k$HB(:B$K%U%)!<%/$7%P%C%/%0%i%&%s%I%W%m%;%9(B
+ $B$H$J$j$^$9!#$7$?$,$C$F(B``&''$B$K$h$jL@<(E*$K%P%C%/%0%i%&%s%I%W%m%;%9$K$9(B
+ $B$kI,MW$O$"$j$^$;$s!#(B
+ .PP
+-cannaserver(1M) $B$O5/F0;~$K(B cannaserver(1M) $B$N=EJ#$7$?5/F0$rHr$1$k$?$a$K%m%C(B
+-$B%/%U%!%$%k(B @(LockDir)/@(LockFile) $B$r:n@.$7$^$9!#%m%C%/%U%!(B
+-$B%$%k$O(B cannaserver(1M) $B=*N;;~$K<+F0E*$K>C5n$5$l$^$9$,!$(Bcannaserver(1M) $B$,0[(B
+-$B>o=*N;$9$k$J$I$N860x$G(B cannaserver(1M) $B$,F0$$$F$$$J$$$K$b$+$+$o$i$:%m%C(B
+-$B%/%U%!%$%k$,B8:_$9$k>l9g$K$O<jF0$G%m%C%/%U%!%$%k$r:o=|$7$F2<$5$$!#(B
+-.PP
+-cannaserver(1M) $B$O5/F0;~$K(B @(cannaLibDir)/dic/premountdics $B$rD4$Y$F$=(B
+-$B$3$K5-=R$7$F$"$k<-=q$r$"$i$+$8$a%^%&%s%H$7$F$*$-$^$9!#$3$l$K$h$j%W%j%^(B
+-$B%&%s%H$7$F$"$k<-=q$N;HMQMW5a$,%/%i%$%"%s%H$+$i$"$,$C$F$-$?$H$-$K?WB.$K(B
+-$B1~$8$k$3$H$,2DG=$H$J$j$^$9!#(B
+-.PP
+ $B;HMQ$9$k<-=q$N;XDj$O%/%i%$%"%s%H$+$i$NMW5a$K$7$?$,$C$F<-=q%G%#%l(B
+ $B%/%H%j$N(B dics.dir $B%U%!%$%k$r;2>H$9$k$3$H$K$h$j7h$a$i$l$^$9!#(B 
+ .SH "$B%*%W%7%g%s(B"
+ .IP "\fIddpath\fP" 12
+ $B<-=q$NB8:_$9$k%G%#%l%/%H%j$r;XDj$7$^$9!#(B
+ .IP "\-l \fIn\fP" 12
+-cannaserver(1M) $B$N%m%0$r(B /tmp/canna.log $B$K=PNO$7$^$9!#(Bn $B$G%m%0(B
++cannaserver(1M) $B$N%m%0$r(B @(ErrDir)/canna.log $B$K=PNO$7$^$9!#(Bn $B$G%m%0(B
+ $B$N%l%Y%k$r@_Dj$7$^$9!#%m%0$N%l%Y%k$H$7$F(B 1$B!A(B5 $B$N?t;z$r;XDj(B
+ $B$G$-$^$9!#(B
+ .IP "\-d" 12
+@@ -64,14 +53,10 @@
+ $B%"%0%i%s%I%W%m%;%9$H$7$F<B9T$5$l!$%m%0%l%Y%k(B 5 $B$N%m%0$,I8=`(B
+ $B%(%i!<=PNO$K=PNO$5$l$^$9!#(B
+ .SH "$B4XO"%U%!%$%k(B"
+-.IP "@(LockDir)/@(LockFile)" 36
+-$B%m%C%/%U%!%$%k(B
+ .IP "@(cannaLibDir)/dic/*/dics.dir" 36
+ $B<-=qL\O?(B
+-.IP "/etc/hosts.canna" 36
++.IP "@(cannaEtcDir)/etc/hosts.canna" 36
+ $B%"%/%;%9@)8f%U%!%$%k(B
+-.IP "@(cannaLibDir)/dic/premountdics" 36
+-$B%W%j%^%&%s%H<-=q%j%9%H(B
+ .SH "$B4XO"%3%^%s%I(B"
+ .PP
+ cannakill(1M), cannastat(1), cannacheck(1)
diff -ruN --exclude=CVS /usr/ports/japanese/Canna/pkg/PLIST ./pkg/PLIST
--- /usr/ports/japanese/Canna/pkg/PLIST	Sat Jul 10 13:52:12 1999
+++ ./pkg/PLIST	Fri Aug 27 02:08:35 1999
@@ -1,13 +1,11 @@
 bin/addwords
 bin/canlisp
 bin/cannacheck
+bin/cannakill
 bin/cannastat
-bin/canvert
 bin/catdic
-bin/chmoddic
 bin/cpdic
 bin/crfreq
-bin/crrdic
 bin/crxdic
 bin/crxgram
 bin/cshost
@@ -16,11 +14,9 @@
 bin/dicar
 bin/dpbindic
 bin/dpromdic
-bin/dpwdic
 bin/dpxdic
 bin/forcpp
 bin/forsort
-bin/itoc
 bin/kpdic
 bin/lsdic
 bin/mergeword
@@ -38,75 +34,76 @@
 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
+@exec mkdir %D/lib/canna/dic/group
+@exec chmod 775 %D/lib/canna/dic/group
+@exec chown bin:bin %D/lib/canna/dic/group
+@unexec rm -rf %D/lib/canna/dic/group
+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
+@exec mkdir %D/lib/canna/dic/user
+@exec chmod 775 %D/lib/canna/dic/user
+@exec chown bin:bin %D/lib/canna/dic/user
+@unexec rm -rf %D/lib/canna/dic/user
+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
@@ -121,14 +118,13 @@
 lib/libcanna16.so.1
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-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
 @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
-@unexec /bin/rmdir /var/run/canna
+@dirrm lib/canna/dic/canna
+@dirrm lib/canna/dic
+@dirrm lib/canna/sample/src
+@dirrm lib/canna/sample
+@dirrm lib/canna

----Next_Part(Fri_Aug_27_10:47:20_1999_663)----
