Update anthy to 6300.

ChangeLog:
* cannadic/ update to cannadic-0.95c
* src/splitter/commit.c fix mis-computation of segment length which
can cause out of array bound access
* use Hidden Markov Model to find segment boundary.

5 files changed, 33 insertions, 10 deletions

diff --git a/inputmethod/anthy/Makefile b/inputmethod/anthy/Makefile
index 7df0d3001ca..9792a6a2f06 100644
--- a/inputmethod/anthy/Makefile
+++ b/inputmethod/anthy/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/12/28 05:35:29 taya Exp $
+# $NetBSD: Makefile,v 1.3 2005/03/03 15:34:08 taya Exp $
 
 .include	"../../inputmethod/anthy/Makefile.common"
 
-PKGREVISION=	1
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	taya@NetBSD.org
@@ -15,6 +14,8 @@ GNU_CONFIGURE=		yes
 
 CONFIGURE_ENV+=		EMACS=no
 
+PKGCONFIG_OVERRIDE+=	anthy.pc.in
+
 # Global and legacy options
 .if defined(USE_2CH_DICT) && !empty(USE_2CH_DICT:M[Yy][Ee][Ss])
 PKG_DEFAULT_OPTIONS+=	2ch_dict
diff --git a/inputmethod/anthy/Makefile.common b/inputmethod/anthy/Makefile.common
index 0c0ab24fd78..30ea042c608 100644
--- a/inputmethod/anthy/Makefile.common
+++ b/inputmethod/anthy/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.1 2004/12/28 05:40:23 taya Exp $
+# $NetBSD: Makefile.common,v 1.2 2005/03/03 15:34:08 taya Exp $
 
-ANTHY_VERSION=	5900
+ANTHY_VERSION=	6300
 DISTNAME=	anthy-${ANTHY_VERSION}
 CATEGORIES=	inputmethod
-MASTER_SITES=	http://downloads.sourceforge.jp/anthy/12071/
+MASTER_SITES=	http://downloads.sourceforge.jp/anthy/13543/
 DISTFILES=	${DISTNAME}.tar.gz
 
 DISTINFO_FILE=	${.CURDIR}/../../inputmethod/anthy/distinfo
diff --git a/inputmethod/anthy/PLIST b/inputmethod/anthy/PLIST
index c5da309ad12..5c397affd38 100644
--- a/inputmethod/anthy/PLIST
+++ b/inputmethod/anthy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/12/28 05:35:29 taya Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/03/03 15:34:08 taya Exp $
 bin/anthy-agent
 bin/anthy-dic-tool
 etc/anthy-conf
@@ -8,6 +8,7 @@ include/anthy/input.h
 lib/libanthy.la
 lib/libanthydic.la
 lib/libanthyinput.la
+lib/pkgconfig/anthy.pc
 share/anthy/a.depword
 share/anthy/ajv.depword
 share/anthy/anthy.dic
diff --git a/inputmethod/anthy/buildlink3.mk b/inputmethod/anthy/buildlink3.mk
new file mode 100644
index 00000000000..3aced3ccd30
--- /dev/null
+++ b/inputmethod/anthy/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2005/03/03 15:34:08 taya Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+ANTHY_BUILDLINK3_MK:=	${ANTHY_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	anthy
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nanthy}
+BUILDLINK_PACKAGES+=	anthy
+
+.if !empty(ANTHY_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.anthy+=	anthy>=6300
+BUILDLINK_PKGSRCDIR.anthy?=	../../inputmethod/anthy
+.endif  # ANTHY_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/inputmethod/anthy/distinfo b/inputmethod/anthy/distinfo
index e24f6ff8943..70b5a54ee60 100644
--- a/inputmethod/anthy/distinfo
+++ b/inputmethod/anthy/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 21:00:35 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/03/03 15:34:08 taya Exp $
 
-SHA1 (anthy-5900.tar.gz) = 2f7cc9d4077d733d88859fc643203b68d35b7308
-RMD160 (anthy-5900.tar.gz) = b4d0377885edef41358dcd34b1a753187ccfc379
-Size (anthy-5900.tar.gz) = 1566783 bytes
+SHA1 (anthy-6300.tar.gz) = bce93631d3249aa551f708bcb9b4724b26f71a70
+RMD160 (anthy-6300.tar.gz) = d6bdad88e15ef4edb0ead94dd65c14295dd9e53e
+Size (anthy-6300.tar.gz) = 2020760 bytes
 SHA1 (2ch.t) = 2160d7b0079e2c1a14093da968f34e7f8dbc07c2
+RMD160 (2ch.t) = b05902485829eebb4e09c554f095275f5278dd8b
 Size (2ch.t) = 142157 bytes
 SHA1 (okinawa-20041220.t) = 2dc67628363dfe087dae4a70ef5517c989ed7644
+RMD160 (okinawa-20041220.t) = dedf4d4725cf31114ff68524a9df63f357cb45a8
 Size (okinawa-20041220.t) = 145992 bytes
+SHA1 (patch-aa) = 79816563a3d1ff853bc1edcbfee7e22ae2e26991