From 3824e1f9f10220c516e59d3b78532280cbf73603 Mon Sep 17 00:00:00 2001
From: minskim <minskim@pkgsrc.org>
Date: Fri, 7 Apr 2006 05:21:01 +0000
Subject: Set PKG_LOCALTEXMFPREFIX to ${PREFIX}/share/texmf-local in
 buildlink3.mk; all TeX packages were converted.

---
 print/teTeX-bin/buildlink3.mk  | 4 ++--
 print/teTeX3-bin/buildlink3.mk | 5 ++---
 print/texmf-dirs/dirs.mk       | 8 +-------
 3 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'print')

diff --git a/print/teTeX-bin/buildlink3.mk b/print/teTeX-bin/buildlink3.mk
index b1f1871a3ae..dcc1a27b2b5 100644
--- a/print/teTeX-bin/buildlink3.mk
+++ b/print/teTeX-bin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:37 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/07 05:21:01 minskim Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TETEX_BIN_BUILDLINK3_MK:=	${TETEX_BIN_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.teTeX-bin?=	../../print/teTeX-bin
 TEX=tex
 PDFTEX=pdftex
 PKG_TEXMFPREFIX=	${PREFIX}/share/texmf
-PKG_LOCALTEXMFPREFIX=	${PREFIX}/share/texmf
+PKG_LOCALTEXMFPREFIX=	${PREFIX}/share/texmf-local
 PLIST_SUBST+=	PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:C|^${PREFIX}/||}
 PLIST_SUBST+=	PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:C|^${PREFIX}/||}
 
diff --git a/print/teTeX3-bin/buildlink3.mk b/print/teTeX3-bin/buildlink3.mk
index 02e6313c1b8..284b15dd71a 100644
--- a/print/teTeX3-bin/buildlink3.mk
+++ b/print/teTeX3-bin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:37 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/07 05:21:01 minskim Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TETEX_BIN_BUILDLINK3_MK:=	${TETEX_BIN_BUILDLINK3_MK}+
@@ -20,8 +20,7 @@ TEX=etex
 PDFTEX=pdfetex
 #PKG_TEXMFPREFIX=	${PREFIX}/share/texmf-dist
 PKG_TEXMFPREFIX=	${PREFIX}/share/texmf
-#PKG_LOCALTEXMFPREFIX=	${PREFIX}/share/texmf-local
-PKG_LOCALTEXMFPREFIX=	${PREFIX}/share/texmf
+PKG_LOCALTEXMFPREFIX=	${PREFIX}/share/texmf-local
 PLIST_SUBST+=	PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:C|^${PREFIX}/||}
 PLIST_SUBST+=	PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:C|^${PREFIX}/||}
 
diff --git a/print/texmf-dirs/dirs.mk b/print/texmf-dirs/dirs.mk
index 2d3a9bfddcb..cca1eff270b 100644
--- a/print/texmf-dirs/dirs.mk
+++ b/print/texmf-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.3 2006/04/07 05:08:50 minskim Exp $
+# $NetBSD: dirs.mk,v 1.4 2006/04/07 05:21:01 minskim Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -43,12 +43,6 @@ TEXMF_DIRS+=	web2c
 .if defined(_USE_TEXMF_DIRS) && !empty(_USE_TEXMF_DIRS)
 DEPENDS+=	texmf-dirs>=${_USE_TEXMF_DIRS}:../../print/texmf-dirs
 
-# Should be removed once all TeX packages are converted to use texmf-dirs
-# and PKG_LOCALTEXMFPREFIX is defined correctly in teTeX[23]-bin/buildlink3.mk.
-.if !empty(TEX_TYPE:MteTeX[23])
-PKG_LOCALTEXMFPREFIX=	${PREFIX}/share/texmf-local
-.endif
-
 .  for dir in ${TEXMF_DIRS}
 PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; }
 PRINT_PLIST_AWK+=	/^@dirrm ${dir:S|/|\\/|g}$$/ \
-- 
cgit v1.2.3