CVS commit: src/external/mit/xorg/server/xorg-server/dix

2022-04-27 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Thu Apr 28 03:07:44 UTC 2022

Modified Files:
src/external/mit/xorg/server/xorg-server/dix: Makefile.common

Log Message:
add locations where pkgsrc installs X11 fonts to the default font path


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/dix/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/server/xorg-server/dix

2022-04-27 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Thu Apr 28 03:07:44 UTC 2022

Modified Files:
src/external/mit/xorg/server/xorg-server/dix: Makefile.common

Log Message:
add locations where pkgsrc installs X11 fonts to the default font path


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/dix/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/dix/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/dix/Makefile.common:1.2 src/external/mit/xorg/server/xorg-server/dix/Makefile.common:1.3
--- src/external/mit/xorg/server/xorg-server/dix/Makefile.common:1.2	Thu Jun 18 02:45:46 2009
+++ src/external/mit/xorg/server/xorg-server/dix/Makefile.common	Thu Apr 28 03:07:44 2022
@@ -1,7 +1,14 @@
-#	$NetBSD: Makefile.common,v 1.2 2009/06/18 02:45:46 mrg Exp $
+#	$NetBSD: Makefile.common,v 1.3 2022/04/28 03:07:44 macallan Exp $
+
+PKGFONTDIR=		/usr/pkg/share/fonts/X11
 
 X11DEFAULTFONTPATH=	${X11FONTDIR}/misc/ \
 			${X11FONTDIR}/TTF/ \
 			${X11FONTDIR}/Type1/ \
 			${X11FONTDIR}/75dpi/ \
-			${X11FONTDIR}/100dpi/
+			${X11FONTDIR}/100dpi/ \
+			${PKGFONTDIR}/misc/ \
+			${PKGFONTDIR}/TTF/ \
+			${PKGFONTDIR}/Type1/ \
+			${PKGFONTDIR}/75dpi/ \
+			${PKGFONTDIR}/100dpi/