Module Name: src
Committed By: uwe
Date: Mon Feb 21 02:13:47 UTC 2022
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib/libXext: Makefile
Log Message:
libXext: Fix MLINKS for XShape.3
XShapeQueryExtension.3 and XShapeQueryVersion.3 are not conjoined twins.
While here split XShape.3 links into separate MLINKS += src dst assignments
and sort them.
To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libXext/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/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.226 src/distrib/sets/lists/xcomp/mi:1.227
--- src/distrib/sets/lists/xcomp/mi:1.226 Tue Aug 24 00:12:32 2021
+++ src/distrib/sets/lists/xcomp/mi Mon Feb 21 02:13:47 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.226 2021/08/24 00:12:32 mrg Exp $
+# $NetBSD: mi,v 1.227 2022/02/21 02:13:47 uwe Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1952,8 +1952,10 @@
./usr/X11R7/man/cat3/XShapeGetRectangles.0 xcomp-libXext-catman .cat,xorg
./usr/X11R7/man/cat3/XShapeInputSelected.0 xcomp-libXext-catman .cat,xorg
./usr/X11R7/man/cat3/XShapeOffsetShape.0 xcomp-libXext-catman .cat,xorg
-./usr/X11R7/man/cat3/XShapeQueryExtensionXShapeQueryVersion.0 xcomp-libXext-catman .cat,xorg
+./usr/X11R7/man/cat3/XShapeQueryExtension.0 xcomp-libXext-catman .cat,xorg
+./usr/X11R7/man/cat3/XShapeQueryExtensionXShapeQueryVersion.0 xcomp-obsolete obsolete
./usr/X11R7/man/cat3/XShapeQueryExtents.0 xcomp-libXext-catman .cat,xorg
+./usr/X11R7/man/cat3/XShapeQueryVersion.0 xcomp-libXext-catman .cat,xorg
./usr/X11R7/man/cat3/XShapeSelectInput.0 xcomp-libXext-catman .cat,xorg
./usr/X11R7/man/cat3/XShm.0 xcomp-libXext-catman .cat,xorg
./usr/X11R7/man/cat3/XShmAttach.0 xcomp-libXext-catman .cat,xorg
@@ -2900,8 +2902,10 @@
./usr/X11R7/man/html3/XShapeGetRectangles.html xcomp-libXext-htmlman html,xorg
./usr/X11R7/man/html3/XShapeInputSelected.html xcomp-libXext-htmlman html,xorg
./usr/X11R7/man/html3/XShapeOffsetShape.html xcomp-libXext-htmlman html,xorg
-./usr/X11R7/man/html3/XShapeQueryExtensionXShapeQueryVersion.html xcomp-libXext-htmlman html,xorg
+./usr/X11R7/man/html3/XShapeQueryExtension.html xcomp-libXext-htmlman html,xorg
+./usr/X11R7/man/html3/XShapeQueryExtensionXShapeQueryVersion.html xcomp-obsolete obsolete
./usr/X11R7/man/html3/XShapeQueryExtents.html xcomp-libXext-htmlman html,xorg
+./usr/X11R7/man/html3/XShapeQueryVersion.html xcomp-libXext-htmlman html,xorg
./usr/X11R7/man/html3/XShapeSelectInput.html xcomp-libXext-htmlman html,xorg
./usr/X11R7/man/html3/XShm.html xcomp-libXext-htmlman html,xorg
./usr/X11R7/man/html3/XShmAttach.html xcomp-libXext-htmlman html,xorg
@@ -3847,8 +3851,10 @@
./usr/X11R7/man/man3/XShapeGetRectangles.3 xcomp-libXext-man .man,xorg
./usr/X11R7/man/man3/XShapeInputSelected.3 xcomp-libXext-man .man,xorg
./usr/X11R7/man/man3/XShapeOffsetShape.3 xcomp-libXext-man .man,xorg
-./usr/X11R7/man/man3/XShapeQueryExtensionXShapeQueryVersion.3 xcomp-libXext-man .man,xorg
+./usr/X11R7/man/man3/XShapeQueryExtension.3 xcomp-libXext-man .man,xorg
+./usr/X11R7/man/man3/XShapeQueryExtensionXShapeQueryVersion.3 xcomp-obsolete obsolete
./usr/X11R7/man/man3/XShapeQueryExtents.3 xcomp-libXext-man .man,xorg
+./usr/X11R7/man/man3/XShapeQueryVersion.3 xcomp-libXext-man .man,xorg
./usr/X11R7/man/man3/XShapeSelectInput.3 xcomp-libXext-man .man,xorg
./usr/X11R7/man/man3/XShm.3 xcomp-libXext-man .man,xorg
./usr/X11R7/man/man3/XShmAttach.3 xcomp-libXext-man .man,xorg
Index: src/external/mit/xorg/lib/libXext/Makefile
diff -u src/external/mit/xorg/lib/libXext/Makefile:1.9 src/external/mit/xorg/lib/libXext/Makefile:1.10
--- src/external/mit/xorg/lib/libXext/Makefile:1.9 Fri Oct 4 09:47:28 2019
+++ src/external/mit/xorg/lib/libXext/Makefile Mon Feb 21 02:13:47 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/10/04 09:47:28 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2022/02/21 02:13:47 uwe Exp $
.include <bsd.own.mk>
@@ -41,16 +41,19 @@ MAN= DBE.3 DPMSCapable.3 DPMSDisable.3 D
XdbeGetVisualInfo.3 XdbeQueryExtension.3 XdbeSwapBuffers.3 Xevi.3 \
Xmbuf.3
-MLINKS= XShape.3 XShapeQueryExtensionXShapeQueryVersion.3 \
- XShape.3 XShapeCombineRegion.3 \
- XShape.3 XShapeCombineRectangles.3 \
- XShape.3 XShapeCombineMask.3 \
- XShape.3 XShapeCombineShape.3 \
- XShape.3 XShapeOffsetShape.3 \
- XShape.3 XShapeQueryExtents.3 \
- XShape.3 XShapeSelectInput.3 \
- XShape.3 XShapeInputSelected.3 \
- XShape.3 XShapeGetRectangles.3
+MLINKS = #
+
+MLINKS += XShape.3 XShapeCombineMask.3
+MLINKS += XShape.3 XShapeCombineRectangles.3
+MLINKS += XShape.3 XShapeCombineRegion.3
+MLINKS += XShape.3 XShapeCombineShape.3
+MLINKS += XShape.3 XShapeGetRectangles.3
+MLINKS += XShape.3 XShapeInputSelected.3
+MLINKS += XShape.3 XShapeOffsetShape.3
+MLINKS += XShape.3 XShapeQueryExtension.3
+MLINKS += XShape.3 XShapeQueryExtents.3
+MLINKS += XShape.3 XShapeQueryVersion.3
+MLINKS += XShape.3 XShapeSelectInput.3
MLINKS+= XShm.3 XShmQueryExtension.3 \
XShm.3 XShmQueryVersion.3 \
