pkg/34651: update inputmethod/anthy and fix for dictionary option

[yamajun%ofug.net@localhost]

>Number:         34651
>Category:       pkg
>Synopsis:       update inputmethod/anthy and fix for dictionary option
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Sep 28 15:10:00 +0000 2006
>Originator:     Yamashiro, Jun
>Release:        NetBSD 4.99.1
>Organization:
Okinawa FreeBSD Users Group
>Environment:
NetBSD yamajun.mydomain 4.99.1 NetBSD 4.99.1 (YAMAJUN) #9: Sun Aug 27 16:42:01 
JST 2006  
yamajun%yamajun.mydomain@localhost:/usr/src/sys/arch/i386/compile/YAMAJUN i386
>Description:
This patch update anthy to anthy-7900.  And fix bug for dictionary option. 
It cause change Makefile to revision 1.12.

Changelog in anthy(7100 to 7900):
* Fix Japanese convert algorithm
* Update main Japanese Kana-Kanji dictionary

Changelog in pkgsrc:
* Fix option for additional Kana-Kanji dictionary.
* Update Okinawa dicrectory(optional).


>How-To-Repeat:

>Fix:
Apply this patch:

diff -Nru anthy.orig/Makefile anthy/Makefile
--- anthy.orig/Makefile 2006-09-27 01:54:13.000000000 +0900
+++ anthy/Makefile      2006-09-28 23:22:11.000000000 +0900
@@ -4,14 +4,12 @@
 
 EXTRACT_ONLY=  ${DISTNAME}.tar.gz
 
-PKGREVISION=   1
-
 MAINTAINER=    taya%NetBSD.org@localhost
 COMMENT=       Kana Kanji conversion system
 
 USE_LIBTOOL=           yes
 USE_LANGUAGES=         c
-USE_TOOLS+=            gmake
+USE_TOOLS+=            gmake printf
 GNU_CONFIGURE=         yes
 
 CONFIGURE_ENV+=                EMACS=no
@@ -32,22 +30,23 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mokinawa_dict)
-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/
+OKIDIC_VERSION=                        okinawa-20060917
+DISTFILES+=                    ${OKIDIC_VERSION}.t
+SITES.${OKIDIC_VERSION}.t+=    http://www.ofug.net/~yamajun/files/
 .endif
 
 post-patch:
 .if !empty(PKG_OPTIONS:M2ch_dict)
-       ${CP} ${DISTDIR}/2ch.t ${WRKSRC}/mkanthydic
-       @${PRINTF} "/read 
@top_srcdir@\\\\/mkanthydic\\\\/placename.t\\na\\nread 
@top_srcdir@/mkanthydic/2ch.t\\n.\\nw\\n" | \
-       ed -s ${WRKSRC}/mkanthydic/dict.args.in
+       ${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" | \
+       ed -s ${WRKSRC}/mkworddic/dict.args.in
 .endif
 .if !empty(PKG_OPTIONS:Mokinawa_dict)
-       ${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
+       ${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" | \
+       ed -s ${WRKSRC}/mkworddic/dict.args.in
 .endif
 
 post-install:
diff -Nru anthy.orig/Makefile.common anthy/Makefile.common
--- anthy.orig/Makefile.common  2006-09-27 01:54:13.000000000 +0900
+++ anthy/Makefile.common       2006-09-28 23:08:45.000000000 +0900
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile.common,v 1.5 2006/01/23 23:08:47 wiz Exp $
 
-ANTHY_VERSION= 7100b
+ANTHY_VERSION= 7900
 DISTNAME=      anthy-${ANTHY_VERSION}
 CATEGORIES=    inputmethod
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE_JP:=anthy/17231/}
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE_JP:=anthy/20887/}
 DISTFILES=     ${DISTNAME}.tar.gz
 
 DISTINFO_FILE= ${.CURDIR}/../../inputmethod/anthy/distinfo
diff -Nru anthy.orig/PLIST anthy/PLIST
--- anthy.orig/PLIST    2006-09-27 01:54:13.000000000 +0900
+++ anthy/PLIST 2006-09-28 23:08:45.000000000 +0900
@@ -1,7 +1,7 @@
 @comment $NetBSD: PLIST,v 1.4 2006/01/23 23:08:47 wiz Exp $
 bin/anthy-agent
 bin/anthy-dic-tool
-etc/anthy-conf
+bin/anthy-morphological-analyzer
 include/anthy/anthy.h
 include/anthy/dicutil.h
 include/anthy/input.h
@@ -9,7 +9,6 @@
 lib/libanthydic.la
 lib/libanthyinput.la
 lib/pkgconfig/anthy.pc
-share/anthy/anthy.dep
 share/anthy/anthy.dic
 share/anthy/dic-tool-usage.txt
 share/anthy/typetab
diff -Nru anthy.orig/buildlink3.mk anthy/buildlink3.mk
--- anthy.orig/buildlink3.mk    2006-09-27 01:54:13.000000000 +0900
+++ anthy/buildlink3.mk 2006-09-28 23:08:45.000000000 +0900
@@ -13,7 +13,7 @@
 
 .if !empty(ANTHY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.anthy+=  anthy>=6300
-BUILDLINK_ABI_DEPENDS.anthy?=  anthy>=7100bnb1
+BUILDLINK_ABI_DEPENDS.anthy?=  anthy>=7900
 BUILDLINK_PKGSRCDIR.anthy?=    ../../inputmethod/anthy
 .endif  # ANTHY_BUILDLINK3_MK
 
diff -Nru anthy.orig/distinfo anthy/distinfo
--- anthy.orig/distinfo 2006-09-27 01:54:13.000000000 +0900
+++ anthy/distinfo      2006-09-28 23:08:45.000000000 +0900
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.8 2006/01/23 23:08:47 wiz Exp $
+$NetBSD$
 
-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-20051104.tar.gz) = cb42ef43b36680661cd90cb39c1ccde13ec0a115
-RMD160 (okinawa-20051104.tar.gz) = 6abaea3d0508d376d09628b483a609f32bf694eb
-Size (okinawa-20051104.tar.gz) = 52191 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