From okazaki@be.to  Tue Jan 25 15:11:41 2000
Return-Path: <okazaki@be.to>
Received: from mailgw1.be.to (mailgw1.be.to [210.235.212.5])
	by hub.freebsd.org (Postfix) with ESMTP id 2F27215393
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 Jan 2000 15:10:55 -0800 (PST)
	(envelope-from okazaki@be.to)
Received: from mail1.be.to (point1.be.to [210.235.212.29])
	by mailgw1.be.to (8.9.3+3.2W/BETO.2.1-2000011019000035) with ESMTP id IAA14033
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 26 Jan 2000 08:10:53 +0900
Received: from acidrain (ppp32-Mobara1.mtci.ne.jp [210.172.1.234])
	by mail1.be.to (8.8.8+3.0Wbeta13/BETO.2.0-1999110714000000) with SMTP id IAA07243
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 26 Jan 2000 08:10:36 +0900
Received: (qmail 809 invoked by uid 1001); 25 Jan 2000 23:06:53 -0000
Message-Id: <20000125230653.808.qmail@dolphin.be.to>
Date: 25 Jan 2000 23:06:53 -0000
From: okazaki@be.to
Reply-To: okazaki@be.to
To: FreeBSD-gnats-submit@freebsd.org
Subject: Refactoring port: japanese/emacs-manual
X-Send-Pr-Version: 3.2

>Number:         16357
>Category:       ports
>Synopsis:       Refactoring port: japanese/emacs-manual
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 25 15:20:01 PST 2000
>Closed-Date:    Thu Jan 27 13:52:04 PST 2000
>Last-Modified:  Thu Jan 27 13:52:19 PST 2000
>Originator:     OKAZAKI Tetsurou
>Release:        FreeBSD 3.4-STABLE i386
>Organization:
Unknown
>Environment:

	ports/japanese/emacs-manual/Makefile,v 1.7 2000/01/08 18:52:29

>Description:

	o Fix irregular checksum depend to emacs20 (kindly pointed by PW.)
	o Change port's texinfo format procedure more verbose one.

	New file:	files/PORT_TEXIFMT.MK
	Modified:	Makefile files/md5 files/Makefile.in

>How-To-Repeat:

	

>Fix:
	
	Commit this patch, thanks.

diff -urN /usr/ports/japanese/emacs-manual/Makefile emacs-manual/Makefile
--- /usr/ports/japanese/emacs-manual/Makefile	Mon Jan 10 02:00:29 2000
+++ emacs-manual/Makefile	Tue Jan 25 15:28:56 2000
@@ -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 @@
 
 # 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 -urN /usr/ports/japanese/emacs-manual/files/Makefile.in emacs-manual/files/Makefile.in
--- /usr/ports/japanese/emacs-manual/files/Makefile.in	Mon Nov 22 02:25:28 1999
+++ emacs-manual/files/Makefile.in	Tue Jan 25 15:27:41 2000
@@ -2,19 +2,15 @@
 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 -urN /usr/ports/japanese/emacs-manual/files/PORT_TEXIFMT.MK emacs-manual/files/PORT_TEXIFMT.MK
--- /usr/ports/japanese/emacs-manual/files/PORT_TEXIFMT.MK	Thu Jan  1 09:00:00 1970
+++ emacs-manual/files/PORT_TEXIFMT.MK	Tue Jan 25 15:30:52 2000
@@ -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
diff -urN /usr/ports/japanese/emacs-manual/files/md5 emacs-manual/files/md5
--- /usr/ports/japanese/emacs-manual/files/md5	Mon Jan 10 02:00:29 2000
+++ emacs-manual/files/md5	Tue Jan 25 15:06:37 2000
@@ -1 +1,2 @@
 MD5 (emacs-20.5-man-jp.tgz) = 087b8b3a5200d72f6f24bc6ec30d46cd
+MD5 (emacs-20.5a.tar.gz) = d3852880bcd144c79be1b9537d28490c

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: asami 
State-Changed-When: Thu Jan 27 13:52:04 PST 2000 
State-Changed-Why:  
committed, thanks! 
>Unformatted:
