Subject: teTeX and TeXfamily (pkg/13446)
To: Hubert Feyrer <hubert@feyrer.de>
From: SUNAGAWA Keiki <Keiki_SUNAGAWA@yokogawa.co.jp>
List: tech-pkg
Date: 09/14/2001 11:20:30
Hi,

(Hubert, in first I thank you for taking a look at the PR
"pkg/13446: cannot compile texfamily".)

I tried building teTeX/TeXfamily after the fix and found a
problem that some executables are not built due to "LaTeX
source files more than 1 year old!." error which is ignored
when building TeXfamily by the package patches.

I believe that there needs to change the 17 months limit of
\ifnum\counter to say, 35 in the teTeX-share{,src} packages
to build TeXfamily package.  I've made the following diffs
to local pkgsrc tree and everything is fine with me.

If there's no strong objection, I'll commit the diffs in
this weekend.  It does two things:

- update to teTeX-share-1.0.2nb1 and teTeX-sharesrc1.0.1nb1
  which include \ifnum\count limit from 17 to 35.  We need
  this because original teTeX package is not released in
  frequently enough.  Other part are unchanged.

- update to TeXfamily{,share}-1.2.1nb1.  No changes in
  TeXfamily itself, but included ptex part.  ptex to 2.1.11,
  ptex-texmf to 1.10, dvipsk to 1.5e

Comments/thoughts?

--
SUNAGAWA Keiki <Keiki_SUNAGAWA@yokogawa.co.jp>


diff --exclude=CVS -urN /a/work/tmp/pkgsrc/print/teTeX/Makefile print/teTeX/Makefile
--- /a/work/tmp/pkgsrc/print/teTeX/Makefile	Fri Sep 14 10:12:00 2001
+++ print/teTeX/Makefile	Tue Sep 11 11:14:53 2001
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.22 2001/02/17 17:51:55 wiz Exp $
 #
 
-DISTNAME=	teTeX-1.0.7
+DISTNAME=	teTeX-1.0.7nb1
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -11,7 +11,7 @@
 COMMENT=	Thomas Esser's TeX distribution for UNIX compatible systems
 
 DEPENDS+=	teTeX-bin>=1.0.7:../teTeX-bin
-DEPENDS+=	teTeX-sharesrc>=1.0.1:../teTeX-sharesrc
+DEPENDS+=	teTeX-sharesrc>=1.0.1nb1:../teTeX-sharesrc
 
 USE_X11=        yes
 EXTRACT_ONLY=   # empty
diff --exclude=CVS -urN /a/work/tmp/pkgsrc/print/teTeX-bin/Makefile print/teTeX-bin/Makefile
--- /a/work/tmp/pkgsrc/print/teTeX-bin/Makefile	Fri Sep 14 10:12:02 2001
+++ print/teTeX-bin/Makefile	Tue Sep 11 11:09:59 2001
@@ -13,7 +13,7 @@
 COMMENT=	TeX distribution for UNIX compatible systems - executables
 
 BUILD_DEPENDS+=	bison-*:../../devel/bison
-DEPENDS+=	teTeX-share-1.0.*:../teTeX-share
+DEPENDS+=	teTeX-share>=1.0.2nb1:../teTeX-share
 DEPENDS+=	dialog-0.6z:../../misc/dialog
 DEPENDS+=	libwww>=5.2.8:../../www/libwww
 DEPENDS+=	png>=1.0.11:../../graphics/png
diff --exclude=CVS -urN /a/work/tmp/pkgsrc/print/teTeX-share/Makefile print/teTeX-share/Makefile
--- /a/work/tmp/pkgsrc/print/teTeX-share/Makefile	Fri Sep 14 10:12:04 2001
+++ print/teTeX-share/Makefile	Tue Sep 11 12:36:40 2001
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	teTeX-texmf-1.0.2
-PKGNAME=	teTeX-share-1.0.2
+PKGNAME=	teTeX-share-1.0.2nb1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/1.0/distrib/sources/}
 
@@ -30,5 +30,13 @@
 		-C ${PREFIX}/share/texmf \
 		-X ${FILESDIR}/exclude \
 		-f ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
+# original LaTeX format limitation is 17 months
+.for file in latex.ltx latexbug.tex
+	@${SED} 's#\\ifnum\\count@>17#\\ifnum\\count@>35#g' \
+	    < ${PREFIX}/share/texmf/tex/latex/base/${file} \
+	    > ${PREFIX}/share/texmf/tex/latex/base/${file}.new
+	@${MV} ${PREFIX}/share/texmf/tex/latex/base/${file}.new \
+	    ${PREFIX}/share/texmf/tex/latex/base/${file}
+.endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --exclude=CVS -urN /a/work/tmp/pkgsrc/print/teTeX-sharesrc/Makefile print/teTeX-sharesrc/Makefile
--- /a/work/tmp/pkgsrc/print/teTeX-sharesrc/Makefile	Fri Sep 14 10:12:05 2001
+++ print/teTeX-sharesrc/Makefile	Tue Sep 11 12:38:33 2001
@@ -3,7 +3,7 @@
 #
 
 DISTNAME=	teTeX-texmfsrc-1.0.1
-PKGNAME=	teTeX-sharesrc-1.0.1
+PKGNAME=	teTeX-sharesrc-1.0.1nb1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/1.0/distrib/sources/}
 
@@ -11,7 +11,7 @@
 HOMEPAGE=	http://www.tug.org/tetex/
 COMMENT=	Sources for machine-independent part of teTeX
 
-DEPENDS+=	teTeX-share-1.0.*:../teTeX-share
+DEPENDS+=	teTeX-share>=1.0.2nb1:../teTeX-share
 
 DIST_SUBDIR=	teTeX
 WRKSRC=		${WRKDIR}
@@ -27,6 +27,16 @@
 	@${ECHO} "  Get yourself a shower and a mug of coffee, this will take long!"
 	@${ECHO} ""
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf
-	${GTAR} plzxCf ${PREFIX}/share/texmf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
+	${GTAR} -plzx \
+		-C ${PREFIX}/share/texmf \
+		-f ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
+# original LaTeX format limitation is 17 months
+.for file in latex.ltx latexbug.tex ltvers.dtx
+	${SED} 's#\\ifnum\\count@>17#\\ifnum\\count@>35#g' \
+	    < ${PREFIX}/share/texmf/source/latex/base/${file} \
+	    > ${PREFIX}/share/texmf/source/latex/base/${file}.new
+	${MV} ${PREFIX}/share/texmf/source/latex/base/${file}.new \
+	    ${PREFIX}/share/texmf/source/latex/base/${file}
+.endfor
 
 .include "../../mk/bsd.pkg.mk"


diff --exclude=CVS -urN /a/work/tmp/pkgsrc/japanese/texfamily/Makefile japanese/texfamily/Makefile
--- /a/work/tmp/pkgsrc/japanese/texfamily/Makefile	Fri Sep 14 10:12:06 2001
+++ japanese/texfamily/Makefile	Tue Sep 11 08:58:29 2001
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.2 2001/04/18 00:33:10 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 @@
 		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-*:../../japanese/vflib-lib
 
 DIST_SUBDIR=	TeXfamily
@@ -90,7 +94,7 @@
 	${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,16 +111,16 @@
 	${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
 	${SED} -e 's,@TEXMFSITE@,${TEXMFSITE},' \
 		${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})
diff --exclude=CVS -urN /a/work/tmp/pkgsrc/japanese/texfamily/distinfo japanese/texfamily/distinfo
--- /a/work/tmp/pkgsrc/japanese/texfamily/distinfo	Fri Sep 14 10:12:06 2001
+++ japanese/texfamily/distinfo	Fri Sep 14 10:28:14 2001
@@ -16,17 +16,16 @@
 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) = e018a38610782ee0be7d87fd9b5535b52f178c97
 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-ah) = 08b0d94c7347693da7fe024eb0ab81916a598529
 SHA1 (patch-ai) = 9f62fe1d16f4004997718fbc7b6f9ad3bef607c6
-SHA1 (patch-aj) = e2dcd12c337757e45b34b99a1252d411dbc0252c
diff --exclude=CVS -urN /a/work/tmp/pkgsrc/japanese/texfamily/patches/patch-aa japanese/texfamily/patches/patch-aa
--- /a/work/tmp/pkgsrc/japanese/texfamily/patches/patch-aa	Fri Sep 14 10:10:26 2001
+++ japanese/texfamily/patches/patch-aa	Fri Sep 14 09:15:19 2001
@@ -1,9 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/09/02 21:26:01 hubertf Exp $
+$NetBSD: patch-aa,v 1.1 2001/04/14 12:58:56 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
-@@ -4,10 +4,15 @@
- 
+--- 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 @@
  default: programs formats
  
 -programs=ptex tftopl pltotf pdvitype jbibtex
@@ -18,9 +17,7 @@
 +texpool_lcl_dir = $(web2c_lcl_dir)
  
  # Used for triptrap.
- DIFF = diff
-@@ -105,6 +110,9 @@
- 	fi
+@@ -106,4 +111,7 @@
  
  ### TFtoPL
 +ptftopl: tftopl
@@ -28,9 +25,7 @@
 +	$(LN) tftopl ptftopl
  tftopl: tftopl.o $(plib_o) $(kpathsea) $(proglib)
  	$(kpathsea_link) tftopl.o $(plib_o) $(LOADLIBES)
- 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
+@@ -116,4 +124,7 @@
  
  ### PLtoTF
 +ppltotf: pltotf
@@ -38,9 +33,7 @@
 +	$(LN) pltotf ppltotf
  pltotf: pltotf.o $(plib_o) $(kpathsea) $(proglib)
  	$(kpathsea_link) pltotf.o $(plib_o) $(LOADLIBES)
- pltotf.o: pltotf.c kanji.h maintain.h ptexhelp.h
-@@ -135,6 +146,9 @@
- 	$(LN) $(srcdir)/dvitype.web pdvitype.web
+@@ -136,4 +147,7 @@
  
  ### jBibTeX
 +pjbibtex: jbibtex
@@ -48,9 +41,7 @@
 +	$(LN) jbibtex pjbibtex
  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 @@
- texmf.cnf: $(kpathsea_dir)/texmf.cnf
+@@ -176,5 +190,10 @@
  	$(SHELL) $(thisdir)/mkconf $< > texmf.cnf
  
 -dumpenv = TEXMFCNF=$(thisdir) TEXMF=$(texmf)
@@ -62,26 +53,14 @@
 +dumpenv = TEXMFCNF=../../kpathsea TEXINPUTS=.:$(texin): TEXFONTS=$(texfonts):
  
  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
- 
- 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 @@
- 
+@@ -213,5 +232,5 @@
  # 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
  
- # The links to ptex for each format and for {ini,vir}ptex.
+@@ -219,23 +238,23 @@
  install-links: install-programs
  	cd $(bindir) && \
 -	(rm -f iniptex virptex; $(LN) ptex iniptex; $(LN) ptex virptex)
@@ -114,22 +93,3 @@
 +#	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 --exclude=CVS -urN /a/work/tmp/pkgsrc/japanese/texfamily/patches/patch-af japanese/texfamily/patches/patch-af
--- /a/work/tmp/pkgsrc/japanese/texfamily/patches/patch-af	Fri Sep 14 10:10:27 2001
+++ japanese/texfamily/patches/patch-af	Thu Jan  1 09:00:00 1970
@@ -1,126 +0,0 @@
-$NetBSD: patch-af,v 1.2 2001/09/02 21:26:01 hubertf 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
- 
- 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 --exclude=CVS -urN /a/work/tmp/pkgsrc/japanese/texfamily/patches/patch-ag japanese/texfamily/patches/patch-ag
--- /a/work/tmp/pkgsrc/japanese/texfamily/patches/patch-ag	Fri Sep 14 10:10:27 2001
+++ japanese/texfamily/patches/patch-ag	Thu Jan  1 09:00:00 1970
@@ -1,126 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2001/09/02 21:26:01 hubertf 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
- 
- 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 --exclude=CVS -urN /a/work/tmp/pkgsrc/japanese/texfamily/patches/patch-aj japanese/texfamily/patches/patch-aj
--- /a/work/tmp/pkgsrc/japanese/texfamily/patches/patch-aj	Fri Sep 14 10:10:27 2001
+++ japanese/texfamily/patches/patch-aj	Thu Jan  1 09:00:00 1970
@@ -1,117 +0,0 @@
-$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
diff --exclude=CVS -urN /a/work/tmp/pkgsrc/japanese/texfamily-share/Makefile japanese/texfamily-share/Makefile
--- /a/work/tmp/pkgsrc/japanese/texfamily-share/Makefile	Fri Sep 14 10:12:07 2001
+++ japanese/texfamily-share/Makefile	Wed Sep 12 14:50:53 2001
@@ -1,12 +1,12 @@
 # $NetBSD: Makefile,v 1.1.1.1 2001/04/14 12:50:21 kei Exp $
 
-DISTNAME=	TeXfamily-share-1.2.1
+DISTNAME=	TeXfamily-share-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/ \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/jvf/
-DISTFILES=	ptex-texmf-1.9${EXTRACT_SUFX} \
+DISTFILES=	ptex-texmf-1.10${EXTRACT_SUFX} \
 		texfam-texmf-latex209${EXTRACT_SUFX} \
 		texfam-texmf-j1.9${EXTRACT_SUFX} \
 		texfam-texmf-j1.9.1${EXTRACT_SUFX} \
@@ -18,7 +18,7 @@
 MAINTAINER=	kei@netbsd.org
 COMMENT=	Machine-independent part of TeXfamily (pTeX, JTeX, MuLTeX)
 
-DEPENDS+=	teTeX>=1.0.7:../../print/teTeX
+DEPENDS+=	teTeX>=1.0.7nb1:../../print/teTeX
 
 DIST_SUBDIR=	TeXfamily
 WRKSRC=		${WRKDIR}
@@ -32,7 +32,7 @@
 
 do-install:
 	@${INSTALL_DATA_DIR} ${LOCALBASE}/share/texmf.local
-.for f in ptex-texmf-1.9 texfam-texmf-latex209 texfam-texmf-j1.9 \
+.for f in ptex-texmf-1.10 texfam-texmf-latex209 texfam-texmf-j1.9 \
     texfam-texmf-j1.9.1 texfam-texmf-m0.8 \
     mulfonts-vf mulfonts-subtfm nmin-ngoth standard morisawa
 	@${GTAR} -plzx -C ${LOCALBASE}/share/texmf.local \
@@ -51,7 +51,8 @@
 
 post-install:
 	@cd ${LOCALBASE}; \
-	 ${FIND} share/texmf.local -type f|sort > ${PLIST_SRC}; \
+	 ${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC}; \
+	 ${FIND} share/texmf.local -type f|sort >> ${PLIST_SRC}; \
 	 for LINK in `${FIND} share/texmf.local -type l`; do \
 		set - X `${FILE} $$LINK`; \
 		${ECHO} "@exec ${LN} -s $$6 %D/$$LINK" >>${PLIST_SRC}; \
diff --exclude=CVS -urN /a/work/tmp/pkgsrc/japanese/texfamily-share/distinfo japanese/texfamily-share/distinfo
--- /a/work/tmp/pkgsrc/japanese/texfamily-share/distinfo	Fri Sep 14 10:12:07 2001
+++ japanese/texfamily-share/distinfo	Mon Sep 10 15:05:51 2001
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.2 2001/04/21 10:13:37 wiz Exp $
 
-SHA1 (TeXfamily/ptex-texmf-1.9.tar.gz) = 5a1bd59efbb51b75d64be72f823322ea49ac9adb
-Size (TeXfamily/ptex-texmf-1.9.tar.gz) = 1860801 bytes
+SHA1 (TeXfamily/ptex-texmf-1.10.tar.gz) = 8ad1e8c5c30146af00329ab5148f43b8f6481489
+Size (TeXfamily/ptex-texmf-1.10.tar.gz) = 1861430 bytes
 SHA1 (TeXfamily/texfam-texmf-latex209.tar.gz) = b28b3f10701531514503d72c3c2609a63042db29
 Size (TeXfamily/texfam-texmf-latex209.tar.gz) = 204702 bytes
 SHA1 (TeXfamily/texfam-texmf-j1.9.tar.gz) = f563c0791a649e38624965ee27c8c400639041a8