summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2020-08-20 16:15:43 +0000
committermartin <martin@NetBSD.org>2020-08-20 16:15:43 +0000
commitc9178ee0574b60bdf40d75e5ead6c8f3eef22c6a (patch)
tree3950622606987c44083725b585b0f6cb946ddd8b /external
parenta6c745851374842b6053cc8cdf2825f1a97ea7b4 (diff)
Pull up following revision(s) (requested by kim in ticket #1059):
share/mk/bsd.x11.mk: revision 1.133 share/mk/bsd.x11.mk: revision 1.136 external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile: revision 1.8 external/mit/xorg/server/xorg-server/doc/Makefile: revision 1.6 Allow overriding the default man substitutions with X11EXTRAMANTRANSFORMS fix various missing transforms for man page, ala PR#55422. add method to transform both the "__foo__" and "@foo@" version of various transforms, while upstream are converting from the former to the latter it seems. convert all the common transforms to this method. expand the grep for .pc files to look for missing @foo@ fixes to the man page genration, and ignore a few things (thanks uwe@ - .IN lines, and stuff between tab(@) and .TE.) xorg-server __default_font_path__ -> @default_font_path@, and xfree86 transform xconfigdir, xkbdir, and modulepath using new both method.
Diffstat (limited to 'external')
-rw-r--r--external/mit/xorg/server/xorg-server/doc/Makefile4
-rw-r--r--external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile7
2 files changed, 8 insertions, 3 deletions
diff --git a/external/mit/xorg/server/xorg-server/doc/Makefile b/external/mit/xorg/server/xorg-server/doc/Makefile
index 27ae3322f74..275d5a352bc 100644
--- a/external/mit/xorg/server/xorg-server/doc/Makefile
+++ b/external/mit/xorg/server/xorg-server/doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/08/14 00:03:58 mrg Exp $
+# $NetBSD: Makefile,v 1.5.16.1 2020/08/20 16:15:44 martin Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@
.PATH: ${X11SRCDIR.xorg-server}/doc
.PATH: ${X11SRCDIR.xorg-server}/man
MAN= Xserver.1
-X11EXTRAMANDEFS+= -e 's%__default_font_path__%${X11DEFAULTFONTPATH:ts,:S/,/, /g}%g'
+X11EXTRAMANDEFS+= -e 's%@default_font_path@%${X11DEFAULTFONTPATH:ts,:S/,/, /g}%g'
.include <bsd.x11.mk>
.include <bsd.man.mk>
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile
index 31f78b5425b..ffc87d37b4e 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/08/14 03:43:04 mrg Exp $
+# $NetBSD: Makefile,v 1.7.16.1 2020/08/20 16:15:43 martin Exp $
.include <bsd.own.mk>
@@ -12,5 +12,10 @@ FILESDIR= ${X11USRLIBDIR}/X11/doc
MAN= Xorg.1 xorg.conf.5
# xorg.conf.d.5?
+X11EXTRAMANTRANSFORMS_BOTH+= \
+ xconfigdir xorg.conf.d \
+ xkbdir ${X11LIBDIR}/xkb \
+ modulepath ${X11ROOTDIR}/modules
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>