svn commit: r317899 - in head: Mk arabic/arabtex astro/pp3 chinese/cwtex comms/gnuradio deskutils/etask deskutils/tomboy-plugin-latex devel/avr-libc devel/doxygen devel/gdcm devel/meta-cvs devel/ml...

Hiroki Sato hrs at FreeBSD.org
Sat May 11 17:59:09 UTC 2013


Author: hrs
Date: Sat May 11 17:58:55 2013
New Revision: 317899
URL: http://svnweb.freebsd.org/changeset/ports/317899

Log:
  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.

Modified:
  head/Mk/bsd.tex.mk
  head/arabic/arabtex/Makefile
  head/astro/pp3/Makefile
  head/chinese/cwtex/Makefile
  head/comms/gnuradio/Makefile
  head/deskutils/etask/Makefile
  head/deskutils/tomboy-plugin-latex/Makefile
  head/devel/avr-libc/Makefile
  head/devel/doxygen/Makefile
  head/devel/gdcm/Makefile
  head/devel/meta-cvs/Makefile
  head/devel/ml-doc/Makefile
  head/devel/ocamlweb/Makefile
  head/devel/ragel/Makefile
  head/devel/simulavr/Makefile
  head/devel/tex-kpathsea/Makefile
  head/editors/kile-kde4/Makefile
  head/editors/kile/Makefile
  head/editors/texmacs/Makefile
  head/editors/texmaker/Makefile
  head/editors/texmakerx/Makefile
  head/editors/winefish/Makefile
  head/editors/zim/Makefile
  head/graphics/epix/Makefile
  head/graphics/evince/Makefile
  head/graphics/gle-graphics/Makefile
  head/graphics/ipe/Makefile
  head/graphics/kdegraphics3/Makefile
  head/graphics/klatexformula/Makefile
  head/graphics/l2p/Makefile
  head/graphics/okular/Makefile
  head/graphics/py-PyX/Makefile
  head/japanese/dvipsk/Makefile
  head/japanese/platex-japanese/Makefile
  head/japanese/platex-jsclasses/Makefile
  head/japanese/ptex/Makefile
  head/japanese/teTeX/Makefile
  head/japanese/texfamily-vfn2a/Makefile
  head/japanese/texfamily/Makefile
  head/japanese/xdvik/Makefile
  head/korean/ko.TeX-fonts-base/Makefile
  head/korean/ko.TeX-fonts-extra/Makefile
  head/korean/ko.TeX/Makefile
  head/lang/hope/Makefile
  head/lang/logo/Makefile
  head/lang/mlton/Makefile
  head/lang/twelf/Makefile
  head/math/R/Makefile
  head/math/asymptote/Makefile
  head/math/coq/Makefile
  head/math/eukleides/Makefile
  head/math/giacxcas/Makefile
  head/math/gnuplot/Makefile
  head/math/naturalmath/Makefile
  head/math/petsc/Makefile
  head/math/sage/Makefile
  head/misc/latex-mk/Makefile
  head/net-im/pidgin-latex/Makefile
  head/net-mgmt/netmagis-common/Makefile
  head/print/abntex/Makefile
  head/print/auctex/Makefile
  head/print/bophook/Makefile
  head/print/catdvi/Makefile
  head/print/cjk-lyx/Makefile
  head/print/cm-super/Makefile
  head/print/dvipdfmx/Makefile
  head/print/dvipsk-tetex/Makefile
  head/print/dvisvg/Makefile
  head/print/examplep/Makefile
  head/print/freetype-tools/Makefile
  head/print/hyperlatex/Makefile
  head/print/ifxetex/Makefile
  head/print/jadetex/Makefile
  head/print/latex-aastex/Makefile
  head/print/latex-acm/Makefile
  head/print/latex-arydshln/Makefile
  head/print/latex-auto-greek/Makefile
  head/print/latex-beamer/Makefile
  head/print/latex-biblatex/Makefile
  head/print/latex-biblist/Makefile
  head/print/latex-bytefield/Makefile
  head/print/latex-caption/Makefile
  head/print/latex-chapterfolder/Makefile
  head/print/latex-circ/Makefile
  head/print/latex-cjk/Makefile
  head/print/latex-csquotes/Makefile
  head/print/latex-etoolbox/Makefile
  head/print/latex-feynmf/Makefile
  head/print/latex-keystroke/Makefile
  head/print/latex-logpap/Makefile
  head/print/latex-logreq/Makefile
  head/print/latex-ltablex/Makefile
  head/print/latex-mathabx/Makefile
  head/print/latex-nomencl/Makefile
  head/print/latex-pgf/Makefile
  head/print/latex-prettyref/Makefile
  head/print/latex-resume/Makefile
  head/print/latex-subfloat/Makefile
  head/print/latex-supertabular/Makefile
  head/print/latex-svninfo/Makefile
  head/print/latex-timing/Makefile
  head/print/latex-tipa/Makefile
  head/print/latex-ucs/Makefile
  head/print/latex2slides/Makefile
  head/print/latexmk/Makefile
  head/print/lgrind/Makefile
  head/print/lilypond-devel/Makefile
  head/print/lilypond/Makefile
  head/print/mftrace/Makefile
  head/print/muttprint/Makefile
  head/print/pdfjam/Makefile
  head/print/py-pyscript/Makefile
  head/print/sgf2tex/Makefile
  head/print/teTeX/Makefile
  head/print/tex-mfpic/Makefile
  head/print/tex-omegaware-old/Makefile
  head/print/texlive-base/Makefile
  head/print/texlive-texmf/Makefile
  head/print/texvc/Makefile
  head/print/typetools/Makefile
  head/print/xdvik/Makefile
  head/print/xmltex/Makefile
  head/print/xtexsh/Makefile
  head/russian/pscyr/Makefile
  head/science/abinit/Makefile
  head/science/ecs/Makefile
  head/science/mpqc/Makefile
  head/science/ncs/Makefile
  head/security/libtomcrypt/Makefile
  head/textproc/bibtool/Makefile
  head/textproc/dblatex/Makefile
  head/textproc/ecromedos/Makefile
  head/textproc/eqe/Makefile
  head/textproc/foiltex/Makefile
  head/textproc/gastex/Makefile
  head/textproc/gladtex/Makefile
  head/textproc/hs-lhs2tex/Makefile
  head/textproc/latex2html/Makefile
  head/textproc/metauml/Makefile
  head/textproc/p5-LaTeX-Driver/Makefile
  head/textproc/ppower4/Makefile
  head/textproc/prosper/Makefile
  head/textproc/rubber/Makefile
  head/textproc/sgmltools-lite/Makefile
  head/textproc/sowing/Makefile
  head/textproc/tex2im/Makefile
  head/textproc/textogif/Makefile
  head/textproc/tth/Makefile
  head/textproc/yodl/Makefile
  head/vietnamese/vntex/Makefile
  head/www/trac-math/Makefile
  head/www/twiki-MathModePlugin/Makefile

Modified: head/Mk/bsd.tex.mk
==============================================================================
--- head/Mk/bsd.tex.mk	Sat May 11 17:50:05 2013	(r317898)
+++ head/Mk/bsd.tex.mk	Sat May 11 17:58:55 2013	(r317899)
@@ -5,59 +5,51 @@
 TEX_MAINTAINER=	hrs at 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
-#
-# The other valid keywords:
-#
-#  tetex-base:	teTeX base
-#  tetex-texmf:	teTeX texmf tree
+# Ports which depend on TeX should use USE_TEX.
 #
-#  web2c:	WEB2C toolchain and TeX engines
-#  kpathsea:	kpathsea library
-#  ptexenc:	character code conversion library for pTeX
-#
-#  base:	TeXLive base
-#  texmf:	TeXLive texmf tree
-#  infra:	tlmgr dependency (Perl modules)
+# USE_TEX=	yes
+# imports variables only, and
+# USE_TEX=	full
+# means full teTeX or TeXLive dependency.
+#
+# The other valid keywords (* means TeXLive specific):
+#
+#  base:	base part
+#  texmf:	texmf tree
+#
+#  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)

Modified: head/arabic/arabtex/Makefile
==============================================================================
--- head/arabic/arabtex/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/arabic/arabtex/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	nivit at 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}

Modified: head/astro/pp3/Makefile
==============================================================================
--- head/astro/pp3/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/astro/pp3/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -11,7 +11,7 @@ MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Creates celestial charts
 
 USE_BZIP2=	yes
-USE_TEX=	tetex
+USE_TEX=	latex
 
 .include <bsd.port.options.mk>
 

Modified: head/chinese/cwtex/Makefile
==============================================================================
--- head/chinese/cwtex/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/chinese/cwtex/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -16,7 +16,7 @@ DISTFILES=	cwtexmain.tgz cwtexbin-${PORT
 MAINTAINER=	ports at 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
 

Modified: head/comms/gnuradio/Makefile
==============================================================================
--- head/comms/gnuradio/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/comms/gnuradio/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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 \

Modified: head/deskutils/etask/Makefile
==============================================================================
--- head/deskutils/etask/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/deskutils/etask/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -15,13 +15,12 @@ MASTER_SITES=	http://members.chello.at/r
 MAINTAINER=	dryice at 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}

Modified: head/deskutils/tomboy-plugin-latex/Makefile
==============================================================================
--- head/deskutils/tomboy-plugin-latex/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/deskutils/tomboy-plugin-latex/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -20,6 +20,6 @@ RUN_DEPENDS=	tomboy:${PORTSDIR}/deskutil
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_TEX=	tetex
+USE_TEX=	latex
 
 .include <bsd.port.mk>

Modified: head/devel/avr-libc/Makefile
==============================================================================
--- head/devel/avr-libc/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/devel/avr-libc/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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

Modified: head/devel/doxygen/Makefile
==============================================================================
--- head/devel/doxygen/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/devel/doxygen/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -52,7 +52,7 @@ BUILD_DEPENDS+=	dot:${PORTSDIR}/graphics
 
 .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

Modified: head/devel/gdcm/Makefile
==============================================================================
--- head/devel/gdcm/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/devel/gdcm/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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 \

Modified: head/devel/meta-cvs/Makefile
==============================================================================
--- head/devel/meta-cvs/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/devel/meta-cvs/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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
 

Modified: head/devel/ml-doc/Makefile
==============================================================================
--- head/devel/ml-doc/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/devel/ml-doc/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -40,7 +40,7 @@ LATEX_DESC=	Install LaTeX if necessary (
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLATEX}
-USE_TEX=	tetex
+USE_TEX=	latex
 .endif
 
 post-extract:

Modified: head/devel/ocamlweb/Makefile
==============================================================================
--- head/devel/ocamlweb/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/devel/ocamlweb/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -18,7 +18,7 @@ COMMENT=	A literate programming tool for
 
 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 
-USE_TEX=	tetex
+USE_TEX=	latex
 GNU_CONFIGURE= yes
 PLIST_SUB+=	TEXMFDIR=${TEXMFDIR} \
 		MKTEXLSR=${MKTEXLSR}

Modified: head/devel/ragel/Makefile
==============================================================================
--- head/devel/ragel/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/devel/ragel/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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=""

Modified: head/devel/simulavr/Makefile
==============================================================================
--- head/devel/simulavr/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/devel/simulavr/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -25,7 +25,7 @@ BUILD_DEPENDS=	${LOCALBASE}/avr/include/
 BROKEN=		does not package
 
 #USE_BZIP2=	yes
-USE_TEX=	tetex
+USE_TEX=	latex:build
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 

Modified: head/devel/tex-kpathsea/Makefile
==============================================================================
--- head/devel/tex-kpathsea/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/devel/tex-kpathsea/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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

Modified: head/editors/kile-kde4/Makefile
==============================================================================
--- head/editors/kile-kde4/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/editors/kile-kde4/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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

Modified: head/editors/kile/Makefile
==============================================================================
--- head/editors/kile/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/editors/kile/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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

Modified: head/editors/texmacs/Makefile
==============================================================================
--- head/editors/texmacs/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/editors/texmacs/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -17,7 +17,7 @@ LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/g
 MAKE_JOBS_SAFE=	yes
 
 USE_PYTHON=	yes
-USE_TEX=	tetex
+USE_TEX=	tex
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: head/editors/texmaker/Makefile
==============================================================================
--- head/editors/texmaker/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/editors/texmaker/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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}

Modified: head/editors/texmakerx/Makefile
==============================================================================
--- head/editors/texmakerx/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/editors/texmakerx/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -13,15 +13,14 @@ COMMENT=	A LaTeX IDE derived from Texmak
 
 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

Modified: head/editors/winefish/Makefile
==============================================================================
--- head/editors/winefish/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/editors/winefish/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--with-freedesktop_org-
 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)

Modified: head/editors/zim/Makefile
==============================================================================
--- head/editors/zim/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/editors/zim/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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

Modified: head/graphics/epix/Makefile
==============================================================================
--- head/graphics/epix/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/graphics/epix/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -18,13 +18,12 @@ COMMENT=	Creates math plots and line fig
 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 \

Modified: head/graphics/evince/Makefile
==============================================================================
--- head/graphics/evince/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/graphics/evince/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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

Modified: head/graphics/gle-graphics/Makefile
==============================================================================
--- head/graphics/gle-graphics/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/graphics/gle-graphics/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -46,7 +46,7 @@ CONFIGURE_ARGS+=	 --with-jpeg=no --with-
 
 .if ${PORT_OPTIONS:MLATEX_GS}
 USE_GHOSTSCRIPT_RUN=	yes
-USE_TEX=	tetex
+USE_TEX=	latex
 .endif
 
 .if ${PORT_OPTIONS:MX11}

Modified: head/graphics/ipe/Makefile
==============================================================================
--- head/graphics/ipe/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/graphics/ipe/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 
 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" \

Modified: head/graphics/kdegraphics3/Makefile
==============================================================================
--- head/graphics/kdegraphics3/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/graphics/kdegraphics3/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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

Modified: head/graphics/klatexformula/Makefile
==============================================================================
--- head/graphics/klatexformula/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/graphics/klatexformula/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -14,12 +14,11 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	makc at 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} \

Modified: head/graphics/l2p/Makefile
==============================================================================
--- head/graphics/l2p/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/graphics/l2p/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -15,12 +15,11 @@ MASTER_SITES=	http://www.redsymbol.net/s
 MAINTAINER=	nivit at 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}

Modified: head/graphics/okular/Makefile
==============================================================================
--- head/graphics/okular/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/graphics/okular/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -38,7 +38,7 @@ DVI_DESC=	Support DVI files (requires te
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDVI}
-USE_TEX=	tetex
+USE_TEX=	latex
 .endif
 
 .include <bsd.port.mk>

Modified: head/graphics/py-PyX/Makefile
==============================================================================
--- head/graphics/py-PyX/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/graphics/py-PyX/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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

Modified: head/japanese/dvipsk/Makefile
==============================================================================
--- head/japanese/dvipsk/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/japanese/dvipsk/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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 \

Modified: head/japanese/platex-japanese/Makefile
==============================================================================
--- head/japanese/platex-japanese/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/japanese/platex-japanese/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -18,11 +18,10 @@ DIST_SUBDIR=	latex
 MAINTAINER=	yokota at 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

Modified: head/japanese/platex-jsclasses/Makefile
==============================================================================
--- head/japanese/platex-jsclasses/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/japanese/platex-jsclasses/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -17,10 +17,8 @@ DISTFILES=	${PORTNAME}-${PORTVERSION:S/^
 MAINTAINER=	hrs at 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} \

Modified: head/japanese/ptex/Makefile
==============================================================================
--- head/japanese/ptex/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/japanese/ptex/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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}" \

Modified: head/japanese/teTeX/Makefile
==============================================================================
--- head/japanese/teTeX/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/japanese/teTeX/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -11,19 +11,13 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	hrs at 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

Modified: head/japanese/texfamily-vfn2a/Makefile
==============================================================================
--- head/japanese/texfamily-vfn2a/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/japanese/texfamily-vfn2a/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/${TEXMFDIR}/
 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
 

Modified: head/japanese/texfamily/Makefile
==============================================================================
--- head/japanese/texfamily/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/japanese/texfamily/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -30,7 +30,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/
 		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}

Modified: head/japanese/xdvik/Makefile
==============================================================================
--- head/japanese/xdvik/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/japanese/xdvik/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -24,7 +24,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/prin
 		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$,,} \

Modified: head/korean/ko.TeX-fonts-base/Makefile
==============================================================================
--- head/korean/ko.TeX-fonts-base/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/korean/ko.TeX-fonts-base/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -15,7 +15,7 @@ DISTNAME=	ko.tex-unfonts-base-20070927
 MAINTAINER=	hyogeollee at gmail.com
 COMMENT=	Korean TeX base fonts
 
-USE_TEX=	tetex
+USE_TEX=	latex
 CONFLICTS=	hlatex-[0-9]*
 
 NO_WRKSUBDIR=	yes

Modified: head/korean/ko.TeX-fonts-extra/Makefile
==============================================================================
--- head/korean/ko.TeX-fonts-extra/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/korean/ko.TeX-fonts-extra/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -15,7 +15,7 @@ DISTFILES=	ko.tex-extra-hlfont.tar.gz ko
 MAINTAINER=	hyogeollee at gmail.com
 COMMENT=	Korean TeX extra fonts
 
-USE_TEX=	tetex
+USE_TEX=	latex
 CONFLICTS=	hlatex-[0-9]*
 
 NO_WRKSUBDIR=	yes

Modified: head/korean/ko.TeX/Makefile
==============================================================================
--- head/korean/ko.TeX/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/korean/ko.TeX/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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

Modified: head/lang/hope/Makefile
==============================================================================
--- head/lang/hope/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/lang/hope/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -15,7 +15,7 @@ MAINTAINER=	lev at 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

Modified: head/lang/logo/Makefile
==============================================================================
--- head/lang/logo/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/lang/logo/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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
 

Modified: head/lang/mlton/Makefile
==============================================================================
--- head/lang/mlton/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/lang/mlton/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -32,7 +32,7 @@ OPTIONS=	SMLNJ	"Bootstrap with SML/NJ (c
 .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

Modified: head/lang/twelf/Makefile
==============================================================================
--- head/lang/twelf/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/lang/twelf/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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

Modified: head/math/R/Makefile
==============================================================================
--- head/math/R/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/math/R/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -244,7 +244,7 @@ INFO=		R-FAQ R-admin R-data R-exts R-int
 .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" \

Modified: head/math/asymptote/Makefile
==============================================================================
--- head/math/asymptote/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/math/asymptote/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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

Modified: head/math/coq/Makefile
==============================================================================
--- head/math/coq/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/math/coq/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -36,7 +36,7 @@ MAN1=	coq-tex.1 coq_makefile.1 coqc.1 co
 .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=	*

Modified: head/math/eukleides/Makefile
==============================================================================
--- head/math/eukleides/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/math/eukleides/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -14,7 +14,7 @@ LIB_DEPENDS=	readline.6:${PORTSDIR}/deve
 RUN_DEPENDS=	pstoedit:${PORTSDIR}/graphics/pstoedit
 
 USE_BZIP2=	yes
-USE_TEX=	tetex
+USE_TEX=	latex
 USES=		bison gettext iconv
 USE_GMAKE=	yes
 

Modified: head/math/giacxcas/Makefile
==============================================================================
--- head/math/giacxcas/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/math/giacxcas/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -14,8 +14,7 @@ COMMENT=	Computer algebra system by Bern
 
 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

Modified: head/math/gnuplot/Makefile
==============================================================================
--- head/math/gnuplot/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/math/gnuplot/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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=""

Modified: head/math/naturalmath/Makefile
==============================================================================
--- head/math/naturalmath/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/math/naturalmath/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -15,7 +15,7 @@ MAINTAINER=	stephen at 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

Modified: head/math/petsc/Makefile
==============================================================================
--- head/math/petsc/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/math/petsc/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=	--with-umfpack-include=
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
-#USE_TEX=	tetex
+#USE_TEX=	latex:build
 #BUILD_DEPENDS+=	c2html:${PORTSDIR}/textproc/c2html	\
 #		doc2lt:${PORTSDIR}/textproc/sowing
 .endif

Modified: head/math/sage/Makefile
==============================================================================
--- head/math/sage/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/math/sage/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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}

Modified: head/misc/latex-mk/Makefile
==============================================================================
--- head/misc/latex-mk/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/misc/latex-mk/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -18,7 +18,7 @@ COMMENT=	A collection of makefile and sc
 BUILD_DEPENDS=	texi2dvi:${PORTSDIR}/print/texinfo
 RUN_DEPENDS=	texi2dvi:${PORTSDIR}/print/texinfo
 
-USE_TEX=	tetex
+USE_TEX=	latex
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 

Modified: head/net-im/pidgin-latex/Makefile
==============================================================================
--- head/net-im/pidgin-latex/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/net-im/pidgin-latex/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -23,7 +23,7 @@ RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/p
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
 
 CFLAGS+=	"-fPIC"
-USE_TEX=	tetex
+USE_TEX=	latex
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_BZIP2=	yes

Modified: head/net-mgmt/netmagis-common/Makefile
==============================================================================
--- head/net-mgmt/netmagis-common/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/net-mgmt/netmagis-common/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -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

Modified: head/print/abntex/Makefile
==============================================================================
--- head/print/abntex/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/print/abntex/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports at 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

Modified: head/print/auctex/Makefile
==============================================================================
--- head/print/auctex/Makefile	Sat May 11 17:50:05 2013	(r317898)
+++ head/print/auctex/Makefile	Sat May 11 17:58:55 2013	(r317899)
@@ -14,7 +14,7 @@ COMMENT=	Integrated environment for writ
 
 LICENSE=	GPLv3
 
-USE_TEX=	tetex
+USE_TEX=	latex

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-ports-all mailing list