Replace teTeX's web2c (7.5.4) with print/web2c (7.5.7).

5 files changed, 138 insertions, 110 deletions

diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile
index 638d4afb321..d1759f66944 100644
--- a/print/teTeX3-bin/Makefile
+++ b/print/teTeX3-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2009/04/12 02:44:08 minskim Exp $
+# $NetBSD: Makefile,v 1.43 2009/04/12 07:33:35 minskim Exp $
 
 DISTNAME=	tetex-src-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=	28
+PKGREVISION=	29
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -14,6 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	teTeX-texmf>=3.0nb10:../../print/teTeX3-texmf
 DEPENDS+=	tex-bin-kpathsea-[0-9]*:../../print/tex-bin-kpathsea
+DEPENDS+=	web2c>=7.5.7nb2:../../print/web2c
 
 # games/omega previously installed an omega executable too
 CONFLICTS+=	omega<0.90.4nb1
@@ -27,12 +28,21 @@ USE_LIBTOOL=	yes
 CONFIGURE_ARGS+=	--without-texinfo --without-texi2html
 CONFIGURE_ARGS+=	--without-dvipdfm --without-dvipng
 CONFIGURE_ARGS+=	--without-dvipsk --without-odvipsk
+CONFIGURE_ARGS+=	--without-etex --without-omega --without-aleph \
+			--without-pdftex --without-pdfetex --without-pdfxtex
 CONFIGURE_ARGS+=	--without-xdvik --without-oxdvik
 
 MAKE_ENV+=		KPATHSEA_PREFIX=${BUILDLINK_PREFIX.kpathsea}
 MAKE_FLAGS+=		LIBTOOL=${LIBTOOL:Q}
 MAKE_FLAGS+=		vartexfonts=${VARBASE:Q}/lib/texmf/fonts
 
+SUBST_CLASSES+=		web2c
+SUBST_MESSAGE.web2c=	Disabling web2c.
+SUBST_STAGE.web2c=	pre-configure
+SUBST_FILES.web2c=	Makefile.in texk/Makefile.in
+SUBST_SED.web2c=	-e 's,^programs = web2c,programs =,' \
+			-e 's,^@FMU@,,'
+
 BUILD_DEFS+=		VARBASE
 LOWER_PAPERSIZE_cmd=	${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'
 LOWER_PAPERSIZE=	${LOWER_PAPERSIZE_cmd:sh}
@@ -49,7 +59,7 @@ INSTALL_MAKE_FLAGS+=	texmf=${DESTDIR}${PREFIX}/share/texmf
 INSTALL_MAKE_FLAGS+=	infodir=${DESTDIR}${PREFIX}/${PKGINFODIR}
 INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
-INSTALLATION_DIRS+=	share/texmf/fmtutil
+INSTALLATION_DIRS+=	info share/texmf/fmtutil
 
 TEX_TEXMF_DIRS=	${PREFIX}/share/texmf
 
@@ -63,4 +73,13 @@ TEX_FORMAT_NAMES+=	tetex
 post-extract:
 	${RM} -rf ${WRKSRC}/texk/kpathsea
 
+post-install:
+.for f in a2ping e2pall epstopdf
+	${INSTALL_SCRIPT} ${WRKSRC}/texk/tetex/${f} ${DESTDIR}${PREFIX}/bin
+.endfor
+	${LN} -sf texexec ${DESTDIR}${PREFIX}/bin/mptopdf
+	${LN} -sf pdftex ${DESTDIR}${PREFIX}/bin/pdfetex
+	${INSTALL_DATA} ${FILESDIR}/format.tetex.cnf \
+		${DESTDIR}${PREFIX}/share/texmf/fmtutil
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX3-bin/PLIST b/print/teTeX3-bin/PLIST
index 34661ea9216..e54dde480f3 100644
--- a/print/teTeX3-bin/PLIST
+++ b/print/teTeX3-bin/PLIST
@@ -1,66 +1,26 @@
-@comment $NetBSD: PLIST,v 1.11 2009/04/12 02:44:08 minskim Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/04/12 07:33:35 minskim Exp $
 bin/a2ping
-bin/aleph
-bin/bibtex
-bin/ctangle
-bin/ctie
-bin/cweave
-bin/dmp
-bin/dvicopy
 bin/dvihp
 bin/dvilj
 bin/dvilj2p
 bin/dvilj4
 bin/dvilj4l
 bin/dvilj6
-bin/dvitomp
-bin/dvitype
 bin/e2pall
 bin/epstopdf
 bin/fdf2tan
 bin/fdf2tex
-bin/gftodvi
-bin/gftopk
-bin/gftype
 bin/gsftopk
 bin/mag
 bin/makeindex
-bin/makempx
 bin/makempy
-bin/mf
-bin/mf-nowin
-bin/mft
 bin/mkindex
-bin/mkocp
-bin/mkofm
-bin/mpost
-bin/mpto
 bin/mptopdf
-bin/newer
-bin/odvicopy
-bin/odvitype
-bin/ofm2opl
-bin/omega
-bin/omfonts
-bin/opl2ofm
-bin/otangle
-bin/otp2ocp
-bin/outocp
-bin/ovf2ovp
-bin/ovp2ovf
-bin/patgen
 bin/pdfcrop
 bin/pdfetex
-bin/pdfxtex
 bin/pfb2pfa
 bin/pk2bm
-bin/pktogf
-bin/pktype
-bin/pltotf
-bin/pooltype
 bin/ps2pk
-bin/tangle
-bin/tex
 bin/texdoc
 bin/texdoctk
 bin/texexec
@@ -68,75 +28,27 @@ bin/texfind
 bin/texfont
 bin/texshow
 bin/texutil
-bin/tftopl
 bin/thumbpdf
-bin/tie
-bin/ttf2afm
 bin/uniqleaf
-bin/vftovp
-bin/vptovf
-bin/weave
 info/latex.info
-info/web2c.info
-man/man1/amstex.1
-man/man1/bibtex.1
-man/man1/ctangle.1
-man/man1/ctie.1
-man/man1/cweave.1
-man/man1/cweb.1
-man/man1/dmp.1
-man/man1/dvicopy.1
 man/man1/dvihp.1
 man/man1/dvilj.1
 man/man1/dvilj2p.1
 man/man1/dvilj4.1
 man/man1/dvilj4l.1
 man/man1/dvilj6.1
-man/man1/dvitomp.1
-man/man1/dvitype.1
-man/man1/eplain.1
-man/man1/etex.1
 man/man1/fdf2tex.1
-man/man1/gftodvi.1
-man/man1/gftopk.1
-man/man1/gftype.1
 man/man1/gsftopk.1
 man/man1/lambda.1
-man/man1/latex.1
 man/man1/mag.1
 man/man1/makeindex.1
-man/man1/makempx.1
-man/man1/mf-nowin.1
-man/man1/mf.1
-man/man1/mft.1
 man/man1/mkindex.1
-man/man1/mpost.1
-man/man1/mpto.1
-man/man1/newer.1
-man/man1/odvicopy.1
-man/man1/odvitype.1
-man/man1/omega.1
-man/man1/patgen.1
-man/man1/pdfetex.1
 man/man1/pdflatex.1
-man/man1/pdftex.1
-man/man1/pdfxtex.1
 man/man1/pfb2pfa.1
 man/man1/pk2bm.1
-man/man1/pktogf.1
-man/man1/pktype.1
-man/man1/pltotf.1
-man/man1/pooltype.1
 man/man1/ps2pk.1
-man/man1/tangle.1
-man/man1/tex.1
 man/man1/texdoc.1
 man/man1/texshow.1
-man/man1/tftopl.1
-man/man1/tie.1
-man/man1/vftovp.1
-man/man1/vptovf.1
-man/man1/weave.1
 share/texmf/doc/tetex/TETEXDOC.dvi
 share/texmf/doc/tetex/TETEXDOC.pdf
 share/texmf/doc/tetex/TETEXDOC.ps
@@ -144,11 +56,4 @@ share/texmf/doc/tetex/teTeX-FAQ
 share/texmf/dvips/gsftopk/render.ps
 share/texmf/fmtutil/format.tetex.cnf
 share/texmf/release-tetex-src.txt
-share/texmf/web2c/aleph.pool
-share/texmf/web2c/mf.pool
-share/texmf/web2c/mp.pool
-share/texmf/web2c/omega.pool
 share/texmf/web2c/pdfetex-pl.pool
-share/texmf/web2c/pdfetex.pool
-share/texmf/web2c/pdfxtex.pool
-share/texmf/web2c/tex.pool
diff --git a/print/teTeX3-bin/distinfo b/print/teTeX3-bin/distinfo
index cb68179a3f0..fbe89ecd14d 100644
--- a/print/teTeX3-bin/distinfo
+++ b/print/teTeX3-bin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2009/02/23 20:12:19 minskim Exp $
+$NetBSD: distinfo,v 1.18 2009/04/12 07:33:35 minskim Exp $
 
 SHA1 (teTeX/tetex-src-3.0.tar.gz) = 7637789f7f4929694aed1b89820f5bad4753e8fc
 RMD160 (teTeX/tetex-src-3.0.tar.gz) = 15a139f5f36993e4ed3583260e175cfb13ce7bcc
@@ -17,7 +17,7 @@ SHA1 (patch-am) = 54d86197eee3d4e15a6c9bad6ae16ef1e0299667
 SHA1 (patch-an) = a02db18a49f61f965e0277fbc5a3fa72a5060b47
 SHA1 (patch-aq) = d7a4dd4864e43cd27b1ca803f8ebfe82e65f84a7
 SHA1 (patch-ar) = 92f465143d278d7b081d70c3053194b70585571b
-SHA1 (patch-as) = e67aa6558648480ba686f84e08cee3670c79fbd1
+SHA1 (patch-as) = 3e1b2f14995c1bb7f566f76714138039f8714f75
 SHA1 (patch-at) = aaeddf2240f1b0e394ab78122352c111f3aa9718
 SHA1 (patch-au) = e8f556ac27ba9a22731b8e7c37356a64eb115860
 SHA1 (patch-av) = 53c963ac1b5f1963f707228badeaf0d57b159344
diff --git a/print/teTeX3-bin/files/format.tetex.cnf b/print/teTeX3-bin/files/format.tetex.cnf
new file mode 100644
index 00000000000..ffcfac0e461
--- /dev/null
+++ b/print/teTeX3-bin/files/format.tetex.cnf
@@ -0,0 +1,104 @@
+# Thomas Esser, Copyright 1998, 1999. Public domain.
+# fmtutil.cnf: configuration file for fmtutil.
+
+# Customize this file to your needs, e.g.
+#   - remove or uncomment formats that you don't need
+#   - add your own formats
+#   - change default engine / flags for standard formats
+
+# Some notes:
+#   1) tex and amstex just load hyphen.tex. No customization.
+#   You can have you own customized (via babel's hyphen.cfg)
+#   formats on top of plain by using "bplain.tex" instead of
+#   plain.tex (see e.g. bplain.ini file for bplain format).
+#
+#   2) etex loads language.def, not language.dat.
+#
+#   3) The symbolic link to the right engines (e.g. bplain -> tex)
+#      will be generated by the "texlinks" script. So, if you call
+#      fmtutil "by hand" and not via texconfig, please also call
+#      texlinks afterwards.
+# 
+#   4) usual comments start with "# ", whereas disabled configurations
+#      start with "#! " in this file.
+
+# The format of the table is:
+
+# format	engine		pattern-file	arguments
+
+# The last part of "arguments" must be the name of the file to run
+# initex (or another "ini"-engine) on.
+
+# metafont and metapost:
+mf		mf		-		-translate-file=cp227.tcx mf.ini
+mpost		mpost		-		-translate-file=cp227.tcx mpost.mp
+metafun		mpost		-		-translate-file=cp227.tcx metafun.mp
+
+# Standard formats (plain, latex) with all engines:
+
+# Change "tex.ini -> bplain.ini" and "- -> language.dat"
+# if you want babel support in tex:
+tex		tex		-		-translate-file=cp227.tcx tex.ini
+latex		pdftex		language.dat	-translate-file=cp227.tcx *latex.ini
+etex		pdftex		language.def	-translate-file=cp227.tcx *etex.ini
+pdftex		pdftex		-	-translate-file=cp227.tcx *pdftex.ini
+pdflatex	pdftex		language.dat	-translate-file=cp227.tcx *pdflatex.ini
+pdfetex		pdftex		language.def	-translate-file=cp227.tcx *pdfetex.ini
+#! pdfxlatex	pdfxtex		language.dat	-translate-file=cp227.tcx *pdfxlatex.ini
+#! pdfxtex		pdfxtex		-		-translate-file=cp227.tcx *pdfxtex.ini
+omega		omega		-	omega.ini
+lambda		omega		language.dat	lambda.ini
+aleph		aleph		-		*aleph.ini
+lamed		aleph		language.dat	*lambda.ini
+
+# The amstex format:
+
+# Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
+# if you want babel support in amstex:
+#! amstex	pdfetex		-		-translate-file=cp227.tcx *amstex.ini
+
+# Change "pdfamstex.ini -> pdfbamstex.ini" and "- -> language.dat"
+# if you want babel support in pdfamstex:
+#! pdfamstex	pdfetex			-	-translate-file=cp227.tcx *pdfamstex.ini
+
+# Context formats:
+#! cont-cz	pdfetex		cont-usr.tex	-translate-file=cp227.tcx *cont-cz.ini
+#! cont-de	pdfetex		cont-usr.tex	-translate-file=cp227.tcx *cont-de.ini
+cont-en	pdftex		cont-usr.tex	-translate-file=cp227.tcx *cont-en.ini
+#! cont-nl	pdfetex		cont-usr.tex	-translate-file=cp227.tcx *cont-nl.ini
+#! cont-uk	pdfetex		cont-usr.tex	-translate-file=cp227.tcx *cont-uk.ini
+
+# language-specific things:
+
+# - Cyrillic:
+#! cyrtex	pdfetex		language.dat	-translate-file=cp227.tcx *cyrtex.ini
+#! cyrtexinfo	pdfetex		language.dat	-translate-file=cp227.tcx *cyrtxinf.ini
+#! cyramstex	pdfetex		language.dat	-translate-file=cp227.tcx *cyramstx.ini
+
+# - Polish:
+#! platex		pdfetex		language.dat	-translate-file=cp227.tcx *platex.ini
+#! pdfplatex		pdfetex		language.dat	-translate-file=cp227.tcx *pdfplatex.ini
+#! mex		pdfetex		mexconf.tex	-translate-file=cp227.tcx *mex.ini
+#! pdfmex		pdfetex		mexconf.tex	-translate-file=cp227.tcx *pdfmex.ini
+#! utf8mex		pdfetex		mexconf.tex	-enc *utf8mex.ini
+
+# - Polish with translated messages (experimental):
+#! platex-pl	pdfetex		-		nls=pdfetex-pl,il2-pl *platex.ini
+#! mex-pl		pdfetex		mexconf.tex	nls=pdfetex-pl,il2-pl *mex.ini
+#! pdfmex-pl	pdfetex		mexconf.tex	nls=pdfetex-pl,il2-pl *pdfmex.ini
+
+# - Czech / Slovak:
+#! csplain	pdfetex		-		-translate-file=cp227.tcx *csplain.ini
+#! cslatex	pdfetex		-	-translate-file=cp227.tcx *cslatex.ini
+#! pdfcsplain	pdfetex		-		-translate-file=cp227.tcx *csplain.ini
+#! pdfcslatex	pdfetex		-    -translate-file=cp227.tcx *cslatex.ini
+
+# Other formats:
+
+# Change "eplain.ini -> ebplain.ini" and "- -> language.dat"
+# if you want babel support in eplain:
+#! eplain	pdfetex		-	-translate-file=cp227.tcx *eplain.ini
+
+
+# mptopdf utility
+mptopdf		pdftex		-		-translate-file=cp227.tcx mptopdf.tex
diff --git a/print/teTeX3-bin/patches/patch-as b/print/teTeX3-bin/patches/patch-as
index 8fb3e56b931..216910a500c 100644
--- a/print/teTeX3-bin/patches/patch-as
+++ b/print/teTeX3-bin/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.3 2009/01/26 21:18:04 minskim Exp $
+$NetBSD: patch-as,v 1.4 2009/04/12 07:33:35 minskim Exp $
 
 --- texk/tetex/Makefile.in.orig	2005-02-04 14:20:54.000000000 -0800
 +++ texk/tetex/Makefile.in
@@ -29,7 +29,7 @@ $NetBSD: patch-as,v 1.3 2009/01/26 21:18:04 minskim Exp $
  
  INFOFILES= latex.info
  POOLFILES = pdfetex-pl.pool
-@@ -39,30 +34,18 @@ install-data:: $(INFOFILES)
+@@ -39,30 +34,13 @@ install-data:: $(INFOFILES)
  	for p in $(manpgs); do \
  	  $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \
  	done
@@ -52,11 +52,11 @@ $NetBSD: patch-as,v 1.3 2009/01/26 21:18:04 minskim Exp $
  	ln -s pdfetex.$(manext) $(man1dir)/pdflatex.$(manext)
 -	ln -s kpsetool.$(manext) $(man1dir)/kpsepath.$(manext)
 -	ln -s kpsetool.$(manext) $(man1dir)/kpsexpand.$(manext)
- 	ln -s mf.$(manext) $(man1dir)/mf-nowin.$(manext)
- 	ln -s cweb.$(manext) $(man1dir)/ctangle.$(manext)
- 	ln -s cweb.$(manext) $(man1dir)/cweave.$(manext)
- 	ln -s dvicopy.$(manext) $(man1dir)/odvicopy.$(manext)
- 	ln -s dvitype.$(manext) $(man1dir)/odvitype.$(manext)
+-	ln -s mf.$(manext) $(man1dir)/mf-nowin.$(manext)
+-	ln -s cweb.$(manext) $(man1dir)/ctangle.$(manext)
+-	ln -s cweb.$(manext) $(man1dir)/cweave.$(manext)
+-	ln -s dvicopy.$(manext) $(man1dir)/odvicopy.$(manext)
+-	ln -s dvitype.$(manext) $(man1dir)/odvitype.$(manext)
 -	ln -s texconfig.$(manext) $(man1dir)/texconfig-sys.$(manext)
 -	ln -s updmap.$(manext) $(man1dir)/updmap-sys.$(manext)
 -	ln -s fmtutil.$(manext) $(man1dir)/mktexfmt.$(manext)
@@ -64,7 +64,7 @@ $NetBSD: patch-as,v 1.3 2009/01/26 21:18:04 minskim Exp $
  	test -r ./latex.info || cd $(srcdir) && for i in latex.info*; do \
  	  $(INSTALL_DATA) $$i $(infodir)/$$i; done
  	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-@@ -74,14 +57,6 @@ install-data:: $(INFOFILES)
+@@ -74,14 +52,6 @@ install-data:: $(INFOFILES)
  	for p in TETEXDOC.pdf TETEXDOC.ps TETEXDOC.dvi teTeX-FAQ; do \
  	  $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/doc/tetex; \
  	done
@@ -79,7 +79,7 @@ $NetBSD: patch-as,v 1.3 2009/01/26 21:18:04 minskim Exp $
  
  install-exec:
  	-$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
-@@ -96,16 +71,10 @@ install-exec:
+@@ -96,16 +66,10 @@ install-exec:
  	else \
  	  true; \
  	fi