Replace teTeX's tex and pdftex formats with those in print/tex-bin-tex

and print/tex-pdftex.

While here, remove a symbolic link pointing to nothing from teTeX-bin.

Bump PKGREVISION for teTeX-{texmf,bin}.

5 files changed, 14 insertions, 21 deletions

diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile
index d1759f66944..b7079b2d996 100644
--- a/print/teTeX3-bin/Makefile
+++ b/print/teTeX3-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2009/04/12 07:33:35 minskim Exp $
+# $NetBSD: Makefile,v 1.44 2009/04/13 07:48:24 minskim Exp $
 
 DISTNAME=	tetex-src-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=	29
+PKGREVISION=	30
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -14,6 +14,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	teTeX-texmf>=3.0nb10:../../print/teTeX3-texmf
 DEPENDS+=	tex-bin-kpathsea-[0-9]*:../../print/tex-bin-kpathsea
+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
 
 # games/omega previously installed an omega executable too
diff --git a/print/teTeX3-bin/PLIST b/print/teTeX3-bin/PLIST
index e54dde480f3..8fe5eaa360e 100644
--- a/print/teTeX3-bin/PLIST
+++ b/print/teTeX3-bin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2009/04/12 07:33:35 minskim Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/04/13 07:48:24 minskim Exp $
 bin/a2ping
 bin/dvihp
 bin/dvilj
@@ -43,7 +43,6 @@ man/man1/lambda.1
 man/man1/mag.1
 man/man1/makeindex.1
 man/man1/mkindex.1
-man/man1/pdflatex.1
 man/man1/pfb2pfa.1
 man/man1/pk2bm.1
 man/man1/ps2pk.1
diff --git a/print/teTeX3-bin/distinfo b/print/teTeX3-bin/distinfo
index fbe89ecd14d..46b3a79d5b6 100644
--- a/print/teTeX3-bin/distinfo
+++ b/print/teTeX3-bin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2009/04/12 07:33:35 minskim Exp $
+$NetBSD: distinfo,v 1.19 2009/04/13 07:48:24 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) = 3e1b2f14995c1bb7f566f76714138039f8714f75
+SHA1 (patch-as) = e8ec2a26580f3be4b8dde85ad5e69fc6ddaeb023
 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
index ffcfac0e461..b134f4cc153 100644
--- a/print/teTeX3-bin/files/format.tetex.cnf
+++ b/print/teTeX3-bin/files/format.tetex.cnf
@@ -35,17 +35,8 @@ 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
diff --git a/print/teTeX3-bin/patches/patch-as b/print/teTeX3-bin/patches/patch-as
index 216910a500c..912061a5c10 100644
--- a/print/teTeX3-bin/patches/patch-as
+++ b/print/teTeX3-bin/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.4 2009/04/12 07:33:35 minskim Exp $
+$NetBSD: patch-as,v 1.5 2009/04/13 07:48:24 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.4 2009/04/12 07:33:35 minskim Exp $
  
  INFOFILES= latex.info
  POOLFILES = pdfetex-pl.pool
-@@ -39,30 +34,13 @@ install-data:: $(INFOFILES)
+@@ -39,30 +34,12 @@ install-data:: $(INFOFILES)
  	for p in $(manpgs); do \
  	  $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \
  	done
@@ -40,7 +40,7 @@ $NetBSD: patch-as,v 1.4 2009/04/12 07:33:35 minskim Exp $
 -	  lambda.$(manext) pdflatex.$(manext) kpsepath.$(manext) \
 -	  kpsexpand.$(manext) mf-nowin.$(manext) ctangle.$(manext) \
 +	cd $(man1dir); rm -f \
-+	  lambda.$(manext) pdflatex.$(manext) \
++	  lambda.$(manext) \
 +	  mf-nowin.$(manext) ctangle.$(manext) \
  	  cweave.$(manext) odvicopy.$(manext) \
 -	  odvitype.$(manext) texconfig-sys.$(manext) \
@@ -49,7 +49,7 @@ $NetBSD: patch-as,v 1.4 2009/04/12 07:33:35 minskim Exp $
 -	ln -s mktexlsr.$(manext) $(man1dir)/texhash.$(manext)
 +	  odvitype.$(manext)
  	ln -s omega.$(manext) $(man1dir)/lambda.$(manext)
- 	ln -s pdfetex.$(manext) $(man1dir)/pdflatex.$(manext)
+-	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)
@@ -64,7 +64,7 @@ $NetBSD: patch-as,v 1.4 2009/04/12 07:33:35 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 +52,6 @@ install-data:: $(INFOFILES)
+@@ -74,14 +51,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.4 2009/04/12 07:33:35 minskim Exp $
  
  install-exec:
  	-$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
-@@ -96,16 +66,10 @@ install-exec:
+@@ -96,16 +65,10 @@ install-exec:
  	else \
  	  true; \
  	fi
@@ -96,3 +96,4 @@ $NetBSD: patch-as,v 1.4 2009/04/12 07:33:35 minskim Exp $
  
  ac_include ../make/clean.mk
  
+-