Index: head/x11-fonts/dejavu/Makefile
===================================================================
--- head/x11-fonts/dejavu/Makefile	(revision 381746)
+++ head/x11-fonts/dejavu/Makefile	(revision 381747)
@@ -1,43 +1,37 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	dejavu
 PORTVERSION=	2.34
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-fonts-ttf-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Bitstream Vera Fonts clone with a wider range of characters
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
-		${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
 OPTIONS_DEFINE=	DOCS LINKS
 OPTIONS_DEFAULT=LINKS
 OPTIONS_SUB=	yes
 LINKS_DESC=	Install links of configuration files in conf.d
 
 NO_BUILD=	yes
-USES=		tar:bzip2
+USES=		fonts tar:bzip2
 
-PLIST_SUB=	FCDIR=${FCDIR} FCDIR_LINKS=${FCDIR_LINKS} FONTSDIR=${FONTSDIR}
+PLIST_SUB=	FCDIR=${FCDIR} FCDIR_LINKS=${FCDIR_LINKS}
 PORTDOCS=	README langcover.txt status.txt unicover.txt
 SUB_FILES=	pkg-message
-SUB_LIST=	FONTSDIR=${FONTSDIR}
 
 FCDIR?=		etc/fonts/conf.avail
 FCDIR_LINKS=	${FCDIR:S|conf.avail|conf.d|}
-FONTSDIR?=	lib/X11/fonts/${PORTNAME}
 
 do-install:
-	cd ${STAGEDIR}${PREFIX}/ && ${MKDIR} ${FCDIR}/ ${FCDIR_LINKS}/ ${FONTSDIR}/
+	cd ${STAGEDIR}${PREFIX}/ && ${MKDIR} ${FCDIR}/ ${FCDIR_LINKS}/ ${STAGEDIR}${FONTSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/fontconfig/*.conf ${STAGEDIR}${PREFIX}/${FCDIR}/
 	cd ${STAGEDIR}${PREFIX}/${FCDIR_LINKS}/ && ${LN} -fs ../conf.avail/*dejavu*.conf .
-	${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${STAGEDIR}${FONTSDIR}/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/x11-fonts/dejavu/pkg-plist
===================================================================
--- head/x11-fonts/dejavu/pkg-plist	(revision 381746)
+++ head/x11-fonts/dejavu/pkg-plist	(revision 381747)
@@ -1,34 +1,33 @@
 %%FCDIR%%/20-unhint-small-dejavu-sans-mono.conf
 %%FCDIR%%/20-unhint-small-dejavu-sans.conf
 %%FCDIR%%/20-unhint-small-dejavu-serif.conf
 %%FCDIR%%/57-dejavu-sans-mono.conf
 %%FCDIR%%/57-dejavu-sans.conf
 %%FCDIR%%/57-dejavu-serif.conf
 %%LINKS%%%%FCDIR_LINKS%%/20-unhint-small-dejavu-sans-mono.conf
 %%LINKS%%%%FCDIR_LINKS%%/20-unhint-small-dejavu-sans.conf
 %%LINKS%%%%FCDIR_LINKS%%/20-unhint-small-dejavu-serif.conf
 %%LINKS%%%%FCDIR_LINKS%%/57-dejavu-sans-mono.conf
 %%LINKS%%%%FCDIR_LINKS%%/57-dejavu-sans.conf
 %%LINKS%%%%FCDIR_LINKS%%/57-dejavu-serif.conf
 %%FONTSDIR%%/DejaVuSans-Bold.ttf
 %%FONTSDIR%%/DejaVuSans-BoldOblique.ttf
 %%FONTSDIR%%/DejaVuSans-ExtraLight.ttf
 %%FONTSDIR%%/DejaVuSans-Oblique.ttf
 %%FONTSDIR%%/DejaVuSans.ttf
 %%FONTSDIR%%/DejaVuSansCondensed-Bold.ttf
 %%FONTSDIR%%/DejaVuSansCondensed-BoldOblique.ttf
 %%FONTSDIR%%/DejaVuSansCondensed-Oblique.ttf
 %%FONTSDIR%%/DejaVuSansCondensed.ttf
 %%FONTSDIR%%/DejaVuSansMono-Bold.ttf
 %%FONTSDIR%%/DejaVuSansMono-BoldOblique.ttf
 %%FONTSDIR%%/DejaVuSansMono-Oblique.ttf
 %%FONTSDIR%%/DejaVuSansMono.ttf
 %%FONTSDIR%%/DejaVuSerif-Bold.ttf
 %%FONTSDIR%%/DejaVuSerif-BoldItalic.ttf
 %%FONTSDIR%%/DejaVuSerif-Italic.ttf
 %%FONTSDIR%%/DejaVuSerif.ttf
 %%FONTSDIR%%/DejaVuSerifCondensed-Bold.ttf
 %%FONTSDIR%%/DejaVuSerifCondensed-BoldItalic.ttf
 %%FONTSDIR%%/DejaVuSerifCondensed-Italic.ttf
 %%FONTSDIR%%/DejaVuSerifCondensed.ttf
-@fcfontsdir %%FONTSDIR%%