3 files changed, 59 insertions, 50 deletions

diff --git a/japanese/lookup-mule/Makefile b/japanese/lookup-mule/Makefile
index 7a05a0dbe27b..c45f01292a16 100644
--- a/japanese/lookup-mule/Makefile
+++ b/japanese/lookup-mule/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	lookup
-PORTVERSION=	1.2
-PKGNAMESUFFIX?=	-mule
+PORTVERSION=	1.3
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 CATEGORIES=	japanese elisp
-MASTER_SITES=	http://openlab.ring.gr.jp/lookup/DIST/
+MASTER_SITES=	http://download.sourceforge.net/lookup/
 
 MAINTAINER=	taoka@FreeBSD.org
 
@@ -18,37 +18,25 @@ RUN_DEPENDS+=	eblook:${PORTSDIR}/japanese/eblook
 FILESDIR=	${.CURDIR}/../lookup-mule/files
 PKGDIR=		${.CURDIR}/../lookup-mule/pkg
 PLIST=		${.CURDIR}/pkg/PLIST
-PATCHDIR=	${.CURDIR}/patches
-EMACS?=		mule
+EMACS_PORT_NAME?=	mule
 
-.if (${EMACS} == "xemacs")
+.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/site-lisp
+EMACSDIR=	${PREFIX}/share/${EMACS_NAME}/site-lisp
 ELISPDIR=	${EMACSDIR}/lookup
 PORTINFODIR=	${PREFIX}/info
 .endif
-NO_BUILD=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \
+		--with-lispdir=${ELISPDIR} \
+		--infodir=${PORTINFODIR}
 
-do-install:
-	${MKDIR} ${ELISPDIR} ${PORTINFODIR};
-	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${ELISPDIR}
-	${RM} ${ELISPDIR}/lookup-compile.el
-	${SED} -e 's,@VERSION@,${PORTVERSION},' -e 's,@pkgemacsdir@,${ELISPDIR},' \
-		${WRKSRC}/lisp/lookup-vars.el.in > ${ELISPDIR}/lookup-vars.el
-	${INSTALL_DATA} ${WRKSRC}/texi/lookup.info* ${PORTINFODIR}
-	${INSTALL_DATA} ${WRKSRC}/texi/lookup-guide.info ${PORTINFODIR}
-.if (${EMACS} != "xemacs")
-	install-info ${PORTINFODIR}/lookup.info ${PORTINFODIR}/dir
-	install-info ${PORTINFODIR}/lookup-guide.info ${PORTINFODIR}/dir
-.endif
-	${SED} -e 's,%%ELISPDIR%%,${ELISPDIR},' ${FILESDIR}/lookup-startup.el.tmpl > ${ELISPDIR}/../lookup-startup.el
-
-.if (${EMACS} == "xemacs")
 post-install:
+.if (${EMACS_PORT_NAME} == "xemacs")
 	${RM} -f ${WRKDIR}/${MANIFEST}
 	emacsdir=`${ECHO} ${EMACSDIR} | ${SED} -e "s;^${PREFIX}/;;"`; \
 	${CAT} ${PLIST} | ${GREP} -e "^$${emacsdir}" | \
diff --git a/japanese/lookup-mule/distinfo b/japanese/lookup-mule/distinfo
index d6e61fe8222d..6c0851902493 100644
--- a/japanese/lookup-mule/distinfo
+++ b/japanese/lookup-mule/distinfo
@@ -1 +1 @@
-MD5 (lookup-1.2.tar.gz) = 4a13ae2548ac52be0e54aa7b394b9955
+MD5 (lookup-1.3.tar.gz) = ed80e1cbcb25dfcdbdf25e6830e03434
diff --git a/japanese/lookup-mule/pkg-plist b/japanese/lookup-mule/pkg-plist
index ab5a017f7312..36e6dd4049bc 100644
--- a/japanese/lookup-mule/pkg-plist
+++ b/japanese/lookup-mule/pkg-plist
@@ -1,28 +1,49 @@
-share/emacs/site-lisp/lookup-startup.el
-share/emacs/site-lisp/lookup/evi-mule.el
-share/emacs/site-lisp/lookup/evi.el
-share/emacs/site-lisp/lookup/lookup-content.el
-share/emacs/site-lisp/lookup/lookup-entry.el
-share/emacs/site-lisp/lookup/lookup-kanji.el
-share/emacs/site-lisp/lookup/lookup-package.el
-share/emacs/site-lisp/lookup/lookup-select.el
-share/emacs/site-lisp/lookup/lookup-types.el
-share/emacs/site-lisp/lookup/lookup-utils.el
-share/emacs/site-lisp/lookup/lookup-vars.el
-share/emacs/site-lisp/lookup/lookup-vse.el
-share/emacs/site-lisp/lookup/lookup.el
-share/emacs/site-lisp/lookup/ndcookie.el
-share/emacs/site-lisp/lookup/ndeb.el
-share/emacs/site-lisp/lookup/ndic.el
-share/emacs/site-lisp/lookup/ndict.el
-share/emacs/site-lisp/lookup/ndkks.el
-share/emacs/site-lisp/lookup/ndmisc.el
-share/emacs/site-lisp/lookup/ndnmz.el
-share/emacs/site-lisp/lookup/ndspell.el
-share/emacs/site-lisp/lookup/ndsrd.el
-share/emacs/site-lisp/lookup/ndtp.el
-share/emacs/site-lisp/lookup/sdicf.el
-share/emacs/site-lisp/lookup/stem-english.el
+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
 @unexec install-info  --delete %D/info/lookup.info %D/info/dir
 info/lookup.info
 info/lookup.info-1
@@ -32,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/emacs/site-lisp/lookup
+@dirrm share/mule/site-lisp/lookup