From 8a28549019afeb09e6f7d6401b5a13ebe78fe015 Mon Sep 17 00:00:00 2001
From: salo <salo@pkgsrc.org>
Date: Thu, 17 Apr 2003 14:31:54 +0000
Subject: Bump PKGREVISION: use fonts.mk to correctly update fonts.dir, delint.

---
 fonts/arphic-ttf/Makefile  | 25 +++++++++++++------------
 fonts/baekmuk-ttf/Makefile | 21 +++++++++------------
 2 files changed, 22 insertions(+), 24 deletions(-)

(limited to 'fonts')

diff --git a/fonts/arphic-ttf/Makefile b/fonts/arphic-ttf/Makefile
index 8310ad6ae4e..4912a8a18e6 100644
--- a/fonts/arphic-ttf/Makefile
+++ b/fonts/arphic-ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/04/17 14:31:54 salo Exp $
 #
 
 DISTNAME=	arphic-ttf-2.11
-WRKSRC=		${WRKDIR}
+PKGREVISION=	1
 CATEGORIES=	fonts
 MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/${DIST_SUBDIR}/
 DISTFILES=	${FONT_FILES} ${MISC_FILES}
@@ -10,30 +10,31 @@ DISTFILES=	${FONT_FILES} ${MISC_FILES}
 MAINTAINER=	rxg@ms25.url.com.tw
 COMMENT=	Chinese TrueType fonts from Arphic Technology
 
+CONFLICTS=	arphicttf-*
+
 FONT_FILES=	bkai00mp.ttf.gz bsmi00lp.ttf.gz gbsn00lp.ttf.gz gkai00mp.ttf.gz
 MISC_FILES=	ARPHICPL.TXT logo.gif release.txt
 
 DIST_SUBDIR=	arphic-ttf
-
-CONFLICTS=	arphicttf-*
-
 EXTRACT_ONLY=	# empty
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
 
-USE_X11BASE=	yes
-FONTDIR=	${PREFIX}/lib/X11/fonts/TrueType
+USE_X11BASE=	YES
+NO_CONFIGURE=	YES
+NO_BUILD=	YES
+
+FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TrueType
 DOCDIR=		${PREFIX}/share/doc/arphic-ttf
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTDIR}
+	${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
 	for f in ${FONT_FILES}; do \
-		${INSTALL_DATA} ${_DISTDIR}/$$f ${FONTDIR}; \
-		${GUNZIP_CMD} ${FONTDIR}/$$f; \
+		${INSTALL_DATA} ${_DISTDIR}/$$f ${FONTS_TTF_DIRS}; \
+		${GUNZIP_CMD} ${FONTS_TTF_DIRS}/$$f; \
 	done
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	for f in ${MISC_FILES}; do \
 		${INSTALL_DATA} ${_DISTDIR}/$$f ${DOCDIR}; \
 	done
 
+.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/baekmuk-ttf/Makefile b/fonts/baekmuk-ttf/Makefile
index 5d2ed5a8e0c..5fa45afe527 100644
--- a/fonts/baekmuk-ttf/Makefile
+++ b/fonts/baekmuk-ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/04/01 00:28:25 salo Exp $
+# $NetBSD: Makefile,v 1.7 2003/04/17 14:38:05 salo Exp $
 #
 
 DISTNAME=	baekmuk-ttf-2.1
-WRKSRC=		${WRKDIR}
+PKGREVISION=	1
 CATEGORIES=	fonts korean
 MASTER_SITES=	ftp://ftp.mizi.com/pub/baekmuk/
 
@@ -10,21 +10,18 @@ MAINTAINER=	junyoung@netbsd.org
 HOMEPAGE=	http://www.mizi.com/ko/prod/desktop/mizios/mos-pro2.htm
 COMMENT=	Baekmuk family Korean TrueType fonts
 
-FONT_FILES=	batang.ttf dotum.ttf gulim.ttf hline.ttf
+USE_X11BASE=	YES
+NO_CONFIGURE=	YES
+NO_BUILD=	YES
 
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-
-USE_X11BASE=	yes
-FONTDIR=	${PREFIX}/lib/X11/fonts/TrueType
+FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TrueType
 DOCDIR=		${PREFIX}/share/doc/baekmuk-ttf
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTDIR}
-	for f in ${FONT_FILES}; do \
-		${INSTALL_DATA} ${WRKSRC}/$$f ${FONTDIR}; \
-	done
+	${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
+	cd ${WRKDIR} && ${PAX} -rw -pm *.ttf ${FONTS_TTF_DIRS}
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${FILESDIR}/COPYRIGHT ${DOCDIR}
 
+.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3