- Use print/texinfo for texi2{dvi,pdf} instead of print/teTeX-base.

- Use print/teTeX-base for latex instead of print/teTeX.
- Use share/texmf for TeX-related files instead of share/texmf-local.

7 files changed, 33 insertions, 27 deletions

diff --git a/emulators/vmips/Makefile b/emulators/vmips/Makefile
index eefc8e2ded50..894e860e9a9c 100644
--- a/emulators/vmips/Makefile
+++ b/emulators/vmips/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vmips
 PORTVERSION=	1.3.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	SF \
 		http://www.dgate.org/vmips/releases/vmips-${PORTVERSION}/
@@ -16,7 +16,8 @@ MASTER_SITES=	SF \
 MAINTAINER=	brg@dgate.org
 COMMENT=	MIPS R3000 simulator
 
-BUILD_DEPENDS=	texi2dvi:${PORTSDIR}/print/teTeX-base
+BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		texi2dvi:${PORTSDIR}/print/texinfo
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 6757c9099f9f..6820ec08a826 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	sbcl
 PORTVERSION=	1.0.43.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	lang lisp
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} \
@@ -91,7 +91,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_PDF)
-BUILD_DEPENDS+=	texi2dvi:${PORTSDIR}/print/teTeX-base
+BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX-base \
+		texi2dvi:${PORTSDIR}/print/texinfo
 DOC_TARGETS+=	pdf
 PLIST_SUB+=	PDF=""
 . if !defined(NOPORTDOCS)
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index 698930f315b5..45c8e886e5cd 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asymptote
 PORTVERSION=	2.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
 		SF/${PORTNAME}/${PORTNAME}/old/${PORTVERSION}
@@ -25,13 +25,13 @@ LIB_DEPENDS=	fftw3.5:${PORTSDIR}/math/fftw3
 .endif
 BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick \
 		dvips:${PORTSDIR}/print/dvipsk-tetex \
-		latex:${PORTSDIR}/print/teTeX \
+		latex:${PORTSDIR}/print/teTeX-base \
 		makeinfo:${PORTSDIR}/textproc/texi2html \
-		${MKTEXLSR}:${PORTSDIR}/print/teTeX \
+		${MKTEXLSR}:${PORTSDIR}/print/teTeX-base \
 		svn:${PORTSDIR}/devel/subversion \
-		texi2dvi:${PORTSDIR}/print/teTeX
+		texi2dvi:${PORTSDIR}/print/texinfo
 RUN_DEPENDS=	gv:${PORTSDIR}/print/gv \
-		latex:${PORTSDIR}/print/teTeX \
+		latex:${PORTSDIR}/print/teTeX-base \
 		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${PYTHON_PKGNAMEPREFIX}imaging>=1.1.6_3:${PORTSDIR}/graphics/py-imaging
 
@@ -48,7 +48,7 @@ MAKE_JOBS_UNSAFE=	yes
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-latex=${LOCALBASE}/share/texmf-local/tex/latex
+CONFIGURE_ARGS+=	--with-latex=${LOCALBASE}/share/texmf/tex/latex
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include $${CPPFLAGS}" LFLAGS="-L${LOCALBASE}/lib $${LFLAGS}" CFLAGS="-I${LOCALBASE}/include $${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib $${LDFLAGS}"
 MAKE_ENV+=	${CONFIGURE_ENV}
 
diff --git a/math/asymptote/pkg-plist b/math/asymptote/pkg-plist
index 4b1a318c3dac..9012a6d4b716 100644
--- a/math/asymptote/pkg-plist
+++ b/math/asymptote/pkg-plist
@@ -504,15 +504,15 @@ bin/xasy
 %%PORTDOCS%%@dirrm info/asymptote
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/asy-faq.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-share/texmf-local/tex/context/third/asymptote/colo-asy.tex
-share/texmf-local/tex/latex/asymptote/asycolors.sty
-share/texmf-local/tex/latex/asymptote/asymptote.sty
-share/texmf-local/tex/latex/asymptote/latexmkrc
-share/texmf-local/tex/latex/asymptote/ocg.sty
+share/texmf/tex/context/third/asymptote/colo-asy.tex
+share/texmf/tex/latex/asymptote/asycolors.sty
+share/texmf/tex/latex/asymptote/asymptote.sty
+share/texmf/tex/latex/asymptote/latexmkrc
+share/texmf/tex/latex/asymptote/ocg.sty
 @dirrm %%DATADIR%%/GUI
 @dirrm %%DATADIR%%
-@dirrm share/texmf-local/tex/latex/asymptote
-@dirrm share/texmf-local/tex/context/third/asymptote
-@dirrm share/texmf-local/tex/context/third
-@unexec %%MKTEXLSR%%
-@exec %%MKTEXLSR%%
+@dirrm share/texmf/tex/latex/asymptote
+@dirrm share/texmf/tex/context/third/asymptote
+@dirrm share/texmf/tex/context/third
+@unexec %%MKTEXLSR%% %D/share/texmf
+@exec %%MKTEXLSR%% %D/share/texmf
diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index 1517ddf77566..684cc17e408f 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	blitz++
 PORTVERSION=	0.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	SF/blitz/blitz/Blitz%2B%2B%20${PORTVERSION}
 DISTNAME=	blitz-${PORTVERSION}
@@ -17,7 +17,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C++ class library for scientific computing
 
 .ifndef NOPORTDOCS
-BUILD_DEPENDS=	dvips:${PORTSDIR}/print/dvipsk-tetex
+BUILD_DEPENDS=	dvips:${PORTSDIR}/print/dvipsk-tetex \
+		texi2dvi:${PORTSDIR}/print/texinfo
 INFO=		blitz
 .else
 MAKE_ARGS=	NOPORTDOCS=yes
diff --git a/math/proofgeneral/Makefile b/math/proofgeneral/Makefile
index 8d9eaafa69b1..de72df0da0b0 100644
--- a/math/proofgeneral/Makefile
+++ b/math/proofgeneral/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	proofgeneral
 PORTVERSION=	3.7.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math elisp
 MASTER_SITES=	http://proofgeneral.inf.ed.ac.uk/releases/
 DISTNAME=	ProofGeneral-3.7.1
@@ -62,7 +62,8 @@ INFO=		PG-adapting ProofGeneral
 
 .if !defined(NOPORTDOCS)
 MAKE_ARGS+=	DOCSDIR=${DOCSDIR} INSTALLDOC=install-doc
-BUILD_DEPENDS+=	${LOCALBASE}/bin/texi2pdf:${PORTSDIR}/print/teTeX-base
+BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX-base \
+		texi2pdf:${PORTSDIR}/print/texinfo
 .endif
 
 post-patch:
diff --git a/misc/latex-mk/Makefile b/misc/latex-mk/Makefile
index f89df9468bd2..24d03867252e 100644
--- a/misc/latex-mk/Makefile
+++ b/misc/latex-mk/Makefile
@@ -8,15 +8,17 @@
 
 PORTNAME=	latex-mk
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc print
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	A collection of makefile and scripts for LaTeX documents
 
-BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		texi2dvi:${PORTSDIR}/print/texinfo
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		texi2dvi:${PORTSDIR}/print/texinfo
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes