Index: head/x11-fonts/urwfonts-ttf/Makefile
===================================================================
--- head/x11-fonts/urwfonts-ttf/Makefile	(revision 381763)
+++ head/x11-fonts/urwfonts-ttf/Makefile	(revision 381764)
@@ -1,35 +1,30 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	urwfonts-ttf
 PORTVERSION=	1.0.7b18
 PORTREVISION=	5
 CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://ftp.izmiran.rssi.ru/pub/fonts/urw/
 DISTNAME=	urw-fonts-${PORTVERSION:S/b/pre/}-ttf
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Unicode TrueType fonts from URW extended by Valek Filippov
 
 LICENSE=	LGPL20
 
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
 DISABLE_SIZE=	yes
 NO_WRKSUBDIR=	yes
 
 NO_BUILD=	yes
-USES=		tar:bzip2
+USES=		fonts tar:bzip2
 
-FONTDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
-PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
-SUB_LIST=	FONTDIR="${FONTDIR}"
 SUB_FILES=	pkg-message
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts.* ${STAGEDIR}${FONTDIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts.* ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
Index: head/x11-fonts/urwfonts-ttf/files/pkg-message.in
===================================================================
--- head/x11-fonts/urwfonts-ttf/files/pkg-message.in	(revision 381763)
+++ head/x11-fonts/urwfonts-ttf/files/pkg-message.in	(revision 381764)
@@ -1,10 +1,10 @@
 ============================================================
-You'll have to add %%FONTDIR%%
+You'll have to add %%FONTSDIR%%
 to your X font path by either:
 
-$ xset fp+ %%FONTDIR%%
+$ xset fp+ %%FONTSDIR%%
 $ xset fp rehash
 
 or by adding it to your X-server configuration file (usually
 /etc/X11/xorg.conf) and restarting the X-server.
 ============================================================
Index: head/x11-fonts/urwfonts-ttf/pkg-plist
===================================================================
--- head/x11-fonts/urwfonts-ttf/pkg-plist	(revision 381763)
+++ head/x11-fonts/urwfonts-ttf/pkg-plist	(revision 381764)
@@ -1,39 +1,38 @@
-%%FONTDIR%%/README
-%%FONTDIR%%/a010013l.ttf
-%%FONTDIR%%/a010015l.ttf
-%%FONTDIR%%/a010033l.ttf
-%%FONTDIR%%/a010035l.ttf
-%%FONTDIR%%/b018012l.ttf
-%%FONTDIR%%/b018015l.ttf
-%%FONTDIR%%/b018032l.ttf
-%%FONTDIR%%/b018035l.ttf
-%%FONTDIR%%/c059013l.ttf
-%%FONTDIR%%/c059016l.ttf
-%%FONTDIR%%/c059033l.ttf
-%%FONTDIR%%/c059036l.ttf
-%%FONTDIR%%/d050000l.ttf
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
-%%FONTDIR%%/n019003l.ttf
-%%FONTDIR%%/n019004l.ttf
-%%FONTDIR%%/n019023l.ttf
-%%FONTDIR%%/n019024l.ttf
-%%FONTDIR%%/n019043l.ttf
-%%FONTDIR%%/n019044l.ttf
-%%FONTDIR%%/n019063l.ttf
-%%FONTDIR%%/n019064l.ttf
-%%FONTDIR%%/n021003l.ttf
-%%FONTDIR%%/n021004l.ttf
-%%FONTDIR%%/n021023l.ttf
-%%FONTDIR%%/n021024l.ttf
-%%FONTDIR%%/n022003l.ttf
-%%FONTDIR%%/n022004l.ttf
-%%FONTDIR%%/n022023l.ttf
-%%FONTDIR%%/n022024l.ttf
-%%FONTDIR%%/p052003l.ttf
-%%FONTDIR%%/p052004l.ttf
-%%FONTDIR%%/p052023l.ttf
-%%FONTDIR%%/p052024l.ttf
-%%FONTDIR%%/s050000l.ttf
-%%FONTDIR%%/z003034l.ttf
-@fc %%FONTDIR%%
+%%FONTSDIR%%/README
+%%FONTSDIR%%/a010013l.ttf
+%%FONTSDIR%%/a010015l.ttf
+%%FONTSDIR%%/a010033l.ttf
+%%FONTSDIR%%/a010035l.ttf
+%%FONTSDIR%%/b018012l.ttf
+%%FONTSDIR%%/b018015l.ttf
+%%FONTSDIR%%/b018032l.ttf
+%%FONTSDIR%%/b018035l.ttf
+%%FONTSDIR%%/c059013l.ttf
+%%FONTSDIR%%/c059016l.ttf
+%%FONTSDIR%%/c059033l.ttf
+%%FONTSDIR%%/c059036l.ttf
+%%FONTSDIR%%/d050000l.ttf
+%%FONTSDIR%%/fonts.dir
+%%FONTSDIR%%/fonts.scale
+%%FONTSDIR%%/n019003l.ttf
+%%FONTSDIR%%/n019004l.ttf
+%%FONTSDIR%%/n019023l.ttf
+%%FONTSDIR%%/n019024l.ttf
+%%FONTSDIR%%/n019043l.ttf
+%%FONTSDIR%%/n019044l.ttf
+%%FONTSDIR%%/n019063l.ttf
+%%FONTSDIR%%/n019064l.ttf
+%%FONTSDIR%%/n021003l.ttf
+%%FONTSDIR%%/n021004l.ttf
+%%FONTSDIR%%/n021023l.ttf
+%%FONTSDIR%%/n021024l.ttf
+%%FONTSDIR%%/n022003l.ttf
+%%FONTSDIR%%/n022004l.ttf
+%%FONTSDIR%%/n022023l.ttf
+%%FONTSDIR%%/n022024l.ttf
+%%FONTSDIR%%/p052003l.ttf
+%%FONTSDIR%%/p052004l.ttf
+%%FONTSDIR%%/p052023l.ttf
+%%FONTSDIR%%/p052024l.ttf
+%%FONTSDIR%%/s050000l.ttf
+%%FONTSDIR%%/z003034l.ttf