Index: head/x11-fonts/urwfonts/Makefile
===================================================================
--- head/x11-fonts/urwfonts/Makefile	(revision 381764)
+++ head/x11-fonts/urwfonts/Makefile	(revision 381765)
@@ -1,32 +1,28 @@
 # $FreeBSD$
 
 PORTNAME=	urwfonts
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/fonts/
 DISTNAME=	urw-fonts
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Another font package for X
 
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
 WRKSRC=		${WRKDIR}/URW
 NO_BUILD=	yes
+USES=		fonts
 
-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}
-.for FILE in fonts.dir fonts.scale Fontmap
-	${INSTALL_DATA} ${WRKSRC}/$(FILE) ${STAGEDIR}${FONTDIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+.for FILE in Fontmap
+	${INSTALL_DATA} ${WRKSRC}/$(FILE) ${STAGEDIR}${FONTSDIR}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/*.pfb ${STAGEDIR}${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.afm ${STAGEDIR}${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.pfm ${STAGEDIR}${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.pfb ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.afm ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.pfm ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
Index: head/x11-fonts/urwfonts/files/pkg-message.in
===================================================================
--- head/x11-fonts/urwfonts/files/pkg-message.in	(revision 381764)
+++ head/x11-fonts/urwfonts/files/pkg-message.in	(revision 381765)
@@ -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/pkg-plist
===================================================================
--- head/x11-fonts/urwfonts/pkg-plist	(revision 381764)
+++ head/x11-fonts/urwfonts/pkg-plist	(revision 381765)
@@ -1,109 +1,106 @@
-%%FONTDIR%%/a010013l.afm
-%%FONTDIR%%/a010013l.pfb
-%%FONTDIR%%/a010013l.pfm
-%%FONTDIR%%/a010015l.afm
-%%FONTDIR%%/a010015l.pfb
-%%FONTDIR%%/a010015l.pfm
-%%FONTDIR%%/a010033l.afm
-%%FONTDIR%%/a010033l.pfb
-%%FONTDIR%%/a010033l.pfm
-%%FONTDIR%%/a010035l.afm
-%%FONTDIR%%/a010035l.pfb
-%%FONTDIR%%/a010035l.pfm
-%%FONTDIR%%/b018012l.afm
-%%FONTDIR%%/b018012l.pfb
-%%FONTDIR%%/b018012l.pfm
-%%FONTDIR%%/b018015l.afm
-%%FONTDIR%%/b018015l.pfb
-%%FONTDIR%%/b018015l.pfm
-%%FONTDIR%%/b018032l.afm
-%%FONTDIR%%/b018032l.pfb
-%%FONTDIR%%/b018032l.pfm
-%%FONTDIR%%/b018035l.afm
-%%FONTDIR%%/b018035l.pfb
-%%FONTDIR%%/b018035l.pfm
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/c059013l.afm
-%%FONTDIR%%/c059013l.pfb
-%%FONTDIR%%/c059013l.pfm
-%%FONTDIR%%/c059016l.afm
-%%FONTDIR%%/c059016l.pfb
-%%FONTDIR%%/c059016l.pfm
-%%FONTDIR%%/c059033l.afm
-%%FONTDIR%%/c059033l.pfb
-%%FONTDIR%%/c059033l.pfm
-%%FONTDIR%%/c059036l.afm
-%%FONTDIR%%/c059036l.pfb
-%%FONTDIR%%/c059036l.pfm
-%%FONTDIR%%/d050000l.afm
-%%FONTDIR%%/d050000l.pfb
-%%FONTDIR%%/d050000l.pfm
-%%FONTDIR%%/fonts.scale
-%%FONTDIR%%/Fontmap
-%%FONTDIR%%/n019003l.afm
-%%FONTDIR%%/n019003l.pfb
-%%FONTDIR%%/n019003l.pfm
-%%FONTDIR%%/n019004l.afm
-%%FONTDIR%%/n019004l.pfb
-%%FONTDIR%%/n019004l.pfm
-%%FONTDIR%%/n019023l.afm
-%%FONTDIR%%/n019023l.pfb
-%%FONTDIR%%/n019023l.pfm
-%%FONTDIR%%/n019024l.afm
-%%FONTDIR%%/n019024l.pfb
-%%FONTDIR%%/n019024l.pfm
-%%FONTDIR%%/n019043l.afm
-%%FONTDIR%%/n019043l.pfb
-%%FONTDIR%%/n019043l.pfm
-%%FONTDIR%%/n019044l.afm
-%%FONTDIR%%/n019044l.pfb
-%%FONTDIR%%/n019044l.pfm
-%%FONTDIR%%/n019063l.afm
-%%FONTDIR%%/n019063l.pfb
-%%FONTDIR%%/n019063l.pfm
-%%FONTDIR%%/n019064l.afm
-%%FONTDIR%%/n019064l.pfb
-%%FONTDIR%%/n019064l.pfm
-%%FONTDIR%%/n021003l.afm
-%%FONTDIR%%/n021003l.pfb
-%%FONTDIR%%/n021003l.pfm
-%%FONTDIR%%/n021004l.afm
-%%FONTDIR%%/n021004l.pfb
-%%FONTDIR%%/n021004l.pfm
-%%FONTDIR%%/n021023l.afm
-%%FONTDIR%%/n021023l.pfb
-%%FONTDIR%%/n021023l.pfm
-%%FONTDIR%%/n021024l.afm
-%%FONTDIR%%/n021024l.pfb
-%%FONTDIR%%/n021024l.pfm
-%%FONTDIR%%/n022003l.afm
-%%FONTDIR%%/n022003l.pfb
-%%FONTDIR%%/n022003l.pfm
-%%FONTDIR%%/n022004l.afm
-%%FONTDIR%%/n022004l.pfb
-%%FONTDIR%%/n022004l.pfm
-%%FONTDIR%%/n022023l.afm
-%%FONTDIR%%/n022023l.pfb
-%%FONTDIR%%/n022023l.pfm
-%%FONTDIR%%/n022024l.afm
-%%FONTDIR%%/n022024l.pfb
-%%FONTDIR%%/n022024l.pfm
-%%FONTDIR%%/p052003l.afm
-%%FONTDIR%%/p052003l.pfb
-%%FONTDIR%%/p052003l.pfm
-%%FONTDIR%%/p052004l.afm
-%%FONTDIR%%/p052004l.pfb
-%%FONTDIR%%/p052004l.pfm
-%%FONTDIR%%/p052023l.afm
-%%FONTDIR%%/p052023l.pfb
-%%FONTDIR%%/p052023l.pfm
-%%FONTDIR%%/p052024l.afm
-%%FONTDIR%%/p052024l.pfb
-%%FONTDIR%%/p052024l.pfm
-%%FONTDIR%%/s050000l.afm
-%%FONTDIR%%/s050000l.pfb
-%%FONTDIR%%/s050000l.pfm
-%%FONTDIR%%/z003034l.afm
-%%FONTDIR%%/z003034l.pfb
-%%FONTDIR%%/z003034l.pfm
-@fc %%FONTDIR%%
+%%FONTSDIR%%/a010013l.afm
+%%FONTSDIR%%/a010013l.pfb
+%%FONTSDIR%%/a010013l.pfm
+%%FONTSDIR%%/a010015l.afm
+%%FONTSDIR%%/a010015l.pfb
+%%FONTSDIR%%/a010015l.pfm
+%%FONTSDIR%%/a010033l.afm
+%%FONTSDIR%%/a010033l.pfb
+%%FONTSDIR%%/a010033l.pfm
+%%FONTSDIR%%/a010035l.afm
+%%FONTSDIR%%/a010035l.pfb
+%%FONTSDIR%%/a010035l.pfm
+%%FONTSDIR%%/b018012l.afm
+%%FONTSDIR%%/b018012l.pfb
+%%FONTSDIR%%/b018012l.pfm
+%%FONTSDIR%%/b018015l.afm
+%%FONTSDIR%%/b018015l.pfb
+%%FONTSDIR%%/b018015l.pfm
+%%FONTSDIR%%/b018032l.afm
+%%FONTSDIR%%/b018032l.pfb
+%%FONTSDIR%%/b018032l.pfm
+%%FONTSDIR%%/b018035l.afm
+%%FONTSDIR%%/b018035l.pfb
+%%FONTSDIR%%/b018035l.pfm
+%%FONTSDIR%%/c059013l.afm
+%%FONTSDIR%%/c059013l.pfb
+%%FONTSDIR%%/c059013l.pfm
+%%FONTSDIR%%/c059016l.afm
+%%FONTSDIR%%/c059016l.pfb
+%%FONTSDIR%%/c059016l.pfm
+%%FONTSDIR%%/c059033l.afm
+%%FONTSDIR%%/c059033l.pfb
+%%FONTSDIR%%/c059033l.pfm
+%%FONTSDIR%%/c059036l.afm
+%%FONTSDIR%%/c059036l.pfb
+%%FONTSDIR%%/c059036l.pfm
+%%FONTSDIR%%/d050000l.afm
+%%FONTSDIR%%/d050000l.pfb
+%%FONTSDIR%%/d050000l.pfm
+%%FONTSDIR%%/Fontmap
+%%FONTSDIR%%/n019003l.afm
+%%FONTSDIR%%/n019003l.pfb
+%%FONTSDIR%%/n019003l.pfm
+%%FONTSDIR%%/n019004l.afm
+%%FONTSDIR%%/n019004l.pfb
+%%FONTSDIR%%/n019004l.pfm
+%%FONTSDIR%%/n019023l.afm
+%%FONTSDIR%%/n019023l.pfb
+%%FONTSDIR%%/n019023l.pfm
+%%FONTSDIR%%/n019024l.afm
+%%FONTSDIR%%/n019024l.pfb
+%%FONTSDIR%%/n019024l.pfm
+%%FONTSDIR%%/n019043l.afm
+%%FONTSDIR%%/n019043l.pfb
+%%FONTSDIR%%/n019043l.pfm
+%%FONTSDIR%%/n019044l.afm
+%%FONTSDIR%%/n019044l.pfb
+%%FONTSDIR%%/n019044l.pfm
+%%FONTSDIR%%/n019063l.afm
+%%FONTSDIR%%/n019063l.pfb
+%%FONTSDIR%%/n019063l.pfm
+%%FONTSDIR%%/n019064l.afm
+%%FONTSDIR%%/n019064l.pfb
+%%FONTSDIR%%/n019064l.pfm
+%%FONTSDIR%%/n021003l.afm
+%%FONTSDIR%%/n021003l.pfb
+%%FONTSDIR%%/n021003l.pfm
+%%FONTSDIR%%/n021004l.afm
+%%FONTSDIR%%/n021004l.pfb
+%%FONTSDIR%%/n021004l.pfm
+%%FONTSDIR%%/n021023l.afm
+%%FONTSDIR%%/n021023l.pfb
+%%FONTSDIR%%/n021023l.pfm
+%%FONTSDIR%%/n021024l.afm
+%%FONTSDIR%%/n021024l.pfb
+%%FONTSDIR%%/n021024l.pfm
+%%FONTSDIR%%/n022003l.afm
+%%FONTSDIR%%/n022003l.pfb
+%%FONTSDIR%%/n022003l.pfm
+%%FONTSDIR%%/n022004l.afm
+%%FONTSDIR%%/n022004l.pfb
+%%FONTSDIR%%/n022004l.pfm
+%%FONTSDIR%%/n022023l.afm
+%%FONTSDIR%%/n022023l.pfb
+%%FONTSDIR%%/n022023l.pfm
+%%FONTSDIR%%/n022024l.afm
+%%FONTSDIR%%/n022024l.pfb
+%%FONTSDIR%%/n022024l.pfm
+%%FONTSDIR%%/p052003l.afm
+%%FONTSDIR%%/p052003l.pfb
+%%FONTSDIR%%/p052003l.pfm
+%%FONTSDIR%%/p052004l.afm
+%%FONTSDIR%%/p052004l.pfb
+%%FONTSDIR%%/p052004l.pfm
+%%FONTSDIR%%/p052023l.afm
+%%FONTSDIR%%/p052023l.pfb
+%%FONTSDIR%%/p052023l.pfm
+%%FONTSDIR%%/p052024l.afm
+%%FONTSDIR%%/p052024l.pfb
+%%FONTSDIR%%/p052024l.pfm
+%%FONTSDIR%%/s050000l.afm
+%%FONTSDIR%%/s050000l.pfb
+%%FONTSDIR%%/s050000l.pfm
+%%FONTSDIR%%/z003034l.afm
+%%FONTSDIR%%/z003034l.pfb
+%%FONTSDIR%%/z003034l.pfm