From nobody Fri May 6 17:46:56 2022 X-Original-To: dev-commits-ports-main@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 390B71AB68C7; Fri, 6 May 2022 17:46:57 +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 4KvygP17qWz4dmZ; Fri, 6 May 2022 17:46:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651859217; 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=lejdSyrzXZbkbOgXR1WuIFrzUMvtuUa7wJfaFqxvyco=; b=BflOBmhFLUYFIDYO2BFhCfZDd+UCYmq3SgMtMex68wOkj5zWizf9OWLs0KJZLIYVfN1u90 JYk1L2iA3g18nqGxGJlJfui7onjMTOkvf4j6hoqmA1+rQaxRV9APaGZAnSd6bjZ8Ve5M28 rqjwIpBiZXayEUdZ9/edf/MMSdxUNti1pChVQFX0ahhVNgGpWeF1tD4RV3HxMDP0MZQt9V Sf8pn3RbMu8zfPhMp0WHIHKEt0fU+IqyhEfGoFUZ7I3zynvbZNYLZjUlMDkPYBxdKMqiOu mznopaX4YXmS8sv3zMwrXCovG+IJF05ibYH8gdo9KIzmYrmoGt+OSm5Jc1d22Q== 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 03C2C1FE72; Fri, 6 May 2022 17:46:57 +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 246Hkulu014199; Fri, 6 May 2022 17:46:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246HkuFP014198; Fri, 6 May 2022 17:46:56 GMT (envelope-from git) Date: Fri, 6 May 2022 17:46:56 GMT Message-Id: <202205061746.246HkuFP014198@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Sato Subject: git: 961eb1a13b72 - main - x11-servers/xorg-server: simplify DEFAULT_FONTPATH_LIST manipulation List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hrs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 961eb1a13b72a9f6cd51ec2315c1664d6328fcc9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651859217; 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=lejdSyrzXZbkbOgXR1WuIFrzUMvtuUa7wJfaFqxvyco=; b=e7sMImq97hO8zOjzDFvPin2qHtwkzSAjgRqsqeKuuqV7gWq+RqShmKvIS8Y1Em/aXqG50m Ov7ND1Rsnp7nhHux0cW+g0hnLZ23ATi2WgHQ05VAs8Jc5gxzkwc9ccszDtATdtWYWoWgrf kn2hVneXIA/4ydTB/wG/0Hns5gELoo4lmJmwzK0l0amcA6PNyo+L0dZrPTzy4VH22SQe6+ EAZsxLs5QLUOumH94pwFgYKt1s3BsopRfA4Qs27p50U7UU1Lm0eOQwjcgld/9UOhE2a4KB lRNMeN1MX0Y3baFg+qHKd3aW80/OfH3nZMqwYLkst80KnLuzbY0A2hv4KjIYnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651859217; a=rsa-sha256; cv=none; b=US2cZDs4ay+VoxZ/QO5BKfp8kzmN+n2Ujoq2WC4FObqWmqr/zhF0a6LsX1s2aTYKQ5PS/T IIdwcw4phYbT2t1GhUJKyn7k9bItofxDy3GNn13gcCW3QKBsl+c2lKvIyw0a66HMfbJKmm Udf9x2K1O665DsSr95gMnSOCENv5czDwHkaAVqS6+3I6VOiOtiZRKp7syQc+0frpD0momx DXOFRRGW0lbsMxWtmpntz5fZuBn6rpLnigrAbIoqoLky8/hIZ6/l2IRjcNd1N8qw6rEl/d k0YC68fI5XMATd8b5T+CEpxAIr5V71dRXRSHfufFpGiu2fDwUZ0JdpbByzrt1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hrs: URL: https://cgit.FreeBSD.org/ports/commit/?id=961eb1a13b72a9f6cd51ec2315c1664d6328fcc9 commit 961eb1a13b72a9f6cd51ec2315c1664d6328fcc9 Author: Hiroki Sato AuthorDate: 2022-05-06 17:46:01 +0000 Commit: Hiroki Sato CommitDate: 2022-05-06 17:46:01 +0000 x11-servers/xorg-server: simplify DEFAULT_FONTPATH_LIST manipulation Note that this involves no functional change. --- x11-servers/xorg-server/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 7efbc03eeeb9..4ef6d11fbe49 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -49,7 +49,6 @@ DEFAULT_FONTPATH_LIST= \ ${FONTPATH_ROOT}/100dpi/ \ ${FONTPATH_ROOT}/75dpi/ \ catalogue:${FONTPATHD} -DEFAULT_FONTPATH_CMD=${ECHO_CMD} ${DEFAULT_FONTPATH_LIST} | ${TR} ' ' , PLIST_SUB+= FONTPATHD="${FONTPATHD:S,^${PREFIX}/,,}" USES= compiler:c11 cpe gl gmake perl5 ssl tar:xz xorg xorg-cat:xserver @@ -57,7 +56,7 @@ USE_PERL5= build USE_GL+= gl USE_XORG+= pixman xau xdmcp xfont2 xkbfile xorgproto xshmfence xtrans CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \ - --with-default-font-path="$$(${DEFAULT_FONTPATH_CMD})" \ + --with-default-font-path="${DEFAULT_FONTPATH_LIST:ts,}" \ --without-dtrace --disable-config-hal \ --disable-install-setuid --disable-unit-tests \ --with-fallback-input-driver=libinput