- Replace teTeX's LaTeX macro with TeX Live's version.

- Use UTF-8 hyphenation patterns, which can be used with luatex.
- Create symlinks for TeX formats explicitly.

Bump PKGREVISION for teTeX-texmf and teTeX-bin.

5 files changed, 11 insertions, 75 deletions

diff --git a/print/teTeX3-bin/DEINSTALL b/print/teTeX3-bin/DEINSTALL
deleted file mode 100644
index 95ce06556d9..00000000000
--- a/print/teTeX3-bin/DEINSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2006/04/06 14:39:11 jlam Exp $
-
-case ${STAGE} in
-DEINSTALL)
-	${TEST} ! -x ./+TETEX || ./+TETEX REMOVE
-	;;
-esac
diff --git a/print/teTeX3-bin/INSTALL b/print/teTeX3-bin/INSTALL
deleted file mode 100644
index f6cd7a049c8..00000000000
--- a/print/teTeX3-bin/INSTALL
+++ /dev/null
@@ -1,62 +0,0 @@
-# $NetBSD: INSTALL,v 1.12 2009/02/23 20:12:19 minskim Exp $
-
-PATH="@PREFIX@"/bin:"${PATH}"
-export PATH
-
-case "${STAGE}" in
-POST-INSTALL)
-	${TEST} ! -x ./+TETEX || ./+TETEX ADD
-	;;
-esac
-
-#
-# Generate a +TETEX script that updates the teTeX installation
-# based on user-modifiable configuration files.
-#
-case "${STAGE},$1" in
-UNPACK,|UNPACK,+TETEX)
-	${CAT} > ./+TETEX << 'EOF'
-#!@SH@
-#
-# +TETEX - teTeX installation update script
-#
-# Usage: ./+TETEX ADD|REMOVE
-
-CAT="@CAT@"
-ECHO="@ECHO@"
-GREP="@GREP@"
-RM="@RM@"
-RMDIR="@RMDIR@"
-TEST="@TEST@"
-TRUE="@TRUE@"
-
-SELF=$0
-ACTION=$1
-: ${PKG_PREFIX=@PREFIX@}
-
-TEXMF_DISTDATADIR="${PKG_PREFIX}/share/texmf-dist"
-TEXMF_DATADIR="${PKG_PREFIX}/share/texmf"
-TEXMF_LOCALDATADIR="${PKG_PREFIX}/share/texmf-local"
-TEXMF_VARDIR="@VARBASE@/lib/texmf"
-
-exitcode=0
-case $ACTION in
-ADD)
-	# Update teTeX installation to support different TeX formats.
-	${TEST} ! -x ${PKG_PREFIX}/bin/texlinks ||
-		${PKG_PREFIX}/bin/texlinks
-	;;
-
-REMOVE)
-	@MKTEXLSR@ ${TEXMF_VARDIR} @PKG_SYSCONFBASE@/texmf
-	;;
-
-*)
-	${ECHO} "Usage: ./+TETEX ADD|REMOVE [metadatadir]"
-	;;
-esac
-exit $exitcode
-EOF
-	${CHMOD} +x ./+TETEX
-	;;
-esac
diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile
index 73917e86c78..70c983ac058 100644
--- a/print/teTeX3-bin/Makefile
+++ b/print/teTeX3-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2009/04/14 07:48:59 minskim Exp $
+# $NetBSD: Makefile,v 1.46 2009/04/15 09:19:45 minskim Exp $
 
 DISTNAME=	tetex-src-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=	31
+PKGREVISION=	32
 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+=	tex-bin-latex-[0-9]*:../../print/tex-bin-latex
 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
@@ -79,7 +80,10 @@ 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 mpost ${DESTDIR}${PREFIX}/bin/metafun
+	${LN} -sf omega ${DESTDIR}${PREFIX}/bin/lambda
+	${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
 
diff --git a/print/teTeX3-bin/PLIST b/print/teTeX3-bin/PLIST
index 8db794a9f2d..e5ea71ab494 100644
--- a/print/teTeX3-bin/PLIST
+++ b/print/teTeX3-bin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/04/14 07:48:59 minskim Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/04/15 09:19:45 minskim Exp $
 bin/a2ping
 bin/dvihp
 bin/dvilj
@@ -11,9 +11,12 @@ bin/epstopdf
 bin/fdf2tan
 bin/fdf2tex
 bin/gsftopk
+bin/lambda
+bin/lamed
 bin/mag
 bin/makeindex
 bin/makempy
+bin/metafun
 bin/mkindex
 bin/mptopdf
 bin/pdfcrop
diff --git a/print/teTeX3-bin/files/format.tetex.cnf b/print/teTeX3-bin/files/format.tetex.cnf
index b134f4cc153..ff88f21915e 100644
--- a/print/teTeX3-bin/files/format.tetex.cnf
+++ b/print/teTeX3-bin/files/format.tetex.cnf
@@ -35,8 +35,6 @@ mpost		mpost		-		-translate-file=cp227.tcx mpost.mp
 metafun		mpost		-		-translate-file=cp227.tcx metafun.mp
 
 # Standard formats (plain, latex) with all engines:
-latex		pdftex		language.dat	-translate-file=cp227.tcx *latex.ini
-pdflatex	pdftex		language.dat	-translate-file=cp227.tcx *pdflatex.ini
 omega		omega		-	omega.ini
 lambda		omega		language.dat	lambda.ini
 aleph		aleph		-		*aleph.ini