Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Mar 2015 18:24:07 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r381658 - head/x11-fonts/roboto-fonts-ttf
Message-ID:  <201503191824.t2JIO7QA097976@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu Mar 19 18:24:06 2015
New Revision: 381658
URL: https://svnweb.freebsd.org/changeset/ports/381658
QAT: https://qat.redports.org/buildarchive/r381658/

Log:
  Convert to USES=fonts

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

Modified: head/x11-fonts/roboto-fonts-ttf/Makefile
==============================================================================
--- head/x11-fonts/roboto-fonts-ttf/Makefile	Thu Mar 19 18:20:38 2015	(r381657)
+++ head/x11-fonts/roboto-fonts-ttf/Makefile	Thu Mar 19 18:24:06 2015	(r381658)
@@ -3,6 +3,7 @@
 
 PORTNAME=	roboto-fonts-ttf
 PORTVERSION=	1.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://developer.android.com/downloads/design/
@@ -13,29 +14,17 @@ COMMENT=	The Roboto typeface family
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES=		zip:infozip
+USES=		fonts zip:infozip
 WRKSRC=		${WRKDIR}/Roboto_v${PORTVERSION}
 
-FONTDIR=	lib/X11/fonts/Roboto
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PLIST_SUB=	FONTDIR=${FONTDIR}
+FONTSDIR=	${PREFIX}/lib/X11/fonts/Roboto
 SUB_FILES=	pkg-message
-SUB_LIST=	FONTDIR=${FONTDIR}
 
 do-build:
 	@${MV} ${WRKSRC}/Roboto/*.ttf ${WRKSRC}/RobotoCondensed/*.ttf ${WRKSRC}
-	@cd ${WRKSRC} && \
-		${LOCALBASE}/bin/mkfontscale && \
-		${LOCALBASE}/bin/mkfontdir
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}
-	cd ${WRKSRC}/ && ${INSTALL_DATA} *.ttf fonts.dir fonts.scale \
-		 ${STAGEDIR}${PREFIX}/${FONTDIR}
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${WRKSRC}/ && ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>

Modified: head/x11-fonts/roboto-fonts-ttf/pkg-plist
==============================================================================
--- head/x11-fonts/roboto-fonts-ttf/pkg-plist	Thu Mar 19 18:20:38 2015	(r381657)
+++ head/x11-fonts/roboto-fonts-ttf/pkg-plist	Thu Mar 19 18:24:06 2015	(r381658)
@@ -1,23 +1,18 @@
-%%FONTDIR%%/Roboto-Black.ttf
-%%FONTDIR%%/Roboto-BlackItalic.ttf
-%%FONTDIR%%/Roboto-Bold.ttf
-%%FONTDIR%%/Roboto-BoldItalic.ttf
-%%FONTDIR%%/Roboto-Italic.ttf
-%%FONTDIR%%/Roboto-Light.ttf
-%%FONTDIR%%/Roboto-LightItalic.ttf
-%%FONTDIR%%/Roboto-Medium.ttf
-%%FONTDIR%%/Roboto-MediumItalic.ttf
-%%FONTDIR%%/Roboto-Regular.ttf
-%%FONTDIR%%/Roboto-Thin.ttf
-%%FONTDIR%%/Roboto-ThinItalic.ttf
-%%FONTDIR%%/RobotoCondensed-Bold.ttf
-%%FONTDIR%%/RobotoCondensed-BoldItalic.ttf
-%%FONTDIR%%/RobotoCondensed-Italic.ttf
-%%FONTDIR%%/RobotoCondensed-Light.ttf
-%%FONTDIR%%/RobotoCondensed-LightItalic.ttf
-%%FONTDIR%%/RobotoCondensed-Regular.ttf
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
-@unexec /bin/rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
-@dirrm %%FONTDIR%%
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTDIR%% 2>/dev/null || /usr/bin/true
+%%FONTSDIR%%/Roboto-Black.ttf
+%%FONTSDIR%%/Roboto-BlackItalic.ttf
+%%FONTSDIR%%/Roboto-Bold.ttf
+%%FONTSDIR%%/Roboto-BoldItalic.ttf
+%%FONTSDIR%%/Roboto-Italic.ttf
+%%FONTSDIR%%/Roboto-Light.ttf
+%%FONTSDIR%%/Roboto-LightItalic.ttf
+%%FONTSDIR%%/Roboto-Medium.ttf
+%%FONTSDIR%%/Roboto-MediumItalic.ttf
+%%FONTSDIR%%/Roboto-Regular.ttf
+%%FONTSDIR%%/Roboto-Thin.ttf
+%%FONTSDIR%%/Roboto-ThinItalic.ttf
+%%FONTSDIR%%/RobotoCondensed-Bold.ttf
+%%FONTSDIR%%/RobotoCondensed-BoldItalic.ttf
+%%FONTSDIR%%/RobotoCondensed-Italic.ttf
+%%FONTSDIR%%/RobotoCondensed-Light.ttf
+%%FONTSDIR%%/RobotoCondensed-LightItalic.ttf
+%%FONTSDIR%%/RobotoCondensed-Regular.ttf



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503191824.t2JIO7QA097976>