- Install the fontmap file into PKG_LOCALTEXMFPREFIX, instead of

  PKG_TEXMFPREFIX, and register it with updmap.
- Use texmf-dirs to install into texmf-local.

Bump PKGREVISION.

4 files changed, 20 insertions, 12 deletions

diff --git a/fonts/ec-fonts-mftraced/Makefile b/fonts/ec-fonts-mftraced/Makefile
index 9b69b4fb0ad..dbc03baaa52 100644
--- a/fonts/ec-fonts-mftraced/Makefile
+++ b/fonts/ec-fonts-mftraced/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:38 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/07 05:10:39 minskim Exp $
 #
 
 DISTNAME=		ec-fonts-mftraced-1.0.8
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		fonts
 MASTER_SITES=		http://lilypond.org/download/fonts/
 
@@ -10,12 +10,13 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://lilypond.org/
 COMMENT=		EC PostScript Type1 fonts with TFMs for TeX
 
+USE_DIRS+=		texmf-1.1
 USE_PKGLOCALEDIR=	yes
 HAS_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 MAKEFILE=		GNUmakefile
-MAKE_ENV+=		PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:Q}
 MAKE_ENV+=		PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:Q}
+TEX_FONTMAPS=		ec-mftrace.map
 
 .include "../../fonts/mftrace/buildlink3.mk"
 .include "../../print/teTeX/module.mk"
diff --git a/fonts/ec-fonts-mftraced/PLIST b/fonts/ec-fonts-mftraced/PLIST
index 30f89355a5e..ff9458cd950 100644
--- a/fonts/ec-fonts-mftraced/PLIST
+++ b/fonts/ec-fonts-mftraced/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2005/11/13 05:30:10 minskim Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/07 05:10:39 minskim Exp $
 share/doc/ec-fonts-mftraced/ChangeLog
 share/doc/ec-fonts-mftraced/LICENSE
 share/doc/ec-fonts-mftraced/README
-${PKG_TEXMFPREFIX}/dvips/ec-fonts-mftraced/ec-mftrace.map
+${PKG_LOCALTEXMFPREFIX}/fonts/map/dvips/ec-fonts-mftraced/ec-mftrace.map
 ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/public/ec-fonts-mftraced/ecb10.tfm
 ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/public/ec-fonts-mftraced/ecb12.tfm
 ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/public/ec-fonts-mftraced/ecb7.tfm
@@ -117,5 +117,5 @@ ${PKG_LOCALTEXMFPREFIX}/fonts/type1/public/ec-fonts-mftraced/ectt8.pfa
 ${PKG_LOCALTEXMFPREFIX}/fonts/type1/public/ec-fonts-mftraced/ectt9.pfa
 @dirrm ${PKG_LOCALTEXMFPREFIX}/fonts/type1/public/ec-fonts-mftraced
 @dirrm ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/public/ec-fonts-mftraced
-@dirrm ${PKG_TEXMFPREFIX}/dvips/ec-fonts-mftraced
+@dirrm ${PKG_LOCALTEXMFPREFIX}/fonts/map/dvips/ec-fonts-mftraced
 @dirrm share/doc/ec-fonts-mftraced
diff --git a/fonts/ec-fonts-mftraced/distinfo b/fonts/ec-fonts-mftraced/distinfo
index 1e8525b3cdc..cb366ca9ad1 100644
--- a/fonts/ec-fonts-mftraced/distinfo
+++ b/fonts/ec-fonts-mftraced/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/11/09 08:12:54 tonio Exp $
+$NetBSD: distinfo,v 1.5 2006/04/07 05:10:39 minskim Exp $
 
 SHA1 (ec-fonts-mftraced-1.0.8.tar.gz) = 6080627136a284ea0173e35198a8751bd3d9e854
 RMD160 (ec-fonts-mftraced-1.0.8.tar.gz) = 2a342747a368fb4477d92c59eb678c51245a3b64
 Size (ec-fonts-mftraced-1.0.8.tar.gz) = 8581 bytes
-SHA1 (patch-aa) = e663e91960df2cf74111e32518d04f62bb858a02
+SHA1 (patch-aa) = 073e6722bfab096363543df5629e6dc831eba4c8
 SHA1 (patch-ab) = 1d736a0b4144f67ba0528245d4e23240a0792b15
diff --git a/fonts/ec-fonts-mftraced/patches/patch-aa b/fonts/ec-fonts-mftraced/patches/patch-aa
index e2cff088c65..e943e5a8559 100644
--- a/fonts/ec-fonts-mftraced/patches/patch-aa
+++ b/fonts/ec-fonts-mftraced/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2005/11/09 08:12:54 tonio Exp $
+$NetBSD: patch-aa,v 1.4 2006/04/07 05:10:39 minskim Exp $
 
---- GNUmakefile.orig	2004-11-04 23:47:34.000000000 +0100
+--- GNUmakefile.orig	2004-11-04 22:47:34.000000000 +0000
 +++ GNUmakefile
-@@ -25,15 +25,15 @@ DISTDIR=$(builddir)/$(NAME)-$(VERSION)
+@@ -25,21 +25,21 @@ DISTDIR=$(builddir)/$(NAME)-$(VERSION)
  TARBALL=$(DISTDIR).tar.gz
  WWWDIR=base.lilypond.org:/var/www/lilypond/download/fonts/
  
@@ -17,10 +17,17 @@ $NetBSD: patch-aa,v 1.3 2005/11/09 08:12:54 tonio Exp $
 -TEXDIR=$(prefix)/share/texmf
 -TEXCONFDIR=$(prefix)/share/texmf
 +TEXDIR=${PKG_LOCALTEXMFPREFIX}
-+TEXCONFDIR=${PKG_TEXMFPREFIX}
++TEXCONFDIR=${PKG_LOCALTEXMFPREFIX}
  ##TEXCONFDIR=$(sysconfdir)/texmf
  
  PATHSUF=$(NAME)
+ PFADIR=$(TEXDIR)/fonts/type1/public/$(PATHSUF)
+ TFMDIR=$(TEXDIR)/fonts/tfm/public/$(PATHSUF)
+-MAPDIR=$(TEXCONFDIR)/dvips/$(PATHSUF)
++MAPDIR=$(TEXDIR)/fonts/map/dvips/$(PATHSUF)
+ ##MAPDIR=$(TEXCONFDIR)/dvips
+ 
+ 
 @@ -87,17 +87,17 @@ $(MAPFILE): GNUmakefile
  	($(foreach ec,$(ECFONTS), echo '$(ec) $(ec) <$(ec).pfa' && ) true) > $@