Updated TeXfamily, TeXfamily-share to 1.2.1nb1. Addresses pkg/13984.

- Fixed to the long-standing problem that since the date of LaTeX included
  teTeX is too old (i.e. > 1 year), TeXfamily doesn't compile.

- Fixed TeXfamily build problem.  TeXfamily is a patch to teTeX-bin, so if
  ${WRKDIR} of teTeX-bin is remaind when TeXfamily build starts.  This occurs
  if you cd to japanese/texfamily and do make on the system teTeX-related
  packages are not installed.

- Updated dvipsk-jpatch to p1.5e which is a content of the package.

  o fixed a bug that an extra rotate was put at the last of each pages.

  o fixed a bug that output position of the European fonts was incorrect
    with help from Hideyuki Suzuki at the University of Tokyo.

8 files changed, 48 insertions, 388 deletions

diff --git a/japanese/texfamily/Makefile b/japanese/texfamily/Makefile
index 1383fb4514f..37625165786 100644
--- a/japanese/texfamily/Makefile
+++ b/japanese/texfamily/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2001/10/17 23:23:15 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/24 00:29:30 kei Exp $
 
-DISTNAME=	TeXfamily-1.2.1
+DISTNAME=	TeXfamily-1.2.1nb1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2/ \
 		ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2.1/ \
@@ -16,13 +16,17 @@ DISTFILES=	texfam-1.2${EXTRACT_SUFX} \
 		dvi2ps-3.2j${EXTRACT_SUFX} \
 		jmakeindex${EXTRACT_SUFX} \
 		ptex-src-2.1.10${EXTRACT_SUFX} \
-		dvipsk-jpatch-p1.5d${EXTRACT_SUFX} \
+		dvipsk-jpatch-p1.5e${EXTRACT_SUFX} \
 		mendexk2.4f${EXTRACT_SUFX}
 
+PATCH_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/
+PATCHFILES=	ptex2.1.10-11.patch
+PATCH_DIST_ARGS= -d ${WRKSRC}/texk/web2c/ptex-src-2.1.10
+
 MAINTAINER=	kei@netbsd.org
 COMMENT=	TeXfamily (pTeX, JTeX, MuLTeX) - executables
 
-DEPENDS+=	TeXfamily-share-1.2.1:../../japanese/texfamily-share
+DEPENDS+=	TeXfamily-share>=1.2.1nb1:../../japanese/texfamily-share
 DEPENDS+=	ja-vflib-lib-[0-9]*:../../japanese/vflib-lib
 
 DIST_SUBDIR=	TeXfamily
@@ -72,6 +76,8 @@ CONFIGURE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 pre-extract:
 	if [ ! -e ${WRKSRC} ]; then \
 		cd ../../print/teTeX-bin && ${MAKE} patch; \
+	elif [ ! -e ${WRKSRC}/texk/texfam.ac ]; then \
+		cd ../../print/teTeX-bin && ${MAKE} clean; ${MAKE} patch; \
 	fi
 
 post-extract:
@@ -90,7 +96,7 @@ post-extract:
 	${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/dvi2ps-3.2j${EXTRACT_SUFX} \
 		-C ${WRKSRC}/texk
 	${GTAR} -xzf \
-		${DISTDIR}/${DIST_SUBDIR}/dvipsk-jpatch-p1.5d${EXTRACT_SUFX} \
+		${DISTDIR}/${DIST_SUBDIR}/dvipsk-jpatch-p1.5e${EXTRACT_SUFX} \
 		-C ${WRKDIR}
 	${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/mendexk2.4f${EXTRACT_SUFX} \
 		-C ${WRKSRC}/texk
@@ -107,10 +113,6 @@ pre-patch:
 	${PATCH} -d ${WRKSRC}/texk/dvipsk --quiet -E -p1 < \
 		${WRKDIR}/dvipsk586.patch
 
-post-configure:
-	(cd ${WRKSRC}/texk/web2c/ptex-src-2.1.10; \
-		./configure EUC ${LOCALBASE}/share/texmf.local)
-
 post-patch:
 	${MV} ${WRKSRC}/texk/kpathsea/texmf.in \
 		${WRKSRC}/texk/kpathsea/texmf.in.orig
@@ -118,6 +120,10 @@ post-patch:
 		${WRKSRC}/texk/kpathsea/texmf.in.orig > \
 		${WRKSRC}/texk/kpathsea/texmf.in 
 
+post-configure:
+	(cd ${WRKSRC}/texk/web2c/ptex-src-2.1.10; \
+		./configure EUC ${LOCALBASE}/share/texmf.local)
+
 do-build:
 	(cd ${WRKSRC}/texk/web2c; ${GMAKE})
 	(cd ${WRKSRC}/texk/web2c-j; ${GMAKE})
diff --git a/japanese/texfamily/distinfo b/japanese/texfamily/distinfo
index f98c6345cb1..501980bcb09 100644
--- a/japanese/texfamily/distinfo
+++ b/japanese/texfamily/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2001/09/02 21:26:01 hubertf Exp $
+$NetBSD: distinfo,v 1.5 2001/10/24 00:29:31 kei Exp $
 
 SHA1 (TeXfamily/texfam-1.2.tar.gz) = 510ef7048c1353a75d84d548738e8e2a94d83be9
 Size (TeXfamily/texfam-1.2.tar.gz) = 154286 bytes
@@ -16,17 +16,19 @@ SHA1 (TeXfamily/jmakeindex.tar.gz) = 14e68b3cbd0f80ae383b540a5391d8ccecc4ba57
 Size (TeXfamily/jmakeindex.tar.gz) = 283656 bytes
 SHA1 (TeXfamily/ptex-src-2.1.10.tar.gz) = d5d1cfe0f56d9b4bcd660486d1af8923bc935426
 Size (TeXfamily/ptex-src-2.1.10.tar.gz) = 132496 bytes
-SHA1 (TeXfamily/dvipsk-jpatch-p1.5d.tar.gz) = 3e19438d7519fedc81229a7fc248484c89f5a387
-Size (TeXfamily/dvipsk-jpatch-p1.5d.tar.gz) = 22818 bytes
+SHA1 (TeXfamily/dvipsk-jpatch-p1.5e.tar.gz) = 568bb4ed176603f43e3f5f0c25c6ff778d093399
+Size (TeXfamily/dvipsk-jpatch-p1.5e.tar.gz) = 23009 bytes
 SHA1 (TeXfamily/mendexk2.4f.tar.gz) = aa65a16a2bc965877fb19e8798ee80790917c588
 Size (TeXfamily/mendexk2.4f.tar.gz) = 22371 bytes
-SHA1 (patch-aa) = 420ce2595e42d35818244b67ee41f8358df2b1d7
+SHA1 (TeXfamily/ptex2.1.10-11.patch) = 8fcef65143761e1862d9e9c80f98a2e5211f57b0
+Size (TeXfamily/ptex2.1.10-11.patch) = 4430 bytes
+SHA1 (patch-aa) = dfc441babfff2fefee43dd38a6f1393859f1d370
 SHA1 (patch-ab) = 6dc92be09afbce61d62468873c21add1564ac02c
 SHA1 (patch-ac) = eeb266e3fc5a6b646ffc498c08107a9dd76c6660
 SHA1 (patch-ad) = 3292baba0f31f191c13a12dd3cd39e8bd2e091f7
 SHA1 (patch-ae) = 2f21e4c6fbe327159d3abd65e501ee440f0c3657
-SHA1 (patch-af) = 8a2fdc955bfca8773147d6bb7752ed3532261540
-SHA1 (patch-ag) = d24593acc4768e421836f4f3a70c8d961d74e1f8
+SHA1 (patch-af) = 999a897d77004503253e7f443e9108d969a4ad11
+SHA1 (patch-ag) = fcd691409227e6025ffc52c23df5a82ab23bf0c3
 SHA1 (patch-ah) = 08b0d94c7347693da7fe024eb0ab81916a598529
 SHA1 (patch-ai) = 9f62fe1d16f4004997718fbc7b6f9ad3bef607c6
-SHA1 (patch-aj) = e2dcd12c337757e45b34b99a1252d411dbc0252c
+SHA1 (patch-aj) = 16eee3e2af7f4fc02c8da9577dc363cd271b8bc3
diff --git a/japanese/texfamily/patches/patch-aa b/japanese/texfamily/patches/patch-aa
index f6a710fe577..5df078d9a72 100644
--- a/japanese/texfamily/patches/patch-aa
+++ b/japanese/texfamily/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2001/09/02 21:26:01 hubertf Exp $
+$NetBSD: patch-aa,v 1.3 2001/10/24 00:29:31 kei Exp $
 
---- texk/web2c/ptex-src-2.1.10/Makefile.in.orig	Thu Feb  8 09:56:34 2001
-+++ texk/web2c/ptex-src-2.1.10/Makefile.in
+--- texk/web2c/ptex-src-2.1.10/Makefile.in.orig	Thu Feb  8 17:56:34 2001
++++ texk/web2c/ptex-src-2.1.10/Makefile.in	Tue Oct 23 14:47:40 2001
 @@ -4,10 +4,15 @@
  
  default: programs formats
@@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.2 2001/09/02 21:26:01 hubertf Exp $
  jbibtex: jbibtex.o jbibextra.o $(plib_o) $(kpathsea) $(proglib)
  	$(kpathsea_link) jbibtex.o jbibextra.o $(plib_o) $(LOADLIBES)
  jbibtex.o: jbibtex.c jbibextra.h kanji.h maintain.h ptexhelp.h
-@@ -175,15 +189,20 @@
+@@ -175,7 +189,12 @@
  texmf.cnf: $(kpathsea_dir)/texmf.cnf
  	$(SHELL) $(thisdir)/mkconf $< > texmf.cnf
  
@@ -63,13 +63,12 @@ $NetBSD: patch-aa,v 1.2 2001/09/02 21:26:01 hubertf Exp $
  
  ptex.fmt: ptex texmf.cnf
  	$(dumpenv) $(MAKE) $(makeargs) files="--progname=ptex ptex.tex min10.tfm" prereq-check
--	$(dumpenv) ./ptex -ini \\input ptex \\dump </dev/null
-+	$(dumpenv) ./ptex -ini \\input ptex \\dump </dev/null || true
+@@ -183,7 +202,7 @@
  
  platex.fmt: ptex texmf.cnf
  	$(dumpenv) $(MAKE) $(makeargs) files="--progname=platex platex.ltx" prereq-check
 -	$(dumpenv) ./ptex -ini --progname=platex \\input platex.ltx </dev/null
-+	$(dumpenv) ./ptex -ini --progname=platex \\input platex.ltx </dev/null || true
++	$(dumpenv) ./ptex -ini --progname=platex \\input platex.ltx </dev/null || ${TRUE}
  
  # This is meant to be called recursively, with $(files) set.
  prereq-check: $(kpathsea_dir)/kpsewhich
@@ -115,21 +114,3 @@ $NetBSD: patch-aa,v 1.2 2001/09/02 21:26:01 hubertf Exp $
  # map files are not provided with pTeX
  #	cd $(thisdir)/share && \
  #	for f in *.map; do $(INSTALL_DATA) $$f $(fontnamedir)/$$f; done
-@@ -258,7 +277,7 @@
- 	./tftopl ./trip.tfm trip.pl
- 	-diff $(tripdir)/trip.pl trip.pl
- 	rm -f trip.tex; $(LN) $(tripdir)/trip.tex . # get same filename in log
--	-$(SHELL) -c '$(testenv) ./ptex -ini <$(tripdir)/trip1.in >tripin.fot'
-+	-$(SHELL) -c '$(testenv) ./ptex -ini <$(tripdir)/trip1.in >tripin.fot' || true
- 	mv trip.log tripin.log
- 	-diff $(tripdir)/tripin.log tripin.log
- # May as well test non-ini second time through.
-@@ -298,7 +317,7 @@
- # tcx files are a bad idea.
- #	./ptex -translate-file=$(srcdir)/share/isol1-t1.tcx $(testdir)/eight \
- #	  && ./pdvitype eight.dvi >eigh.typ
--	./ptex -mltex -ini $(testdir)/mltextst
-+	./ptex -mltex -ini $(testdir)/mltextst || true
- 	-./ptex </dev/null
- 	-PATH=$(kpathsea_dir):$$PATH ./ptex '\nonstopmode\font\foo=nonesuch\end'
- 
diff --git a/japanese/texfamily/patches/patch-af b/japanese/texfamily/patches/patch-af
index 97a628bdfa6..45b2489b0c7 100644
--- a/japanese/texfamily/patches/patch-af
+++ b/japanese/texfamily/patches/patch-af
@@ -1,126 +1,13 @@
-$NetBSD: patch-af,v 1.2 2001/09/02 21:26:01 hubertf Exp $
+$NetBSD: patch-af,v 1.3 2001/10/24 00:29:31 kei Exp $
 
---- texk/web2c/Makefile.in.orig	Tue Apr 18 09:28:32 2000
-+++ texk/web2c/Makefile.in
-@@ -5,7 +5,7 @@
- # install-fmts/install-bases/install-mems will install. plain.* is
- # created automatically (as a link).  See the Formats node in
- # doc/web2c.texi for details on the fmts.
--@TEX@fmts = latex.fmt latex209.fmt # amstex.fmt eplain.fmt texinfo.fmt
-+@TEX@fmts = latex.fmt # latex209.fmt amstex.fmt eplain.fmt texinfo.fmt
- @ETEX@efmts = #elatex.efmt
- @CTEX@cfmts = #latex.efmt
- @PTEX@pdffmts = #pdflatex.fmt
-@@ -439,75 +439,75 @@
- 
- tex.fmt: tex
- 	$(dumpenv) $(MAKE) $(makeargs) files="--progname=tex plain.tex cmr10.tfm" prereq-check
--	$(dumpenv) ./tex --fmt=tex --ini \\input plain \\dump </dev/null
-+	$(dumpenv) ./tex --fmt=tex --ini \\input plain \\dump </dev/null || true
+--- texk/web2c/Makefile.in.orig	Tue Sep 18 13:53:39 2001
++++ texk/web2c/Makefile.in	Tue Sep 18 13:54:03 2001
+@@ -443,7 +443,7 @@
  
  latex.fmt: tex
  	$(dumpenv) $(MAKE) $(makeargs) files="--progname=latex latex.ltx" prereq-check
 -	$(dumpenv) ./tex --progname=latex --ini \\input latex.ltx </dev/null
-+	$(dumpenv) ./tex --progname=latex --ini \\input latex.ltx </dev/null || true
++	$(dumpenv) ./tex --progname=latex --ini \\input latex.ltx </dev/null || ${TRUE}
  
  latex209.fmt: tex
  	$(dumpenv) $(MAKE) $(makeargs) files="--progname=latex209 lplain.tex" prereq-check
--	$(dumpenv) ./tex --fmt=latex209 --ini \\input lplain \\dump </dev/null
-+	$(dumpenv) ./tex --fmt=latex209 --ini \\input lplain \\dump </dev/null || true
- 
- etex.efmt: etex
- 	$(dumpenv) $(MAKE) files="--progname=etex etex.src plain.tex cmr10.tfm" prereq-check
--	$(dumpenv) ./etex --efmt=etex --ini \*\\input etex.src \\dump </dev/null
-+	$(dumpenv) ./etex --efmt=etex --ini \*\\input etex.src \\dump </dev/null || true
- 
- elatex.efmt: etex
- 	$(dumpenv) $(MAKE) files="--progname=elatex latex.ltx" prereq-check
--	$(dumpenv) ./etex --efmt=elatex --ini \*\\input latex.ltx </dev/null
-+	$(dumpenv) ./etex --efmt=elatex --ini \*\\input latex.ltx </dev/null || true
- 
- tex.efmt: etex
- 	$(dumpenv) $(MAKE) files="--progname=tex plain.tex cmr10.tfm" prereq-check
--	$(dumpenv) ./etex --efmt=tex --ini \\input plain \\dump </dev/null
-+	$(dumpenv) ./etex --efmt=tex --ini \\input plain \\dump </dev/null || true
- 
- latex.efmt: etex
- 	$(dumpenv) $(MAKE) files="--progname=latex latex.ltx" prereq-check
--	$(dumpenv) ./etex --progname=latex --ini \\input latex.ltx </dev/null
-+	$(dumpenv) ./etex --progname=latex --ini \\input latex.ltx </dev/null || true
- 
- omega.fmt: omega
- 	$(dumpenv) $(MAKE) files="--progname=omega omega.tex" prereq-check
--	$(dumpenv) ./omega --ini \\input omega.tex \\dump </dev/null
-+	$(dumpenv) ./omega --ini \\input omega.tex \\dump </dev/null || true
- 
- lambda.fmt: omega
- 	$(dumpenv) $(MAKE) files="--progname=lambda lambda.tex" prereq-check
--	$(dumpenv) ./omega --ini --progname=lambda \\input lambda.tex </dev/null
-+	$(dumpenv) ./omega --ini --progname=lambda \\input lambda.tex </dev/null || true
- 
- pdftex.fmt: pdftex
- 	$(dumpenv) $(MAKE) files="--progname=pdftex plain.tex cmr10.tfm" prereq-check
--	$(dumpenv) ./pdftex --fmt=pdftex --ini \\pdfoutput=1 \\input plain \\dump </dev/null
-+	$(dumpenv) ./pdftex --fmt=pdftex --ini \\pdfoutput=1 \\input plain \\dump </dev/null || true
- 
- pdflatex.fmt: pdftex
- 	$(dumpenv) $(MAKE) files="--progname=pdflatex latex.ltx" prereq-check
--	$(dumpenv) ./pdftex --fmt=pdflatex --ini \\pdfoutput=1 \\input latex.ltx </dev/null
-+	$(dumpenv) ./pdftex --fmt=pdflatex --ini \\pdfoutput=1 \\input latex.ltx </dev/null || true
- 
- pdftexinfo.fmt: pdftex
- 	$(dumpenv) $(MAKE) files="--progname=pdftexinfo pdftexinfo.ini" prereq-check
--	$(dumpenv) ./pdftex --progname=pdftexinfo --ini pdftexinfo.ini </dev/null
-+	$(dumpenv) ./pdftex --progname=pdftexinfo --ini pdftexinfo.ini </dev/null || true
- 
- pdfetex.efmt: pdfetex
- 	$(dumpenv) $(MAKE) files="--progname=pdfetex etex.src plain.tex cmr10.tfm" prereq-check
--	$(dumpenv) ./pdfetex --efmt=pdfetex --ini \*\\pdfoutput=1\\input etex.src \\dump </dev/null
-+	$(dumpenv) ./pdfetex --efmt=pdfetex --ini \*\\pdfoutput=1\\input etex.src \\dump </dev/null || true
- 
- pdfelatex.efmt: pdfetex
- 	$(dumpenv) $(MAKE) files="--progname=pdfelatex latex.ltx" prereq-check
--	$(dumpenv) ./pdfetex --efmt=pdfelatex --ini \*\\pdfoutput=1\\input latex.ltx </dev/null
-+	$(dumpenv) ./pdfetex --efmt=pdfelatex --ini \*\\pdfoutput=1\\input latex.ltx </dev/null || true
- 
- mltex.fmt: tex
- 	$(dumpenv) $(MAKE) files="--progname=mltex plain.tex cmr10.tfm" prereq-check
--	$(dumpenv) ./tex --mltex --fmt=mltex --ini \\input plain \\dump </dev/null
-+	$(dumpenv) ./tex --mltex --fmt=mltex --ini \\input plain \\dump </dev/null || true
- 
- mllatex.fmt: tex
- 	$(dumpenv) $(MAKE) files="--progname=mllatex latex.ltx" prereq-check
--	$(dumpenv) ./tex --mltex --fmt=mllatex --ini \\input latex.ltx </dev/null
-+	$(dumpenv) ./tex --mltex --fmt=mllatex --ini \\input latex.ltx </dev/null || true
- 
- mf.base: mf
- 	$(dumpenv) $(MAKE) $(makeargs) files="plain.mf cmr10.mf $(localmodes).mf" prereq-check
--	$(dumpenv) ./mf --base=mf --ini \\input plain input $(localmodes) dump </dev/null
-+	$(dumpenv) ./mf --base=mf --ini \\input plain input $(localmodes) dump </dev/null || true
- 
- mpost.mem: mpost
- 	$(dumpenv) $(MAKE) $(makeargs) files=plain.mp prereq-check
--	$(dumpenv) ./mpost --mem=mpost --ini \\input plain dump </dev/null
-+	$(dumpenv) ./mpost --mem=mpost --ini \\input plain dump </dev/null || true
- 
- # This is meant to be called recursively, with $(files) set.
- prereq-check: $(kpathsea_dir)/kpsewhich
-@@ -529,15 +529,15 @@
- $(kpathsea_dir)/kpsewhich: $(kpathsea)
- 
- amstex.fmt: tex
--	$(dumpenv) ./tex --progname=amstex --ini amstex.ini </dev/null
-+	$(dumpenv) ./tex --progname=amstex --ini amstex.ini </dev/null || true
- 
- # Texinfo changes the escape character from `\' to `@'.
- texinfo.fmt: tex.fmt
--	$(dumpenv) ./tex --progname=texinfo --ini texinfo @dump </dev/null
-+	$(dumpenv) ./tex --progname=texinfo --ini texinfo @dump </dev/null || true
- 
- eplain.fmt: tex.fmt
- 	touch eplain.aux # Makes cross-reference warnings work right.
--	$(dumpenv) ./tex --progname=eplain --ini \&./tex eplain \\dump </dev/null
-+	$(dumpenv) ./tex --progname=eplain --ini \&./tex eplain \\dump </dev/null || true
- 
- # 
- install: install-exec install-data
diff --git a/japanese/texfamily/patches/patch-ag b/japanese/texfamily/patches/patch-ag
index 27b5cfc3dd5..e8b41b9dba2 100644
--- a/japanese/texfamily/patches/patch-ag
+++ b/japanese/texfamily/patches/patch-ag
@@ -1,126 +1,13 @@
-$NetBSD: patch-ag,v 1.2 2001/09/02 21:26:01 hubertf Exp $
+$NetBSD: patch-ag,v 1.3 2001/10/24 00:29:31 kei Exp $
 
---- texk/web2c-j/Makefile.in.orig	Sat Mar  4 19:01:21 2000
-+++ texk/web2c-j/Makefile.in
-@@ -5,7 +5,7 @@
- # install-fmts/install-bases/install-mems will install. plain.* is
- # created automatically (as a link).  See the Formats node in
- # doc/web2c.texi for details on the fmts.
--@TEX@fmts = jlatex.fmt jlatex209.fmt # amsjtex.fmt jeplain.fmt texinfo.fmt
-+@TEX@fmts = jlatex.fmt # jlatex209.fmt amsjtex.fmt jeplain.fmt texinfo.fmt
- @ETEX@efmts = #elatex.efmt
- @CTEX@cfmts = #latex.efmt
- @PTEX@pdffmts = #pdflatex.fmt
-@@ -460,75 +460,75 @@
- 
- jtex.fmt: jtex
- 	$(dumpenv) $(MAKE) $(makeargs) files="--progname=jtex jplain.tex dmjhira10.tfm" prereq-check
--	$(dumpenv) ./jtex --fmt=jtex --ini \\input jplain \\dump </dev/null
-+	$(dumpenv) ./jtex --fmt=jtex --ini \\input jplain \\dump </dev/null || true
+--- texk/web2c-j/Makefile.in.orig	Mon Sep 17 18:08:21 2001
++++ texk/web2c-j/Makefile.in	Mon Sep 17 18:08:41 2001
+@@ -464,7 +464,7 @@
  
  jlatex.fmt: jtex
  	$(dumpenv) $(MAKE) $(makeargs) files="--progname=jlatex jlatex.ltx" prereq-check
 -	$(dumpenv) ./jtex --progname=jlatex --ini \\input jlatex.ltx </dev/null
-+	$(dumpenv) ./jtex --progname=jlatex --ini \\input jlatex.ltx </dev/null || true
++	$(dumpenv) ./jtex --progname=jlatex --ini \\input jlatex.ltx </dev/null || ${TRUE}
  
  jlatex209.fmt: jtex
  	$(dumpenv) $(MAKE) $(makeargs) files="--progname=jlatex209 jlplain.tex" prereq-check
--	$(dumpenv) ./jtex --fmt=jlatex209 --ini \\input jlplain \\dump </dev/null
-+	$(dumpenv) ./jtex --fmt=jlatex209 --ini \\input jlplain \\dump </dev/null || true
- 
- etex.efmt: etex
- 	$(dumpenv) $(MAKE) files="--progname=etex etex.src plain.tex cmr10.tfm" prereq-check
--	$(dumpenv) ./etex --efmt=etex --ini \*\\input etex.src \\dump </dev/null
-+	$(dumpenv) ./etex --efmt=etex --ini \*\\input etex.src \\dump </dev/null || true
- 
- elatex.efmt: etex
- 	$(dumpenv) $(MAKE) files="--progname=elatex latex.ltx" prereq-check
--	$(dumpenv) ./etex --efmt=elatex --ini \*\\input latex.ltx </dev/null
-+	$(dumpenv) ./etex --efmt=elatex --ini \*\\input latex.ltx </dev/null || true
- 
- tex.efmt: etex
- 	$(dumpenv) $(MAKE) files="--progname=tex plain.tex cmr10.tfm" prereq-check
--	$(dumpenv) ./etex --efmt=tex --ini \\input plain \\dump </dev/null
-+	$(dumpenv) ./etex --efmt=tex --ini \\input plain \\dump </dev/null || true
- 
- latex.efmt: etex
- 	$(dumpenv) $(MAKE) files="--progname=latex latex.ltx" prereq-check
--	$(dumpenv) ./etex --progname=latex --ini \\input latex.ltx </dev/null
-+	$(dumpenv) ./etex --progname=latex --ini \\input latex.ltx </dev/null || true
- 
- omega.fmt: omega
- 	$(dumpenv) $(MAKE) files="--progname=omega omega.tex" prereq-check
--	$(dumpenv) ./omega --ini \\input omega.tex \\dump </dev/null
-+	$(dumpenv) ./omega --ini \\input omega.tex \\dump </dev/null || true
- 
- lambda.fmt: omega
- 	$(dumpenv) $(MAKE) files="--progname=lambda lambda.tex" prereq-check
--	$(dumpenv) ./omega --ini --progname=lambda \\input lambda.tex </dev/null
-+	$(dumpenv) ./omega --ini --progname=lambda \\input lambda.tex </dev/null || true
- 
- pdftex.fmt: pdftex
- 	$(dumpenv) $(MAKE) files="--progname=pdftex plain.tex cmr10.tfm" prereq-check
--	$(dumpenv) ./pdftex --fmt=pdftex --ini \\pdfoutput=1 \\input plain \\dump </dev/null
-+	$(dumpenv) ./pdftex --fmt=pdftex --ini \\pdfoutput=1 \\input plain \\dump </dev/null || true
- 
- pdflatex.fmt: pdftex
- 	$(dumpenv) $(MAKE) files="--progname=pdflatex latex.ltx" prereq-check
--	$(dumpenv) ./pdftex --fmt=pdflatex --ini \\pdfoutput=1 \\input latex.ltx </dev/null
-+	$(dumpenv) ./pdftex --fmt=pdflatex --ini \\pdfoutput=1 \\input latex.ltx </dev/null || true
- 
- pdftexinfo.fmt: pdftex
- 	$(dumpenv) $(MAKE) files="--progname=pdftexinfo pdftexinfo.ini" prereq-check
--	$(dumpenv) ./pdftex --progname=pdftexinfo --ini pdftexinfo.ini </dev/null
-+	$(dumpenv) ./pdftex --progname=pdftexinfo --ini pdftexinfo.ini </dev/null || true
- 
- pdfetex.efmt: pdfetex
- 	$(dumpenv) $(MAKE) files="--progname=pdfetex etex.src plain.tex cmr10.tfm" prereq-check
--	$(dumpenv) ./pdfetex --efmt=pdfetex --ini \*\\pdfoutput=1\\input etex.src \\dump </dev/null
-+	$(dumpenv) ./pdfetex --efmt=pdfetex --ini \*\\pdfoutput=1\\input etex.src \\dump </dev/null || true
- 
- pdfelatex.efmt: pdfetex
- 	$(dumpenv) $(MAKE) files="--progname=pdfelatex latex.ltx" prereq-check
--	$(dumpenv) ./pdfetex --efmt=pdfelatex --ini \*\\pdfoutput=1\\input latex.ltx </dev/null
-+	$(dumpenv) ./pdfetex --efmt=pdfelatex --ini \*\\pdfoutput=1\\input latex.ltx </dev/null || true
- 
- mltex.fmt: tex
- 	$(dumpenv) $(MAKE) files="--progname=mltex plain.tex cmr10.tfm" prereq-check
--	$(dumpenv) ./tex --mltex --fmt=mltex --ini \\input plain \\dump </dev/null
-+	$(dumpenv) ./tex --mltex --fmt=mltex --ini \\input plain \\dump </dev/null || true
- 
- mllatex.fmt: tex
- 	$(dumpenv) $(MAKE) files="--progname=mllatex latex.ltx" prereq-check
--	$(dumpenv) ./tex --mltex --fmt=mllatex --ini \\input latex.ltx </dev/null
-+	$(dumpenv) ./tex --mltex --fmt=mllatex --ini \\input latex.ltx </dev/null || true
- 
- mf.base: mf
- 	$(dumpenv) $(MAKE) $(makeargs) files="plain.mf cmr10.mf $(localmodes).mf" prereq-check
--	$(dumpenv) ./mf --base=mf --ini \\input plain input $(localmodes) dump </dev/null
-+	$(dumpenv) ./mf --base=mf --ini \\input plain input $(localmodes) dump </dev/null || true
- 
- mpost.mem: mpost
- 	$(dumpenv) $(MAKE) $(makeargs) files=plain.mp prereq-check
--	$(dumpenv) ./mpost --mem=mpost --ini \\input plain dump </dev/null
-+	$(dumpenv) ./mpost --mem=mpost --ini \\input plain dump </dev/null || true
- 
- # This is meant to be called recursively, with $(files) set.
- prereq-check: $(kpathsea_dir)/kpsewhich
-@@ -550,15 +550,15 @@
- $(kpathsea_dir)/kpsewhich: $(kpathsea)
- 
- amsjtex.fmt: jtex
--	$(dumpenv) ./jtex --progname=amsjtex --ini amsjtex.ini </dev/null
-+	$(dumpenv) ./jtex --progname=amsjtex --ini amsjtex.ini </dev/null || true
- 
- # Texinfo changes the escape character from `\' to `@'.
- texinfo.fmt: tex.fmt
--	$(dumpenv) ./tex --progname=texinfo --ini texinfo @dump </dev/null
-+	$(dumpenv) ./tex --progname=texinfo --ini texinfo @dump </dev/null || true
- 
- jeplain.fmt: jtex.fmt
- 	touch jeplain.aux # Makes cross-reference warnings work right.
--	$(dumpenv) ./jtex --fmt=jeplain --ini \&./jtex eplain \\dump </dev/null
-+	$(dumpenv) ./jtex --fmt=jeplain --ini \&./jtex eplain \\dump </dev/null || true
- 
- # 
- install: install-exec install-data
diff --git a/japanese/texfamily/patches/patch-aj b/japanese/texfamily/patches/patch-aj
index 837f5b3aebd..bea85dd4c48 100644
--- a/japanese/texfamily/patches/patch-aj
+++ b/japanese/texfamily/patches/patch-aj
@@ -1,117 +1,13 @@
-$NetBSD: patch-aj,v 1.1 2001/09/02 21:26:01 hubertf Exp $
+$NetBSD: patch-aj,v 1.2 2001/10/24 00:29:31 kei Exp $
 
---- texk/web2c-m/Makefile.in.orig	Sat Mar  4 18:25:00 2000
-+++ texk/web2c-m/Makefile.in
-@@ -456,75 +456,75 @@
- 
- multex.fmt: multex
- 	$(dumpenv) $(MAKE) $(makeargs) files="--progname=multex mulplain.tex dm10.tfm" prereq-check
--	$(dumpenv) ./multex --fmt=multex --ini \\input mulplain \\dump </dev/null
-+	$(dumpenv) ./multex --fmt=multex --ini \\input mulplain \\dump </dev/null || true
+--- texk/web2c-m/Makefile.in.orig	Tue Sep 18 15:37:37 2001
++++ texk/web2c-m/Makefile.in	Tue Sep 18 15:38:07 2001
+@@ -460,7 +460,7 @@
  
  mullatex.fmt: multex
  	$(dumpenv) $(MAKE) $(makeargs) files="--progname=mullatex mullatex.ltx" prereq-check
 -	$(dumpenv) ./multex --progname=mullatex --ini \\input mullatex.ltx </dev/null
-+	$(dumpenv) ./multex --progname=mullatex --ini \\input mullatex.ltx </dev/null || true
++	$(dumpenv) ./multex --progname=mullatex --ini \\input mullatex.ltx </dev/null || ${TRUE}
  
  mullatex209.fmt: multex
  	$(dumpenv) $(MAKE) $(makeargs) files="--progname=mullatex209 mullplain.tex" prereq-check
--	$(dumpenv) ./multex --fmt=mullatex209 --ini \\input mullplain \\dump </dev/null
-+	$(dumpenv) ./multex --fmt=mullatex209 --ini \\input mullplain \\dump </dev/null || true
- 
- etex.efmt: etex
- 	$(dumpenv) $(MAKE) files="--progname=etex etex.src plain.tex cmr10.tfm" prereq-check
--	$(dumpenv) ./etex --efmt=etex --ini \*\\input etex.src \\dump </dev/null
-+	$(dumpenv) ./etex --efmt=etex --ini \*\\input etex.src \\dump </dev/null || true
- 
- elatex.efmt: etex
- 	$(dumpenv) $(MAKE) files="--progname=elatex latex.ltx" prereq-check
--	$(dumpenv) ./etex --efmt=elatex --ini \*\\input latex.ltx </dev/null
-+	$(dumpenv) ./etex --efmt=elatex --ini \*\\input latex.ltx </dev/null || true
- 
- tex.efmt: etex
- 	$(dumpenv) $(MAKE) files="--progname=tex plain.tex cmr10.tfm" prereq-check
--	$(dumpenv) ./etex --efmt=tex --ini \\input plain \\dump </dev/null
-+	$(dumpenv) ./etex --efmt=tex --ini \\input plain \\dump </dev/null || true
- 
- latex.efmt: etex
- 	$(dumpenv) $(MAKE) files="--progname=latex latex.ltx" prereq-check
--	$(dumpenv) ./etex --progname=latex --ini \\input latex.ltx </dev/null
-+	$(dumpenv) ./etex --progname=latex --ini \\input latex.ltx </dev/null || true
- 
- omega.fmt: omega
- 	$(dumpenv) $(MAKE) files="--progname=omega omega.tex" prereq-check
--	$(dumpenv) ./omega --ini \\input omega.tex \\dump </dev/null
-+	$(dumpenv) ./omega --ini \\input omega.tex \\dump </dev/null || true
- 
- lambda.fmt: omega
- 	$(dumpenv) $(MAKE) files="--progname=lambda lambda.tex" prereq-check
--	$(dumpenv) ./omega --ini --progname=lambda \\input lambda.tex </dev/null
-+	$(dumpenv) ./omega --ini --progname=lambda \\input lambda.tex </dev/null || true
- 
- pdftex.fmt: pdftex
- 	$(dumpenv) $(MAKE) files="--progname=pdftex plain.tex cmr10.tfm" prereq-check
--	$(dumpenv) ./pdftex --fmt=pdftex --ini \\pdfoutput=1 \\input plain \\dump </dev/null
-+	$(dumpenv) ./pdftex --fmt=pdftex --ini \\pdfoutput=1 \\input plain \\dump </dev/null || true
- 
- pdflatex.fmt: pdftex
- 	$(dumpenv) $(MAKE) files="--progname=pdflatex latex.ltx" prereq-check
--	$(dumpenv) ./pdftex --fmt=pdflatex --ini \\pdfoutput=1 \\input latex.ltx </dev/null
-+	$(dumpenv) ./pdftex --fmt=pdflatex --ini \\pdfoutput=1 \\input latex.ltx </dev/null || true
- 
- pdftexinfo.fmt: pdftex
- 	$(dumpenv) $(MAKE) files="--progname=pdftexinfo pdftexinfo.ini" prereq-check
--	$(dumpenv) ./pdftex --progname=pdftexinfo --ini pdftexinfo.ini </dev/null
-+	$(dumpenv) ./pdftex --progname=pdftexinfo --ini pdftexinfo.ini </dev/null || true
- 
- pdfetex.efmt: pdfetex
- 	$(dumpenv) $(MAKE) files="--progname=pdfetex etex.src plain.tex cmr10.tfm" prereq-check
--	$(dumpenv) ./pdfetex --efmt=pdfetex --ini \*\\pdfoutput=1\\input etex.src \\dump </dev/null
-+	$(dumpenv) ./pdfetex --efmt=pdfetex --ini \*\\pdfoutput=1\\input etex.src \\dump </dev/null || true
- 
- pdfelatex.efmt: pdfetex
- 	$(dumpenv) $(MAKE) files="--progname=pdfelatex latex.ltx" prereq-check
--	$(dumpenv) ./pdfetex --efmt=pdfelatex --ini \*\\pdfoutput=1\\input latex.ltx </dev/null
-+	$(dumpenv) ./pdfetex --efmt=pdfelatex --ini \*\\pdfoutput=1\\input latex.ltx </dev/null || true
- 
- mltex.fmt: tex
- 	$(dumpenv) $(MAKE) files="--progname=mltex plain.tex cmr10.tfm" prereq-check
--	$(dumpenv) ./tex --mltex --fmt=mltex --ini \\input plain \\dump </dev/null
-+	$(dumpenv) ./tex --mltex --fmt=mltex --ini \\input plain \\dump </dev/null || true
- 
- mllatex.fmt: tex
- 	$(dumpenv) $(MAKE) files="--progname=mllatex latex.ltx" prereq-check
--	$(dumpenv) ./tex --mltex --fmt=mllatex --ini \\input latex.ltx </dev/null
-+	$(dumpenv) ./tex --mltex --fmt=mllatex --ini \\input latex.ltx </dev/null || true
- 
- mf.base: mf
- 	$(dumpenv) $(MAKE) $(makeargs) files="plain.mf cmr10.mf $(localmodes).mf" prereq-check
--	$(dumpenv) ./mf --base=mf --ini \\input plain input $(localmodes) dump </dev/null
-+	$(dumpenv) ./mf --base=mf --ini \\input plain input $(localmodes) dump </dev/null || true
- 
- mpost.mem: mpost
- 	$(dumpenv) $(MAKE) $(makeargs) files=plain.mp prereq-check
--	$(dumpenv) ./mpost --mem=mpost --ini \\input plain dump </dev/null
-+	$(dumpenv) ./mpost --mem=mpost --ini \\input plain dump </dev/null || true
- 
- # This is meant to be called recursively, with $(files) set.
- prereq-check: $(kpathsea_dir)/kpsewhich
-@@ -546,15 +546,15 @@
- $(kpathsea_dir)/kpsewhich: $(kpathsea)
- 
- amsmultex.fmt: multex
--	$(dumpenv) ./multex --progname=amsmultex --ini amsmultex.ini </dev/null
-+	$(dumpenv) ./multex --progname=amsmultex --ini amsmultex.ini </dev/null || true
- 
- # Texinfo changes the escape character from `\' to `@'.
- texinfo.fmt: tex.fmt
--	$(dumpenv) ./tex --progname=texinfo --ini texinfo @dump </dev/null
-+	$(dumpenv) ./tex --progname=texinfo --ini texinfo @dump </dev/null || true
- 
- muleplain.fmt: multex.fmt
- 	touch muleplain.aux # Makes cross-reference warnings work right.
--	$(dumpenv) ./multex --fmt=muleplain --ini \&./multex eplain \\dump </dev/null
-+	$(dumpenv) ./multex --fmt=muleplain --ini \&./multex eplain \\dump </dev/null || true
- 
- # 
- install: install-exec install-data
diff --git a/japanese/texfamily/pkg/DESCR b/japanese/texfamily/pkg/DESCR
index 008ace8fa48..90b27c20629 100644
--- a/japanese/texfamily/pkg/DESCR
+++ b/japanese/texfamily/pkg/DESCR
@@ -13,7 +13,7 @@ NetBSD version of this package contains several programs:
 
 3. ASCII pTeX and tools for it
   - ASCII Publishing TeX (ptex) 2.1.10
-  - dvipsk-p1.5d (dvips with Japanese support)
+  - dvipsk-p1.5e (dvips with Japanese support)
   - mendexk2.4f (indexing tool with Japanese support)
 
 This package contains executables.
diff --git a/japanese/texfamily/pkg/PLIST b/japanese/texfamily/pkg/PLIST
index 44a3eff3726..aeb10d94e18 100644
--- a/japanese/texfamily/pkg/PLIST
+++ b/japanese/texfamily/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/04/14 12:58:55 kei Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/10/24 00:29:32 kei Exp $
 bin/MakePK
 bin/dvi2ps
 bin/inijtex
@@ -161,6 +161,7 @@ share/texmf.local/dvips/base/texc.pro
 share/texmf.local/dvips/base/texps.pro
 share/texmf.local/ls-R
 share/texmf.local/web2c/jlatex.fmt
+share/texmf.local/web2c/jlatex209.fmt
 share/texmf.local/web2c/jtex.fmt
 share/texmf.local/web2c/jtex.pool
 share/texmf.local/web2c/mullatex.fmt