'tex -ini' complains that LaTeX sOuRcEs Are older than one year, and should

be updated. We'll not go and touch the guts of teTeX here, and instead just
ignore the warnings (``... || true'').

Fixes PR 13446 by Naoto Shimazaki <igy@arhc.org>

5 files changed, 404 insertions, 20 deletions

diff --git a/japanese/texfamily/distinfo b/japanese/texfamily/distinfo
index 2115b70df9c..f98c6345cb1 100644
--- a/japanese/texfamily/distinfo
+++ b/japanese/texfamily/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/04/21 10:13:37 wiz Exp $
+$NetBSD: distinfo,v 1.4 2001/09/02 21:26:01 hubertf Exp $
 
 SHA1 (TeXfamily/texfam-1.2.tar.gz) = 510ef7048c1353a75d84d548738e8e2a94d83be9
 Size (TeXfamily/texfam-1.2.tar.gz) = 154286 bytes
@@ -20,12 +20,13 @@ SHA1 (TeXfamily/dvipsk-jpatch-p1.5d.tar.gz) = 3e19438d7519fedc81229a7fc248484c89
 Size (TeXfamily/dvipsk-jpatch-p1.5d.tar.gz) = 22818 bytes
 SHA1 (TeXfamily/mendexk2.4f.tar.gz) = aa65a16a2bc965877fb19e8798ee80790917c588
 Size (TeXfamily/mendexk2.4f.tar.gz) = 22371 bytes
-SHA1 (patch-aa) = e018a38610782ee0be7d87fd9b5535b52f178c97
+SHA1 (patch-aa) = 420ce2595e42d35818244b67ee41f8358df2b1d7
 SHA1 (patch-ab) = 6dc92be09afbce61d62468873c21add1564ac02c
 SHA1 (patch-ac) = eeb266e3fc5a6b646ffc498c08107a9dd76c6660
 SHA1 (patch-ad) = 3292baba0f31f191c13a12dd3cd39e8bd2e091f7
 SHA1 (patch-ae) = 2f21e4c6fbe327159d3abd65e501ee440f0c3657
-SHA1 (patch-af) = 75866c0f57eec6f7ba8f690dd8afb47ed32dede4
-SHA1 (patch-ag) = 7187fcde6937bbb35af90f77f88c98817f427122
+SHA1 (patch-af) = 8a2fdc955bfca8773147d6bb7752ed3532261540
+SHA1 (patch-ag) = d24593acc4768e421836f4f3a70c8d961d74e1f8
 SHA1 (patch-ah) = 08b0d94c7347693da7fe024eb0ab81916a598529
 SHA1 (patch-ai) = 9f62fe1d16f4004997718fbc7b6f9ad3bef607c6
+SHA1 (patch-aj) = e2dcd12c337757e45b34b99a1252d411dbc0252c
diff --git a/japanese/texfamily/patches/patch-aa b/japanese/texfamily/patches/patch-aa
index 60c0040c963..f6a710fe577 100644
--- a/japanese/texfamily/patches/patch-aa
+++ b/japanese/texfamily/patches/patch-aa
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/14 12:58:56 kei Exp $
+$NetBSD: patch-aa,v 1.2 2001/09/02 21:26:01 hubertf Exp $
 
---- texk/web2c/ptex-src-2.1.10/Makefile.in.orig	Tue Feb 29 18:09:41 2000
-+++ texk/web2c/ptex-src-2.1.10/Makefile.in	Tue May  2 05:04:25 2000
-@@ -5,8 +5,13 @@
+--- 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
+@@ -4,10 +4,15 @@
+ 
  default: programs formats
  
 -programs=ptex tftopl pltotf pdvitype jbibtex
@@ -17,7 +18,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/14 12:58:56 kei Exp $
 +texpool_lcl_dir = $(web2c_lcl_dir)
  
  # Used for triptrap.
-@@ -106,4 +111,7 @@
+ DIFF = diff
+@@ -105,6 +110,9 @@
+ 	fi
  
  ### TFtoPL
 +ptftopl: tftopl
@@ -25,7 +28,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/14 12:58:56 kei Exp $
 +	$(LN) tftopl ptftopl
  tftopl: tftopl.o $(plib_o) $(kpathsea) $(proglib)
  	$(kpathsea_link) tftopl.o $(plib_o) $(LOADLIBES)
-@@ -116,4 +124,7 @@
+ tftopl.o: tftopl.c kanji.h maintain.h ptexhelp.h
+@@ -115,6 +123,9 @@
+ 	$(srcdir)/tie -m tftopl.web $(srcdir)/tftopl.web $(srcdir)/tftopl.ch
  
  ### PLtoTF
 +ppltotf: pltotf
@@ -33,7 +38,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/14 12:58:56 kei Exp $
 +	$(LN) pltotf ppltotf
  pltotf: pltotf.o $(plib_o) $(kpathsea) $(proglib)
  	$(kpathsea_link) pltotf.o $(plib_o) $(LOADLIBES)
-@@ -136,4 +147,7 @@
+ pltotf.o: pltotf.c kanji.h maintain.h ptexhelp.h
+@@ -135,6 +146,9 @@
+ 	$(LN) $(srcdir)/dvitype.web pdvitype.web
  
  ### jBibTeX
 +pjbibtex: jbibtex
@@ -41,7 +48,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/14 12:58:56 kei Exp $
 +	$(LN) jbibtex pjbibtex
  jbibtex: jbibtex.o jbibextra.o $(plib_o) $(kpathsea) $(proglib)
  	$(kpathsea_link) jbibtex.o jbibextra.o $(plib_o) $(LOADLIBES)
-@@ -176,5 +190,10 @@
+ jbibtex.o: jbibtex.c jbibextra.h kanji.h maintain.h ptexhelp.h
+@@ -175,15 +189,20 @@
+ texmf.cnf: $(kpathsea_dir)/texmf.cnf
  	$(SHELL) $(thisdir)/mkconf $< > texmf.cnf
  
 -dumpenv = TEXMFCNF=$(thisdir) TEXMF=$(texmf)
@@ -53,14 +62,26 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/14 12:58:56 kei Exp $
 +dumpenv = TEXMFCNF=../../kpathsea TEXINPUTS=.:$(texin): TEXFONTS=$(texfonts):
  
  ptex.fmt: ptex texmf.cnf
-@@ -213,5 +232,5 @@
+ 	$(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
+ 
+ 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
+ 
+ # This is meant to be called recursively, with $(files) set.
+ prereq-check: $(kpathsea_dir)/kpsewhich
+@@ -212,31 +231,31 @@
+ 
  # The actual binary executables and pool files.
  install-programs: $(programs)
 -	$(SHELL) $(top_srcdir)/mkinstalldirs $(bindir) $(texpooldir)
 +	$(SHELL) $(top_srcdir)/mkinstalldirs $(bindir) $(texpool_lcl_dir)
  	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
  
-@@ -219,23 +238,23 @@
+ # The links to ptex for each format and for {ini,vir}ptex.
  install-links: install-programs
  	cd $(bindir) && \
 -	(rm -f iniptex virptex; $(LN) ptex iniptex; $(LN) ptex virptex)
@@ -93,3 +114,22 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/14 12:58:56 kei Exp $
 +#	for f in *.tcx; do $(INSTALL_DATA) $$f $(web2c_lcl_dir)/$$f; done
  # 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 13092e274a9..97a628bdfa6 100644
--- a/japanese/texfamily/patches/patch-af
+++ b/japanese/texfamily/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/04/14 12:58:56 kei Exp $
+$NetBSD: patch-af,v 1.2 2001/09/02 21:26:01 hubertf Exp $
 
---- texk/web2c/Makefile.in.orig	Wed Mar 28 08:05:10 2001
-+++ texk/web2c/Makefile.in	Wed Mar 28 08:05:17 2001
+--- 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
@@ -11,3 +11,116 @@ $NetBSD: patch-af,v 1.1.1.1 2001/04/14 12:58:56 kei Exp $
  @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
+ 
+ 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
+ 
+ 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 429a8f6c47a..27b5cfc3dd5 100644
--- a/japanese/texfamily/patches/patch-ag
+++ b/japanese/texfamily/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/04/14 12:58:56 kei Exp $
+$NetBSD: patch-ag,v 1.2 2001/09/02 21:26:01 hubertf Exp $
 
---- texk/web2c-j/Makefile.in.orig	Wed Mar 28 08:09:10 2001
-+++ texk/web2c-j/Makefile.in	Wed Mar 28 08:09:55 2001
+--- 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
@@ -11,3 +11,116 @@ $NetBSD: patch-ag,v 1.1.1.1 2001/04/14 12:58:56 kei Exp $
  @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
+ 
+ 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
+ 
+ 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
new file mode 100644
index 00000000000..837f5b3aebd
--- /dev/null
+++ b/japanese/texfamily/patches/patch-aj
@@ -0,0 +1,117 @@
+$NetBSD: patch-aj,v 1.1 2001/09/02 21:26:01 hubertf 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
+ 
+ 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
+ 
+ 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