svn commit: r533551 - branches/2020Q2/x11-servers/xwayland-devel

[Jan Beich]

Author: jbeich
Date: Fri May  1 14:45:05 2020
New Revision: 533551
URL: https://svnweb.freebsd.org/changeset/ports/533551

Log:
  MFH: r533550
  
  x11-servers/xwayland-devel: don't disable default font path
  
  *.pcf fonts are rendered by X11 server but if font path is disabled
  only built-in fonts are available by default. While users could still
  amend font path via "xset fp" the discrepancy with xorg-server gave
  a bad first impression.
  
  Reported by:	jsm
  Approved by:	ports-secteam blanket (regression fix)

Modified:
  branches/2020Q2/x11-servers/xwayland-devel/Makefile
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/x11-servers/xwayland-devel/Makefile
==============================================================================
--- branches/2020Q2/x11-servers/xwayland-devel/Makefile	Fri May  1 14:43:41 2020	(r533550)
+++ branches/2020Q2/x11-servers/xwayland-devel/Makefile	Fri May  1 14:45:05 2020	(r533551)
@@ -4,6 +4,7 @@ PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
 DISTVERSION=	1.20.0-626
 DISTVERSIONSUFFIX=	-g${GL_COMMIT:C/(.{12}).*/\1/}
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 
@@ -43,8 +44,20 @@ MESON_ARGS=	-Dxwayland=true \
 		-Dxvfb=false \
 		-Dudev=false \
 		-Dudev_kms=false \
-		-Ddefault_font_path=${NONEXISTENT}
+		-Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}"
 PLIST_FILES=	bin/Xwayland
+
+# Keep in sync with xorg-server
+FONTPATH_ROOT?=	${LOCALBASE}/share/fonts
+FONTPATHD?=	${PREFIX}/etc/X11/fontpath.d
+DEFAULT_FONTPATH_LIST= \
+	${FONTPATH_ROOT}/misc/	\
+	${FONTPATH_ROOT}/TTF/ \
+	${FONTPATH_ROOT}/OTF/ \
+	${FONTPATH_ROOT}/Type1/ \
+	${FONTPATH_ROOT}/100dpi/ \
+	${FONTPATH_ROOT}/75dpi/ \
+	catalogue:${FONTPATHD}
 
 OPTIONS_DEFINE=	NVIDIA