Upgrade to 20.4 and remove BROKEN.

PR:		14910
Submitted by:	OKAZAKI Tetsurou <okazaki@be.to>

5 files changed, 29 insertions, 40 deletions

diff --git a/japanese/emacs-manual/Makefile b/japanese/emacs-manual/Makefile
index 2ff0443291b0..24cb9d832896 100644
--- a/japanese/emacs-manual/Makefile
+++ b/japanese/emacs-manual/Makefile
@@ -6,29 +6,26 @@
 # $FreeBSD$
 #
 
-DISTNAME=	emacs-20.3-man-jp
-PKGNAME=	ja-emacs-manual-13.1998.11.25
+DISTNAME=	emacs-20.4-man-jp
+PKGNAME=	ja-emacs-manual-13.1999.09.12
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/GNU/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	okazaki@be.to
 
-BUILD_DEPENDS=	emacs-20.3:${PORTSDIR}/editors/emacs20 \
-		/nonexistent:${PORTSDIR}/editors/emacs20:fetch
-
-BROKEN=	"Depending emacs ports are already 20.4. Waiting for upgrade."
-FORBIDDEN= ${BROKEN} # Avoiding package building error report.
+BUILD_DEPENDS=	emacs-20.4:${PORTSDIR}/editors/emacs20 \
+		/nonexistent:${PORTSDIR}/editors/emacs20:checksum
 
 # EMACS_ARC is fetched by BUILD_DEPENDS
-EMACS_DISTNAME= emacs-20.3
+EMACS_DISTNAME= emacs-20.4
 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 use emacs20 to format texinfo files.
-EMACS=		emacs-20.3
+EMACS=		emacs-20.4
 FORMAT_FLAG=	t
 
 MAKE_ENV=	EMACS="${EMACS}" FORMAT_FLAG="${FORMAT_FLAG}"
@@ -36,18 +33,13 @@ MAKE_ENV=	EMACS="${EMACS}" FORMAT_FLAG="${FORMAT_FLAG}"
 post-extract:
 	@${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
 	@(cd ${WRKDIR} && \
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${EMACS_ARC} ${EXTRACT_AFTER_ARGS} ${EXTRACT_FILES})
-	@${CP} ${EMACS_SRCDIR}/man/ack.texi ${WRKSRC}/ack.texi
-	@${CP} ${EMACS_SRCDIR}/lisp/textmodes/texinfmt.el ${WRKSRC}/texinfmt.el
+	${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
 
-post-patch:
-	@(cd ${WRKSRC} && ${MV} texinfmt.el texinfmt.el.tmp && \
-	  ${SED} -e 's/START-INFO-DIR-ENTRY\\n\\n/START-INFO-DIR-ENTRY\\n/g' \
-	  texinfmt.el.tmp > texinfmt.el)
-
 pre-build:
 	@${ECHO_MSG} "===>   Now start formatting texinfo. Please wait."
 
diff --git a/japanese/emacs-manual/distinfo b/japanese/emacs-manual/distinfo
index ad2023ad48dc..b26fa3251c36 100644
--- a/japanese/emacs-manual/distinfo
+++ b/japanese/emacs-manual/distinfo
@@ -1 +1 @@
-MD5 (emacs-20.3-man-jp.tgz) = b080e57be7aa861012aeee3f17ec6a8e
+MD5 (emacs-20.4-man-jp.tgz) = 9443b8b814174a7cc8d59dcd531ac0dc
diff --git a/japanese/emacs-manual/files/Makefile.in b/japanese/emacs-manual/files/Makefile.in
index 22b3e0d31352..f8fd7393b50a 100644
--- a/japanese/emacs-manual/files/Makefile.in
+++ b/japanese/emacs-manual/files/Makefile.in
@@ -1,21 +1,23 @@
 TEXIFILE= emacs.texi
-INFOFILE= emacs-ja
+INFOFILE= ../info/emacs-ja
 
 EMACS?=	emacs
 FORMAT_FLAG?= t
 
-EMACS_ARGS= -batch -nw --multibyte -no-site-file
+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
 
 all: ${INFOFILE}
 
-${INFOFILE}: ${TEXIFILE}
-	${EMACS} ${EMACS_ARGS} ${EMACS_LOADLIBS} ${TEXIFILE} ${EMACS_FUNCALLS} \
+MAKEINFO-BY-EMACS: .USE
+	${EMACS} ${EMACS_ARGS} ${EMACS_LOADLIBS} ${.ALLSRC} ${EMACS_FUNCALLS} \
 		> /dev/null 2>&1
 
+${INFOFILE}: ${TEXIFILE} MAKEINFO-BY-EMACS
+
 install: all
 	${BSD_INSTALL_DATA} ${INFOFILE} ${PREFIX}/info
 
 clean:
-	rm -f ${INFOFILE}
\ No newline at end of file
+	rm -f ${INFOFILE}
diff --git a/japanese/emacs-manual/files/patch-aa b/japanese/emacs-manual/files/patch-aa
index 67218e4c801b..d0ffe3c4c919 100644
--- a/japanese/emacs-manual/files/patch-aa
+++ b/japanese/emacs-manual/files/patch-aa
@@ -1,29 +1,24 @@
---- emacs.texi.orig	Tue Dec  1 00:00:00 1998
-+++ emacs.texi	Fri Apr 23 23:21:44 1999
-@@ -10,20 +10,20 @@
+--- emacs.texi.~1~	Mon Sep 13 10:50:56 1999
++++ emacs.texi	Tue Nov 16 01:25:21 1999
+@@ -11,7 +11,8 @@
  @setchapternewpage odd
  @c @settitle GNU Emacs Manual
  @settitle GNU Emacsマニュアル
 -@setfilename ../info/emacs
-+@setfilename emacs-ja
++@setfilename ../info/emacs-ja
 +@footnotestyle end
  @synindex pg cp
  
  @ifinfo
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Emacs-ja: (emacs-ja).         The extensible self-documenting text editor. (Japanese)
-+@end direntry
- @c @c The edition number appears in several places in this file
- @c This is the thirteenth edition of the @cite{GNU Emacs Manual},
- @c updated for Emacs version 20.3
- Emacs 20.3版対応に改訂した@cite{GNU Emacs Manual} 13版です。
+@@ -21,9 +22,9 @@
+ Emacs 20.4版対応に改訂した@cite{GNU Emacs Manual} 13版です。
  @c Please REMEMBER to update edition number in *three* places in this file.
--
+ 
 -@dircategory Editors
--@direntry
++@dircategory The Emacs editor and associated tools
+ @direntry
 -* Emacs: (emacs).	The extensible self-documenting text editor.
--@end direntry
++* Emacs-ja: (emacs-ja).		The extensible self-documenting text editor. (Japanese)
+ @end direntry
  
  Published by the Free Software Foundation
- 59 Temple Place, Suite 330
diff --git a/japanese/emacs-manual/pkg-descr b/japanese/emacs-manual/pkg-descr
index 75ed47866650..efb277826a30 100644
--- a/japanese/emacs-manual/pkg-descr
+++ b/japanese/emacs-manual/pkg-descr
@@ -2,4 +2,4 @@ This is a Japanese translation of the GNU Emacs Manual.
 
 Emacs is the extensible, customizable, self-documenting real-time
 display editor.  This Info file describes how to edit with Emacs and
-some of how to customize it; it corresponds to GNU Emacs version 20.3.
+some of how to customize it; it corresponds to GNU Emacs version 20.4.