4 files changed, 68 insertions, 19 deletions

diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile
index a38c60d2e483..7a4cfe456cd3 100644
--- a/japanese/tomoe/Makefile
+++ b/japanese/tomoe/Makefile
@@ -6,11 +6,15 @@
 #
 
 PORTNAME=	tomoe
-PORTVERSION=	0.4.0
+PORTVERSION=	0.5.0
 #PORTREVISION=	0
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=tomoe/22893
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP} \
+		ftp://ftp.unicode.org/Public/UNIDATA/:unihan
+MASTER_SITE_SUBDIR=tomoe/23340
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		Unihan.zip:unihan
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Tegaki Online MOji-ninshiki Engine
@@ -19,6 +23,17 @@ USE_GNOME=	lthack gnomehack
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 
+USE_RUBY=	yes
+EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2 \
+	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv \
+	${RUBY_SITELIBDIR}/suikyo/suikyo.rb:${PORTSDIR}/japanese/suikyo
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
+
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 
+post-extract:
+	cd ${WRKSRC}/module/dict && \
+		${UNZIP_CMD} -qo ${DISTDIR}/Unihan.zip -d ${WRKSRC}/module/dict
+
 .include <bsd.port.mk>
diff --git a/japanese/tomoe/distinfo b/japanese/tomoe/distinfo
index 5eec779ecdf1..6362dcca94ca 100644
--- a/japanese/tomoe/distinfo
+++ b/japanese/tomoe/distinfo
@@ -1,3 +1,6 @@
-MD5 (tomoe-0.4.0.tar.gz) = 239a78420d35f107c5ec9edd2fcf474a
-SHA256 (tomoe-0.4.0.tar.gz) = eee687c7b9b54d3c2b7d856b66a15275e71b45f7bf58d04cca8494f26ea1edc6
-SIZE (tomoe-0.4.0.tar.gz) = 2422289
+MD5 (tomoe-0.5.0.tar.gz) = 8a5abae3a1c388e497c6952e45db5bbd
+SHA256 (tomoe-0.5.0.tar.gz) = c4b06d6560d1b3cef0f39afd275196c5e915d25670543b3268ef151f03fc11dd
+SIZE (tomoe-0.5.0.tar.gz) = 3470162
+MD5 (Unihan.zip) = b512f87420f0e46bf78a08fe7eab6d57
+SHA256 (Unihan.zip) = aab3638ae364395dda9533deda0f1f9a6e19e410262b69a13632c595c87c7a69
+SIZE (Unihan.zip) = 6107283
diff --git a/japanese/tomoe/files/patch-module::dict::Makefile.in b/japanese/tomoe/files/patch-module::dict::Makefile.in
new file mode 100644
index 000000000000..4bf80a357a2b
--- /dev/null
+++ b/japanese/tomoe/files/patch-module::dict::Makefile.in
@@ -0,0 +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
+ 
+ @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 $@
diff --git a/japanese/tomoe/pkg-plist b/japanese/tomoe/pkg-plist
index 6dfbe846aea1..ed8a216f6397 100644
--- a/japanese/tomoe/pkg-plist
+++ b/japanese/tomoe/pkg-plist
@@ -19,16 +19,25 @@ lib/libtomoe.a
 lib/libtomoe.la
 lib/libtomoe.so
 lib/libtomoe.so.1
-lib/tomoe/dict/libxml.a
-lib/tomoe/dict/libxml.la
-lib/tomoe/dict/libxml.so
-lib/tomoe/dict/libxml.so.1
-@dirrm lib/tomoe/dict
-lib/tomoe/recognizer/libsimple.a
-lib/tomoe/recognizer/libsimple.la
-lib/tomoe/recognizer/libsimple.so
-lib/tomoe/recognizer/libsimple.so.1
-@dirrm lib/tomoe/recognizer
+lib/tomoe/module/dict/libest.a
+lib/tomoe/module/dict/libest.la
+lib/tomoe/module/dict/libest.so
+lib/tomoe/module/dict/libest.so.1
+lib/tomoe/module/dict/libunihan.a
+lib/tomoe/module/dict/libunihan.la
+lib/tomoe/module/dict/libunihan.so
+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
+@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
+@dirrm lib/tomoe/module/recognizer
+@dirrm lib/tomoe/module
 @dirrm lib/tomoe
 libdata/pkgconfig/tomoe.pc
 share/gtk-doc/html/tomoe/TomoeCandidate.html
@@ -38,6 +47,7 @@ share/gtk-doc/html/tomoe/TomoeContext.html
 share/gtk-doc/html/tomoe/TomoeDict.html
 share/gtk-doc/html/tomoe/TomoeQuery.html
 share/gtk-doc/html/tomoe/TomoeReading.html
+share/gtk-doc/html/tomoe/TomoeRecognizer.html
 share/gtk-doc/html/tomoe/TomoeShelf.html
 share/gtk-doc/html/tomoe/TomoeWriting.html
 share/gtk-doc/html/tomoe/home.png
@@ -55,7 +65,15 @@ share/gtk-doc/html/tomoe/up.png
 @dirrm share/gtk-doc/html/tomoe
 @dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc
-share/tomoe/all.xml
-share/tomoe/kanjidic2.xml
-share/tomoe/tomoe-dict.dtd
+@dirrm share/tomoe/dict
+share/tomoe/dict.dtd
+share/tomoe/recognizer/handwriting.xml
+@dirrm share/tomoe/recognizer
+share/tomoe/xml2est.rb
 @dirrm share/tomoe
+%%RUBY_SITEARCHLIBDIR%%/rbtomoe.h
+%%RUBY_SITEARCHLIBDIR%%/tomoe.a
+%%RUBY_SITEARCHLIBDIR%%/tomoe.la
+%%RUBY_SITEARCHLIBDIR%%/tomoe.so
+%%RUBY_SITEARCHLIBDIR%%/tomoe.so.1
+%%RUBY_SITELIBDIR%%/tomoe.rb