svn commit: r381634 - head/x11-fonts/droid-fonts-ttf

[Baptiste Daroussin]

Author: bapt
Date: Thu Mar 19 17:47:17 2015
New Revision: 381634
URL: https://svnweb.freebsd.org/changeset/ports/381634
QAT: https://qat.redports.org/buildarchive/r381634/

Log:
  Convert to USES=fonts

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

Modified: head/x11-fonts/droid-fonts-ttf/Makefile
==============================================================================
--- head/x11-fonts/droid-fonts-ttf/Makefile	Thu Mar 19 17:44:05 2015	(r381633)
+++ head/x11-fonts/droid-fonts-ttf/Makefile	Thu Mar 19 17:47:17 2015	(r381634)
@@ -12,22 +12,15 @@ COMMENT=	The Droid typeface family
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
-		${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
 NO_BUILD=	yes
-USES=		tar:xz
+USES=		fonts tar:xz
 
-FONTDIR=	lib/X11/fonts/Droid
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PLIST_SUB=	FONTDIR=${FONTDIR}
+FONTSDIR=	lib/X11/fonts/Droid
 SUB_FILES=	pkg-message
-SUB_LIST=	FONTDIR=${FONTDIR}
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} *.ttf ${STAGEDIR}${PREFIX}/${FONTDIR}/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} *.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}/
 
 # maintainer section:
 # https://android.googlesource.com/platform/frameworks/base/+/master/data/fonts/
@@ -51,10 +44,10 @@ maketar: do-clean extract
 	cd ${.CURDIR}/ && ${MAKE_CMD} makesum
 	${ECHO_MSG} '*** Update from ${PORTVERSION} to ${MS_VERSION} ***'
 # genplist
-	${SED} 's|^|%%FONTDIR%%/|' ${MS_FONTS} > ${MS_PLIST}
-	${ECHO_CMD} "%%FONTDIR%%/fonts.dir" >> ${MS_PLIST}
-	${ECHO_CMD} "%%FONTDIR%%/fonts.scale" >> ${MS_PLIST}
-	${ECHO_CMD} "@dirrm %%FONTDIR%%" >> ${MS_PLIST}
+	${SED} 's|^|%%FONTSDIR%%/|' ${MS_FONTS} > ${MS_PLIST}
+	${ECHO_CMD} "%%FONTSDIR%%/fonts.dir" >> ${MS_PLIST}
+	${ECHO_CMD} "%%FONTSDIR%%/fonts.scale" >> ${MS_PLIST}
+	${ECHO_CMD} "@dirrm %%FONTSDIR%%" >> ${MS_PLIST}
 	${INSTALL} -m 600 ${MS_PLIST} ${PLIST}
 
 .include <bsd.port.mk>

Modified: head/x11-fonts/droid-fonts-ttf/pkg-plist
==============================================================================
--- head/x11-fonts/droid-fonts-ttf/pkg-plist	Thu Mar 19 17:44:05 2015	(r381633)
+++ head/x11-fonts/droid-fonts-ttf/pkg-plist	Thu Mar 19 17:47:17 2015	(r381634)
@@ -1,24 +1,23 @@
-%%FONTDIR%%/DroidKufi-Bold.ttf
-%%FONTDIR%%/DroidKufi-Regular.ttf
-%%FONTDIR%%/DroidNaskh-Bold.ttf
-%%FONTDIR%%/DroidNaskh-Regular.ttf
-%%FONTDIR%%/DroidNaskhUI-Regular.ttf
-%%FONTDIR%%/DroidSans-Bold.ttf
-%%FONTDIR%%/DroidSans.ttf
-%%FONTDIR%%/DroidSansArabic.ttf
-%%FONTDIR%%/DroidSansArmenian.ttf
-%%FONTDIR%%/DroidSansEthiopic-Bold.ttf
-%%FONTDIR%%/DroidSansEthiopic-Regular.ttf
-%%FONTDIR%%/DroidSansFallback.ttf
-%%FONTDIR%%/DroidSansFallbackFull.ttf
-%%FONTDIR%%/DroidSansFallbackLegacy.ttf
-%%FONTDIR%%/DroidSansGeorgian.ttf
-%%FONTDIR%%/DroidSansHebrew-Bold.ttf
-%%FONTDIR%%/DroidSansHebrew-Regular.ttf
-%%FONTDIR%%/DroidSansJapanese.ttf
-%%FONTDIR%%/DroidSansMono.ttf
-%%FONTDIR%%/DroidSerif-Bold.ttf
-%%FONTDIR%%/DroidSerif-BoldItalic.ttf
-%%FONTDIR%%/DroidSerif-Italic.ttf
-%%FONTDIR%%/DroidSerif-Regular.ttf
- at fcfontsdir %%FONTDIR%%
+%%FONTSDIR%%/DroidKufi-Bold.ttf
+%%FONTSDIR%%/DroidKufi-Regular.ttf
+%%FONTSDIR%%/DroidNaskh-Bold.ttf
+%%FONTSDIR%%/DroidNaskh-Regular.ttf
+%%FONTSDIR%%/DroidNaskhUI-Regular.ttf
+%%FONTSDIR%%/DroidSans-Bold.ttf
+%%FONTSDIR%%/DroidSans.ttf
+%%FONTSDIR%%/DroidSansArabic.ttf
+%%FONTSDIR%%/DroidSansArmenian.ttf
+%%FONTSDIR%%/DroidSansEthiopic-Bold.ttf
+%%FONTSDIR%%/DroidSansEthiopic-Regular.ttf
+%%FONTSDIR%%/DroidSansFallback.ttf
+%%FONTSDIR%%/DroidSansFallbackFull.ttf
+%%FONTSDIR%%/DroidSansFallbackLegacy.ttf
+%%FONTSDIR%%/DroidSansGeorgian.ttf
+%%FONTSDIR%%/DroidSansHebrew-Bold.ttf
+%%FONTSDIR%%/DroidSansHebrew-Regular.ttf
+%%FONTSDIR%%/DroidSansJapanese.ttf
+%%FONTSDIR%%/DroidSansMono.ttf
+%%FONTSDIR%%/DroidSerif-Bold.ttf
+%%FONTSDIR%%/DroidSerif-BoldItalic.ttf
+%%FONTSDIR%%/DroidSerif-Italic.ttf
+%%FONTSDIR%%/DroidSerif-Regular.ttf