3 files changed, 45 insertions, 31 deletions

diff --git a/japanese/migemo-emacs20/Makefile b/japanese/migemo-emacs20/Makefile
index cbf2b4fccc32..eb364ace05e6 100644
--- a/japanese/migemo-emacs20/Makefile
+++ b/japanese/migemo-emacs20/Makefile
@@ -7,20 +7,34 @@
 
 PORTNAME=	migemo
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=   http://migemo.namazu.org/stable/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	nobutaka@nobutaka.com
 
-BUILD_DEPENDS=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME} \
-		${NONEXISTENT}:${SKK_PORT_DIR}:extract
+EMACS_PORT_NAME?=	emacs20
+
+.if (${EMACS_PORT_NAME} == "xemacs21-mule")
+EMACS_PACKAGESDIR=	lib/xemacs/site-packages
+
+BUILD_DEPENDS=	${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS=	${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+.else
+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_AUTOCONF=	yes
+USE_AUTOMAKE=	yes
+
+CONFIGURE_ARGS=		--with-emacs=${EMACS_CMD}
+.if (${EMACS_PORT_NAME} == "xemacs21-mule")
+CONFIGURE_ARGS+=	--with-lispdir=${PREFIX}/${EMACS_LIBDIR}/site-lisp
+.endif
 
-EMACS_PORT_NAME=emacs20
 SKK_PORT_DIR=	${PORTSDIR}/japanese/skk-jisyo
 
 .include <bsd.port.pre.mk>
diff --git a/japanese/migemo-emacs20/pkg-comment b/japanese/migemo-emacs20/pkg-comment
index 574ffd491de6..b1f77f7440f2 100644
--- a/japanese/migemo-emacs20/pkg-comment
+++ b/japanese/migemo-emacs20/pkg-comment
@@ -1 +1 @@
-Japanese incremental search tool for Emacs
+Japanese incremental search tool for emacs20
diff --git a/japanese/migemo-emacs20/pkg-plist b/japanese/migemo-emacs20/pkg-plist
index 9a565d6b9e51..644b7a9160dc 100644
--- a/japanese/migemo-emacs20/pkg-plist
+++ b/japanese/migemo-emacs20/pkg-plist
@@ -5,36 +5,36 @@ lib/perl5/site_perl/%%PERL_VER%%/Lingua/romrom.pl
 lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Lingua/Romkan/.packlist
 %%EMACS_LIBDIR%%/site-lisp/migemo.el
 %%EMACS_LIBDIR%%/site-lisp/migemo.elc
-share/migemo/doc/english-1.png
-share/migemo/doc/english-2.png
-share/migemo/doc/english-3.png
-share/migemo/doc/english-4.png
-share/migemo/doc/english-5.png
-share/migemo/doc/english-6.png
-share/migemo/doc/kanji-1.png
-share/migemo/doc/kanji-2.png
-share/migemo/doc/kanji-3.png
-share/migemo/doc/kanji-4.png
-share/migemo/doc/katakana-1.png
-share/migemo/doc/katakana-2.png
-share/migemo/doc/katakana-3.png
-share/migemo/doc/katakana-4.png
-share/migemo/doc/katakana-5.png
-share/migemo/doc/line-across-1.png
-share/migemo/doc/line-across-2.png
-share/migemo/doc/line-across-3.png
-share/migemo/doc/line-across-4.png
-share/migemo/doc/line-across-5.png
-share/migemo/doc/migemo.html
-share/migemo/doc/zenkaku-1.png
-share/migemo/doc/zenkaku-2.png
-share/migemo/doc/zenkaku-3.png
-share/migemo/doc/zenkaku-4.png
+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%%/i386-freebsd/auto/Lingua/Romkan
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Lingua
-@dirrm share/migemo/doc
+@dirrm share/doc/migemo
 @dirrm share/migemo