2 files changed, 38 insertions, 33 deletions

diff --git a/print/preview-latex/Makefile b/print/preview-latex/Makefile
index f852d553c2c2..33ddd4fef3b3 100644
--- a/print/preview-latex/Makefile
+++ b/print/preview-latex/Makefile
@@ -7,22 +7,19 @@
 
 PORTNAME=	preview-latex
 PORTVERSION=	0.7.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	LaTeX previewer on Emacs
 
-USE_GHOSTSCRIPT=	yes
-
-BUILD_DEPENDS=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/auctex/latex.el:${PORTSDIR}/print/auctex
+BUILD_DEPENDS=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/auctex/latex.el:${PORTSDIR}/print/auctex \
+		${MKTEXLSR}:${PORTSDIR}/print/teTeX-base
 RUN_DEPENDS=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/auctex/latex.el:${PORTSDIR}/print/auctex \
-		mktexlsr:${PORTSDIR}/print/teTeX
-
-BROKEN=		Configure fails
+		${MKTEXLSR}:${PORTSDIR}/print/teTeX-base
 
 EMACS_PORT_NAME?=	emacs21
 
@@ -31,11 +28,18 @@ INFO=		preview-latex
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
 		--with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/preview \
-		--with-texmf=${PREFIX}/share/texmf
-CONFIGURE_ARGS+=	--disable-8bit-test
+		--with-texmf-dir=${PREFIX}/${TEXMFLOCAL} \
+		--disable-8bit-test
+USE_GHOSTSCRIPT=	yes
+PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR}
 
+INFO=	preview-latex
 DOCS=	ChangeLog INSTALL PROBLEMS README latex/README-preview RELEASE TODO
 
+TEXMFLOCAL=	share/texmf-local
+MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
+EMACS_PORT_NAME?=	emacs21
+
 pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
 	@${ECHO_MSG} ""
@@ -45,7 +49,7 @@ pre-everything::
 .endif
 
 post-install:
-	mktexlsr
+	${MKTEXLSR}
 	${INSTALL_DATA} ${WRKSRC}/preview-latex.el ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/preview/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/print/preview-latex/pkg-plist b/print/preview-latex/pkg-plist
index febd2e3efd5f..2e8f93e1ad7f 100644
--- a/print/preview-latex/pkg-plist
+++ b/print/preview-latex/pkg-plist
@@ -1,17 +1,18 @@
-share/texmf-var/tex/latex/preview/prauctex.cfg
-share/texmf-var/tex/latex/preview/prauctex.def
-share/texmf-var/tex/latex/preview/prcounters.def
-share/texmf-var/tex/latex/preview/preview.sty
-share/texmf-var/tex/latex/preview/prfootnotes.def
-share/texmf-var/tex/latex/preview/prlyx.def
-share/texmf-var/tex/latex/preview/prshowbox.def
-share/texmf-var/tex/latex/preview/prshowlabels.def
-share/texmf-var/tex/latex/preview/prtightpage.def
-share/texmf-var/tex/latex/preview/prtracingall.def
-@dirrm share/texmf-var/tex/latex/preview
-@exec %D/bin/mktexlsr
-@unexec %D/bin/mktexlsr
-share/texmf-var/doc/latex/styles/preview.dvi
+@comment $FreeBSD$
+%%TEXMFLOCAL%%/tex/latex/preview/prauctex.cfg
+%%TEXMFLOCAL%%/tex/latex/preview/prauctex.def
+%%TEXMFLOCAL%%/tex/latex/preview/prcounters.def
+%%TEXMFLOCAL%%/tex/latex/preview/preview.sty
+%%TEXMFLOCAL%%/tex/latex/preview/prfootnotes.def
+%%TEXMFLOCAL%%/tex/latex/preview/prlyx.def
+%%TEXMFLOCAL%%/tex/latex/preview/prshowbox.def
+%%TEXMFLOCAL%%/tex/latex/preview/prshowlabels.def
+%%TEXMFLOCAL%%/tex/latex/preview/prtightpage.def
+%%TEXMFLOCAL%%/tex/latex/preview/prtracingall.def
+@dirrm %%TEXMFLOCAL%%/tex/latex/preview
+%%TEXMFLOCAL%%/doc/latex/styles/preview.dvi
+@exec %%MKTEXLSR%%
+@unexec %%MKTEXLSR%%
 %%EMACS_VERSION_SITE_LISPDIR%%/preview/preview.el
 %%EMACS_VERSION_SITE_LISPDIR%%/preview/preview.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/preview/preview-latex.el
@@ -25,11 +26,11 @@ share/texmf-var/doc/latex/styles/preview.dvi
 %%EMACS_VERSION_SITE_LISPDIR%%/preview/prevwork.xbm
 %%EMACS_VERSION_SITE_LISPDIR%%/preview/prevwork.xpm
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/preview
-%%PORTDOCS%%share/doc/preview-latex/ChangeLog
-%%PORTDOCS%%share/doc/preview-latex/INSTALL
-%%PORTDOCS%%share/doc/preview-latex/PROBLEMS
-%%PORTDOCS%%share/doc/preview-latex/README
-%%PORTDOCS%%share/doc/preview-latex/README-preview
-%%PORTDOCS%%share/doc/preview-latex/RELEASE
-%%PORTDOCS%%share/doc/preview-latex/TODO
-%%PORTDOCS%%@dirrm share/doc/preview-latex
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/PROBLEMS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README-preview
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%