7 files changed, 46 insertions, 76 deletions

diff --git a/japanese/migemo-emacs20/Makefile b/japanese/migemo-emacs20/Makefile
index 9fdc3e96263c..f258efd236b5 100644
--- a/japanese/migemo-emacs20/Makefile
+++ b/japanese/migemo-emacs20/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	migemo
-PORTVERSION=	0.22
+PORTVERSION=	0.3
+PORTEPOCH=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=   http://migemo.namazu.org/stable/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -24,34 +25,27 @@ RUN_DEPENDS=	${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/edit
 BUILD_DEPENDS=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
 RUN_DEPENDS=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
 .endif
-BUILD_DEPENDS+=	${NONEXISTENT}:${SKK_PORT_DIR}:extract
 
-USE_PERL5=	yes
 USE_AUTOMAKE=	yes
+USE_RUBY=	yes
+BUILD_DEPENDS+=	${RUBY_SITELIBDIR}/romkan.rb:${PORTSDIR}/japanese/ruby-romkan \
+		${RUBY_SITELIBDIR}/bsearch.rb:${PORTSDIR}/devel/ruby-bsearch
+RUN_DEPENDS+=	${RUBY_SITELIBDIR}/romkan.rb:${PORTSDIR}/japanese/ruby-romkan \
+		${RUBY_SITELIBDIR}/bsearch.rb:${PORTSDIR}/devel/ruby-bsearch
 
-CONFIGURE_ARGS=		--with-emacs=${EMACS_CMD}
+CONFIGURE_ARGS=		--with-rubydir=${RUBY_SITELIBDIR} --with-emacs=${EMACS_CMD}
 .if (${EMACS_PORT_NAME} == "xemacs21-mule")
 CONFIGURE_ARGS+=	--with-lispdir=${PREFIX}/${EMACS_LIBDIR}/site-lisp
 .endif
 
-SKK_PORT_DIR=	${PORTSDIR}/japanese/skk-jisyo
-
 .include <bsd.port.pre.mk>
 
-SKK_WRKSRC!=	cd ${SKK_PORT_DIR}; ${MAKE} -V WRKSRC
-
-post-extract:
-	${MKDIR} ${WRKSRC}/Lingua
-	${CP} ${WRKSRC}/Lingua-Romkan/Romkan.pm ${WRKSRC}/Lingua
-	${CP} ${SKK_WRKSRC}/jisyo/SKK-JISYO.L ${WRKSRC}
-
-post-build:
-	(cd ${WRKSRC}/Lingua-Romkan/; ${PERL} Makefile.PL; ${MAKE})
-
-pre-install:
-	(cd ${WRKSRC}/Lingua-Romkan/; ${MAKE} install)
+post-configure:
+	${RUBY} -i -pe 'sub /@list=/, "list="' ${WRKSRC}/${MAKEFILE}
 
 post-install:
+	@${MKDIR} ${PREFIX}/share/doc/migemo
+	@${MV} ${PREFIX}/share/migemo/migemo.ja.html ${PREFIX}/share/doc/migemo
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/japanese/migemo-emacs20/distinfo b/japanese/migemo-emacs20/distinfo
index 9368b12f2999..6355fdb5c6a1 100644
--- a/japanese/migemo-emacs20/distinfo
+++ b/japanese/migemo-emacs20/distinfo
@@ -1 +1 @@
-MD5 (migemo-0.22.tar.gz) = fd9e92b423fb9ef73eb8486f2fb00d80
+MD5 (migemo-0.3.tar.gz) = e16e0bccaae5a79b41770584f10efb84
diff --git a/japanese/migemo-emacs20/files/patch-Makefile.am b/japanese/migemo-emacs20/files/patch-Makefile.am
new file mode 100644
index 000000000000..440a8846d15b
--- /dev/null
+++ b/japanese/migemo-emacs20/files/patch-Makefile.am
@@ -0,0 +1,10 @@
+--- Makefile.am.orig	Sat Jul 14 14:58:55 2001
++++ Makefile.am	Sat Jul 14 14:59:44 2001
+@@ -47,7 +47,3 @@
+ 	tar zxf ruby-bsearch.tar.gz
+ 	cp ruby-bsearch/bsearch.rb .
+ 	rm -rf ruby-bsearch
+-
+-migemo.ja.html: migemo.ja.rd
+-	rd2 migemo.ja.rd > migemo.ja.html
+-
diff --git a/japanese/migemo-emacs20/files/patch-configure.in b/japanese/migemo-emacs20/files/patch-configure.in
deleted file mode 100644
index 817a2b4ead1b..000000000000
--- a/japanese/migemo-emacs20/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Mon Feb 19 04:20:52 2001
-+++ configure.in	Mon Feb 19 04:20:59 2001
-@@ -14,7 +14,7 @@
- changequote([, ])
- 
- AC_MSG_CHECKING(for Lingua::Romkan perl module)
--if $PERL -e "use Lingua::Romkan $ROMKAN_VERSION;"; then
-+if $PERL -e "use lib Lingua-Romkan; use Lingua::Romkan $ROMKAN_VERSION;"; then
-     ROMKAN=yes
-     AC_MSG_RESULT(yes)
- else
diff --git a/japanese/migemo-emacs20/files/patch-doc:Makefile.am b/japanese/migemo-emacs20/files/patch-doc:Makefile.am
deleted file mode 100644
index 1a96a6d7c2ba..000000000000
--- a/japanese/migemo-emacs20/files/patch-doc:Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- doc/Makefile.am.orig	Mon Feb 19 05:32:43 2001
-+++ doc/Makefile.am	Mon Feb 19 05:33:49 2001
-@@ -24,6 +24,6 @@
- 	     english-5.png \
- 	     english-6.png 
- 
--docdir = $(pkgdatadir)/doc
-+docdir = $(datadir)/doc/migemo
- 
- EXTRA_DIST = $(doc_DATA)
diff --git a/japanese/migemo-emacs20/files/patch-migemo-cache.rb b/japanese/migemo-emacs20/files/patch-migemo-cache.rb
new file mode 100644
index 000000000000..46a7c94584f0
--- /dev/null
+++ b/japanese/migemo-emacs20/files/patch-migemo-cache.rb
@@ -0,0 +1,11 @@
+--- migemo-cache.rb.orig	Sat Jul 14 14:51:42 2001
++++ migemo-cache.rb	Sat Jul 14 14:51:58 2001
+@@ -16,7 +16,7 @@
+   next if pattern == ""
+ 
+   migemo = Migemo.new(static_dict, pattern)
+-  migemo.optimize = 3
++  migemo.optimization = 3
+   data = Marshal.dump(migemo.regex_tree)
+   output = [pattern.length].pack("N") + pattern + 
+     [data.length].pack("N") + data
diff --git a/japanese/migemo-emacs20/pkg-plist b/japanese/migemo-emacs20/pkg-plist
index e0e0c3ee8da9..b97057b208ec 100644
--- a/japanese/migemo-emacs20/pkg-plist
+++ b/japanese/migemo-emacs20/pkg-plist
@@ -1,40 +1,16 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/Romkan.pm
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/kanrom.pl
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/romkan.pl
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/romrom.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/Romkan/.packlist
 %%EMACS_LIBDIR%%/site-lisp/migemo.el
 %%EMACS_LIBDIR%%/site-lisp/migemo.elc
-share/doc/migemo/english-1.png
-share/doc/migemo/english-2.png
-share/doc/migemo/english-3.png
-share/doc/migemo/english-4.png
-share/doc/migemo/english-5.png
-share/doc/migemo/english-6.png
-share/doc/migemo/kanji-1.png
-share/doc/migemo/kanji-2.png
-share/doc/migemo/kanji-3.png
-share/doc/migemo/kanji-4.png
-share/doc/migemo/katakana-1.png
-share/doc/migemo/katakana-2.png
-share/doc/migemo/katakana-3.png
-share/doc/migemo/katakana-4.png
-share/doc/migemo/katakana-5.png
-share/doc/migemo/line-across-1.png
-share/doc/migemo/line-across-2.png
-share/doc/migemo/line-across-3.png
-share/doc/migemo/line-across-4.png
-share/doc/migemo/line-across-5.png
-share/doc/migemo/migemo.html
-share/doc/migemo/zenkaku-1.png
-share/doc/migemo/zenkaku-2.png
-share/doc/migemo/zenkaku-3.png
-share/doc/migemo/zenkaku-4.png
-share/migemo/migemo-cache.pl
-share/migemo/migemo-dict
-share/migemo/migemo.pl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Lingua
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/Romkan
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua
+%%RUBY_SITELIBDIR%%/migemo.rb
+%%RUBY_SITELIBDIR%%/migemo-cache.rb
+%%RUBY_SITELIBDIR%%/migemo-convert.rb
+%%RUBY_SITELIBDIR%%/migemo-dict.rb
+%%RUBY_SITELIBDIR%%/migemo-index.rb
+share/doc/migemo/migemo.ja.html
 @dirrm share/doc/migemo
+share/migemo/migemo-dict
+share/migemo/migemo-dict.idx
+share/migemo/migemo-dict.cache
+share/migemo/migemo-dict.cache.idx
+share/migemo/user-dict.sample
+share/migemo/regex-dict.sample
 @dirrm share/migemo