From nobody Tue Mar 22 12:30:01 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 281151A3811A; Tue, 22 Mar 2022 12:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KN9mV0ZKLz3pQB; Tue, 22 Mar 2022 12:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647952202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aQXhMGJRQcSlJxJittbuO8USxwFaUXiTmhd3k8kDJ2A=; b=AfRedk4matHUO2j86a01aqaf4V51bJtP+3ybYG+99Z5kHtD2YUs1y3PQiyVZFZ7iHYssmA lUz1oOKuL1IqTxuMVgV+HIxjhTr1Kfbpg0to4ujNUjyLNGu8TN9lqxTLoXXJWyVAlWUlaA fNcbdgax244lQFFglmNVbsq+molYdICG0RCjUetu+KjZ3oRXM2s6p1gwh57uXrsWLPzgiH 8H5tiUOnsHqVCFwIkkA3UoJ+aEA6EBAITyB1j+l9hzEKYFD1QP36mXF0Yu2s+4O/vfwgAk nzOD2Qv0Q+8jj26EDUYGyrS3YfOdlToEAoWcptqN0qQzrGluAIYtBfuQiKKkBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E3A7A72FA; Tue, 22 Mar 2022 12:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22MCU1dG076855; Tue, 22 Mar 2022 12:30:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22MCU1jp076852; Tue, 22 Mar 2022 12:30:01 GMT (envelope-from git) Date: Tue, 22 Mar 2022 12:30:01 GMT Message-Id: <202203221230.22MCU1jp076852@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 306567bc74fb - main - x11-fonts/fontconfig: Use triggers to rebuild fc-cache List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 306567bc74fbdfb30c62479083b933835f314c8f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647952202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aQXhMGJRQcSlJxJittbuO8USxwFaUXiTmhd3k8kDJ2A=; b=sPHV94TLY86VpcKK4GPs8qxlEy+XZG5OH/JFtIR6twNi85SlkVMp6mPqCWwslpZd1T8Ezc okwdXjQTZccDfC2AZOPipcFKIzYZ1ljKP7T1ybVO7liPndijoypsBawqd/Oy6jS8rvjepX hZmW1ontLfmd6gO5ckVeeonaFBZhlqDoFNv9bimCc62fZrMrZNjOghWzjH0rbS3C95iPCe zRqMtyOlql7UmiwWDayoH44zDwy11HaCG5n3l58GnvVsOpaIa5U8KWj1A+JG//Y3IFJvN/ 2TrtYpsz8pliu2TXv5jMo7aFwlOp3X2XY/7Gg/AW0WGMEV5qvL3FNolNIW1mjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647952202; a=rsa-sha256; cv=none; b=BYp3PqNhHJ6lnUaWLmuXCQSczlmjZLj/2mej10JEv8W/nykI48lleerytcHP/86GlIz20p dVVwQxHykGzm0pQjfmsul8QFjFKIAVgpJKCw99T+6Kw9Fl0CLsRujgelc8OKmm9V66KpBP GXqXji5i9Hvq3wFH+9MtDIWFoSD4qrp02naV+EUyB0ohEUKW1ku2Dvg/DSAEzeZYKfn1oJ fJqe0cW9BM/tsfD6hRNuXSF8shqHS+lsSVTFOBQwLnnBwVt/tXnkkX/eVuWY5H0ojVXNAb nW12AzvqC4tHYn8NQ6LeHNFaxseDjDOuqNGjTSXfakKNuTGZc4yJhSj4+VSh7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=306567bc74fbdfb30c62479083b933835f314c8f commit 306567bc74fbdfb30c62479083b933835f314c8f Author: Baptiste Daroussin AuthorDate: 2022-03-18 13:36:57 +0000 Commit: Baptiste Daroussin CommitDate: 2022-03-22 12:29:52 +0000 x11-fonts/fontconfig: Use triggers to rebuild fc-cache Stop forcing the overwrite of the cache at each run it is not necessary most of the time. Reviewed by: tcberner Differencial Revision: https://reviews.freebsd.org/D34602 While here rework USES=fonts to drop @fcfontsdir which is not nessary anymore and convert the @fontsdir into lua which make it way simpler to read --- Keywords/fcfontsdir.ucl | 27 ---------------------- Keywords/fontsdir.ucl | 34 ++++++++++++---------------- Mk/Uses/fonts.mk | 10 ++++---- x11-fonts/font-misc-ethiopic/pkg-plist | 2 +- x11-fonts/fontconfig/Makefile | 7 +++--- x11-fonts/fontconfig/files/fontconfig.ucl.in | 9 ++++++++ x11-fonts/fontconfig/files/pkg-install.in | 10 -------- 7 files changed, 32 insertions(+), 67 deletions(-) diff --git a/Keywords/fcfontsdir.ucl b/Keywords/fcfontsdir.ucl deleted file mode 100644 index 81f9d4e716ab..000000000000 --- a/Keywords/fcfontsdir.ucl +++ /dev/null @@ -1,27 +0,0 @@ -# MAINTAINER: x11@FreeBSD.org - -actions: [dir] -post-install: </dev/null || true - mkfontscale ${fontsdir} 2>/dev/null || true - mkfontdir ${fontsdir} 2>/dev/null || true -EOD -post-deinstall: </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 ${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 diff --git a/Keywords/fontsdir.ucl b/Keywords/fontsdir.ucl index 09c31572bf50..8c0701223e53 100644 --- a/Keywords/fontsdir.ucl +++ b/Keywords/fontsdir.ucl @@ -1,25 +1,19 @@ # MAINTAINER: x11@FreeBSD.org actions: [dir] -post-install: </dev/null || true - mkfontdir ${fontsdir} 2>/dev/null || true +post-install-lua: </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 ${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 +post-deinstall-lua: <