Convert ot use tex.buildlink3.mk

latex2html installs it's latex files in ${PKG_LOCALTEXMFPREFIX}

3 files changed, 21 insertions, 20 deletions

diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index 02e938541da..14d26a90922 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/10/09 20:02:29 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2005/11/08 20:02:52 tonio Exp $
 
 DISTNAME=	latex2html-2002-2-1
 PKGNAME=	latex2html-2002.2.1
@@ -10,9 +10,9 @@ MAINTAINER=	wennmach@NetBSD.org
 HOMEPAGE=	http://www.latex2html.org/
 COMMENT=	LaTeX to HTML converter
 
-DEPENDS+=       teTeX-bin>=1.0.6:../../print/teTeX-bin
 DEPENDS+=	netpbm>=10.29nb2:../../graphics/netpbm
 
+LATEX_ACCEPTED=		teTeX1 teTeX2 teTeX3
 USE_TOOLS+=		perl:run
 GNU_CONFIGURE=		yes
 
@@ -20,11 +20,12 @@ GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--enable-gif	# add support of GIF images
 CONFIGURE_ARGS+=	--enable-png	# add support of PNG images
-CONFIGURE_ARGS+=	--with-texpath=${PREFIX}/share/texmf/tex/latex/html
+CONFIGURE_ARGS+=	--with-texpath=${PKG_LOCALTEXMFPREFIX}/tex/latex/html
 CONFIGURE_ARGS+=	--shlibdir=${PREFIX}/share/latex2html
 .if defined(LATEX2HTML_ICONPATH)
 CONFIGURE_ARGS+=	--with-iconpath=${LATEX2HTML_ICONPATH}
 .endif
 
+.include "../../mk/tex.buildlink3.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/latex2html/PLIST b/textproc/latex2html/PLIST
index 512a00e8823..1f474e0a6f2 100644
--- a/textproc/latex2html/PLIST
+++ b/textproc/latex2html/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/08 22:32:07 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/11/08 20:02:52 tonio Exp $
 bin/latex2html
 bin/pstoimg
 bin/texexpand
@@ -332,19 +332,19 @@ share/latex2html/versions/table.pl
 share/latex2html/versions/techexpl.pl
 share/latex2html/versions/unicode.pl
 share/latex2html/versions/utf8.pl
-share/texmf/tex/latex/html/floatflt.ins
-share/texmf/tex/latex/html/frames.sty
-share/texmf/tex/latex/html/heqn.sty
-share/texmf/tex/latex/html/hthtml.sty
-share/texmf/tex/latex/html/html.sty
-share/texmf/tex/latex/html/htmllist.sty
-share/texmf/tex/latex/html/justify.sty
-share/texmf/tex/latex/html/latin9.def
-share/texmf/tex/latex/html/ldump.sty
-share/texmf/tex/latex/html/techexplHTML.tex
-share/texmf/tex/latex/html/url.sty
-share/texmf/tex/latex/html/verbatimfiles.sty
-@dirrm share/texmf/tex/latex/html
+${PKG_LOCALTEXMFPREFIX}/tex/latex/html/floatflt.ins
+${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
+@dirrm ${PKG_LOCALTEXMFPREFIX}/tex/latex/html
 @dirrm share/latex2html/versions
 @dirrm share/latex2html/texinputs
 @dirrm share/latex2html/styles
diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile
index 99feef054da..3b0b6d872f4 100644
--- a/textproc/rubber/Makefile
+++ b/textproc/rubber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/10/26 12:59:51 tonio Exp $
+# $NetBSD: Makefile,v 1.9 2005/11/08 20:02:52 tonio Exp $
 #
 
 DISTNAME=		rubber-1.0
@@ -10,17 +10,17 @@ MAINTAINER=		tonio@NetBSD.org
 HOMEPAGE=		http://www.pps.jussieu.fr/~beffara/soft/rubber/
 COMMENT=		Automated system for building LaTeX documents
 
-DEPENDS+=		teTeX-bin-[0-9]*:../../print/teTeX-bin
-
 USE_PKGLOCALEDIR=	yes
 HAS_CONFIGURE=		yes
 USE_MAKEINFO=		yes
 INFO_FILES=		rubber.info
 TEXINFO_REQD=		4.6
 PYTHON_VERSIONS_ACCEPTED=	24 23
+LATEX_ACCEPTED=		teTeX1 teTeX2 teTeX3
 
 CONFIGURE_ARGS+=	--python=${PYTHONBIN} --prefix=${PREFIX} \
 			--datadir=${PREFIX}/share
 
 .include "../../lang/python/application.mk"
+.include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"