Wed Feb 23 00:06:49 2022 UTC ()
libXi: Fixup libmansuffix in manual pages.

The manpages use unadorned libmansuffix instead of __libmansuffix__ or
@libmansuffix@ that the standard transformations handle.

Add ad-hoc s/// command for it.  It has "3" hardcoded because there's
no easy way to look up that mapping, but then that very same "3" is
hardcoded in the file names anyway.


(uwe)
diff -r1.14 -r1.15 src/external/mit/xorg/lib/libXi/Makefile
cvs diff -r1.14 -r1.15 src/external/mit/xorg/lib/libXi/Makefile (switch to unified diff)

--- src/external/mit/xorg/lib/libXi/Makefile 2022/02/22 22:49:39 1.14
+++ src/external/mit/xorg/lib/libXi/Makefile 2022/02/23 00:06:49 1.15
@@ -1,169 +1,172 @@ @@ -1,169 +1,172 @@
1# $NetBSD: Makefile,v 1.14 2022/02/22 22:49:39 uwe Exp $ 1# $NetBSD: Makefile,v 1.15 2022/02/23 00:06:49 uwe Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5LIB= Xi 5LIB= Xi
6.PATH: ${X11SRCDIR.${LIB}}/src 6.PATH: ${X11SRCDIR.${LIB}}/src
7.PATH: ${X11SRCDIR.${LIB}}/include/X11/extensions 7.PATH: ${X11SRCDIR.${LIB}}/include/X11/extensions
8.PATH: ${X11SRCDIR.${LIB}}/man 8.PATH: ${X11SRCDIR.${LIB}}/man
9 9
10SRCS= XIAllowEvents.c \ 10SRCS= XIAllowEvents.c \
11 XIBarrier.c \ 11 XIBarrier.c \
12 XIGrabDevice.c \ 12 XIGrabDevice.c \
13 XIQueryVersion.c \ 13 XIQueryVersion.c \
14 XIQueryDevice.c \ 14 XIQueryDevice.c \
15 XISetDevFocus.c \ 15 XISetDevFocus.c \
16 XIGetDevFocus.c \ 16 XIGetDevFocus.c \
17 XIPassiveGrab.c \ 17 XIPassiveGrab.c \
18 XIProperties.c \ 18 XIProperties.c \
19 XISelEv.c \ 19 XISelEv.c \
20 XISetCPtr.c \ 20 XISetCPtr.c \
21 XIWarpPointer.c \ 21 XIWarpPointer.c \
22 XIHierarchy.c \ 22 XIHierarchy.c \
23 XIDefineCursor.c \ 23 XIDefineCursor.c \
24 XIQueryPointer.c 24 XIQueryPointer.c
25SRCS+= XAllowDv.c \ 25SRCS+= XAllowDv.c \
26 XChDProp.c \ 26 XChDProp.c \
27 XChgDCtl.c \ 27 XChgDCtl.c \
28 XChgFCtl.c \ 28 XChgFCtl.c \
29 XChgKbd.c \ 29 XChgKbd.c \
30 XChgKMap.c \ 30 XChgKMap.c \
31 XChgPnt.c \ 31 XChgPnt.c \
32 XChgProp.c \ 32 XChgProp.c \
33 XCloseDev.c \ 33 XCloseDev.c \
34 XDelDProp.c \ 34 XDelDProp.c \
35 XDevBell.c \ 35 XDevBell.c \
36 XExtToWire.c \ 36 XExtToWire.c \
37 XGetBMap.c \ 37 XGetBMap.c \
38 XGetCPtr.c \ 38 XGetCPtr.c \
39 XGetDCtl.c \ 39 XGetDCtl.c \
40 XGetDProp.c \ 40 XGetDProp.c \
41 XGetFCtl.c \ 41 XGetFCtl.c \
42 XGetKMap.c \ 42 XGetKMap.c \
43 XGetMMap.c \ 43 XGetMMap.c \
44 XGetProp.c \ 44 XGetProp.c \
45 XGetVers.c \ 45 XGetVers.c \
46 XGMotion.c \ 46 XGMotion.c \
47 XGrabDev.c \ 47 XGrabDev.c \
48 XGrDvBut.c \ 48 XGrDvBut.c \
49 XGrDvKey.c \ 49 XGrDvKey.c \
50 XGtFocus.c \ 50 XGtFocus.c \
51 XGtSelect.c \ 51 XGtSelect.c \
52 XListDev.c \ 52 XListDev.c \
53 XListDProp.c \ 53 XListDProp.c \
54 XOpenDev.c \ 54 XOpenDev.c \
55 XQueryDv.c \ 55 XQueryDv.c \
56 XSelect.c \ 56 XSelect.c \
57 XSetBMap.c \ 57 XSetBMap.c \
58 XSetDVal.c \ 58 XSetDVal.c \
59 XSetMMap.c \ 59 XSetMMap.c \
60 XSetMode.c \ 60 XSetMode.c \
61 XSndExEv.c \ 61 XSndExEv.c \
62 XStFocus.c \ 62 XStFocus.c \
63 XUngrDev.c \ 63 XUngrDev.c \
64 XUngrDvB.c \ 64 XUngrDvB.c \
65 XUngrDvK.c \ 65 XUngrDvK.c \
66 XExtInt.c 66 XExtInt.c
67 67
68CPPFLAGS+= ${X11FLAGS.THREADLIB} 68CPPFLAGS+= ${X11FLAGS.THREADLIB}
69CPPFLAGS+= -DHAVE__XEATDATAWORDS 69CPPFLAGS+= -DHAVE__XEATDATAWORDS
70 70
71LIBDPLIBS=\ 71LIBDPLIBS=\
72 Xext ${.CURDIR}/../libXext \ 72 Xext ${.CURDIR}/../libXext \
73 X11 ${.CURDIR}/../libX11/dynamic 73 X11 ${.CURDIR}/../libX11/dynamic
74 74
75INCS= XInput.h \ 75INCS= XInput.h \
76 XInput2.h 76 XInput2.h
77 77
78INCSDIR=${X11INCDIR}/X11/extensions 78INCSDIR=${X11INCDIR}/X11/extensions
79 79
80PKGDIST= ${LIB} 80PKGDIST= ${LIB}
81 81
82COPTS.XExtInt.c+= -Wno-error # XXX 82COPTS.XExtInt.c+= -Wno-error # XXX
83COPTS.XSndExEv.c+= -Wno-error # XXX 83COPTS.XSndExEv.c+= -Wno-error # XXX
84 84
85CWARNFLAGS.clang+= -Wno-pointer-sign 85CWARNFLAGS.clang+= -Wno-pointer-sign
86 86
 87# libXi does not use __libmansuffix__ or @libmansuffix@ in its man pages
 88X11EXTRAMANDEFS = -e 's,libmansuffix,3,g'
 89
87# X Input v1 man pages 90# X Input v1 man pages
88MAN += XAllowDeviceEvents.3 91MAN += XAllowDeviceEvents.3
89MAN += XChangeDeviceDontPropagateList.3 92MAN += XChangeDeviceDontPropagateList.3
90MAN += XChangeKeyboardDevice.3 93MAN += XChangeKeyboardDevice.3
91MAN += XChangePointerDevice.3 94MAN += XChangePointerDevice.3
92MAN += XDeviceBell.3 95MAN += XDeviceBell.3
93MAN += XGetDeviceControl.3 96MAN += XGetDeviceControl.3
94MAN += XGetDeviceKeyMapping.3 97MAN += XGetDeviceKeyMapping.3
95MAN += XGetDeviceModifierMapping.3 98MAN += XGetDeviceModifierMapping.3
96MAN += XGetDeviceMotionEvents.3 99MAN += XGetDeviceMotionEvents.3
97MAN += XGetDeviceProperty.3 100MAN += XGetDeviceProperty.3
98MAN += XGetExtensionVersion.3 101MAN += XGetExtensionVersion.3
99MAN += XGetFeedbackControl.3 102MAN += XGetFeedbackControl.3
100MAN += XGrabDeviceButton.3 103MAN += XGrabDeviceButton.3
101MAN += XGrabDeviceKey.3 104MAN += XGrabDeviceKey.3
102MAN += XGrabDevice.3 105MAN += XGrabDevice.3
103MAN += XListDeviceProperties.3 106MAN += XListDeviceProperties.3
104MAN += XListInputDevices.3 107MAN += XListInputDevices.3
105MAN += XOpenDevice.3 108MAN += XOpenDevice.3
106MAN += XQueryDeviceState.3 109MAN += XQueryDeviceState.3
107MAN += XSelectExtensionEvent.3 110MAN += XSelectExtensionEvent.3
108MAN += XSendExtensionEvent.3 111MAN += XSendExtensionEvent.3
109MAN += XSetDeviceButtonMapping.3 112MAN += XSetDeviceButtonMapping.3
110MAN += XSetDeviceFocus.3 113MAN += XSetDeviceFocus.3
111MAN += XSetDeviceMode.3 114MAN += XSetDeviceMode.3
112MAN += XSetDeviceValuators.3 115MAN += XSetDeviceValuators.3
113 116
114MLINKS += XChangeDeviceDontPropagateList.3 XGetDeviceDontPropagateList.3 117MLINKS += XChangeDeviceDontPropagateList.3 XGetDeviceDontPropagateList.3
115MLINKS += XGetDeviceControl.3 XChangeDeviceControl.3 118MLINKS += XGetDeviceControl.3 XChangeDeviceControl.3
116MLINKS += XGetDeviceKeyMapping.3 XChangeDeviceKeyMapping.3 119MLINKS += XGetDeviceKeyMapping.3 XChangeDeviceKeyMapping.3
117MLINKS += XGetDeviceModifierMapping.3 XSetDeviceModifierMapping.3 120MLINKS += XGetDeviceModifierMapping.3 XSetDeviceModifierMapping.3
118MLINKS += XGetDeviceMotionEvents.3 XDeviceTimeCoord.3 121MLINKS += XGetDeviceMotionEvents.3 XDeviceTimeCoord.3
119MLINKS += XGetDeviceProperty.3 XChangeDeviceProperty.3 122MLINKS += XGetDeviceProperty.3 XChangeDeviceProperty.3
120MLINKS += XGetDeviceProperty.3 XDeleteDeviceProperty.3 123MLINKS += XGetDeviceProperty.3 XDeleteDeviceProperty.3
121MLINKS += XGetFeedbackControl.3 XChangeFeedbackControl.3 124MLINKS += XGetFeedbackControl.3 XChangeFeedbackControl.3
122MLINKS += XGrabDevice.3 XUngrabDevice.3 125MLINKS += XGrabDevice.3 XUngrabDevice.3
123MLINKS += XGrabDeviceButton.3 XUngrabDeviceButton.3 126MLINKS += XGrabDeviceButton.3 XUngrabDeviceButton.3
124MLINKS += XGrabDeviceKey.3 XUngrabDeviceKey.3 127MLINKS += XGrabDeviceKey.3 XUngrabDeviceKey.3
125MLINKS += XListInputDevices.3 XFreeDeviceList.3 128MLINKS += XListInputDevices.3 XFreeDeviceList.3
126MLINKS += XOpenDevice.3 XCloseDevice.3 129MLINKS += XOpenDevice.3 XCloseDevice.3
127MLINKS += XSelectExtensionEvent.3 XGetSelectedExtensionEvents.3 130MLINKS += XSelectExtensionEvent.3 XGetSelectedExtensionEvents.3
128MLINKS += XSetDeviceButtonMapping.3 XGetDeviceButtonMapping.3 131MLINKS += XSetDeviceButtonMapping.3 XGetDeviceButtonMapping.3
129MLINKS += XSetDeviceFocus.3 XGetDeviceFocus.3 132MLINKS += XSetDeviceFocus.3 XGetDeviceFocus.3
130 133
131 134
132# X Input v2 man pages 135# X Input v2 man pages
133MAN += XIAllowEvents.3 136MAN += XIAllowEvents.3
134MAN += XIBarrierReleasePointer.3 137MAN += XIBarrierReleasePointer.3
135MAN += XIChangeHierarchy.3 138MAN += XIChangeHierarchy.3
136MAN += XIChangeProperty.3 139MAN += XIChangeProperty.3
137MAN += XIDefineCursor.3 140MAN += XIDefineCursor.3
138MAN += XIGrabButton.3 141MAN += XIGrabButton.3
139MAN += XIGrabDevice.3 142MAN += XIGrabDevice.3
140MAN += XIGrabEnter.3 143MAN += XIGrabEnter.3
141MAN += XIListProperties.3 144MAN += XIListProperties.3
142MAN += XIQueryDevice.3 145MAN += XIQueryDevice.3
143MAN += XIQueryPointer.3 146MAN += XIQueryPointer.3
144MAN += XIQueryVersion.3 147MAN += XIQueryVersion.3
145MAN += XISelectEvents.3 148MAN += XISelectEvents.3
146MAN += XISetClientPointer.3 149MAN += XISetClientPointer.3
147MAN += XISetFocus.3 150MAN += XISetFocus.3
148MAN += XIWarpPointer.3 151MAN += XIWarpPointer.3
149 152
150MLINKS += XIBarrierReleasePointer.3 XIBarrierReleasePointers.3 153MLINKS += XIBarrierReleasePointer.3 XIBarrierReleasePointers.3
151MLINKS += XIChangeProperty.3 XIDeleteProperty.3 154MLINKS += XIChangeProperty.3 XIDeleteProperty.3
152MLINKS += XIChangeProperty.3 XIGetProperty.3 155MLINKS += XIChangeProperty.3 XIGetProperty.3
153MLINKS += XIDefineCursor.3 XIUndefineCursor.3 156MLINKS += XIDefineCursor.3 XIUndefineCursor.3
154MLINKS += XIGrabButton.3 XIGrabKeycode.3 157MLINKS += XIGrabButton.3 XIGrabKeycode.3
155MLINKS += XIGrabButton.3 XIGrabTouchBegin.3 158MLINKS += XIGrabButton.3 XIGrabTouchBegin.3
156MLINKS += XIGrabButton.3 XIUngrabButton.3 159MLINKS += XIGrabButton.3 XIUngrabButton.3
157MLINKS += XIGrabButton.3 XIUngrabKeycode.3 160MLINKS += XIGrabButton.3 XIUngrabKeycode.3
158MLINKS += XIGrabButton.3 XIUngrabTouchBegin.3 161MLINKS += XIGrabButton.3 XIUngrabTouchBegin.3
159MLINKS += XIGrabDevice.3 XIUngrabDevice.3 162MLINKS += XIGrabDevice.3 XIUngrabDevice.3
160MLINKS += XIGrabEnter.3 XIGrabFocusIn.3 163MLINKS += XIGrabEnter.3 XIGrabFocusIn.3
161MLINKS += XIGrabEnter.3 XIUngrabEnter.3 164MLINKS += XIGrabEnter.3 XIUngrabEnter.3
162MLINKS += XIGrabEnter.3 XIUngrabFocusIn.3 165MLINKS += XIGrabEnter.3 XIUngrabFocusIn.3
163MLINKS += XIQueryDevice.3 XIFreeDeviceInfo.3 166MLINKS += XIQueryDevice.3 XIFreeDeviceInfo.3
164MLINKS += XISelectEvents.3 XIGetSelectedEvents.3 167MLINKS += XISelectEvents.3 XIGetSelectedEvents.3
165MLINKS += XISetClientPointer.3 XIGetClientPointer.3 168MLINKS += XISetClientPointer.3 XIGetClientPointer.3
166MLINKS += XISetFocus.3 XIGetFocus.3 169MLINKS += XISetFocus.3 XIGetFocus.3
167 170
168.include <bsd.x11.mk> 171.include <bsd.x11.mk>
169.include <bsd.lib.mk> 172.include <bsd.lib.mk>