diff -Nur anthy/Makefile anthy-9100h/Makefile
--- anthy/Makefile	Tue Feb 17 00:29:43 2009
+++ anthy-9100h/Makefile	Sun May 30 16:36:00 2010
@@ -4,14 +4,14 @@
 
 CATEGORIES=	japanese inputmethods
 
-V=		8300
+V=		9100h
 MULTI_PACKAGES=	-main -emacs
 DISTNAME=	anthy-$V
 PKGNAME-main=	anthy-$V
 PKGNAME-emacs=	emacs-anthy-$V
 
 HOMEPAGE= 	http://anthy.sourceforge.jp/
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=anthy/22565/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=anthy/37536/}
 
 # GPL, part LGPL
 
diff -Nur anthy/distinfo anthy-9100h/distinfo
--- anthy/distinfo	Sun Apr  8 23:58:04 2007
+++ anthy-9100h/distinfo	Sun May 30 16:36:00 2010
@@ -1,5 +1,5 @@
-MD5 (anthy-8300.tar.gz) = jRgmQO+BdquHfl95tsCUQw==
-RMD160 (anthy-8300.tar.gz) = EOtxcXVn1KBhEWapLmslsjguo0M=
-SHA1 (anthy-8300.tar.gz) = r+QXABP2KUZZYRhykJyYLPOdnZI=
-SHA256 (anthy-8300.tar.gz) = UhqySuhSB+HDuVOTluAYopDjsItKHbGwEzu1xhaAKJo=
-SIZE (anthy-8300.tar.gz) = 3705386
+MD5 (anthy-9100h.tar.gz) = H1WP9+0pZ4e1W7HGzxMRCA==
+RMD160 (anthy-9100h.tar.gz) = bdsmwKR9ry92WylzgXz76E+oVgY=
+SHA1 (anthy-9100h.tar.gz) = v+qedOIIxLl2tr16xnhM0pDGNv0=
+SHA256 (anthy-9100h.tar.gz) = 0lbwdfAYtKPLDRZe1hUf2kun2xYhcn4OtUVptuInVUc=
+SIZE (anthy-9100h.tar.gz) = 4446148
diff -Nur anthy/patches/patch-configure anthy-9100h/patches/patch-configure
--- anthy/patches/patch-configure	Thu Jan  1 09:00:00 1970
+++ anthy-9100h/patches/patch-configure	Sun May 30 16:36:00 2010
@@ -0,0 +1,11 @@
+--- configure.orig	Sat Feb  7 21:21:42 2009
++++ configure	Sun Apr 25 17:47:13 2010
+@@ -19942,7 +19942,7 @@
+ am__untar!$am__untar$ac_delim
+ CC!$CC$ac_delim
+ CFLAGS!$CFLAGS$ac_delim
+-LDFLAGS!$LDFLAGS$ac_delim
++LDFLAGS!$ac_delim
+ CPPFLAGS!$CPPFLAGS$ac_delim
+ ac_ct_CC!$ac_ct_CC$ac_delim
+ EXEEXT!$EXEEXT$ac_delim
diff -Nur anthy/patches/patch-src-util-Makefile_in anthy-9100h/patches/patch-src-util-Makefile_in
--- anthy/patches/patch-src-util-Makefile_in	Thu Jan  1 09:00:00 1970
+++ anthy-9100h/patches/patch-src-util-Makefile_in	Sun May 30 16:36:00 2010
@@ -0,0 +1,25 @@
+--- src-util/Makefile.in.orig	Sat Feb  7 21:21:39 2009
++++ src-util/Makefile.in	Sun Apr 25 17:47:13 2010
+@@ -75,7 +75,7 @@
+ 	../src-worddic/libanthydic.la
+ am_anthy_dic_tool_OBJECTS = dic-tool.$(OBJEXT)
+ anthy_dic_tool_OBJECTS = $(am_anthy_dic_tool_OBJECTS)
+-anthy_dic_tool_DEPENDENCIES = ../src-worddic/libanthydic.la
++anthy_dic_tool_DEPENDENCIES = ../src-worddic/libanthydic.la ../src-diclib/libdiclib.la
+ am_anthy_morphological_analyzer_OBJECTS = morph-main.$(OBJEXT)
+ anthy_morphological_analyzer_OBJECTS =  \
+ 	$(am_anthy_morphological_analyzer_OBJECTS)
+@@ -236,11 +236,11 @@
+ libconvdb_la_SOURCES = convdb.c
+ INCLUDES = -I$(top_srcdir)/
+ anthy_dic_tool_SOURCES = dic-tool.c
+-anthy_dic_tool_LDADD = ../src-worddic/libanthydic.la
++anthy_dic_tool_LDADD = ../src-worddic/libanthydic.la ../src-diclib/libdiclib.la
+ anthy_agent_SOURCES = agent.c egg.c
+ anthy_agent_LDADD = libanthyinput.la ../src-main/libanthy.la ../src-worddic/libanthydic.la
+ anthy_morphological_analyzer_SOURCES = morph-main.c
+-anthy_morphological_analyzer_LDADD = libconvdb.la ../src-main/libanthy.la ../src-worddic/libanthydic.la
++anthy_morphological_analyzer_LDADD = libconvdb.la ../src-main/libanthy.la ../src-worddic/libanthydic.la ../src-diclib/libdiclib.la
+ lib_LTLIBRARIES = libanthyinput.la
+ libanthyinput_la_SOURCES = input.c rkconv.c rkhelper.c\
+  rkconv.h rkmap.h rkhelper.h
diff -Nur anthy/pkg/PLIST-emacs anthy-9100h/pkg/PLIST-emacs
--- anthy/pkg/PLIST-emacs	Thu Oct 19 08:13:34 2006
+++ anthy-9100h/pkg/PLIST-emacs	Sun May 30 16:36:00 2010
@@ -15,4 +15,3 @@
 share/emacs/site-lisp/anthy/anthy.el
 share/emacs/site-lisp/anthy/anthy.elc
 share/emacs/site-lisp/anthy/leim-list.el
-share/emacs/site-lisp/anthy/leim-list.elc