Update to 9100, provided by Yamashiro Jun in PR 36675.

anthy-9100:
* Fix kana-kanji transformation algorithm.
* New version of kana-kanji dictionary.

pkgsrc change:
* Update additional Japanese kana-kanji dictionary: okinawa-20070717.t

5 files changed, 15 insertions, 35 deletions

diff --git a/inputmethod/anthy/Makefile b/inputmethod/anthy/Makefile
index cbc3aee24a6..a00f9bc3a4d 100644
--- a/inputmethod/anthy/Makefile
+++ b/inputmethod/anthy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/01/20 17:11:52 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/08/30 20:19:45 wiz Exp $
 
 .include	"../../inputmethod/anthy/Makefile.common"
 
@@ -25,13 +25,13 @@ post-patch:
 .if !empty(PKG_OPTIONS:Manthy-2ch-dict)
 	${CP} ${DISTDIR}/2ch.t ${WRKSRC}/mkworddic
 	# Don't change "\n".
-	@${PRINTF} "/read @top_srcdir@\\\\/mkworddic\\\\/placename.t\na\nread @top_srcdir@/mkworddic/2ch.t\n.\nw\n" | \
+	@${PRINTF} "/read @top_srcdir@\\\\/mkworddic\\\\/base.t\na\nread @top_srcdir@/mkworddic/2ch.t\n.\nw\n" | \
 	ed -s ${WRKSRC}/mkworddic/dict.args.in
 .endif
 .if !empty(PKG_OPTIONS:Manthy-okinawa-dict)
 	${CP} ${DISTDIR}/${OKIDIC_VERSION}.t ${WRKSRC}/mkworddic/okinawa.t
 	# Don't change "\n".
-	@${PRINTF} "/read @top_srcdir@\\\\/mkworddic\\\\/placename.t\na\nread @top_srcdir@/mkworddic/okinawa.t\n.\nw\n" | \
+	@${PRINTF} "/read @top_srcdir@\\\\/mkworddic\\\\/base.t\na\nread @top_srcdir@/mkworddic/okinawa.t\n.\nw\n" | \
 	ed -s ${WRKSRC}/mkworddic/dict.args.in
 .endif
 
diff --git a/inputmethod/anthy/Makefile.common b/inputmethod/anthy/Makefile.common
index 3a3a4bfb899..15ecfdfc4ff 100644
--- a/inputmethod/anthy/Makefile.common
+++ b/inputmethod/anthy/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.6 2007/01/20 17:11:52 wiz Exp $
+# $NetBSD: Makefile.common,v 1.7 2007/08/30 20:19:45 wiz Exp $
 
-ANTHY_VERSION=	7900
+ANTHY_VERSION=	9100
 DISTNAME=	anthy-${ANTHY_VERSION}
 CATEGORIES=	inputmethod
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=anthy/20887/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=anthy/26131/}
 DISTFILES=	${DISTNAME}.tar.gz
 
 DISTINFO_FILE=	${.CURDIR}/../../inputmethod/anthy/distinfo
diff --git a/inputmethod/anthy/distinfo b/inputmethod/anthy/distinfo
index dbf24d65593..a81567b8fa0 100644
--- a/inputmethod/anthy/distinfo
+++ b/inputmethod/anthy/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.9 2007/01/20 17:11:52 wiz Exp $
+$NetBSD: distinfo,v 1.10 2007/08/30 20:19:45 wiz Exp $
 
 SHA1 (2ch.t) = 2160d7b0079e2c1a14093da968f34e7f8dbc07c2
 RMD160 (2ch.t) = b05902485829eebb4e09c554f095275f5278dd8b
 Size (2ch.t) = 142157 bytes
-SHA1 (anthy-7900.tar.gz) = 9b3ae54ebf81e7aedb095f7c4a3b97027557c258
-RMD160 (anthy-7900.tar.gz) = fd28f5925fa981fe173f115f5e1919899fa92037
-Size (anthy-7900.tar.gz) = 3604440 bytes
-SHA1 (okinawa-20060917.t) = d6497f2fd152331f82e967974022333462d4b9e9
-RMD160 (okinawa-20060917.t) = 801df2a7d597c05aa106bcfdec1e609bdb23909d
-Size (okinawa-20060917.t) = 153341 bytes
-SHA1 (patch-aa) = 79816563a3d1ff853bc1edcbfee7e22ae2e26991
+SHA1 (anthy-9100.tar.gz) = 2e49613de5f85a42e15d8281ee47668d85d8a2a1
+RMD160 (anthy-9100.tar.gz) = 0ef5c84429cb5a9641f1a0a6e88c065f2ab25688
+Size (anthy-9100.tar.gz) = 4069385 bytes
+SHA1 (okinawa-20070717.t) = 4f90271591fc97a069c971997a91e3b87b6bb828
+RMD160 (okinawa-20070717.t) = 52da8e7e68f213190d6395de6181229d513328bb
+Size (okinawa-20070717.t) = 158199 bytes
diff --git a/inputmethod/anthy/options.mk b/inputmethod/anthy/options.mk
index 29c526a1a80..77fdcf62384 100644
--- a/inputmethod/anthy/options.mk
+++ b/inputmethod/anthy/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2007/01/20 17:11:52 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2007/08/30 20:19:45 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.anthy
 PKG_SUPPORTED_OPTIONS=	anthy-2ch-dict anthy-okinawa-dict
@@ -16,7 +16,7 @@ SITES.2ch.t+=	http://omaemona.sourceforge.net/packages/Zisyo/
 .endif
 
 .if !empty(PKG_OPTIONS:Manthy-okinawa-dict)
-OKIDIC_VERSION=			okinawa-20060917
+OKIDIC_VERSION=			okinawa-20070717
 DISTFILES+=			${OKIDIC_VERSION}.t
 SITES.${OKIDIC_VERSION}.t+=	http://www.ofug.net/~yamajun/files/
 .endif
diff --git a/inputmethod/anthy/patches/patch-aa b/inputmethod/anthy/patches/patch-aa
deleted file mode 100644
index b96fcac7669..00000000000
--- a/inputmethod/anthy/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/03/03 15:40:14 taya Exp $
-
---- anthy.pc.in.orig	2004-08-29 04:34:47.000000000 +0900
-+++ anthy.pc.in	2005-03-04 00:08:13.000000000 +0900
-@@ -1,8 +1,13 @@
- #To Be Done
- # See http://www.freedesktop.org/Software/pkgconfig
- 
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
- Name: anthy
- Description: Japanese conversion engine
- Version: @VERSION@
- Cflags:
--Libs: -lanthy -lanthydic
-+Libs: -Wl,-R${libdir} -Wl,-R${libdir} -L${libdir} -lanthy -lanthydic