2 files changed, 52 insertions, 47 deletions

diff --git a/x11-fonts/urwfonts-ttf/Makefile b/x11-fonts/urwfonts-ttf/Makefile
index bee188450ddd..b76b80e3e341 100644
--- a/x11-fonts/urwfonts-ttf/Makefile
+++ b/x11-fonts/urwfonts-ttf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	urwfonts-ttf
 PORTVERSION=	1.0.7b18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://ftp.izmiran.rssi.ru/pub/fonts/urw/
 DISTNAME=	urw-fonts-${PORTVERSION:S/b/pre/}-ttf
@@ -11,17 +11,23 @@ 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
 
-USE_BZIP2=	yes
 NO_BUILD=	yes
+USES=		tar:bzip2
+
+FONTDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
+PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/urwfonts-ttf
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${WRKSRC}/fonts.* \
-		${STAGEDIR}${PREFIX}/lib/X11/fonts/urwfonts-ttf
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${WRKSRC}/README \
-		${STAGEDIR}${PREFIX}/lib/X11/fonts/urwfonts-ttf
+	@${MKDIR} ${STAGEDIR}${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts.* ${STAGEDIR}${FONTDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/urwfonts-ttf/pkg-plist b/x11-fonts/urwfonts-ttf/pkg-plist
index e077130ff353..d03e376946ff 100644
--- a/x11-fonts/urwfonts-ttf/pkg-plist
+++ b/x11-fonts/urwfonts-ttf/pkg-plist
@@ -1,40 +1,39 @@
-lib/X11/fonts/urwfonts-ttf/COPYING
-lib/X11/fonts/urwfonts-ttf/README
-lib/X11/fonts/urwfonts-ttf/a010013l.ttf
-lib/X11/fonts/urwfonts-ttf/a010015l.ttf
-lib/X11/fonts/urwfonts-ttf/a010033l.ttf
-lib/X11/fonts/urwfonts-ttf/a010035l.ttf
-lib/X11/fonts/urwfonts-ttf/b018012l.ttf
-lib/X11/fonts/urwfonts-ttf/b018015l.ttf
-lib/X11/fonts/urwfonts-ttf/b018032l.ttf
-lib/X11/fonts/urwfonts-ttf/b018035l.ttf
-lib/X11/fonts/urwfonts-ttf/c059013l.ttf
-lib/X11/fonts/urwfonts-ttf/c059016l.ttf
-lib/X11/fonts/urwfonts-ttf/c059033l.ttf
-lib/X11/fonts/urwfonts-ttf/c059036l.ttf
-lib/X11/fonts/urwfonts-ttf/d050000l.ttf
-lib/X11/fonts/urwfonts-ttf/fonts.dir
-lib/X11/fonts/urwfonts-ttf/fonts.scale
-lib/X11/fonts/urwfonts-ttf/n019003l.ttf
-lib/X11/fonts/urwfonts-ttf/n019004l.ttf
-lib/X11/fonts/urwfonts-ttf/n019023l.ttf
-lib/X11/fonts/urwfonts-ttf/n019024l.ttf
-lib/X11/fonts/urwfonts-ttf/n019043l.ttf
-lib/X11/fonts/urwfonts-ttf/n019044l.ttf
-lib/X11/fonts/urwfonts-ttf/n019063l.ttf
-lib/X11/fonts/urwfonts-ttf/n019064l.ttf
-lib/X11/fonts/urwfonts-ttf/n021003l.ttf
-lib/X11/fonts/urwfonts-ttf/n021004l.ttf
-lib/X11/fonts/urwfonts-ttf/n021023l.ttf
-lib/X11/fonts/urwfonts-ttf/n021024l.ttf
-lib/X11/fonts/urwfonts-ttf/n022003l.ttf
-lib/X11/fonts/urwfonts-ttf/n022004l.ttf
-lib/X11/fonts/urwfonts-ttf/n022023l.ttf
-lib/X11/fonts/urwfonts-ttf/n022024l.ttf
-lib/X11/fonts/urwfonts-ttf/p052003l.ttf
-lib/X11/fonts/urwfonts-ttf/p052004l.ttf
-lib/X11/fonts/urwfonts-ttf/p052023l.ttf
-lib/X11/fonts/urwfonts-ttf/p052024l.ttf
-lib/X11/fonts/urwfonts-ttf/s050000l.ttf
-lib/X11/fonts/urwfonts-ttf/z003034l.ttf
-@dirrm lib/X11/fonts/urwfonts-ttf
+%%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%%