aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.tex.mk201
-rw-r--r--arabic/arabtex/Makefile2
-rw-r--r--astro/pp3/Makefile2
-rw-r--r--chinese/cwtex/Makefile2
-rw-r--r--comms/gnuradio/Makefile2
-rw-r--r--deskutils/etask/Makefile5
-rw-r--r--deskutils/tomboy-plugin-latex/Makefile2
-rw-r--r--devel/avr-libc/Makefile2
-rw-r--r--devel/doxygen/Makefile2
-rw-r--r--devel/gdcm/Makefile2
-rw-r--r--devel/meta-cvs/Makefile2
-rw-r--r--devel/ml-doc/Makefile2
-rw-r--r--devel/ocamlweb/Makefile2
-rw-r--r--devel/ragel/Makefile2
-rw-r--r--devel/simulavr/Makefile2
-rw-r--r--devel/tex-kpathsea/Makefile1
-rw-r--r--editors/kile-kde4/Makefile2
-rw-r--r--editors/kile/Makefile2
-rw-r--r--editors/texmacs/Makefile2
-rw-r--r--editors/texmaker/Makefile5
-rw-r--r--editors/texmakerx/Makefile5
-rw-r--r--editors/winefish/Makefile2
-rw-r--r--editors/zim/Makefile2
-rw-r--r--graphics/epix/Makefile5
-rw-r--r--graphics/evince/Makefile2
-rw-r--r--graphics/gle-graphics/Makefile2
-rw-r--r--graphics/ipe/Makefile2
-rw-r--r--graphics/kdegraphics3/Makefile2
-rw-r--r--graphics/klatexformula/Makefile5
-rw-r--r--graphics/l2p/Makefile5
-rw-r--r--graphics/okular/Makefile2
-rw-r--r--graphics/py-PyX/Makefile2
-rw-r--r--japanese/dvipsk/Makefile2
-rw-r--r--japanese/platex-japanese/Makefile5
-rw-r--r--japanese/platex-jsclasses/Makefile4
-rw-r--r--japanese/ptex/Makefile2
-rw-r--r--japanese/teTeX/Makefile14
-rw-r--r--japanese/texfamily-vfn2a/Makefile2
-rw-r--r--japanese/texfamily/Makefile2
-rw-r--r--japanese/xdvik/Makefile2
-rw-r--r--korean/ko.TeX-fonts-base/Makefile2
-rw-r--r--korean/ko.TeX-fonts-extra/Makefile2
-rw-r--r--korean/ko.TeX/Makefile2
-rw-r--r--lang/hope/Makefile2
-rw-r--r--lang/logo/Makefile2
-rw-r--r--lang/mlton/Makefile2
-rw-r--r--lang/twelf/Makefile2
-rw-r--r--math/R/Makefile2
-rw-r--r--math/asymptote/Makefile6
-rw-r--r--math/coq/Makefile2
-rw-r--r--math/eukleides/Makefile2
-rw-r--r--math/giacxcas/Makefile5
-rw-r--r--math/gnuplot/Makefile2
-rw-r--r--math/naturalmath/Makefile2
-rw-r--r--math/petsc/Makefile2
-rw-r--r--math/sage/Makefile2
-rw-r--r--misc/latex-mk/Makefile2
-rw-r--r--net-im/pidgin-latex/Makefile2
-rw-r--r--net-mgmt/netmagis-common/Makefile2
-rw-r--r--print/abntex/Makefile2
-rw-r--r--print/auctex/Makefile2
-rw-r--r--print/bophook/Makefile2
-rw-r--r--print/catdvi/Makefile2
-rw-r--r--print/cjk-lyx/Makefile5
-rw-r--r--print/cm-super/Makefile2
-rw-r--r--print/dvipdfmx/Makefile2
-rw-r--r--print/dvipsk-tetex/Makefile2
-rw-r--r--print/dvisvg/Makefile2
-rw-r--r--print/examplep/Makefile2
-rw-r--r--print/freetype-tools/Makefile2
-rw-r--r--print/hyperlatex/Makefile2
-rw-r--r--print/ifxetex/Makefile2
-rw-r--r--print/jadetex/Makefile2
-rw-r--r--print/latex-aastex/Makefile4
-rw-r--r--print/latex-acm/Makefile2
-rw-r--r--print/latex-arydshln/Makefile2
-rw-r--r--print/latex-auto-greek/Makefile2
-rw-r--r--print/latex-beamer/Makefile2
-rw-r--r--print/latex-biblatex/Makefile2
-rw-r--r--print/latex-biblist/Makefile2
-rw-r--r--print/latex-bytefield/Makefile2
-rw-r--r--print/latex-caption/Makefile2
-rw-r--r--print/latex-chapterfolder/Makefile2
-rw-r--r--print/latex-circ/Makefile2
-rw-r--r--print/latex-cjk/Makefile2
-rw-r--r--print/latex-csquotes/Makefile2
-rw-r--r--print/latex-etoolbox/Makefile2
-rw-r--r--print/latex-feynmf/Makefile2
-rw-r--r--print/latex-keystroke/Makefile2
-rw-r--r--print/latex-logpap/Makefile2
-rw-r--r--print/latex-logreq/Makefile2
-rw-r--r--print/latex-ltablex/Makefile2
-rw-r--r--print/latex-mathabx/Makefile2
-rw-r--r--print/latex-nomencl/Makefile2
-rw-r--r--print/latex-pgf/Makefile2
-rw-r--r--print/latex-prettyref/Makefile2
-rw-r--r--print/latex-resume/Makefile2
-rw-r--r--print/latex-subfloat/Makefile2
-rw-r--r--print/latex-supertabular/Makefile2
-rw-r--r--print/latex-svninfo/Makefile2
-rw-r--r--print/latex-timing/Makefile2
-rw-r--r--print/latex-tipa/Makefile2
-rw-r--r--print/latex-ucs/Makefile2
-rw-r--r--print/latex2slides/Makefile2
-rw-r--r--print/latexmk/Makefile2
-rw-r--r--print/lgrind/Makefile2
-rw-r--r--print/lilypond-devel/Makefile2
-rw-r--r--print/lilypond/Makefile2
-rw-r--r--print/mftrace/Makefile2
-rw-r--r--print/muttprint/Makefile2
-rw-r--r--print/pdfjam/Makefile2
-rw-r--r--print/py-pyscript/Makefile4
-rw-r--r--print/sgf2tex/Makefile2
-rw-r--r--print/teTeX/Makefile12
-rw-r--r--print/tex-mfpic/Makefile2
-rw-r--r--print/tex-omegaware-old/Makefile2
-rw-r--r--print/texlive-base/Makefile1
-rw-r--r--print/texlive-texmf/Makefile4
-rw-r--r--print/texvc/Makefile5
-rw-r--r--print/typetools/Makefile2
-rw-r--r--print/xdvik/Makefile2
-rw-r--r--print/xmltex/Makefile2
-rw-r--r--print/xtexsh/Makefile2
-rw-r--r--russian/pscyr/Makefile2
-rw-r--r--science/abinit/Makefile5
-rw-r--r--science/ecs/Makefile2
-rw-r--r--science/mpqc/Makefile2
-rw-r--r--science/ncs/Makefile2
-rw-r--r--security/libtomcrypt/Makefile2
-rw-r--r--textproc/bibtool/Makefile2
-rw-r--r--textproc/dblatex/Makefile2
-rw-r--r--textproc/ecromedos/Makefile2
-rw-r--r--textproc/eqe/Makefile2
-rw-r--r--textproc/foiltex/Makefile2
-rw-r--r--textproc/gastex/Makefile2
-rw-r--r--textproc/gladtex/Makefile3
-rw-r--r--textproc/hs-lhs2tex/Makefile2
-rw-r--r--textproc/latex2html/Makefile2
-rw-r--r--textproc/metauml/Makefile2
-rw-r--r--textproc/p5-LaTeX-Driver/Makefile2
-rw-r--r--textproc/ppower4/Makefile2
-rw-r--r--textproc/prosper/Makefile2
-rw-r--r--textproc/rubber/Makefile2
-rw-r--r--textproc/sgmltools-lite/Makefile2
-rw-r--r--textproc/sowing/Makefile5
-rw-r--r--textproc/tex2im/Makefile2
-rw-r--r--textproc/textogif/Makefile5
-rw-r--r--textproc/tth/Makefile2
-rw-r--r--textproc/yodl/Makefile2
-rw-r--r--vietnamese/vntex/Makefile2
-rw-r--r--www/trac-math/Makefile2
-rw-r--r--www/twiki-MathModePlugin/Makefile2
152 files changed, 262 insertions, 313 deletions
diff --git a/Mk/bsd.tex.mk b/Mk/bsd.tex.mk
index dae5613f19e6..e52b0b31321d 100644
--- a/Mk/bsd.tex.mk
+++ b/Mk/bsd.tex.mk
@@ -5,59 +5,51 @@
TEX_MAINTAINER= hrs@FreeBSD.org
#
-# For ports which depend on TeX:
-# USE_TEX= yes
-# Note that teTeX or TeXLive is used based on $TEX_DEFAULT, and full version
-# of the packages will be installed as the dependency.
-#
-# For full teTeX dependency:
-# USE_TEX= tetex
-#
-# For full TeXLive dependency:
-# USE_TEX= texlive
+# Ports which depend on TeX should use USE_TEX.
#
-# The other valid keywords:
+# USE_TEX= yes
+# imports variables only, and
+# USE_TEX= full
+# means full teTeX or TeXLive dependency.
#
-# tetex-base: teTeX base
-# tetex-texmf: teTeX texmf tree
+# The other valid keywords (* means TeXLive specific):
#
-# web2c: WEB2C toolchain and TeX engines
-# kpathsea: kpathsea library
-# ptexenc: character code conversion library for pTeX
+# base: base part
+# texmf: texmf tree
#
-# base: TeXLive base
-# texmf: TeXLive texmf tree
-# infra: tlmgr dependency (Perl modules)
+# web2c: WEB2C toolchain and TeX engines[*]
+# kpathsea: kpathsea library[*]
+# ptexenc: character code conversion library for pTeX[*]
+# infra: tlmgr dependency (Perl modules)[*]
#
# dvipsk: dvipsk
# dvipdfmx: DVIPDFMx
# xdvik: XDvi
#
# formats: TeX, LaTeX, PDFTeX, AMSTeX, ConTeXT, CSLaTeX, EplainTeX,
-# METAFONT, MLTeX, PDFTeX, TeXsis
-# aleph: Aleph
+# METAFONT, MLTeX, PDFTeX, TeXsis[*]
+# tex: TeX
+# latex: LaTeX
+# aleph: Aleph[*]
# jadetex: JadeTeX
-# luatex: LuaTeX
+# luatex: LuaTeX[*]
# ptex: pTeX
-# xetex: XeTeX
+# xetex: XeTeX[*]
# xmltex: XMLTeX
#
# texhash: directory search hash regeneration
-# updmap: font map regeneration
-# fmtutil: format regeneration
+# updmap: font map regeneration[*]
+# fmtutil: format regeneration[*]
#
+# Examples:
+# USE_TEX= latex:build
+# USE_TEX= formats:run
+# USE_TEX= latex:build dvips:build
# default TeX distribution. "tetex" or "texlive"
TEX_DEFAULT?= tetex
#TEX_DEFAULT?= texlive
-# normalize
-TEX_DEFAULT:= ${TEX_DEFAULT:L}
-
-.if defined(USE_TEX) && !empty(USE_TEX:M[Yy][Ee][Ss])
-USE_TEX:= ${TEX_DEFAULT}
-.endif
-
TEXMFDIR?= share/texmf
TEXMFDISTDIR?= share/texmf-dist
TEXMFLOCALDIR?= share/texmf-local
@@ -79,100 +71,87 @@ CONFLICTS_TETEX= \
teTeX-*-[0-9]* *-teTeX-*-[0-9]* \
latex2e-[0-9]*
-.if !empty(USE_TEX:Mtetex-texmf) || !empty(USE_TEX:Mtetex)
-_USE_TETEX_TEXMF= ${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf
+.if !empty(TEX_DEFAULT:U:MTETEX)
CONFLICTS_INSTALL+= ${CONFLICTS_TEXLIVE}
+.elif !empty(TEX_DEFAULT:U:MTEXLIVE)
+CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
+.else
+.error malformed TEX_DEFAULT: ${TEX_DEFAULT}
.endif
-.if !empty(USE_TEX:Mtetex-base) || !empty(USE_TEX:Mtetex)
+
+_TEX_LABEL:= ${TEX_DEFAULT:U:S/TEXLIVE/TEX/}
+
+_USE_TETEX_TEXMF= ${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf
+_USE_TEX_TEXMF= ${LOCALBASE}/${TEXMFDISTDIR}/README:${PORTSDIR}/print/texlive-texmf
+
_USE_TETEX_BASE= mktexlsr:${PORTSDIR}/print/teTeX-base
-CONFLICTS_INSTALL+= ${CONFLICTS_TEXLIVE}
-.endif
-.if !empty(USE_TEX:Mtetex-dvipsk) || !empty(USE_TEX:Mtetex)
+_USE_TEX_BASE= tlmgr:${PORTSDIR}/print/texlive-base
+
+_USE_TEX_INFRA= ${SITE_PERL}/TeXLive/TLConfig.pm:${PORTSDIR}/print/texlive-infra
+
_USE_TETEX_DVIPSK= dvips:${PORTSDIR}/print/dvipsk-tetex
-CONFLICTS_INSTALL+= ${CONFLICTS_TEXLIVE}
-.endif
+_USE_TEX_DVIPSK= dvips:${PORTSDIR}/print/tex-dvipsk
-.if !empty(USE_TEX:Mweb2c) || !empty(USE_TEX:Mtexlive)
-_USE_TEX_WEB2C= weave:${PORTSDIR}/devel/tex-web2c
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.endif
-.if !empty(USE_TEX:Mjadetex) || !empty(USE_TEX:Mtexlive)
+_USE_TETEX_XDVIK= xdvi:${PORTSDIR}/print/xdvik
+_USE_TEX_XDVIK= xdvi:${PORTSDIR}/print/tex-xdvik
+
+_USE_TETEX_DVIPDFMX= dvipdfmx:${PORTSDIR}/print/dvipdfmx
+_USE_TEX_DVIPDFMX= dvipdfmx:${PORTSDIR}/print/tex-dvipdfmx
+
+_USE_TETEX_TEX= ${_USE_TETEX_BASE} ${_USE_TETEX_TEXMF}
+_USE_TEX_TEX= ${_USE_TEX_FORMATS}
+
+_USE_TETEX_LATEX= ${_USE_TETEX_BASE} ${_USE_TETEX_TEXMF}
+_USE_TEX_LATEX= ${_USE_TEX_FORMATS}
+
+_USE_TETEX_JADETEX= jadetex:${PORTSDIR}/print/jadetex
_USE_TEX_JADETEX= jadetex:${PORTSDIR}/print/tex-jadetex
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.endif
-.if !empty(USE_TEX:Mxmltex) || !empty(USE_TEX:Mtexlive)
+
+_USE_TETEX_XMLTEX= xmltex:${PORTSDIR}/print/xmltex
_USE_TEX_XMLTEX= xmltex:${PORTSDIR}/print/tex-xmltex
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.endif
-.if !empty(USE_TEX:Mluatex) || !empty(USE_TEX:Mtexlive)
-_USE_TEX_LUATEX= luatex:${PORTSDIR}/print/tex-luatex
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.endif
-.if !empty(USE_TEX:Mxetex) || !empty(USE_TEX:Mtexlive)
-_USE_TEX_XETEX= xetex:${PORTSDIR}/print/tex-xetex
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.endif
-.if !empty(USE_TEX:Maleph) || !empty(USE_TEX:Mtexlive)
-_USE_TEX_ALEPH= aleph:${PORTSDIR}/print/tex-aleph
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.endif
-.if !empty(USE_TEX:Mptex) || !empty(USE_TEX:Mtexlive)
+
+_USE_TETEX_PTEX= ptex:${PORTSDIR}/japanese/ptex
_USE_TEX_PTEX= ptex:${PORTSDIR}/japanese/tex-ptex
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.endif
-.if !empty(USE_TEX:Mkpathsea) || !empty(USE_TEX:Mtexlive)
+
+_USE_TEX_WEB2C= weave:${PORTSDIR}/devel/tex-web2c
_USE_TEX_KPATHSEA= kpathsea:${PORTSDIR}/devel/tex-kpathsea
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.endif
-.if !empty(USE_TEX:Mptexenc) || !empty(USE_TEX:Mtexlive)
_USE_TEX_PTEXENC= ptexenc:${PORTSDIR}/print/tex-ptexenc
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.endif
-.if !empty(USE_TEX:Mdvipsk) || !empty(USE_TEX:Mtexlive)
-_USE_TEX_DVIPSK= dvips:${PORTSDIR}/print/tex-dvipsk
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.endif
-.if !empty(USE_TEX:Mxdvik) || !empty(USE_TEX:Mtexlive)
-_USE_TEX_XDVIK= xdvi:${PORTSDIR}/print/tex-xdvik
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.endif
-.if !empty(USE_TEX:Mxdvipdfmx) || !empty(USE_TEX:Mtexlive)
-_USE_TEX_DVIPDFMX= dvipdfmx:${PORTSDIR}/print/tex-dvipdfmx
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.endif
-.if !empty(USE_TEX:Mbase) || !empty(USE_TEX:Mtexlive)
-_USE_TEXLIVE_BASE= tlmgr:${PORTSDIR}/print/texlive-base
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.endif
-.if !empty(USE_TEX:Mtexmf) || !empty(USE_TEX:Mtexlive)
-_USE_TEXLIVE_TEXMF= ${LOCALBASE}/${TEXMFDISTDIR}/README:${PORTSDIR}/print/texlive-texmf
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.endif
-.if !empty(USE_TEX:Mformats) || !empty(USE_TEX:Mtexlive)
_USE_TEX_FORMATS= ${LOCALBASE}/${TEXMFVARDIR}/web2c/tex/tex.fmt:${PORTSDIR}/print/tex-formats
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.endif
-.if !empty(USE_TEX:Minfra) || !empty(USE_TEX:Mtexlive)
-_USE_TEXLIVE_INFRA= ${SITE_PERL}/TeXLive/TLConfig.pm:${PORTSDIR}/print/texlive-infra
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.endif
+_USE_TEX_ALEPH= aleph:${PORTSDIR}/print/tex-aleph
+_USE_TEX_LUATEX= luatex:${PORTSDIR}/print/tex-luatex
+_USE_TEX_XETEX= xetex:${PORTSDIR}/print/tex-xetex
-.for D in TETEX_TEXMF TETEX_BASE TETEX_DVIPSK \
- TEXLIVE_BASE TEX_WEB2C TEXLIVE_TEXMF TEXLIVE_INFRA \
- TEX_FORMATS TEX_ALEPH TEX_JADETEX TEX_XMLTEX TEX_LUATEX \
- TEX_XETEX TEX_PTEX TEX_XDVIK TEX_DVIPSK TEX_DVIPDFMX
-RUN_DEPENDS+= ${_USE_${D}}
-.endfor
-.for D in TETEX_TEXMF TETEX_BASE TETEX_DVIPSK \
- TEXLIVE_BASE TEX_WEB2C TEXLIVE_TEXMF \
- TEX_FORMATS TEX_ALEPH TEX_JADETEX TEX_XMLTEX TEX_LUATEX \
- TEX_XETEX TEX_PTEX
-BUILD_DEPENDS+= ${_USE_${D}}
+.for D in TEXMF BASE \
+ DVIPSK DVIPDFMX XDVIK XMLTEX JADETEX
+_USE_TETEX_FULL+= ${_USE_TETEX_${D}}
.endfor
-.for D in TEX_KPATHSEA TEX_PTEXENC
-LIB_DEPENDS+= ${_USE_${D}}
+.for D in TEXMF BASE WEB2C KPATHSEA PTEXENC INFRA \
+ FORMATS ALEPH XETEX JADETEX LUATEX XMLTEX PTEX \
+ DVIPSK DVIPDFMX XDVIK
+_USE_TEX_FULL+= ${_USE_TEX_${D}}
.endfor
+.if !empty(USE_TEX:U:MFULL)
+BUILD_DEPENDS+= ${_USE_${_TEX_LABEL}_FULL}
+RUN_DEPENDS+= ${_USE_${_TEX_LABEL}_FULL}
+.else
+. for _UU in ${USE_TEX:U}
+_U:= ${_UU} # ugly but necessary in for loop
+. if !empty(_U:MKPATHSEA) || !empty(_U:MPTEXENC)
+_C:= LIB
+. else
+. if empty(_U:M*\:*)
+_C:= BUILD RUN
+. else
+_C:= ${_U:C/.*://}
+. endif
+. endif
+. for _CC in ${_C}
+${_CC}_DEPENDS+=${_USE_${_TEX_LABEL}_${_UU:C/:.*$//}}
+. endfor
+. endfor
+.endif
+
.ORDER: do-texhash do-fmtutil do-updmap
.if !empty(USE_TEX:Mtexhash) || !empty(USE_TEX:Mfmtutil) || !empty(USE_TEX:Mupdmap)
diff --git a/arabic/arabtex/Makefile b/arabic/arabtex/Makefile
index c044aec4a52d..1a1376a1554a 100644
--- a/arabic/arabtex/Makefile
+++ b/arabic/arabtex/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= nivit@FreeBSD.org
COMMENT= TeX/LaTeX package to generate Arabic writing
-USE_TEX= tetex
+USE_TEX= base texmf
NO_WRKSUBDIR= yes
NO_BUILD= yes
PLIST_SUB= MKTEXLSR=${MKTEXLSR}
diff --git a/astro/pp3/Makefile b/astro/pp3/Makefile
index 030593952868..aa777556cd05 100644
--- a/astro/pp3/Makefile
+++ b/astro/pp3/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Creates celestial charts
USE_BZIP2= yes
-USE_TEX= tetex
+USE_TEX= latex
.include <bsd.port.options.mk>
diff --git a/chinese/cwtex/Makefile b/chinese/cwtex/Makefile
index e31d3d455912..23776c505992 100644
--- a/chinese/cwtex/Makefile
+++ b/chinese/cwtex/Makefile
@@ -16,7 +16,7 @@ DISTFILES= cwtexmain.tgz cwtexbin-${PORTVERSION}.tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= CwTeX let you use Chinese Big5 codes in TeX/LaTeX documents
-USE_TEX= tetex
+USE_TEX= latex
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index a046667ed6d1..49a66ae9ad78 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -51,7 +51,7 @@ TESTING_DESC= Include testing support
PLIST_SUB+= PORTVERSION=${PORTVERSION}
.if ${PORT_OPTIONS:MDOCS}
-USE_TEX= tetex
+USE_TEX= latex:build
BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \
${LOCALBASE}/bin/sphinx-apidoc:${PORTSDIR}/textproc/py-sphinx \
dot:${PORTSDIR}/graphics/graphviz \
diff --git a/deskutils/etask/Makefile b/deskutils/etask/Makefile
index 992c8ddda741..3b6584f95004 100644
--- a/deskutils/etask/Makefile
+++ b/deskutils/etask/Makefile
@@ -15,13 +15,12 @@ MASTER_SITES= http://members.chello.at/rene.weichselbaum/ \
MAINTAINER= dryice@dryice.name
COMMENT= Manage your projects or tasks within GNU Emacs
-RUN_DEPENDS= dvips:${PORTSDIR}/print/dvipsk-tetex \
- xpdf:${PORTSDIR}/graphics/xpdf
+RUN_DEPENDS= xpdf:${PORTSDIR}/graphics/xpdf
USE_EMACS= yes
EMACS_PORT_NAME?= emacs21
USE_GHOSTSCRIPT_RUN= yes
-USE_TEX= tetex
+USE_TEX= latex dvipsk
.if ${EMACS_PORT_NAME} != "emacs21"
PORTNAMESUFFIX= ${PKGNAMESUFFIX}
diff --git a/deskutils/tomboy-plugin-latex/Makefile b/deskutils/tomboy-plugin-latex/Makefile
index 28e1169db180..51d39b298bf5 100644
--- a/deskutils/tomboy-plugin-latex/Makefile
+++ b/deskutils/tomboy-plugin-latex/Makefile
@@ -20,6 +20,6 @@ RUN_DEPENDS= tomboy:${PORTSDIR}/deskutils/tomboy
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_TEX= tetex
+USE_TEX= latex
.include <bsd.port.mk>
diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index 468fe7725732..dee83f179142 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -37,7 +37,7 @@ WITHOUT_AVRLIBCDOCS= true
.endif
.if defined(WITH_AVRLIBCDOCS)
-USE_TEX= tetex
+USE_TEX= latex:build
BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \
fig2dev:${PORTSDIR}/print/transfig \
jpegtopnm:${PORTSDIR}/graphics/netpbm
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 354266d1d65f..465defb99d87 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -52,7 +52,7 @@ BUILD_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz
.if ${PORT_OPTIONS:MPDFDOCS}
ALL_TARGET+= pdf
-USE_TEX= tetex
+USE_TEX= latex:build
USE_GHOSTSCRIPT_BUILD= yes
MAKE_ARGS+= HAVE_PDFDOCS=yes
.endif # PDFDOCS
diff --git a/devel/gdcm/Makefile b/devel/gdcm/Makefile
index 68a0ae4d2b87..7ebcedd489a2 100644
--- a/devel/gdcm/Makefile
+++ b/devel/gdcm/Makefile
@@ -51,7 +51,7 @@ PLIST_SUB+= GDCM_MAJ="${GDCM_MAJ}" \
GDCM_SO="${GDCM_SO}"
.if ${PORT_OPTIONS:MDOCS}
-USE_TEX= tetex
+USE_TEX= latex:build
USE_GHOSTSCRIPT= yes
BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen
CMAKE_ARGS+= -DGDCM_DOCUMENTATION:BOOL=YES \
diff --git a/devel/meta-cvs/Makefile b/devel/meta-cvs/Makefile
index 8b189eb2db73..583f4d03e719 100644
--- a/devel/meta-cvs/Makefile
+++ b/devel/meta-cvs/Makefile
@@ -37,7 +37,7 @@ PORTDOCS= Meta-CVS-PAPER \
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MPDFDOC} && !defined(NOPORTDOCS)
-USE_TEX= tetex
+USE_TEX= latex:build
PORTDOCS+= meta-cvs.pdf
.endif
diff --git a/devel/ml-doc/Makefile b/devel/ml-doc/Makefile
index 967760493c71..5f73094a7bb8 100644
--- a/devel/ml-doc/Makefile
+++ b/devel/ml-doc/Makefile
@@ -40,7 +40,7 @@ LATEX_DESC= Install LaTeX if necessary (needed for pdf output)
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MLATEX}
-USE_TEX= tetex
+USE_TEX= latex
.endif
post-extract:
diff --git a/devel/ocamlweb/Makefile b/devel/ocamlweb/Makefile
index 7922bd1ff2e8..c80e2f0de9f4 100644
--- a/devel/ocamlweb/Makefile
+++ b/devel/ocamlweb/Makefile
@@ -18,7 +18,7 @@ COMMENT= A literate programming tool for Objective Caml
BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
-USE_TEX= tetex
+USE_TEX= latex
GNU_CONFIGURE= yes
PLIST_SUB+= TEXMFDIR=${TEXMFDIR} \
MKTEXLSR=${MKTEXLSR}
diff --git a/devel/ragel/Makefile b/devel/ragel/Makefile
index 64915578b934..68a39f722ff5 100644
--- a/devel/ragel/Makefile
+++ b/devel/ragel/Makefile
@@ -23,7 +23,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
-USE_TEX= tetex
+USE_TEX= latex:build
CONFIGURE_ARGS+= --enable-manual
BUILD_DEPENDS+= fig2dev:${PORTSDIR}/print/transfig
PLIST_SUB+= DOCS=""
diff --git a/devel/simulavr/Makefile b/devel/simulavr/Makefile
index bce4cafb22e0..8aa556ded04b 100644
--- a/devel/simulavr/Makefile
+++ b/devel/simulavr/Makefile
@@ -25,7 +25,7 @@ BUILD_DEPENDS= ${LOCALBASE}/avr/include/avr/io.h:${PORTSDIR}/devel/avr-libc \
BROKEN= does not package
#USE_BZIP2= yes
-USE_TEX= tetex
+USE_TEX= latex:build
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/tex-kpathsea/Makefile b/devel/tex-kpathsea/Makefile
index dc4be0cdfc45..b39d4a7e77a4 100644
--- a/devel/tex-kpathsea/Makefile
+++ b/devel/tex-kpathsea/Makefile
@@ -15,6 +15,7 @@ COMMENT= Path searching library for TeX
USE_XZ= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
+USE_TEX= yes
EXTRACT_AFTER_ARGS= ${EXTRACT_FILES}
EXTRACT_FILES= ${DISTNAME}/build-aux \
${DISTNAME}/texk/kpathsea
diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile
index 61e22d9c4485..e0e3aa91aa0e 100644
--- a/editors/kile-kde4/Makefile
+++ b/editors/kile-kde4/Makefile
@@ -15,7 +15,7 @@ USE_BZIP2= yes
USES= cmake
USE_QT4= qmake_build moc_build rcc_build uic_build
USE_KDE4= kdeprefix kdelibs automoc4 sharedmime kate_run
-USE_TEX= tetex
+USE_TEX= latex
MAKE_JOBS_SAFE= yes
LATEST_LINK= ${PORTNAME}-kde4
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 30971f56e73f..f7e7fd202ec6 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -26,7 +26,7 @@ USE_KDELIBS_VER=3
USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
-USE_TEX= tetex
+USE_TEX= latex
OPTIONS_DEFINE= KPDF
OPTIONS_DEFAULT= KPDF
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index 73b6b4feb145..37d83613c659 100644
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= guile.21:${PORTSDIR}/lang/guile
MAKE_JOBS_SAFE= yes
USE_PYTHON= yes
-USE_TEX= tetex
+USE_TEX= tex
USE_GMAKE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index 64349c5886f8..402eedf182a9 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -12,14 +12,13 @@ COMMENT= LaTeX Development Environment
LIB_DEPENDS= poppler:${PORTSDIR}/graphics/poppler \
poppler-qt4:${PORTSDIR}/graphics/poppler-qt4
-RUN_DEPENDS= dvips:${PORTSDIR}/print/dvipsk-tetex \
- ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
USE_BZIP2= yes
USE_GHOSTSCRIPT=yes
USE_QT4= gui network xml webkit \
moc_build qmake_build rcc_build uic_build
-USE_TEX= tetex
+USE_TEX= latex dvipsk
HAS_CONFIGURE= yes
QMAKE_ARGS= PREFIX=${PREFIX} ICONDIR=${PREFIX}/share/pixmaps \
DESKTOPDIR=${DESKTOPDIR}
diff --git a/editors/texmakerx/Makefile b/editors/texmakerx/Makefile
index ec80b909cb76..b44e0fd7f554 100644
--- a/editors/texmakerx/Makefile
+++ b/editors/texmakerx/Makefile
@@ -13,15 +13,14 @@ COMMENT= A LaTeX IDE derived from Texmaker
LIB_DEPENDS= poppler:${PORTSDIR}/graphics/poppler \
poppler-qt4:${PORTSDIR}/graphics/poppler-qt4
-RUN_DEPENDS= dvips:${PORTSDIR}/print/dvipsk-tetex \
- ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}
USE_GHOSTSCRIPT=yes
USE_QT4= gui network xml moc_build qmake_build rcc_build \
uic_build qtestlib script
-USE_TEX= tetex
+USE_TEX= latex dvipsk
HAS_CONFIGURE= yes
INSTALLS_ICONS= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/editors/winefish/Makefile b/editors/winefish/Makefile
index 6038adddfed4..2c83788c3bf6 100644
--- a/editors/winefish/Makefile
+++ b/editors/winefish/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --with-freedesktop_org-menu=${GNOME_LOCALSTATEDIR}/applications
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= libgnomeui desktopfileutils gnomehier
-USE_TEX= tetex
+USE_TEX= latex
OPTIONS_DEFINE= CONTEXT VNTEX UNIKEY_GTK NLS DOCS
CONTEXT_DESC= ConTexT support (Experimental)
diff --git a/editors/zim/Makefile b/editors/zim/Makefile
index bda8fa7140d2..0690923c4dcc 100644
--- a/editors/zim/Makefile
+++ b/editors/zim/Makefile
@@ -38,7 +38,7 @@ DITAA_DESC= Diagram editor support
RUN_DEPENDS+= R:${PORTSDIR}/math/R
.endif
.if ${PORT_OPTIONS:MLATEX}
-USE_TEX= tetex
+USE_TEX= latex
.endif
.if ${PORT_OPTIONS:MGRAPHVIZ}
RUN_DEPENDS+= fdp:${PORTSDIR}/graphics/graphviz
diff --git a/graphics/epix/Makefile b/graphics/epix/Makefile
index 098739fd0ac8..b6f58ea7fbb8 100644
--- a/graphics/epix/Makefile
+++ b/graphics/epix/Makefile
@@ -18,13 +18,12 @@ COMMENT= Creates math plots and line figures using easy-to-learn syntax
LICENSE= GPLv2 # (or later)
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= dvips:${PORTSDIR}/print/dvipsk-tetex \
- latex-pgf>=0:${PORTSDIR}/print/latex-pgf \
+BUILD_DEPENDS= latex-pgf>=0:${PORTSDIR}/print/latex-pgf \
bash:${PORTSDIR}/shells/bash
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
USE_BZIP2= yes
-USE_TEX= tetex
+USE_TEX= latex dvipsk:build
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-bash=${LOCALBASE}/bin/bash \
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index e7681b702716..2bf0f7e163d9 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -55,7 +55,7 @@ DJVU_DESC= DJVU support
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDVI} || ${PORT_OPTIONS:MT1LIB}
-USE_TEX= tetex
+USE_TEX= latex
CONFIGURE_ARGS+= --enable-dvi
GCONF_SCHEMAS+= evince-thumbnailer-dvi.schemas
diff --git a/graphics/gle-graphics/Makefile b/graphics/gle-graphics/Makefile
index 7c6fc4e008c4..b6952e80d8f4 100644
--- a/graphics/gle-graphics/Makefile
+++ b/graphics/gle-graphics/Makefile
@@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --with-jpeg=no --with-png=no -with-tiff=no
.if ${PORT_OPTIONS:MLATEX_GS}
USE_GHOSTSCRIPT_RUN= yes
-USE_TEX= tetex
+USE_TEX= latex
.endif
.if ${PORT_OPTIONS:MX11}
diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile
index fd2e6ec9a1eb..85e4ab286e4c 100644
--- a/graphics/ipe/Makefile
+++ b/graphics/ipe/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
USES= pkgconfig
USE_QT4= gui moc_build qmake_build rcc_build uic_build
-USE_TEX= tetex-base
+USE_TEX= latex
USE_GMAKE= yes
MAKE_ENV= DLL_CFLAGS="-fPIC" \
ICONV_CFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 8f5c62ef215c..22b784e0c402 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -34,7 +34,7 @@ PREFIX= ${KDE_PREFIX}
USE_GL= glut
USE_BZIP2= yes
-USE_TEX= tetex
+USE_TEX= latex:build
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --without-poppler
USE_GMAKE= yes
diff --git a/graphics/klatexformula/Makefile b/graphics/klatexformula/Makefile
index ec4b4eb03466..355d21fd42c0 100644
--- a/graphics/klatexformula/Makefile
+++ b/graphics/klatexformula/Makefile
@@ -14,12 +14,11 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= Convert LaTeX formula to image
-RUN_DEPENDS= dvips:${PORTSDIR}/print/dvipsk-tetex \
- ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
USE_QT4= gui xml dbus designer_build \
qmake_build moc_build rcc_build uic_build
-USE_TEX= tetex
+USE_TEX= latex dvipsk
HAS_CONFIGURE= yes
USE_GHOSTSCRIPT= yes
QMAKE_ARGS= QMAKE=${QMAKE} INSTALLPREFIX=${PREFIX} \
diff --git a/graphics/l2p/Makefile b/graphics/l2p/Makefile
index 2e3862dcdc17..b46d029fa730 100644
--- a/graphics/l2p/Makefile
+++ b/graphics/l2p/Makefile
@@ -15,12 +15,11 @@ MASTER_SITES= http://www.redsymbol.net/software/l2p/dist/ \
MAINTAINER= nivit@FreeBSD.org
COMMENT= Create PNG images from LaTeX math expressions
-RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick \
- dvips:${PORTSDIR}/print/dvipsk-tetex
+RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick
USE_PERL5_RUN= yes
USE_ZIP= yes
-USE_TEX= tetex
+USE_TEX= latex dvipsk
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
index c0b11b9fac27..1e4a29403fe3 100644
--- a/graphics/okular/Makefile
+++ b/graphics/okular/Makefile
@@ -38,7 +38,7 @@ DVI_DESC= Support DVI files (requires teTeX)
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDVI}
-USE_TEX= tetex
+USE_TEX= latex
.endif
.include <bsd.port.mk>
diff --git a/graphics/py-PyX/Makefile b/graphics/py-PyX/Makefile
index b421e0d2d40d..e776ac4eeb1e 100644
--- a/graphics/py-PyX/Makefile
+++ b/graphics/py-PyX/Makefile
@@ -14,7 +14,7 @@ LICENSE= GPLv2
USE_PYTHON= 2.5+
USE_PYDISTUTILS=yes
-USE_TEX= tetex
+USE_TEX= latex:build
OPTIONS_DEFINE= T1CODE KPATHSEA
OPTIONS_DEFAULT= T1CODE KPATHSEA
diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile
index 171121939b4b..6fdacb749dbd 100644
--- a/japanese/dvipsk/Makefile
+++ b/japanese/dvipsk/Makefile
@@ -38,7 +38,7 @@ PLIST_SUB= DVIPSDIR=${DVIPSDIR} \
TEXMFCONFIGDIR=${TEXMFCONFIGDIR} \
FONTSMAPDIR=${FONTSMAPDIR} \
UPDMAP_SYS="${UPDMAP_SYS}"
-USE_TEX= tetex
+USE_TEX= base texmf
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-multiplatform \
diff --git a/japanese/platex-japanese/Makefile b/japanese/platex-japanese/Makefile
index db79b2b6129c..4898c7eeb928 100644
--- a/japanese/platex-japanese/Makefile
+++ b/japanese/platex-japanese/Makefile
@@ -18,11 +18,10 @@ DIST_SUBDIR= latex
MAINTAINER= yokota@res.otaru-uc.ac.jp
COMMENT= pLaTeX package that literally provides Japanese option to babel
-BUILD_DEPENDS= ptex:${PORTSDIR}/japanese/ptex \
- iconv:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
USE_ZIP= yes
-USE_TEX= tetex
+USE_TEX= latex ptex
TEXMFDIR= share/texmf
STYDIR= tex/generic/babel
diff --git a/japanese/platex-jsclasses/Makefile b/japanese/platex-jsclasses/Makefile
index 9d9724251e3a..24fb6312bdd9 100644
--- a/japanese/platex-jsclasses/Makefile
+++ b/japanese/platex-jsclasses/Makefile
@@ -17,10 +17,8 @@ DISTFILES= ${PORTNAME}-${PORTVERSION:S/^1.0.20//}${EXTRACT_SUFX}:0 \
MAINTAINER= hrs@FreeBSD.org
COMMENT= New document class files for pLaTeX
-RUN_DEPENDS= ptex:${PORTSDIR}/japanese/ptex
-
USE_ZIP= YES
-USE_TEX= tetex
+USE_TEX= latex ptex
NO_BUILD= YES
PLIST_SUB= CLASSDIR=${CLASSDIR} TFMDIR=${TFMDIR} \
PLDIR=${PLDIR} MKTEXLSR=${MKTEXLSR} \
diff --git a/japanese/ptex/Makefile b/japanese/ptex/Makefile
index a3d8bdde389a..84aa408b9152 100644
--- a/japanese/ptex/Makefile
+++ b/japanese/ptex/Makefile
@@ -31,7 +31,7 @@ CONFLICTS_INSTALL= \
tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]*
-USE_TEX= tetex
+USE_TEX= base texmf
GNU_CONFIGURE= yes
CONFIGURE_ARGS= ${KANJICODE}
CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
diff --git a/japanese/teTeX/Makefile b/japanese/teTeX/Makefile
index 52e5840518fa..ef61077d1e18 100644
--- a/japanese/teTeX/Makefile
+++ b/japanese/teTeX/Makefile
@@ -11,19 +11,13 @@ EXTRACT_ONLY= # empty
MAINTAINER= hrs@FreeBSD.org
COMMENT= A meta port for teTeX suite for Japanese (including pTeX and JTeX)
-RUN_DEPENDS= ptex:${PORTSDIR}/japanese/ptex \
- dvips:${PORTSDIR}/japanese/dvipsk \
- jtex:${PORTSDIR}/japanese/texfamily \
+RUN_DEPENDS= jtex:${PORTSDIR}/japanese/texfamily \
${JTEXVF}:${PORTSDIR}/japanese/texfamily-vfn2a
+
+USE_TEX= base texmf dvipsk ptex
.if !defined(WITHOUT_X11)
-RUN_DEPENDS+= xdvi:${PORTSDIR}/japanese/xdvik
+USE_TEX+= xdvik
.endif
-
-CONFLICTS= texlive-[0-9]* tex-web2c-[0-9]* \
- tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
- tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]*
-
-USE_TEX= tetex
JTEXVF= ${LOCALBASE}/share/texmf-local/fonts/vf/n2a/dmjsy5.vf
TEXMFLOCAL_LSR= ${LOCALBASE}/share/texmf-local/ls-R
TEXMFDISTDIR= share/texmf-dist
diff --git a/japanese/texfamily-vfn2a/Makefile b/japanese/texfamily-vfn2a/Makefile
index dc66d64859ae..107b733da7c4 100644
--- a/japanese/texfamily-vfn2a/Makefile
+++ b/japanese/texfamily-vfn2a/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/${TEXMFDIR}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/jap
RUN_DEPENDS= ${LOCALBASE}/${TEXMFDIR}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex \
jtex:${PORTSDIR}/japanese/texfamily
-USE_TEX= tetex
+USE_TEX= base texmf
MAKE_ENV= JTEXTFMDIR=${LOCALBASE}/${TEXMFLOCALDIR}/fonts/tfm/muling/nttsub \
PTEXTFMDIR=${LOCALBASE}/${TEXMFDIR}/fonts/tfm/ptex
diff --git a/japanese/texfamily/Makefile b/japanese/texfamily/Makefile
index 47f2afda8d5c..2256afe458d0 100644
--- a/japanese/texfamily/Makefile
+++ b/japanese/texfamily/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
wwwcore.1:${PORTSDIR}/www/libwww \
t1.5:${PORTSDIR}/devel/t1lib
-USE_TEX= tetex
+USE_TEX= base texmf
USE_GCC= any
GNU_CONFIGURE= yes
CONFIGURE_ARGS= ${KANJICODE}
diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 6cc91be25b28..e5ca45b56519 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
t1.5:${PORTSDIR}/devel/t1lib
DIST_SUBDIR= xdvik
-USE_TEX= tetex
+USE_TEX= base texmf
USE_GMAKE= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS= --datadir=${PREFIX}/${TEXMFDIR:S,texmf$,,} \
diff --git a/korean/ko.TeX-fonts-base/Makefile b/korean/ko.TeX-fonts-base/Makefile
index 646faf049065..7e96849e965a 100644
--- a/korean/ko.TeX-fonts-base/Makefile
+++ b/korean/ko.TeX-fonts-base/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ko.tex-unfonts-base-20070927
MAINTAINER= hyogeollee@gmail.com
COMMENT= Korean TeX base fonts
-USE_TEX= tetex
+USE_TEX= latex
CONFLICTS= hlatex-[0-9]*
NO_WRKSUBDIR= yes
diff --git a/korean/ko.TeX-fonts-extra/Makefile b/korean/ko.TeX-fonts-extra/Makefile
index 43f9ed74eadf..b1aa79592b7b 100644
--- a/korean/ko.TeX-fonts-extra/Makefile
+++ b/korean/ko.TeX-fonts-extra/Makefile
@@ -15,7 +15,7 @@ DISTFILES= ko.tex-extra-hlfont.tar.gz ko.tex-unfonts-extra.tar.gz
MAINTAINER= hyogeollee@gmail.com
COMMENT= Korean TeX extra fonts
-USE_TEX= tetex
+USE_TEX= latex
CONFLICTS= hlatex-[0-9]*
NO_WRKSUBDIR= yes
diff --git a/korean/ko.TeX/Makefile b/korean/ko.TeX/Makefile
index 01859ea5236b..06eca1757942 100644
--- a/korean/ko.TeX/Makefile
+++ b/korean/ko.TeX/Makefile
@@ -17,7 +17,7 @@ COMMENT= Korean TeX macro and utilities
RUN_DEPENDS= ${BASE_MAP}:${PORTSDIR}/korean/ko.TeX-fonts-base
-USE_TEX= tetex
+USE_TEX= latex
CONFLICTS= hlatex-[0-9]*
NO_WRKSUBDIR= yes
diff --git a/lang/hope/Makefile b/lang/hope/Makefile
index a4f6bd4e9e36..5ac0f9dbe5b0 100644
--- a/lang/hope/Makefile
+++ b/lang/hope/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= lev@FreeBSD.org
COMMENT= Hope is lazy interpreter for HOPE applicative language
.if defined(WITH_DOCS)
-USE_TEX= tetex
+USE_TEX= latex:build
BUILD_DEPENDS+= latex2html:${PORTSDIR}/textproc/latex2html
MAKE_ARGS+= WITH_DOCS=yes
.else
diff --git a/lang/logo/Makefile b/lang/logo/Makefile
index c2c9b88aebf6..c9d7a0948230 100644
--- a/lang/logo/Makefile
+++ b/lang/logo/Makefile
@@ -21,7 +21,7 @@ USE_EMACS= yes
.if defined(WITH_FULL_DOCS)
.undef NOPORTDOCS
-USE_TEX= tetex
+USE_TEX= tex:build
USE_GHOSTSCRIPT=yes
.endif
diff --git a/lang/mlton/Makefile b/lang/mlton/Makefile
index 6f085de7a9b3..121595774eba 100644
--- a/lang/mlton/Makefile
+++ b/lang/mlton/Makefile
@@ -32,7 +32,7 @@ OPTIONS= SMLNJ "Bootstrap with SML/NJ (can take >15 hours)" off \
.if !defined(NOPORTDOCS)
BUILD_DEPENDS+= gsed:${PORTSDIR}/textproc/gsed \
htmldoc:${PORTSDIR}/textproc/htmldoc
-USE_TEX= tetex
+USE_TEX= latex:build
.else
INSTALL_TARGET= install-no-docs
ALL_TARGET= all-no-docs
diff --git a/lang/twelf/Makefile b/lang/twelf/Makefile
index c7b2c8599a25..51f0328f0e9f 100644
--- a/lang/twelf/Makefile
+++ b/lang/twelf/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS= sml:${PORTSDIR}/lang/sml-nj
BUILD_DEPENDS= sml:${PORTSDIR}/lang/sml-nj
.endif
-USE_TEX= tetex
+USE_TEX= tex:build
.if defined(WITH_MLTON)
MAKEFILE= mlton/Makefile
diff --git a/math/R/Makefile b/math/R/Makefile
index 517118169667..b64dea7c1dbb 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -244,7 +244,7 @@ INFO= R-FAQ R-admin R-data R-exts R-intro R-lang
.if ${PORT_OPTIONS:MPDF_MANUALS} && ${PORT_OPTIONS:MDOCS}
BROKEN = The PDF_MANUALS option cannot be used, because\
print/texinfo is incompatible with print/teTeX-base
-USE_TEX= tetex
+USE_TEX= tex:build
BUILD_DEPENDS += texi2dvi:${PORTSDIR}/print/texinfo
ALL_TARGET+= pdf
CONFIGURE_ENV += INSTALL_INFO="${LOCALBASE}/bin/install-info" \
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index e37895f25c59..a31b98e27552 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386 amd64
CONFIGURE_ARGS= --disable-gc
USE_GHOSTSCRIPT=yes
-USE_TEX= tetex
+USE_TEX= latex
USE_GL= glut
USE_GMAKE= yes
USE_PERL5_BUILD= yes
@@ -80,11 +80,9 @@ INSTALL_TARGET+= install-man
#.if ${PORT_OPTIONS:MMANPAGES} || ${PORT_OPTIONS:MDOCS}
# teTeX is too old to compile the asymptote documentation
.if 0
+USE_TEX+= dvipsk:build
BUILD_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick \
- dvips:${PORTSDIR}/print/dvipsk-tetex \
- latex:${PORTSDIR}/print/teTeX-base \
makeinfo:${PORTSDIR}/textproc/texi2html \
- ${MKTEXLSR}:${PORTSDIR}/print/teTeX-base \
svn:${PORTSDIR}/devel/subversion \
texi2dvi:${PORTSDIR}/print/texinfo
.endif
diff --git a/math/coq/Makefile b/math/coq/Makefile
index a2191926c16c..8034e71fa3c7 100644
--- a/math/coq/Makefile
+++ b/math/coq/Makefile
@@ -36,7 +36,7 @@ MAN1= coq-tex.1 coq_makefile.1 coqc.1 coqchk.1 coqdep.1 coqdoc.1 \
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
-USE_TEX= tetex
+USE_TEX= latex:build
BUILD_DEPENDS+= hevea:${PORTSDIR}/textproc/hevea \
${LOCALBASE}/share/texmf/tex/latex/ucs/utf8x.def:${PORTSDIR}/print/latex-ucs
PORTDOCS= *
diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index 5701d54e9d0f..2fbf03d706f6 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= readline.6:${PORTSDIR}/devel/readline
RUN_DEPENDS= pstoedit:${PORTSDIR}/graphics/pstoedit
USE_BZIP2= yes
-USE_TEX= tetex
+USE_TEX= latex
USES= bison gettext iconv
USE_GMAKE= yes
diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile
index 3d372be0c960..de64e6d9d0ce 100644
--- a/math/giacxcas/Makefile
+++ b/math/giacxcas/Makefile
@@ -14,8 +14,7 @@ COMMENT= Computer algebra system by Bernard Parisse
LICENSE= GPLv3
-BUILD_DEPENDS= dvips:${PORTSDIR}/print/dvipsk-tetex \
- bash:${PORTSDIR}/shells/bash \
+BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl
LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp \
pari:${PORTSDIR}/math/pari \
@@ -29,7 +28,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GL= gl
USE_XORG= xcursor xft xi
-USE_TEX= tetex
+USE_TEX= latex:build dvipsk:build
USE_LDCONFIG= yes
USES= gettext
MAKE_JOBS_SAFE= yes
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 61e06c263b23..5a82812b92e3 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -68,7 +68,7 @@ CONFIGURE_ARGS+= --without-plot
.endif
.if ${PORT_OPTIONS:MTETEX}
-USE_TEX= tetex
+USE_TEX= base texmf latex
CONFIGURE_ARGS+= --with-kpsexpand \
--with-texdir=${LOCALBASE}/share/texmf/tex/latex/gnuplot
PLIST_SUB+= TETEX=""
diff --git a/math/naturalmath/Makefile b/math/naturalmath/Makefile
index 471d5b23578e..28b6aee842df 100644
--- a/math/naturalmath/Makefile
+++ b/math/naturalmath/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= stephen@FreeBSD.org
COMMENT= Script to turn intuitively written math into latex
USE_PERL5= yes
-USE_TEX= tetex
+USE_TEX= latex:build
post-patch:
@${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/naturalmath
diff --git a/math/petsc/Makefile b/math/petsc/Makefile
index 8e9fd552838a..1ff2de37803c 100644
--- a/math/petsc/Makefile
+++ b/math/petsc/Makefile
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+= --with-umfpack-include="${LOCALBASE}/include/suitesparse" \
.if !defined(NOPORTDOCS)
PORTDOCS= *
-#USE_TEX= tetex
+#USE_TEX= latex:build
#BUILD_DEPENDS+= c2html:${PORTSDIR}/textproc/c2html \
# doc2lt:${PORTSDIR}/textproc/sowing
.endif
diff --git a/math/sage/Makefile b/math/sage/Makefile
index a3eadedaee0a..03d725d5dea4 100644
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -32,7 +32,7 @@ USE_FORTRAN= yes
USE_GCC= 4.7+
USE_TK= yes
USE_GMAKE= yes
-USE_TEX= tetex
+USE_TEX= latex:build
USES= iconv
MAKE_JOBS_SAFE= yes
LDFLAGS:= -Wl,-rpath=${WRKSRC}/local/lib ${LDFLAGS}
diff --git a/misc/latex-mk/Makefile b/misc/latex-mk/Makefile
index d0119d10bacc..5a98248292f8 100644
--- a/misc/latex-mk/Makefile
+++ b/misc/latex-mk/Makefile
@@ -18,7 +18,7 @@ COMMENT= A collection of makefile and scripts for LaTeX documents
BUILD_DEPENDS= texi2dvi:${PORTSDIR}/print/texinfo
RUN_DEPENDS= texi2dvi:${PORTSDIR}/print/texinfo
-USE_TEX= tetex
+USE_TEX= latex
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net-im/pidgin-latex/Makefile b/net-im/pidgin-latex/Makefile
index 410c7991a330..e09e9dba1491 100644
--- a/net-im/pidgin-latex/Makefile
+++ b/net-im/pidgin-latex/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= pidgin:${PORTSDIR}/net-im/pidgin \
WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
CFLAGS+= "-fPIC"
-USE_TEX= tetex
+USE_TEX= latex
USE_GMAKE= yes
USE_GNOME= gtk20
USE_BZIP2= yes
diff --git a/net-mgmt/netmagis-common/Makefile b/net-mgmt/netmagis-common/Makefile
index bc39f040aa80..e32265badd0b 100644
--- a/net-mgmt/netmagis-common/Makefile
+++ b/net-mgmt/netmagis-common/Makefile
@@ -28,7 +28,7 @@ USE_PGSQL+= server pltcl
.if ${PKGNAMESUFFIX} == -www
USE_APACHE= 22+
-USE_TEX= tetex
+USE_TEX= tex
RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz \
pwgen:${PORTSDIR}/sysutils/pwgen \
${LOCALBASE}/libexec/apache22/mod_auth_pgsql.so:${PORTSDIR}/www/mod_auth_pgsql2
diff --git a/print/abntex/Makefile b/print/abntex/Makefile
index 00ba1f6eece9..e49389940a93 100644
--- a/print/abntex/Makefile
+++ b/print/abntex/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Both classes and styles for both LaTex and bibtex for ABNT rules
-USE_TEX= tetex
+USE_TEX= latex
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
NO_BUILD= yes
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index eeeee03a32ec..de3d49c2e355 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -14,7 +14,7 @@ COMMENT= Integrated environment for writing LaTeX using GNU Emacs
LICENSE= GPLv3
-USE_TEX= tetex
+USE_TEX= latex
USE_GHOSTSCRIPT=yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-lispdir=${PREFIX}/${LISPDIR} \
diff --git a/print/bophook/Makefile b/print/bophook/Makefile
index ce3bc10162b0..e69562df8599 100644
--- a/print/bophook/Makefile
+++ b/print/bophook/Makefile
@@ -16,7 +16,7 @@ COMMENT= Style file providing a beginning-of-page hook for LaTeX
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_ZIP= yes
-USE_TEX= tetex
+USE_TEX= latex
PLIST= ${WRKDIR}/pkg-plist
diff --git a/print/catdvi/Makefile b/print/catdvi/Makefile
index 4664f83c4138..2961ffa68227 100644
--- a/print/catdvi/Makefile
+++ b/print/catdvi/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A DVI to text/plain translator
-USE_TEX= tetex
+USE_TEX= latex
USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKEFILE= GNUmakefile
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 875cf1345dfb..a82a6050a506 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -81,10 +81,9 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
# Choose appropriate settings for each LaTeX
.if ${PORT_OPTIONS:MJATETEX}
-BUILD_DEPENDS+= latex:${PORTSDIR}/japanese/teTeX
-RUN_DEPENDS+= latex:${PORTSDIR}/japanese/teTeX
+USE_TEX= ptex
.else
-USE_TEX= tetex
+USE_TEX= latex
.endif
.include <bsd.port.mk>
diff --git a/print/cm-super/Makefile b/print/cm-super/Makefile
index 7402e75e186c..781a5862f88f 100644
--- a/print/cm-super/Makefile
+++ b/print/cm-super/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
.endif
USE_ZIP= yes
-USE_TEX= tetex
+USE_TEX= base texmf
WRKSRC= ${WRKDIR}/${PORTNAME}
.if !defined(WITHOUT_X11)
diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index 72497e914f2a..2c28cdfc05f3 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
paper:${PORTSDIR}/print/libpaper
RUN_DEPENDS= ${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
-USE_TEX= tetex
+USE_TEX= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --datadir=${LOCALBASE}/share
MAKE_JOBS_SAFE= yes
diff --git a/print/dvipsk-tetex/Makefile b/print/dvipsk-tetex/Makefile
index 71da46e724e1..9aa68a4038e8 100644
--- a/print/dvipsk-tetex/Makefile
+++ b/print/dvipsk-tetex/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
wwwcore.1:${PORTSDIR}/www/libwww \
t1.5:${PORTSDIR}/devel/t1lib
-USE_TEX= tetex-base tetex-texmf
+USE_TEX= base texmf
PLIST_SUB= TEXMFDIR=${TEXMFDIR} \
TEXMFDISTDIR=${TEXMFDISTDIR} \
TEXMFCONFIGDIR=${TEXMFCONFIGDIR} \
diff --git a/print/dvisvg/Makefile b/print/dvisvg/Makefile
index 5fc6d69a150a..51f91e5b30b1 100644
--- a/print/dvisvg/Makefile
+++ b/print/dvisvg/Makefile
@@ -17,7 +17,7 @@ COMMENT= Converter from DVI to SVG
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
USE_GHOSTSCRIPT_RUN= yes
-USE_TEX= tetex
+USE_TEX= base texmf
ALL_TARGET= # empty
# workaround for svgfonts.c not including kpathsea/c-auto.h
CFLAGS+= -DHAVE_PROTOTYPES
diff --git a/print/examplep/Makefile b/print/examplep/Makefile
index 948b65f83d8c..ced9e89e1137 100644
--- a/print/examplep/Makefile
+++ b/print/examplep/Makefile
@@ -16,7 +16,7 @@ COMMENT= LaTeX style files for typesetting verbatim source code listings
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_ZIP= yes
-USE_TEX= tetex
+USE_TEX= latex
PLIST= ${WRKDIR}/pkg-plist
diff --git a/print/freetype-tools/Makefile b/print/freetype-tools/Makefile
index 3d90e28f3914..db5191003513 100644
--- a/print/freetype-tools/Makefile
+++ b/print/freetype-tools/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= ttf.4:${PORTSDIR}/print/freetype
RUN_DEPENDS= t1asm:${PORTSDIR}/print/t1utils
BUILD_DEPENDS:= ${RUN_DEPENDS}
-USE_TEX= tetex
+USE_TEX= base texmf
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-nls --enable-static --enable-shared
diff --git a/print/hyperlatex/Makefile b/print/hyperlatex/Makefile
index e81386c32bd5..6d3c320f8bdc 100644
--- a/print/hyperlatex/Makefile
+++ b/print/hyperlatex/Makefile
@@ -16,7 +16,7 @@ COMMENT= Produce HTML and printed documents from LaTeX source
RUN_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm
-USE_TEX= tetex
+USE_TEX= latex
USE_EMACS= yes
EMACS_PORT_NAME?= emacs21
diff --git a/print/ifxetex/Makefile b/print/ifxetex/Makefile
index 80413d4420b5..11666a5b94d8 100644
--- a/print/ifxetex/Makefile
+++ b/print/ifxetex/Makefile
@@ -17,7 +17,7 @@ COMMENT= The file ifxetex.sty tests whether XeTeX is being used
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_ZIP= yes
-USE_TEX= tetex
+USE_TEX= latex
PLIST= ${WRKDIR}/pkg-plist
diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile
index fe3e29ac859a..3f8ea9863384 100644
--- a/print/jadetex/Makefile
+++ b/print/jadetex/Makefile
@@ -16,7 +16,7 @@ COMMENT= A TeX backend for Jade, for typesetting SGML documents
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
-USE_TEX= tetex
+USE_TEX= tex
MAKE_JOBS_UNSAFE= yes
MAKE_ENV= TEXMFCNF=${FILESDIR}:${TEXMFDIR}/web2c
diff --git a/print/latex-aastex/Makefile b/print/latex-aastex/Makefile
index 68e5daf82192..5d4cced6ffe6 100644
--- a/print/latex-aastex/Makefile
+++ b/print/latex-aastex/Makefile
@@ -16,10 +16,8 @@ DIST_SUBDIR= latex
MAINTAINER= yokota@res.otaru-uc.ac.jp
COMMENT= LaTeX class for American Astronomical Society (AAS) journals
-BUILD_DEPENDS= dvips:${PORTSDIR}/print/dvipsk-tetex
-
USE_GHOSTSCRIPT=yes
-USE_TEX= tetex
+USE_TEX= latex dvipsk
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/print/latex-acm/Makefile b/print/latex-acm/Makefile
index 06e275d51961..1dd616953a50 100644
--- a/print/latex-acm/Makefile
+++ b/print/latex-acm/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= rea@FreeBSD.org
COMMENT= LaTeX styles for ACM journals
USE_ZIP= yes
-USE_TEX= tetex
+USE_TEX= latex
NO_BUILD= yes
TEXMFLOCAL= share/texmf-local
diff --git a/print/latex-arydshln/Makefile b/print/latex-arydshln/Makefile
index f18caa958eb2..4a6e1ee2a264 100644
--- a/print/latex-arydshln/Makefile
+++ b/print/latex-arydshln/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= hrs@FreeBSD.org
COMMENT= A LaTeX package that draws dash-lines in array/tabular
-USE_TEX= tetex
+USE_TEX= latex
PLIST= ${WRKDIR}/pkg-plist
TEXMFLOCAL= share/texmf-local
diff --git a/print/latex-auto-greek/Makefile b/print/latex-auto-greek/Makefile
index 90dc294ee8f1..d094d54a70a9 100644
--- a/print/latex-auto-greek/Makefile
+++ b/print/latex-auto-greek/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://waterdeep.physics.upatras.gr/~eelvex/files/
MAINTAINER= mplekos@physics.upatras.gr
COMMENT= A LaTeX package for switching between greek/latintext automatically
-USE_TEX= tetex
+USE_TEX= latex
NO_BUILD= YES
PLIST_SUB= TEXMFDIST=${TEXMFDIST} UPDMAP=${UPDMAP} \
CLASSDIR=${CLASSDIR} FMTUTIL=${FMTUTIL} \
diff --git a/print/latex-beamer/Makefile b/print/latex-beamer/Makefile
index 24beba4e5f42..f30ab7983e3b 100644
--- a/print/latex-beamer/Makefile
+++ b/print/latex-beamer/Makefile
@@ -11,7 +11,7 @@ COMMENT= A LaTeX class to create a beamer presentation
RUN_DEPENDS= ${LOCALBASE}/${TEXMFDIR}/tex/latex/pgf/basiclayer/pgf.sty:${PORTSDIR}/print/latex-pgf
-USE_TEX= tetex
+USE_TEX= latex
NO_BUILD= YES
PLIST= ${WRKDIR}/pkg-plist
diff --git a/print/latex-biblatex/Makefile b/print/latex-biblatex/Makefile
index 43c2cd07aa70..32f20dc7dd4c 100644
--- a/print/latex-biblatex/Makefile
+++ b/print/latex-biblatex/Makefile
@@ -15,7 +15,7 @@ COMMENT= Reimplementation of the LaTeX bibliographic facilities
RUN_DEPENDS= ${LOCALBASE}/${TEXMFLOCAL}/tex/latex/etoolbox/etoolbox.sty:${PORTSDIR}/print/latex-etoolbox
USE_ZIP= YES
-USE_TEX= tetex
+USE_TEX= latex
NO_BUILD= YES
PLIST= ${WRKDIR}/pkg-plist
diff --git a/print/latex-biblist/Makefile b/print/latex-biblist/Makefile
index c5f11d268c3e..9def8047c4d8 100644
--- a/print/latex-biblist/Makefile
+++ b/print/latex-biblist/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY= #empty
MAINTAINER= hrs@FreeBSD.org
COMMENT= A LaTeX package for printing all of a BibTeX database entries
-USE_TEX= tetex
+USE_TEX= latex
NO_BUILD= YES
PLIST= ${WRKDIR}/pkg-plist
diff --git a/print/latex-bytefield/Makefile b/print/latex-bytefield/Makefile
index 7f0f65139ee4..eb705eaf3b25 100644
--- a/print/latex-bytefield/Makefile
+++ b/print/latex-bytefield/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= hrs@FreeBSD.org
COMMENT= A LaTeX package that utilization diagram of data fields
-USE_TEX= tetex
+USE_TEX= latex
PLIST_SUB= TEXMFDIR=${TEXMFDIR} MKTEXLSR=${MKTEXLSR} \
CLASSDIR=${CLASSDIR}
diff --git a/print/latex-caption/Makefile b/print/latex-caption/Makefile
index d22c34976753..12b8a29bb085 100644
--- a/print/latex-caption/Makefile
+++ b/print/latex-caption/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= hrs@FreeBSD.org
COMMENT= A LaTeX package that supports customization of captions
-USE_TEX= tetex
+USE_TEX= latex
PLIST_SUB= MKTEXLSR=${MKTEXLSR} \
TEXMFDIR=${TEXMFDIR}
diff --git a/print/latex-chapterfolder/Makefile b/print/latex-chapterfolder/Makefile
index 39460b0094de..54d5f6e613cf 100644
--- a/print/latex-chapterfolder/Makefile
+++ b/print/latex-chapterfolder/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
COMMENT= A LaTeX package that ties section structures and folders
-USE_TEX= tetex
+USE_TEX= latex
PLIST_SUB= MKTEXLSR=${MKTEXLSR} \
TEXMFDIR=${TEXMFDIR}
diff --git a/print/latex-circ/Makefile b/print/latex-circ/Makefile
index e46e346c3ba6..96199372ff1f 100644
--- a/print/latex-circ/Makefile
+++ b/print/latex-circ/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= nivit@FreeBSD.org
COMMENT= A LaTeX package for typesetting circuit diagrams
USE_ZIP= yes
-USE_TEX= tetex
+USE_TEX= latex
# We need to install in the global texmf-local directory
PREFIX= ${LOCALBASE}
diff --git a/print/latex-cjk/Makefile b/print/latex-cjk/Makefile
index 5eea525f71b4..2f3b8c036fc3 100644
--- a/print/latex-cjk/Makefile
+++ b/print/latex-cjk/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS:= ${RUN_DEPENDS} \
LIB_DEPENDS= ttf:${PORTSDIR}/print/freetype
USE_GMAKE= yes
-USE_TEX= tetex
+USE_TEX= latex
MAN1= bg5conv.1 cef5conv.1 cefconv.1 cefsconv.1 extconv.1 \
hbf2gf.1 sjisconv.1
diff --git a/print/latex-csquotes/Makefile b/print/latex-csquotes/Makefile
index 6132ddf4696e..ebead4ab3c59 100644
--- a/print/latex-csquotes/Makefile
+++ b/print/latex-csquotes/Makefile
@@ -18,7 +18,7 @@ COMMENT= Context sensitive quotation facilities
RUN_DEPENDS= ${LOCALBASE}/${TEXMFLOCAL}/tex/latex/etoolbox/etoolbox.sty:${PORTSDIR}/print/latex-etoolbox
USE_ZIP= YES
-USE_TEX= tetex
+USE_TEX= latex
NO_BUILD= YES
PLIST= ${WRKDIR}/pkg-plist
diff --git a/print/latex-etoolbox/Makefile b/print/latex-etoolbox/Makefile
index 625f2b657275..c352a8f2e4fb 100644
--- a/print/latex-etoolbox/Makefile
+++ b/print/latex-etoolbox/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= idolum@users.sourceforge.net
COMMENT= A toolbox providing programming facilities for LaTeX
USE_ZIP= YES
-USE_TEX= tetex
+USE_TEX= latex
NO_BUILD= YES
PLIST= ${WRKDIR}/pkg-plist
diff --git a/print/latex-feynmf/Makefile b/print/latex-feynmf/Makefile
index 143b2d93a9b0..5ad99dbee1ac 100644
--- a/print/latex-feynmf/Makefile
+++ b/print/latex-feynmf/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= #empty
MAINTAINER= hrs@FreeBSD.org
COMMENT= A LaTeX package for drawing of Feynman diagrams
-USE_TEX= tetex
+USE_TEX= latex
PLIST_SUB= TEXMFDIR=${TEXMFDIR} MKTEXLSR=${MKTEXLSR} \
CLASSDIR=${CLASSDIR} FONTDIR=${FONTDIR} MPDIR=${MPDIR}
diff --git a/print/latex-keystroke/Makefile b/print/latex-keystroke/Makefile
index e876492102f5..6b3c32c67d2c 100644
--- a/print/latex-keystroke/Makefile
+++ b/print/latex-keystroke/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY= #empty
MAINTAINER= hrs@FreeBSD.org
COMMENT= A LaTeX package for the graphical representation of the keys
-USE_TEX= tetex
+USE_TEX= latex
NO_BUILD= YES
PLIST_SUB= TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
CLASSDIR=${CLASSDIR}
diff --git a/print/latex-logpap/Makefile b/print/latex-logpap/Makefile
index 29597a1f6cb7..1bca41398c80 100644
--- a/print/latex-logpap/Makefile
+++ b/print/latex-logpap/Makefile
@@ -20,7 +20,7 @@ COMMENT= A LaTeX package for drawing logarithmic graph paper
PLIST_SUB= TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
CLASSDIR=${CLASSDIR}
-USE_TEX= tetex
+USE_TEX= latex
USE_GMAKE= YES
TEXMFLOCAL= share/texmf-local
TEXMFLOCAL_LSR= ${LOCALBASE}/${TEXMFLOCAL}/ls-R
diff --git a/print/latex-logreq/Makefile b/print/latex-logreq/Makefile
index 0e2153aac13f..22a7ed093200 100644
--- a/print/latex-logreq/Makefile
+++ b/print/latex-logreq/Makefile
@@ -18,7 +18,7 @@ COMMENT= Support for automation of the LaTeX workflow
RUN_DEPENDS= ${LOCALBASE}/${TEXMFLOCAL}/tex/latex/etoolbox/etoolbox.sty:${PORTSDIR}/print/latex-etoolbox
USE_ZIP= YES
-USE_TEX= tetex
+USE_TEX= latex
NO_BUILD= YES
PLIST= ${WRKDIR}/pkg-plist
diff --git a/print/latex-ltablex/Makefile b/print/latex-ltablex/Makefile
index 0975a9116e8b..f6082626fd1d 100644
--- a/print/latex-ltablex/Makefile
+++ b/print/latex-ltablex/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= rakuco@FreeBSD.org
COMMENT= Combines the features of both the tabularx and longtable packages
USE_ZIP= YES
-USE_TEX= tetex
+USE_TEX= latex
NO_BUILD= YES
PLIST_SUB= MKTEXLSR=${MKTEXLSR} \
CLASSDIR=${CLASSDIR} \
diff --git a/print/latex-mathabx/Makefile b/print/latex-mathabx/Makefile
index 6beeaafcd93b..f5e76be42fd0 100644
--- a/print/latex-mathabx/Makefile
+++ b/print/latex-mathabx/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= hrs@FreeBSD.org
COMMENT= Math series, aka mathabx MetaFont fontset for TeX/LaTeX
USE_ZIP= YES
-USE_TEX= tetex
+USE_TEX= latex
NO_BUILD= YES
PLIST_SUB= TEXMFLOCALDIR=${TEXMFLOCALDIR} \
MKTEXLSR=${MKTEXLSR} \
diff --git a/print/latex-nomencl/Makefile b/print/latex-nomencl/Makefile
index ee1e9aa5d07d..7732a9501556 100644
--- a/print/latex-nomencl/Makefile
+++ b/print/latex-nomencl/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
COMMENT= A LaTeX package to generate a nomenclature using MakeIndex
-USE_TEX= tetex
+USE_TEX= latex
PLIST_SUB= MKTEXLSR=${MKTEXLSR} \
TEXMFDIR=${TEXMFDIR}
diff --git a/print/latex-pgf/Makefile b/print/latex-pgf/Makefile
index 0b20d06fd261..9cd3ac49e4f4 100644
--- a/print/latex-pgf/Makefile
+++ b/print/latex-pgf/Makefile
@@ -16,7 +16,7 @@ COMMENT= A LaTeX package for TeX Portable Graphic Format
NO_BUILD= YES
USE_ZIP= YES
-USE_TEX= tetex
+USE_TEX= latex
PLIST_SUB= MKTEXLSR=${MKTEXLSR} \
CLASSDIR=${CLASSDIR} \
TEXMFDIR=${TEXMFDIR}
diff --git a/print/latex-prettyref/Makefile b/print/latex-prettyref/Makefile
index 2adebbaee554..e77cc47a2230 100644
--- a/print/latex-prettyref/Makefile
+++ b/print/latex-prettyref/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= yokota@res.otaru-uc.ac.jp
COMMENT= Improved reference formatting for LaTeX2e
USE_ZIP= yes
-USE_TEX= tetex
+USE_TEX= latex
PLIST_SUB= MKTEXLSR=${MKTEXLSR}
TEXMFDIR?= share/texmf
diff --git a/print/latex-resume/Makefile b/print/latex-resume/Makefile
index 6b3fbef2823b..291d87b67e77 100644
--- a/print/latex-resume/Makefile
+++ b/print/latex-resume/Makefile
@@ -19,7 +19,7 @@ DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A resume class for LaTeX
-USE_TEX= tetex
+USE_TEX= latex
NO_BUILD= yes
NO_WRKSUBDIR= yes
EXTRACT_CMD= ${CP}
diff --git a/print/latex-subfloat/Makefile b/print/latex-subfloat/Makefile
index f17aa94023d5..c25ba65a4ac6 100644
--- a/print/latex-subfloat/Makefile
+++ b/print/latex-subfloat/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= hrs@FreeBSD.org
COMMENT= A LaTeX package that enables subnumbering of different floats
-USE_TEX= tetex
+USE_TEX= latex
PLIST_SUB= TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
CLASSDIR=${CLASSDIR}
diff --git a/print/latex-supertabular/Makefile b/print/latex-supertabular/Makefile
index d18d03ac2eba..05474a556638 100644
--- a/print/latex-supertabular/Makefile
+++ b/print/latex-supertabular/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= niedbalski@gmail.com
COMMENT= A LaTeX package for a tabular that spans multiple pages
-USE_TEX= tetex
+USE_TEX= latex
PLIST_SUB= TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
CLASSDIR=${CLASSDIR}
USE_GMAKE= yes
diff --git a/print/latex-svninfo/Makefile b/print/latex-svninfo/Makefile
index a05e0236326a..fffccfff0aaa 100644
--- a/print/latex-svninfo/Makefile
+++ b/print/latex-svninfo/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX= latex-
MAINTAINER= brix@FreeBSD.org
COMMENT= A LaTeX package for Subversion support
-USE_TEX= tetex
+USE_TEX= latex
PLIST_SUB= MKTEXLSR=${MKTEXLSR} CLASSDIR=${CLASSDIR}
TEXMFLOCAL= share/texmf-local
diff --git a/print/latex-timing/Makefile b/print/latex-timing/Makefile
index 623f66d7439c..3fdd65d81b47 100644
--- a/print/latex-timing/Makefile
+++ b/print/latex-timing/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY= #empty
MAINTAINER= hrs@FreeBSD.org
COMMENT= A LaTeX package for drawing timing diagrams
-USE_TEX= tetex
+USE_TEX= latex
NO_BUILD= YES
PLIST_SUB= TEXMFDIR=${TEXMFDIR} MKTEXLSR=${MKTEXLSR} \
CLASSDIR=${CLASSDIR} \
diff --git a/print/latex-tipa/Makefile b/print/latex-tipa/Makefile
index deef5c58e925..f07d50c4b79f 100644
--- a/print/latex-tipa/Makefile
+++ b/print/latex-tipa/Makefile
@@ -15,7 +15,7 @@ DISTNAME= tipa-${PORTVERSION}
MAINTAINER= a.strich.b@web.de
COMMENT= Package which provides T3-encoded fonts to be used with LaTeX2e
-USE_TEX= tetex
+USE_TEX= latex
NO_INSTALL_MANPAGES= yes
NO_BUILD= yes
LATEX_BIN= ${LOCALBASE}/bin/latex
diff --git a/print/latex-ucs/Makefile b/print/latex-ucs/Makefile
index 6523835d056f..884fc6ed5b68 100644
--- a/print/latex-ucs/Makefile
+++ b/print/latex-ucs/Makefile
@@ -18,7 +18,7 @@ COMMENT= A LaTeX package for using UTF-8 as input encoding
NO_BUILD= yes
USE_PERL5_RUN= yes
-USE_TEX= tetex
+USE_TEX= latex
PLIST_SUB= MKTEXLSR="${MKTEXLSR}" CLASSDIR=${CLASSDIR}
TEXMFDIR= share/texmf
diff --git a/print/latex2slides/Makefile b/print/latex2slides/Makefile
index add01c781690..0ba129b8b349 100644
--- a/print/latex2slides/Makefile
+++ b/print/latex2slides/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick \
${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
USE_PYTHON= yes
-USE_TEX= tetex
+USE_TEX= dvipsk:run
NO_BUILD= yes
PLIST_SUB= PORTNAME="${PORTNAME}" PORTVERSION="${PORTVERSION}"
diff --git a/print/latexmk/Makefile b/print/latexmk/Makefile
index 421dea609650..56a8437fe009 100644
--- a/print/latexmk/Makefile
+++ b/print/latexmk/Makefile
@@ -18,7 +18,7 @@ NO_BUILD= yes
USE_ZIP= yes
USE_PERL5_RUN= yes
-USE_TEX= tetex
+USE_TEX= latex
MAN1= latexmk.1
PORTDOCS= *
diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index 16ace8c72952..c92771cde49b 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -52,7 +52,7 @@ EXTRACT_ONLY= ${PORTNAME}.tar.gz
MAINTAINER= dereckson@gmail.com
COMMENT= Produce beautiful listings of source code with LaTeX
-USE_TEX= tetex
+USE_TEX= latex
MAN1= lgrind.1
MAN5= lgrindef.5
diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
index f2cd22b07db0..783013cdf5d2 100644
--- a/print/lilypond-devel/Makefile
+++ b/print/lilypond-devel/Makefile
@@ -48,7 +48,7 @@ USE_GMAKE= yes
USE_GHOSTSCRIPT=9
USE_PYTHON= yes
USE_PERL5_BUILD=yes
-USE_TEX= tetex
+USE_TEX= latex
USE_GNOME= pango
MAKEFILE= GNUmakefile
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index c3fa634323b5..cfe3513fc204 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -42,7 +42,7 @@ INFO= lilypond-notation \
USES= bison:build gettext
USE_GMAKE= yes
USE_GHOSTSCRIPT=9
-USE_TEX= tetex
+USE_TEX= latex
USE_PYTHON= yes
USE_PERL5_BUILD=yes
USE_GNOME= pango
diff --git a/print/mftrace/Makefile b/print/mftrace/Makefile
index 3eb699bbc363..95c18dd9c37d 100644
--- a/print/mftrace/Makefile
+++ b/print/mftrace/Makefile
@@ -29,7 +29,7 @@ RUN_DEPENDS+= potrace:${PORTSDIR}/graphics/potrace
# Python3 ready
USE_PYTHON= yes
-USE_TEX= tetex
+USE_TEX= base texmf
GNU_CONFIGURE= yes
USE_GMAKE= yes
MAKEFILE= GNUmakefile
diff --git a/print/muttprint/Makefile b/print/muttprint/Makefile
index a02a5b152572..03d74a077d30 100644
--- a/print/muttprint/Makefile
+++ b/print/muttprint/Makefile
@@ -30,7 +30,7 @@ NO_BUILD= yes
PLIST_SUB+= LANGINFO="@comment "
REINPLACE_ARGS= -i ""
-USE_TEX= tetex
+USE_TEX= latex
USE_GMAKE= yes
MAN1= muttprint.1
diff --git a/print/pdfjam/Makefile b/print/pdfjam/Makefile
index 03ee1ad81e94..606462a93718 100644
--- a/print/pdfjam/Makefile
+++ b/print/pdfjam/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/
MAINTAINER= johans@FreeBSD.org
COMMENT= Shell scripts to manipulate PDF files
-USE_TEX= tetex
+USE_TEX= latex
WRKSRC= ${WRKDIR}/${PORTNAME}
PROGS= pdf90 pdf180 pdf270 pdfbook pdfflip pdfjam \
diff --git a/print/py-pyscript/Makefile b/print/py-pyscript/Makefile
index 26c40e07cce5..c4d920673d54 100644
--- a/print/py-pyscript/Makefile
+++ b/print/py-pyscript/Makefile
@@ -15,11 +15,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Python module for producing high quality PostScript graphics
-RUN_DEPENDS= dvips:${PORTSDIR}/print/dvipsk-tetex
-
USE_PYTHON= yes
USE_PYDISTUTILS= yes
-USE_TEX= tetex
+USE_TEX= latex dvipsk
DATADIR= ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
diff --git a/print/sgf2tex/Makefile b/print/sgf2tex/Makefile
index 76c8bd50ab4a..baba61fec446 100644
--- a/print/sgf2tex/Makefile
+++ b/print/sgf2tex/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://sporadic.stanford.edu/bump/
MAINTAINER= spcoltri@omcl.org
COMMENT= Convert a Go game record in SGF format into TeX and provide fonts to make a dvi
-USE_TEX= tetex
+USE_TEX= tex
PLIST_SUB= MKTEXLSR=${MKTEXLSR}
MAKE_ENV= TEX_BIN=${TEX_BIN}
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index b0206c206d9b..0cb7d12e4350 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -12,28 +12,22 @@ EXTRACT_ONLY= # empty
MAINTAINER= hrs@FreeBSD.org
COMMENT= A meta port for teTeX suite
-RUN_DEPENDS= ${LOCALBASE}/share/fonts/cm-super/README:${PORTSDIR}/print/cm-super \
- dvips:${PORTSDIR}/print/dvipsk-tetex
+RUN_DEPENDS= ${LOCALBASE}/share/fonts/cm-super/README:${PORTSDIR}/print/cm-super
-USE_TEX= tetex
+USE_TEX= base texmf dvipsk dvipdfmx
OPTIONS_DEFINE= LETTERSIZE X11
LETTERSIZE_DESC= Use letter size by default
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MX11}
-RUN_DEPENDS+= xdvi:${PORTSDIR}/print/xdvik
+USE_TEX+= xdvik
.endif
# XXX: We always build in batch mode to disable OPTIONS
# in print/teTeX-base.
DEPENDS_ARGS+= BATCH=yes
-CONFLICTS= latex2e-[0-9]* tex-[0-9]* dvips-[0-9]* xdvi-[0-9]* \
- texlive-[0-9]* tex-web2c-[0-9]* \
- tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
- tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]*
-
.if ${PORT_OPTIONS:MLETTERSIZE}
FLAVOR+= letter
DEPENDS_ARGS+= WITH_LETTERSIZE=true
diff --git a/print/tex-mfpic/Makefile b/print/tex-mfpic/Makefile
index 93caf4f1011a..83625764b105 100644
--- a/print/tex-mfpic/Makefile
+++ b/print/tex-mfpic/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= hrs@FreeBSD.org
COMMENT= A TeX package that supports drawing pictures
USE_ZIP= yes
-USE_TEX= tetex
+USE_TEX= latex
PLIST_SUB= MKTEXLSR=${MKTEXLSR} \
TEXMFDIR=${TEXMFDIR}
TEXMFDIR= share/texmf
diff --git a/print/tex-omegaware-old/Makefile b/print/tex-omegaware-old/Makefile
index 8522d94a53f0..8fb12541caeb 100644
--- a/print/tex-omegaware-old/Makefile
+++ b/print/tex-omegaware-old/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY= ${TETEX_SRC}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Old version of ovf2ovp, ovp2ovf, ofm2opl, and opl2ofm
-USE_TEX= tetex
+USE_TEX= base texmf
DIST_SUBDIR= teTeX
WRKSRC= ${WRKDIR}/tetex-src-${PORTVERSION}/texk/web2c
CONFIGURE_WRKSRC= ${WRKDIR}/tetex-src-${PORTVERSION}
diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile
index 20198ca0502a..3fa0dac379b0 100644
--- a/print/texlive-base/Makefile
+++ b/print/texlive-base/Makefile
@@ -24,6 +24,7 @@ LIB_DEPENDS= icuio:${PORTSDIR}/devel/icu \
zzip:${PORTSDIR}/devel/zziplib
USE_TEX= web2c kpathsea ptexenc texhash
+TEX_DEFAULT= texlive # override user configuration
USE_XZ= yes
USE_GMAKE= yes
USE_AUTOTOOLS= autoconf
diff --git a/print/texlive-texmf/Makefile b/print/texlive-texmf/Makefile
index 79a11b17ec7a..8990de0a942c 100644
--- a/print/texlive-texmf/Makefile
+++ b/print/texlive-texmf/Makefile
@@ -13,7 +13,9 @@ MAINTAINER= hrs@FreeBSD.org
COMMENT= TeX Live Typesetting System, texmf Tree
USE_XZ= yes
-USE_TEX= base
+USE_TEX= base texhash
+TEX_DEFAULT= texlive # override user configuration
+TEXHASHDIRS= ${TEXMFDIR} ${TEXMFDISTDIR}
NO_BUILD= yes
NO_WRKSRC= yes
diff --git a/print/texvc/Makefile b/print/texvc/Makefile
index 83d040a403a4..83e23086fef4 100644
--- a/print/texvc/Makefile
+++ b/print/texvc/Makefile
@@ -30,9 +30,8 @@ RASTER_DESC= rasterization support
.if ${PORT_OPTIONS:MRASTER}
USE_GHOSTSCRIPT_RUN= yes
-USE_TEX= tetex
-RUN_DEPENDS+= dvips:${PORTSDIR}/print/dvipsk-tetex \
- convert:${PORTSDIR}/graphics/ImageMagick
+USE_TEX= latex dvipsk
+RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick
.endif
do-install:
diff --git a/print/typetools/Makefile b/print/typetools/Makefile
index 2c8659e335c0..35bd1a8f593e 100644
--- a/print/typetools/Makefile
+++ b/print/typetools/Makefile
@@ -12,7 +12,7 @@ COMMENT= Tools for manipulating fonts
LICENSE= GPLv2
-USE_TEX= tetex
+USE_TEX= base
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_header_kpathsea_kpathsea_h=yes
CONFIGURE_ARGS= --with-kpathsea=${LOCALBASE}
diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index e2408d700c8c..2a941f689487 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -15,7 +15,7 @@ COMMENT= DVI Previewer(kpathsearch) for X
LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib
USE_GMAKE= yes
-USE_TEX= tetex
+USE_TEX= base texmf
USE_MOTIF= yes
MAKE_JOBS_UNSAFE= yes
GNU_CONFIGURE= yes
diff --git a/print/xmltex/Makefile b/print/xmltex/Makefile
index 0c2bedfcf799..ab6a11196f31 100644
--- a/print/xmltex/Makefile
+++ b/print/xmltex/Makefile
@@ -20,7 +20,7 @@ COMMENT= A non-validating XML parser, written in TeX
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
-USE_TEX= tetex
+USE_TEX= tex
.include <bsd.port.pre.mk>
diff --git a/print/xtexsh/Makefile b/print/xtexsh/Makefile
index e6152aae31fb..b2ecb70cad83 100644
--- a/print/xtexsh/Makefile
+++ b/print/xtexsh/Makefile
@@ -21,7 +21,7 @@ LICENSE_COMB= dual
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
NO_BUILD= yes
-USE_TEX= tetex
+USE_TEX= latex
USE_TK_WRAPPER= yes
INSTALLS_ICONS= yes
MAN1= xtexsh.1
diff --git a/russian/pscyr/Makefile b/russian/pscyr/Makefile
index 917eeb2044db..d6ef0a6bd582 100644
--- a/russian/pscyr/Makefile
+++ b/russian/pscyr/Makefile
@@ -18,7 +18,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION:S/${PATCH_LEVEL}$/-patch&/}-tex.tar.gz \
MAINTAINER= ports@FreeBSD.org
COMMENT= Cyrillic PostScript Type1 fonts for use with TeX
-USE_TEX= tetex
+USE_TEX= base texmf
NO_WRKSUBDIR= yes
NO_BUILD= yes
MAKE_ENV= TEXMFDIR=${LOCALBASE}/share/texmf
diff --git a/science/abinit/Makefile b/science/abinit/Makefile
index ee9d45060dd0..00f32524e02f 100644
--- a/science/abinit/Makefile
+++ b/science/abinit/Makefile
@@ -32,9 +32,8 @@ CONFIGURE_ARGS= --disable-wannier90 --disable-bigdft --disable-etsf-io \
ALL_TARGET= all libabinit
.if !defined(NOPORTDOCS)
-USE_TEX= tetex
-BUILD_DEPENDS+= dvips:${PORTSDIR}/print/dvipsk-tetex \
- gm4:${PORTSDIR}/devel/m4 \
+USE_TEX= latex:build dvipsk:build
+BUILD_DEPENDS+= gm4:${PORTSDIR}/devel/m4 \
markdown:${PORTSDIR}/textproc/markdown
USE_GHOSTSCRIPT_BUILD= yes
.endif
diff --git a/science/ecs/Makefile b/science/ecs/Makefile
index 064ac46f59fa..7d92df4cc37a 100644
--- a/science/ecs/Makefile
+++ b/science/ecs/Makefile
@@ -53,7 +53,7 @@ CONFIGURE_ARGS+= --enable-debug
.endif
.if !defined(NOPORTDOCS)
-USE_TEX= tetex
+USE_TEX= tex:build
BUILD_DEPENDS+= fig2dev:${PORTSDIR}/print/transfig
PORTDOCS= mi_ecs.pdf mt_ecs.pdf
.endif
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile
index b9ee868e3316..eef11f0ffcea 100644
--- a/science/mpqc/Makefile
+++ b/science/mpqc/Makefile
@@ -42,7 +42,7 @@ LIB_DEPENDS+= mpich:${PORTSDIR}/net/mpich2
.endif
LIB_DEPENDS+= int.1:${PORTSDIR}/science/libint
.if !defined(NOPORTDOCS)
-USE_TEX= tetex
+USE_TEX= latex:build
BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen
BUILD_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz
BUILD_DEPENDS+= ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
diff --git a/science/ncs/Makefile b/science/ncs/Makefile
index b27677fc0b3d..fa8125003e1b 100644
--- a/science/ncs/Makefile
+++ b/science/ncs/Makefile
@@ -78,7 +78,7 @@ MPI_LIBS= -lmpich -lmpl ${PTHREAD_LIBS}
.endif
.if !defined(NOPORTDOCS)
-USE_TEX= tetex
+USE_TEX= tex:build
BUILD_DEPENDS+= fig2dev:${PORTSDIR}/print/transfig
ALL_TARGET= all pdf
INSTALL_TARGET= install install-pdf
diff --git a/security/libtomcrypt/Makefile b/security/libtomcrypt/Makefile
index b7e9b11b3754..189443c33d66 100644
--- a/security/libtomcrypt/Makefile
+++ b/security/libtomcrypt/Makefile
@@ -47,7 +47,7 @@ CFLAGS+= -DGMP_DESC
.endif
.if ${PORT_OPTIONS:MDOCS}
-USE_TEX= tetex
+USE_TEX= latex:build
PORTDOCS= *
.else
MAKE_ARGS+= NODOCS=yes
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:
diff --git a/vietnamese/vntex/Makefile b/vietnamese/vntex/Makefile
index 880aaac0feb3..2044c6b3ccbf 100644
--- a/vietnamese/vntex/Makefile
+++ b/vietnamese/vntex/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= obrien@FreeBSD.org
COMMENT= teTeX Vietnamese language + font support
USE_ZIP= yes
-USE_TEX= tetex
+USE_TEX= tex
NO_BUILD= yes
do-install:
diff --git a/www/trac-math/Makefile b/www/trac-math/Makefile
index 46a3e6b43777..cf7bb3709274 100644
--- a/www/trac-math/Makefile
+++ b/www/trac-math/Makefile
@@ -13,7 +13,7 @@ COMMENT= Support for LaTeX math formulas in wiki pages
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
-USE_TEX= tetex
+USE_TEX= latex
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/www/twiki-MathModePlugin/Makefile b/www/twiki-MathModePlugin/Makefile
index bd991d3319ea..041bfa8415ac 100644
--- a/www/twiki-MathModePlugin/Makefile
+++ b/www/twiki-MathModePlugin/Makefile
@@ -10,7 +10,7 @@ COMMENT= Include LaTeX formatted math in your TWiki pages
RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick
-USE_TEX= tetex
+USE_TEX= base latex
post-patch:
${REINPLACE_CMD} -i '' -e 's!=/usr/bin!=${LOCALBASE}/bin!g; s!=/bin!=/usr/bin!g;' \