From owner-svn-ports-all@FreeBSD.ORG Thu Jun 12 10:11:24 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 84FFA978; Thu, 12 Jun 2014 10:11:24 +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 574F02882; Thu, 12 Jun 2014 10:11:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5CABOrL057644; Thu, 12 Jun 2014 10:11:24 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5CABOUH057643; Thu, 12 Jun 2014 10:11:24 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201406121011.s5CABOUH057643@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 12 Jun 2014 10:11:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357580 - head/Keywords 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: Thu, 12 Jun 2014 10:11:24 -0000 Author: bapt Date: Thu Jun 12 10:11:23 2014 New Revision: 357580 URL: http://svnweb.freebsd.org/changeset/ports/357580 QAT: https://qat.redports.org/buildarchive/r357580/ Log: Make pkg_install aware of @fc @fcfontsdir and @fontsdir Forgotten in previous commit Tested by: mandree Modified: head/Keywords/pkg_install.awk Modified: head/Keywords/pkg_install.awk ============================================================================== --- head/Keywords/pkg_install.awk Thu Jun 12 10:10:50 2014 (r357579) +++ head/Keywords/pkg_install.awk Thu Jun 12 10:11:23 2014 (r357580) @@ -44,6 +44,45 @@ $1 == "@shell" { next } +$1 == "@fc" { + font_dir=$2 + print "@comment begin " $0 + print "@exec fc-cache -s %D/" font_dir " 2>/dev/null || true" + print "@unexec fc-cache -s %D/" font_dir " 2>/dev/null || true" + print "@unexec rmdir %D/"font_dir" 2>/dev/null || true" + print "@comment end " $0 + next +} + +$1 == "@fcfontsdir" { + font_dir=$2 + print "@comment begin " $0 + print "@exec fc-cache -s %D/" font_dir " 2>/dev/null || true" + print "@exec mkfontscale %D/" font_dir " 2>/dev/null || true" + print "@exec mkfontdir %D/" font_dir " 2>/dev/null || true" + print "@unexec fc-cache -s %D/" font_dir " 2>/dev/null || true" + print "@unexec mkfontscale %D/" font_dir " 2>/dev/null || true" + print "@unexec if [ -e %D/%@/fonts.scale -a \"`stat -f '%%z' %D/" font_dir "/fonts.scale 2>/dev/null`\" = '2' ]; then rm %D/" font_dir "/fonts.scale ; fi" + print "@unexec mkfontdir %D/" font_dir " 2>/dev/null || true" + print "@unexec if [ -e %D/" font_dir "/fonts.dir -a `\"`stat -f '%%z' %D/" font_dir "/fonts.dir 2>/dev/null`\" = '2' ]; then rm %D/" font_dir "/fonts.dir ; fi" + print "@unexec rmdir %D/"font_dir" 2>/dev/null || true" + print "@comment end " $0 + next +} + +$1 == "@fontsdir" { + print "@comment begin " $0 + print "@exec mkfontscale %D/" font_dir " 2>/dev/null || true" + print "@exec mkfontdir %D/" font_dir " 2>/dev/null || true" + print "@unexec mkfontscale %D/" font_dir " 2>/dev/null || true" + print "@unexec if [ -e %D/%@/fonts.scale -a \"`stat -f '%%z' %D/" font_dir "/fonts.scale 2>/dev/null`\" = '2' ]; then rm %D/" font_dir "/fonts.scale ; fi" + print "@unexec mkfontdir %D/" font_dir " 2>/dev/null || true" + print "@unexec if [ -e %D/" font_dir "/fonts.dir -a `\"`stat -f '%%z' %D/" font_dir "/fonts.dir 2>/dev/null`\" = '2' ]; then rm %D/" font_dir "/fonts.dir ; fi" + print "@unexec rmdir %D/"font_dir" 2>/dev/null || true" + print "@comment end " $0 + next +} + # Print everything else as-is { print $0