svn commit: r362685 - head/x11-fonts/dejavu

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Wed Jul 23 13:17:28 2014
New Revision: 362685
URL: http://svnweb.freebsd.org/changeset/ports/362685
QAT: https://qat.redports.org/buildarchive/r362685/

Log:
  - Use @fcfontsdir
  - Bump PORTREVISION for package change

Modified:
  head/x11-fonts/dejavu/Makefile
  head/x11-fonts/dejavu/pkg-plist

Modified: head/x11-fonts/dejavu/Makefile
==============================================================================
--- head/x11-fonts/dejavu/Makefile	Wed Jul 23 13:16:39 2014	(r362684)
+++ head/x11-fonts/dejavu/Makefile	Wed Jul 23 13:17:28 2014	(r362685)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dejavu
 PORTVERSION=	2.34
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-fonts-ttf-${PORTVERSION}
@@ -11,7 +11,8 @@ DISTNAME=	${PORTNAME}-fonts-ttf-${PORTVE
 MAINTAINER=	sunpoet at FreeBSD.org
 COMMENT=	Bitstream Vera Fonts clone with a wider range of characters
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+BUILD_DEPENDS=	${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
+		${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 OPTIONS_DEFINE=	DOCS LINKS
@@ -19,6 +20,7 @@ OPTIONS_DEFAULT=LINKS
 OPTIONS_SUB=	yes
 LINKS_DESC=	Install links of configuration files in conf.d
 
+NO_BUILD=	yes
 USES=		tar:bzip2
 
 PLIST_SUB=	FCDIR=${FCDIR} FCDIR_LINKS=${FCDIR_LINKS} FONTSDIR=${FONTSDIR}
@@ -30,15 +32,11 @@ FCDIR?=		etc/fonts/conf.avail
 FCDIR_LINKS=	${FCDIR:S|conf.avail|conf.d|}
 FONTSDIR?=	lib/X11/fonts/${PORTNAME}
 
-do-build:
-	@cd ${WRKSRC}/ttf/ && ${LOCALBASE}/bin/mkfontscale
-	@cd ${WRKSRC}/ttf/ && ${LOCALBASE}/bin/mkfontdir
-
 do-install:
 	cd ${STAGEDIR}${PREFIX}/ && ${MKDIR} ${FCDIR}/ ${FCDIR_LINKS}/ ${FONTSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/fontconfig/*.conf ${STAGEDIR}${PREFIX}/${FCDIR}/
 	cd ${STAGEDIR}${PREFIX}/${FCDIR_LINKS}/ && ${LN} -fs ../conf.avail/*dejavu*.conf .
-	${INSTALL_DATA} ${WRKSRC}/ttf/fonts.* ${WRKSRC}/ttf/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 

Modified: head/x11-fonts/dejavu/pkg-plist
==============================================================================
--- head/x11-fonts/dejavu/pkg-plist	Wed Jul 23 13:16:39 2014	(r362684)
+++ head/x11-fonts/dejavu/pkg-plist	Wed Jul 23 13:17:28 2014	(r362685)
@@ -31,9 +31,7 @@
 %%FONTSDIR%%/DejaVuSerifCondensed-BoldItalic.ttf
 %%FONTSDIR%%/DejaVuSerifCondensed-Italic.ttf
 %%FONTSDIR%%/DejaVuSerifCondensed.ttf
-%%FONTSDIR%%/fonts.dir
-%%FONTSDIR%%/fonts.scale
- at dirrm %%FONTSDIR%%
+ at fcfontsdir %%FONTSDIR%%
 %%LINKS%%@dirrmtry %%FCDIR_LINKS%%
 @dirrmtry %%FCDIR%%
 @dirrmtry etc/fonts