Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Mar 2015 17:40:36 +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: r381632 - head/x11-fonts/croscorefonts-fonts-ttf
Message-ID:  <201503191740.t2JHeavL071757@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu Mar 19 17:40:36 2015
New Revision: 381632
URL: https://svnweb.freebsd.org/changeset/ports/381632
QAT: https://qat.redports.org/buildarchive/r381632/

Log:
  Convert to USES=fonts

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

Modified: head/x11-fonts/croscorefonts-fonts-ttf/Makefile
==============================================================================
--- head/x11-fonts/croscorefonts-fonts-ttf/Makefile	Thu Mar 19 17:37:24 2015	(r381631)
+++ head/x11-fonts/croscorefonts-fonts-ttf/Makefile	Thu Mar 19 17:40:36 2015	(r381632)
@@ -3,6 +3,7 @@
 
 PORTNAME=	croscorefonts
 PORTVERSION=	1.23.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://gsdview.appspot.com/chromeos-localmirror/distfiles/ \
 		LOCAL/sunpoet
@@ -15,32 +16,18 @@ COMMENT=	Fonts created from by Google fo
 #LICENSE_FILE=	${WRKSRC}/LICENSE
 #LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
+USES=		fonts
 USE_XORG=	x11
 
 PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
-
 SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_LIST=	FONTDIR=${FONTDIR}
 
 FONTNAME=	ChromeOS
-FONTDIR=	${PREFIX}/lib/X11/fonts/${FONTNAME}
-INSTDAT=	fonts.dir fonts.scale
-
-MKFONTSCL_CMD=	${LOCALBASE}/bin/mkfontscale
-MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
-
-do-build:
-	cd ${WRKSRC} && ${MKFONTSCL_CMD}
-	${REINPLACE_CMD} -e 's|-misc-|-google-|' ${WRKSRC}/fonts.scale
-	cd ${WRKSRC} && ${MKFONTDIR_CMD}
+FONTSDIR=	${PREFIX}/lib/X11/fonts/${FONTNAME}
+NO_BUILD=	yes
 
 do-install:
-	${MKDIR} ${STAGEDIR}${FONTDIR}
-	cd ${WRKSRC} &&	\
-	${INSTALL_DATA} ${INSTDAT} *.ttf ${STAGEDIR}${FONTDIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>

Modified: head/x11-fonts/croscorefonts-fonts-ttf/pkg-plist
==============================================================================
--- head/x11-fonts/croscorefonts-fonts-ttf/pkg-plist	Thu Mar 19 17:37:24 2015	(r381631)
+++ head/x11-fonts/croscorefonts-fonts-ttf/pkg-plist	Thu Mar 19 17:40:36 2015	(r381632)
@@ -1,17 +1,13 @@
-%%FONTDIR%%/Arimo-Bold.ttf
-%%FONTDIR%%/Arimo-BoldItalic.ttf
-%%FONTDIR%%/Arimo-Italic.ttf
-%%FONTDIR%%/Arimo-Regular.ttf
-%%FONTDIR%%/Cousine-Bold.ttf
-%%FONTDIR%%/Cousine-BoldItalic.ttf
-%%FONTDIR%%/Cousine-Italic.ttf
-%%FONTDIR%%/Cousine-Regular.ttf
-%%FONTDIR%%/SymbolNeu.ttf
-%%FONTDIR%%/Tinos-Bold.ttf
-%%FONTDIR%%/Tinos-BoldItalic.ttf
-%%FONTDIR%%/Tinos-Italic.ttf
-%%FONTDIR%%/Tinos-Regular.ttf
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
-@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
-@dirrm %%FONTDIR%%
+%%FONTSDIR%%/Arimo-Bold.ttf
+%%FONTSDIR%%/Arimo-BoldItalic.ttf
+%%FONTSDIR%%/Arimo-Italic.ttf
+%%FONTSDIR%%/Arimo-Regular.ttf
+%%FONTSDIR%%/Cousine-Bold.ttf
+%%FONTSDIR%%/Cousine-BoldItalic.ttf
+%%FONTSDIR%%/Cousine-Italic.ttf
+%%FONTSDIR%%/Cousine-Regular.ttf
+%%FONTSDIR%%/SymbolNeu.ttf
+%%FONTSDIR%%/Tinos-Bold.ttf
+%%FONTSDIR%%/Tinos-BoldItalic.ttf
+%%FONTSDIR%%/Tinos-Italic.ttf
+%%FONTSDIR%%/Tinos-Regular.ttf



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