19 files changed, 154 insertions, 272 deletions

diff --git a/print/latex-arydshln/Makefile b/print/latex-arydshln/Makefile
index 09f4f072b7a3..a8d13c0103d6 100644
--- a/print/latex-arydshln/Makefile
+++ b/print/latex-arydshln/Makefile
@@ -16,10 +16,9 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package that draws dash-lines in array/tabular
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX \
-		tex:${PORTSDIR}/print/teTeX \
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
 		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
 		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 
 PLIST=		${WRKDIR}/pkg-plist
diff --git a/print/latex-biblist/Makefile b/print/latex-biblist/Makefile
index 14ac7cb9b183..a7049f436b52 100644
--- a/print/latex-biblist/Makefile
+++ b/print/latex-biblist/Makefile
@@ -16,9 +16,10 @@ EXTRACT_ONLY=	#empty
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package for printing all of a BibTeX database entries
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX \
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
 		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 
 NO_BUILD=	YES
 PLIST=		${WRKDIR}/pkg-plist
diff --git a/print/latex-bibtopic/Makefile b/print/latex-bibtopic/Makefile
index abbdc89e4c71..4e068176da4c 100644
--- a/print/latex-bibtopic/Makefile
+++ b/print/latex-bibtopic/Makefile
@@ -16,10 +16,10 @@ EXTRACT_ONLY=	#empty
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package allows several bibliographies in a document
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX \
-		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
-		latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 
 PLIST=		${WRKDIR}/pkg-plist
 
diff --git a/print/latex-bibunits/Makefile b/print/latex-bibunits/Makefile
index 8652ed5dceb2..e7570b615eeb 100644
--- a/print/latex-bibunits/Makefile
+++ b/print/latex-bibunits/Makefile
@@ -17,10 +17,10 @@ EXTRACT_ONLY=	#empty
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package allows separate bibliographies
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX \
-		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
-		tex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 
 PLIST=		${WRKDIR}/pkg-plist
 
diff --git a/print/latex-booktabs/Makefile b/print/latex-booktabs/Makefile
index 38120f8bee74..97982fa5de5b 100644
--- a/print/latex-booktabs/Makefile
+++ b/print/latex-booktabs/Makefile
@@ -16,9 +16,10 @@ EXTRACT_ONLY=	#empty
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package for publication quality tables
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX \
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
 		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 
 NO_BUILD=	YES
 PLIST=		${WRKDIR}/pkg-plist
diff --git a/print/latex-bytefield/Makefile b/print/latex-bytefield/Makefile
index a7d264d7e445..adc715a24ea4 100644
--- a/print/latex-bytefield/Makefile
+++ b/print/latex-bytefield/Makefile
@@ -16,15 +16,15 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package that utilization diagram of data fields
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
-BUILD_DEPENDS+=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
-BUILD_DEPENDS+=	tex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-
-PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR}
-PLIST_SUB+=	CLASSDIR=${CLASSDIR}
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 
+PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
+		CLASSDIR=${CLASSDIR}
 USE_GMAKE=	YES
+
 TEXMFLOCAL=	share/texmf-local
 TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
@@ -32,14 +32,8 @@ TEX_BIN=	${LOCALBASE}/bin/tex
 CLASSDIR=	${TEXMFLOCAL}/tex/latex/${PORTNAME:S/^latex-//}
 WRKSRC=		${WRKDIR}/${PORTNAME:S/^latex-//}
 
-CLASS_FILES=	bytefield.dtx
-CLASS_FILES+=	bytefield.sty
-CLASS_FILES+=	bytefield.ins
-
-DOC_FILES=	README
-DOC_FILES+=	bytefield.pdf
-DOC_FILES+=	example.pdf
-DOC_FILES+=	example.tex
+CLASS_FILES=	bytefield.dtx bytefield.sty bytefield.ins
+DOC_FILES=	README bytefield.pdf example.pdf example.tex
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/print/latex-caption/Makefile b/print/latex-caption/Makefile
index 4a52b68ced8d..fcb6f4bae5d1 100644
--- a/print/latex-caption/Makefile
+++ b/print/latex-caption/Makefile
@@ -16,15 +16,15 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package that supports customization of captions
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
-BUILD_DEPENDS+=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
-BUILD_DEPENDS+=	tex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-
-PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR}
-PLIST_SUB+=	CLASSDIR=${CLASSDIR}
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 
+PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
+		CLASSDIR=${CLASSDIR}
 USE_GMAKE=	YES
+
 TEXMFLOCAL=	share/texmf-local
 TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
@@ -33,14 +33,8 @@ YES_CMD=	/usr/bin/yes
 CLASSDIR=	${TEXMFLOCAL}/tex/latex/${PORTNAME:S/^latex-//}
 WRKSRC=		${WRKDIR}/${PORTNAME:S/^latex-//}
 
-CLASS_FILES=	caption.dtx
-CLASS_FILES+=	caption.sty
-CLASS_FILES+=	caption.ins
-CLASS_FILES+=	caption2.dtx
-CLASS_FILES+=	caption2.sty
-
-DOC_FILES=	manual.tex
-DOC_FILES+=	caption.xml
+CLASS_FILES=	caption.dtx caption.sty caption.ins caption2.dtx caption2.sty
+DOC_FILES=	manual.tex caption.xml
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/print/latex-feynmf/Makefile b/print/latex-feynmf/Makefile
index b2b6a528f62e..034ae1c0876b 100644
--- a/print/latex-feynmf/Makefile
+++ b/print/latex-feynmf/Makefile
@@ -18,13 +18,13 @@ EXTRACT_ONLY=	#empty
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package for drawing of Feynman diagrams
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
-BUILD_DEPENDS+=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
-BUILD_DEPENDS+=	tex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 
-PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR}
-PLIST_SUB+=	CLASSDIR=${CLASSDIR} FONTDIR=${FONTDIR} MPDIR=${MPDIR}
+PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
+		CLASSDIR=${CLASSDIR} FONTDIR=${FONTDIR} MPDIR=${MPDIR}
 
 TEXMFLOCAL=	share/texmf-local
 TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
@@ -34,22 +34,16 @@ CLASSDIR=	${TEXMFLOCAL}/tex/latex/${PORTNAME:S/^latex-//}
 FONTDIR=	${TEXMFLOCAL}/fonts/source/public/${PORTNAME:S/^latex-//}
 MPDIR=		${TEXMFLOCAL}/metapost/${PORTNAME:S/^latex-//}
 
-DOC_FILES=	Announce
-DOC_FILES+=	COPYING
-DOC_FILES+=	Feynman.Diagrams
-DOC_FILES+=	README
-DOC_FILES+=	Tutorial
-DOC_FILES+=	manual.ps.gz
-DOC_FILES+=	template.tex
+DOC_FILES=	Announce COPYING Feynman.Diagrams README \
+		Tutorial manual.ps.gz template.tex
 
-CLASS_FILES=	feynmf.dtx
-CLASS_FILES+=	feynmf.ins feynmf209.ins
-CLASS_FILES+=	feynmf.sty feynmp.sty
+CLASS_FILES=	feynmf.dtx feynmf.ins feynmf209.ins \
+		feynmf.sty feynmp.sty
 
 SCRIPT_FILES=	feynmf.pl
 
 FONT_FILES=	feynmf.mf
-MP_FILES+=	feynmp.mp manpics.mp manpics.1 manpics.2 manpics.3
+MP_FILES=	feynmp.mp manpics.mp manpics.1 manpics.2 manpics.3
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/print/latex-index/Makefile b/print/latex-index/Makefile
index 4c9d78078835..24a674a15023 100644
--- a/print/latex-index/Makefile
+++ b/print/latex-index/Makefile
@@ -16,15 +16,15 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package that reimplements LaTeX indexing macros
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
-BUILD_DEPENDS+=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
-BUILD_DEPENDS+=	tex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-
-PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR}
-PLIST_SUB+=	CLASSDIR=${CLASSDIR}
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 
+PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
+		CLASSDIR=${CLASSDIR}
 USE_GMAKE=	YES
+
 TEXMFLOCAL=	share/texmf-local
 TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
@@ -33,24 +33,13 @@ YES_CMD=	/usr/bin/yes
 CLASSDIR=	${TEXMFLOCAL}/tex/latex/${PORTNAME:S/^latex-//}
 WRKSRC=		${WRKDIR}/${PORTNAME:S/^latex-//}
 
-CLASS_FILES=	agsmtst.tex
-CLASS_FILES+=	autind.sty
-CLASS_FILES+=	autind.tex
-CLASS_FILES+=	bibref.ist
-CLASS_FILES+=	bibref.sty
-CLASS_FILES+=	index.dtx
-CLASS_FILES+=	index.ins
-CLASS_FILES+=	plaintst.tex
-CLASS_FILES+=	test.bib
-CLASS_FILES+=	xagsm.bst
-CLASS_FILES+=	xplain.bst
+CLASS_FILES=	agsmtst.tex autind.sty autind.tex bibref.ist \
+		bibref.sty index.dtx index.ins plaintst.tex \
+		test.bib xagsm.bst xplain.bst
 
-CLASS_ADD_FILES+=	index.sty
-CLASS_ADD_FILES+=	sample.tex
+CLASS_ADD_FILES=	index.sty sample.tex
 
-DOC_FILES=	README
-DOC_FILES+=	TODO
-DOC_FILES+=	index.pdf
+DOC_FILES=	README TODO index.pdf
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/print/latex-keystroke/Makefile b/print/latex-keystroke/Makefile
index 0b63efd51f3a..9da79d45f377 100644
--- a/print/latex-keystroke/Makefile
+++ b/print/latex-keystroke/Makefile
@@ -16,28 +16,25 @@ EXTRACT_ONLY=	#empty
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package for the graphical representation of the keys
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 
 NO_BUILD=	YES
-PLIST_SUB=	TEXMF=${TEXMF} MKTEXLSR=${MKTEXLSR}
-PLIST_SUB+=	CLASSDIR=${CLASSDIR}
+PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
+		CLASSDIR=${CLASSDIR}
 
-TEXMF=		share/texmf
+TEXMFLOCAL=	share/texmf-local
+TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
-CLASSDIR=	${TEXMF}/tex/latex/${PORTNAME:S/^latex-//}
+CLASSDIR=	${TEXMFLOCAL}/tex/latex/${PORTNAME:S/^latex-//}
 
 DOC_FILES=	README
 
-CLASS_FILES+=	key-test.pdf
-CLASS_FILES+=	key-test.tex
-CLASS_FILES+=	keystroke.sty
-CLASS_FILES+=	keystroke_left.eps
-CLASS_FILES+=	keystroke_left.pdf
-CLASS_FILES+=	keystroke_middle.eps
-CLASS_FILES+=	keystroke_middle.pdf
-CLASS_FILES+=	keystroke_right.eps
-CLASS_FILES+=	keystroke_right.pdf
+CLASS_FILES=	key-test.pdf key-test.tex keystroke.sty \
+		keystroke_left.eps keystroke_left.pdf keystroke_middle.eps \
+		keystroke_middle.pdf keystroke_right.eps keystroke_right.pdf
 
 do-install:
 	${MKDIR} ${PREFIX}/${CLASSDIR}
diff --git a/print/latex-layouts/Makefile b/print/latex-layouts/Makefile
index 0641af1cc0df..a667751b1e91 100644
--- a/print/latex-layouts/Makefile
+++ b/print/latex-layouts/Makefile
@@ -16,13 +16,13 @@ EXTRACT_ONLY=	#empty
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package for the display of layout elements
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
-BUILD_DEPENDS+=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
-BUILD_DEPENDS+=	tex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 
-PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR}
-PLIST_SUB+=	CLASSDIR=${CLASSDIR}
+PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
+		CLASSDIR=${CLASSDIR}
 
 TEXMFLOCAL=	share/texmf-local
 TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
@@ -32,13 +32,9 @@ YES_CMD=	/usr/bin/yes
 CLASSDIR=	${TEXMFLOCAL}/tex/latex/${PORTNAME:S/^latex-//}
 WRKSRC=		${WRKDIR}/${PORTNAME:S/^latex-//}
 
-CLASS_FILES=	layouts.dtx
-CLASS_FILES+=	layouts.ins
-CLASS_FILES+=	layouts.sty
+CLASS_FILES=	layouts.dtx layouts.ins layouts.sty
 
-DOC_FILES=	README
-DOC_FILES+=	layman.pdf
-DOC_FILES+=	layman.tex
+DOC_FILES=	README layman.pdf layman.tex
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/print/latex-lineno/Makefile b/print/latex-lineno/Makefile
index 2cfe8329930b..f44cfb5e1c87 100644
--- a/print/latex-lineno/Makefile
+++ b/print/latex-lineno/Makefile
@@ -16,9 +16,9 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package that provides line numbers on paragraphs
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX \
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
 		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
-RUN_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX \
+RUN_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
 		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 
 NO_BUILD=	yes
diff --git a/print/latex-logpap/Makefile b/print/latex-logpap/Makefile
index 962045099592..15ba9128b5fe 100644
--- a/print/latex-logpap/Makefile
+++ b/print/latex-logpap/Makefile
@@ -16,13 +16,13 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package for drawing logarithmic graph paper
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
-BUILD_DEPENDS+=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
-BUILD_DEPENDS+=	tex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 
-PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR}
-PLIST_SUB+=	CLASSDIR=${CLASSDIR}
+PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
+		CLASSDIR=${CLASSDIR}
 
 USE_GMAKE=	YES
 TEXMFLOCAL=	share/texmf-local
diff --git a/print/latex-mathabx/Makefile b/print/latex-mathabx/Makefile
index 9d17eea162ec..88f86e666974 100644
--- a/print/latex-mathabx/Makefile
+++ b/print/latex-mathabx/Makefile
@@ -13,104 +13,46 @@ DISTFILES=	mathabx${EXTRACT_SUFX} abxtype1${EXTRACT_SUFX}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Math series, aka mathabx MetaFont fontset for TeX/LaTeX
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 
 USE_ZIP=	YES
 NO_BUILD=	YES
-PLIST_SUB=	TEXMF=${TEXMF} MKTEXLSR=${MKTEXLSR}
-PLIST_SUB+=	CLASSDIR=${CLASSDIR} MFDIR=${MFDIR}
-PLIST_SUB+=	TYPE1DIR=${TYPE1DIR} DVIPSDIR=${DVIPSDIR}
+PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
+		CLASSDIR=${CLASSDIR} MFDIR=${MFDIR} \
+		TYPE1DIR=${TYPE1DIR} DVIPSDIR=${DVIPSDIR}
 
 TEXMF=		share/texmf
+TEXMFLOCAL=	share/texmf-local
+TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
-CLASSDIR=	${TEXMF}/tex/latex/${PORTNAME:S/^latex-//}
-MFDIR=		${TEXMF}/fonts/source/public/${PORTNAME:S/^latex-//}
-TYPE1DIR=	${TEXMF}/fonts/type1/${PORTNAME:S/^latex-//}
-DVIPSDIR=	${TEXMF}/dvips/${PORTNAME:S/^latex-//}
 WRKSRC=		${WRKDIR}/${PORTNAME:S/^latex-//}
 
-CLASS_FILES=	mathabx.dcl
-CLASS_FILES+=	mathabx.sty
-CLASS_FILES+=	mathabx.tex
-CLASS_FILES+=	testmac.tex
+CLASSDIR=	${TEXMFLOCAL}/tex/latex/${PORTNAME:S/^latex-//}
+CLASS_FILES=	mathabx.dcl mathabx.sty mathabx.tex testmac.tex
 
-MF_FILES=	matha10.mf
-MF_FILES+=	matha12.mf
-MF_FILES+=	matha5.mf
-MF_FILES+=	matha6.mf
-MF_FILES+=	matha7.mf
-MF_FILES+=	matha8.mf
-MF_FILES+=	matha9.mf
-MF_FILES+=	mathacnt.mf
-MF_FILES+=	mathadrv.mf
-MF_FILES+=	matharrw.mf
-MF_FILES+=	mathastr.mf
-MF_FILES+=	mathasym.mf
-MF_FILES+=	mathb10.mf
-MF_FILES+=	mathb12.mf
-MF_FILES+=	mathb5.mf
-MF_FILES+=	mathb6.mf
-MF_FILES+=	mathb7.mf
-MF_FILES+=	mathb8.mf
-MF_FILES+=	mathb9.mf
-MF_FILES+=	mathbase.mf
-MF_FILES+=	mathbdel.mf
-MF_FILES+=	mathbdrv.mf
-MF_FILES+=	mathbigs.mf
-MF_FILES+=	mathbsym.mf
-MF_FILES+=	mathcall.mf
-MF_FILES+=	mathextr.mf
-MF_FILES+=	mathfine.mf
-MF_FILES+=	mathgrey.mf
-MF_FILES+=	mathhbrw.mf
-MF_FILES+=	mathineq.mf
-MF_FILES+=	mathltlk.mf
-MF_FILES+=	mathmbcb.mf
-MF_FILES+=	mathprmt.mf
-MF_FILES+=	mathsmsy.mf
-MF_FILES+=	mathsubs.mf
-MF_FILES+=	mathsymb.mf
-MF_FILES+=	matht10.mf
-MF_FILES+=	mathu10.mf
-MF_FILES+=	mathudrv.mf
-MF_FILES+=	mathusym.mf
-MF_FILES+=	mathux10.mf
-MF_FILES+=	mathuxdrv.mf
-MF_FILES+=	mathx10.mf
-MF_FILES+=	mathx12.mf
-MF_FILES+=	mathx5.mf
-MF_FILES+=	mathx6.mf
-MF_FILES+=	mathx7.mf
-MF_FILES+=	mathx8.mf
-MF_FILES+=	mathx9.mf
-MF_FILES+=	mathxdrv.mf
-MF_FILES+=	maydigit.mf
+MFDIR=		${TEXMFLOCAL}/fonts/source/public/${PORTNAME:S/^latex-//}
+MF_FILES=	matha10.mf matha12.mf matha5.mf matha6.mf matha7.mf \
+		matha8.mf matha9.mf mathacnt.mf mathadrv.mf matharrw.mf \
+		mathastr.mf mathasym.mf mathb10.mf mathb12.mf mathb5.mf \
+		mathb6.mf mathb7.mf mathb8.mf mathb9.mf mathbase.mf \
+		mathbdel.mf mathbdrv.mf mathbigs.mf mathbsym.mf mathcall.mf \
+		mathextr.mf mathfine.mf mathgrey.mf mathhbrw.mf mathineq.mf \
+		mathltlk.mf mathmbcb.mf mathprmt.mf mathsmsy.mf mathsubs.mf \
+		mathsymb.mf matht10.mf mathu10.mf mathudrv.mf mathusym.mf \
+		mathux10.mf mathuxdrv.mf mathx10.mf mathx12.mf mathx5.mf \
+		mathx6.mf mathx7.mf mathx8.mf mathx9.mf mathxdrv.mf maydigit.mf
 
-TYPE1_FILES=	matha10.pfb
-TYPE1_FILES+=	matha12.pfb
-TYPE1_FILES+=	matha5.pfb
-TYPE1_FILES+=	matha6.pfb
-TYPE1_FILES+=	matha7.pfb
-TYPE1_FILES+=	matha8.pfb
-TYPE1_FILES+=	matha9.pfb
-TYPE1_FILES+=	mathb10.pfb
-TYPE1_FILES+=	mathb12.pfb
-TYPE1_FILES+=	mathb5.pfb
-TYPE1_FILES+=	mathb6.pfb
-TYPE1_FILES+=	mathb7.pfb
-TYPE1_FILES+=	mathb8.pfb
-TYPE1_FILES+=	mathb9.pfb
-TYPE1_FILES+=	mathu10.pfb
-TYPE1_FILES+=	mathux10.pfb
-TYPE1_FILES+=	mathx10.pfb
-TYPE1_FILES+=	mathx12.pfb
-TYPE1_FILES+=	mathx5.pfb
-TYPE1_FILES+=	mathx6.pfb
-TYPE1_FILES+=	mathx7.pfb
-TYPE1_FILES+=	mathx8.pfb
-TYPE1_FILES+=	mathx9.pfb
+TYPE1DIR=	${TEXMFLOCAL}/fonts/type1/${PORTNAME:S/^latex-//}
+TYPE1_FILES=	matha10.pfb matha12.pfb matha5.pfb matha6.pfb matha7.pfb \
+		matha8.pfb matha9.pfb mathb10.pfb mathb12.pfb mathb5.pfb \
+		mathb6.pfb mathb7.pfb mathb8.pfb mathb9.pfb mathu10.pfb \
+		mathux10.pfb mathx10.pfb mathx12.pfb mathx5.pfb mathx6.pfb \
+		mathx7.pfb mathx8.pfb mathx9.pfb
 
+DVIPSDIR=	${TEXMFLOCAL}/dvips/${PORTNAME:S/^latex-//}
 DVIPS_FILES=	mathabx.map
 
 do-install:
diff --git a/print/latex-mathabx/pkg-message b/print/latex-mathabx/pkg-message
index 01fef1f03808..d0e19c084bf0 100644
--- a/print/latex-mathabx/pkg-message
+++ b/print/latex-mathabx/pkg-message
@@ -5,6 +5,6 @@ How To Use Math series
 
 dvips:
 	Add a line "p +mathabx.map" into
-	%%PREFIX%%/%%TEXMF%%/dvips/config/config.ps.
+	%%PREFIX%%/%%TEXMF%%-var/dvips/config/config.ps.
 
 (NOTE: This instruction depends on the directory layout of teTeX distribution.)
diff --git a/print/latex-pict2e/Makefile b/print/latex-pict2e/Makefile
index 65464072d239..e88c9050d586 100644
--- a/print/latex-pict2e/Makefile
+++ b/print/latex-pict2e/Makefile
@@ -16,10 +16,9 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package that extends the LaTeX picture environment
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX \
-		tex:${PORTSDIR}/print/teTeX \
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
 		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
 		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 
 PLIST_SUB=	MKTEXLSR=${MKTEXLSR} CLASSDIR=${CLASSDIR}
diff --git a/print/latex-subfig/Makefile b/print/latex-subfig/Makefile
index 3cf4b69655f4..6b714a4d32d1 100644
--- a/print/latex-subfig/Makefile
+++ b/print/latex-subfig/Makefile
@@ -14,16 +14,18 @@ DISTNAME=	subfig.11
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package that supports small "sub" figures/tables
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
-BUILD_DEPENDS+=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
-BUILD_DEPENDS+=	${STY_CAPTION}:${PORTSDIR}/print/latex-caption
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-
-PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR}
-PLIST_SUB+=	CLASSDIR=${CLASSDIR}
-
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
+		${STY_CAPTION}:${PORTSDIR}/print/latex-caption
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
+		${STY_CAPTION}:${PORTSDIR}/print/latex-caption
+
+PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
+		CLASSDIR=${CLASSDIR}
 USE_GMAKE=	YES
 ALL_TARGET=	sty
+
 TEXMFLOCAL=	share/texmf-local
 TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
 STY_CAPTION=	${LOCALBASE}/${TEXMFLOCAL}/tex/latex/caption/caption.sty
@@ -31,18 +33,10 @@ MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
 CLASSDIR=	${TEXMFLOCAL}/tex/latex/${PORTNAME:S/^latex-//}
 WRKSRC=		${WRKDIR}/${PORTNAME:S/^latex-//}
 
-CLASS_FILES=	subfig.dtx
-CLASS_FILES+=	subfig.ins
-CLASS_FILES+=	subfig.sty
-CLASS_FILES+=	subfig.cfg
-
-DOC_FILES=	README
-DOC_FILES+=	test1.tex
-DOC_FILES+=	test2.tex
-DOC_FILES+=	test3.tex
-DOC_FILES+=	test4.tex
-DOC_FILES+=	test5.tex
-DOC_FILES+=	test6.tex
+CLASS_FILES=	subfig.dtx subfig.ins subfig.sty subfig.cfg
+
+DOC_FILES=	README test1.tex test2.tex test3.tex \
+		test4.tex test5.tex test6.tex
 
 do-install:
 	${MKDIR} ${PREFIX}/${CLASSDIR}
diff --git a/print/latex-subfloat/Makefile b/print/latex-subfloat/Makefile
index 0594e6c0946f..8bcb223c49e3 100644
--- a/print/latex-subfloat/Makefile
+++ b/print/latex-subfloat/Makefile
@@ -15,13 +15,13 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package that enables subnumbering of different floats
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
-BUILD_DEPENDS+=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
-BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 
-PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR}
-PLIST_SUB+=	CLASSDIR=${CLASSDIR}
+PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
+		CLASSDIR=${CLASSDIR}
 
 TEXMFLOCAL=	share/texmf-local
 TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
@@ -30,14 +30,9 @@ TEX_BIN=	${LOCALBASE}/bin/tex
 CLASSDIR=	${TEXMFLOCAL}/tex/latex/${PORTNAME:S/^latex-//}
 WRKSRC=		${WRKDIR}/${PORTNAME:S/^latex-//}
 
-CLASS_FILES=	subfloat.dtx
-CLASS_FILES+=	subfloat.sty
-CLASS_FILES+=	subfloat.ins
+CLASS_FILES=	subfloat.dtx subfloat.sty subfloat.ins
 
-DOC_FILES=	README
-DOC_FILES+=	ChangeLog
-DOC_FILES+=	subfloat.dvi
-DOC_FILES+=	subfloat.xml
+DOC_FILES=	README ChangeLog subfloat.dvi subfloat.xml
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/print/latex-timing/Makefile b/print/latex-timing/Makefile
index cdd006a7fc13..b56c881f2098 100644
--- a/print/latex-timing/Makefile
+++ b/print/latex-timing/Makefile
@@ -16,46 +16,33 @@ EXTRACT_ONLY=	#empty
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package for drawing timing diagrams
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
-BUILD_DEPENDS+=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 
 NO_BUILD=	YES
-PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR}
-PLIST_SUB+=	CLASSDIR=${CLASSDIR}
-PLIST_SUB+=	MFDIR=${MFDIR} TFMDIR=${TFMDIR} PKDIR=${PKDIR}
+PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
+		CLASSDIR=${CLASSDIR} \
+		MFDIR=${MFDIR} TFMDIR=${TFMDIR} PKDIR=${PKDIR}
 
 TEXMFLOCAL=	share/texmf-local
 TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
-CLASSDIR=	${TEXMFLOCAL}/tex/latex/${PORTNAME:S/^latex-//}
-MFDIR=		${TEXMFLOCAL}/fonts/source/public/${PORTNAME:S/^latex-//}
-TFMDIR=		${TEXMFLOCAL}/fonts/tfm/${PORTNAME:S/^latex-//}
-PKDIR=		${TEXMFLOCAL}/fonts/pk/${PORTNAME:S/^latex-//}
 
-DOC_FILES=	read.me
-DOC_FILES+=	timing.dvi
-DOC_FILES+=	timing.tex
-DOC_FILES+=	prozt1.tex
-DOC_FILES+=	tim0594.upl
+DOC_FILES=	read.me timing.dvi timing.tex prozt1.tex tim0594.upl
 
+CLASSDIR=	${TEXMFLOCAL}/tex/latex/${PORTNAME:S/^latex-//}
 CLASS_FILES=	timing.sty
 
-MF_FILES=	timing.mf
-MF_FILES+=	timing1.mf
-MF_FILES+=	timing1s.mf
-MF_FILES+=	timing2.mf
-MF_FILES+=	timing2s.mf
+MFDIR=		${TEXMFLOCAL}/fonts/source/public/${PORTNAME:S/^latex-//}
+MF_FILES=	timing.mf timing1.mf timing1s.mf timing2.mf timing2s.mf
 
-PK_FILES=	timing1.pk
-PK_FILES+=	timing1s.pk
-PK_FILES+=	timing2.pk
-PK_FILES+=	timing2s.pk
+PKDIR=		${TEXMFLOCAL}/fonts/pk/${PORTNAME:S/^latex-//}
+PK_FILES=	timing1.pk timing1s.pk timing2.pk timing2s.pk
 
-TFM_FILES=	timing1.tfm
-TFM_FILES+=	timing1s.tfm
-TFM_FILES+=	timing2.tfm
-TFM_FILES+=	timing2s.tfm
+TFMDIR=		${TEXMFLOCAL}/fonts/tfm/${PORTNAME:S/^latex-//}
+TFM_FILES=	timing1.tfm timing1s.tfm timing2.tfm timing2s.tfm
 
 do-install:
 	${MKDIR} ${PREFIX}/${CLASSDIR}