Adds quotes around VENDORNAME, see bug #48229. Removed old ebuild.

13 files changed, 183 insertions, 1843 deletions

diff --git a/app-i18n/canna/ChangeLog b/app-i18n/canna/ChangeLog
index 3214432ae43a..77fa94425593 100644
--- a/app-i18n/canna/ChangeLog
+++ b/app-i18n/canna/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/canna
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.34 2004/05/04 16:24:49 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.35 2004/05/04 18:12:04 usata Exp $
+
+*canna-3.7_p1 (05 May 2004)
+
+  05 May 2004; Mamoru KOMACHI <usata@gentoo.org> canna-3.5_beta2-r2.ebuild,
+  canna-3.7_p1.ebuild, files/canna-3.5_beta2-r2/canna.confd,
+  files/canna-3.5_beta2-r2/canna.initd, files/canna-3.5_beta2-r2/gentoo.diff:
+  Adds quotes around VENDORNAME, see bug #48229. Removed old ebuild.
 
   04 May 2004; Bryan Østergaard <kloeri@gentoo.org> canna-3.7.ebuild:
   Stable on alpha.
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
index 4b2216f306fb..1a73328cbbe5 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -1,19 +1,15 @@
+MD5 628e37f748467009ef09bc13271d2348 canna-3.6_p4.ebuild 2842
+MD5 22151d44fea4f013ab176a7c15102eb2 canna-3.7.ebuild 3382
+MD5 9c22ff1f7160493339fefe639c5eb00e ChangeLog 6081
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 e0db490ab919deb0ca3b08ade03cc51b canna-3.7.ebuild 3387
-MD5 439e688ef5ac43233ebc5ad2ee1ed959 ChangeLog 5768
-MD5 af60638d12b9f3d419c40d1fd84066fb canna-3.6_p4.ebuild 2847
-MD5 c05917bd4c6d021366b9e8fa2a2e9f8c canna-3.5_beta2-r2.ebuild 1378
-MD5 167b6b59b36ffe7d7ebda5ddd85c930a files/digest-canna-3.7 61
-MD5 190c04019722e776769ab0287dd9de6d files/canna.initd 692
-MD5 2b13f6b61d303f6bf273a325ff3bc411 files/canna-3.7-gentoo.diff.in 5263
-MD5 d817072e9bb7181804fdde1b52427a3f files/canna-kpdef-gentoo.diff 255
-MD5 d77588a06485914d6bab3aab2a1985fb files/canna-3.6_p4-gentoo.diff 5587
+MD5 cebcd0f0011d50cae30f52e281a7539c canna-3.7_p1.ebuild 3519
 MD5 248b68ec823c14f763cc3f62221fb7d7 files/canna.confd 306
 MD5 d60168a33fd321ad1a29382cafcb60d3 files/canna.hosts 5
-MD5 b662ec8c507add7b3d6550fe86ee83d6 files/digest-canna-3.5_beta2-r2 62
-MD5 d4dea6579bb38b239b93899b2b8226a4 files/canna.initd.new 1009
+MD5 67ba430259be85b8791dac27115538b0 files/canna.initd 1005
+MD5 d77588a06485914d6bab3aab2a1985fb files/canna-3.6_p4-gentoo.diff 5587
 MD5 0d09a45d1074f9f4801a48bf8ec3208a files/update-canna-dics_dir 1101
+MD5 2b13f6b61d303f6bf273a325ff3bc411 files/canna-3.7-gentoo.diff.in 5263
+MD5 167b6b59b36ffe7d7ebda5ddd85c930a files/digest-canna-3.7 61
 MD5 c48de658742361ca5549edaddebb3e94 files/digest-canna-3.6_p4 62
-MD5 2970f75a3fc696dbb28eab2f9d95aa10 files/canna-3.5_beta2-r2/canna.initd 515
-MD5 6915bb4afc796b0f7c35b448594eace6 files/canna-3.5_beta2-r2/canna.confd 89
-MD5 fb68f318058521c299eb4776b98fab43 files/canna-3.5_beta2-r2/gentoo.diff 50373
+MD5 d817072e9bb7181804fdde1b52427a3f files/canna-kpdef-gentoo.diff 255
+MD5 928c920864a62989dc12b294fa01aac5 files/digest-canna-3.7_p1 63
diff --git a/app-i18n/canna/canna-3.5_beta2-r2.ebuild b/app-i18n/canna/canna-3.5_beta2-r2.ebuild
deleted file mode 100644
index 54b739dfcfc6..000000000000
--- a/app-i18n/canna/canna-3.5_beta2-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.5_beta2-r2.ebuild,v 1.6 2004/02/23 18:05:13 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://www.nec.co.jp/canna/"
-SRC_URI="ftp://ftp.tokyonet.ad.jp/pub/misc/Canna/Canna35/Canna35b2.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86"
-
-RDEPEND="virtual/glibc"
-
-S="${WORKDIR}/Canna35b2"
-
-src_unpack() {
-	# unpack the archive
-	unpack ${A}
-
-	# patch Canna.conf to ensure that files are installed into image dir
-	cd Canna35b2
-	epatch ${FILESDIR}/${PF}/gentoo.diff
-}
-
-src_compile() {
-	# create a Makefile from Canna.conf
-	xmkmf         || die "xmkmf failed"
-	make Makefile || die "Makefile creation failed"
-
-	# build Canna - emake causes trouble on my system so playing safe
-	make canna   || die "Canna build failed"
-}
-
-src_install() {
-	# install libs, executables, dictionaries
-	make DESTDIR=${D} install     || die "installation failed"
-
-	# install man pages
-	make DESTDIR=${D} install.man || die "installation of manpages failed"
-
-	# install docs
-	dodoc README WHATIS
-
-	# install rc script and its config file
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${PF}/canna.initd canna
-	insinto /etc/conf.d ; newins ${FILESDIR}/${PF}/canna.confd canna
-}
diff --git a/app-i18n/canna/canna-3.6_p4.ebuild b/app-i18n/canna/canna-3.6_p4.ebuild
index f05c6b1e5b5e..d6733928080e 100644
--- a/app-i18n/canna/canna-3.6_p4.ebuild
+++ b/app-i18n/canna/canna-3.6_p4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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_p4.ebuild,v 1.12 2004/04/06 03:50:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.6_p4.ebuild,v 1.13 2004/05/04 18:12:04 usata Exp $
 
 inherit cannadic eutils
 
@@ -78,7 +78,7 @@ src_install() {
 		doins doc/man/guide/tex/canna.{dvi,ps,pdf}
 	fi
 
-	exeinto /etc/init.d ; newexe ${FILESDIR}/canna.initd.new canna || die
+	exeinto /etc/init.d ; newexe ${FILESDIR}/canna.initd canna || die
 	insinto /etc/conf.d ; newins ${FILESDIR}/canna.confd canna || die
 	insinto /etc/       ; newins ${FILESDIR}/canna.hosts hosts.canna || die
 	keepdir /var/log/canna/ || die
diff --git a/app-i18n/canna/canna-3.7.ebuild b/app-i18n/canna/canna-3.7.ebuild
index d2860a0a38a6..3cb1983ed7a7 100644
--- a/app-i18n/canna/canna-3.7.ebuild
+++ b/app-i18n/canna/canna-3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7.ebuild,v 1.6 2004/05/04 16:24:49 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7.ebuild,v 1.7 2004/05/04 18:12:04 usata Exp $
 
 inherit cannadic eutils
 
@@ -83,7 +83,7 @@ src_install() {
 		doins doc/man/guide/tex/canna.{dvi,ps,pdf}
 	fi
 
-	exeinto /etc/init.d ; newexe ${FILESDIR}/canna.initd.new canna || die
+	exeinto /etc/init.d ; newexe ${FILESDIR}/canna.initd canna || die
 	insinto /etc/conf.d ; newins ${FILESDIR}/canna.confd canna || die
 	insinto /etc/       ; newins ${FILESDIR}/canna.hosts hosts.canna || die
 	keepdir /var/log/canna/ || die
diff --git a/app-i18n/canna/canna-3.7_p1.ebuild b/app-i18n/canna/canna-3.7_p1.ebuild
new file mode 100644
index 000000000000..689d641f8f2c
--- /dev/null
+++ b/app-i18n/canna/canna-3.7_p1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p1.ebuild,v 1.1 2004/05/04 18:12:04 usata Exp $
+
+inherit cannadic eutils
+
+IUSE="doc"
+
+MY_P="Canna${PV//./}"
+
+DESCRIPTION="A client-server based Kana-Kanji conversion system"
+HOMEPAGE="http://canna.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/canna/7449/${MY_P/_/}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+
+DEPEND="virtual/glibc
+	virtual/x11
+	>=sys-apps/sed-4
+	doc? ( app-text/ptex )"
+RDEPEND="virtual/glibc"
+
+S="${WORKDIR}/${MY_P/_/}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g'
+	sed -e "s%@cannapkgver@%${PF}%" \
+		${FILESDIR}/${P/_*/}-gentoo.diff.in > ${T}/${PF}-gentoo.diff
+	epatch ${T}/${PF}-gentoo.diff
+	cd dic/phono
+	epatch ${FILESDIR}/${PN}-kpdef-gentoo.diff
+}
+
+src_compile() {
+
+	xmkmf || die
+
+	# put quotes around VENDORNAME if any, see bug #48229
+	sed -i -e '/VENDORNAME/s/= \(.*\)$/= "\1"/g' Makefile || die
+
+	#make libCannaDir=../lib/canna canna || die
+	make canna || die
+
+	if [ -n "`use doc`" ] ; then
+		einfo "Compiling DVI, PS (and PDF) document"
+		cd doc/man/guide/tex
+		xmkmf || die
+		make JLATEXCMD=platex \
+			DVI2PSCMD="dvips -f" \
+			canna.dvi canna.ps || die
+		if has_version 'app-text/dvipdfmx' && \
+			( has_version 'app-text/acroread' \
+			|| has_version 'app-text/xpdf-japanese' ); then
+			make JLATEXCMD=platex \
+				DVI2PSCMD="dvips -f" \
+				canna.pdf || die
+		fi
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install.man || die
+
+	# install default.canna (removed from Canna36p4)
+	insinto /usr/share/canna
+	newins misc/initfiles/verbose.canna default.canna
+
+	# cannakill should link to /usr/bin/catdic
+	dosym ../bin/catdic /usr/sbin/cannakill
+
+	dodir /usr/share/man/man8 /usr/share/man/ja/man8
+	for man in cannaserver cannakill ; do
+		for mandir in ${D}/usr/share/man ${D}/usr/share/man/ja ; do
+			mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8
+		done
+	done
+
+	dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
+
+	if [ -n "`use doc`" ] ; then
+		insinto /usr/share/doc/${PF}
+		doins doc/man/guide/tex/canna.{dvi,ps,pdf}
+	fi
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/canna.initd canna || die
+	insinto /etc/conf.d ; newins ${FILESDIR}/canna.confd canna || die
+	insinto /etc/       ; newins ${FILESDIR}/canna.hosts hosts.canna || die
+	keepdir /var/log/canna/ || die
+
+	# for backward compatibility
+	dosbin ${FILESDIR}/update-canna-dics_dir
+
+	insinto /var/lib/canna/dic/dics.d/
+	newins ${D}/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir
+
+	# fix permission for user dictionary
+	keepdir /var/lib/canna/dic/{user,group}
+	fowners root:bin /var/lib/canna/dic/{user,group}
+	fperms 775 /var/lib/canna/dic/{user,group}
+}
+
+pkg_postinst() {
+
+	update-cannadic-dir
+	einfo
+	einfo "Canna dictionary format has been changed."
+	einfo "You should rebuild app-dict/canna-* after emerge."
+	einfo
+}
+
+pkg_prerm () {
+
+	if [ -S /tmp/.iroha_unix/IROHA ] ; then
+		# make sure cannaserver get stopped because otherwise
+		# we cannot stop it with /etc/init.d after emerge -C canna
+		einfo
+		einfo "Stopping Canna for safe unmerge"
+		einfo
+		/etc/init.d/canna stop
+		touch ${T}/canna.cookie
+	fi
+}
+
+pkg_postrm () {
+
+	if [ -f /usr/sbin/cannaserver -a -e ${T}/canna.cookie ] ; then
+		#update-cannadic-dir
+		einfo
+		einfo "Restarting Canna"
+		einfo
+		/etc/init.d/canna start
+		rm -f ${T}/canna.cookie
+	fi
+}
diff --git a/app-i18n/canna/files/canna-3.5_beta2-r2/canna.confd b/app-i18n/canna/files/canna-3.5_beta2-r2/canna.confd
deleted file mode 100644
index 8019d2030189..000000000000
--- a/app-i18n/canna/files/canna-3.5_beta2-r2/canna.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-# Config file for /etc/init.d/canna
-
-# Specify user to run as
-CANNASERVER_OPTS="-u canna"
\ No newline at end of file
diff --git a/app-i18n/canna/files/canna-3.5_beta2-r2/canna.initd b/app-i18n/canna/files/canna-3.5_beta2-r2/canna.initd
deleted file mode 100644
index 4c58d2c3073f..000000000000
--- a/app-i18n/canna/files/canna-3.5_beta2-r2/canna.initd
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/files/canna-3.5_beta2-r2/canna.initd,v 1.4 2004/02/13 19:14:58 vapier Exp $
-
-# 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/canna-3.5_beta2-r2/gentoo.diff b/app-i18n/canna/files/canna-3.5_beta2-r2/gentoo.diff
deleted file mode 100644
index f2dc49d8b300..000000000000
--- a/app-i18n/canna/files/canna-3.5_beta2-r2/gentoo.diff
+++ /dev/null
@@ -1,1702 +0,0 @@
-Index: Canna.conf
-===================================================================
-RCS file: /var/lib/cvs/canna/Canna.conf,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-131,138c131,143
-< 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
----
-> cannaBinDir   = /usr/bin
-> cannaSrvDir   = /usr/sbin
-> cannaLibDir   = /etc/canna
-> cannaEtcDir   = /etc/canna
-> cannaManDir   = /usr/share/man
-> cannaIncDir   = /usr/include/canna
-> libCannaDir   = /usr/lib
-> cannaDocDir   = /usr/share/doc/canna-3.5_beta2
-> cannaShareDir = /usr/share/canna
-> 
-> ErrDir   = /var/log/canna
-> LockDir  = /tmp/.iroha_unix
-> LockFile = IROHA
-151c156
-< cannaDsoRev = 1
----
-> cannaDsoRev = 1.0
-170c175
-< #define JAPANESEMAN
----
-> /* #define JAPANESEMAN */
-207c212
-< DicDir   = $(cannaLibDir)/dic
----
-> DicDir   = /var/lib/canna/dic
-285a291
-> /*
-290a297
-> */
-306a314,316
-> 	 echo "s%@(DicDir)%$(DicDir)%g"; \				@@\
-> 	 echo "s%@(LockDir)%$(LockDir)%g"; \				@@\
-> 	 echo "s%@(LockFile)%$(LockFile)%g"; \				@@\
-319a330,332
-> 	echo "s%@(DicDir)%$(DicDir)%g" >> $(MANUALSED)		@@\
-> 	echo "s%@(LockDir)%$(LockDir)%g" >> $(MANUALSED)		@@\
-> 	echo "s%@(LockFile)%$(LockFile)%g" >> $(MANUALSED)		@@\
-324a338,339
-> MANSUFFIX = 1 /* man section for user programs */
-> 
-329,330c344,346
-< ConvertPathName(file.tmp,file.$(MANSRCSUFF))				@@\
-< install.man:: file.tmp							@@\
----
-> ConvertPathName(file.tmp,file.man)					@@\
-> ConvertPathName(file.jtmp,file.jmn)					@@\
-> install.man:: file.tmp file.jtmp					@@\
-331a348
-> 	MakeDir($(DESTDIR)destdir/ja/man$(MANSUFFIX))		@@\
-333c350,351
-< 	$(RM) file.tmp							@@\
----
-> 	$(INSTALL) -c $(INSTMANFLAGS) file.jtmp $(DESTDIR)destdir/ja/man$(MANSUFFIX)/dest.$(MANSUFFIX)	@@\
-> 	$(RM) file.tmp file.jtmp					@@\
-335c353
-< 	$(RM) file.tmp
----
-> 	$(RM) file.tmp file.jtmp
-342a361,362
-> LIBMANSUFFIX = 3 /* man section for libraries */
-> 
-347,348c367,369
-< ConvertPathName(file.tmp,file.$(MANSRCSUFF))				@@\
-< install.man:: file.tmp							@@\
----
-> ConvertPathName(file.tmp,file.man)				@@\
-> ConvertPathName(file.jtmp,file.jmn)				@@\
-> install.man:: file.tmp file.jtmp				@@\
-349a371
-> 	MakeDir($(DESTDIR)destdir/ja/man$(LIBMANSUFFIX))	@@\
-351c373,374
-< 	$(RM) file.tmp							@@\
----
-> 	$(INSTALL) -c $(INSTMANFLAGS) file.jtmp $(DESTDIR)destdir/ja/man$(LIBMANSUFFIX)/dest.$(LIBMANSUFFIX)	@@\
-> 	$(RM) file.tmp file.jtmp					@@\
-353c376
-< 	$(RM) file.tmp
----
-> 	$(RM) file.tmp file.jtmp
-378c401
-< 		set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i;$(CHOWN) owner $(DESTDIR)$$i;$(CHGRP) group $(DESTDIR)$$i); fi \	@@\
----
-> 		set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i;$(CHOWN) owner $(DESTDIR)$$i;$(CHGRP) group $(DESTDIR)$$i); fi; \	@@\
-425a449
-> 	echo "#define CANNASHAREDIR '$(cannaShareDir)'" >> junk		@@\
-448a473
-> 	 echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \		@@\
-Index: Imakefile
-===================================================================
-RCS file: /var/lib/cvs/canna/Imakefile,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-6c6
-<       WORLDOPTS = -k
----
->       WORLDOPTS =
-14c14
-< 	$(RM) -r include cannaconf.h
----
-> 	$(RM) -r include
-Index: ccustom/canna.h
-===================================================================
-RCS file: /var/lib/cvs/canna/ccustom/canna.h,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-44c44
-< # if defined(SYSV) || defined(SVR4)
----
-> # if defined(SYSV) || defined(SVR4) || defined(linux) || defined(__GNU__)
-Index: cmd/cannacheck/ccheck.man
-===================================================================
-RCS file: /var/lib/cvs/canna/cmd/cannacheck/ccheck.man,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-49c49
-< Name of the host under which \fIcannaserver(1M)\fP is in operation.
----
-> Name of the host under which \fIcannaserver(1)\fP is in operation.
-52c52
-< cannaserver(1M), cannakill(1M), cannastat(1)
----
-> cannaserver(1), cannakill(1), cannastat(1)
-55c55
-< Specifies the name of the host under which \fIcannaserver(1M)\fP is in
----
-> Specifies the name of the host under which \fIcannaserver(1)\fP is in
-Index: cmd/cannastat/cstat.man
-===================================================================
-RCS file: /var/lib/cvs/canna/cmd/cannastat/cstat.man,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-32c32
-< server \fIcannaserver(1M)\fP.  The information includes the
----
-> server \fIcannaserver(1)\fP.  The information includes the
-34c34
-< exists, the \fIcannaserver(1M)\fP's version, the number of clients
----
-> exists, the \fIcannaserver(1)\fP's version, the number of clients
-88c88
-< cannaserver(1M), cannakill(1M), cannacheck(1)
----
-> cannaserver(1), cannakill(1), cannacheck(1)
-93c93
-< Specifies the name of the host under which \fIcannaserver(1M)\fP is in
----
-> Specifies the name of the host under which \fIcannaserver(1)\fP is in
-Index: cmd/catdic/Imakefile
-===================================================================
-RCS file: /var/lib/cvs/canna/cmd/catdic/Imakefile,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-3a4,6
-> /* gentoo: use hard links so that the image can be merged correctly */
->               LN = ln
-> 
-56,75c59,78
-< 	$(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
-78,96c81,99
-< 	$(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
-Index: cmd/catdic/cannakill.man
-===================================================================
-RCS file: /var/lib/cvs/canna/cmd/catdic/cannakill.man,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-32c32
-< cannaserver(1M).  This causes the server to delete the lock file and
----
-> cannaserver(1).  This causes the server to delete the lock file and
-35,36c35,36
-< 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.
-42c42
-< cannaserver(1M), cannastat(1), cannacheck(1)
----
-> cannaserver(1), cannastat(1), cannacheck(1)
-Index: cmd/catdic/catdic.man
-===================================================================
-RCS file: /var/lib/cvs/canna/cmd/catdic/catdic.man,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-33c33
-< on which \fIcannaserver\fP(1M) is in operation.  (Hereafter, this machine 
----
-> on which \fIcannaserver\fP(1) is in operation.  (Hereafter, this machine 
-64c64
-< cannaserver(1M), lsdic(1), mkdic(1)
----
-> cannaserver(1), lsdic(1), mkdic(1)
-Index: cmd/catdic/mkdic.man
-===================================================================
-RCS file: /var/lib/cvs/canna/cmd/catdic/mkdic.man,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-31c31
-< 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. 
-99c99
-< catdic(1), cannaserver(1M), lsdic(1)
----
-> catdic(1), cannaserver(1), lsdic(1)
-Index: cmd/crxgram/crxgram.c
-===================================================================
-RCS file: /var/lib/cvs/canna/cmd/crxgram/crxgram.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-71a72
-> #if !defined(__GLIBC__)
-85a87
-> #endif /* __GLIBC__ */
-Index: cmd/cshost/cshost.man
-===================================================================
-RCS file: /var/lib/cvs/canna/cmd/cshost/cshost.man,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-9c9
-< connections to \fIcannaserver\fP(1M).
----
-> connections to \fIcannaserver\fP(1).
-11c11
-< \fIcannaserver\fP(1M) allows network connections only from programs
----
-> \fIcannaserver\fP(1) allows network connections only from programs
-Index: dic/ideo/grammar/Imakefile
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/grammar/Imakefile,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-88,90c88,90
-< 	$(CHGRP) $(cannaGroup) $(CANNADICDIR)
-< 	$(CHOWN) $(cannaOwner) $(CANNADICDIR)
-< 	$(CHMOD) ug+w $(CANNADICDIR)
----
-> 	$(CHGRP) $(cannaGroup) $(DESTDIR)$(CANNADICDIR)
-> 	$(CHOWN) $(cannaOwner) $(DESTDIR)$(CANNADICDIR)
-> 	$(CHMOD) ug+w $(DESTDIR)$(CANNADICDIR)
-Index: dic/ideo/grammar/gram.code
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/grammar/gram.code,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-33c33
-<  *		¿·¤·¤¯¤Ä¤±Â­¤·¤¿·Á¼°Ì¾»ì¡¥Æ¯¤­¤ÏƱ¤¸¡¥
----
->  *		¡Ö¤Ê¡×¤¬JTNO¤Î¤è¤¦¤ËƯ¤¯¸å¤Ë°ú¤­Â³¤¯¡£¡Ö¤Ï¤º¡×¡Ö¤ï¤±¡×¤ÎÆó¸ì¡£
-49c49
-< 	/* ¤¢¤È/¤¦¤Á/¤ª¤ê/¤³¤È/¤¿¤á/¤È¤­/¤È¤³¤í/¤Ï¤º/¤Û¤¦/¤Û¤«/¤Þ¤¨/¤Þ¤Þ/¤â¤Î/¤ï¤±/ */
----
-> 	/* ¤¢¤È/¤¦¤Á/¤ª¤ê/¤³¤È/¤¿¤á/¤È¤­/¤È¤³¤í/¤Ï¤º/¤Û¤¦/¤Û¤«/¤Þ¤¨/¤Þ¤Þ/¤â¤Î/¤ï¤±//¤¢¤¤¤À/¤¢¤Þ¤ê/¤¦¤¨/¤ª¤«¤²/¤«¤®¤ê/¤«¤¿/¤¯¤»/¤´¤È/¤Ä¤â¤ê/¤Õ¤·/¤ä¤Ä/¤è¤¦/¤è¤¦¤Ê/¤è¤· */
-51c51
-< 	/* ¤¢¤¤¤À/¤¢¤Þ¤ê/¤¦¤¨/¤ª¤«¤²/¤«¤®¤ê/¤«¤¿/¤¯¤»/¤´¤È/¤Ä¤â¤ê/¤Õ¤·/¤ä¤Ä/¤è¤¦/¤è¤¦¤Ê/¤è¤· */
----
-> 	/* ¤Ï¤º/¤ï¤± (KN¤È¤ÎÆó½ÅÅÐÏ¿¤ò¤¹¤ë) */
-221d220
-<  *	¤¿¤À¤·¡¤C5r(¹Ô¤¯)¤Ë¤Ä¤¤¤Æ¤Ï°ì¸ì¤Î¤ß¤Ê¤Î¤ÇÏ¢ÍÑ·Á¤Î¥³¡¼¥É¤È¤¹¤ë
-226,227c225
-< k5      a       ¤«              /* ÃÖ¤«_¤Ê¤¤,½ñ¤«_¤Ê¤¤ */
-<         iO      ¤¤              /* ÃÖ¤¤_¤¿¤é,½ñ¤¤_¤¿ */
----
-> k5      iO      ¤¤              /* ÃÖ¤¤_¤¿¤é,½ñ¤¤_¤¿ */
-232a231
-> k5a     _       ¤«              /* ÃÖ¤«_¤Ê¤¤,½ñ¤«_¤Ê¤¤: ktek5a»²¾È */
-237,243c236,244
-< c5r     a       ¤«              /* ¹Ô¤«_¤Ê¤¤ */
-<         i       ¤­              /* ¹Ô¤­_¤Þ¤¹ */
-<         tO      ¤Ã              /* ¹Ô¤Ã_¤¿¤é */
-<         u       ¤¯              /* ¹Ô¤¯_¤È¤­ */
-<         e       ¤±              /* ¹Ô¤± */
-<         o       ¤³              /* ¹Ô¤³_¤¦ */
-<         ya      _               /* ¹Ô¤­¤ã */
----
-> /* ÉÊ»ì¿ôºï¸º¤Î¤¿¤á¼ç¤ËK5r¤È³èÍѸìÈø¤ò¶¦Í­
->  * ¹Ô¤«_¤Ê¤¤ k5a
->  * ¹Ô¤­_¤Þ¤¹ k5ir
->  * ¹Ô¤¯_¤È¤­ k5u
->  * ¹Ô¤±      k5e
->  * ¹Ô¤³_¤¦   k5o 
->  * ¹Ô¤­¤ã    k5ya
->  * ¹Ô¤Ã_¤¿¤é t5tO
->  */
-266d266
-<         tO      ¤Ã              /* Àä¤Ã_¤¿¤é,ÂǤÃ_¤¿ */
-272a273
-> t5tO	_	¤Ã              /* Àä¤Ã_¤¿¤é,ÂǤÃ_¤¿ */
-397,400c398,402
-< des     ho      ¤Ç¤·¤ç
-<         hou     ¤Ç¤·¤ç¤¦
-<         i       ¤Ç¤·
-<         u       ¤Ç¤¹
----
-> des	i	¤Ç¤·
-> 	u	¤Ç¤¹
-> desho	_	¤Ç¤·¤ç
-> deshou	_	¤Ç¤·¤ç¤¦
-> 
-432,433c434,435
-< dd      at      ¤À¤Ã            /* ·ÁÆ°¤Î¸ìÈø¤ò·ó¤Í¤ë ? */
-<         emo     ¤Ç¤â            /* Àܳ½õ»ì ? */
----
-> ddat	_	¤À¤Ã            /* ·ÁÆ°¤Î¸ìÈø¤ò·ó¤Í¤ë ? */
-> ddemo	_	¤Ç¤â            /* Àܳ½õ»ì ? */
-437a440
-> dde3	_	¤Ç		/* ¡Ö¤·¤Ê¤¤_¤Ç_¤¯¤ì¡×:¡Ö¤·_¤Æ_¤¯¤ì¡×¤ÈÂбþ */
-438a442
-> djan	_	_		/* ¡Ö¤¸¤ã_¤Ê¤¤¡×¤ÈƱ¤¸Á°¸å¤ÎÀܳ */
-452c456,457
-< sugiru  _       ¤¹¤®    /* ¹Ô¤­_¤¹¤®¤ë */
----
-> sugiru  _       ¤¹¤®    /* ¹Ô¤­_¤¹¤®¤ë¡¢Î©ÇÉ_¤¹¤®¤ë */
-> yagaru	_	_	/* Æ°»ì¤Î¸å¤Î¤ß */
-539c544
-< nainee	_	_	/* ¿©¤Ù_¤Í¤¨ */
----
-> nainee	_	¤Ê¤¤	/* ¿©¤Ù_¤Í¤¨: ËÜÍè¤Î·Á¡Ö¤Ê¤¤¡×¤â¤³¤³¤Ë¼ý¤á¤ë¡£ */
-600c605,606
-< /* kte ¤ËÀܳ¤¹¤ë¸ý¸ì¤ÎÉÊ»ì */
----
-> /* k5 ¤¬Àܳ¤¹¤ë¸ý¸ì¤ÎÉÊ»ì:¡Ö¸º¤Ã¤Æ¤¯¡×¤Ê¤É¡£ */
-> kte2	_	_	/* ¸º¤Ã_¤Æ_¤«¤Ê¤¤ */
-602,608c608,609
-< ktec5	a	_	/* Ï¢¤ì¤Æ_¤«_¤Ê¤¤ */
-< /*	i	*/	/* Ï¢¤ì¤Æ_¤­_¤Þ¤¹ :¡ÖÏ¢¤ì¤ÆÍè¤Þ¤¹¡×¤â¤¢¤ë¤¿¤áÊÝα */
-< 	tO	_	/* Ï¢¤ì¤Æ_¤Ã_¤Æ */
-< 	u	_	/* Ï¢¤ì¤Æ_¤¯ */
-< 	e	_	/* Ï¢¤ì¤Æ_¤± */
-< 	o	_	/* Ï¢¤ì¤Æ_¤³_¤¦¤è */
-< 	ya	_	/* Ï¢¤ì¤Æ_¤­¤ã */
----
-> /* kte2 ¤ËÀܳ¤¹¤ë k5a:¡ÖÉÕ¤¤¤Æ¤«¤ó¤¬¡×Âкö */
-> ktek5a	_	¤«	/* ¸º¤Ã¤Æ_¤«_¤Ê¤¤ */
-Index: dic/ideo/grammar/gram.goto
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/grammar/gram.goto,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-40c40
-< BB+	KJ NN N00 N01 N02 N03 CJ RT KN TKN FKN
----
-> BB+	KJ NN N00 N01 N02 N03 CJ RT KN FKN
-51c51
-< BB+	rasii youda mitaida dd dda1 dde1 ddar ddeha des JS
----
-> BB+	rasii youda mitaida ddat ddemo dda1 dde1 ddar ddeha des desho deshou JS
-60a61,64
-> #ifdef BUNMATU
-> BM+	BM
-> #endif
-> 
-63c67
-< YOUGEN+	kx sx aru iru oru kureru morau yaru miru oku rasii dd dda1 dde1 ddar ddeha des ssu
----
-> YOUGEN+	kx sx aru iru oru kureru morau yaru miru oku rasii ddat ddemo dda1 dde1 ddar ddeha djan des desho deshou ssu
-89c93
-< #define	T_NA	Fdatte kdn dd dda2 dde1 ddar ddeha sugiru mitaida ysouda	/* ·ÁÍÆÆ°»ì¤Î³èÍѸìÈø */
----
-> #define	T_NA	Fdatte kdn ddat ddemo dda2 dde1 ddar ddeha djan sugiru mitaida ysouda	/* ·ÁÍÆÆ°»ì¤Î³èÍѸìÈø */
-98c102
-< 	rasii ppoi dd dde1 ddar ddeha des ssu mitaida buru na\
----
-> 	rasii ppoi ddat ddemo dde1 ddar ddeha djan des desho deshou ssu mitaida buru na\
-268c272,274
-< CNS+	@T35 CNSUC2
----
-> CN-	SUC
-> CNS+	@CN
-> CNS-	CNSUC1
-270,271c276,278
-< JNS+	@T35 JNM JNSSUC JNSUC
-< JNM+	@T35 JNMSUC JNSUC
----
-> JN-	SUC
-> JNS+	@JN JNSSUC /* JNM */
-> JNM+	@JN JNMSUC
-338c345
-< CJ+	BB /*dd dde1 ddar ddeha des*/
----
-> CJ+	BB /*ddat ddemo dde1 ddar ddeha djan des desho deshou*/
-340c347
-< RT+	BB KN TKN FKN KJ SX ZX NZX PRE NNPRE CNPRE JNPRE
----
-> RT+	BB KN FKN KJ SX ZX NZX PRE NNPRE CNPRE JNPRE
-356c363
-< OKX+	nasaru rasii dd dda2 dde1 ddar ddeha des
----
-> OKX+	nasaru rasii ddat ddemo dda2 dde1 ddar ddeha djan des desho deshou
-364c371
-< JTNN-	Fttara Ftte Kto
----
-> JTNN-	Fttara Ftte Fdano ddemo Kto
-366c373
-< TKN+	@T35
----
-> KN-	SUC
-367a375,379
-> FKN-	SUC
-> /* TKN: ¡Á¤Ê(¤ï¤±|¤Ï¤º) */
-> TKN+	BB Zka Zkai Zkasira Zkana Zsa Zne Znee Zyo 
-> TKN+	Ftoka Fdokoro Fnari Fha Fmo Snara Stte
-> TKN+	rasii ppoi ddat ddemo dda1 dde1 ddar ddeha djan des desho deshou ssu mitaida na
-375c387
-< KS+	mas saseru sugiru nasaru rareru chau 
----
-> KS+	mas saseru sugiru yagaru nasaru rareru chau 
-378c390
-< KS+	kt kte kteha ktya ktemo kto gatera
----
-> KS+	kt kte kte2 kteha ktya ktemo kto gatera
-383c395
-< KSr-	N2T35
----
-> KSr-	N2T35 SUC
-388c400
-< ksru+	BB Kni JTNO JTNN KN TKN FKN Kyori
----
-> ksru+	BB Kni JTNO JTNN KN FKN Kyori
-394c406
-< ksru+	rasii youda mitaida dsouda mai be goto des ssu ddar ddeha
----
-> ksru+	rasii youda mitaida dsouda mai be goto des desho deshou ssu ddar ddeha djan
-411,412c423
-< K5+	k5 k5i
-< C5r+	c5r
----
-> K5+	k5 k5a k5i
-415c426
-< T5+	t5 t5i
----
-> T5+	t5 t5i t5tO
-428c439,440
-< K5r+    k5 k5ir
----
-> K5r+    k5 k5a k5ir
-> C5r+    k5 k5a k5ir t5tO
-431c443
-< T5r+    t5 t5ir
----
-> T5r+    t5 t5ir t5tO
-449c461
-< k5i+	nasaru tai yasui you ysouda mas sugiru tamae
----
-> k5i+	nasaru tai yasui you ysouda mas sugiru yagaru tamae
-458c470
-< k5i+	nasaru rasii des dd dda2 dde1 na
----
-> k5i+	nasaru rasii des desho deshou ddat ddemo dda2 dde1 na
-461c473
-< k5iO+	kt kte kteha ktya ktemo kto chau
----
-> k5iO+	kt kte kte2 kteha ktya ktemo kto chau
-468a481
-> k5ir-	SUC
-472,479d484
-< c5ra+	@k5a
-< c5ro+	@k5o
-< c5ri+	@k5i @T35
-< c5rtO+	@k5iO
-< c5ru+	@k5u
-< c5re+	@k5e
-< c5rya+	@k5ya
-< 
-487a493
-> g5ir-	SUC
-496a503
-> s5ir-	SUC
-506a514
-> t5ir-	SUC
-524a533
-> b5ir-	SUC
-534a544
-> m5ir-	SUC
-545a556
-> r5ir-	SUC
-565a577
-> w5ir-	SUC
-575a588
-> u5ir-	SUC
-584c597
-< kxi+	tai yasui ysouda mas kt kte kteha ktya ktemo chau sugiru tamae
----
-> kxi+	tai yasui ysouda mas kt kte kteha ktya ktemo chau sugiru yagaru tamae
-603,604c616,617
-< sxi+	ysouda tai yasui nai nainee naisa mai mas sugiru nasaru you tamae ND2KY N2KYT
-< sxi+	kt kte kteha ktya ktemo kto
----
-> sxi+	ysouda tai yasui nai nainee naisa mai mas sugiru yagaru nasaru chau you tamae ND2KY N2KYT
-> sxi+	kt kte kte2 kteha ktya ktemo kto
-642c655
-< sugiru+	BB Fka you des dd dda1 dde1 ddar ddeha nai nainya nainee mas ks zu znn z na
----
-> sugiru+	BB Fka you des desho deshou ddat ddemo dda1 dde1 ddar ddeha djan nai nainya nainee mas ks zu znn z na
-643a657
-> yagaru+	BB r5 /* r5i, r5ir ¤Ï¤ï¤¶¤ÈÆþ¤ì¤Æ¤Ê¤¤ */
-660c674
-< k5siru+	kt kte kteha ktya ktemo
----
-> k5siru+	kt kte kte2 kteha ktya ktemo
-675c689
-< aru5i+	@r5i Kno Sto Stomo ddar dd dda2 dde1 ddeha
----
-> aru5i+	@r5i Kno Sto Stomo ddar ddat ddemo dda2 dde1 ddeha djan
-683c697
-< kureru+	BB ks Fto Stte
----
-> kureru+	BB ks Fto Stte Zi Zya Zyo Zyona
-722c736
-< kyi+	@k5u Kde Kdeno ddeha Ztto
----
-> kyi+	@k5u /*Kde Kdeno*/ ddeha djan Ztto
-737a752
-> kymi-	SUC
-742c757,758
-< nainee+	@kyi
----
-> nainee+	@kyi dde3
-> nainee- Fsura Zne Znee
-764c780
-< kdni+	/* sx sxu2 */ yoru ddar dd naru
----
-> kdni+	sx sxu2 yoru ddar ddat ddemo naru
-790,797c806,813
-< SUC+	@KN @TKN @FKN N2T10 N2T15 N2T16 JNSUC CNSUC2 JNSSUC JNMSUC
-< CNSUC1+	@KN @TKN @FKN N2T10 N2T15 N2T16 JNSUC CNSUC2 JNSSUC JNMSUC
-< CNSUC2+	@KN @TKN @FKN N2T10 N2T15 N2T16 JNSUC CNSUC2 JNSSUC JNMSUC
-< JNSUC+	@KN @TKN @FKN N2T10 N2T15 N2T16 CNSUC2
-< JNSSUC+	@KN @TKN @FKN N2T10 N2T15 N2T16 CNSUC2
-< JNMSUC+	@KN @TKN @FKN N2T10 N2T15 N2T16 CNSUC2
-< JS+	@KN @TKN @FKN JSSUC @T35 JSmono
-< JSSUC+	@KN @TKN @FKN JSmono
----
-> SUC+	@KN @FKN N2T10 N2T15 N2T16 JNSUC CNSUC2 JNSSUC JNMSUC
-> CNSUC1+	@KN @FKN N2T10 N2T15 N2T16 JNSUC CNSUC2 JNSSUC JNMSUC
-> CNSUC2+	@KN @FKN N2T10 N2T15 N2T16 JNSUC CNSUC2 JNSSUC JNMSUC
-> JNSUC+	@KN @FKN N2T10 N2T15 N2T16 CNSUC2
-> JNSSUC+	@KN @FKN N2T10 N2T15 N2T16 CNSUC2
-> JNMSUC+	@KN @FKN N2T10 N2T15 N2T16 CNSUC2
-> JS+	@KN @FKN JSSUC @T35 JSmono
-> JSSUC+	@KN @FKN JSmono
-859c875
-< gotoki+	BB Kni Kno Fha KN TKN FKN
----
-> gotoki+	BB Kni Kno Fha KN FKN
-864c880
-< beki+	BB Kga Sto Stomo dd dda1 dde1 ddar ddeha des na Fka
----
-> beki+	BB Kga Sto Stomo ddat ddemo dda1 dde1 ddar ddeha djan des desho deshou na Fka
-872c888
-< zu+	dd dda2 dde2 ddar N2T18
----
-> zu+	ddat ddemo dda2 dde2 ddar N2T18
-882c898
-< znu+	goto dsouda dd dda1 dde2 ddeha ddar youda mitaida rasii N2T18
----
-> znu+	goto dsouda ddat ddemo dda1 dde2 ddeha ddar youda mitaida rasii N2T18
-917c933
-< masen+	BB des Fga Sto Stte Stoka Ssi Skara Snode Skeredo Stomo Smono JTNO
----
-> masen+	BB des desho deshou Fga Sto Stte Stoka Ssi Skara Snode Skeredo Stomo Smono JTNO
-928c944
-< masu+	mai youda JTNO
----
-> masu+	deshou desho mai youda JTNO
-932a949
-> masuru-	desho mai
-943c960
-< kta+	ddeha dsouda youda mitaida rasii des ssu N2T18 JTNO JTNN KN TKN FKN
----
-> kta+	ddeha djan dsouda youda mitaida rasii des desho deshou ssu N2T18 JTNO JTNN KN FKN
-950c967,968
-< ktari+	BB Fsika Fsura Fdano Fto Ftoka Fnazo Fha Fbakari Fmo Ssae Skoso sx
----
-> ktari+	BB Fsika Fsura Fdano Fto Ftoka Fnazo Fha Fbakari Fmo Ssae Skoso 
-> ktari+	sx ddar ddat ddemo dda2 dde1 ddeha djan
-953,955c971,973
-< kte+	nai nainee naisa dd dda2 dde2 des aru iru oru kureru morau yaru miru oku
-< kte+	Zna Znaa Zne Znee Zya Zyo /* kx ¤Ï¤º¤¹Í½Äê */
-< kte+	ktec5 nn te
----
-> kte+	nai nainee naisa ddat ddemo dda2 dde2 des desho deshou aru iru oru kureru morau yaru miru oku
-> kte+	Zsa Zna Znaa Zne Znee Zya Zyo /* kx ¤Ï¤º¤¹Í½Äê */
-> kte+	nn te
-963c981
-< ktemo+	dd dda2 dde2 ddar des
----
-> ktemo+	ddat ddemo dda2 dde2 ddar des desho deshou
-991c1009
-< dde1+	nai nainee naisa aru des
----
-> dde1+	nai nainee naisa aru des desho deshou
-994c1012,1014
-< dde2+	nai nainee naisa aru des
----
-> dde2+	nai nainee naisa aru des desho deshou
-> dde3+	BB Kno Fsae Fbakari Fkoso Ska iru kureru morau oku
-> dde3+	Zna Znaa Zne Znee Zyo
-1011a1032
-> djan+	BB Zka
-1014c1035
-< youda+	kdn dd dda1 dde1 ddar ddeha des BB Zne Zyo na Snara
----
-> youda+	kdn ddat ddemo dda1 dde1 ddar ddeha djan des desho deshou BB Zne Zyo na Snara
-1016c1037
-< ysouda+	kdn dd dda1 dde1 ddar ddeha des BM na Fmo
----
-> ysouda+	kdn ddat ddemo dda1 dde1 ddar ddeha djan des desho deshou BM na Fmo
-1019c1040
-< dsouda+	dd dda1 dde1 ddar ddeha des des na Zna Zne Znee Zyo
----
-> dsouda+	ddat ddemo dda1 dde1 ddar ddeha djan des desho deshou na Zna Zne Znee Zyo
-1022c1043
-< u+	BB KN TKN FKN
----
-> u+	BB KN FKN
-1035c1056
-< na+	JTNO JTNN Zno
----
-> na+	TKN JTNO JTNN Zno
-1037,1045c1058,1064
-< ktec5a+		@c5ra
-< ktec5a-		saseru simeru znn z
-< ktec5o+		@c5ro
-< ktec5tO+	@c5rtO
-< ktec5u+		@c5ru
-< ktec5u-		Fkoso Fsae Fnomi Stote Snagara goto
-< ktec5e+		@c5re
-< ktec5e-		Sdomo Stote Stutu nainya tamae
-< ktec5ya+ 	@c5rya
----
-> /* ¿©¤Ù_¤Æ¤«¤Ê¤¤
->  * ¡Ö½³¤Ã¤Æ¤¤¤Æ¤­¡×¤òÈò¤±¤ë¤¿¤á¡¢k5ir ¤Ï½ü¤¯
->  * ¡Ö¤Ä¤¤¤Æ¤«¤ó¤¬¡×¤òÈò¤±¤ë¤¿¤á¡¢k5a ¤Ç¤Ï¤Ê¤¯ ktek5a
->  */
-> kte2+	k5 ktek5a t5tO
-> ktek5a+	@k5a
-> ktek5a-	saseru simeru znn z
-1062c1081
-< nn+	JTNO Zno dd dde2 ddar ddeha des
----
-> nn+	JTNO Zno ddat ddemo dde2 ddar ddeha djan des desho deshou
-1066c1085
-< #define	K_BUN dd dda2 dde2 ddar ddeha des rasii/* ¡Á¤«¤é¤À¡¢¡Á¤«¤é¤Ç¤¹¡¢¡Á¤«¤é¤é¤·¤¤ */
----
-> #define	K_BUN ddat ddemo dda2 dde2 ddar ddeha djan des desho deshou rasii/* ¡Á¤«¤é¤À¡¢¡Á¤«¤é¤Ç¤¹¡¢¡Á¤«¤é¤é¤·¤¤ */
-1077c1096
-< Kno+	BB KN TKN FKN youda goto
----
-> Kno+	BB KN FKN youda goto
-1090c1109
-< Kto+	ddar dd dda2 dde1
----
-> Kto+	ddar ddat ddemo dda2 dde1
-1093c1112
-< Kni+	Fka Fmade Fya Fdano Fnari Fsae Fsika Fsura Fnomi Fbakari Fkiri
----
-> Kni+	Fka Fmade Fya Fdano Fnari Fsae Fsika Fsura Fnomi Fbakari
-1095a1115
-> Kni+	naru
-1117c1137
-< Fka+	BB @KAKUJS dd dda2 dde1 ddar ddeha
----
-> Fka+	BB @KAKUJS ddat ddemo dda2 dde1 ddar ddeha djan
-1123c1143
-< Fkiri+	BB @KAKUJS dd dda2 dde1 ddar ddeha des rasii N2T18
----
-> Fkiri+	BB @KAKUJS ddat ddemo dda2 dde1 ddar ddeha djan des desho deshou rasii na N2T18
-1131c1151
-< Fkoso+	BB /*Kga Kwo Kto Fka Fha*/ dd dda2 dde1 ddar ddeha des
----
-> Fkoso+	BB /*Kga Kwo Kto Fka Fha*/ ddat ddemo dda2 dde1 ddar ddeha des desho deshou
-1141c1161
-< Fzutu+	BB @KAKUJS dd dda2 dde1 ddar ddeha des nai rasii N2T18
----
-> Fzutu+	BB @KAKUJS ddat ddemo dda2 dde1 ddar ddeha djan des desho deshou nai rasii N2T18
-1153,1155c1173,1175
-< Fto+	BB Kde Kdeno Kni Kwo Kmade Kno dd dda2 dde1 ddar ddeha des rasii
-< Fto+	Fya Fdano Fnari Fsae Fsika Fsura Fnomi Fbakari Fkiri Fyara Fka Fkoso
-< Fto+	Fdeha Fdemo Fdokoro Fnazo Fha Fmade Fmo Snara
----
-> Fto+	BB Kde Kdeno Kni Kwo Kmade Kno ddat ddemo dda2 dde1 ddar ddeha djan des desho deshou rasii
-> Fto+	Fnari Fsae Fsika Fsura Fnomi Fbakari Fkiri Fyara Fka Fkoso
-> Fto+	Fdeha Fdemo Fha Fmade Fmo Snara
-1177c1197
-< Fnazo+	BB @KAKUJS dd dda2 dde1 ddar ddeha des rasii
----
-> Fnazo+	BB @KAKUJS ddat ddemo dda2 dde1 ddar ddeha des desho deshou rasii
-1188c1208
-< Fnari+	BB Kga Kno Kni Khe Kwo Kkara Kmade Kyori Kto dd dda2 dde1 ddar ddeha
----
-> Fnari+	BB Kga Kno Kni Khe Kwo Kkara Kmade Kyori Kto ddat ddemo dda2 dde1 ddar ddeha
-1192c1212
-< Fnomi+	BB @KAKUJS dd dda2 dde1 ddar ddeha des rasii na	/* ¤Î¤ß¡Ü¤Ê¤Î */
----
-> Fnomi+	BB @KAKUJS ddat ddemo dda2 dde1 ddar ddeha des desho deshou rasii na	/* ¤Î¤ß¡Ü¤Ê¤Î */
-1199c1219
-< Fbakari+ BB @KAKUJS dd dda1 dde1 ddar ddeha des rasii N2T18
----
-> Fbakari+ BB @KAKUJS ddat ddemo dda1 dde1 ddar ddeha djan des desho deshou rasii N2T18
-1207c1227
-< Fmade+	dd dda1 dde1 ddar ddeha des rasii N2T18 /* kx ¤Ï¤º¤¹Í½Äê */
----
-> Fmade+	ddat ddemo dda1 dde1 ddar ddeha djan des desho deshou rasii N2T18 /* kx ¤Ï¤º¤¹Í½Äê */
-1210c1230
-< Fmo+	BB @KAKUJS Fka Sto nai rasii dd dda2 dde2 ddar ddeha des
----
-> Fmo+	BB @KAKUJS Fka Sto nai rasii ddat ddemo dda2 dde2 ddar ddeha djan des desho deshou
-1223c1243
-< Fyue+	dd dda2 dde1 ddar ddeha des
----
-> Fyue+	ddat ddemo dda2 dde1 ddar ddeha des desho deshou
-1233c1253
-< Skara+	dd dda2 dde1 ddar ddeha des rasii N2T18
----
-> Skara+	ddat ddemo dda2 dde1 ddar ddeha djan des desho deshou rasii N2T18
-1279c1299
-< Snagara+ BB Kga dd dda2 dde1 ddar ddeha
----
-> Snagara+ BB Kga ddat ddemo dda2 dde1 ddar ddeha djan
-Index: dic/ideo/pubdic/a.p
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/pubdic/a.p,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-662c662
-< ¤¢¤¿¤é¤· ¿·¤· #KYmi 255
----
-> ¤¢¤¿¤é¤· ¿·¤· #KYme 255
-1072a1073,1074
-> ¤¢¤é¤ó¤«¤®¤ê¤Î ¤¢¤é¤ó¤«¤®¤ê¤Î #RT 0
-> ¤¢¤é¤ó¤«¤®¤ê¤Î ¤¢¤é¤ó¸Â¤ê¤Î #RT 0
-3706c3708
-< ¤¨¤ó¤º¤¤ ±ä¿ï #T35 0
----
-> ¤¨¤ó¤º¤¤ ±ä¿ñ #T35 0
-5563c5565,5567
-< ¤ª¤Ê¤¸ ¤ª¤Ê¤¸ #T35 0
----
-> ¤ª¤Ê¤¸ Ʊ¤¸ #RT 0
-> ¤ª¤Ê¤¸ ¤ª¤Ê¤¸ #T05 0
-> ¤ª¤Ê¤¸ ¤ª¤Ê¤¸ #RT 0
-Index: dic/ideo/pubdic/h.p
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/pubdic/h.p,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-3484c3484
-< ¤Õ¤ë ¸Å #KYmi 138
----
-> ¤Õ¤ë ¸Å #KYmime 138
-Index: dic/ideo/pubdic/k.p
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/pubdic/k.p,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-2895,2896c2895,2896
-< ¤­ ÀÚ #R5 152
-< ¤­ ¤­ #R5 6
----
-> ¤­ ÀÚ #R5r 152
-> ¤­ ¤­ #R5r 6
-7804c7804
-< ¤³¤Ä¤º¤¤ ¹ü¿ï #T35 0
----
-> ¤³¤Ä¤º¤¤ ¹ü¿ñ #T35 0
-Index: dic/ideo/pubdic/m.p
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/pubdic/m.p,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-2238c2238
-< ¤â ÌÏ #SX 45
----
-> ¤â ÌÏ #KJ 0
-2366a2367,2368
-> ¤â¤·¤¿ ÌϤ·¤¿ #RT 0
-> ¤â¤·¤Æ ÌϤ·¤Æ #F14 0
-2640a2643
-> ¤â¤ó¤À¤¤¤Ê ÌäÂê¤Ê #KY 0
-Index: dic/ideo/pubdic/n.p
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/pubdic/n.p,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-9a10
-> ¤Ê Ë´ #KY 0
-888a890
-> ¤Ë¤·¤á ¼ÑÀ÷¤á #KSr 0
-Index: dic/ideo/pubdic/pod.c
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/pubdic/pod.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-32a33
-> #include <stdlib.h>
-54c55
-< static FILE *in1 = stdin, *in2 = stdin;
----
-> static FILE *in1, *in2;
-1378a1380,1381
-> 
->   in1 = stdin, in2 = stdin;
-Index: dic/ideo/pubdic/t.p
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/pubdic/t.p,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-939,940c939,940
-< ¤¿¤È¤¨¤Ð ¤¿¤È¤¨¤Ð #CJ 5
-< ¤¿¤È¤¨¤Ð Î㤨¤Ð #F14 226
----
-> ¤¿¤È¤¨¤Ð ¤¿¤È¤¨¤Ð #T36 5
-> ¤¿¤È¤¨¤Ð Î㤨¤Ð #T36 226
-4496a4497,4501
-> ¤È¤Ã¤Æ ¤È¤Ã¤Æ #T35 0
-> ¤È¤Ã¤Æ ¼è¤Ã¼ê #T35 0
-> ¤È¤Ã¤Æ ¼è¼ê #T35 0
-> ¤È¤Ã¤Æ ÇĤüê #T35 0
-> ¤È¤Ã¤Æ Çļê #T35 0
-Index: dic/ideo/words/Imakefile
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/words/Imakefile,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-72,78c72,78
-< 	$(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
-Index: dic/ideo/words/dics.dir
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/words/dics.dir,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-35a36
-> suffix.ctd(.swd)		-suffix---
-Index: dic/ideo/words/hojomwd.t
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/words/hojomwd.t,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-24a25
-> ¤­¤ê¤¬¤Ê #KY ¤­¤ê¤¬¤Ê
-28c29
-< ¤Ê¤¢ #T35 @
----
-> ¤Ê¤¢ #CJ ¤Ê¤¢
-Index: dic/ideo/words/hojoswd.t
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/words/hojoswd.t,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-25c25
-< ¤« #ktec5a @ #ktok5a @
----
-> ¤« #ktok5a @
-33,34c33,34
-< ¤­¤ã #ktec5ya @ #ktok5ya @ #kykya @ #k5ya @ #c5rya @
-< ¤­¤ã¤¢ #ktec5ya @ #ktok5ya @ #kykya @ #k5ya @ #c5rya @
----
-> ¤­¤ã #ktok5ya @ #kykya @ #k5ya @
-> ¤­¤ã¤¢ #ktok5ya @ #kykya @ #k5ya @
-37c37
-< ¤¯ #ktec5u @ #ktok5u @
----
-> ¤¯ #ktok5u @
-42c42
-< ¤± #ktec5e @ #ktok5e @
----
-> ¤± #ktok5e @
-46c46
-< ¤³ #ktec5o @ #ktok5o @
----
-> ¤³ #ktok5o @
-56a57
-> ¤¸¤ã¤ó #djan @
-70d70
-< ¤Ã #ktec5tO @
-78a79
-> ¤Æ #kte2 @
-96c97
-< ¤Ï¤º #KN @
----
-> ¤Ï¤º #KN @ #TKN @
-104a106
-> ¤ä¤¬ #yagaru @
-112a115
-> ¤ï¤± #TKN @
-115a119
-> ¤ó¤Ç #Snode @
-Index: dic/ideo/words/keishiki.t
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/words/keishiki.t,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-29,30d28
-< ¤Û¤¦ #KN @
-< ¤Û¤« #KN @
-Index: dic/ideo/words/obsolete.dir
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/words/obsolete.dir,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-35c35
-< keishiki.t(.mwd)	-keishiki---
----
-> keishiki.t(.swd)	-keishiki---
-Index: dic/ideo/words/suffix.t
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/ideo/words/suffix.t,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-3c3
-< ¤Æ¤­ #N2T17*1187 Ū
----
-> ¤Æ¤­ #N2T16*1187 Ū
-Index: dic/phono/Imakefile
-===================================================================
-RCS file: /var/lib/cvs/canna/dic/phono/Imakefile,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-30,32c30,33
-<                DICDIR = $(cannaLibDir)/dic
-<             SAMPLEDIR = $(cannaLibDir)/sample
-<          SAMPLESRCDIR = $(cannaLibDir)/sample/src
----
->                DICDIR = $(DicDir)
->         CANNASHAREDIR = $(cannaShareDir)
->             SAMPLEDIR = $(cannaDocDir)/sample
->          SAMPLESRCDIR = $(cannaDocDir)/sample/src
-72c73
-< InstallMultiple($(ROMKANA_TABLES),$(DICDIR))
----
-> InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR))
-Index: lib/RK/RKintern.h
-===================================================================
-RCS file: /var/lib/cvs/canna/lib/RK/RKintern.h,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-36a37,39
-> #define FUJIEDA_HACK
-> /* Æ£»Þ¡÷£Ê£Á£É£Ó£Ô¤Î¥Ï¥Ã¥¯¤òÍ­¸ú¤Ë¤¹¤ë */
-> 
-101c104
-< # if defined(SYSV) || defined(SVR4)
----
-> # if defined(SYSV) || defined(SVR4) || defined(linux) || defined(__GNU__)
-610a614,616
-> #ifdef FUJIEDA_HACK
->   int			P_KJ; /* tankanji */
-> #endif
-684a691,693
-> #ifdef FUJIEDA_HACK
-> #define NW_DUMMY	0x08
-> #endif
-Index: lib/RK/context.c
-===================================================================
-RCS file: /var/lib/cvs/canna/lib/RK/context.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-177a178,180
-> #ifdef FUJIEDA_HACK
-> 		SG.P_KJ  = RkGetGramNum(SG.gramdic, "KJ");
-> #endif
-Index: lib/RK/dd.c
-===================================================================
-RCS file: /var/lib/cvs/canna/lib/RK/dd.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-30c30
-< #if defined(USG) || defined(SYSV) || defined(SVR4) || defined(WIN)
----
-> #if defined(USG) || defined(SYSV) || defined(SVR4) || defined(WIN) || defined(linux)
-1746c1746
-<     dicsdir = malloc(strlen(dd->dd_path + strlen("/dics.dir") + 1));
----
->     dicsdir = malloc(strlen(dd->dd_path) + strlen("/dics.dir") + 1);
-Index: lib/RK/nword.c
-===================================================================
-RCS file: /var/lib/cvs/canna/lib/RK/nword.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-210a211,213
-> #ifdef FUJIEDA_HACK
->     conc.nw_flags = p->nw_flags&(NW_PRE|NW_SUC|NW_SWD|NW_DUMMY);
-> #else
-211a215
-> #endif
-239a244,246
-> #ifdef FUJIEDA_HACK
-> 	conc.nw_flags |= (q->nw_flags & NW_DUMMY);
-> #endif
-701a709
-> #ifndef FUJIEDA_HACK
-705a714
-> #endif
-745a755,757
-> #ifdef FUJIEDA_HACK
-> 	    w[-1].nw_flags |= NW_DUMMY;
-> #endif
-987,988c999,1002
-< 		/* ¶çÆÉÅÀ¤½¤Î¾¤Î¾ì¹ç¤Ë¤Ïʸ¾ÏËö¸¡ºº¤ÏÉÔÍ× */
-< 		if (q->nw_class >= ND_OPN)
----
-> 		/* ¶çÆÉÅÀ¤Ê¤É¤Î¾ì¹ç¤È¡¢Æɤߤò¿Ô¤¯¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï
-> 		   ʸ¾ÏËö¸¡ºº¤ÏÉÔÍ× */
-> 		if (q->nw_class >= ND_OPN ||
-> 		    (doflush && yy + pq->nw_ylen == cx->store->nyomi))
-1352a1367,1383
-> #ifdef BUNMATU
-> static
-> struct nword	*
-> modifyPrio(cx, words)
->     struct RkContext	*cx;
->     struct nword	*words;
-> {
->   struct RkKxGram	*gram = cx->gram->gramdic;
->   struct nword		*w;
-> 
->   for (w = words; w; w = w->nw_next)
->     if (w->nw_prio > 0 && !IsBunmatu(gram, w->nw_rowcol))
-> 	w->nw_prio += 0x2000 << 4;
->   return words;
-> }
-> #endif
-> 
-1363a1395,1397
-> #ifdef BUNMATU
->   full = sortWord(modifyPrio(cx, parseBun(cx, yy, ys, ye, 1, 0, &maxclen)));
-> #else
-1364a1399
-> #endif
-1384a1420,1454
-> #define FUJIEDA_HACK
-> /* Æ£»Þ¡÷£Ê£Á£É£Ó£Ô¤Î¥Ï¥Ã¥¯¤òÍ­¸ú¤Ë¤¹¤ë */
-> 
-> #ifdef FUJIEDA_HACK
-> static
-> void
-> evalSplit(cx, suc, ul)
->      struct RkContext	*cx;
->      struct nword	*suc;
->      struct splitParm	*ul;
-> {
->   struct nword	*p;
->   unsigned	l2;
->   unsigned long	u2;
->   
->   l2 = 0;
->   u2 = 0L;
->   for (p = suc; p; p = p->nw_next)  
->   {
->     if (!CanSplitWord(p) || /* ʸÀá¤Ë¤Ê¤é¤Ê¤¤ */
-> 	OnlyBunmatu(p) || /* ¥ê¥Æ¥é¥ë¤ÎľÁ°¤Ç¤·¤«Ê¸Àá¤Ë¤Ê¤ì¤Ê¤¤ */
-> 	(p->nw_rowcol == cx->gram->P_KJ) || /* ñ´Á»ú */
-> 	(p->nw_flags & NW_DUMMY) || /* ÙÔ¤¤µ¤ì¤¿Ì¾»ì */
-> 	(p->nw_flags & NW_SUC))
->       continue;
->     if (l2 <= p->nw_ylen) {
->       l2 = p->nw_ylen;
->       if (u2 < p->nw_prio)
->         u2 = p->nw_prio;
->     }
->   }
->   ul->l2 = l2;
->   ul->u2 = u2;
-> }
-> #else /* FUJIEDA_HACK */
-1398a1469,1471
-> #ifdef BUNMATU
->     if (!CanSplitWord(p) || OnlyBunmatu(p) || (p->nw_flags & NW_SUC))
-> #else
-1399a1473
-> #endif
-1402a1477,1480
-> #ifdef FUJIEDA_HACK
->     /* Æɤߤ¬°ìʸ»ú¤Îñ¸ì¤ÎÍ¥ÀèÅ٤ϹÍθ¤·¤Ê¤¤ */
->     if (u2 < p->nw_prio && p->nw_ylen > 1)
-> #else
-1403a1482
-> #endif
-1408a1488
-> #endif /* FUJIEDA_HACK */
-1421a1502,1505
-> #ifdef FUJIEDA_HACK
->   int			L, L1 = 0, L2;
->   unsigned long		U;
-> #else
-1423a1508
-> #endif
-1450a1536,1538
-> #ifdef FUJIEDA_HACK
->     U = 0L;
-> #else
-1451a1540
-> #endif
-1457c1546,1549
-<       int				l, l1;
----
->       int			l, l1;
-> #ifdef FUJIEDA_HACK
->       unsigned long		u;
-> #endif
-1459c1551
-<       /* ichido ni 2tu tukomono ha yameru */
----
->       /* ʸÀá¤Ë¤Ê¤é¤Ê¤¤ */
-1466c1558
-<       /* mijikasugiru/bunsetumatu ni narenai  monoha hazusu */
----
->       /* Æɤߤò¾ÃÈñ¤·¤Æ¤¤¤Ê¤¤ */
-1471c1563
-<       /* shuujoushi ha bun no tochuu deha tukanai */
----
->       /* °ìʸÀá¤Ë¤¹¤ë¤Î¤¬ºÇĹ */
-1483c1575,1582
-<       /* migi donari no bunsetsu wo kaiseki */
----
-> #ifdef FUJIEDA_HACK
->       /* ñ´Á»ú¤Ïʸ¤ÎÅÓÃæ¤ËÅо줷¤Ê¤¤ */
->       if (w->nw_rowcol == cx->gram->P_KJ) {
->         DontSplitWord(w);
->         continue;
->       }
-> #endif
->       /* ±¦ÎÙ¤ÎʸÀá¤ò²òÀÏ */
-1486c1585,1589
-< 	  evalSplit(xq[l1].tree, &ul2[l1]);
----
-> #ifdef FUJIEDA_HACK
->         evalSplit(cx, xq[l1].tree, &ul2[l1]);
-> #else
->         evalSplit(xq[l1].tree, &ul2[l1]);
-> #endif
-1490c1593,1597
-< 	evalSplit(xq[l1].tree, &ul);
----
-> #ifdef FUJIEDA_HACK
->       evalSplit(cx, xq[l1].tree, &ul);
-> #else
->       evalSplit(xq[l1].tree, &ul);
-> #endif
-1493a1601,1612
-> #ifdef FUJIEDA_HACK
->       u = w->nw_prio + ul.u2;
->       if ((L < l) || /* ÆóʸÀáºÇĹ */
->         ((L == l) &&
->          (U < u || /* Í¥ÀèÅ٤ιç·× */
->           (U == u && (L2 < ul.l2))))) { /* ÆóʸÀáÌܤÎŤµ */
->         L = l;
->         U = u;
->         L1 = l1;
->         L2 = ul.l2;
->       }
-> #else
-1502a1622
-> #endif
-2002a2123
-> /*
-2004a2126
-> */
-Index: lib/RK/permdic.c
-===================================================================
-RCS file: /var/lib/cvs/canna/lib/RK/permdic.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-259a260,262
-> #ifdef FUJIEDA_HACK
-> 	dm->dm_gram->P_KJ  = RkGetGramNum(gram, "KJ");
-> #endif
-Index: lib/RKC/rkc.h
-===================================================================
-RCS file: /var/lib/cvs/canna/lib/RKC/rkc.h,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-45c45
-< # if defined(SYSV) || defined(SVR4) || defined(WIN)
----
-> # if defined(SYSV) || defined(SVR4) || defined(WIN) || defined(linux) || defined(__GNU__)
-Index: lib/canna/Imakefile
-===================================================================
-RCS file: /var/lib/cvs/canna/lib/canna/Imakefile,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-119,120c119,120
-< sglobal.h: GSYM.awk globnames
-< 	awk -f GSYM.awk < globnames > $@
----
-> includes::
-> 	awk -f GSYM.awk < globnames > sglobal.h
-Index: lib/canna/canna.h
-===================================================================
-RCS file: /var/lib/cvs/canna/lib/canna/canna.h,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-109c109
-< # if defined(SYSV) || defined(SVR4)
----
-> # if defined(SYSV) || defined(SVR4) || defined(linux) || defined(__GNU__)
-Index: lib/canna/ebind.c
-===================================================================
-RCS file: /var/lib/cvs/canna/lib/canna/ebind.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-208c208
-<   inbuf[0] = (wchar_t)buffer_return[0];
----
->   inbuf[0] = (wchar_t)(buffer_return[0] & 0xff);
-210c210
-<     inbuf[i] = (wchar_t)buffer_return[i];
----
->     inbuf[i] = (wchar_t)(buffer_return[i] & 0xff);
-Index: lib/canna/romaji.c
-===================================================================
-RCS file: /var/lib/cvs/canna/lib/canna/romaji.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-39a40
-> /* Comment out original code.
-44a46,48
-> */
-> /* Canna 3.5b2 have only cbp files. */
-> #define DEFAULT_ROMKANA_TABLE "/dic/default.cbp"
-392c396
-< 
----
-> 	
-403c407
-< 
----
-> 	
-412a417
->       }
-414,415c419,435
-< 	if (retval == (struct RkRxDic *)NULL) { /* Á´Éô¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤ */
-< 	  sprintf(rdic, 
----
->       if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi <ishikawa@linux.or.jp> */
->         extern jrUserInfoStruct *uinfo;
-> 	
->         rdic[0] = '\0';
->         if (uinfo && uinfo->topdir) {
-> 	  strcpy(rdic, uinfo->topdir);
->         }
->         else {
->           strcpy(rdic, CANNALIBDIR);
->         }
-> 	strcat(rdic, "/");
-> 	strcat(rdic, table);
-> 	retval = RkwOpenRoma(rdic);
-> 	
-> 	if (ckverbose) {
-> 	  if (retval != (struct RkRxDic *)NULL) {
-> 	    if (ckverbose == CANNA_FULL_VERBOSE) {
-417,428c437,440
-< 		  "¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë(%s)¤¬¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£",
-< #else
-< 	"\245\355\241\274\245\336\273\372\244\253\244\312"
-< 	"\312\321\264\271\245\306\241\274\245\326\245\353\50\45\163\51\244\254"
-< 	"\245\252\241\274\245\327\245\363\244\307\244\255\244\336\244\273"
-< 	"\244\363\241\243",
-< #endif
-< 		  table);
-<            /* ¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë(%s)¤¬¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£ */
-< 	  addWarningMesg(rdic);
-< 	  retval = (struct RkRxDic *)0;
-< 	  goto return_ret;
----
->               printf("¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë¤Ï \"%s\" ¤òÍѤ¤¤Þ¤¹¡£\n", rdic);
-> #endif
-> 	    }
-> 	  }
-430a443,483
->       
->       if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi <ishikawa@linux.or.jp> */
->         extern jrUserInfoStruct *uinfo;
-> 	
->         rdic[0] = '\0';
->         if (uinfo && uinfo->topdir) {
-> 	  strcpy(rdic, uinfo->topdir);
->         }
->         else {
->           strcpy(rdic, CANNASHAREDIR);
->         }
-> 	strcat(rdic, "/");
-> 	strcat(rdic, table);
-> 	retval = RkwOpenRoma(rdic);
-> 	
-> 	if (ckverbose) {
-> 	  if (retval != (struct RkRxDic *)NULL) {
-> 	    if (ckverbose == CANNA_FULL_VERBOSE) {
-> #ifndef WIN
->               printf("¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë¤Ï \"%s\" ¤òÍѤ¤¤Þ¤¹¡£\n", rdic);
-> #endif
-> 	    }
-> 	  }
-> 	}
->       }
->       
->       if (retval == (struct RkRxDic *)NULL) { /* Á´Éô¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤ */
-> 	sprintf(rdic, 
-> #ifndef WIN
-> 		"¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë(%s)¤¬¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£",
-> #else
-> 		"\245\355\241\274\245\336\273\372\244\253\244\312"
-> 		"\312\321\264\271\245\306\241\274\245\326\245\353\50\45\163\51\244\254"
-> 		"\245\252\241\274\245\327\245\363\244\307\244\255\244\336\244\273"
-> 		"\244\363\241\243",
-> #endif
-> 		table);
-> 	/* ¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë(%s)¤¬¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£ */
-> 	addWarningMesg(rdic);
-> 	retval = (struct RkRxDic *)0;
->       }
-433c486
-<  return_ret:
----
-> 
-Index: misc/Imakefile
-===================================================================
-RCS file: /var/lib/cvs/canna/misc/Imakefile,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-8a9
-> #ifdef engineSwitch
-10a12,15
-> #else
->        PROGRAMS = default.canna
-> #endif
-> 
-22a28
-> #ifdef engineSwitch
-24a31
-> #endif
-31c38
-< MakeDirectories(install,$(cannaLibDir)/sample/src)
----
-> MakeDirectories(install,$(cannaDocDir)/sample/src)
-33c40
-< InstallNamedNonExec(rMakefile,Makefile,$(cannaLibDir)/sample/src)
----
-> InstallNamedNonExec(rMakefile,Makefile,$(cannaDocDir)/sample/src)
-35c42
-< InstallNamedNonExec(cMakefile,Makefile,$(cannaLibDir)/sample/src)
----
-> InstallNamedNonExec(cMakefile,Makefile,$(cannaDocDir)/sample/src)
-46,47c53,54
-< InstallNonExec(default.canna,$(cannaLibDir))
-< InstallNonExec(is.c,$(cannaLibDir)/sample/src)
----
-> InstallNonExec(default.canna,$(cannaEtcDir))
-> InstallNonExec(is.c,$(cannaDocDir)/sample/src)
-Index: misc/default.ca
-===================================================================
-RCS file: /var/lib/cvs/canna/misc/default.ca,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-37c37
-< ;; °ìÍ÷ɽ¼¨¾õÂÖ¤«¤é¡¢Ê¸»ú¿­½Ì¤ò¹Ô¤¦¡£
----
-> ;; key bindings to extend and shrink the conversion area
-41c41
-< ;; ¥·¥ó¥Ü¥ë¤ÎÄêµÁ
----
-> ;; symbol definitions
-Index: misc/initfiles/Imakefile
-===================================================================
-RCS file: /var/lib/cvs/canna/misc/initfiles/Imakefile,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-9c9
-<             SAMPLEDIR = $(cannaLibDir)/sample
----
->             SAMPLEDIR = $(cannaShareDir)
-Index: server/IR.h
-===================================================================
-RCS file: /var/lib/cvs/canna/server/IR.h,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-31c31
-< # if defined(SYSV) || defined(SVR4)
----
-> # if defined(SYSV) || defined(SVR4) || defined(linux) || defined(__GNU__)
-Index: server/connection.c
-===================================================================
-RCS file: /var/lib/cvs/canna/server/connection.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-87a88,92
-> #ifdef USE_INET_SOCKET
-> /* flag for using INET Domain Socket */
-> extern int UseInet;
-> #endif
-> 
-223,231c228,237
-<   if ((request = open_inet_socket ()) != -1)
-<   {
-<     WellKnownConnections |= (1L << request);
-<   }
-<   else
-<   {
-<     ir_debug( Dmsg(5,"Warning: INET domain not created.\n");)
-<     return 0; /* ºîÀ®¤Ë¼ºÇÔ */
-<   }
----
->   if(UseInet){
->     if ((request = open_inet_socket ()) != -1)
->     {
->       WellKnownConnections |= (1L << request);
->     }
->     else
->     {
->       ir_debug( Dmsg(5,"Warning: INET domain not created.\n");)
->       return 0; /* ºîÀ®¤Ë¼ºÇÔ */
->     }
-233c239,240
-<   ir_debug( Dmsg(3,"£É£Î£Å£Ô¥É¥á¥¤¥ó¤Ï¤Ç¤­¤¿\n"); )
----
->     ir_debug( Dmsg(3,"£É£Î£Å£Ô¥É¥á¥¤¥ó¤Ï¤Ç¤­¤¿\n"); )
->   }
-Index: server/misc.c
-===================================================================
-RCS file: /var/lib/cvs/canna/server/misc.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-49d48
-< #include <sys/types.h>
-52a52
-> #include <pwd.h>
-53a54
-> #include <sys/types.h>
-89a91,103
-> static char *userID=NULL; /* canna server's user id */
-> 
-> #ifdef USE_INET_SOCKET
-> /* flag for using INET Domain Socket */
-> #ifdef USE_UNIX_SOCKET
-> /* Not to use INET domain socket, if can use Unix Domain Socket */
-> int UseInet = 0;
-> #else
-> /* if can use Unix Domain Socket, Use INET domain socket */
-> int UseInet = 1;
-> #endif
-> #endif
-> 
-102c116
-< #define USAGE "Usage: cannaserver [-p num] [-l num] [-d] [-syslog] [dichome]"
----
-> #define USAGE "Usage: cannaserver [-p num] [-l num] [-u userid] [-syslog] [-inet] [-d] [dichome]"
-119a134
->     struct  passwd *pwent;
-139a155,169
-> 	else if( !strcmp( argv[i], "-u")) {
-> 	  if (++i < argc) {
-> 	    userID = argv[i];
-> 	  }
-> 	  else {
-> 	    fprintf(stderr, "%s\n", USAGE);
-> 	    exit(2);
-> 	    /* NOTREACHED */
-> 	  }
-> 	}
-> #ifdef USE_INET_SOCKET
-> 	else if( !strcmp( argv[i], "-inet")) {
-> 	  UseInet = 1;
-> 	}
-> #endif
-170a201,217
->     if (userID != NULL) {
->         pwent = getpwnam(userID);
-> 	if (pwent) {
-> 	    if(setgid(pwent->pw_gid)) {
-> 	        FatalError("cannaserver:couldn't set groupid to canna user's group\n");	  
-> 	    }
-> 	    if (initgroups(userID, pwent->pw_gid)) {
-> 	        FatalError("cannserver: couldn't init supplementary groups\n");
-> 	    }
-> 	    if (setuid(pwent->pw_uid)) {
-> 	        FatalError("cannaserver: couldn't set userid to %s user\n", userID);
-> 	    }
-> 	} else if (userID != NULL) {
-> 	    FatalError("cannaserver: -u flag specified, but canna not run as root\n");
-> 	}
->     }
-> 
-563,564d609
-<     if( current )
-< 	current->next = (ACLPtr)NULL ;
-651a697,702
-> 	if (strlen(DDUSER) + strlen(client->username) +
-> 	    strlen(DDGROUP) + strlen(client->groupname) +
-> 	    strlen(DDPATH) + 4 >= 256) {
-> 	  return(-1);
-> 	}
-> 
-657a709,712
->         if (strlen(DDUSER) + strlen(client->username) +
-> 	    strlen(DDPATH) + 2 >= 256) {
-> 	  return(-1);
-> 	}
-Index: server/server.man
-===================================================================
-RCS file: /var/lib/cvs/canna/server/server.man,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -r1.1.1.1 -r1.2
-31c31
-< users on the network can access cannaserver(1M).  The scope of
----
-> users on the network can access cannaserver.  The scope of
-35c35
-< After starting, cannaserver(1M) immediately forks and enters the
----
-> After starting, cannaserver immediately forks and enters the
-39c39
-< When starting, cannaserver(1M) creates the lock file
----
-> When starting, cannaserver creates the lock file
-41,43c41,43
-< 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
----
-> lock file is deleted automatically at the end of cannaserver if no
-> trouble occurs.  The lock file may exist although cannaserver is
-> not in operation (because cannaserver terminates abnormally, for
-46c46
-< When starting, cannaserver(1M) examines
----
-> When starting, cannaserver examines
-59c59
-< Outputs the cannaserver(1M) log to /tmp/canna.log.  n (1 to 5)
----
-> Outputs the cannaserver log to /tmp/canna.log.  n (1 to 5)
-62c62
-< Starts cannaserver(1M) in debug mode.  It is executed as the
----
-> Starts cannaserver in debug mode.  It is executed as the
-68,69c68,69
-< .IP "@(cannaLibDir)/dic/*/dics.dir" 36
-< Dictionary directory
----
-> .IP "@(DicDir)/dics.dir" 36
-> Dictionary list
-73c73
-< Premount dictionary list
----
-> Premounted dictionary list
-76c76
-< cannakill(1M), cannastat(1), cannacheck(1)
----
-> cannakill(1), cannastat(1), cannacheck(1)
diff --git a/app-i18n/canna/files/canna.initd b/app-i18n/canna/files/canna.initd
index a037f5bae903..036ff823ada0 100644
--- a/app-i18n/canna/files/canna.initd
+++ b/app-i18n/canna/files/canna.initd
@@ -1,28 +1,37 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/files/canna.initd,v 1.4 2003/05/17 19:15:26 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/files/canna.initd,v 1.5 2004/05/04 18:12:04 usata Exp $
 
 # CANNASERVER_OPTS is defined in /etc/conf.d/canna
 
+depend() {
+	after logger
+}
+
 start() {
+	if [ -S /tmp/.iroha_unix/IROHA ] ; then
+		/usr/sbin/cannakill >/dev/null 2>&1
+	fi
+	rm -f /tmp/.iroha_unix/IROHA
+
+	if [ "${CANNASERVER_OPTS}" = "${CANNASERVER_OPTS/-syslog/}" ] ; then
+		if [ ! -f /var/log/canna/CANNA0msgs ] ; then
+			touch /var/log/canna/CANNA0msgs
+		fi
+		if [ "${CANNASERVER_OPTS}" != "${CANNASERVER_OPTS/-u/}" ] ; then
+			chown `echo ${CANNASERVER_OPTS} | sed -e 's/.*-u *\(\w*\).*/\1/'` /var/log/canna/CANNA0msgs
+		fi
+		chmod u+w /var/log/canna/CANNA0msgs
+	fi
+
 	ebegin "Starting canna"
 	/usr/sbin/cannaserver ${CANNASERVER_OPTS}
 	eend $? "Failed to start canna"
 }
 
 stop() {
-	if [ -x /usr/sbin/cannakill ]; then
-		CANNAKILL="/usr/sbin/cannakill"
-	elif [ -x /usr/bin/cannakill ]; then
-		CANNAKILL="/usr/bin/cannakill"
-	else
-		eerror "file not found: cannakill"
-		return 1
-	fi
-
 	ebegin "Stopping canna"
-	${CANNAKILL}
+	/usr/sbin/cannakill
 	eend $? "Failed to stop canna"
 }
-
diff --git a/app-i18n/canna/files/canna.initd.new b/app-i18n/canna/files/canna.initd.new
deleted file mode 100644
index 27cf1e064072..000000000000
--- a/app-i18n/canna/files/canna.initd.new
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/files/canna.initd.new,v 1.1 2003/09/22 19:26:04 usata Exp $
-
-# CANNASERVER_OPTS is defined in /etc/conf.d/canna
-
-depend() {
-	after logger
-}
-
-start() {
-	if [ -S /tmp/.iroha_unix/IROHA ] ; then
-		/usr/sbin/cannakill >/dev/null 2>&1
-	fi
-	rm -f /tmp/.iroha_unix/IROHA
-
-	if [ "${CANNASERVER_OPTS}" = "${CANNASERVER_OPTS/-syslog/}" ] ; then
-		if [ ! -f /var/log/canna/CANNA0msgs ] ; then
-			touch /var/log/canna/CANNA0msgs
-		fi
-		if [ "${CANNASERVER_OPTS}" != "${CANNASERVER_OPTS/-u/}" ] ; then
-			chown `echo ${CANNASERVER_OPTS} | sed -e 's/.*-u *\(\w*\).*/\1/'` /var/log/canna/CANNA0msgs
-		fi
-		chmod u+w /var/log/canna/CANNA0msgs
-	fi
-
-	ebegin "Starting canna"
-	/usr/sbin/cannaserver ${CANNASERVER_OPTS}
-	eend $? "Failed to start canna"
-}
-
-stop() {
-	ebegin "Stopping canna"
-	/usr/sbin/cannakill
-	eend $? "Failed to stop canna"
-}
diff --git a/app-i18n/canna/files/digest-canna-3.5_beta2-r2 b/app-i18n/canna/files/digest-canna-3.5_beta2-r2
deleted file mode 100644
index aec39c35191f..000000000000
--- a/app-i18n/canna/files/digest-canna-3.5_beta2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09ae4dd3a5d33168ba17470ad9242cf3 Canna35b2.tar.gz 1333329
diff --git a/app-i18n/canna/files/digest-canna-3.7_p1 b/app-i18n/canna/files/digest-canna-3.7_p1
new file mode 100644
index 000000000000..1154a63e2a43
--- /dev/null
+++ b/app-i18n/canna/files/digest-canna-3.7_p1
@@ -0,0 +1 @@
+MD5 849102b32a84cf48cddc150a1fcd83ad Canna37p1.tar.bz2 1261687