Replace the following commands and utilities of teTeX with those in

TeX Live: dviljk, makeindexk, and metafont.

Bump PKGREVISION for teTeX-bin and teTeX.

4 files changed, 10 insertions, 23 deletions

diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 2815d0b46ab..c656d1aee6b 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2009/04/12 02:44:08 minskim Exp $
+# $NetBSD: Makefile,v 1.52 2009/04/30 01:01:41 minskim Exp $
 
 DISTNAME=	teTeX-3.0
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	print meta-pkgs
 MASTER_SITES=	# empty
 
@@ -9,6 +9,7 @@ MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://www.tug.org/tetex/
 COMMENT=	Thomas Esser's TeX distribution for UNIX compatible systems
 
+DEPENDS+=	dviljk-[0-9]*:../../print/dviljk
 DEPENDS+=	dvipdfm-[0-9]*:../../print/dvipdfm
 DEPENDS+=	dvipng-[0-9]*:../../graphics/dvipng
 DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile
index 70c983ac058..444a6d201d4 100644
--- a/print/teTeX3-bin/Makefile
+++ b/print/teTeX3-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2009/04/15 09:19:45 minskim Exp $
+# $NetBSD: Makefile,v 1.47 2009/04/30 01:01:40 minskim Exp $
 
 DISTNAME=	tetex-src-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=	32
+PKGREVISION=	33
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -12,9 +12,11 @@ COMMENT=	TeX distribution for UNIX compatible systems - binaries
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	teTeX-texmf>=3.0nb10:../../print/teTeX3-texmf
+DEPENDS+=	makeindexk-[0-9]*:../../textproc/makeindexk
+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+=	web2c>=7.5.7nb2:../../print/web2c
@@ -31,6 +33,7 @@ USE_LIBTOOL=	yes
 CONFIGURE_ARGS+=	--without-texinfo --without-texi2html
 CONFIGURE_ARGS+=	--without-dvipdfm --without-dvipng
 CONFIGURE_ARGS+=	--without-dvipsk --without-odvipsk
+CONFIGURE_ARGS+=	--without-dviljk --without-makeindexk
 CONFIGURE_ARGS+=	--without-etex --without-omega --without-aleph \
 			--without-pdftex --without-pdfetex --without-pdfxtex
 CONFIGURE_ARGS+=	--without-xdvik --without-oxdvik
diff --git a/print/teTeX3-bin/PLIST b/print/teTeX3-bin/PLIST
index e5ea71ab494..610d36d96f0 100644
--- a/print/teTeX3-bin/PLIST
+++ b/print/teTeX3-bin/PLIST
@@ -1,11 +1,5 @@
-@comment $NetBSD: PLIST,v 1.15 2009/04/15 09:19:45 minskim Exp $
+@comment $NetBSD: PLIST,v 1.16 2009/04/30 01:01:41 minskim Exp $
 bin/a2ping
-bin/dvihp
-bin/dvilj
-bin/dvilj2p
-bin/dvilj4
-bin/dvilj4l
-bin/dvilj6
 bin/e2pall
 bin/epstopdf
 bin/fdf2tan
@@ -14,10 +8,8 @@ bin/gsftopk
 bin/lambda
 bin/lamed
 bin/mag
-bin/makeindex
 bin/makempy
 bin/metafun
-bin/mkindex
 bin/mptopdf
 bin/pdfcrop
 bin/pfb2pfa
@@ -33,18 +25,10 @@ bin/texutil
 bin/thumbpdf
 bin/uniqleaf
 info/latex.info
-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/fdf2tex.1
 man/man1/gsftopk.1
 man/man1/lambda.1
 man/man1/mag.1
-man/man1/makeindex.1
-man/man1/mkindex.1
 man/man1/pfb2pfa.1
 man/man1/pk2bm.1
 man/man1/ps2pk.1
diff --git a/print/teTeX3-bin/files/format.tetex.cnf b/print/teTeX3-bin/files/format.tetex.cnf
index ff88f21915e..04f3d14bcd6 100644
--- a/print/teTeX3-bin/files/format.tetex.cnf
+++ b/print/teTeX3-bin/files/format.tetex.cnf
@@ -30,7 +30,6 @@
 # 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