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

[Baptiste Daroussin]

Author: bapt
Date: Fri Mar 20 16:30:23 2015
New Revision: 381747
URL: https://svnweb.freebsd.org/changeset/ports/381747
QAT: https://qat.redports.org/buildarchive/r381747/

Log:
  Convert to USES=fonts

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

Modified: head/x11-fonts/dejavu/Makefile
==============================================================================
--- head/x11-fonts/dejavu/Makefile	Fri Mar 20 16:26:28 2015	(r381746)
+++ head/x11-fonts/dejavu/Makefile	Fri Mar 20 16:30:23 2015	(r381747)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dejavu
 PORTVERSION=	2.34
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-fonts-ttf-${PORTVERSION}
@@ -11,32 +11,26 @@ 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/fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
-		${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
 OPTIONS_DEFINE=	DOCS LINKS
 OPTIONS_DEFAULT=LINKS
 OPTIONS_SUB=	yes
 LINKS_DESC=	Install links of configuration files in conf.d
 
 NO_BUILD=	yes
-USES=		tar:bzip2
+USES=		fonts tar:bzip2
 
-PLIST_SUB=	FCDIR=${FCDIR} FCDIR_LINKS=${FCDIR_LINKS} FONTSDIR=${FONTSDIR}
+PLIST_SUB=	FCDIR=${FCDIR} FCDIR_LINKS=${FCDIR_LINKS}
 PORTDOCS=	README langcover.txt status.txt unicover.txt
 SUB_FILES=	pkg-message
-SUB_LIST=	FONTSDIR=${FONTSDIR}
 
 FCDIR?=		etc/fonts/conf.avail
 FCDIR_LINKS=	${FCDIR:S|conf.avail|conf.d|}
-FONTSDIR?=	lib/X11/fonts/${PORTNAME}
 
 do-install:
-	cd ${STAGEDIR}${PREFIX}/ && ${MKDIR} ${FCDIR}/ ${FCDIR_LINKS}/ ${FONTSDIR}/
+	cd ${STAGEDIR}${PREFIX}/ && ${MKDIR} ${FCDIR}/ ${FCDIR_LINKS}/ ${STAGEDIR}${FONTSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/fontconfig/*.conf ${STAGEDIR}${PREFIX}/${FCDIR}/
 	cd ${STAGEDIR}${PREFIX}/${FCDIR_LINKS}/ && ${LN} -fs ../conf.avail/*dejavu*.conf .
-	${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${STAGEDIR}${FONTSDIR}/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 

Modified: head/x11-fonts/dejavu/pkg-plist
==============================================================================
--- head/x11-fonts/dejavu/pkg-plist	Fri Mar 20 16:26:28 2015	(r381746)
+++ head/x11-fonts/dejavu/pkg-plist	Fri Mar 20 16:30:23 2015	(r381747)
@@ -31,4 +31,3 @@
 %%FONTSDIR%%/DejaVuSerifCondensed-BoldItalic.ttf
 %%FONTSDIR%%/DejaVuSerifCondensed-Italic.ttf
 %%FONTSDIR%%/DejaVuSerifCondensed.ttf
- at fcfontsdir %%FONTSDIR%%