Module Name: src
Committed By: mrg
Date: Sat May 22 02:41:33 UTC 2010
Modified Files:
src/external/mit/xorg/lib/libXi: Makefile
src/external/mit/xorg/lib/libXtst: Makefile
Log Message:
- update includes list and delete obsolete man pages
- new -Wno-error's
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libXi/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXtst/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXi/Makefile
diff -u src/external/mit/xorg/lib/libXi/Makefile:1.4 src/external/mit/xorg/lib/libXi/Makefile:1.5
--- src/external/mit/xorg/lib/libXi/Makefile:1.4 Tue Mar 10 04:50:25 2009
+++ src/external/mit/xorg/lib/libXi/Makefile Sat May 22 02:41:33 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2009/03/10 04:50:25 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/05/22 02:41:33 mrg Exp $
.include <bsd.own.mk>
LIB= Xi
.PATH: ${X11SRCDIR.${LIB}}/src
-.PATH: ${X11SRCDIR.${LIB}}/man
+.PATH: ${X11SRCDIR.${LIB}}/include/X11/extensions
SRCS= XAllowDv.c XChgDCtl.c XChgFCtl.c XChgKMap.c XChgKbd.c \
XChgPnt.c XChgProp.c XCloseDev.c XDevBell.c XExtInt.c \
@@ -22,33 +22,15 @@
Xext ${.CURDIR}/../libXext \
X11 ${.CURDIR}/../libX11/dynamic
-MAN= XAllowDeviceEvents.3 XChangeDeviceDontPropagateList.3 \
- XChangeKeyboardDevice.3 XChangePointerDevice.3 XDeviceBell.3 \
- XGetDeviceControl.3 XGetDeviceKeyMapping.3 \
- XGetDeviceModifierMapping.3 XGetDeviceMotionEvents.3 \
- XGetExtensionVersion.3 XGetFeedbackControl.3 XGrabDevice.3 \
- XGrabDeviceButton.3 XGrabDeviceKey.3 XListInputDevices.3 \
- XOpenDevice.3 XQueryDeviceState.3 XSelectExtensionEvent.3 \
- XSendExtensionEvent.3 XSetDeviceButtonMapping.3 XSetDeviceFocus.3 \
- XSetDeviceMode.3 XSetDeviceValuators.3 \
- XGetDeviceProperty.3 XListDeviceProperties.3
-
-MLINKS= XGetDeviceControl.3 XChangeDeviceControl.3 \
- XGetFeedbackControl.3 XChangeFeedbackControl.3 \
- XGetDeviceKeyMapping.3 XChangeDeviceKeyMapping.3 \
- XGetDeviceModifierMapping.3 XSetDeviceModifierMapping.3 \
- XChangeDeviceDontPropagateList.3 XGetDeviceDontPropagateList.3 \
- XGetDeviceMotionEvents.3 XDeviceTimeCoord.3 \
- XGrabDeviceButton.3 XUngrabDeviceButton.3 \
- XGrabDeviceKey.3 XUngrabDeviceKey.3 \
- XGrabDevice.3 XUngrabDevice.3 \
- XListInputDevices.3 XFreeDeviceList.3 \
- XOpenDevice.3 XCloseDevice.3 \
- XSetDeviceButtonMapping.3 XGetDeviceButtonMapping.3 \
- XSetDeviceFocus.3 XGetDeviceFocus.3 \
- XSelectExtensionEvent.3 XGetSelectedExtensionEvents.3
+INCS= XInput.h \
+ XInput2.h
+
+INCSDIR=${X11INCDIR}/X11/extensions
PKGDIST= ${LIB}
+COPTS.XExtInt.c+= -Wno-error # XXX
+COPTS.XSndExEv.c+= -Wno-error # XXX
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libXtst/Makefile
diff -u src/external/mit/xorg/lib/libXtst/Makefile:1.3 src/external/mit/xorg/lib/libXtst/Makefile:1.4
--- src/external/mit/xorg/lib/libXtst/Makefile:1.3 Sat Oct 4 19:00:19 2008
+++ src/external/mit/xorg/lib/libXtst/Makefile Sat May 22 02:41:33 2010
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2008/10/04 19:00:19 cube Exp $
+# $NetBSD: Makefile,v 1.4 2010/05/22 02:41:33 mrg Exp $
.include <bsd.own.mk>
LIB= Xtst
-.PATH: ${X11SRCDIR.Xtst}/src ${X11SRCDIR.Xtst}/man
+.PATH: ${X11SRCDIR.${LIB}}/src
+.PATH: ${X11SRCDIR.${LIB}}/man
+.PATH: ${X11SRCDIR.${LIB}}/include/X11/extensions
SRCS= XTest.c XRecord.c
@@ -13,17 +15,10 @@
Xext ${.CURDIR}/../libXext \
X11 ${.CURDIR}/../libX11/dynamic
-MAN= XTestQueryExtension.3
-MLINKS= XTestQueryExtension.3 XTestCompareCurrentCursorWithWindow.3 \
- XTestQueryExtension.3 XTestCompareCursorWithWindow.3 \
- XTestQueryExtension.3 XTestDiscard.3 \
- XTestQueryExtension.3 XTestFakeButtonEvent.3 \
- XTestQueryExtension.3 XTestFakeKeyEvent.3 \
- XTestQueryExtension.3 XTestFakeMotionEvent.3 \
- XTestQueryExtension.3 XTestFakeRelativeMotionEvent.3 \
- XTestQueryExtension.3 XTestGrabControl.3 \
- XTestQueryExtension.3 XTestSetGContextOfGC.3 \
- XTestQueryExtension.3 XTestSetVisualIDOfVisual.3
+INCS= XTest.h \
+ record.h
+
+INCSDIR=${X11INCDIR}/X11/extensions
PKGDIST= ${LIB}
