16 files changed, 175 insertions, 118 deletions

diff --git a/japanese/libtomoe-gtk/Makefile b/japanese/libtomoe-gtk/Makefile
index e7c65111bd38..b1469f961f69 100644
--- a/japanese/libtomoe-gtk/Makefile
+++ b/japanese/libtomoe-gtk/Makefile
@@ -6,21 +6,44 @@
 #
 
 PORTNAME=	libtomoe-gtk
-PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTVERSION=	0.6.0
 #PORTREVISION=	0
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=tomoe/23909
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=tomoe
+DISTNAME=	tomoe-gtk-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	TOMOE GTK+ library
 
-LIB_DEPENDS=	tomoe.1:${PORTSDIR}/japanese/tomoe \
-		gucharmap.6:${PORTSDIR}/deskutils/gucharmap
+LIB_DEPENDS=	tomoe.1:${PORTSDIR}/japanese/tomoe
 
 USE_GNOME=	lthack gnomehack gtk20
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
-.include <bsd.port.mk>
+OPTIONS=	GUCHARMAP	"Compile with gucharmap"		on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_GUCHARMAP)
+CONFIGURE_ARGS+=--with-gucharmap=no
+PLIST_SUB+=	GUCHARMAP="@comment "
+.else
+LIB_DEPENDS+=	gucharmap.6:${PORTSDIR}/deskutils/gucharmap
+PLIST_SUB+=	GUCHARMAP=""
+.endif
+
+.if exists(${LOCALBASE}/libdata/pkgconfig/pytomoe.pc)
+USE_PYTHON=	yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+CONFIGURE_ENV+=	PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \
+		pyexecdir=${PYTHON_SITELIBDIR}
+PLIST_SUB+=	PYTHON=""
+.else
+CONFIGURE_ARGS+=--with-python=no
+PLIST_SUB+=	PYTHON="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/japanese/libtomoe-gtk/distinfo b/japanese/libtomoe-gtk/distinfo
index 4562f9e22848..e757e5ca36ac 100644
--- a/japanese/libtomoe-gtk/distinfo
+++ b/japanese/libtomoe-gtk/distinfo
@@ -1,3 +1,3 @@
-MD5 (libtomoe-gtk-0.5.1.tar.gz) = 4d1752619cd1dab8b16cb0689a484d37
-SHA256 (libtomoe-gtk-0.5.1.tar.gz) = 5ed4edf5de751bd920be53d00cfe562b3955c71d901032a0bcaafafc54da563e
-SIZE (libtomoe-gtk-0.5.1.tar.gz) = 421769
+MD5 (tomoe-gtk-0.6.0.tar.gz) = bd49ac64549d8a7ab092bea1c1dc04fc
+SHA256 (tomoe-gtk-0.6.0.tar.gz) = 4e9b228e25451b1e875127a57eb40270e38c59cf4d46bc25c208e370d884ba64
+SIZE (tomoe-gtk-0.6.0.tar.gz) = 448058
diff --git a/japanese/libtomoe-gtk/pkg-plist b/japanese/libtomoe-gtk/pkg-plist
index 62f97364e247..1c3f1fe89864 100644
--- a/japanese/libtomoe-gtk/pkg-plist
+++ b/japanese/libtomoe-gtk/pkg-plist
@@ -5,7 +5,9 @@ include/tomoe/gtk/tomoe-edit-char.h
 include/tomoe/gtk/tomoe-edit-meta.h
 include/tomoe/gtk/tomoe-edit-strokes.h
 include/tomoe/gtk/tomoe-gtk.h
-include/tomoe/gtk/tomoe-gucharmap.h
+include/tomoe/gtk/tomoe-gtk-config.h
+include/tomoe/gtk/tomoe-gtk-enum-types.h
+%%GUCHARMAP%%include/tomoe/gtk/tomoe-gucharmap.h
 include/tomoe/gtk/tomoe-handwriting.h
 include/tomoe/gtk/tomoe-reading-search.h
 include/tomoe/gtk/tomoe-scrollable.h
@@ -16,13 +18,16 @@ lib/libtomoe-gtk.a
 lib/libtomoe-gtk.la
 lib/libtomoe-gtk.so
 lib/libtomoe-gtk.so.1
-libdata/pkgconfig/libtomoe-gtk.pc
-share/libtomoe-gtk/tomoe-data-view.png
-share/libtomoe-gtk/tomoe-dictionary.png
-share/libtomoe-gtk/tomoe-gucharmap.png
-share/libtomoe-gtk/tomoe-handwriting.png
-share/libtomoe-gtk/tomoe-search.png
-@dirrm share/libtomoe-gtk
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gtk-2.0/tomoegtk.a
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gtk-2.0/tomoegtk.la
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gtk-2.0/tomoegtk.so
+libdata/pkgconfig/tomoe-gtk.pc
+share/tomoe-gtk/tomoe-data-view.png
+share/tomoe-gtk/tomoe-dictionary.png
+share/tomoe-gtk/tomoe-gucharmap.png
+share/tomoe-gtk/tomoe-handwriting.png
+share/tomoe-gtk/tomoe-search.png
+@dirrm share/tomoe-gtk
 share/gtk-doc/html/libtomoe-gtk/TomoeCanvas.html
 share/gtk-doc/html/libtomoe-gtk/TomoeCharTable.html
 share/gtk-doc/html/libtomoe-gtk/TomoeHandwriting.html
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index ac8fadef744d..70a947477fc5 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	scim-tomoe
-PORTVERSION=	0.5.0
-PORTREVISION=	4
+PORTVERSION=	0.6.0
+#PORTREVISION=	0
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=scim-imengine/23343
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=tomoe
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	SCIM IMEngine module using Tomoe
@@ -21,6 +21,7 @@ LIB_DEPENDS=	tomoe.1:${PORTSDIR}/japanese/tomoe \
 
 USE_GNOME=	lthack
 USE_X_LIB=	yes
+USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/japanese/scim-tomoe/distinfo b/japanese/scim-tomoe/distinfo
index 2fdcc1930297..22adc84483b9 100644
--- a/japanese/scim-tomoe/distinfo
+++ b/japanese/scim-tomoe/distinfo
@@ -1,3 +1,3 @@
-MD5 (scim-tomoe-0.5.0.tar.gz) = 9d18a485faff3bc2aa18537d0115ca51
-SHA256 (scim-tomoe-0.5.0.tar.gz) = 9523a34006aab3b8a005dcef2e9f5c2bbc35d66363bd60cd8dcc3bd4b1f56a41
-SIZE (scim-tomoe-0.5.0.tar.gz) = 506966
+MD5 (scim-tomoe-0.6.0.tar.gz) = 21207dad4ceb5c00651673ec3737e010
+SHA256 (scim-tomoe-0.6.0.tar.gz) = 4f053944285ed50e7916ebdb38298025e60eb430b64715fdad9375483456dc06
+SIZE (scim-tomoe-0.6.0.tar.gz) = 385126
diff --git a/japanese/scim-tomoe/files/patch-configure b/japanese/scim-tomoe/files/patch-configure
new file mode 100644
index 000000000000..f50c98f591a9
--- /dev/null
+++ b/japanese/scim-tomoe/files/patch-configure
@@ -0,0 +1,13 @@
+Index: configure
+diff -u configure.orig configure
+--- configure.orig	2007-08-16 04:51:25.000000000 +0900
++++ configure	2007-08-16 04:55:27.000000000 +0900
+@@ -25607,7 +25607,7 @@
+     "modify-itlocaledir":C)
+ sed \
+   -i'' \
+-  -e "s/^itlocaledir = /itlocaledir = \$(datadir)\/locale\n#itlocaledir = /" \
++  -e "s/^itlocaledir = .*/itlocaledir = \$(datadir)\/locale/" \
+   po/Makefile
+  ;;
+     "po/stamp-it":C)
diff --git a/japanese/scim-tomoe/files/patch-src::Makefile.in b/japanese/scim-tomoe/files/patch-src::Makefile.in
deleted file mode 100644
index ff8348d259cd..000000000000
--- a/japanese/scim-tomoe/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/Makefile.in
-diff -u src/Makefile.in.orig src/Makefile.in
---- src/Makefile.in.orig	Mon Dec 18 16:40:22 2006
-+++ src/Makefile.in	Sat Mar 31 05:10:37 2007
-@@ -262,7 +262,7 @@
- 	scim_tomoe_prefs.h \
- 	scim_tomoe_prefs_widget.h
- 
--moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper
-+moduledir = @SCIM_MODULEDIR@/Helper
- module_LTLIBRARIES = tomoe.la
- tomoe_la_SOURCES = \
- 	scim_tomoe.cpp \
diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile
index 2ebdba1b3afd..d266216392c7 100644
--- a/japanese/tomoe/Makefile
+++ b/japanese/tomoe/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	tomoe
-PORTVERSION=	0.5.1
+PORTVERSION=	0.6.0
 #PORTREVISION=	0
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=tomoe/23908
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=tomoe
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -18,7 +18,9 @@ MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Tegaki Online MOji-ninshiki Engine
 
 USE_GNOME=	lthack gnomehack
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_RUBY=	yes
 
@@ -31,7 +33,8 @@ ARCH!=		${UNAME} -p
 
 OPTIONS=DICT_RUBY	"Enable Ruby based dictionary module"		off \
 	EST		"Enable Hyper Estraier dictionary module"	off \
-	MYSQL		"Enable MySQL dictionary module"		off
+	MYSQL		"Enable MySQL dictionary module"		off \
+	PYTHON		"Enable Python module"				on
 .if ${ARCH} == "sparc64"
 OPTIONS+=UNIHAN		"Enable Unihan database dictionary module"	off
 .else
@@ -62,6 +65,15 @@ PLIST_SUB+=	MYSQL=""
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
+.if defined(WITHOUT_PYTHON)
+CONFIGURE_ARGS+=--with-python=no
+PLIST_SUB+=	PYTHON="@comment "
+.else
+USE_PYTHON=	yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+PLIST_SUB+=	PYTHON=""
+.endif
+
 .if defined(WITH_UNIHAN)
 .if ${ARCH} == "sparc64"
 BROKEN=	Not buildable with Unihan on sparc64
@@ -78,7 +90,10 @@ CONFIGURE_ARGS+=--disable-unihan
 PLIST_SUB+=	UNIHAN="@comment "
 .endif
 
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \
+		pyexecdir=${PYTHON_SITELIBDIR} \
+		GMSGFMT='/usr/local/bin/msgfmt'
 
 .if defined(WITH_UNIHAN)
 post-extract:
diff --git a/japanese/tomoe/distinfo b/japanese/tomoe/distinfo
index d94dca26c3aa..e02e40467ba8 100644
--- a/japanese/tomoe/distinfo
+++ b/japanese/tomoe/distinfo
@@ -1,6 +1,6 @@
-MD5 (tomoe-0.5.1.tar.gz) = 84b103ef8240bf0d76f1083b2cf3521b
-SHA256 (tomoe-0.5.1.tar.gz) = 38f2fcf09fd055330ce1170f0f092480875d977cdc4e40e282e108eac64f288d
-SIZE (tomoe-0.5.1.tar.gz) = 3486020
+MD5 (tomoe-0.6.0.tar.gz) = 0e51e88d097085e101bf722fc04808ed
+SHA256 (tomoe-0.6.0.tar.gz) = ee600f97fa434c13f6c41a1db9e03eccd551151ed48ece9c56cd9e828228ea1e
+SIZE (tomoe-0.6.0.tar.gz) = 4918949
 MD5 (Unihan.zip) = b512f87420f0e46bf78a08fe7eab6d57
 SHA256 (Unihan.zip) = aab3638ae364395dda9533deda0f1f9a6e19e410262b69a13632c595c87c7a69
 SIZE (Unihan.zip) = 6107283
diff --git a/japanese/tomoe/files/patch-configure b/japanese/tomoe/files/patch-configure
index 7e2c4198883f..e76e023d9909 100644
--- a/japanese/tomoe/files/patch-configure
+++ b/japanese/tomoe/files/patch-configure
@@ -1,22 +1,31 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Fri Jan 12 01:41:01 2007
-+++ configure	Fri Jan 12 01:47:51 2007
-@@ -21716,7 +21716,7 @@
+--- configure.orig	2007-08-16 02:29:47.000000000 +0900
++++ configure	2007-08-16 04:00:10.000000000 +0900
+@@ -23914,7 +23914,7 @@
+ echo "${ECHO_T}yes" >&6; }
+ 	use_est=yes
  fi
- 
- 
--if test "$est_exists" = "yes"; then
-+if test x"$with_est" = "xyes" -a "$est_exists" = "yes"; then
-   WITH_EST_TRUE=
-   WITH_EST_FALSE='#'
+- if test x"$use_est" = "xyes"; then
++ if test x"$with_est" = "xyes" -a x"$use_est" = "xyes"; then
+   USE_EST_TRUE=
+   USE_EST_FALSE='#'
  else
-@@ -22374,7 +22374,7 @@
- fi
+@@ -24970,7 +24970,7 @@
+ 
  
  
 -if test "x$MYSQL_CONFIG" != "xmysql_config-not-found"; then
 +if test x"$with_mysql" = "xyes" -a "x$MYSQL_CONFIG" != "xmysql_config-not-found"; then
-   enable_mysql=yes
+   use_mysql=yes
    MYSQL_CFLAGS=`$MYSQL_CONFIG --cflags`
    MYSQL_LIBS=`$MYSQL_CONFIG --libs`
+@@ -26677,7 +26677,7 @@
+     "modify-itlocaledir":C)
+ sed \
+   -i'' \
+-  -e "s/^itlocaledir = /itlocaledir = \$(datadir)\/locale\n#itlocaledir = /" \
++  -e "s/^itlocaledir = .*/itlocaledir = \$(datadir)\/locale/" \
+   po/Makefile
+  ;;
+     "po/stamp-it":C)
diff --git a/japanese/tomoe/files/patch-module::dict::Makefile.in b/japanese/tomoe/files/patch-module::dict::Makefile.in
index 4bf80a357a2b..8a8b8eb326eb 100644
--- a/japanese/tomoe/files/patch-module::dict::Makefile.in
+++ b/japanese/tomoe/files/patch-module::dict::Makefile.in
@@ -1,13 +1,13 @@
 Index: module/dict/Makefile.in
 diff -u module/dict/Makefile.in.orig module/dict/Makefile.in
---- module/dict/Makefile.in.orig	Sat Jan  6 17:19:56 2007
-+++ module/dict/Makefile.in	Sat Jan  6 20:19:38 2007
-@@ -694,7 +694,7 @@
- @WITH_UNIHAN_TRUE@	cd $(top_builddir)/data && $(MAKE) $(AM_MAKEFLAGS) kanjidic2.xml
+--- module/dict/Makefile.in.orig	2007-08-15 03:35:25.000000000 +0900
++++ module/dict/Makefile.in	2007-08-15 03:39:54.000000000 +0900
+@@ -727,7 +727,7 @@
+ @USE_UNIHAN_TRUE@	cd $(top_builddir)/data && $(MAKE) $(AM_MAKEFLAGS) kanjidic2.xml
  
- @WITH_UNIHAN_TRUE@tomoe-unihan-data.h: unihan-compiler.rb Unihan.stamp $(top_builddir)/data/kanjidic2.xml
--@WITH_UNIHAN_TRUE@	$(RUBY) -I$(top_srcdir)/ext/ruby -I$(top_builddir)/ext/ruby/.libs \
-+@WITH_UNIHAN_TRUE@	env LD_LIBRARY_PATH=$(top_srcdir)/lib/.libs:/usr/local/lib:/usr/lib:/lib $(RUBY) -I$(top_srcdir)/ext/ruby -I$(top_builddir)/ext/ruby/.libs \
- @WITH_UNIHAN_TRUE@	  -I$(top_srcdir)/test unihan-compiler.rb \
- @WITH_UNIHAN_TRUE@	  Unihan.txt $(top_srcdir)/data/kanjidic2.xml > $@.tmp || exit 1;
- @WITH_UNIHAN_TRUE@	mv $@.tmp $@
+ @USE_UNIHAN_TRUE@tomoe-unihan-data.h: unihan-compiler.rb Unihan.stamp $(top_builddir)/data/kanjidic2.xml
+-@USE_UNIHAN_TRUE@	$(RUBY) -I$(top_srcdir)/bindings/ruby -I$(top_builddir)/bindings/ruby/.libs \
++@USE_UNIHAN_TRUE@	env LD_LIBRARY_PATH=$(top_srcdir)/lib/.libs:/usr/local/lib:/usr/lib:/lib $(RUBY) -I$(top_srcdir)/bindings/ruby -I$(top_builddir)/bindings/ruby/.libs \
+ @USE_UNIHAN_TRUE@	  -I$(top_srcdir)/test unihan-compiler.rb \
+ @USE_UNIHAN_TRUE@	  Unihan.txt $(top_srcdir)/data/kanjidic2.xml > $@.tmp || exit 1;
+ @USE_UNIHAN_TRUE@	mv $@.tmp $@
diff --git a/japanese/tomoe/pkg-plist b/japanese/tomoe/pkg-plist
index a220851f77ea..651edbaf72be 100644
--- a/japanese/tomoe/pkg-plist
+++ b/japanese/tomoe/pkg-plist
@@ -1,5 +1,6 @@
 etc/tomoe/config
 @dirrm etc/tomoe
+%%PYTHON%%include/tomoe/pytomoe-utils.h
 include/tomoe/tomoe-candidate.h
 include/tomoe/tomoe-char.h
 include/tomoe/tomoe-config.h
@@ -19,34 +20,32 @@ lib/libtomoe.a
 lib/libtomoe.la
 lib/libtomoe.so
 lib/libtomoe.so.1
-%%EST%%lib/tomoe/module/dict/libest.a
-%%EST%%lib/tomoe/module/dict/libest.la
-%%EST%%lib/tomoe/module/dict/libest.so
-%%EST%%lib/tomoe/module/dict/libest.so.1
-%%MYSQL%%lib/tomoe/module/dict/libmysql.a
-%%MYSQL%%lib/tomoe/module/dict/libmysql.la
-%%MYSQL%%lib/tomoe/module/dict/libmysql.so
-%%MYSQL%%lib/tomoe/module/dict/libmysql.so.1
-%%DICT_RUBY%%lib/tomoe/module/dict/libruby.a
-%%DICT_RUBY%%lib/tomoe/module/dict/libruby.la
-%%DICT_RUBY%%lib/tomoe/module/dict/libruby.so
-%%DICT_RUBY%%lib/tomoe/module/dict/libruby.so.1
-%%UNIHAN%%lib/tomoe/module/dict/libunihan.a
-%%UNIHAN%%lib/tomoe/module/dict/libunihan.la
-%%UNIHAN%%lib/tomoe/module/dict/libunihan.so
-%%UNIHAN%%lib/tomoe/module/dict/libunihan.so.1
-lib/tomoe/module/dict/libxml.a
-lib/tomoe/module/dict/libxml.la
-lib/tomoe/module/dict/libxml.so
-lib/tomoe/module/dict/libxml.so.1
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/tomoe.a
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/tomoe.la
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/tomoe.so
+%%EST%%lib/tomoe/module/dict/est.a
+%%EST%%lib/tomoe/module/dict/est.la
+%%EST%%lib/tomoe/module/dict/est.so
+%%MYSQL%%lib/tomoe/module/dict/mysql.a
+%%MYSQL%%lib/tomoe/module/dict/mysql.la
+%%MYSQL%%lib/tomoe/module/dict/mysql.so
+%%DICT_RUBY%%lib/tomoe/module/dict/ruby.a
+%%DICT_RUBY%%lib/tomoe/module/dict/ruby.la
+%%DICT_RUBY%%lib/tomoe/module/dict/ruby.so
+%%UNIHAN%%lib/tomoe/module/dict/unihan.a
+%%UNIHAN%%lib/tomoe/module/dict/unihan.la
+%%UNIHAN%%lib/tomoe/module/dict/unihan.so
+lib/tomoe/module/dict/xml.a
+lib/tomoe/module/dict/xml.la
+lib/tomoe/module/dict/xml.so
 @dirrm lib/tomoe/module/dict
-lib/tomoe/module/recognizer/libsimple.a
-lib/tomoe/module/recognizer/libsimple.la
-lib/tomoe/module/recognizer/libsimple.so
-lib/tomoe/module/recognizer/libsimple.so.1
+lib/tomoe/module/recognizer/simple.a
+lib/tomoe/module/recognizer/simple.la
+lib/tomoe/module/recognizer/simple.so
 @dirrm lib/tomoe/module/recognizer
 @dirrm lib/tomoe/module
 @dirrm lib/tomoe
+%%PYTHON%%libdata/pkgconfig/pytomoe.pc
 libdata/pkgconfig/tomoe.pc
 share/gtk-doc/html/tomoe/TomoeCandidate.html
 share/gtk-doc/html/tomoe/TomoeChar.html
@@ -73,9 +72,13 @@ share/gtk-doc/html/tomoe/up.png
 @dirrm share/gtk-doc/html/tomoe
 @dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc
+share/locale/ja/LC_MESSAGES/tomoe.mo
 @dirrm share/tomoe/dict
 share/tomoe/dict.dtd
-share/tomoe/recognizer/handwriting.xml
+%%PYTHON%%share/tomoe/python/tomoe.defs
+%%PYTHON%%@dirrm share/tomoe/python
+share/tomoe/recognizer/handwriting-ja.xml
+share/tomoe/recognizer/handwriting-zh_CN.xml
 @dirrm share/tomoe/recognizer
 share/tomoe/xml2est.rb
 @dirrm share/tomoe
@@ -83,5 +86,4 @@ share/tomoe/xml2est.rb
 %%RUBY_SITEARCHLIBDIR%%/tomoe.a
 %%RUBY_SITEARCHLIBDIR%%/tomoe.la
 %%RUBY_SITEARCHLIBDIR%%/tomoe.so
-%%RUBY_SITEARCHLIBDIR%%/tomoe.so.1
 %%RUBY_SITELIBDIR%%/tomoe.rb
diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile
index a78797d3ad90..cb027e6d7ca7 100644
--- a/japanese/uim-tomoe-gtk/Makefile
+++ b/japanese/uim-tomoe-gtk/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	uim-tomoe-gtk
-PORTVERSION=	0.5.0
-PORTREVISION=	3
+PORTVERSION=	0.6.0
+#PORTREVISION=	0
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=tomoe/23342
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=tomoe
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	UIM helper program for Tomoe
@@ -22,9 +22,12 @@ LIB_DEPENDS=	tomoe.1:${PORTSDIR}/japanese/tomoe \
 USE_GNOME=	lthack gtk20
 USE_X_LIB=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 
-PLIST_FILES=	bin/uim-tomoe-gtk
-#PLIST_FILES+=	share/locale/ja/LC_MESSAGES/uim-tomoe-gtk.mo
+PLIST_FILES=	bin/uim-tomoe-gtk \
+		share/locale/ja/LC_MESSAGES/uim-tomoe-gtk.mo
+
+CONFIGURE_ENV+=	GMSGFMT='/usr/local/bin/msgfmt'
 
 .include <bsd.port.mk>
diff --git a/japanese/uim-tomoe-gtk/distinfo b/japanese/uim-tomoe-gtk/distinfo
index b1ade8c6b93e..213b5af1594d 100644
--- a/japanese/uim-tomoe-gtk/distinfo
+++ b/japanese/uim-tomoe-gtk/distinfo
@@ -1,3 +1,3 @@
-MD5 (uim-tomoe-gtk-0.5.0.tar.gz) = 1a03b74a0caca44d98de8a4c38baef16
-SHA256 (uim-tomoe-gtk-0.5.0.tar.gz) = 84b7fffa4b4f078132918223fc9f36b55938ce1ae7c5fd474a93b33d53744124
-SIZE (uim-tomoe-gtk-0.5.0.tar.gz) = 335294
+MD5 (uim-tomoe-gtk-0.6.0.tar.gz) = 2c2573d405b9bf08c618c8dabf3b668a
+SHA256 (uim-tomoe-gtk-0.6.0.tar.gz) = a419a061cbb91aa4d68a0d31528e5967039ef4914c4e99848b0086f5b5e6e589
+SIZE (uim-tomoe-gtk-0.6.0.tar.gz) = 372357
diff --git a/japanese/uim-tomoe-gtk/files/patch-configure b/japanese/uim-tomoe-gtk/files/patch-configure
new file mode 100644
index 000000000000..3a1695dc65c2
--- /dev/null
+++ b/japanese/uim-tomoe-gtk/files/patch-configure
@@ -0,0 +1,13 @@
+Index: configure
+diff -u configure.orig configure
+--- configure.orig	2007-08-16 03:48:43.000000000 +0900
++++ configure	2007-08-16 03:48:56.000000000 +0900
+@@ -25862,7 +25862,7 @@
+     "modify-itlocaledir":C)
+ sed \
+   -i'' \
+-  -e "s/^itlocaledir = /itlocaledir = \$(datadir)\/locale\n#itlocaledir = /" \
++  -e "s/^itlocaledir = .*/itlocaledir = \$(datadir)\/locale/" \
+   po/Makefile
+  ;;
+     "po/stamp-it":C)
diff --git a/japanese/uim-tomoe-gtk/files/patch-src::uim-tomoe-gtk.c b/japanese/uim-tomoe-gtk/files/patch-src::uim-tomoe-gtk.c
deleted file mode 100644
index 277cc2782316..000000000000
--- a/japanese/uim-tomoe-gtk/files/patch-src::uim-tomoe-gtk.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: src/uim-tomoe-gtk.c
-diff -u -p src/uim-tomoe-gtk.c.orig src/uim-tomoe-gtk.c
---- src/uim-tomoe-gtk.c.orig	Wed Dec  6 15:48:57 2006
-+++ src/uim-tomoe-gtk.c	Mon Apr  9 02:55:56 2007
-@@ -24,6 +24,9 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h> 
- #endif /* HAVE_CONFIG_H */
-+#ifdef HAVE_LOCALE_H
-+#include <locale.h>
-+#endif /* HAVE_LOCALE_H */
- #include <gtk/gtk.h>
- #include <uim/uim.h>
- #include <uim/uim-helper.h>