2 files changed, 38 insertions, 59 deletions

diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index aa4c6c86e92e..520a5c8c6a84 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -7,49 +7,37 @@
 
 PORTNAME=	latex2html
 PORTVERSION=	2002.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	support/${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S,.,-,g}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Convert LaTeX documents to HTML
 
-.include <bsd.port.pre.mk>
-
-# Global variables
-#
-
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
-
-BUILD_DEPENDS=	${LOCALBASE}/bin/latex:${PORTSDIR}/print/teTeX \
-		${LOCALBASE}/bin/gs:${PORTSDIR}/${GSPORT} \
+BUILD_DEPENDS=	${LOCALBASE}/bin/latex:${PORTSDIR}/print/teTeX-base \
 		${LOCALBASE}/bin/anytopnm:${PORTSDIR}/graphics/netpbm
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
+USE_PERL5=		yes
+USE_GHOSTSCRIPT=	yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=	--with-perl=${PERL} \
 		--disable-gif \
-		--shlibdir=${DATADIR}
-
-MAN1=	latex2html.1
-
-MSG_FILE=	${PKGDIR}/pkg-message
+		--shlibdir=${DATADIR} \
+		--with-texpath=${PREFIX}/${TEXMFLOCAL}/tex/latex/html
 PKGMESSAGE=	${WRKDIR}/pkg-message
+PKGMESSAGE_IN=	${PKGDIR}/pkg-message
+PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR}
 
-# Local variables
-#
+MAN1=	latex2html.1
 
+TEXMFLOCAL=	share/texmf-local
+MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
 DOC_FILES=	FAQ INSTALL LICENSE README
 
-# Inform message
-#
+.include <bsd.port.pre.mk>
 
 pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
@@ -59,18 +47,10 @@ pre-everything::
 	@${ECHO_MSG} ""
 .endif
 
-# Port-patch
-#
-
 post-patch:
-	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
+	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${PKGMESSAGE_IN} > ${PKGMESSAGE}
 
-# Post-install
-#
-
-post-install: install-docs display-message
-
-install-docs:
+post-install:
 	${INSTALL_MAN} ${FILESDIR}/latex2html.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -78,8 +58,7 @@ install-docs:
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
-
-display-message:
+	@${MKTEXLSR}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/textproc/latex2html/pkg-plist b/textproc/latex2html/pkg-plist
index 8610568ea78f..3b4685ddb491 100644
--- a/textproc/latex2html/pkg-plist
+++ b/textproc/latex2html/pkg-plist
@@ -3,10 +3,10 @@ bin/pstoimg
 bin/texexpand
 lib/latex2html/cfgcache.pm
 lib/latex2html/l2hconf.pm
-share/doc/latex2html/FAQ
-share/doc/latex2html/INSTALL
-share/doc/latex2html/LICENSE
-share/doc/latex2html/README
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
 share/latex2html/IndicTeX-HTML/README
 share/latex2html/IndicTeX-HTML/bengali.perl
 share/latex2html/IndicTeX-HTML/bengali.sty
@@ -306,22 +306,22 @@ share/latex2html/versions/table.pl
 share/latex2html/versions/techexpl.pl
 share/latex2html/versions/unicode.pl
 share/latex2html/versions/utf8.pl
-share/texmf-var/tex/latex/html/floatflt.ins
-share/texmf-var/tex/latex/html/frames.sty
-share/texmf-var/tex/latex/html/heqn.sty
-share/texmf-var/tex/latex/html/hthtml.sty
-share/texmf-var/tex/latex/html/html.sty
-share/texmf-var/tex/latex/html/htmllist.sty
-share/texmf-var/tex/latex/html/justify.sty
-share/texmf-var/tex/latex/html/latin9.def
-share/texmf-var/tex/latex/html/ldump.sty
-share/texmf-var/tex/latex/html/techexplHTML.tex
-share/texmf-var/tex/latex/html/url.sty
-share/texmf-var/tex/latex/html/verbatimfiles.sty
-@exec /usr/local/bin/mktexlsr
-@unexec /usr/local/bin/mktexlsr
+%%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%%
 @dirrm lib/latex2html
-@dirrm share/doc/latex2html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/latex2html/IndicTeX-HTML
 @dirrm share/latex2html/L2hos
 @dirrm share/latex2html/XyMTeX-HTML
@@ -338,4 +338,4 @@ share/texmf-var/tex/latex/html/verbatimfiles.sty
 @dirrm share/latex2html/texinputs
 @dirrm share/latex2html/versions
 @dirrm share/latex2html
-@dirrm share/texmf-var/tex/latex/html
+@dirrm %%TEXMFLOCAL%%/tex/latex/html