From owner-svn-ports-head@FreeBSD.ORG Tue Jul 22 17:42:03 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DEFF9229; Tue, 22 Jul 2014 17:42:02 +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 BFB342093; Tue, 22 Jul 2014 17:42:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6MHg2Eg007710; Tue, 22 Jul 2014 17:42:02 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6MHg2df007706; Tue, 22 Jul 2014 17:42:02 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201407221742.s6MHg2df007706@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Tue, 22 Jul 2014 17:42:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362557 - in head/x11-fonts/sourcesanspro-ttf: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jul 2014 17:42:03 -0000 Author: sunpoet Date: Tue Jul 22 17:42:01 2014 New Revision: 362557 URL: http://svnweb.freebsd.org/changeset/ports/362557 QAT: https://qat.redports.org/buildarchive/r362557/ Log: - Remove leading indefinite article from COMMENT - Use @fcfontsdir - Simplify FONTDIR - Cleanup Makefile Modified: head/x11-fonts/sourcesanspro-ttf/Makefile head/x11-fonts/sourcesanspro-ttf/files/pkg-message.in head/x11-fonts/sourcesanspro-ttf/pkg-plist Modified: head/x11-fonts/sourcesanspro-ttf/Makefile ============================================================================== --- head/x11-fonts/sourcesanspro-ttf/Makefile Tue Jul 22 17:41:55 2014 (r362556) +++ head/x11-fonts/sourcesanspro-ttf/Makefile Tue Jul 22 17:42:01 2014 (r362557) @@ -3,41 +3,32 @@ PORTNAME= sourcesanspro-ttf PORTVERSION= 1.050 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= SF/sourcesans.adobe DISTNAME= SourceSansPro_FontsOnly-${PORTVERSION} MAINTAINER= office@FreeBSD.org -COMMENT= A set of fonts by Adobe designed for user interfaces +COMMENT= Set of fonts by Adobe designed for user interfaces LICENSE= OFL11 -BUILD_DEPENDS= mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ +BUILD_DEPENDS= mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir +NO_BUILD= yes USES= zip USE_XORG= x11 -PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}" - -SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message +PLIST_SUB= FONTDIR=${FONTDIR} +SUB_FILES= pkg-message SUB_LIST= FONTDIR=${FONTDIR} -FONTNAME= SourceSansPro -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} - cd ${WRKSRC}/ && ${MKFONTDIR_CMD} +FONTDIR= lib/X11/fonts/SourceSansPro do-install: - ${MKDIR} ${STAGEDIR}${FONTDIR} - cd ${WRKSRC}/ && \ - ${INSTALL_DATA} ${INSTDAT} TTF/*.ttf ${STAGEDIR}${FONTDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR} + cd ${WRKSRC}/ && ${INSTALL_DATA} TTF/*.ttf ${STAGEDIR}${PREFIX}/${FONTDIR} .include Modified: head/x11-fonts/sourcesanspro-ttf/files/pkg-message.in ============================================================================== --- head/x11-fonts/sourcesanspro-ttf/files/pkg-message.in Tue Jul 22 17:41:55 2014 (r362556) +++ head/x11-fonts/sourcesanspro-ttf/files/pkg-message.in Tue Jul 22 17:42:01 2014 (r362557) @@ -2,4 +2,4 @@ You can start using the fonts by followi Add the following line to the "Files" section of your x.org configuration file: - FontPath "%%FONTDIR%%/" + FontPath "%%PREFIX%%/%%FONTDIR%%/" Modified: head/x11-fonts/sourcesanspro-ttf/pkg-plist ============================================================================== --- head/x11-fonts/sourcesanspro-ttf/pkg-plist Tue Jul 22 17:41:55 2014 (r362556) +++ head/x11-fonts/sourcesanspro-ttf/pkg-plist Tue Jul 22 17:42:01 2014 (r362557) @@ -10,7 +10,4 @@ %%FONTDIR%%/SourceSansPro-Regular.ttf %%FONTDIR%%/SourceSansPro-Semibold.ttf %%FONTDIR%%/SourceSansPro-SemiboldIt.ttf -%%FONTDIR%%/fonts.dir -%%FONTDIR%%/fonts.scale -@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true -@dirrm %%FONTDIR%% +@fcfontsdir %%FONTDIR%%