From 8afc3ddba3da98e5f426fa7bf8adf7b490c07c22 Mon Sep 17 00:00:00 2001
From: uebayasi <uebayasi>
Date: Tue, 23 Sep 2003 15:06:57 +0000
Subject: 1) Update Canna to 3.6p4.

* Reconstruct sample init files.
* RC-style start script.
* Auto-registration of Kana conversion.
* Abolish fuzokugo.cld.
* More key symbols can be configured with Lisp.
* Server returns more appropriate values at abort.
* TeX document improvements.
* And many bug fixes.

2) Make Canuum use Canna's common make files.  From Osamu Oishi in PR 22244.
---
 inputmethod/canna-dict/Makefile | 6 +++---
 inputmethod/canna-dict/PLIST    | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'inputmethod/canna-dict')

diff --git a/inputmethod/canna-dict/Makefile b/inputmethod/canna-dict/Makefile
index c5150bc34f2..c35bb66e026 100644
--- a/inputmethod/canna-dict/Makefile
+++ b/inputmethod/canna-dict/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2003/05/31 08:28:33 uebayasi Exp $
+# $NetBSD: Makefile,v 1.6 2003/09/23 15:06:59 uebayasi Exp $
 #
 .include "../canna/Makefile.common"
 
 CANNA_MODULE=	dict
 
-BUILD_DEPENDS+=	Canna-server-bin>=${CANNA_VERSION}:../canna-server-bin
+BUILD_DEPENDS+=	Canna-server>=${CANNA_VERSION}:../canna-server
 
 NO_MTREE=	yes
 OWN_DIRS=	${PREFIX}/canna
 
-EVAL_PREFIX+=	CANNASERVERBINDIR=Canna-server-bin
+EVAL_PREFIX+=	CANNASERVERBINDIR=Canna-server
 .for cmd in MERGE FORCPP FORSORT SPLITWORD MERGEWORD CRXGRAM CRXDIC CRFREQ KPDIC
 CANNA_CMD_SED_SCRIPT+=-e 's|\(${cmd} = \).*/\(.*\)|\1${CANNASERVERBINDIR}/bin/\2|'
 .endfor
diff --git a/inputmethod/canna-dict/PLIST b/inputmethod/canna-dict/PLIST
index 1961a80c42c..71b879d3390 100644
--- a/inputmethod/canna-dict/PLIST
+++ b/inputmethod/canna-dict/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/10 09:05:09 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/09/23 15:06:59 uebayasi Exp $
 canna/canna/bushu.cld
 canna/canna/chimei.ctd
 canna/canna/dics.dir
 canna/canna/fuzokugo.cbd
-canna/canna/fuzokugo.cld
 canna/canna/hojomwd.ctd
 canna/canna/hojoswd.ctd
 canna/canna/iroha.cbd
-- 
cgit v1.2.3