4 files changed, 29 insertions, 15 deletions

diff --git a/japanese/emacs-manual/Makefile b/japanese/emacs-manual/Makefile
index e0ab17d04e2d..0d24cc39d5b7 100644
--- a/japanese/emacs-manual/Makefile
+++ b/japanese/emacs-manual/Makefile
@@ -9,15 +9,16 @@
 DISTNAME=	emacs-20.5-man-jp
 PKGNAME=	ja-emacs-manual-13.1999.12.13
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/GNU/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/GNU/ \
+		${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	emacs
+DISTFILES=	${DISTNAME}.tgz ${EMACS_ARC}
 
 MAINTAINER=	okazaki@be.to
 
-BUILD_DEPENDS=	${EMACS}:${PORTSDIR}/editors/emacs20 \
-		/nonexistent:${PORTSDIR}/editors/emacs20:checksum
+BUILD_DEPENDS=	${EMACS}:${PORTSDIR}/editors/emacs20
 
-# EMACS_ARC is fetched by BUILD_DEPENDS
+EXTRACT_ONLY=	${DISTNAME}.tgz
 EMACS_DISTNAME= emacs-20.5
 EMACS_ARC=	${EMACS_DISTNAME}a.tar.gz
 EMACS_SRCDIR=	${WRKDIR}/${EMACS_DISTNAME}
@@ -26,12 +27,12 @@ EXTRACT_FILES=	${EMACS_DISTNAME}/man/ack.texi \
 
 # We use emacs20 to format texinfo files.
 EMACS=		emacs-20.5
-FORMAT_FLAG=	t
 
-MAKE_ENV=	EMACS="${EMACS}" FORMAT_FLAG="${FORMAT_FLAG}"
+MAKE_ENV=	EMACS="${EMACS}"
 
 post-extract:
 	@${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
+	@${CP} ${FILESDIR}/PORT_TEXIFMT.MK ${WRKSRC}
 	@(cd ${WRKDIR} && \
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${EMACS_ARC} ${EXTRACT_AFTER_ARGS} ${EXTRACT_FILES} ; \
 	${CP} ${EXTRACT_FILES} ${WRKSRC})
diff --git a/japanese/emacs-manual/distinfo b/japanese/emacs-manual/distinfo
index 2912f8878860..13e5d65dbb48 100644
--- a/japanese/emacs-manual/distinfo
+++ b/japanese/emacs-manual/distinfo
@@ -1 +1,2 @@
 MD5 (emacs-20.5-man-jp.tgz) = 087b8b3a5200d72f6f24bc6ec30d46cd
+MD5 (emacs-20.5a.tar.gz) = d3852880bcd144c79be1b9537d28490c
diff --git a/japanese/emacs-manual/files/Makefile.in b/japanese/emacs-manual/files/Makefile.in
index f8fd7393b50a..ae123a322465 100644
--- a/japanese/emacs-manual/files/Makefile.in
+++ b/japanese/emacs-manual/files/Makefile.in
@@ -2,19 +2,15 @@ TEXIFILE= emacs.texi
 INFOFILE= ../info/emacs-ja
 
 EMACS?=	emacs
-FORMAT_FLAG?= t
 
 EMACS_ARGS= -batch -nw --multibyte -no-init-file -no-site-file
-EMACS_LOADLIBS= --load=texinfmt.el
-EMACS_FUNCALLS=	--eval "(texinfo-format-buffer ${FORMAT_FLAG})" -f save-buffer
+EMACS_LOADLIBS= --load=texinfmt.el --load=PORT_TEXIFMT.MK
+EMACS_FUNCALLS= --eval "(defconst PORT-TEXI \"${TEXIFILE}\")" -f port-texinfo-format
 
 all: ${INFOFILE}
 
-MAKEINFO-BY-EMACS: .USE
-	${EMACS} ${EMACS_ARGS} ${EMACS_LOADLIBS} ${.ALLSRC} ${EMACS_FUNCALLS} \
-		> /dev/null 2>&1
-
-${INFOFILE}: ${TEXIFILE} MAKEINFO-BY-EMACS
+${INFOFILE}: ${TEXIFILE}
+	${EMACS} ${EMACS_ARGS} ${EMACS_LOADLIBS} ${EMACS_FUNCALLS}
 
 install: all
 	${BSD_INSTALL_DATA} ${INFOFILE} ${PREFIX}/info
diff --git a/japanese/emacs-manual/files/PORT_TEXIFMT.MK b/japanese/emacs-manual/files/PORT_TEXIFMT.MK
new file mode 100644
index 000000000000..9443db0cbd56
--- /dev/null
+++ b/japanese/emacs-manual/files/PORT_TEXIFMT.MK
@@ -0,0 +1,16 @@
+;;; -*- Emacs-Lisp -*-
+;;; PORT_TEXIFMT.MK --- for texinfo-format
+;;; Code:
+
+(defun port-texinfo-format ()
+  (let (obuf)
+    (find-file (expand-file-name PORT-TEXI))
+    (setq obuf (current-buffer))
+    (require 'texinfmt)
+    (texinfo-format-buffer t)
+    (set-buffer-file-coding-system 'iso-2022-jp)
+    (save-buffer)
+    (kill-buffer (current-buffer))
+    (kill-buffer obuf)))
+
+;;; PORT_TEXIFMT.MK ends here