Update version.

6 files changed, 561 insertions, 2 deletions

diff --git a/app-i18n/canna/ChangeLog b/app-i18n/canna/ChangeLog
index 93a7ec704fb3..cb606532f7a1 100644
--- a/app-i18n/canna/ChangeLog
+++ b/app-i18n/canna/ChangeLog
@@ -1,8 +1,17 @@
 # ChangeLog for app-i18n/canna
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.4 2002/10/10 01:15:02 stubear Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.5 2002/11/16 05:35:58 nakano Exp $
 
-*cana-3.5_beta2_r2 (22 Jul 2002)
+*canna-3.6 (16 Nov 2002)
+
+  16 Nov 2002; Masatomo Nakano <nakano@gentoo.org> canna-3.6.ebuild
+	files/canna-3.6-gentoo.diff files/canna.initd files/canna.confd
+	digest-canna-3.6 ChangeLog :
+
+  New version.
+	Thanks to: matsuu@7501.net (MATSUU Takuto)
+
+*canna-3.5_beta2_r2 (22 Jul 2002)
 
   22 Jul 2002; Stuart Bouyer <stubear@gentoo.org> 
   files/canna-3.5_beta-r2/canna.initd ChangeLog :
diff --git a/app-i18n/canna/canna-3.6.ebuild b/app-i18n/canna/canna-3.6.ebuild
new file mode 100644
index 000000000000..f48857da6dab
--- /dev/null
+++ b/app-i18n/canna/canna-3.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.6.ebuild,v 1.1 2002/11/16 05:35:58 nakano Exp $
+
+MY_P="Canna36"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A client-server based Kana-Kanji conversion system"
+HOMEPAGE="http://canna.sourceforge.jp/"
+KEYWORDS="~x86"
+LICENSE="as-is"
+SLOT="0"
+IUSE=""
+SRC_URI="http://downloads.sourceforge.jp/canna/1425/${MY_P}.tar.gz"
+DEPEND="virtual/glibc"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${PF}-gentoo.diff || die
+}
+
+src_compile() {
+
+	xmkmf || die
+	make Makefiles
+	# make includes
+	make canna || die
+}
+
+src_install () {
+
+	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install.man || die
+	dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
+	exeinto /etc/init.d ; newexe ${FILESDIR}/canna.initd canna
+	insinto /etc/conf.d ; newins ${FILESDIR}/canna.confd canna
+}
diff --git a/app-i18n/canna/files/canna-3.6-gentoo.diff b/app-i18n/canna/files/canna-3.6-gentoo.diff
new file mode 100644
index 000000000000..11b9e77219f4
--- /dev/null
+++ b/app-i18n/canna/files/canna-3.6-gentoo.diff
@@ -0,0 +1,487 @@
+diff -Naur Canna36.orig/Canna.conf Canna36/Canna.conf
+--- Canna36.orig/Canna.conf	2002-10-24 23:37:25.000000000 +0900
++++ Canna36/Canna.conf	2002-11-02 13:49:30.000000000 +0900
+@@ -132,20 +132,26 @@
+ 
+ /* rootにならずにインストールする時はこれを定義して下さい */
+ /* #define InstallAsUser */
+-cannaPrefix = /usr/local/canna
++cannaPrefix = /usr
+ cannaExecPrefix = $(cannaPrefix)
+ cannaBinDir = $(cannaExecPrefix)/bin
+-cannaSrvDir = $(cannaExecPrefix)/bin
+-cannaLibDir = $(cannaPrefix)/lib
+-cannaManDir = $(cannaPrefix)/man
++cannaSrvDir = $(cannaExecPrefix)/sbin
++cannaLibDir = /etc/canna
++cannaEtcDir = /etc/canna
++cannaManDir = $(cannaPrefix)/share/man
+ cannaIncDir = $(cannaPrefix)/include/canna
++cannaDocDir = $(cannaPrefix)/share/doc/canna-3.6
++cannaShareDir = $(cannaPrefix)/share/canna
++
++LockDir = /tmp/.iroha_unix
++LockFile = IROHA 
+ 
+ #ifdef InstallAsUser
+ libCannaDir = $(cannaExecPrefix)/lib
+ ErrDir  = $(cannaExecPrefix)/log
+ #else
+ libCannaDir = /usr/lib
+-ErrDir  = /usr/spool/canna
++ErrDir  = /var/log/canna
+ #endif
+ 
+ /* 次の3行は変更しないでください */
+@@ -164,7 +170,7 @@
+ 
+ pointerIntegerDef =
+ 
+-cannaDsoRev = 1
++cannaDsoRev = 1.0
+     /* SunOS 4.x をお使いの方で shared object を利用する場合には
+             cannaDsoRev = 1.1
+     と指定してください。また、FreeBSD を利用する場合は、
+@@ -231,7 +237,7 @@
+ /* #define UseInstalledLibCanna YES */
+ #define UseInstalledLibCanna NO
+ 
+-DicDir   = $(cannaLibDir)/dic
++DicDir   = /var/lib/canna/dic
+ 
+ #ifdef NeXT
+ #define NO_X_ENV
+@@ -348,6 +354,9 @@
+ 	 echo "s%@(UnixSockDir)%$(UnixSockDir)%g"; \			@@\
+ 	 echo "s%@(UnixSockName)%$(UnixSockName)%g"; \			@@\
+ 	 echo "s%@(AccessFile)%$(AccessFile)%g"; \			@@\
++	 echo "s%@(DicDir)%$(DicDir)%g"; \				@@\
++	 echo "s%@(LockDir)%$(LockDir)%g"; \				@@\
++	 echo "s%@(LockFile)%$(LockFile)%g"; \				@@\
+ 	 echo "s%@(ErrDir)%$(ErrDir)%g") > $(MANUALSED)			@@\
+ clean::									@@\
+ 	$(RM) $(MANUALSED)
+@@ -364,11 +373,16 @@
+ 	echo "s%@(UnixSockDir)%$(UnixSockDir)%g" >> $(MANUALSED)	@@\
+ 	echo "s%@(UnixSockName)%$(UnixSockName)%g" >> $(MANUALSED)	@@\
+ 	echo "s%@(AccessFile)%$(AccessFile)%g" >> $(MANUALSED)		@@\
++	echo "s%@(DicDir)%$(DicDir)%g" >> $(MANUALSED)			@@\
++	echo "s%@(LockDir)%$(LockDir)%g" >> $(MANUALSED)		@@\
++	echo "s%@(LockFile)%$(LockFile)%g" >> $(MANUALSED)		@@\
+ 	echo "s%@(ErrDir)%$(ErrDir)%g" >> $(MANUALSED)			@@\
+ clean::									@@\
+ 	$(RM) $(MANUALSED)
+ #endif
+ 
++MANSUFFIX = 1 /* man section for user programs */
++
+ #ifdef InstallManPageLong
+ #undef InstallManPageLong
+ #endif
+@@ -401,6 +415,8 @@
+ #define	InstallManPage(file,destdir)					@@\
+ InstallManPageLong(file,destdir,file)
+ 
++LIBMANSUFFIX = 3 /* man section for libraries */
++
+ #ifdef InstallLibManPageLong
+ #undef InstallLibManPageLong
+ #endif
+@@ -527,6 +543,7 @@
+ 	echo "#define CANNAHOSTFILE '$(cannaLibDir)/cannahost'" >> junk	@@\
+ 	echo "/* for lib/canna */" >> junk				@@\
+ 	echo "#define CANNALIBDIR '$(cannaLibDir)'" >> junk		@@\
++	echo "#define CANNASHAREDIR '$(cannaShareDir)'" >> junk		@@\
+ 	echo "/* for scripts */" >> junk				@@\
+ 	echo "#define CANNABINDIR $(cannaBinDir)" >> junk		@@\
+ 	echo "/* others */" >> junk					@@\
+@@ -553,6 +570,7 @@
+ 	 echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\	@@\
+ 	 echo "/* for lib/canna */";\					@@\
+ 	 echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \		@@\
++	 echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \		@@\
+ 	 echo "/* for scripts */";\					@@\
+ 	 echo "#define CANNABINDIR $(cannaBinDir)"; \			@@\
+ 	 echo "/* others */";\					@@\
+diff -Naur Canna36.orig/cmd/catdic/Imakefile Canna36/cmd/catdic/Imakefile
+--- Canna36.orig/cmd/catdic/Imakefile	2002-10-20 13:10:25.000000000 +0900
++++ Canna36/cmd/catdic/Imakefile	2002-10-28 16:55:23.000000000 +0900
+@@ -1,6 +1,9 @@
+ /* $Id: canna-3.6-gentoo.diff,v 1.1 2002/11/16 05:35:58 nakano Exp $ */
+ #include "../../Canna.conf"
+ 
++/* gentoo: use hard links so that the image can be merged correctly */
++              LN = ln
++
+        CANNAROOT = ../..
+         CANNASRC = $(CANNAROOT)/lib/canna
+           RKCSRC = $(CANNAROOT)/lib/RKC
+@@ -53,45 +56,45 @@
+ 
+ #if defined(__EMX__) || defined(__CYGWIN32__)
+ install::
+-	$(RM) $(cannaBinDir)/cpdic.exe
+-	$(RM) $(cannaBinDir)/lsdic.exe
+-	$(RM) $(cannaBinDir)/mkdic.exe
+-	$(RM) $(cannaBinDir)/mvdic.exe
+-	$(RM) $(cannaBinDir)/rmdic.exe
+-	$(RM) $(cannaBinDir)/syncdic.exe
+-	$(RM) $(cannaBinDir)/chmoddic.exe
+-	$(RM) $(cannaBinDir)/addwords.exe
+-	$(RM) $(cannaBinDir)/delwords.exe
+-	$(RM) $(cannaBinDir)/cannakill.exe
+-	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/cpdic.exe
+-	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/lsdic.exe
+-	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/mkdic.exe
+-	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/mvdic.exe
+-	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/rmdic.exe
+-	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/syncdic.exe
+-	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/chmoddic.exe
+-	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/addwords.exe
+-	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/delwords.exe
+-	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/cannakill.exe
++	$(RM) $(DESTDIR)$(cannaBinDir)/cpdic.exe
++	$(RM) $(DESTDIR)$(cannaBinDir)/lsdic.exe
++	$(RM) $(DESTDIR)$(cannaBinDir)/mkdic.exe
++	$(RM) $(DESTDIR)$(cannaBinDir)/mvdic.exe
++	$(RM) $(DESTDIR)$(cannaBinDir)/rmdic.exe
++	$(RM) $(DESTDIR)$(cannaBinDir)/syncdic.exe
++	$(RM) $(DESTDIR)$(cannaBinDir)/chmoddic.exe
++	$(RM) $(DESTDIR)$(cannaBinDir)/addwords.exe
++	$(RM) $(DESTDIR)$(cannaBinDir)/delwords.exe
++	$(RM) $(DESTDIR)$(cannaBinDir)/cannakill.exe
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/cpdic.exe
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/lsdic.exe
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/mkdic.exe
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/mvdic.exe
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/rmdic.exe
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/syncdic.exe
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/chmoddic.exe
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/addwords.exe
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/delwords.exe
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/cannakill.exe
+ #else
+ install::
+-	$(RM) $(cannaBinDir)/cpdic
+-	$(RM) $(cannaBinDir)/lsdic
+-	$(RM) $(cannaBinDir)/mkdic
+-	$(RM) $(cannaBinDir)/mvdic
+-	$(RM) $(cannaBinDir)/rmdic
+-	$(RM) $(cannaBinDir)/syncdic
+-	$(RM) $(cannaBinDir)/chmoddic
+-	$(RM) $(cannaBinDir)/addwords
+-	$(RM) $(cannaBinDir)/delwords
+-	$(RM) $(cannaBinDir)/cannakill
+-	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cpdic
+-	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/lsdic
+-	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mkdic
+-	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mvdic
+-	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/rmdic
+-	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/syncdic
+-	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/addwords
+-	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/delwords
+-	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cannakill
++	$(RM) $(DESTDIR)$(cannaBinDir)/cpdic
++	$(RM) $(DESTDIR)$(cannaBinDir)/lsdic
++	$(RM) $(DESTDIR)$(cannaBinDir)/mkdic
++	$(RM) $(DESTDIR)$(cannaBinDir)/mvdic
++	$(RM) $(DESTDIR)$(cannaBinDir)/rmdic
++	$(RM) $(DESTDIR)$(cannaBinDir)/syncdic
++	$(RM) $(DESTDIR)$(cannaBinDir)/chmoddic
++	$(RM) $(DESTDIR)$(cannaBinDir)/addwords
++	$(RM) $(DESTDIR)$(cannaBinDir)/delwords
++	$(RM) $(DESTDIR)$(cannaBinDir)/cannakill
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/cpdic
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/lsdic
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/mkdic
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/mvdic
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/rmdic
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/syncdic
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/addwords
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/delwords
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/cannakill
+ #endif
+diff -Naur Canna36.orig/cmd/catdic/cannakill.man Canna36/cmd/catdic/cannakill.man
+--- Canna36.orig/cmd/catdic/cannakill.man	2002-10-23 00:19:13.000000000 +0900
++++ Canna36/cmd/catdic/cannakill.man	2002-11-02 12:51:57.000000000 +0900
+@@ -29,14 +29,14 @@
+ .SH "DESCRIPTION"
+ .PP
+ cannakill terminates operation of Kana-Kanji conversion server
+-cannaserver(1M).  This causes the server to delete the socket and
++cannaserver(1).  This causes the server to delete the socket and
+ close all open dictionaries before terminating its processing.
+ .PP
+-The user who has started cannaserver(1M) or the super user can only
+-use cannakill(1M) to terminate operation of canncannaer.
++The user who has started cannaserver(1) or the super user can only
++use cannakill(1) to terminate operation of canncannaer.
+ .SH "FILES"
+ .IP "@(UnixSockDir)/@(UnixSockName)[:num]" 36
+ Socket
+ .SH "SEE ALSO"
+ .PP
+-cannaserver(1M), cannastat(1), cannacheck(1)
++cannaserver(1), cannastat(1), cannacheck(1)
+diff -Naur Canna36.orig/cmd/catdic/catdic.man Canna36/cmd/catdic/catdic.man
+--- Canna36.orig/cmd/catdic/catdic.man	2002-10-19 17:27:33.000000000 +0900
++++ Canna36/cmd/catdic/catdic.man	2002-11-02 12:52:34.000000000 +0900
+@@ -30,7 +30,7 @@
+ catdic downloads a dictionary file to the current directory. 
+ The file downloaded is a dictionary file the dictionary name of which is
+ \fIremote-dic\fP.  It is in the user dictionary directory of the machine 
+-on which \fIcannaserver\fP(1M) is in operation.  (Hereafter, this machine 
++on which \fIcannaserver\fP(1) is in operation.  (Hereafter, this machine 
+ is called the remote host.)
+ .SH "OPTIONS"
+ .IP "\-cs \fIcanna-server\fP (or \-cannaserver \fIcanna-server\fP)" 12
+@@ -61,4 +61,4 @@
+ file ``test2.t''.
+ .SH "SEE ALSO"
+ .PP
+-cannaserver(1M), lsdic(1), mkdic(1)
++cannaserver(1), lsdic(1), mkdic(1)
+diff -Naur Canna36.orig/cmd/catdic/mkdic.man Canna36/cmd/catdic/mkdic.man
+--- Canna36.orig/cmd/catdic/mkdic.man	2002-10-19 17:27:33.000000000 +0900
++++ Canna36/cmd/catdic/mkdic.man	2002-11-02 12:53:11.000000000 +0900
+@@ -28,7 +28,7 @@
+ .SH "DESCRIPTION"
+ .PP
+ mkdic creates user dictionary named \fIremote-dic\fP in the user dictionary 
+-directory of the remote host, on which \fIcannaserver\fP(1M) is in operation. 
++directory of the remote host, on which \fIcannaserver\fP(1) is in operation. 
+ Dictionary file name \fIremote-dic\fP is assigned to this file at this time.
+ .PP
+ If the \- and \-l option isn't specified, mkdic creates an empty dictionary.
+@@ -96,4 +96,4 @@
+ user1.t is a dictionary file name generated automatically by the system.
+ .SH "SEE ALSO"
+ .PP
+-catdic(1), cannaserver(1M), lsdic(1)
++catdic(1), cannaserver(1), lsdic(1)
+diff -Naur Canna36.orig/cmd/cshost/cshost.man Canna36/cmd/cshost/cshost.man
+--- Canna36.orig/cmd/cshost/cshost.man	2002-10-19 17:27:34.000000000 +0900
++++ Canna36/cmd/cshost/cshost.man	2002-11-02 12:55:37.000000000 +0900
+@@ -6,9 +6,9 @@
+ .SH "DESCRIPTION"
+ .PP
+ the \fIcshost\fP(1) prints the list of machines that are allowed to make
+-connections to \fIcannaserver\fP(1M).
++connections to \fIcannaserver\fP(1).
+ .PP
+-\fIcannaserver\fP(1M) allows network connections only from programs
++\fIcannaserver\fP(1) allows network connections only from programs
+ running on the same machine or machines listed in the file
+ /etc/hosts.canna.  If /etc/hosts.canna does not exist or the file
+ is empty, access is granted to everyone.
+diff -Naur Canna36.orig/dic/ideo/grammar/Imakefile Canna36/dic/ideo/grammar/Imakefile
+--- Canna36.orig/dic/ideo/grammar/Imakefile	2002-10-19 17:27:34.000000000 +0900
++++ Canna36/dic/ideo/grammar/Imakefile	2002-10-28 16:53:28.000000000 +0900
+@@ -85,6 +85,6 @@
+ InstallMultipleFlags($(ALLDIC),$(CANNADICDIR),-m 0664 $(cannaOwnerGroup))
+ 
+ install::
+-	$(CHGRP) $(cannaGroup) $(CANNADICDIR)
+-	$(CHOWN) $(cannaOwner) $(CANNADICDIR)
+-	$(CHMOD) ug+w $(CANNADICDIR)
++	$(CHGRP) $(cannaGroup) $(DESTDIR)$(CANNADICDIR)
++	$(CHOWN) $(cannaOwner) $(DESTDIR)$(CANNADICDIR)
++	$(CHMOD) ug+w $(DESTDIR)$(CANNADICDIR)
+diff -Naur Canna36.orig/dic/ideo/words/Imakefile Canna36/dic/ideo/words/Imakefile
+--- Canna36.orig/dic/ideo/words/Imakefile	2002-10-20 13:10:29.000000000 +0900
++++ Canna36/dic/ideo/words/Imakefile	2002-10-28 16:53:28.000000000 +0900
+@@ -69,13 +69,13 @@
+ #endif
+ 
+ install::
+-	$(CHGRP) $(cannaGroup) $(CANNADICDIR)
+-	$(CHOWN) $(cannaOwner) $(CANNADICDIR)
+-	$(CHMOD) ug+w $(CANNADICDIR)
+-	$(CHGRP) $(cannaGroup) $(DicDir)
+-	$(CHOWN) $(cannaOwner) $(DicDir)
+-	$(CHMOD) ug+w $(DicDir)
+-	$(CHMOD) -w $(CANNADICDIR)/dics.dir
++	$(CHGRP) $(cannaGroup) $(DESTDIR)$(CANNADICDIR)
++	$(CHOWN) $(cannaOwner) $(DESTDIR)$(CANNADICDIR)
++	$(CHMOD) ug+w $(DESTDIR)$(CANNADICDIR)
++	$(CHGRP) $(cannaGroup) $(DESTDIR)$(DicDir)
++	$(CHOWN) $(cannaOwner) $(DESTDIR)$(DicDir)
++	$(CHMOD) ug+w $(DESTDIR)$(DicDir)
++	$(CHMOD) -w $(DESTDIR)$(CANNADICDIR)/dics.dir
+ 
+ #ifndef USE_OBSOLETE_STYLE_FILENAME
+ InstallNamedNonExec(necgaiji.t,necgaiji.ctd,$(CANNADICDIR))
+diff -Naur Canna36.orig/dic/phono/Imakefile Canna36/dic/phono/Imakefile
+--- Canna36.orig/dic/phono/Imakefile	2002-10-19 17:27:40.000000000 +0900
++++ Canna36/dic/phono/Imakefile	2002-11-02 14:07:15.000000000 +0900
+@@ -27,9 +27,10 @@
+ 
+        ROMAJI_DIC_DEF = -DSHIFT
+ 
+-               DICDIR = $(cannaLibDir)/dic
+-            SAMPLEDIR = $(cannaLibDir)/sample
+-         SAMPLESRCDIR = $(cannaLibDir)/sample/src
++               DICDIR = $(DicDir)
++        CANNASHAREDIR = $(cannaShareDir)
++            SAMPLEDIR = $(cannaDocDir)/sample
++         SAMPLESRCDIR = $(cannaDocDir)/sample/src
+ 
+     KPDEF = default.kpdef jdaemon.kpdef just.kpdef kaisoku.kpdef kana.kpdef \
+             lan5.kpdef matsu.kpdef newjis.kpdef romaji.kpdef sokuon.kpdef \
+@@ -69,7 +70,7 @@
+ MakeDirectories(install,$(DICDIR))
+ MakeDirectories(install,$(SAMPLESRCDIR))
+ 
+-InstallMultiple($(ROMKANA_TABLES),$(DICDIR))
++InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR))
+ 
+ #ifdef USE_OBSOLETE_STYLE_FILENAME
+ InstallNonExec(default.kpdef,$(SAMPLESRCDIR))
+diff -Naur Canna36.orig/lib/canna/Imakefile Canna36/lib/canna/Imakefile
+--- Canna36.orig/lib/canna/Imakefile	2002-10-20 17:20:33.000000000 +0900
++++ Canna36/lib/canna/Imakefile	2002-11-02 13:10:14.000000000 +0900
+@@ -116,8 +116,8 @@
+ #endif /* ProjectX */
+ #endif /* DoSharedLib */
+ 
+-sglobal.h: GSYM.awk globnames
+-	awk -f GSYM.awk < globnames > $@
++includes::
++	awk -f GSYM.awk < globnames > sglobal.h
+ 
+ clean::
+ 	$(RM) y.tab.h y.tab.c lex.yy.c gram.h gram.c lex.c sglobal.h
+diff -Naur Canna36.orig/lib/canna/ebind.c Canna36/lib/canna/ebind.c
+--- Canna36.orig/lib/canna/ebind.c	2002-10-19 17:27:48.000000000 +0900
++++ Canna36/lib/canna/ebind.c	2002-11-02 13:12:33.000000000 +0900
+@@ -205,9 +205,9 @@
+     }
+   }
+ 
+-  inbuf[0] = (wchar_t)buffer_return[0];
++  inbuf[0] = (wchar_t)(buffer_return[0] & 0xff);
+   for (i = 1 ; i < nbytes ; i++) {
+-    inbuf[i] = (wchar_t)buffer_return[i];
++    inbuf[i] = (wchar_t)(buffer_return[i] & 0xff);
+   }
+   ch = buffer_return[0] & 0xff;
+   ret = XwcLookupKanji2(dpy, win, inbuf, inbufsize, nbytes, functionalChar,
+diff -Naur Canna36.orig/lib/canna/romaji.c Canna36/lib/canna/romaji.c
+--- Canna36.orig/lib/canna/romaji.c	2002-10-21 03:00:21.000000000 +0900
++++ Canna36/lib/canna/romaji.c	2002-11-15 19:28:16.000000000 +0900
+@@ -438,7 +438,7 @@
+ 	}
+       }
+       
+-#if 0 /* currently CANNASHAREDDIR is not defined */
++#if 1 /* currently CANNASHAREDDIR is defined */
+       if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi <ishikawa@linux.or.jp> */
+         extern jrUserInfoStruct *uinfo;
+ 	
+diff -Naur Canna36.orig/misc/Imakefile Canna36/misc/Imakefile
+--- Canna36.orig/misc/Imakefile	2002-10-21 03:00:21.000000000 +0900
++++ Canna36/misc/Imakefile	2002-11-02 13:49:51.000000000 +0900
+@@ -34,11 +34,11 @@
+ MakeLintLibSubdirs($(SUBDIRS))
+ MakeLintSubdirs($(SUBDIRS),install.ln,install.ln)
+ 
+-MakeDirectories(install,$(cannaLibDir)/sample/src)
++MakeDirectories(install,$(cannaDocDir)/sample/src)
+ #if defined(nec_ews_svr4) || defined(pcux_r32)
+-InstallNamedNonExec(rMakefile,Makefile,$(cannaLibDir)/sample/src)
++InstallNamedNonExec(rMakefile,Makefile,$(cannaDocDir)/sample/src)
+ #else
+-InstallNamedNonExec(cMakefile,Makefile,$(cannaLibDir)/sample/src)
++InstallNamedNonExec(cMakefile,Makefile,$(cannaDocDir)/sample/src)
+ #endif /* nec_ews_svr4 */
+ 
+ #ifdef USE_OBSOLETE_STYLE_FILENAME
+@@ -49,8 +49,8 @@
+ 	$(CP) default.ca default.canna
+ #endif
+ 
+-InstallNonExec(default.canna,$(cannaLibDir))
+-InstallNonExec(is.c,$(cannaLibDir)/sample/src)
++InstallNonExec(default.canna,$(cannaEtcDir))
++InstallNonExec(is.c,$(cannaDocDir)/sample/src)
+ 
+ clean::
+ 	$(RM) $(PROGRAMS)
+diff -Naur Canna36.orig/misc/initfiles/Imakefile Canna36/misc/initfiles/Imakefile
+--- Canna36.orig/misc/initfiles/Imakefile	2002-10-19 17:27:52.000000000 +0900
++++ Canna36/misc/initfiles/Imakefile	2002-11-02 13:15:01.000000000 +0900
+@@ -6,7 +6,7 @@
+ #endif
+ 
+             CANNAROOT = ../..
+-            SAMPLEDIR = $(cannaLibDir)/sample
++            SAMPLEDIR = $(cannaShareDir)
+ 
+ all::
+ 
+diff -Naur Canna36.orig/server/server.man Canna36/server/server.man
+--- Canna36.orig/server/server.man	2002-10-24 23:16:43.000000000 +0900
++++ Canna36/server/server.man	2002-11-02 13:18:38.000000000 +0900
+@@ -28,19 +28,19 @@
+ .SH "DESCRIPTION"
+ .PP
+ cannaserver provides the Kana-Kanji conversion service.  Usually all
+-users on the network can access cannaserver(1M).  The scope of
++users on the network can access cannaserver(1).  The scope of
+ accessing sources (hosts, users) can be restricted using the
+ /etc/hosts.canna file.
+ .PP
+-After starting, cannaserver(1M) immediately forks and enters the
++After starting, cannaserver(1) 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 UNIX domain socket
++When starting, cannaserver(1) creates the UNIX domain socket
+ @(UnixSockDir)/@(UnixSockName) to communicate clients.  The
+-socket is deleted automatically at the end of cannaserver(1M) if no
+-trouble occurs.  The socket may exist although cannaserver(1M) is
+-not in operation (because cannaserver(1M) terminates abnormally, for
++socket is deleted automatically at the end of cannaserver(1) if no
++trouble occurs.  The socket may exist although cannaserver(1) is
++not in operation (because cannaserver(1) terminates abnormally, for
+ example).  In this case, delete the file manually.
+ .PP
+ Specification of the dictionary to use is determined by referencing
+@@ -50,27 +50,27 @@
+ .IP "\fIddpath\fP" 12
+ Specifies the directory that contains the dictionary.
+ .IP "\-inet" 12
+-The remote host can connect with the cannaserver(1M) using
++The remote host can connect with the cannaserver(1) using
+ the inet domain socket.
+-By the default, the cannaserver(1M) uses only UNIX domain socket.
++By the default, the cannaserver(1) uses only UNIX domain socket.
+ i.e. Only clients in your local machine can connect to the server.
+ .IP "\-l \fIn\fP" 12
+-Outputs the cannaserver(1M) log to /tmp/canna.log.  n (1 to 5)
++Outputs the cannaserver(1) log to /tmp/canna.log.  n (1 to 5)
+ specifies the log level.
+ .IP "\-d" 12
+-Starts cannaserver(1M) in debug mode.  It is executed as the
++Starts cannaserver(1) in debug mode.  It is executed as the
+ foreground process.  Log data at log level 5 is output to the standard
+ output.
+ .IP "\-u \fIuserid\fP" 12
+-Specifies which user cannaserver(1M) runs as.  By default, cannaserver(1M)
+-runs as the user who started cannaserver(1M).
++Specifies which user cannaserver(1) runs as.  By default, cannaserver(1)
++runs as the user who started cannaserver(1).
+ .SH "FILES"
+ .IP "@(UnixSockDir)/@(UnixSockName)[:num]" 36
+ Socket
+-.IP "@(cannaLibDir)/dic/*/dics.dir" 36
+-Dictionary directory
++.IP "@(DicDir)/dics.dir" 36
++Dictionary list
+ .IP "@(AccessFile)" 36
+ Access control file
+ .SH "SEE ALSO"
+ .PP
+-cannakill(1M), cannastat(1), cannacheck(1)
++cannakill(1), cannastat(1), cannacheck(1)
diff --git a/app-i18n/canna/files/canna.confd b/app-i18n/canna/files/canna.confd
new file mode 100644
index 000000000000..00961ad8e83a
--- /dev/null
+++ b/app-i18n/canna/files/canna.confd
@@ -0,0 +1,4 @@
+# Config file for /etc/init.d/canna
+
+# Specify user to run as
+CANNASERVER_OPTS=""
diff --git a/app-i18n/canna/files/canna.initd b/app-i18n/canna/files/canna.initd
new file mode 100644
index 000000000000..3616fcf37165
--- /dev/null
+++ b/app-i18n/canna/files/canna.initd
@@ -0,0 +1,19 @@
+#!/sbin/runscript
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# /space/gentoo/cvsroot/gentoo-x86/app-misc/canna/files/3.5_beta2/canna
+
+# CANNASERVER_OPTS is defined in /etc/conf.d/canna
+
+start() {
+	ebegin "Starting canna"
+	/usr/sbin/cannaserver ${CANNASERVER_OPTS}
+	eend $? "Failed to start canna"
+}
+
+stop() {
+	ebegin "Stopping canna"
+	/usr/bin/cannakill
+	eend $? "Failed to stop canna"
+}
+
diff --git a/app-i18n/canna/files/digest-canna-3.6 b/app-i18n/canna/files/digest-canna-3.6
new file mode 100644
index 000000000000..2ba62421ac92
--- /dev/null
+++ b/app-i18n/canna/files/digest-canna-3.6
@@ -0,0 +1 @@
+MD5 6c6698f1b6202d92d62b85aed599c519 Canna36.tar.gz 1336431