svn commit: r360629 - head/x11-fonts/proggy_fonts-ttf

[Vanilla I. Shu]

Author: vanilla
Date: Fri Jul  4 14:46:37 2014
New Revision: 360629
URL: http://svnweb.freebsd.org/changeset/ports/360629
QAT: https://qat.redports.org/buildarchive/r360629/

Log:
  Stagify, use @fcfontsdir.

Modified:
  head/x11-fonts/proggy_fonts-ttf/Makefile
  head/x11-fonts/proggy_fonts-ttf/pkg-plist

Modified: head/x11-fonts/proggy_fonts-ttf/Makefile
==============================================================================
--- head/x11-fonts/proggy_fonts-ttf/Makefile	Fri Jul  4 14:41:05 2014	(r360628)
+++ head/x11-fonts/proggy_fonts-ttf/Makefile	Fri Jul  4 14:46:37 2014	(r360629)
@@ -16,19 +16,17 @@ COMMENT=	The perfect monospaced bitmap p
 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>

Modified: head/x11-fonts/proggy_fonts-ttf/pkg-plist
==============================================================================
--- head/x11-fonts/proggy_fonts-ttf/pkg-plist	Fri Jul  4 14:41:05 2014	(r360628)
+++ head/x11-fonts/proggy_fonts-ttf/pkg-plist	Fri Jul  4 14:46:37 2014	(r360629)
@@ -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
- at dirrm lib/X11/fonts/proggy_fonts-ttf
- at 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
+ at fcfontsdir %%FONTDIR%%