2 files changed, 50 insertions, 88 deletions

diff --git a/japanese/lookup-mule/Makefile b/japanese/lookup-mule/Makefile
index 72ac343f9781..b0a3362a69ac 100644
--- a/japanese/lookup-mule/Makefile
+++ b/japanese/lookup-mule/Makefile
@@ -5,45 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	lookup
-PORTVERSION=	1.3
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-CATEGORIES=	japanese elisp
-MASTER_SITES=	http://download.sourceforge.net/lookup/
+MASTERDIR=	${.CURDIR}/../lookup
+EMACS_PORT_NAME=	mule
 
-MAINTAINER=	taoka@FreeBSD.org
-
-RUN_DEPENDS+=	eblook:${PORTSDIR}/japanese/eblook
-
-FILESDIR=	${.CURDIR}/../lookup-mule/files
-PKGDIR=		${.CURDIR}/../lookup-mule
-PLIST=		${.CURDIR}/pkg-plist
-EMACS_PORT_NAME?=	mule
-
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
-EMACSDIR=	${PREFIX}/lib/xemacs/site-packages
-ELISPDIR=	${EMACSDIR}/lisp/lookup
-PORTINFODIR=	${EMACSDIR}/info
-MANIFEST=	MANIFEST.lookup
-.else
-EMACSDIR=	${PREFIX}/share/${EMACS_NAME}/site-lisp
-ELISPDIR=	${EMACSDIR}/lookup
-PORTINFODIR=	${PREFIX}/info
-.endif
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \
-		--with-lispdir=${ELISPDIR} \
-		--infodir=${PORTINFODIR}
-
-post-install:
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
-	${RM} -f ${WRKDIR}/${MANIFEST}
-	emacsdir=`${ECHO} ${EMACSDIR} | ${SED} -e "s;^${PREFIX}/;;"`; \
-	${CAT} ${PLIST} | ${GREP} -e "^$${emacsdir}" | \
-		${SED} -e "s;^$${emacsdir}/;;" > ${WRKDIR}/${MANIFEST}
-	${MKDIR} ${EMACSDIR}/pkginfo
-	${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
-		${EMACSDIR}/pkginfo/
-.endif
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/lookup-mule/pkg-plist b/japanese/lookup-mule/pkg-plist
index 36e6dd4049bc..d6dc80a9dc24 100644
--- a/japanese/lookup-mule/pkg-plist
+++ b/japanese/lookup-mule/pkg-plist
@@ -1,49 +1,49 @@
-share/mule/site-lisp/lookup/evi.el
-share/mule/site-lisp/lookup/evi.elc
-share/mule/site-lisp/lookup/evi-mule.el
-share/mule/site-lisp/lookup/evi-mule.elc
-share/mule/site-lisp/lookup/lookup.el
-share/mule/site-lisp/lookup/lookup.elc
-share/mule/site-lisp/lookup/lookup-utils.el
-share/mule/site-lisp/lookup/lookup-utils.elc
-share/mule/site-lisp/lookup/lookup-types.el
-share/mule/site-lisp/lookup/lookup-types.elc
-share/mule/site-lisp/lookup/lookup-vse.el
-share/mule/site-lisp/lookup/lookup-vse.elc
-share/mule/site-lisp/lookup/lookup-package.el
-share/mule/site-lisp/lookup/lookup-package.elc
-share/mule/site-lisp/lookup/lookup-kanji.el
-share/mule/site-lisp/lookup/lookup-kanji.elc
-share/mule/site-lisp/lookup/lookup-entry.el
-share/mule/site-lisp/lookup/lookup-entry.elc
-share/mule/site-lisp/lookup/lookup-content.el
-share/mule/site-lisp/lookup/lookup-content.elc
-share/mule/site-lisp/lookup/lookup-select.el
-share/mule/site-lisp/lookup/lookup-select.elc
-share/mule/site-lisp/lookup/ndic.el
-share/mule/site-lisp/lookup/ndic.elc
-share/mule/site-lisp/lookup/ndeb.el
-share/mule/site-lisp/lookup/ndeb.elc
-share/mule/site-lisp/lookup/ndtp.el
-share/mule/site-lisp/lookup/ndtp.elc
-share/mule/site-lisp/lookup/ndict.el
-share/mule/site-lisp/lookup/ndict.elc
-share/mule/site-lisp/lookup/ndkks.el
-share/mule/site-lisp/lookup/ndkks.elc
-share/mule/site-lisp/lookup/ndspell.el
-share/mule/site-lisp/lookup/ndspell.elc
-share/mule/site-lisp/lookup/ndcookie.el
-share/mule/site-lisp/lookup/ndcookie.elc
-share/mule/site-lisp/lookup/ndmisc.el
-share/mule/site-lisp/lookup/ndmisc.elc
-share/mule/site-lisp/lookup/ndsrd.el
-share/mule/site-lisp/lookup/ndsrd.elc
-share/mule/site-lisp/lookup/sdicf.el
-share/mule/site-lisp/lookup/sdicf.elc
-share/mule/site-lisp/lookup/stem-english.el
-share/mule/site-lisp/lookup/stem-english.elc
-share/mule/site-lisp/lookup/lookup-vars.el
-share/mule/site-lisp/lookup/lookup-vars.elc
+%%ELISPDIR%%/lookup/evi.el
+%%ELISPDIR%%/lookup/evi.elc
+%%ELISPDIR%%/lookup/evi-mule.el
+%%ELISPDIR%%/lookup/evi-mule.elc
+%%ELISPDIR%%/lookup/lookup.el
+%%ELISPDIR%%/lookup/lookup.elc
+%%ELISPDIR%%/lookup/lookup-utils.el
+%%ELISPDIR%%/lookup/lookup-utils.elc
+%%ELISPDIR%%/lookup/lookup-types.el
+%%ELISPDIR%%/lookup/lookup-types.elc
+%%ELISPDIR%%/lookup/lookup-vse.el
+%%ELISPDIR%%/lookup/lookup-vse.elc
+%%ELISPDIR%%/lookup/lookup-package.el
+%%ELISPDIR%%/lookup/lookup-package.elc
+%%ELISPDIR%%/lookup/lookup-kanji.el
+%%ELISPDIR%%/lookup/lookup-kanji.elc
+%%ELISPDIR%%/lookup/lookup-entry.el
+%%ELISPDIR%%/lookup/lookup-entry.elc
+%%ELISPDIR%%/lookup/lookup-content.el
+%%ELISPDIR%%/lookup/lookup-content.elc
+%%ELISPDIR%%/lookup/lookup-select.el
+%%ELISPDIR%%/lookup/lookup-select.elc
+%%ELISPDIR%%/lookup/ndic.el
+%%ELISPDIR%%/lookup/ndic.elc
+%%ELISPDIR%%/lookup/ndeb.el
+%%ELISPDIR%%/lookup/ndeb.elc
+%%ELISPDIR%%/lookup/ndtp.el
+%%ELISPDIR%%/lookup/ndtp.elc
+%%ELISPDIR%%/lookup/ndict.el
+%%ELISPDIR%%/lookup/ndict.elc
+%%ELISPDIR%%/lookup/ndkks.el
+%%ELISPDIR%%/lookup/ndkks.elc
+%%ELISPDIR%%/lookup/ndspell.el
+%%ELISPDIR%%/lookup/ndspell.elc
+%%ELISPDIR%%/lookup/ndcookie.el
+%%ELISPDIR%%/lookup/ndcookie.elc
+%%ELISPDIR%%/lookup/ndmisc.el
+%%ELISPDIR%%/lookup/ndmisc.elc
+%%ELISPDIR%%/lookup/ndsrd.el
+%%ELISPDIR%%/lookup/ndsrd.elc
+%%ELISPDIR%%/lookup/sdicf.el
+%%ELISPDIR%%/lookup/sdicf.elc
+%%ELISPDIR%%/lookup/stem-english.el
+%%ELISPDIR%%/lookup/stem-english.elc
+%%ELISPDIR%%/lookup/lookup-vars.el
+%%ELISPDIR%%/lookup/lookup-vars.elc
 @unexec install-info  --delete %D/info/lookup.info %D/info/dir
 info/lookup.info
 info/lookup.info-1
@@ -53,4 +53,4 @@ info/lookup.info-3
 @unexec install-info  --delete %D/info/lookup-guide.info %D/info/dir
 info/lookup-guide.info
 @exec install-info %D/info/lookup-guide.info %D/info/dir
-@dirrm share/mule/site-lisp/lookup
+@dirrm %%ELISPDIR%%/lookup