>Number:         32091
>Category:       pkg
>Synopsis:       update inputmethod/anthy to anthy-7100b
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Nov 16 16:24:00 +0000 2005
>Originator:     Yamashiro, Jun
>Release:        NetBSD/i386-current 3.99.11
>Organization:
Okinawa FreeBSD Users Group
>Environment:
NetBSD yamajun.mydomain 3.99.11 NetBSD 3.99.11 (YAMAJUN) #2: Thu Nov  3 18:50:52 JST 2005  yamajun@yamajun.mydomain:/usr/src/sys/arch/i386/compile/YAMAJUN i386
>Description:
Update patch to inputmethod/anthy.

Changelog:
* Change Japanese Kana-Kanji conversion algorithm.
* Add placename dictonary.
* Add (Japanese)Zipcode to placename converter dictionary.
* Add English README file(${PREFIX}/share/doc/anthy/README.en).
* Update Okinawa Dictionary(optional).

>How-To-Repeat:

>Fix:
Apply this patch:

diff -ru anthy.orig/Makefile anthy/Makefile
--- anthy.orig/Makefile	2005-11-16 22:39:56.000000000 +0900
+++ anthy/Makefile	2005-11-17 00:30:44.000000000 +0900
@@ -30,20 +30,22 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mokinawa_dict)
-DISTFILES+=			okinawa-20050607.t
-SITES_okinawa-20050607.t+=	http://www.ofug.net/~yamajun/files/
+OKIDIC_VERSION=			okinawa-20051104
+DISTFILES+=			${OKIDIC_VERSION}.tar.gz
+EXTRACT_ONLY+=			${OKIDIC_VERSION}.tar.gz
+SITES_${OKIDIC_VERSION}.tar.gz+=	http://www.ofug.net/~yamajun/files/
 .endif
 
 post-patch:
 .if !empty(PKG_OPTIONS:M2ch_dict)
 	${CP} ${DISTDIR}/2ch.t ${WRKSRC}/mkanthydic
-	@printf '/^EXTRA_DICS\ns/$$/ 2ch.t/\nwq\n' | \
-		ed -s ${WRKSRC}/mkanthydic/Makefile.in
+	@printf "/read @top_srcdir@\\\\/mkanthydic\\\\/placename.t\na\nread @top_srcdir@/mkanthydic/2ch.t\n.\nw\n" | \
+	ed -s ${WRKSRC}/mkanthydic/dict.args.in
 .endif
 .if !empty(PKG_OPTIONS:Mokinawa_dict)
-	${CP} ${DISTDIR}/okinawa-20050607.t ${WRKSRC}/mkanthydic
-	@printf '/^EXTRA_DICS\ns/$$/ okinawa-20050607.t/\nwq\n' | \
-		ed -s ${WRKSRC}/mkanthydic/Makefile.in
+	${CP} ${WRKDIR}/${OKIDIC_VERSION}/okinawa.t ${WRKSRC}/mkanthydic
+	@printf "/read @top_srcdir@\\\\/mkanthydic\\\\/placename.t\na\nread @top_srcdir@/mkanthydic/okinawa.t\n.\nw\n" | \
+	ed -s ${WRKSRC}/mkanthydic/dict.args.in
 .endif
 
 post-install:
@@ -52,5 +54,6 @@
 	${INSTALL_DATA} ${WRKSRC}/doc/ELISP ${PREFIX}/share/doc/anthy
 	${INSTALL_DATA} ${WRKSRC}/doc/GUIDE.english ${PREFIX}/share/doc/anthy
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/anthy
+	${INSTALL_DATA} ${WRKSRC}/README.en ${PREFIX}/share/doc/anthy
 
 .include "../../mk/bsd.pkg.mk"
diff -ru anthy.orig/Makefile.common anthy/Makefile.common
--- anthy.orig/Makefile.common	2005-11-16 22:39:55.000000000 +0900
+++ anthy/Makefile.common	2005-11-17 00:37:43.000000000 +0900
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile.common,v 1.3 2005/09/05 15:00:09 taya Exp $
 
-ANTHY_VERSION=	6700b
+ANTHY_VERSION=	7100b
 DISTNAME=	anthy-${ANTHY_VERSION}
 CATEGORIES=	inputmethod
-MASTER_SITES=	http://downloads.sourceforge.jp/anthy/15414/
+MASTER_SITES=	http://downloads.sourceforge.jp/anthy/17231/
 DISTFILES=	${DISTNAME}.tar.gz
 
 DISTINFO_FILE=	${.CURDIR}/../../inputmethod/anthy/distinfo
diff -ru anthy.orig/PLIST anthy/PLIST
--- anthy.orig/PLIST	2005-11-16 22:39:55.000000000 +0900
+++ anthy/PLIST	2005-11-17 00:29:26.000000000 +0900
@@ -1,7 +1,6 @@
 @comment $NetBSD: PLIST,v 1.3 2005/03/03 15:34:08 taya Exp $
 bin/anthy-agent
 bin/anthy-dic-tool
-etc/anthy-conf
 include/anthy/anthy.h
 include/anthy/dicutil.h
 include/anthy/input.h
@@ -9,24 +8,16 @@
 lib/libanthydic.la
 lib/libanthyinput.la
 lib/pkgconfig/anthy.pc
-share/anthy/a.depword
-share/anthy/ajv.depword
+share/anthy/anthy.dep
 share/anthy/anthy.dic
-share/anthy/av.depword
-share/anthy/conjugate.depword
-share/anthy/conjugate.table
 share/anthy/dic-tool-usage.txt
-share/anthy/fix.depword
-share/anthy/indepword.txt
-share/anthy/master.depword
-share/anthy/noun-variant.depword
-share/anthy/noun.depword
 share/anthy/typetab
-share/anthy/v.depword
+share/anthy/zipcode.t
 share/doc/anthy/DICUTIL
 share/doc/anthy/ELISP
 share/doc/anthy/GUIDE.english
 share/doc/anthy/README
+share/doc/anthy/README.en
 @dirrm share/doc/anthy
 @dirrm share/anthy
 @dirrm include/anthy
diff -ru anthy.orig/distinfo anthy/distinfo
--- anthy.orig/distinfo	2005-11-16 22:39:55.000000000 +0900
+++ anthy/distinfo	2005-11-17 00:29:29.000000000 +0900
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.7 2005/09/05 15:00:09 taya Exp $
+$NetBSD$
 
-SHA1 (anthy-6700b.tar.gz) = 19e53a9c41497ef2949e23851999ed72fd211e83
-RMD160 (anthy-6700b.tar.gz) = 02815a1ec441b46e75cf34c1effb2a967b0b8331
-Size (anthy-6700b.tar.gz) = 2218622 bytes
+SHA1 (anthy-7100b.tar.gz) = c7aad6ea0e6dc462be3926052a538b88ac2e4aee
+RMD160 (anthy-7100b.tar.gz) = 62de300bf50f727672f63109fd409b7cbdbb5572
+Size (anthy-7100b.tar.gz) = 3359606 bytes
 SHA1 (2ch.t) = 2160d7b0079e2c1a14093da968f34e7f8dbc07c2
 RMD160 (2ch.t) = b05902485829eebb4e09c554f095275f5278dd8b
 Size (2ch.t) = 142157 bytes
-SHA1 (okinawa-20050607.t) = 50f9524e5f11240cbc486c32eb86fcc1a3075e6f
-RMD160 (okinawa-20050607.t) = 6ee9adeaddb0c62c6a4741761d14932603ee7a81
-Size (okinawa-20050607.t) = 150145 bytes
+SHA1 (okinawa-20051104.tar.gz) = cb42ef43b36680661cd90cb39c1ccde13ec0a115
+RMD160 (okinawa-20051104.tar.gz) = 6abaea3d0508d376d09628b483a609f32bf694eb
+Size (okinawa-20051104.tar.gz) = 52191 bytes
 SHA1 (patch-aa) = 79816563a3d1ff853bc1edcbfee7e22ae2e26991