Module Name: src
Committed By: uwe
Date: Sun May 1 22:55:00 UTC 2022
Modified Files:
src/distrib/sets/lists/xbase: mi
src/external/mit/xorg/lib/libX11: Makefile
Log Message:
libX11: Install Compose(5) manual page.
To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/libX11/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.166 src/distrib/sets/lists/xbase/mi:1.167
--- src/distrib/sets/lists/xbase/mi:1.166 Tue Apr 27 06:50:27 2021
+++ src/distrib/sets/lists/xbase/mi Sun May 1 22:54:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.166 2021/04/27 06:50:27 mrg Exp $
+# $NetBSD: mi,v 1.167 2022/05/01 22:54:59 uwe Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1409,6 +1409,8 @@
./usr/X11R7/man/cat4/evbarm base-x11-root xorg
./usr/X11R7/man/cat4/x86 base-x11-root xorg
./usr/X11R7/man/cat5 base-x11-root xorg
+./usr/X11R7/man/cat5/Compose.0 xbase-x11-catman .cat,xorg
+./usr/X11R7/man/cat5/XCompose.0 xbase-x11-catman .cat,xorg
./usr/X11R7/man/cat5/fonts-conf.0 xbase-x11-catman .cat,xorg
./usr/X11R7/man/cat5/fonts.conf.0 xbase-x11-catman .cat,xorg
./usr/X11R7/man/cat7 base-x11-root xorg
@@ -1557,6 +1559,8 @@
./usr/X11R7/man/html4/evbarm base-x11-root xorg
./usr/X11R7/man/html4/x86 base-x11-root xorg
./usr/X11R7/man/html5 base-x11-root xorg
+./usr/X11R7/man/html5/Compose.html xbase-x11-htmlman html,xorg
+./usr/X11R7/man/html5/XCompose.html xbase-x11-htmlman html,xorg
./usr/X11R7/man/html5/fonts-conf.html xbase-x11-htmlman html,xorg
./usr/X11R7/man/html5/fonts.conf.html xbase-x11-htmlman html,xorg
./usr/X11R7/man/html7 base-x11-root xorg
@@ -1706,6 +1710,8 @@
./usr/X11R7/man/man4/evbarm base-x11-root xorg
./usr/X11R7/man/man4/x86 base-x11-root xorg
./usr/X11R7/man/man5 base-x11-root xorg
+./usr/X11R7/man/man5/Compose.5 xbase-x11-man .man,xorg
+./usr/X11R7/man/man5/XCompose.5 xbase-x11-man .man,xorg
./usr/X11R7/man/man5/fonts-conf.5 xbase-x11-man .man,xorg
./usr/X11R7/man/man5/fonts.conf.5 xbase-x11-man .man,xorg
./usr/X11R7/man/man7 base-x11-root xorg
Index: src/external/mit/xorg/lib/libX11/Makefile
diff -u src/external/mit/xorg/lib/libX11/Makefile:1.16 src/external/mit/xorg/lib/libX11/Makefile:1.17
--- src/external/mit/xorg/lib/libX11/Makefile:1.16 Sun May 1 13:45:46 2022
+++ src/external/mit/xorg/lib/libX11/Makefile Sun May 1 22:55:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2022/05/01 13:45:46 uwe Exp $
+# $NetBSD: Makefile,v 1.17 2022/05/01 22:55:00 uwe Exp $
.include <bsd.own.mk>
@@ -82,6 +82,8 @@ MAN= AllPlanes.3 BlackPixelOfScreen.3 D
XrmPutResource.3 XrmUniqueQuark.3
# XGetEventData.man
+MAN += Compose.5
+
USETBL= yes
FILES= XErrorDB XKeysymDB Xcms.txt
@@ -536,6 +538,8 @@ MLINKS += XrmUniqueQuark.3 XrmStringToBi
MLINKS += XrmUniqueQuark.3 XrmStringToQuark.3
MLINKS += XrmUniqueQuark.3 XrmStringToQuarkList.3
+MLINKS += Compose.5 XCompose.5
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
