>Number:         36675
>Category:       pkg
>Synopsis:       Update inputmethod/anthy update to anthy-9100
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Jul 22 08:55:00 +0000 2007
>Originator:     Yamashiro Jun
>Release:        NetBSD/i386 4.99.24
>Organization:
Okinawa FreeBSD Users Group
>Environment:
NetBSD yamajun.mydomain 4.99.24 NetBSD 4.99.24 (YAMAJUN) #16: Sat Jul 21 03:36:50 JST 2007  yamajun@yamajun.mydomain:/usr/src/sys/arch/i386/compile/YAMAJUN i386
>Description:
Update request inputmethod/anthy to anthy-9100

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

2) pkgsrc/inpumethod/anthy:
* Update additional Japanese kana-kanji dictionary: okinawa-20070717.t

>How-To-Repeat:

>Fix:
1. Apply this patch to inputmethod/anthy.
2. Remove patches/patch-aa


diff -Nru anthy.orig/Makefile anthy/Makefile
--- anthy.orig/Makefile	2007-07-21 20:28:07.000000000 +0900
+++ anthy/Makefile	2007-07-21 20:51:14.000000000 +0900
@@ -25,13 +25,13 @@
 .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 -Nru anthy.orig/Makefile.common anthy/Makefile.common
--- anthy.orig/Makefile.common	2007-07-21 20:28:07.000000000 +0900
+++ anthy/Makefile.common	2007-07-21 20:46:51.000000000 +0900
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile.common,v 1.6 2007/01/20 17:11:52 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 -Nru anthy.orig/distinfo anthy/distinfo
--- anthy.orig/distinfo	2007-07-21 20:28:07.000000000 +0900
+++ anthy/distinfo	2007-07-21 20:53:09.000000000 +0900
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.9 2007/01/20 17:11:52 wiz Exp $
+$NetBSD$
 
 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 -Nru anthy.orig/options.mk anthy/options.mk
--- anthy.orig/options.mk	2007-07-21 20:28:07.000000000 +0900
+++ anthy/options.mk	2007-07-21 20:52:35.000000000 +0900
@@ -16,7 +16,7 @@
 .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 -Nru anthy.orig/patches/patch-aa anthy/patches/patch-aa
--- anthy.orig/patches/patch-aa	2007-07-21 20:28:07.000000000 +0900
+++ anthy/patches/patch-aa	1970-01-01 09:00:00.000000000 +0900
@@ -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