From owner-svn-ports-all@FreeBSD.ORG Mon Jun 9 23:38:58 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6A873B00; Mon, 9 Jun 2014 23:38:58 +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 5769D2EC0; Mon, 9 Jun 2014 23:38:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s59Ncwlw004350; Mon, 9 Jun 2014 23:38:58 GMT (envelope-from olgeni@svn.freebsd.org) Received: (from olgeni@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s59NcwJ3004346; Mon, 9 Jun 2014 23:38:58 GMT (envelope-from olgeni@svn.freebsd.org) Message-Id: <201406092338.s59NcwJ3004346@svn.freebsd.org> From: Jimmy Olgeni Date: Mon, 9 Jun 2014 23:38:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357226 - head/x11-fonts/moveable-type-fonts 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 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: Mon, 09 Jun 2014 23:38:58 -0000 Author: olgeni Date: Mon Jun 9 23:38:57 2014 New Revision: 357226 URL: http://svnweb.freebsd.org/changeset/ports/357226 QAT: https://qat.redports.org/buildarchive/r357226/ Log: Add staging support. - Fix COMMENT. - Use the @fc keyword in pkg-plist. - General cleanup. Modified: head/x11-fonts/moveable-type-fonts/Makefile head/x11-fonts/moveable-type-fonts/pkg-plist (contents, props changed) Modified: head/x11-fonts/moveable-type-fonts/Makefile ============================================================================== --- head/x11-fonts/moveable-type-fonts/Makefile Mon Jun 9 23:33:33 2014 (r357225) +++ head/x11-fonts/moveable-type-fonts/Makefile Mon Jun 9 23:38:57 2014 (r357226) @@ -16,27 +16,23 @@ DISTFILES= junction.zip \ goudy-bookletter-1911.zip MAINTAINER= olgeni@FreeBSD.org -COMMENT= A collection of open source fonts +COMMENT= Collection of open source fonts BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig NO_BUILD= yes USES= zip -FONTSDIR?= ${PREFIX}/lib/X11/fonts/${PORTNAME} -PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" -NO_STAGE= yes +FONTDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME} +PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}" + post-extract: @${FIND} ${WRKDIR} -name __MACOSX | ${XARGS} ${RM} -r do-install: - @${MKDIR} ${FONTSDIR} - @${FIND} ${WRKDIR} -name \*.ttf -exec ${INSTALL_DATA} {} ${FONTSDIR} \; - @${FIND} ${WRKDIR} -name \*.otf -exec ${INSTALL_DATA} {} ${FONTSDIR} \; - -post-install: - @${ECHO_MSG} "===> Running fc-cache" - -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} + @${MKDIR} ${STAGEDIR}${FONTDIR} + ${FIND} ${WRKDIR} -name \*.ttf -exec ${INSTALL_DATA} {} ${STAGEDIR}${FONTDIR} \; + ${FIND} ${WRKDIR} -name \*.otf -exec ${INSTALL_DATA} {} ${STAGEDIR}${FONTDIR} \; .include Modified: head/x11-fonts/moveable-type-fonts/pkg-plist ============================================================================== --- head/x11-fonts/moveable-type-fonts/pkg-plist Mon Jun 9 23:33:33 2014 (r357225) +++ head/x11-fonts/moveable-type-fonts/pkg-plist Mon Jun 9 23:38:57 2014 (r357226) @@ -1,28 +1,26 @@ -%%FONTSDIR%%/Blackout-2am.ttf -%%FONTSDIR%%/Blackout-Midnight.ttf -%%FONTSDIR%%/Chunk.otf -%%FONTSDIR%%/Chunk.ttf -%%FONTSDIR%%/GoudyBookletter1911.otf -%%FONTSDIR%%/Junction 02.otf -%%FONTSDIR%%/Junction 02.ttf -%%FONTSDIR%%/League Gothic.otf -%%FONTSDIR%%/OFLGoudyStM-Italic.otf -%%FONTSDIR%%/OFLGoudyStM.otf -%%FONTSDIR%%/OFLGoudyStMTT-Italic.ttf -%%FONTSDIR%%/OFLGoudyStMTT.ttf -%%FONTSDIR%%/Prociono.otf -%%FONTSDIR%%/ProcionoTT.ttf -%%FONTSDIR%%/Sniglet.ttf -%%FONTSDIR%%/orbitron-black.otf -%%FONTSDIR%%/orbitron-black.ttf -%%FONTSDIR%%/orbitron-bold.otf -%%FONTSDIR%%/orbitron-bold.ttf -%%FONTSDIR%%/orbitron-light.otf -%%FONTSDIR%%/orbitron-light.ttf -%%FONTSDIR%%/orbitron-medium.otf -%%FONTSDIR%%/orbitron-medium.ttf -%%FONTSDIR%%/raleway_thin.otf -%%FONTSDIR%%/raleway_thin.ttf -@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true -@dirrm %%FONTSDIR%% -@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true +%%FONTDIR%%/Blackout-2am.ttf +%%FONTDIR%%/Blackout-Midnight.ttf +%%FONTDIR%%/Chunk.otf +%%FONTDIR%%/Chunk.ttf +%%FONTDIR%%/GoudyBookletter1911.otf +%%FONTDIR%%/Junction 02.otf +%%FONTDIR%%/Junction 02.ttf +%%FONTDIR%%/League Gothic.otf +%%FONTDIR%%/OFLGoudyStM-Italic.otf +%%FONTDIR%%/OFLGoudyStM.otf +%%FONTDIR%%/OFLGoudyStMTT-Italic.ttf +%%FONTDIR%%/OFLGoudyStMTT.ttf +%%FONTDIR%%/Prociono.otf +%%FONTDIR%%/ProcionoTT.ttf +%%FONTDIR%%/Sniglet.ttf +%%FONTDIR%%/orbitron-black.otf +%%FONTDIR%%/orbitron-black.ttf +%%FONTDIR%%/orbitron-bold.otf +%%FONTDIR%%/orbitron-bold.ttf +%%FONTDIR%%/orbitron-light.otf +%%FONTDIR%%/orbitron-light.ttf +%%FONTDIR%%/orbitron-medium.otf +%%FONTDIR%%/orbitron-medium.ttf +%%FONTDIR%%/raleway_thin.otf +%%FONTDIR%%/raleway_thin.ttf +@fc %%FONTDIR%%