From owner-svn-ports-all@FreeBSD.ORG Sun May 11 12:22:44 2014 Return-Path: Delivered-To: svn-ports-all@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 010BAC6A; Sun, 11 May 2014 12:22:44 +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 C9F882EBF; Sun, 11 May 2014 12:22:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4BCMhbr051039; Sun, 11 May 2014 12:22:43 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4BCMhOK051037; Sun, 11 May 2014 12:22:43 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201405111222.s4BCMhOK051037@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 11 May 2014 12:22:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353680 - head/x11-fonts/gohufont 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: Sun, 11 May 2014 12:22:44 -0000 Author: rakuco Date: Sun May 11 12:22:43 2014 New Revision: 353680 URL: http://svnweb.freebsd.org/changeset/ports/353680 QAT: https://qat.redports.org/buildarchive/r353680/ Log: - Support staging. - Stop calling fontconfig on installation and deinstallation: fontconfig should be smart enough to manage its cache automatically. - Stop depending on and using mkfont{dir,scale}. Even though this is not a TTF font, most programs already use freetype and fontconfig. Modified: head/x11-fonts/gohufont/Makefile head/x11-fonts/gohufont/pkg-plist Modified: head/x11-fonts/gohufont/Makefile ============================================================================== --- head/x11-fonts/gohufont/Makefile Sun May 11 12:16:30 2014 (r353679) +++ head/x11-fonts/gohufont/Makefile Sun May 11 12:22:43 2014 (r353680) @@ -2,6 +2,7 @@ PORTNAME= gohufont PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= http://font.gohu.org/ @@ -13,21 +14,12 @@ LICENSE_NAME= Do What The Fuck You Want LICENSE_FILE= ${WRKSRC}/COPYING-LICENSE LICENSE_PERMS= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell -BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig \ - mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir - FONTDIR= lib/X11/fonts/${PORTNAME} NO_BUILD= yes -PLIST_SUB+= FONTDIR=${FONTDIR} +PLIST_SUB= FONTDIR=${FONTDIR} -NO_STAGE= yes do-install: - @${MKDIR} ${LOCALBASE}/${FONTDIR} - @${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${LOCALBASE}/${FONTDIR} - -post-install: - @cd ${LOCALBASE}/${FONTDIR} && mkfontdir - @${CP} ${LOCALBASE}/${FONTDIR}/fonts.dir ${LOCALBASE}/${FONTDIR}/fonts.scale - @command fc-cache -f -v ${LOCALBASE}/${FONTDIR} + ${MKDIR} ${STAGEDIR}${LOCALBASE}/${FONTDIR} + ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${LOCALBASE}/${FONTDIR} .include Modified: head/x11-fonts/gohufont/pkg-plist ============================================================================== --- head/x11-fonts/gohufont/pkg-plist Sun May 11 12:16:30 2014 (r353679) +++ head/x11-fonts/gohufont/pkg-plist Sun May 11 12:22:43 2014 (r353680) @@ -1,5 +1,3 @@ -%%FONTDIR%%/fonts.dir -%%FONTDIR%%/fonts.scale %%FONTDIR%%/gohufont-11.pcf.gz %%FONTDIR%%/gohufont-11b.pcf.gz %%FONTDIR%%/gohufont-14.pcf.gz @@ -8,6 +6,4 @@ %%FONTDIR%%/gohufont-uni-11b.pcf.gz %%FONTDIR%%/gohufont-uni-14.pcf.gz %%FONTDIR%%/gohufont-uni-14b.pcf.gz -@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true @dirrm %%FONTDIR%% -@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true