From 048e7dd8676d42b2153be8d834309ec9b58a3a8c Mon Sep 17 00:00:00 2001
From: "Vanilla I. Shu" <vanilla@FreeBSD.org>
Date: Fri, 4 Jul 2014 14:46:37 +0000
Subject: [PATCH] Stagify, use @fcfontsdir.

---
 x11-fonts/proggy_fonts-ttf/Makefile  | 16 +++++++---------
 x11-fonts/proggy_fonts-ttf/pkg-plist | 23 ++++++++++-------------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/x11-fonts/proggy_fonts-ttf/Makefile b/x11-fonts/proggy_fonts-ttf/Makefile
index 204113250827..ce56a8d0a7ba 100644
--- a/x11-fonts/proggy_fonts-ttf/Makefile
+++ b/x11-fonts/proggy_fonts-ttf/Makefile
@@ -16,19 +16,17 @@ COMMENT=	The perfect monospaced bitmap programming fonts, TTF version
 LICENSE=	MIT
 
 BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
+		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 USES=		zip
 NO_WRKSUBDIR=	yes
-INSTALLDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
-
-NO_STAGE=	yes
-do-build:
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/mkfontscale
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/mkfontdir
+FONTDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
+NO_BUILD=	yes
+PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
 
 do-install:
-	@${MKDIR} ${INSTALLDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} fonts.dir fonts.scale *.ttf ${INSTALLDIR}
+	@${MKDIR} ${STAGEDIR}${FONTDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/proggy_fonts-ttf/pkg-plist b/x11-fonts/proggy_fonts-ttf/pkg-plist
index 5c051eef28ff..d26edabdd314 100644
--- a/x11-fonts/proggy_fonts-ttf/pkg-plist
+++ b/x11-fonts/proggy_fonts-ttf/pkg-plist
@@ -1,13 +1,10 @@
-lib/X11/fonts/proggy_fonts-ttf/ProggyClean.ttf
-lib/X11/fonts/proggy_fonts-ttf/ProggyCleanCE.ttf
-lib/X11/fonts/proggy_fonts-ttf/ProggyCleanSZ.ttf
-lib/X11/fonts/proggy_fonts-ttf/ProggyCleanSZBP.ttf
-lib/X11/fonts/proggy_fonts-ttf/ProggySmall.ttf
-lib/X11/fonts/proggy_fonts-ttf/ProggySquare.ttf
-lib/X11/fonts/proggy_fonts-ttf/ProggySquareSZ.ttf
-lib/X11/fonts/proggy_fonts-ttf/ProggyTiny.ttf
-lib/X11/fonts/proggy_fonts-ttf/ProggyTinySZ.ttf
-lib/X11/fonts/proggy_fonts-ttf/fonts.dir
-lib/X11/fonts/proggy_fonts-ttf/fonts.scale
-@dirrm lib/X11/fonts/proggy_fonts-ttf
-@exec fc-cache -v %D/lib/X11/fonts/proggy_fonts-ttf 2>/dev/null || true
+%%FONTDIR%%/ProggyClean.ttf
+%%FONTDIR%%/ProggyCleanCE.ttf
+%%FONTDIR%%/ProggyCleanSZ.ttf
+%%FONTDIR%%/ProggyCleanSZBP.ttf
+%%FONTDIR%%/ProggySmall.ttf
+%%FONTDIR%%/ProggySquare.ttf
+%%FONTDIR%%/ProggySquareSZ.ttf
+%%FONTDIR%%/ProggyTiny.ttf
+%%FONTDIR%%/ProggyTinySZ.ttf
+@fcfontsdir %%FONTDIR%%