Module Name: src
Committed By: uwe
Date: Tue May 3 13:46:22 UTC 2022
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib/libXcursor: Makefile
Log Message:
libXcursor: Add missing MLINKS.
To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libXcursor/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.232 src/distrib/sets/lists/xcomp/mi:1.233
--- src/distrib/sets/lists/xcomp/mi:1.232 Tue May 3 00:29:23 2022
+++ src/distrib/sets/lists/xcomp/mi Tue May 3 13:46:22 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.232 2022/05/03 00:29:23 uwe Exp $
+# $NetBSD: mi,v 1.233 2022/05/03 13:46:22 uwe Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2455,6 +2455,37 @@
./usr/X11R7/man/cat3/XcupQueryVersion.0 xcomp-libXext-catman .cat,xorg
./usr/X11R7/man/cat3/XcupStoreColors.0 xcomp-libXext-catman .cat,xorg
./usr/X11R7/man/cat3/Xcursor.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorCursorsCreate.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorCursorsDestroy.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorFilenameLoad.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorFilenameLoadAllImages.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorFilenameLoadCursor.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorFilenameLoadImage.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorFilenameLoadImages.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorFilenameSave.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorFilenameSaveImages.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorGetDefaultSize.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorGetTheme.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorImageCreate.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorImageDestroy.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorImagesCreate.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorImagesDestroy.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorLibraryLoadCursor.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorLibraryLoadCursors.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorLibraryLoadImage.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorLibraryLoadImages.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorSetDefaultSize.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorSetTheme.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorShapeLoadCursor.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorShapeLoadCursors.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorShapeLoadImage.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorShapeLoadImages.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorSupportsARGB.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorXcFileLoad.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorXcFileLoadAllImages.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorXcFileLoadImage.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorXcFileLoadImages.0 xcomp-libXcursor-catman .cat,xorg
+./usr/X11R7/man/cat3/XcursorXcFileSave.0 xcomp-libXcursor-catman .cat,xorg
./usr/X11R7/man/cat3/XdbeAllocateBackBufferName.0 xcomp-libXext-catman .cat,xorg
./usr/X11R7/man/cat3/XdbeBeginIdiom.0 xcomp-libXext-catman .cat,xorg
./usr/X11R7/man/cat3/XdbeDeallocateBackBufferName.0 xcomp-libXext-catman .cat,xorg
@@ -3890,6 +3921,37 @@
./usr/X11R7/man/html3/XcupQueryVersion.html xcomp-libXext-htmlman html,xorg
./usr/X11R7/man/html3/XcupStoreColors.html xcomp-libXext-htmlman html,xorg
./usr/X11R7/man/html3/Xcursor.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorCursorsCreate.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorCursorsDestroy.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorFilenameLoad.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorFilenameLoadAllImages.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorFilenameLoadCursor.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorFilenameLoadImage.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorFilenameLoadImages.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorFilenameSave.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorFilenameSaveImages.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorGetDefaultSize.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorGetTheme.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorImageCreate.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorImageDestroy.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorImagesCreate.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorImagesDestroy.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorLibraryLoadCursor.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorLibraryLoadCursors.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorLibraryLoadImage.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorLibraryLoadImages.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorSetDefaultSize.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorSetTheme.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorShapeLoadCursor.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorShapeLoadCursors.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorShapeLoadImage.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorShapeLoadImages.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorSupportsARGB.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorXcFileLoad.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorXcFileLoadAllImages.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorXcFileLoadImage.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorXcFileLoadImages.html xcomp-libXcursor-htmlman html,xorg
+./usr/X11R7/man/html3/XcursorXcFileSave.html xcomp-libXcursor-htmlman html,xorg
./usr/X11R7/man/html3/XdbeAllocateBackBufferName.html xcomp-libXext-htmlman html,xorg
./usr/X11R7/man/html3/XdbeBeginIdiom.html xcomp-libXext-htmlman html,xorg
./usr/X11R7/man/html3/XdbeDeallocateBackBufferName.html xcomp-libXext-htmlman html,xorg
@@ -5324,6 +5386,37 @@
./usr/X11R7/man/man3/XcupQueryVersion.3 xcomp-libXext-man .man,xorg
./usr/X11R7/man/man3/XcupStoreColors.3 xcomp-libXext-man .man,xorg
./usr/X11R7/man/man3/Xcursor.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorCursorsCreate.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorCursorsDestroy.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorFilenameLoad.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorFilenameLoadAllImages.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorFilenameLoadCursor.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorFilenameLoadImage.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorFilenameLoadImages.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorFilenameSave.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorFilenameSaveImages.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorGetDefaultSize.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorGetTheme.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorImageCreate.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorImageDestroy.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorImagesCreate.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorImagesDestroy.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorLibraryLoadCursor.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorLibraryLoadCursors.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorLibraryLoadImage.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorLibraryLoadImages.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorSetDefaultSize.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorSetTheme.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorShapeLoadCursor.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorShapeLoadCursors.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorShapeLoadImage.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorShapeLoadImages.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorSupportsARGB.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorXcFileLoad.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorXcFileLoadAllImages.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorXcFileLoadImage.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorXcFileLoadImages.3 xcomp-libXcursor-man .man,xorg
+./usr/X11R7/man/man3/XcursorXcFileSave.3 xcomp-libXcursor-man .man,xorg
./usr/X11R7/man/man3/XdbeAllocateBackBufferName.3 xcomp-libXext-man .man,xorg
./usr/X11R7/man/man3/XdbeBeginIdiom.3 xcomp-libXext-man .man,xorg
./usr/X11R7/man/man3/XdbeDeallocateBackBufferName.3 xcomp-libXext-man .man,xorg
Index: src/external/mit/xorg/lib/libXcursor/Makefile
diff -u src/external/mit/xorg/lib/libXcursor/Makefile:1.7 src/external/mit/xorg/lib/libXcursor/Makefile:1.8
--- src/external/mit/xorg/lib/libXcursor/Makefile:1.7 Tue Mar 12 23:52:46 2019
+++ src/external/mit/xorg/lib/libXcursor/Makefile Tue May 3 13:46:22 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/03/12 23:52:46 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2022/05/03 13:46:22 uwe Exp $
.include <bsd.own.mk>
@@ -12,15 +12,6 @@ SRCS= cursor.c display.c file.c library.
INCS= Xcursor.h
INCSDIR=${X11INCDIR}/X11/Xcursor
-MAN= Xcursor.3
-__XCURSORPATH__ = \
- ~/.local/share/icons, \
- ~/.icons, \
- /usr/share/icons, \
- /usr/share/pixmaps, \
- ${X11LIBDIR}/icons
-X11EXTRAMANDEFS+= -e s%__XCURSORPATH__%${__XCURSORPATH__:Q}%g
-
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= -DICONDIR=\"${X11LIBDIR}/icons\"
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xcursor
@@ -33,5 +24,49 @@ LIBDPLIBS=\
PKGDIST= ${LIB}
+
+MAN = Xcursor.3
+
+X11EXTRAMANDEFS += -e s%__XCURSORPATH__%${__XCURSORPATH__:Q}%g
+
+__XCURSORPATH__ = \
+ ~/.local/share/icons, \
+ ~/.icons, \
+ /usr/share/icons, \
+ /usr/share/pixmaps, \
+ ${X11LIBDIR}/icons
+
+MLINKS += Xcursor.3 XcursorCursorsCreate.3
+MLINKS += Xcursor.3 XcursorCursorsDestroy.3
+MLINKS += Xcursor.3 XcursorFilenameLoad.3
+MLINKS += Xcursor.3 XcursorFilenameLoadAllImages.3
+MLINKS += Xcursor.3 XcursorFilenameLoadCursor.3
+MLINKS += Xcursor.3 XcursorFilenameLoadImage.3
+MLINKS += Xcursor.3 XcursorFilenameLoadImages.3
+MLINKS += Xcursor.3 XcursorFilenameSave.3
+MLINKS += Xcursor.3 XcursorFilenameSaveImages.3
+MLINKS += Xcursor.3 XcursorGetDefaultSize.3
+MLINKS += Xcursor.3 XcursorGetTheme.3
+MLINKS += Xcursor.3 XcursorImageCreate.3
+MLINKS += Xcursor.3 XcursorImageDestroy.3
+MLINKS += Xcursor.3 XcursorImagesCreate.3
+MLINKS += Xcursor.3 XcursorImagesDestroy.3
+MLINKS += Xcursor.3 XcursorLibraryLoadCursor.3
+MLINKS += Xcursor.3 XcursorLibraryLoadCursors.3
+MLINKS += Xcursor.3 XcursorLibraryLoadImage.3
+MLINKS += Xcursor.3 XcursorLibraryLoadImages.3
+MLINKS += Xcursor.3 XcursorSetDefaultSize.3
+MLINKS += Xcursor.3 XcursorSetTheme.3
+MLINKS += Xcursor.3 XcursorShapeLoadCursor.3
+MLINKS += Xcursor.3 XcursorShapeLoadCursors.3
+MLINKS += Xcursor.3 XcursorShapeLoadImage.3
+MLINKS += Xcursor.3 XcursorShapeLoadImages.3
+MLINKS += Xcursor.3 XcursorSupportsARGB.3
+MLINKS += Xcursor.3 XcursorXcFileLoad.3
+MLINKS += Xcursor.3 XcursorXcFileLoadAllImages.3
+MLINKS += Xcursor.3 XcursorXcFileLoadImage.3
+MLINKS += Xcursor.3 XcursorXcFileLoadImages.3
+MLINKS += Xcursor.3 XcursorXcFileSave.3
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
