From owner-svn-ports-head@FreeBSD.ORG Wed Oct 8 21:39:49 2014 Return-Path: Delivered-To: svn-ports-head@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 82E36C97; Wed, 8 Oct 2014 21:39:49 +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 65F6B79; Wed, 8 Oct 2014 21:39:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s98LdnrY027677; Wed, 8 Oct 2014 21:39:49 GMT (envelope-from ak@FreeBSD.org) Received: (from ak@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s98Ldmhp027672; Wed, 8 Oct 2014 21:39:48 GMT (envelope-from ak@FreeBSD.org) Message-Id: <201410082139.s98Ldmhp027672@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ak set sender to ak@FreeBSD.org using -f From: Alex Kozlov Date: Wed, 8 Oct 2014 21:39:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370490 - in head: Keywords Mk/Scripts 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-1 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: Wed, 08 Oct 2014 21:39:49 -0000 Author: ak Date: Wed Oct 8 21:39:47 2014 New Revision: 370490 URL: https://svnweb.freebsd.org/changeset/ports/370490 QAT: https://qat.redports.org/buildarchive/r370490/ Log: - Accept absolute path for @fc, @fontsdir, @fcfontsdir, @shell keywords Approved by: portmgr (antoine, bapt) Differential Revision: https://reviews.freebsd.org/D721 Modified: head/Keywords/fc.ucl head/Keywords/fcfontsdir.ucl head/Keywords/fontsdir.ucl head/Keywords/shell.ucl head/Mk/Scripts/check-stagedir.sh Modified: head/Keywords/fc.ucl ============================================================================== --- head/Keywords/fc.ucl Wed Oct 8 21:28:48 2014 (r370489) +++ head/Keywords/fc.ucl Wed Oct 8 21:39:47 2014 (r370490) @@ -4,8 +4,16 @@ actions: [dir] post-install: </dev/null || true + case "%@" in + /*) fontsdir="%@" ;; + *) fontsdir="%D/%@" ;; + esac + fc-cache -s ${fontsdir} 2>/dev/null || true EOD post-deinstall: </dev/null || true + case "%@" in + /*) fontsdir="%@" ;; + *) fontsdir="%D/%@" ;; + esac + fc-cache -s ${fontsdir} 2>/dev/null || true EOD Modified: head/Keywords/fcfontsdir.ucl ============================================================================== --- head/Keywords/fcfontsdir.ucl Wed Oct 8 21:28:48 2014 (r370489) +++ head/Keywords/fcfontsdir.ucl Wed Oct 8 21:39:47 2014 (r370490) @@ -4,18 +4,26 @@ actions: [dir] post-install: </dev/null || true - mkfontscale %D/%@ 2>/dev/null || true - mkfontdir %D/%@ 2>/dev/null || true + case "%@" in + /*) fontsdir="%@" ;; + *) fontsdir="%D/%@" ;; + esac + fc-cache -s ${fontsdir} 2>/dev/null || true + mkfontscale ${fontsdir} 2>/dev/null || true + mkfontdir ${fontsdir} 2>/dev/null || true EOD post-deinstall: </dev/null || true - mkfontscale %D/%@ 2>/dev/null || true - if [ -e %D/%@/fonts.scale -a "`stat -f '%%z' %D/%@/fonts.scale 2>/dev/null`" = '2' ]; then - rm %D/%@/fonts.scale + case "%@" in + /*) fontsdir="%@" ;; + *) fontsdir="%D/%@" ;; + esac + fc-cache -s ${fontsdir} 2>/dev/null || true + mkfontscale ${fontsdir} 2>/dev/null || true + if [ -e ${fontsdir}/fonts.scale -a "`stat -f '%%z' ${fontsdir}/fonts.scale 2>/dev/null`" = '2' ]; then + rm ${fontsdir}/fonts.scale fi - mkfontdir %D/%@ 2>/dev/null || true - if [ -e %D/%@/fonts.dir -a "`stat -f '%%z' %D/%@/fonts.dir 2>/dev/null`" = '2' ]; then - rm %D/%@/fonts.dir + mkfontdir ${fontsdir} 2>/dev/null || true + if [ -e ${fontsdir}/fonts.dir -a "`stat -f '%%z' ${fontsdir}/fonts.dir 2>/dev/null`" = '2' ]; then + rm ${fontsdir}/fonts.dir fi EOD Modified: head/Keywords/fontsdir.ucl ============================================================================== --- head/Keywords/fontsdir.ucl Wed Oct 8 21:28:48 2014 (r370489) +++ head/Keywords/fontsdir.ucl Wed Oct 8 21:39:47 2014 (r370490) @@ -4,16 +4,24 @@ actions: [dir] post-install: </dev/null || true - mkfontdir %D/%@ 2>/dev/null || true + case "%@" in + /*) fontsdir="%@" ;; + *) fontsdir="%D/%@" ;; + esac + mkfontscale ${fontsdir} 2>/dev/null || true + mkfontdir ${fontsdir} 2>/dev/null || true EOD post-deinstall: </dev/null || true - if [ -e %D/%@/fonts.scale -a "`stat -f '%%z' %D/%@/fonts.scale 2>/dev/null`" = '2' ]; then - rm %D/%@/fonts.scale + case "%@" in + /*) fontsdir="%@" ;; + *) fontsdir="%D/%@" ;; + esac + mkfontscale ${fontsdir} 2>/dev/null || true + if [ -e ${fontsdir}/fonts.scale -a "`stat -f '%%z' ${fontsdir}/fonts.scale 2>/dev/null`" = '2' ]; then + rm ${fontsdir}/fonts.scale fi - mkfontdir %D/%@ 2>/dev/null || true - if [ -e %D/%@/fonts.dir -a "`stat -f '%%z' %D/%@/fonts.dir 2>/dev/null`" = '2' ]; then - rm %D/%@/fonts.dir + mkfontdir ${fontsdir} 2>/dev/null || true + if [ -e ${fontsdir}/fonts.dir -a "`stat -f '%%z' ${fontsdir}/fonts.dir 2>/dev/null`" = '2' ]; then + rm ${fontsdir}/fonts.dir fi EOD Modified: head/Keywords/shell.ucl ============================================================================== --- head/Keywords/shell.ucl Wed Oct 8 21:28:48 2014 (r370489) +++ head/Keywords/shell.ucl Wed Oct 8 21:39:47 2014 (r370490) @@ -13,12 +13,20 @@ actions: [file] post-install: < /etc/shells + (grep -v ${file} /etc/shells.bak; echo ${file}) > /etc/shells rm -f /etc/shells.bak EOD pre-deinstall: < /etc/shells + grep -v ${file} /etc/shells.bak > /etc/shells rm -f /etc/shells.bak EOD Modified: head/Mk/Scripts/check-stagedir.sh ============================================================================== --- head/Mk/Scripts/check-stagedir.sh Wed Oct 8 21:28:48 2014 (r370489) +++ head/Mk/Scripts/check-stagedir.sh Wed Oct 8 21:39:47 2014 (r370490) @@ -95,7 +95,14 @@ parse_plist() { @fc\ *|@fcfontsdir\ *|@fontsdir\ *) set -- $line shift + case "$@" in + /*) + echo >&3 "${comment}$@" + ;; + *) echo >&3 "${comment}${cwd}/$@" + ;; + esac ;; # order matters here - we must check @cwd first because