From f72aac16bed36f83f19516e115eab0381d900561 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 17 Feb 2006 19:35:25 +0000 Subject: Add bdftopcf to tools. Fix font handling. Fix pkglint warnings. Bump PKGREVISION. --- fonts/ko-baekmuk/Makefile | 17 ++++++++--------- fonts/ko-baekmuk/PLIST | 3 +-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/fonts/ko-baekmuk/Makefile b/fonts/ko-baekmuk/Makefile index 3a08c2aadeb..548a5c9c958 100644 --- a/fonts/ko-baekmuk/Makefile +++ b/fonts/ko-baekmuk/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:10 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/02/17 19:35:25 wiz Exp $ # DISTNAME= baekmuk-2.0 PKGNAME= ko-baekmuk-20010718 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= fonts x11 korean MASTER_SITES+= ftp://ftp.mizi.com/pub/baekmuk/ \ http://zinc.skku.ac.kr/~wkpark/baekmuk/ @@ -13,8 +13,7 @@ COMMENT= X11 fonts for KSX 1001 Korean standard (baekmuk foundry) CONFLICTS+= ksc5601fonts-[0-9]* -USE_X11BASE= yes -USE_TOOLS+= gzip +USE_TOOLS+= bdftopcf gzip MAKE_ENV+= FONTDIR=${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q} @@ -29,16 +28,16 @@ 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 -FONTS_DIRS.x11= ${FONTDIR} +FONTDIR= ${PREFIX}/lib/X11/fonts/local +FONTS_DIRS.x11+= ${FONTDIR} +REQD_DIRS+= ${FONTDIR} post-extract: ${MKDIR} ${WRKSRC} ${CP} ${.CURDIR}/../../fonts/ko-x11fonts/files/Makefile ${WRKSRC} - (cd ${WRKSRC}; ${MAKE} prepare) + cd ${WRKSRC} && ${MAKE} prepare pre-install: - [ -d ${FONTDIR} ] || ${INSTALL_DATA_DIR} ${FONTDIR} - cp ${WRKSRC}/../fonts.alias ${FONTDIR} + ${CP} ${WRKSRC}/../fonts.alias ${FONTDIR} .include "../../mk/bsd.pkg.mk" diff --git a/fonts/ko-baekmuk/PLIST b/fonts/ko-baekmuk/PLIST index 859a1eb7dd3..6d171623771 100644 --- a/fonts/ko-baekmuk/PLIST +++ b/fonts/ko-baekmuk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2005/12/29 18:17:21 jlam Exp $ +@comment $NetBSD: PLIST,v 1.5 2006/02/17 19:35:25 wiz Exp $ lib/X11/fonts/local/batang10.pcf.gz lib/X11/fonts/local/batang10b.pcf.gz lib/X11/fonts/local/batang12.pcf.gz @@ -20,7 +20,6 @@ lib/X11/fonts/local/dotum16.pcf.gz lib/X11/fonts/local/dotum18.pcf.gz lib/X11/fonts/local/dotum20.pcf.gz lib/X11/fonts/local/dotum24.pcf.gz -lib/X11/fonts/local/fonts.alias lib/X11/fonts/local/gulim10.pcf.gz lib/X11/fonts/local/gulim10b.pcf.gz lib/X11/fonts/local/gulim12.pcf.gz -- cgit v1.2.3