From ae75981543acf446f8664b7c0fac16832bf6d24b Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sun, 26 Dec 2004 17:30:51 +0000
Subject: Convert to fonts.mk. Bump PKGREVISION. Remove USE_X11BASE.

---
 fonts/kochi-ttf/Makefile        | 11 ++++-------
 fonts/kochi-ttf/files/deinstall | 20 --------------------
 fonts/kochi-ttf/files/install   | 20 --------------------
 3 files changed, 4 insertions(+), 47 deletions(-)
 delete mode 100644 fonts/kochi-ttf/files/deinstall
 delete mode 100644 fonts/kochi-ttf/files/install

(limited to 'fonts/kochi-ttf')

diff --git a/fonts/kochi-ttf/Makefile b/fonts/kochi-ttf/Makefile
index 2cf98214182..6ae83842d9e 100644
--- a/fonts/kochi-ttf/Makefile
+++ b/fonts/kochi-ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/06/15 02:35:11 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2004/12/26 17:30:51 wiz Exp $
 
 DISTNAME=	kochi-substitute-${KOCHI_VERSION}
 PKGNAME=	kochi-ttf-${KOCHI_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	fonts japanese
 MASTER_SITES=	http://osdn.dl.sourceforge.jp/efont/5411/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,13 +14,9 @@ COMMENT=	Free Japanese TrueType font by Yasuyuki Furukawa
 KOCHI_VERSION=	20030809
 
 NO_BUILD=	yes
-USE_X11BASE=	yes
 USE_PKGINSTALL=	yes
 
-INSTALL_TMPL=	${FILESDIR}/install
-DEINSTALL_TMPL=	${FILESDIR}/deinstall
-FILES_SUBST+=	X11PREFIX=${X11PREFIX}
-FILES_SUBST+=	X11FONTSSUBDIR=TTF
+FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TTF
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/TTF
@@ -29,4 +25,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/kochi-mincho-subst.ttf \
 	    ${PREFIX}/lib/X11/fonts/TTF/kochi-mincho.ttf
 
+.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/kochi-ttf/files/deinstall b/fonts/kochi-ttf/files/deinstall
deleted file mode 100644
index f97e0e9ebb2..00000000000
--- a/fonts/kochi-ttf/files/deinstall
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: deinstall,v 1.1.1.1 2002/07/15 10:49:14 uebayasi Exp $
-
-PREFIX=@PREFIX@
-X11PREFIX=@X11PREFIX@
-X11FONTSPREFIX=${PREFIX}/lib/X11/fonts
-X11FONTSSUBDIR=@X11FONTSSUBDIR@
-X11FONTSDIR=${X11FONTSPREFIX}/${X11FONTSSUBDIR}
-
-case ${STAGE} in
-DEINSTALL)
-	;;
-POST-DEINSTALL)
-	${X11PREFIX}/bin/mkfontscale ${X11FONTSDIR}
-	;;
-*)
-	${ECHO} "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/fonts/kochi-ttf/files/install b/fonts/kochi-ttf/files/install
deleted file mode 100644
index c4dfde6d882..00000000000
--- a/fonts/kochi-ttf/files/install
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: install,v 1.1.1.1 2002/07/15 10:49:14 uebayasi Exp $
-
-PREFIX=@PREFIX@
-X11PREFIX=@X11PREFIX@
-X11FONTSPREFIX=${PREFIX}/lib/X11/fonts
-X11FONTSSUBDIR=@X11FONTSSUBDIR@
-X11FONTSDIR=${X11FONTSPREFIX}/${X11FONTSSUBDIR}
-
-case ${STAGE} in
-PRE-INSTALL)
-	;;
-POST-INSTALL)
-	${X11PREFIX}/bin/mkfontscale ${X11FONTSDIR}
-	;;
-*)
-	${ECHO} "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
-- 
cgit v1.2.3