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.

8 files changed, 12 insertions, 21 deletions

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$,,} \