From owner-ports-jp@jp.freebsd.org  Sun Mar 12 00:38:55 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id AAA05505;
	Sun, 12 Mar 2000 00:38:55 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from mailgw1.be.to (mailgw1.be.to [210.235.212.5])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id AAA05499
	for <ports-jp@jp.freebsd.org>; Sun, 12 Mar 2000 00:38:53 +0900 (JST)
	(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-2000030802000035) with ESMTP id AAA01629
	for <ports-jp@jp.freebsd.org>; Sun, 12 Mar 2000 00:38:48 +0900
Received: from acidrain (ppp22-Mobara1.mtci.ne.jp [210.172.1.224])
	by mail1.be.to (8.8.8+3.0Wbeta13/BETO.2.0-1999110714000000) with SMTP id AAA29772
	for <ports-jp@jp.freebsd.org>; Sun, 12 Mar 2000 00:38:28 +0900
Received: (qmail 19384 invoked from network); 11 Mar 2000 15:37:36 -0000
Received: from localhost (HELO acidrain.localnet) (127.0.0.1)
  by localhost with SMTP; 11 Mar 2000 15:37:35 -0000
Date: Sun, 12 Mar 2000 00:37:33 +0900
Message-ID: <86k8j9cybm.wl@dolphin.be.to>
From: OKAZAKI Tetsurou <okazaki@be.to>
To: asami@FreeBSD.org
Cc: ports-jp@jp.freebsd.org, shige@FreeBSD.org
In-Reply-To: In your message of "10 Mar 2000 13:33:02 -0800"
	<vqcog8mik8h.fsf@silvia.hip.berkeley.edu>
References: <86bt4nv4ol.wl@dolphin.be.to>
	<006b01bf8a50$4b35d860$8bc07885@sitc.toshiba.co.jp>
	<vqcwvnaiql6.fsf@silvia.hip.berkeley.edu>
	<vqcog8mik8h.fsf@silvia.hip.berkeley.edu>
User-Agent: Wanderlust/1.1.0 (Overjoyed-pre3) REMI/1.14.1
 (=?ISO-8859-4?Q?Mushigawa=F2sugi?=) Chao/1.14.1 (=?ISO-8859-4?Q?Rokujiz?=
 =?ISO-8859-4?Q?=F2?=) APEL/10.2 Emacs/20.6 (i386--freebsd) MULE/4.0
 (HANANOEN)
Organization: Unknown
MIME-Version: 1.0 (generated by REMI 1.14.1 - =?ISO-8859-4?Q?=22Mushigawa=F2?=
 =?ISO-8859-4?Q?sugi=22?=)
Content-Type: text/plain; charset=ISO-2022-JP
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990727
X-Sequence: ports-jp 9085
Subject: [ports-jp 9085] Re: [patch] emacs20-dl update to emacs-dl-20.6
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: okazaki@be.to

In the message <vqcog8mik8h.fsf@silvia.hip.berkeley.edu> 
asami@FreeBSD.org (Satoshi - Ports Wraith - Asami) wrote:

>  * $B$H$j$"$($:!"(BEMACS_VER$B$,;H$o$l$F$$$k$H$3$m$G$N(B20.5 -> 20.6$B$NJQ99$r(B
>  * commit$B$7$^$9!#$"$H$O(B4.0$B$N%j%j!<%98e$H$$$&$3$H$G!#(B

> $B$3$l$b(Bcommit$B$7$^$7$?!#3NG'$O$G$-$F$$$^$;$s$,!"(B20.5$B$N$^$^$@$HLdBj30$N$H(B
> $B$3$m$G;_$^$k$N$OL@Gr$J$N$G$H$j$"$($:$3$l$GMM;R$r8+$^$7$g$&!#(B

> $B$J$K$+2u$l$?$i$3$3$K=P$^$9!#;d$,?2$F$$$k4V$K2?$+=P$?$i$h$m$7$/$*4j$$$7(B
$B$^$9!#!J(B> $BJ!Eg$5$sB>!K(B

>   http://bento.FreeBSD.org/errorlogs/errorlogs/e.4.20000309/

1) leim20 $B$N(B checksum $B$,99?7$5$l$F$$$^$;$s!#(B

diff -urN /usr/ports/editors/leim20/files/md5 leim20/files/md5
--- /usr/ports/editors/leim20/files/md5	Wed Jan  5 23:40:47 2000
+++ leim20/files/md5	Sat Mar 11 20:51:25 2000
@@ -1 +1 @@
-MD5 (leim-20.5a.tar.gz) = bbf2dfcb55fa95d178844e7551c497b5
+MD5 (leim-20.6.tar.gz) = d5e35be67636b266b604fd606aefcb01

2) japanese/emacs-manual $B$K2<$N%Q%C%A$rEv$F$F$/$@$5$$!#(B
   ports/17205 $B$N99?7J,$r4^$s$G$^$9!#(B

diff -urN /usr/ports/japanese/emacs-manual/Makefile emacs-manual/Makefile
--- /usr/ports/japanese/emacs-manual/Makefile	Sat Mar 11 08:29:46 2000
+++ emacs-manual/Makefile	Sun Mar 12 00:17:28 2000
@@ -7,9 +7,9 @@
 #
 
 DISTNAME=	emacs-20.5-man-jp
-PKGNAME=	ja-emacs-manual-13.1999.12.13
+PKGNAME=	ja-emacs-manual-13.2000.01.13
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/GNU/ \
+MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/GNU/emacs-20.x/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
 DISTFILES=	${DISTNAME}.tgz ${EMACS_ARC}
@@ -18,13 +18,24 @@
 
 BUILD_DEPENDS=	${EMACS}:${PORTSDIR}/editors/emacs20
 
+ERRATA_FILE=	Errata-2000-01-13
+
 EXTRACT_ONLY=	${DISTNAME}.tgz
 EMACS_DISTNAME= emacs-20.6
-EMACS_ARC=	${EMACS_DISTNAME}a.tar.gz
+EMACS_ARC=	${EMACS_DISTNAME}.tar.gz
 EMACS_SRCDIR=	${WRKDIR}/${EMACS_DISTNAME}
 EXTRACT_FILES=	${EMACS_DISTNAME}/man/ack.texi \
 		${EMACS_DISTNAME}/lisp/textmodes/texinfmt.el
 
+# We must apply this patch at first.
+EXTRA_PATCHES=	${WRKSRC}/patch-texinfmt.el
+
+.if defined(ERRATA_FILE) && !empty(ERRATA_FILE)
+DISTFILES+=	${ERRATA_FILE}.tgz
+EXTRACT_ONLY+=	${ERRATA_FILE}.tgz
+EXTRA_PATCHES+=	${WRKDIR}/${ERRATA_FILE}
+.endif
+
 # We use emacs20 to format texinfo files.
 EMACS=		emacs-20.6
 
@@ -37,9 +48,6 @@
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${EMACS_ARC} ${EXTRACT_AFTER_ARGS} ${EXTRACT_FILES} ; \
 	${CP} ${EXTRACT_FILES} ${WRKSRC})
 	@${MKDIR} ${WRKDIR}/info
-
-pre-patch:
-	@${PATCH} ${PATCH_ARGS} < ${WRKSRC}/patch-texinfmt.el
 
 pre-build:
 	@${ECHO_MSG} "===>   Now start formatting texinfo. Please wait."
diff -urN /usr/ports/japanese/emacs-manual/files/md5 emacs-manual/files/md5
--- /usr/ports/japanese/emacs-manual/files/md5	Fri Jan 28 11:41:47 2000
+++ emacs-manual/files/md5	Sun Mar 12 00:18:11 2000
@@ -1,2 +1,3 @@
 MD5 (emacs-20.5-man-jp.tgz) = 087b8b3a5200d72f6f24bc6ec30d46cd
-MD5 (emacs-20.5a.tar.gz) = d3852880bcd144c79be1b9537d28490c
+MD5 (emacs-20.6.tar.gz) = cfcaa33b5fc7d64210d3428f13570f8d
+MD5 (Errata-2000-01-13.tgz) = 7b4fa4f0357b16c9a73352f402430688

-- 
$B2,:jE/O/(B
