Avoid dependency on teTeX.

2 files changed, 27 insertions, 19 deletions

diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index fc15b8d4258..df7df68c56a 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -1,19 +1,24 @@
-# $NetBSD: Makefile,v 1.36 2011/07/09 14:19:30 bsiegert Exp $
+# $NetBSD: Makefile,v 1.37 2011/10/19 19:28:49 minskim Exp $
 
 DISTNAME=	latex2html-2008
-#PKGNAME=	latex2html-2008
+PKGREVISION=	1
 CATEGORIES=	textproc converters
-#MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=support/latex2html/}
-MASTER_SITES=	http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/
+MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=support/latex2html/}
 
 MAINTAINER=	wennmach@NetBSD.org
 HOMEPAGE=	http://www.latex2html.org/
 COMMENT=	LaTeX to HTML converter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+DEPENDS+=	tex-graphics-[0-9]*:../../print/tex-graphics
+DEPENDS+=	tex-hyperref-[0-9]*:../../print/tex-hyperref
+DEPENDS+=	tex-latex-[0-9]*:../../print/tex-latex
+DEPENDS+=	tex-latex-bin-[0-9]*:../../print/tex-latex-bin
+DEPENDS+=	tex-tex-[0-9]*:../../print/tex-tex
 DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
 DEPENDS+=	netpbm>=10.29nb2:../../graphics/netpbm
 
-TEX_ACCEPTED=		teTeX3
 USE_TOOLS+=		gs:run perl:run
 GNU_CONFIGURE=		yes
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -22,15 +27,18 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFIGURE_ARGS+=	--enable-gif	# add support of GIF images
 CONFIGURE_ARGS+=	--enable-png	# add support of PNG images
-CONFIGURE_ARGS+=	--with-texpath=${PKG_LOCALTEXMFPREFIX}/tex/latex/html
+CONFIGURE_ARGS+=	--with-texpath=${PREFIX}/share/texmf-dist/tex/latex/html
 CONFIGURE_ARGS+=	--shlibdir=${PREFIX}/share/latex2html
 .if defined(LATEX2HTML_ICONPATH)
 CONFIGURE_ARGS+=	--with-iconpath=${LATEX2HTML_ICONPATH:Q}
 .endif
 CONFIGURE_ARGS+=	--with-gs=${TOOLS_PATH.gs:Q}
 
+MAKE_ENV+=		DESTDIR=${DESTDIR}
+
 REPLACE_PERL+=		l2hconf.pin cweb2html/cweb2html cweb2html/makemake.pl
 REPLACE_PERL+=		makemap makeseg/makeseg
 
-.include "../../print/teTeX/module.mk"
+.include "../../print/kpathsea/texmf.mk"
+.include "../../print/kpathsea/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/latex2html/PLIST b/textproc/latex2html/PLIST
index 9878789d4eb..d47396605bc 100644
--- a/textproc/latex2html/PLIST
+++ b/textproc/latex2html/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:17:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/10/19 19:28:49 minskim Exp $
 bin/latex2html
 bin/pstoimg
 bin/texexpand
@@ -333,14 +333,14 @@ share/latex2html/versions/table.pl
 share/latex2html/versions/techexpl.pl
 share/latex2html/versions/unicode.pl
 share/latex2html/versions/utf8.pl
-${PKG_LOCALTEXMFPREFIX}/tex/latex/html/frames.sty
-${PKG_LOCALTEXMFPREFIX}/tex/latex/html/heqn.sty
-${PKG_LOCALTEXMFPREFIX}/tex/latex/html/hthtml.sty
-${PKG_LOCALTEXMFPREFIX}/tex/latex/html/html.sty
-${PKG_LOCALTEXMFPREFIX}/tex/latex/html/htmllist.sty
-${PKG_LOCALTEXMFPREFIX}/tex/latex/html/justify.sty
-${PKG_LOCALTEXMFPREFIX}/tex/latex/html/latin9.def
-${PKG_LOCALTEXMFPREFIX}/tex/latex/html/ldump.sty
-${PKG_LOCALTEXMFPREFIX}/tex/latex/html/techexplHTML.tex
-${PKG_LOCALTEXMFPREFIX}/tex/latex/html/url.sty
-${PKG_LOCALTEXMFPREFIX}/tex/latex/html/verbatimfiles.sty
+share/texmf-dist/tex/latex/html/frames.sty
+share/texmf-dist/tex/latex/html/heqn.sty
+share/texmf-dist/tex/latex/html/hthtml.sty
+share/texmf-dist/tex/latex/html/html.sty
+share/texmf-dist/tex/latex/html/htmllist.sty
+share/texmf-dist/tex/latex/html/justify.sty
+share/texmf-dist/tex/latex/html/latin9.def
+share/texmf-dist/tex/latex/html/ldump.sty
+share/texmf-dist/tex/latex/html/techexplHTML.tex
+share/texmf-dist/tex/latex/html/url.sty
+share/texmf-dist/tex/latex/html/verbatimfiles.sty