Adapt teTeX-bin to TeX Live 2009.

- Replace tex-bin-tex with tex-tex.
- Remove format.tetex.cnf, which is no longer used.

3 files changed, 5 insertions, 98 deletions

diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile
index 0fbcffd343f..0103a3baed7 100644
--- a/print/teTeX3-bin/Makefile
+++ b/print/teTeX3-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2010/01/28 21:37:35 minskim Exp $
+# $NetBSD: Makefile,v 1.55 2010/01/29 21:46:19 minskim Exp $
 
 DISTNAME=	tetex-src-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=	39
+PKGREVISION=	40
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -17,8 +17,8 @@ DEPENDS+=	teTeX-texmf>=3.0nb14:../../print/teTeX3-texmf
 DEPENDS+=	tex-bin-kpathsea-[0-9]*:../../print/tex-bin-kpathsea
 DEPENDS+=	tex-bin-latex-[0-9]*:../../print/tex-bin-latex
 DEPENDS+=	tex-bin-metafont-[0-9]*:../../fonts/tex-bin-metafont
-DEPENDS+=	tex-bin-tex-[0-9]*:../../print/tex-bin-tex
 DEPENDS+=	tex-pdftex-[0-9]*:../../print/tex-pdftex
+DEPENDS+=	tex-tex-[0-9]*:../../print/tex-tex
 DEPENDS+=	web2c>=7.5.7nb2:../../print/web2c
 
 INFO_FILES=	# PLIST
@@ -67,7 +67,7 @@ INSTALLATION_DIRS+=	info share/texmf/fmtutil
 
 TEX_TEXMF_DIRS=	${PREFIX}/share/texmf
 
-TEX_FORMAT_NAMES+=	tetex
+TEX_FORMATS=	"mpost mpost - -translate-file=cp227.tcx mpost.mp\\nmetafun mpost - -translate-file=cp227.tcx metafun.mp\\naleph aleph - *aleph.ini\\nlamed aleph language.dat *lambda.ini\\ncont-en pdftex cont-usr.tex -translate-file=cp227.tcx *cont-en.ini\\nmptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex\\n"
 
 .include "../../print/kpathsea/texmf.mk"
 .include "../../print/teTeX3-bin/Makefile.common"
@@ -80,7 +80,5 @@ post-install:
 	${LN} -sf mpost ${DESTDIR}${PREFIX}/bin/metafun
 	${LN} -sf aleph ${DESTDIR}${PREFIX}/bin/lamed
 	${LN} -sf pdftex ${DESTDIR}${PREFIX}/bin/mptopdf
-	${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 b9951dbf847..f91f72f0e2f 100644
--- a/print/teTeX3-bin/PLIST
+++ b/print/teTeX3-bin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2010/01/28 21:37:35 minskim Exp $
+@comment $NetBSD: PLIST,v 1.22 2010/01/29 21:46:19 minskim Exp $
 bin/fdf2tan
 bin/fdf2tex
 bin/lamed
@@ -23,6 +23,5 @@ share/texmf/doc/tetex/TETEXDOC.dvi
 share/texmf/doc/tetex/TETEXDOC.pdf
 share/texmf/doc/tetex/TETEXDOC.ps
 share/texmf/doc/tetex/teTeX-FAQ
-share/texmf/fmtutil/format.tetex.cnf
 share/texmf/release-tetex-src.txt
 share/texmf/web2c/pdfetex-pl.pool
diff --git a/print/teTeX3-bin/files/format.tetex.cnf b/print/teTeX3-bin/files/format.tetex.cnf
deleted file mode 100644
index 44cfa751fd9..00000000000
--- a/print/teTeX3-bin/files/format.tetex.cnf
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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:
-mpost		mpost		-		-translate-file=cp227.tcx mpost.mp
-metafun		mpost		-		-translate-file=cp227.tcx metafun.mp
-
-# Standard formats (plain, latex) with all engines:
-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