Convert to use the new pkginstall framework fonts-handling by renaming

FONTS_<TYPE>_DIRS variables to FONTS_DIRS.<type>, and by removing the
unnecessary inclusion of mk/fonts.mk.

19 files changed, 61 insertions, 81 deletions

diff --git a/fonts/alee-ttf/Makefile b/fonts/alee-ttf/Makefile
index 8b733455c7e..6dfd9154bbb 100644
--- a/fonts/alee-ttf/Makefile
+++ b/fonts/alee-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/11/23 05:49:59 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 07:04:27 jlam Exp $
 #
 
 DISTNAME=	ttf-alee_6.0
@@ -15,14 +15,13 @@ NO_CONFIGURE=   YES
 NO_BUILD=       YES
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
-FONTS_TTF_DIRS= ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=         ${PREFIX}/share/doc/alee-ttf
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTS_TTF_DIRS}
+	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTS_DIRS.ttf}
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCDIR}
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/arphic-ttf/Makefile b/fonts/arphic-ttf/Makefile
index 764aad05132..ce46aca508d 100644
--- a/fonts/arphic-ttf/Makefile
+++ b/fonts/arphic-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:49 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 07:04:27 jlam Exp $
 #
 
 DISTNAME=	arphic-ttf-2.11
@@ -24,19 +24,18 @@ NO_BUILD=	YES
 
 USE_TOOLS+=	gunzip
 
-FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=		${PREFIX}/share/doc/arphic-ttf
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
+	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
 	for f in ${FONT_FILES}; do \
-		${INSTALL_DATA} ${_DISTDIR}/$$f ${FONTS_TTF_DIRS}; \
-		${GUNZIP_CMD} ${FONTS_TTF_DIRS}/$$f; \
+		${INSTALL_DATA} ${_DISTDIR}/$$f ${FONTS_DIRS.ttf}; \
+		${GUNZIP_CMD} ${FONTS_DIRS.ttf}/$$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/artwiz-fonts/Makefile b/fonts/artwiz-fonts/Makefile
index ab0f385bc11..11fedabbed7 100644
--- a/fonts/artwiz-fonts/Makefile
+++ b/fonts/artwiz-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/12/29 06:21:40 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/29 07:04:27 jlam Exp $
 #
 
 DISTNAME=	artwiz-aleczapka-1.3
@@ -18,11 +18,10 @@ USE_X11BASE=	yes
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
 
-FONTS_X11_DIRS=	${PREFIX}/lib/X11/fonts/artwiz
+FONTS_DIRS.x11=	${PREFIX}/lib/X11/fonts/artwiz
 OWN_DIRS=	${PREFIX}/lib/X11/fonts/artwiz
 
 do-install:
-	for i in ${WRKSRC}/*.pcf; do ${INSTALL_DATA} $$i ${FONTS_X11_DIRS}; done
+	for i in ${WRKSRC}/*.pcf; do ${INSTALL_DATA} $$i ${FONTS_DIRS.x11}; done
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/baekmuk-ttf/Makefile b/fonts/baekmuk-ttf/Makefile
index d0de6125c0c..885dd4b328b 100644
--- a/fonts/baekmuk-ttf/Makefile
+++ b/fonts/baekmuk-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/12/28 14:38:03 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/29 07:04:27 jlam Exp $
 
 DISTNAME=	baekmuk-ttf-2.2
 PKGREVISION=	1
@@ -13,14 +13,13 @@ USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
-FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=		${PREFIX}/share/doc/baekmuk-ttf
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
-	${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${FONTS_TTF_DIRS}
+	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
+	${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${FONTS_DIRS.ttf}
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT* ${DOCDIR}
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/biznet-iso8859_2/Makefile b/fonts/biznet-iso8859_2/Makefile
index 4be252fae47..daa14951052 100644
--- a/fonts/biznet-iso8859_2/Makefile
+++ b/fonts/biznet-iso8859_2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:49 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/29 07:04:27 jlam Exp $
 #
 
 DISTNAME=	ISO8859-2-pcf
@@ -18,7 +18,7 @@ USE_TOOLS+=	gzip
 
 FONTDIR=	${PREFIX}/lib/X11/fonts/biznet
 OWN_DIRS=	${FONTDIR}
-FONTS_X11_DIRS=	${FONTDIR}/75dpi ${FONTDIR}/100dpi ${FONTDIR}/misc
+FONTS_DIRS.x11=	${FONTDIR}/75dpi ${FONTDIR}/100dpi ${FONTDIR}/misc
 
 do-install:
 	@for d in 75dpi 100dpi misc; do \
@@ -31,5 +31,4 @@ do-install:
 		done; \
 	done
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/cyberbit-ttf/Makefile.common b/fonts/cyberbit-ttf/Makefile.common
index 1d72cb078c2..6e52a284e1e 100644
--- a/fonts/cyberbit-ttf/Makefile.common
+++ b/fonts/cyberbit-ttf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2004/10/04 12:44:55 wiz Exp $
+# $NetBSD: Makefile.common,v 1.14 2005/12/29 07:04:27 jlam Exp $
 #
 
 DISTNAME=	# empty
@@ -30,13 +30,11 @@ USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
-FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=		${PREFIX}/share/doc/html/cyberbit-ttf
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
-	${INSTALL_DATA} ${WRKDIR}/*.ttf ${FONTS_TTF_DIRS}
+	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
+	${INSTALL_DATA} ${WRKDIR}/*.ttf ${FONTS_DIRS.ttf}
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${_DISTDIR}/ReadMe.htm ${DOCDIR}
-
-.include "../../mk/fonts.mk"
diff --git a/fonts/dbz-ttf/Makefile b/fonts/dbz-ttf/Makefile
index 5bc2be6ab6f..937388f4f93 100644
--- a/fonts/dbz-ttf/Makefile
+++ b/fonts/dbz-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/29 13:46:16 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 07:04:27 jlam Exp $
 #
 
 DISTNAME=	dbz
@@ -22,14 +22,13 @@ USE_X11=	YES
 NO_BUILD=	YES
 NO_CONFIGURE=	YES
 
-FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=		${PREFIX}/share/doc/dbz-ttf
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
-	${INSTALL_DATA} ${WRKDIR}/*.ttf ${FONTS_TTF_DIRS}
+	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
+	${INSTALL_DATA} ${WRKDIR}/*.ttf ${FONTS_DIRS.ttf}
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKDIR}/readme.txt ${DOCDIR}
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/dejavu-ttf/Makefile b/fonts/dejavu-ttf/Makefile
index ce51e6fcebb..c17cbb3251f 100644
--- a/fonts/dejavu-ttf/Makefile
+++ b/fonts/dejavu-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/09/07 22:40:23 reed Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/29 07:04:27 jlam Exp $
 
 DISTNAME=	dejavu-ttf-1.13
 CATEGORIES=	fonts
@@ -12,7 +12,7 @@ USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
-FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 
 INSTALLATION_DIRS=	lib/X11/fonts/TTF share/doc/dejavu-ttf
 
@@ -21,5 +21,4 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS BUGS LICENSE NEWS README \
 		${PREFIX}/share/doc/dejavu-ttf
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/geoslab703-ttf/Makefile b/fonts/geoslab703-ttf/Makefile
index 7dcee452095..6b7025e60a9 100644
--- a/fonts/geoslab703-ttf/Makefile
+++ b/fonts/geoslab703-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/12/28 14:38:03 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/29 07:04:27 jlam Exp $
 #
 
 DISTNAME=	geoslab703-ttf-20010522
@@ -18,11 +18,10 @@ USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
-FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
-	${INSTALL_DATA} ${_DISTDIR}/*.ttf ${FONTS_TTF_DIRS}
+	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
+	${INSTALL_DATA} ${_DISTDIR}/*.ttf ${FONTS_DIRS.ttf}
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ja-sazanami-ttf/Makefile b/fonts/ja-sazanami-ttf/Makefile
index 1e61c876655..7f374922e9c 100644
--- a/fonts/ja-sazanami-ttf/Makefile
+++ b/fonts/ja-sazanami-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/05 16:10:03 agc Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/29 07:04:27 jlam Exp $
 
 DISTNAME=		sazanami-${SAZANAMI_VERS}
 PKGNAME=		ja-sazanami-ttf-${SAZANAMI_VERS}
@@ -11,15 +11,14 @@ HOMEPAGE=		http://wiki.fdiary.net/font/?sazanami
 COMMENT=		Truly free Japanese TrueType font
 
 SAZANAMI_VERS=		20040629
-FONTS_TTF_DIRS=		${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=		${PREFIX}/lib/X11/fonts/TTF
 
 NO_BUILD=		YES
 NO_CONFIGURE=		YES
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
-	${INSTALL_DATA}	${WRKSRC}/sazanami-gothic.ttf ${FONTS_TTF_DIRS}
-	${INSTALL_DATA}	${WRKSRC}/sazanami-mincho.ttf ${FONTS_TTF_DIRS}
+	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
+	${INSTALL_DATA}	${WRKSRC}/sazanami-gothic.ttf ${FONTS_DIRS.ttf}
+	${INSTALL_DATA}	${WRKSRC}/sazanami-mincho.ttf ${FONTS_DIRS.ttf}
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/jisx0212fonts/Makefile b/fonts/jisx0212fonts/Makefile
index b35cf9eea19..8bbad85eeae 100644
--- a/fonts/jisx0212fonts/Makefile
+++ b/fonts/jisx0212fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:50 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 07:04:28 jlam Exp $
 
 DISTNAME=	jisx0212fonts-0.0
 PKGREVISION=	1
@@ -19,7 +19,7 @@ EXTRACT_ONLY=	${DISTFILES}
 
 FONTS=		${DISTFILES:C/\.bdf.*$//}
 FONTDIR=	${PREFIX}/lib/X11/fonts/local
-FONTS_X11_DIRS=	${FONTDIR}
+FONTS_DIRS.x11=	${FONTDIR}
 
 USE_TOOLS+=	gzip gunzip
 
@@ -42,5 +42,4 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/$${f}.pcf.gz ${FONTDIR}; \
 	done
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/jisx0213fonts/Makefile b/fonts/jisx0213fonts/Makefile
index 47dca38b3c9..8864197ccc0 100644
--- a/fonts/jisx0213fonts/Makefile
+++ b/fonts/jisx0213fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/15 18:27:50 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/29 07:04:28 jlam Exp $
 #
 
 DISTNAME=	jisx0213fonts-0.0
@@ -15,7 +15,7 @@ USE_TOOLS+=	gzip
 
 FONTS=		K14-1 K14-2 jiskan16-2000-1 jiskan16-2000-2
 FONTDIR=	${PREFIX}/lib/X11/fonts/local
-FONTS_X11_DIRS=	${FONTDIR}
+FONTS_DIRS.x11=	${FONTDIR}
 
 WRKSRC=		${WRKDIR}
 
@@ -37,5 +37,4 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/$${f}.pcf.gz ${FONTDIR}; \
 	done
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/kochi-ttf/Makefile b/fonts/kochi-ttf/Makefile
index 25db71b444f..6da8e020ab0 100644
--- a/fonts/kochi-ttf/Makefile
+++ b/fonts/kochi-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/12/29 06:21:40 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/29 07:04:28 jlam Exp $
 
 DISTNAME=	kochi-substitute-${KOCHI_VERSION}
 PKGNAME=	kochi-ttf-${KOCHI_VERSION}
@@ -15,7 +15,7 @@ KOCHI_VERSION=	20030809
 
 NO_BUILD=	yes
 
-FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/TTF
@@ -24,5 +24,4 @@ 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/ms-ttf/Makefile b/fonts/ms-ttf/Makefile
index 9db0990953a..7da7b4a1c9d 100644
--- a/fonts/ms-ttf/Makefile
+++ b/fonts/ms-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/12/28 14:38:03 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/29 07:04:28 jlam Exp $
 
 DISTNAME=	# empty
 PKGNAME=	ms-ttf-20020306
@@ -32,7 +32,7 @@ CABEXTRACT_PREFIX_DEFAULT=${LOCALBASE}
 EXTRACT_CMD=	${CABEXTRACT_PREFIX}/bin/cabextract -q $${extract_file}
 FONTDIR=	${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=		${PREFIX}/share/doc/ms-ttf
-FONTS_TTF_DIRS=	${FONTDIR}
+FONTS_DIRS.ttf=	${FONTDIR}
 
 post-extract:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
@@ -48,5 +48,4 @@ do-install:
 	done
 	${INSTALL_DATA} ${.CURDIR}/../../licenses/${LICENSE} ${DOCDIR}
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/profont/Makefile b/fonts/profont/Makefile
index 7c504e1f010..31a27d17ebd 100644
--- a/fonts/profont/Makefile
+++ b/fonts/profont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/12/29 06:21:40 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/29 07:04:28 jlam Exp $
 #
 
 DISTNAME=	profontlinux
@@ -15,11 +15,10 @@ NO_BUILD=		yes
 NO_CONFIGURE=		yes
 USE_X11BASE=		yes
 
-FONTS_X11_DIRS=		${PREFIX}/lib/X11/fonts/misc
+FONTS_DIRS.x11=		${PREFIX}/lib/X11/fonts/misc
 INSTALLATION_DIRS=	lib/X11/fonts/misc
 
 do-install:
-	for i in ${WRKDIR}/*.pcf; do ${INSTALL_DATA} $$i ${FONTS_X11_DIRS}; done
+	for i in ${WRKDIR}/*.pcf; do ${INSTALL_DATA} $$i ${FONTS_DIRS.x11}; done
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/un-core-ttf/Makefile b/fonts/un-core-ttf/Makefile
index 8855d08cfa6..659844c79ea 100644
--- a/fonts/un-core-ttf/Makefile
+++ b/fonts/un-core-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/28 14:38:03 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/29 07:04:28 jlam Exp $
 
 DISTNAME=	un-fonts-core-${UN_CORE_VER}
 PKGNAME=	un-core-ttf-${UN_CORE_VER}
@@ -19,11 +19,10 @@ USE_X11BASE=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTS_TTF_DIRS}
+	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTS_DIRS.ttf}
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/un-extra-ttf/Makefile b/fonts/un-extra-ttf/Makefile
index 87f2ba58478..c6b49304995 100644
--- a/fonts/un-extra-ttf/Makefile
+++ b/fonts/un-extra-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/28 14:38:03 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/29 07:04:28 jlam Exp $
 
 DISTNAME=	un-fonts-extra-${UN_EXTRA_VER}
 PKGNAME=	un-extra-ttf-${UN_EXTRA_VER}
@@ -19,11 +19,10 @@ USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
-FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTS_TTF_DIRS}
+	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTS_DIRS.ttf}
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/vera-ttf/Makefile b/fonts/vera-ttf/Makefile
index e0232abbbeb..0ce55e4431e 100644
--- a/fonts/vera-ttf/Makefile
+++ b/fonts/vera-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/12/28 14:38:03 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/29 07:04:28 jlam Exp $
 #
 
 DISTNAME=	ttf-bitstream-vera-1.10
@@ -16,15 +16,14 @@ USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
-FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
+	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
 	cd ${WRKSRC} && ${PAX} -rw -pm *.ttf ${PREFIX}/lib/X11/fonts/TTF/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vera-ttf
 	${INSTALL_DATA} ${WRKSRC}/local.conf ${PREFIX}/share/examples/vera-ttf
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vera-ttf
 	cd ${WRKSRC} && ${INSTALL_DATA} *.TXT ${PREFIX}/share/doc/vera-ttf
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile
index 4d780f0d5f8..33dc248ae28 100644
--- a/games/nethack-x11/Makefile
+++ b/games/nethack-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:17 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/29 07:04:28 jlam Exp $
 #
 
 .include "../../games/nethack-lib/Makefile.common"
@@ -16,7 +16,7 @@ BUILD_TARGET=		x11tiles nethack
 INSTALL_TARGET=		binfiles
 MAKE_ENV+=		GTYPE=-x11
 
-FONTS_X11_DIRS+=	${PREFIX}/lib/X11/fonts/misc
+FONTS_DIRS.x11+=	${PREFIX}/lib/X11/fonts/misc
 
 INSTALLATION_DIRS=	lib/X11/app-defaults lib/X11/fonts/misc
 
@@ -29,5 +29,4 @@ post-install:
 	    ${PREFIX}/share/${NETHACK_DIR}/nethack.x11.rc
 
 .include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"