From owner-svn-ports-all@FreeBSD.ORG Thu Mar 19 17:47:18 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CB3AAC2A; Thu, 19 Mar 2015 17:47:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B61E2854; Thu, 19 Mar 2015 17:47:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2JHlIqr076557; Thu, 19 Mar 2015 17:47:18 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2JHlIpu076555; Thu, 19 Mar 2015 17:47:18 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201503191747.t2JHlIpu076555@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 19 Mar 2015 17:47:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381634 - head/x11-fonts/droid-fonts-ttf X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2015 17:47:19 -0000 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 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 -@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