From 67f9f822e89ffaac63bc208430279a9d3a9e7e12 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 29 Dec 2005 18:17:21 +0000 Subject: 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. --- fonts/ko-baekmuk/Makefile | 10 ++++------ fonts/ko-baekmuk/PLIST | 4 +--- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'fonts/ko-baekmuk') diff --git a/fonts/ko-baekmuk/Makefile b/fonts/ko-baekmuk/Makefile index a2ad4850e4d..a26e401e685 100644 --- a/fonts/ko-baekmuk/Makefile +++ b/fonts/ko-baekmuk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:14 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/29 18:17:21 jlam Exp $ # DISTNAME= baekmuk-2.0 @@ -14,7 +14,7 @@ COMMENT= X11 fonts for KSX 1001 Korean standard (baekmuk foundry) CONFLICTS+= ksc5601fonts-[0-9]* USE_X11BASE= yes -USE_TOOLS+= gzip mkfontdir:run +USE_TOOLS+= gzip MAKE_ENV+= FONTDIR=${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q} @@ -29,7 +29,8 @@ BAEKMUK_BDF= batang10.bdf batang10b.bdf batang12.bdf batang12b.bdf \ gulim20b.bdf gulim24.bdf gulim24b.bdf hline10.bdf hline12.bdf \ hline14.bdf hline16.bdf hline18.bdf hline20.bdf hline24.bdf -FONTDIR=${PREFIX}/lib/X11/fonts/local +FONTDIR= ${PREFIX}/lib/X11/fonts/local +FONTS_DIRS.x11= ${FONTDIR} post-extract: ${MKDIR} ${WRKSRC} @@ -40,7 +41,4 @@ pre-install: [ -d ${FONTDIR} ] || ${INSTALL_DATA_DIR} ${FONTDIR} cp ${WRKSRC}/../fonts.alias ${FONTDIR} -post-install: - (cd ${FONTDIR}; mkfontdir) - .include "../../mk/bsd.pkg.mk" diff --git a/fonts/ko-baekmuk/PLIST b/fonts/ko-baekmuk/PLIST index 11c3e2a564a..859a1eb7dd3 100644 --- a/fonts/ko-baekmuk/PLIST +++ b/fonts/ko-baekmuk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/07/26 19:09:32 junyoung Exp $ +@comment $NetBSD: PLIST,v 1.4 2005/12/29 18:17:21 jlam Exp $ lib/X11/fonts/local/batang10.pcf.gz lib/X11/fonts/local/batang10b.pcf.gz lib/X11/fonts/local/batang12.pcf.gz @@ -42,5 +42,3 @@ lib/X11/fonts/local/hline16.pcf.gz lib/X11/fonts/local/hline18.pcf.gz lib/X11/fonts/local/hline20.pcf.gz lib/X11/fonts/local/hline24.pcf.gz -@exec ${X11BASE}/bin/mkfontdir %D/lib/X11/fonts/local -@unexec ${X11BASE}/bin/mkfontdir %D/lib/X11/fonts/local -- cgit v1.2.3