2 files changed, 97 insertions, 104 deletions

diff --git a/x11-fonts/lfpfonts-var/Makefile b/x11-fonts/lfpfonts-var/Makefile
index 4e3decb7aa3e..c76a0c4cb3cf 100644
--- a/x11-fonts/lfpfonts-var/Makefile
+++ b/x11-fonts/lfpfonts-var/Makefile
@@ -2,26 +2,20 @@
 
 PORTNAME=	lfpfonts-var
 PORTVERSION=	0.83
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF/xfonts/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Variable width fonts from the Linux Font Project
 
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
 WRKSRC=		${WRKDIR}/lfpfonts-var
 
 NO_BUILD=	yes
-USES=		tar:bzip2
-
-FONTDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
-PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
+USES=		fonts tar:bzip2
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/lfp-var/*.pcf.gz ${STAGEDIR}${FONTDIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/lfp-var/*.pcf.gz ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/lfpfonts-var/pkg-plist b/x11-fonts/lfpfonts-var/pkg-plist
index b6045365d526..b10587d34932 100644
--- a/x11-fonts/lfpfonts-var/pkg-plist
+++ b/x11-fonts/lfpfonts-var/pkg-plist
@@ -1,94 +1,93 @@
-%%FONTDIR%%/lomonosov-v-08-m-r.pcf.gz
-%%FONTDIR%%/lomonosov-v-10-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-05-b-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-05-b-i.pcf.gz
-%%FONTDIR%%/uniread-v-05-b-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-05-b-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-05-b-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-05-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-i.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-r-sc-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-r-sc-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-r-sc-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-r-sc.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-07-b-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-07-b-i.pcf.gz
-%%FONTDIR%%/uniread-v-07-b-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-07-b-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-07-b-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-07-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-07-m-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-07-m-i.pcf.gz
-%%FONTDIR%%/uniread-v-07-m-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-07-m-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-07-m-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-07-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-09-b-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-09-b-i-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-09-b-i-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-09-b-i.pcf.gz
-%%FONTDIR%%/uniread-v-09-b-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-09-b-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-09-b-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-09-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-i-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-i-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-i.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-r-w-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-r-w.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-10-b-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-10-b-i.pcf.gz
-%%FONTDIR%%/uniread-v-10-b-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-10-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-10-m-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-10-m-i.pcf.gz
-%%FONTDIR%%/uniread-v-10-m-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-10-m-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-10-m-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-10-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-12-b-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-12-b-i-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-12-b-i-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-12-b-i.pcf.gz
-%%FONTDIR%%/uniread-v-12-b-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-12-b-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-12-b-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-12-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-12-bb-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-12-bb-r.pcf.gz
-%%FONTDIR%%/uniread-v-12-m-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-12-m-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-12-m-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-12-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-14-b-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-14-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-14-m-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-14-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-18-m-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-18-m-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-18-m-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-18-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-alt-05-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-alt-05-m-r-sc.pcf.gz
-%%FONTDIR%%/uniread-v-alt-05-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-alt-06-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-alt-06-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-alt-08-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-alt-08-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-alt-14-b-i.pcf.gz
-%%FONTDIR%%/uniread-v-alt-14-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-s-10-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-s-10-m-r.pcf.gz
-%%FONTDIR%%/vizing-06-b-r.pcf.gz
-%%FONTDIR%%/vizing-06-m-r.pcf.gz
-@fontsdir %%FONTDIR%%
+%%FONTSDIR%%/lomonosov-v-08-m-r.pcf.gz
+%%FONTSDIR%%/lomonosov-v-10-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-05-b-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-05-b-i.pcf.gz
+%%FONTSDIR%%/uniread-v-05-b-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-05-b-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-05-b-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-05-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-i.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-r-sc-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-r-sc-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-r-sc-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-r-sc.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-07-b-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-07-b-i.pcf.gz
+%%FONTSDIR%%/uniread-v-07-b-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-07-b-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-07-b-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-07-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-07-m-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-07-m-i.pcf.gz
+%%FONTSDIR%%/uniread-v-07-m-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-07-m-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-07-m-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-07-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-09-b-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-09-b-i-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-09-b-i-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-09-b-i.pcf.gz
+%%FONTSDIR%%/uniread-v-09-b-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-09-b-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-09-b-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-09-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-i-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-i-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-i.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-r-w-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-r-w.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-10-b-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-10-b-i.pcf.gz
+%%FONTSDIR%%/uniread-v-10-b-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-10-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-10-m-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-10-m-i.pcf.gz
+%%FONTSDIR%%/uniread-v-10-m-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-10-m-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-10-m-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-10-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-12-b-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-12-b-i-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-12-b-i-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-12-b-i.pcf.gz
+%%FONTSDIR%%/uniread-v-12-b-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-12-b-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-12-b-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-12-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-12-bb-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-12-bb-r.pcf.gz
+%%FONTSDIR%%/uniread-v-12-m-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-12-m-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-12-m-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-12-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-14-b-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-14-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-14-m-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-14-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-18-m-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-18-m-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-18-m-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-18-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-05-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-05-m-r-sc.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-05-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-06-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-06-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-08-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-08-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-14-b-i.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-14-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-s-10-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-s-10-m-r.pcf.gz
+%%FONTSDIR%%/vizing-06-b-r.pcf.gz
+%%FONTSDIR%%/vizing-06-m-r.pcf.gz