3 files changed, 27 insertions, 33 deletions

diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index ec6c642fb07c..3f3326173ef4 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	latex2html
 PORTVERSION=	2002.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	support/${PORTNAME}
@@ -21,22 +21,23 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/latex:${PORTSDIR}/print/teTeX-base \
 		${LOCALBASE}/bin/anytopnm:${PORTSDIR}/graphics/netpbm
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+CONFLICTS=	ja-latex2html-[0-9]*
+
 USE_PERL5=		yes
 USE_GHOSTSCRIPT=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=	--with-perl=${PERL} \
 		--disable-gif \
 		--shlibdir=${DATADIR} \
-		--with-texpath=${PREFIX}/${TEXMFLOCAL}/tex/latex/html
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PKGMESSAGE_IN=	${PKGDIR}/pkg-message
-PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR}
+		--with-texpath=${PREFIX}/${TEXMFDIR}/tex/latex/html
+SUB_FILES=	pkg-message
+PLIST_SUB=	TEXMFDIR=${TEXMFDIR} MKTEXLSR=${MKTEXLSR}
 
 MAN1=	latex2html.1
 
-TEXMFLOCAL=	share/texmf-local
+TEXMFDIR=	share/texmf
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
-DOC_FILES=	FAQ INSTALL LICENSE README
+PORTDOCS=	FAQ INSTALL LICENSE README
 
 .include <bsd.port.pre.mk>
 
@@ -48,18 +49,15 @@ pre-everything::
 	@${ECHO_MSG} ""
 .endif
 
-post-patch:
-	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${PKGMESSAGE_IN} > ${PKGMESSAGE}
-
 post-install:
 	${INSTALL_MAN} ${FILESDIR}/latex2html.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${DOC_FILES}
+.for file in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
-	@${MKTEXLSR}
+	@${MKTEXLSR} ${PREFIX}/${TEXMFDIR}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/textproc/latex2html/pkg-message b/textproc/latex2html/files/pkg-message.in
index 56695a9f21b7..4d679074b550 100644
--- a/textproc/latex2html/pkg-message
+++ b/textproc/latex2html/files/pkg-message.in
@@ -1,3 +1,3 @@
 ****  Individual user configurations can be accomplished by placing a copy
-      of %%PREFIX%%/share/latex2html/dot.latex2html-init in the user's home
+      of %%DATADIR%%/dot.latex2html-init in the user's home
       directory and editing to preference.
diff --git a/textproc/latex2html/pkg-plist b/textproc/latex2html/pkg-plist
index d977572153a2..5bb489832ca7 100644
--- a/textproc/latex2html/pkg-plist
+++ b/textproc/latex2html/pkg-plist
@@ -1,12 +1,9 @@
+@comment $FreeBSD$
 bin/latex2html
 bin/pstoimg
 bin/texexpand
 lib/latex2html/cfgcache.pm
 lib/latex2html/l2hconf.pm
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%DATADIR%%/IndicTeX-HTML/README
 %%DATADIR%%/IndicTeX-HTML/bengali.perl
 %%DATADIR%%/IndicTeX-HTML/bengali.sty
@@ -306,22 +303,21 @@ lib/latex2html/l2hconf.pm
 %%DATADIR%%/versions/techexpl.pl
 %%DATADIR%%/versions/unicode.pl
 %%DATADIR%%/versions/utf8.pl
-%%TEXMFLOCAL%%/tex/latex/html/floatflt.ins
-%%TEXMFLOCAL%%/tex/latex/html/frames.sty
-%%TEXMFLOCAL%%/tex/latex/html/heqn.sty
-%%TEXMFLOCAL%%/tex/latex/html/hthtml.sty
-%%TEXMFLOCAL%%/tex/latex/html/html.sty
-%%TEXMFLOCAL%%/tex/latex/html/htmllist.sty
-%%TEXMFLOCAL%%/tex/latex/html/justify.sty
-%%TEXMFLOCAL%%/tex/latex/html/latin9.def
-%%TEXMFLOCAL%%/tex/latex/html/ldump.sty
-%%TEXMFLOCAL%%/tex/latex/html/techexplHTML.tex
-%%TEXMFLOCAL%%/tex/latex/html/url.sty
-%%TEXMFLOCAL%%/tex/latex/html/verbatimfiles.sty
-@exec %%MKTEXLSR%%
-@unexec %%MKTEXLSR%%
+%%TEXMFDIR%%/tex/latex/html/floatflt.ins
+%%TEXMFDIR%%/tex/latex/html/frames.sty
+%%TEXMFDIR%%/tex/latex/html/heqn.sty
+%%TEXMFDIR%%/tex/latex/html/hthtml.sty
+%%TEXMFDIR%%/tex/latex/html/html.sty
+%%TEXMFDIR%%/tex/latex/html/htmllist.sty
+%%TEXMFDIR%%/tex/latex/html/justify.sty
+%%TEXMFDIR%%/tex/latex/html/latin9.def
+%%TEXMFDIR%%/tex/latex/html/ldump.sty
+%%TEXMFDIR%%/tex/latex/html/techexplHTML.tex
+%%TEXMFDIR%%/tex/latex/html/url.sty
+%%TEXMFDIR%%/tex/latex/html/verbatimfiles.sty
+@exec %%MKTEXLSR%% %D/%%TEXMFDIR%%
+@unexec %%MKTEXLSR%% %D/%%TEXMFDIR%%
 @dirrm lib/latex2html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/IndicTeX-HTML
 @dirrm %%DATADIR%%/L2hos
 @dirrm %%DATADIR%%/XyMTeX-HTML
@@ -338,4 +334,4 @@ lib/latex2html/l2hconf.pm
 @dirrm %%DATADIR%%/texinputs
 @dirrm %%DATADIR%%/versions
 @dirrm %%DATADIR%%
-@dirrm %%TEXMFLOCAL%%/tex/latex/html
+@dirrm %%TEXMFDIR%%/tex/latex/html