6 files changed, 17 insertions, 79 deletions

diff --git a/japanese/migemo-emacs20/Makefile b/japanese/migemo-emacs20/Makefile
index f258efd236b5..9f6f497a78ab 100644
--- a/japanese/migemo-emacs20/Makefile
+++ b/japanese/migemo-emacs20/Makefile
@@ -1,51 +1,34 @@
-# New ports collection makefile for:	Migemo
+# New ports collection makefile for:	Migemo (for emacs20)
 # Date created:		19 February 2001
 # Whom:			MANTANI Nobutaka <nobutaka@nobutaka.com>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	migemo
-PORTVERSION=	0.3
-PORTEPOCH=	1
-CATEGORIES=	japanese elisp
-MASTER_SITES=   http://migemo.namazu.org/stable/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	nobutaka@nobutaka.com
+MASTERDIR=      ${.CURDIR}/../../japanese/migemo
+PKGDIR=         ${.CURDIR}
+PLIST=          ${MASTERDIR}/pkg-plist
+PKGMESSAGE=     ${MASTERDIR}/pkg-message
 
-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
+EMACS_PORT_NAME=	emacs20
 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
-
-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
+RUN_DEPENDS=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME} \
+		migemo:${PORTSDIR}/japanese/migemo
 
-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
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD}
+ALL_TARGET=	migemo.elc
 
-.include <bsd.port.pre.mk>
+PLIST_SUB=	MIGEMO="@comment " ELISP=""
 
-post-configure:
-	${RUBY} -i -pe 'sub /@list=/, "list="' ${WRKSRC}/${MAKEFILE}
+do-install:
+	${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/site-lisp/migemo
+	${INSTALL_DATA} ${WRKSRC}/migemo.el ${PREFIX}/${EMACS_LIBDIR}/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/migemo.elc ${PREFIX}/${EMACS_LIBDIR}/site-lisp
 
 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>
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/migemo-emacs20/distinfo b/japanese/migemo-emacs20/distinfo
deleted file mode 100644
index 6355fdb5c6a1..000000000000
--- a/japanese/migemo-emacs20/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 440a8846d15b..000000000000
--- a/japanese/migemo-emacs20/files/patch-Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-migemo-cache.rb b/japanese/migemo-emacs20/files/patch-migemo-cache.rb
deleted file mode 100644
index 46a7c94584f0..000000000000
--- a/japanese/migemo-emacs20/files/patch-migemo-cache.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-message b/japanese/migemo-emacs20/pkg-message
deleted file mode 100644
index f5f48e01a589..000000000000
--- a/japanese/migemo-emacs20/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-********************************************************
-* Before using Migemo, you must set following elisp to *
-* your own .emacs file.                                *
-*                                                      *
-* (load-library "migemo")                              *
-*                                                      *
-********************************************************
diff --git a/japanese/migemo-emacs20/pkg-plist b/japanese/migemo-emacs20/pkg-plist
deleted file mode 100644
index b97057b208ec..000000000000
--- a/japanese/migemo-emacs20/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-%%EMACS_LIBDIR%%/site-lisp/migemo.el
-%%EMACS_LIBDIR%%/site-lisp/migemo.elc
-%%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