Rectify USE_TEX to support both of teTeX and TeXLive.

TEX_DEFAULT:
	A knob to choose teTeX or TeXLive.  One can specify in /etc/make.conf.

USE_TEX:
	A knob for port developers.  Valid keywords are listed in
	bsd.tex.mk.

20 files changed, 22 insertions, 25 deletions

diff --git a/textproc/bibtool/Makefile b/textproc/bibtool/Makefile
index 36888919bfc6..431e6e2a0596 100644
--- a/textproc/bibtool/Makefile
+++ b/textproc/bibtool/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	BibTool-${PORTVERSION}
 MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	Command line manipulation of BibTeX files
 
-USE_TEX=	tetex
+USE_TEX=	latex:build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-kpathsea
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
diff --git a/textproc/dblatex/Makefile b/textproc/dblatex/Makefile
index cce02efa8ad3..8fc47c24d9f1 100644
--- a/textproc/dblatex/Makefile
+++ b/textproc/dblatex/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
 		${LOCALBASE}/share/xml/docbook/4.2/docbook.cat:${PORTSDIR}/textproc/docbook-xml
 
 USE_BZIP2=	yes
-USE_TEX=	tetex
+USE_TEX=	tex
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=yes
 PYDISTUTILS_INSTALLARGS=	-c -O1 --prefix=${PREFIX} \
diff --git a/textproc/ecromedos/Makefile b/textproc/ecromedos/Makefile
index e9f938838a58..926884488a02 100644
--- a/textproc/ecromedos/Makefile
+++ b/textproc/ecromedos/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 
 NO_BUILD=	yes
 USE_PYTHON=	yes
-USE_TEX=	tetex
+USE_TEX=	latex
 
 FIND_DIRS=	-type d
 FIND_DATA=	-type f -not \( -name "*.orig" -or -name "*.bak" \)
diff --git a/textproc/eqe/Makefile b/textproc/eqe/Makefile
index 7ab8df49b3a8..4970320acd28 100644
--- a/textproc/eqe/Makefile
+++ b/textproc/eqe/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
-USE_TEX=	tetex
+USE_TEX=	tex
 
 MAKE_ARGS=	PREFIX=${PREFIX}
 
diff --git a/textproc/foiltex/Makefile b/textproc/foiltex/Makefile
index cb9512367dc9..0b57a2bac76b 100644
--- a/textproc/foiltex/Makefile
+++ b/textproc/foiltex/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A collection of LaTeX files for making foils
 
 NO_CDROM=	redistribution on a not-for-profit basis only
 
-USE_TEX=	tetex
+USE_TEX=	latex
 NO_WRKSUBDIR=	yes
 
 LATEX_CMD=	${LOCALBASE}/bin/latex
diff --git a/textproc/gastex/Makefile b/textproc/gastex/Makefile
index f8e333d66cda..5f8c41dd49fd 100644
--- a/textproc/gastex/Makefile
+++ b/textproc/gastex/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	#
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphs and Automata Simplified in TeX
 
-USE_TEX=	tetex
+USE_TEX=	latex
 NO_BUILD=	yes
 
 TEXMFDIR?=	share/texmf
diff --git a/textproc/gladtex/Makefile b/textproc/gladtex/Makefile
index 0593e143a51d..de0d4a1d4197 100644
--- a/textproc/gladtex/Makefile
+++ b/textproc/gladtex/Makefile
@@ -15,9 +15,8 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	gif:${PORTSDIR}/graphics/giflib \
 		png15:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	dvips:${PORTSDIR}/print/dvipsk-tetex
 
-USE_TEX=	tetex
+USE_TEX=	latex dvipsk
 BINPATH=	${PREFIX}/bin
 INCPATH=	"-I${LOCALBASE}/include"
 LIBPATH=	"-L${LOCALBASE}/lib"
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index c2686f0b71cf..b969a05429a3 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 
 CABAL_SETUP=	Setup.hs
 USE_CABAL=	mtl regex-compat
-USE_TEX=	tetex
+USE_TEX=	latex
 
 STANDALONE=	yes
 EXECUTABLE=	lhs2TeX
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index 461644a293cc..8b6f2b47ffa2 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -23,7 +23,7 @@ CONFLICTS=	ja-latex2html-[0-9]*
 
 USE_PERL5=		yes
 USE_GHOSTSCRIPT=	yes
-USE_TEX=		tetex
+USE_TEX=		latex dvipsk
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=	--with-perl=${PERL} \
 		--disable-gif \
diff --git a/textproc/metauml/Makefile b/textproc/metauml/Makefile
index 035751714e70..339c17ff61c9 100644
--- a/textproc/metauml/Makefile
+++ b/textproc/metauml/Makefile
@@ -24,7 +24,7 @@ COMMENT=	A MetaPost library for typesetting UML diagrams
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/thrunk/License
 
-USE_TEX=	tetex
+USE_TEX=	latex
 PLIST_SUB=	TEXMFDIR=${TEXMFDIR} MKTEXLSR=${MKTEXLSR} MPDIR=${MPDIR}
 
 TEXMFDIR=	share/texmf
diff --git a/textproc/p5-LaTeX-Driver/Makefile b/textproc/p5-LaTeX-Driver/Makefile
index d9634dc76221..7be9bf27eaf3 100644
--- a/textproc/p5-LaTeX-Driver/Makefile
+++ b/textproc/p5-LaTeX-Driver/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
 		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_TEX=	tetex
+USE_TEX=	latex
 PERL_CONFIGURE=	yes
 
 MAN1=	latex2ps.1 latex2pdf.1 latex2dvi.1
diff --git a/textproc/ppower4/Makefile b/textproc/ppower4/Makefile
index f6153528b83f..e0d8b99e7c63 100644
--- a/textproc/ppower4/Makefile
+++ b/textproc/ppower4/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Post processor for PDF presentations made with (La)TeX
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_ZIP=	yes
-USE_TEX=	tetex
+USE_TEX=	latex
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/textproc/prosper/Makefile b/textproc/prosper/Makefile
index b19b817917ab..1c511d9621ca 100644
--- a/textproc/prosper/Makefile
+++ b/textproc/prosper/Makefile
@@ -19,7 +19,7 @@ COMMENT=	LaTeX class for writing transparencies
 
 NO_BUILD=	yes
 USE_GHOSTSCRIPT_RUN=	yes
-USE_TEX=	tetex
+USE_TEX=	latex
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile
index a97bc9b54334..02075fc9a5b4 100644
--- a/textproc/rubber/Makefile
+++ b/textproc/rubber/Makefile
@@ -20,7 +20,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_PYTHON=	2.5+
 USE_GMAKE=	yes
-USE_TEX=	tetex
+USE_TEX=	latex
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --infodir=${PREFIX}/${INFO_PATH} \
 		--datadir=${PYTHON_SITELIBDIR}
diff --git a/textproc/sgmltools-lite/Makefile b/textproc/sgmltools-lite/Makefile
index 2112a0c4523c..d2d7b08ce81d 100644
--- a/textproc/sgmltools-lite/Makefile
+++ b/textproc/sgmltools-lite/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS+=	docbook<2:${PORTSDIR}/textproc/docbook \
 		${LOCALBASE}/share/sgml/docbook/dsssl:${PORTSDIR}/textproc/dsssl-docbook-modular
 
 USE_PYTHON_BUILD=	yes
-USE_TEX=	tetex
+USE_TEX=	latex:build
 MAN1=		sgmltools-lite.1
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-etcsgml=${PREFIX}/etc/sgml --datadir=${PREFIX}/share
diff --git a/textproc/sowing/Makefile b/textproc/sowing/Makefile
index 60ca0ccda63e..8036c127007d 100644
--- a/textproc/sowing/Makefile
+++ b/textproc/sowing/Makefile
@@ -15,13 +15,12 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Text processing tools to generate documentation from source files
 
 BUILD_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
-RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm	\
-		dvips:${PORTSDIR}/print/dvipsk-tetex
+RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
 
 USE_PERL5=	yes
 USE_GHOSTSCRIPT=yes
 USE_GMAKE=	yes
-USE_TEX=	tetex
+USE_TEX=	latex dvipsk
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 CONFIGURE_ARGS=	--datadir=${DATADIR}
diff --git a/textproc/tex2im/Makefile b/textproc/tex2im/Makefile
index 57152e78e946..58ff9bb092b8 100644
--- a/textproc/tex2im/Makefile
+++ b/textproc/tex2im/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Converts LaTeX formulas into high resolution pixmap graphics
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick \
 		bash:${PORTSDIR}/shells/bash
 
-USE_TEX=	tetex
+USE_TEX=	latex
 NO_BUILD=	yes
 PLIST_FILES=	bin/tex2im
 PORTEXAMPLES=	example1.png example1.tex example2.png example2.tex \
diff --git a/textproc/textogif/Makefile b/textproc/textogif/Makefile
index c18c4ce67a40..82ac05d57024 100644
--- a/textproc/textogif/Makefile
+++ b/textproc/textogif/Makefile
@@ -16,11 +16,10 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A Perl script to convert LaTeX formulas into GIFs
 
-RUN_DEPENDS=	dvips:${PORTSDIR}/print/dvipsk-tetex \
-		ppmtogif:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
 
 NO_BUILD=	yes
-USE_TEX=	tetex
+USE_TEX=	latex dvipsk
 USE_PERL5_RUN=	yes
 
 do-install:
diff --git a/textproc/tth/Makefile b/textproc/tth/Makefile
index dd60cf4bf39f..0cb99f7e573f 100644
--- a/textproc/tth/Makefile
+++ b/textproc/tth/Makefile
@@ -20,7 +20,7 @@ COMMENT=	A TeX to HTML translator
 RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
 
 USE_GHOSTSCRIPT_RUN=	yes
-USE_TEX=	tetex
+USE_TEX=	latex
 
 MAN1=		tth.1
 
diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile
index 4943bb1a42a6..9e552c468bed 100644
--- a/textproc/yodl/Makefile
+++ b/textproc/yodl/Makefile
@@ -41,7 +41,7 @@ PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .if !defined(NOPORTDOCS)
-USE_TEX=	tetex
+USE_TEX=	latex:build dvipsk:build
 .endif
 
 post-patch: