Mon Feb 21 02:13:47 2022 UTC ()
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.


(uwe)
diff -r1.226 -r1.227 src/distrib/sets/lists/xcomp/mi
diff -r1.9 -r1.10 src/external/mit/xorg/lib/libXext/Makefile
cvs diff -r1.226 -r1.227 src/distrib/sets/lists/xcomp/mi (expand / switch to context diff)
--- src/distrib/sets/lists/xcomp/mi 2021/08/24 00:12:32 1.226
+++ src/distrib/sets/lists/xcomp/mi 2022/02/21 02:13:47 1.227
@@ -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
cvs diff -r1.9 -r1.10 src/external/mit/xorg/lib/libXext/Makefile (expand / switch to context diff)
--- src/external/mit/xorg/lib/libXext/Makefile 2019/10/04 09:47:28 1.9
+++ src/external/mit/xorg/lib/libXext/Makefile 2022/02/21 02:13:47 1.10
@@ -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 @@
 	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 \