git: 961eb1a13b72 - main - x11-servers/xorg-server: simplify DEFAULT_FONTPATH_LIST manipulation

From: Hiroki Sato <hrs_at_FreeBSD.org>
Date: Fri, 06 May 2022 17:46:56 UTC
The branch main has been updated by hrs:

URL: https://cgit.FreeBSD.org/ports/commit/?id=961eb1a13b72a9f6cd51ec2315c1664d6328fcc9

commit 961eb1a13b72a9f6cd51ec2315c1664d6328fcc9
Author:     Hiroki Sato <hrs@FreeBSD.org>
AuthorDate: 2022-05-06 17:46:01 +0000
Commit:     Hiroki Sato <hrs@FreeBSD.org>
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