convert to use tex.buildlink3.mk

installs tex files in PKG_TEXMFPREFIX

6 files changed, 29 insertions, 23 deletions

diff --git a/print/advi/Makefile b/print/advi/Makefile
index e95018478b3..41c9ea56ac9 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:08 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/11/08 20:30:29 tonio Exp $
 
 DISTNAME=		advi-1.6.0
 CATEGORIES=		print
@@ -9,9 +9,9 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://pauillac.inria.fr/advi/
 COMMENT=		Active-DVI Presenter
 
-DEPENDS+=		teTeX-[0-9]*:../../print/teTeX
 BUILD_DEPENDS+=		ocaml>=3.04:../../lang/ocaml
 
+LATEX_ACCEPTED=		teTeX1 teTeX2 teTeX3
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
@@ -49,5 +49,6 @@ post-install:
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/lablgtk/buildlink3.mk"
 .include "../../x11/ocaml-graphics/buildlink3.mk"
+.include "../../mk/tex.buildlink3.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/chktex/Makefile b/print/chktex/Makefile
index 4c208b8317a..f67fae4db6d 100644
--- a/print/chktex/Makefile
+++ b/print/chktex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/10/22 13:47:01 tonio Exp $
+# $NetBSD: Makefile,v 1.15 2005/11/08 20:30:29 tonio Exp $
 #
 
 DISTNAME=	chktex-1.6.3
@@ -24,5 +24,5 @@ MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" EGDIR="${EGDIR}"
 pre-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 
-.include "../../print/teTeX-bin/kpathsea.buildlink3.mk"
+.include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index c7bbbe8e221..f0abe5761e1 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/09/29 14:21:08 tonio Exp $
+# $NetBSD: Makefile,v 1.23 2005/11/08 20:30:29 tonio Exp $
 
 DISTNAME=	lgrind
 PKGNAME=	lgrind-3.5
@@ -10,14 +10,15 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	jwise@NetBSD.org
 COMMENT=	Source pretty printer for LaTeX
 
-DEPENDS+=	teTeX-bin>=1.0:../../print/teTeX-bin
-
 WRKSRC=		${WRKDIR}/lgrind/source
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 NO_CONFIGURE=	yes
+LATEX_ACCEPTED=	teTeX1 teTeX2 teTeX3
 
 .include "../../mk/x11.buildlink3.mk"
 
+MAKE_ENV+=	PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX}
+
 pre-patch:
 	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile-prepatch
 	${SED} -e '/Id/s|\$$||g' ${WRKSRC}/Makefile-prepatch > ${WRKSRC}/Makefile
@@ -31,8 +32,8 @@ pre-build:
 	${SED} -e 's,@PREFIX@,${PREFIX},g' < ${WRKSRC}/lgrindef.5.bak > ${WRKSRC}/lgrindef.5
 
 pre-install:
-	-mkdir ${PREFIX}/share/texmf/tex/latex/lgrind
-	-mkdir ${PREFIX}/share/texmf/doc/latex/lgrind
+	-mkdir ${PKG_LOCALTEXMFPREFIX}/tex/latex/lgrind
+	-mkdir ${PKG_LOCALTEXMFPREFIX}/doc/latex/lgrind
 
 post-install:
 	${PREFIX}/bin/texconfig rehash
@@ -45,4 +46,5 @@ post-wrapper:
 			> ${BUILDLINK_DIR}/include/malloc.h;	\
 	fi
 
+.include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/lgrind/PLIST b/print/lgrind/PLIST
index 40ede4fa2e6..ddec5f8ae08 100644
--- a/print/lgrind/PLIST
+++ b/print/lgrind/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2005/01/17 12:51:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/11/08 20:30:29 tonio Exp $
 bin/lgrind
-share/texmf/tex/latex/lgrind/lgrindef
-share/texmf/doc/latex/lgrind/lgrind.dvi
-share/texmf/tex/latex/lgrind/lgrind.sty
+${PKG_LOCALTEXMFPREFIX}/tex/latex/lgrind/lgrindef
+${PKG_LOCALTEXMFPREFIX}/doc/latex/lgrind/lgrind.dvi
+${PKG_LOCALTEXMFPREFIX}/tex/latex/lgrind/lgrind.sty
 man/man1/lgrind.1
 man/man5/lgrindef.5
-@dirrm share/texmf/tex/latex/lgrind
-@dirrm share/texmf/doc/latex/lgrind
+@dirrm ${PKG_LOCALTEXMFPREFIX}/tex/latex/lgrind
+@dirrm ${PKG_LOCALTEXMFPREFIX}/doc/latex/lgrind
 @exec %D/bin/mktexlsr
 @unexec %D/bin/mktexlsr
diff --git a/print/lgrind/distinfo b/print/lgrind/distinfo
index 44620cdfcad..251211df0b0 100644
--- a/print/lgrind/distinfo
+++ b/print/lgrind/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 12:51:43 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/11/08 20:30:29 tonio Exp $
 
 SHA1 (lgrind.tar.bz2) = 152d92ccdcb9bc7342f6aec6c4c009d124f7e812
 RMD160 (lgrind.tar.bz2) = c32b0002d95e3dec58d03ba39e58dd798058e0eb
 Size (lgrind.tar.bz2) = 90624 bytes
-SHA1 (patch-aa) = 48955722b024a3d88000db89afaa1b8c83054774
+SHA1 (patch-aa) = bc0ac18edfd1c7d0cbc2554d80cef62a60f38ec5
 SHA1 (patch-ab) = cf62c0aafe78806f2c83d8ba8410da9d692dcf7d
 SHA1 (patch-ac) = e6fc5bdebe7c138aad45acd545b63acaed70d356
 SHA1 (patch-ad) = a475dd078de2d92ffdd23592fd16ae489cec5dee
diff --git a/print/lgrind/patches/patch-aa b/print/lgrind/patches/patch-aa
index a4163c99ca8..aa17bc25a69 100644
--- a/print/lgrind/patches/patch-aa
+++ b/print/lgrind/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 1999/12/16 14:34:10 agc Exp $
+$NetBSD: patch-aa,v 1.5 2005/11/08 20:30:29 tonio Exp $
 
---- Makefile.orig	Tue Aug  4 15:02:00 1998
-+++ Makefile	Tue Dec  7 21:48:48 1999
+--- Makefile.orig	2005-11-08 21:18:37.000000000 +0100
++++ Makefile
 @@ -3,13 +3,13 @@
  # Id: Makefile,v 2.0 96/02/19 23:54:15 gvr Exp 
  
@@ -11,10 +11,13 @@ $NetBSD: patch-aa,v 1.4 1999/12/16 14:34:10 agc Exp $
 +BASEDIR=${PREFIX}/share
 +DESTDIR=${PREFIX}/bin
  #DEFSFILE=/home/mike/LGrind/lgrindef
- DEFSFILE=${BASEDIR}/texmf/tex/latex/lgrind/lgrindef
- TEXINPUTS=${BASEDIR}/texmf/tex/latex/lgrind
- DOC=${BASEDIR}/texmf/doc/latex/lgrind
+-DEFSFILE=${BASEDIR}/texmf/tex/latex/lgrind/lgrindef
+-TEXINPUTS=${BASEDIR}/texmf/tex/latex/lgrind
+-DOC=${BASEDIR}/texmf/doc/latex/lgrind
 -MAN=${BASEDIR}/man
++DEFSFILE=${PKG_TEXMFPREFIX}/tex/latex/lgrind/lgrindef
++TEXINPUTS=${PKG_TEXMFPREFIX}/tex/latex/lgrind
++DOC=${PKG_TEXMFPREFIX}/doc/latex/lgrind
 +MAN=${PREFIX}/man
  
  CC=gcc