Fix the context format generation by replacing teTeX's context and

metapost files with those in TeX Live 2009.

4 files changed, 15 insertions, 20 deletions

diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile
index ad945e10db8..1c30376b7a6 100644
--- a/print/teTeX3-bin/Makefile
+++ b/print/teTeX3-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2010/06/13 22:45:18 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2010/06/17 00:44:01 minskim Exp $
 
 DISTNAME=	tetex-src-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=	44
+PKGREVISION=	45
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -67,7 +67,7 @@ INSTALLATION_DIRS+=	info share/texmf/fmtutil
 
 TEX_TEXMF_DIRS=	${PREFIX}/share/texmf
 
-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"
+TEX_FORMATS=	"aleph aleph - *aleph.ini\\nlamed aleph language.dat *lambda.ini\\n"
 
 .include "../../print/kpathsea/texmf.mk"
 .include "../../print/teTeX3-bin/Makefile.common"
@@ -77,8 +77,6 @@ post-extract:
 	${RM} -rf ${WRKSRC}/texk/kpathsea
 
 post-install:
-	${LN} -sf mpost ${DESTDIR}${PREFIX}/bin/metafun
 	${LN} -sf aleph ${DESTDIR}${PREFIX}/bin/lamed
-	${LN} -sf pdftex ${DESTDIR}${PREFIX}/bin/mptopdf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX3-bin/PLIST b/print/teTeX3-bin/PLIST
index f91f72f0e2f..144bb7c1908 100644
--- a/print/teTeX3-bin/PLIST
+++ b/print/teTeX3-bin/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.22 2010/01/29 21:46:19 minskim Exp $
+@comment $NetBSD: PLIST,v 1.23 2010/06/17 00:44:01 minskim Exp $
 bin/fdf2tan
 bin/fdf2tex
 bin/lamed
 bin/makempy
-bin/metafun
-bin/mptopdf
 bin/pdfcrop
 bin/texdoc
 bin/texdoctk
@@ -19,9 +17,5 @@ info/latex.info
 man/man1/fdf2tex.1
 man/man1/texdoc.1
 man/man1/texshow.1
-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/release-tetex-src.txt
 share/texmf/web2c/pdfetex-pl.pool
diff --git a/print/teTeX3-bin/distinfo b/print/teTeX3-bin/distinfo
index 0b693cfc936..cfb07d7ed35 100644
--- a/print/teTeX3-bin/distinfo
+++ b/print/teTeX3-bin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2010/01/28 21:37:35 minskim Exp $
+$NetBSD: distinfo,v 1.23 2010/06/17 00:44:01 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) = 1e056c17d103694309f2b5b20e7a5686586aba1a
+SHA1 (patch-as) = f68cbd77b2308c0cdfb9fc45bcc264bc04072b83
 SHA1 (patch-at) = aaeddf2240f1b0e394ab78122352c111f3aa9718
 SHA1 (patch-au) = e8f556ac27ba9a22731b8e7c37356a64eb115860
 SHA1 (patch-av) = 53c963ac1b5f1963f707228badeaf0d57b159344
diff --git a/print/teTeX3-bin/patches/patch-as b/print/teTeX3-bin/patches/patch-as
index 54082fe64ee..daed7a2a949 100644
--- a/print/teTeX3-bin/patches/patch-as
+++ b/print/teTeX3-bin/patches/patch-as
@@ -1,6 +1,6 @@
-$NetBSD: patch-as,v 1.8 2010/01/28 21:37:35 minskim Exp $
+$NetBSD: patch-as,v 1.9 2010/06/17 00:44:01 minskim Exp $
 
---- texk/tetex/Makefile.in.orig	2005-02-04 14:20:54.000000000 -0800
+--- texk/tetex/Makefile.in.orig	2005-02-04 22:20:54.000000000 +0000
 +++ texk/tetex/Makefile.in
 @@ -8,26 +8,21 @@ ac_include ../make/programs.mk
  man5dir = $(mandir)/man5
@@ -66,10 +66,13 @@ $NetBSD: patch-as,v 1.8 2010/01/28 21:37: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 +45,6 @@ install-data:: $(INFOFILES)
- 	for p in TETEXDOC.pdf TETEXDOC.ps TETEXDOC.dvi teTeX-FAQ; do \
- 	  $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/doc/tetex; \
+@@ -71,17 +42,6 @@ install-data:: $(INFOFILES)
+ 	for p in $(POOLFILES); do \
+ 	  $(INSTALL_DATA) $(srcdir)/$$p $(texpooldir)/$$p; \
  	done
+-	for p in TETEXDOC.pdf TETEXDOC.ps TETEXDOC.dvi teTeX-FAQ; do \
+-	  $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/doc/tetex; \
+-	done
 -	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/texconfig $(texmf)/texconfig/g $(texmf)/texconfig/v $(texmf)/texconfig/x
 -	$(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g
 -	$(INSTALL_DATA) $(srcdir)/texmf/texconfig/v/vt100 $(texmf)/texconfig/v
@@ -81,7 +84,7 @@ $NetBSD: patch-as,v 1.8 2010/01/28 21:37:35 minskim Exp $
  
  install-exec:
  	-$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
-@@ -96,16 +59,10 @@ install-exec:
+@@ -96,16 +56,10 @@ install-exec:
  	else \
  	  true; \
  	fi