diff options
| author | jlam <jlam@pkgsrc.org> | 2005-12-29 18:17:21 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-12-29 18:17:21 +0000 |
| commit | 67f9f822e89ffaac63bc208430279a9d3a9e7e12 (patch) | |
| tree | d3534d29133f9db5991d6ecad761546aa6aa87a4 /fonts/efont-unicode | |
| parent | 07a6855ecb813f84768d7a2b227fc7e41465b7a4 (diff) | |
| download | pkgsrc-67f9f822e89ffaac63bc208430279a9d3a9e7e12.tar.gz | |
Convert to use the font hooks in the pkginstall framework. We no
longer need to run mkfontdir ourselves, and those @exec/@unexec lines
may be removed from the PLISTs.
Diffstat (limited to 'fonts/efont-unicode')
| -rw-r--r-- | fonts/efont-unicode/Makefile | 9 | ||||
| -rw-r--r-- | fonts/efont-unicode/PLIST | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/fonts/efont-unicode/Makefile b/fonts/efont-unicode/Makefile index 270f1ea9ef8..913b9518157 100644 --- a/fonts/efont-unicode/Makefile +++ b/fonts/efont-unicode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:14 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/29 18:17:21 jlam Exp $ DISTNAME= efont-unicode-bdf-0.4.2 PKGNAME= ${DISTNAME:S/-bdf//} @@ -11,7 +11,7 @@ HOMEPAGE= http://openlab.ring.gr.jp/efont/unicode/ COMMENT= Free unicode BDF font USE_X11BASE= YES -USE_TOOLS+= gzip mkfontdir:run +USE_TOOLS+= bdftopcf gzip MESSAGE_SUBST+= FONTDIR=${FONTDIR} PLIST_SUBST+= FONTDIR=${FONTDIR:Q} @@ -27,12 +27,14 @@ FONTS= b10 b10_b b10_bi b10_i\ h16 h16_b h16_bi h16_i\ h24 h24_b h24_bi h24_i FONTDIR= lib/X11/fonts/efont +REQD_DIRS= ${FONTDIR} +FONTS_DIRS.x11= ${FONTDIR} do-build: @cd ${WRKSRC}; \ for FONT in ${FONTS}; do \ ${ECHO} -n "Compiling font $${FONT} ... "; \ - ${X11BASE}/bin/bdftopcf $${FONT}.bdf | \ + bdftopcf $${FONT}.bdf | \ ${GZIP_CMD} -c >$${FONT}.pcf.gz; \ ${ECHO} "done"; \ done @@ -45,6 +47,5 @@ do-install: ${PREFIX}/${FONTDIR}; \ ${ECHO} "done"; \ done - @cd ${PREFIX}/${FONTDIR}; ${X11BASE}/bin/mkfontdir .include "../../mk/bsd.pkg.mk" diff --git a/fonts/efont-unicode/PLIST b/fonts/efont-unicode/PLIST index f6f3a6aad4f..9de9a5ba574 100644 --- a/fonts/efont-unicode/PLIST +++ b/fonts/efont-unicode/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/05 19:01:33 tron Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/12/29 18:17:21 jlam Exp $ ${FONTDIR}/b10.pcf.gz ${FONTDIR}/b10_b.pcf.gz ${FONTDIR}/b10_bi.pcf.gz @@ -39,6 +39,3 @@ ${FONTDIR}/h24.pcf.gz ${FONTDIR}/h24_b.pcf.gz ${FONTDIR}/h24_bi.pcf.gz ${FONTDIR}/h24_i.pcf.gz -@exec cd %D/${FONTDIR} && ${X11BASE}/bin/mkfontdir -@unexec rm -f %D/${FONTDIR}/fonts.dir -@dirrm ${FONTDIR} |