4 files changed, 28 insertions, 31 deletions

diff --git a/japanese/elisp-manual/Makefile b/japanese/elisp-manual/Makefile
index a1480f7639d4..75889d39a7a2 100644
--- a/japanese/elisp-manual/Makefile
+++ b/japanese/elisp-manual/Makefile
@@ -25,34 +25,53 @@ USE_REINPLACE=	yes
 
 # emacs port setup
 
-EXTRA_FILES=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/lisp/textmodes/texinfmt.el
+TEXINFMT_EL=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/lisp/textmodes/texinfmt.el
 
 # We must apply this patch at first.
 EXTRA_PATCHES=	${WRKSRC}/patch-texinfmt.el
 
+EXTRACT_DEPENDS+=	${TEXINFMT_EL}:${EMACS_PORTSDIR}
+
+INFO=	elisp-ja
+TEXINFO=	elisp.texi
+
+EMACS_ARGS=	-batch -nw --multibyte -no-init-file -no-site-file
+EMACS_LOADLIBS=	--load=texinfmt.el --load=PORT_TEXIFMT.MK
+
 post-extract:
-	${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
 	${CP} ${FILESDIR}/PORT_TEXIFMT.MK ${WRKSRC}
-	${CP} ${EXTRA_FILES} ${WRKSRC}
+	${CP} ${TEXINFMT_EL} ${WRKSRC}
 	${MKDIR} ${WRKDIR}/info
 	${LN} -sf index.unperm ${WRKSRC}/index.texi
 
 pre-patch:
-	@(cd ${WRKSRC} && \
-	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-texinfmt.el.patch ; \
-	)
+	cd ${WRKSRC}; \
+	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-texinfmt.el.patch
 
 post-patch:
-	cd ${WRKSRC} && \
+	cd ${WRKSRC}; \
 	${REINPLACE_CMD} -E -e 's/(@[^@]*ref{.*,.*,.*, *emacs),/\1-ja,/;' *.texi
 
 pre-build:
 	@${ECHO_MSG} "===>   Now start formatting texinfo. Please wait."
 
+do-build:
+	cd ${WRKSRC}; for f in ${TEXINFO}; do \
+		${EMACS_CMD} ${EMACS_ARGS} ${EMACS_LOADLIBS} \
+			--eval "(port-texinfo-format \"$$f\" 'junet)"; \
+	done
+
 post-build:
 	@${ECHO_MSG} "===>   Done."
 
+do-install:
+.for i in ${INFO}
+	${INSTALL_DATA} ${WRKDIR}/info/$i.info ${PREFIX}/${INFO_PATH}
+.endfor
+
 post-install:
-	install-info ${PREFIX}/info/elisp-ja ${PREFIX}/info/dir
+.for i in ${INFO}
+	install-info ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
+.endfor
 
 .include <bsd.port.mk>
diff --git a/japanese/elisp-manual/files/Makefile.in b/japanese/elisp-manual/files/Makefile.in
deleted file mode 100644
index 564d0332e56a..000000000000
--- a/japanese/elisp-manual/files/Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-TEXIFILE= elisp.texi
-INFOFILE= ../info/elisp-ja
-
-EMACS?=	emacs
-
-EMACS_ARGS= -batch -nw --multibyte -no-init-file -no-site-file
-EMACS_LOADLIBS= --load=texinfmt.el --load=PORT_TEXIFMT.MK
-EMACS_FUNCALLS= --eval "(port-texinfo-format \"${TEXIFILE}\" 'junet)" 
-
-all: ${INFOFILE}
-
-${INFOFILE}: ${TEXIFILE}
-	${EMACS} ${EMACS_ARGS} ${EMACS_LOADLIBS} ${EMACS_FUNCALLS}
-
-install: all
-	${BSD_INSTALL_DATA} ${INFOFILE} ${PREFIX}/info
-
-clean:
-	rm -f ${INFOFILE}
diff --git a/japanese/elisp-manual/files/patch-aa b/japanese/elisp-manual/files/patch-aa
index e5d449d4c9b1..1313d7add473 100644
--- a/japanese/elisp-manual/files/patch-aa
+++ b/japanese/elisp-manual/files/patch-aa
@@ -4,7 +4,7 @@
  \input texinfo  @c -*-texinfo-*-
  @c %**start of header
 -@setfilename elisp
-+@setfilename ../info/elisp-ja
++@setfilename ../info/elisp-ja.info
  @c @settitle GNU Emacs Lisp Reference Manual
  @settitle GNU Emacs Lispリファレンスマニュアル
  @c %**end of header
diff --git a/japanese/elisp-manual/pkg-plist b/japanese/elisp-manual/pkg-plist
deleted file mode 100644
index e638cfe45038..000000000000
--- a/japanese/elisp-manual/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-@unexec install-info --delete %D/info/elisp-ja %D/info/dir
-info/elisp-ja
-@exec install-info %D/info/elisp-ja %D/info/dir