Update to 7900, based on patches provided by Yamashiro, Jun in PR 34651.

Additionally, split option handling into options.mk and properly handle
the configuration file.

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).

6 files changed, 54 insertions, 46 deletions

diff --git a/inputmethod/anthy/Makefile b/inputmethod/anthy/Makefile
index fd27a06334f..cbc3aee24a6 100644
--- a/inputmethod/anthy/Makefile
+++ b/inputmethod/anthy/Makefile
@@ -1,53 +1,38 @@
-# $NetBSD: Makefile,v 1.12 2006/04/12 09:21:06 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/20 17:11:52 wiz Exp $
 
 .include	"../../inputmethod/anthy/Makefile.common"
 
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
-PKGREVISION=	1
-
 MAINTAINER=	taya@NetBSD.org
 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
+EGDIR=			${PREFIX}/share/examples/anthy
+INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
+CONF_FILES+=		${EGDIR}/anthy-conf ${PKG_SYSCONFDIR}/anthy-conf
 
 PKGCONFIG_OVERRIDE+=	anthy.pc.in
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.anthy
-PKG_SUPPORTED_OPTIONS=	2ch_dict okinawa_dict
-
-.include	"../../mk/bsd.options.mk"
-
-###
-### Optional dictionary support
-###
-.if !empty(PKG_OPTIONS:M2ch_dict)
-DISTFILES+=	2ch.t
-SITES.2ch.t+=	http://omaemona.sourceforge.net/packages/Zisyo/
-.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/
-.endif
+.include	"options.mk"
 
 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
+.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" | \
+	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
+.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" | \
+	ed -s ${WRKSRC}/mkworddic/dict.args.in
 .endif
 
 post-install:
diff --git a/inputmethod/anthy/Makefile.common b/inputmethod/anthy/Makefile.common
index e254709edfc..3a3a4bfb899 100644
--- a/inputmethod/anthy/Makefile.common
+++ b/inputmethod/anthy/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.5 2006/01/23 23:08:47 wiz Exp $
+# $NetBSD: Makefile.common,v 1.6 2007/01/20 17:11:52 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 --git a/inputmethod/anthy/PLIST b/inputmethod/anthy/PLIST
index 5db47f0a0eb..4164a9776e7 100644
--- a/inputmethod/anthy/PLIST
+++ b/inputmethod/anthy/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2006/01/23 23:08:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/01/20 17:11:52 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/libanthy.la
 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
@@ -19,6 +18,8 @@ share/doc/anthy/ELISP
 share/doc/anthy/GUIDE.english
 share/doc/anthy/README
 share/doc/anthy/README.en
+share/examples/anthy/anthy-conf
+@dirrm share/examples/anthy
 @dirrm share/doc/anthy
 @dirrm share/anthy
 @dirrm include/anthy
diff --git a/inputmethod/anthy/buildlink3.mk b/inputmethod/anthy/buildlink3.mk
index 0c163af0674..f3e08c96604 100644
--- a/inputmethod/anthy/buildlink3.mk
+++ b/inputmethod/anthy/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2007/01/20 17:11:52 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ANTHY_BUILDLINK3_MK:=	${ANTHY_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}anthy
 
 .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 --git a/inputmethod/anthy/distinfo b/inputmethod/anthy/distinfo
index 3a27529776e..dbf24d65593 100644
--- a/inputmethod/anthy/distinfo
+++ b/inputmethod/anthy/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.8 2006/01/23 23:08:47 wiz Exp $
+$NetBSD: distinfo,v 1.9 2007/01/20 17:11:52 wiz Exp $
 
-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
diff --git a/inputmethod/anthy/options.mk b/inputmethod/anthy/options.mk
new file mode 100644
index 00000000000..29c526a1a80
--- /dev/null
+++ b/inputmethod/anthy/options.mk
@@ -0,0 +1,22 @@
+# $NetBSD: options.mk,v 1.1 2007/01/20 17:11:52 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.anthy
+PKG_SUPPORTED_OPTIONS=	anthy-2ch-dict anthy-okinawa-dict
+PKG_OPTIONS_LEGACY_OPTS+=	2ch_dict:anthy-2ch-dict
+PKG_OPTIONS_LEGACY_OPTS+=	okinawa_dict:anthy-okinawa-dict
+
+.include	"../../mk/bsd.options.mk"
+
+###
+### Optional dictionary support
+###
+.if !empty(PKG_OPTIONS:Manthy-2ch-dict)
+DISTFILES+=	2ch.t
+SITES.2ch.t+=	http://omaemona.sourceforge.net/packages/Zisyo/
+.endif
+
+.if !empty(PKG_OPTIONS:Manthy-okinawa-dict)
+OKIDIC_VERSION=			okinawa-20060917
+DISTFILES+=			${OKIDIC_VERSION}.t
+SITES.${OKIDIC_VERSION}.t+=	http://www.ofug.net/~yamajun/files/
+.endif