Convert to use the font hooks in the pkginstall framework and get rid

of the custom INSTALL and DEINSTALL scripts.  Also, just override some
make variables using MAKE_FLAGS instead of patching the Makefile, and
get rid of patch-aa.

5 files changed, 11 insertions, 49 deletions

diff --git a/fonts/monafonts/DEINSTALL b/fonts/monafonts/DEINSTALL
deleted file mode 100644
index a1f582027f7..00000000000
--- a/fonts/monafonts/DEINSTALL
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1 2004/11/29 15:00:42 uebayasi Exp $
-
-PREFIX=@PREFIX@
-X11BASE=@X11BASE@
-X11FONTSPREFIX=${PREFIX}/lib/X11/fonts
-X11FONTSSUBDIR=@X11FONTSSUBDIR@
-X11FONTSDIR=${X11FONTSPREFIX}/${X11FONTSSUBDIR}
-
-case ${STAGE} in
-POST-DEINSTALL)
-	${X11BASE}/bin/mkfontdir ${X11FONTSDIR}
-	;;
-esac
-exit 0
diff --git a/fonts/monafonts/INSTALL b/fonts/monafonts/INSTALL
deleted file mode 100644
index 1c33ede1866..00000000000
--- a/fonts/monafonts/INSTALL
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: INSTALL,v 1.1 2004/11/29 15:00:42 uebayasi Exp $
-
-PREFIX=@PREFIX@
-X11BASE=@X11BASE@
-X11FONTSPREFIX=${PREFIX}/lib/X11/fonts
-X11FONTSSUBDIR=@X11FONTSSUBDIR@
-X11FONTSDIR=${X11FONTSPREFIX}/${X11FONTSSUBDIR}
-
-case ${STAGE} in
-POST-INSTALL)
-	${X11BASE}/bin/mkfontdir ${X11FONTSDIR}
-	;;
-esac
-exit 0
diff --git a/fonts/monafonts/Makefile b/fonts/monafonts/Makefile
index d9c04543b34..0b7c55dff36 100644
--- a/fonts/monafonts/Makefile
+++ b/fonts/monafonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/29 06:21:40 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/29 22:20:00 jlam Exp $
 
 DISTNAME=	monafont-2.90
 PKGNAME=	${DISTNAME:S/font/fonts/}
@@ -12,14 +12,20 @@ COMMENT=	Japanese fonts for "Mona" seen at 2ch.net
 
 USE_X11BASE=	yes
 BUILD_TARGET=	bdf
-USE_TOOLS+=	bdftopcf gzip mkfontdir perl sed
+USE_TOOLS+=	bdftopcf gzip mkdirhier mkfontdir perl sed
+
+# X11BINDIR is just the path to the X11 tools listed above.
+MAKE_FLAGS+=	X11BINDIR=${TOOLS_DIR:Q}/bin
+
+MAKE_FLAGS+=	X11FONTDIR=${PREFIX:Q}/${FONTS_SUBDIR:Q}
 MAKE_FLAGS+=	SED_CMD=${SED:Q}
 MAKE_FLAGS+=	PERL_CMD=${PERL5:Q}
 MAKE_FLAGS+=	GZIP_CMD=${GZIP_CMD:Q}
 
-FILES_SUBST+=	X11FONTSSUBDIR=local
+FONTS_SUBDIR=	lib/X11/fonts/local
+FONTS_DIRS.x11=	${FONTS_SUBDIR}
 
-post-extract:
+pre-build:
 	${MKDIR} ${WRKSRC}/dist
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/monafonts/distinfo b/fonts/monafonts/distinfo
index 7353c64bb40..58eb7633eeb 100644
--- a/fonts/monafonts/distinfo
+++ b/fonts/monafonts/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 19:18:28 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/12/29 22:20:00 jlam Exp $
 
 SHA1 (monafont-2.90.tar.bz2) = 6106097a74afed072b3c49555356c5cb88cec172
 RMD160 (monafont-2.90.tar.bz2) = 1b5dbd521581f05bd26e8339b316e0207be3c7a1
 Size (monafont-2.90.tar.bz2) = 808897 bytes
-SHA1 (patch-aa) = 3fc21159dbe3a282b919ef73fd722db79f67732c
diff --git a/fonts/monafonts/patches/patch-aa b/fonts/monafonts/patches/patch-aa
deleted file mode 100644
index a28b2c3938c..00000000000
--- a/fonts/monafonts/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/10/31 13:57:48 toshii Exp $
-
---- Makefile.orig	Mon Jun 24 06:00:11 2002
-+++ Makefile
-@@ -17,8 +17,8 @@
- #GZIP_SUFFIX	= Z
- 
- DESTDIR		=
--X11BINDIR	= /usr/X11R6/bin
--X11FONTDIR	= $(DESTDIR)/usr/X11R6/lib/X11/fonts/local
-+X11BINDIR	= $(X11BASE)/bin
-+X11FONTDIR	= $(PREFIX)/lib/X11/fonts/local
- BDFTOPCF	= $(X11BINDIR)/bdftopcf
- MKDIRHIER	= $(X11BINDIR)/mkdirhier	# 'mkdir -p' may also work.
- MKFONTDIR	= $(X11BINDIR)/mkfontdir