[src/trunk]: src adapt for libXi 1.7.1.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/17355b445a19
branches:  trunk
changeset: 787164:17355b445a19
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jun 05 00:52:22 2013 +0000

description:
adapt for libXi 1.7.1.

diffstat:

 distrib/sets/lists/xbase/shl.mi           |  4 ++--
 distrib/sets/lists/xdebug/shl.mi          |  4 ++--
 external/mit/xorg/lib/libXi/Makefile      |  5 ++++-
 external/mit/xorg/lib/libXi/shlib_version |  4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diffs (71 lines):

diff -r 546b798e00a4 -r 17355b445a19 distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi   Wed Jun 05 00:48:32 2013 +0000
+++ b/distrib/sets/lists/xbase/shl.mi   Wed Jun 05 00:52:22 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.50 2013/06/03 23:25:43 mrg Exp $
+# $NetBSD: shl.mi,v 1.51 2013/06/05 00:52:22 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -245,7 +245,7 @@
 ./usr/X11R7/lib/libXft.so.3.0                  -unknown-               xorg
 ./usr/X11R7/lib/libXi.so                       -unknown-               xorg
 ./usr/X11R7/lib/libXi.so.7                     -unknown-               xorg
-./usr/X11R7/lib/libXi.so.7.0                   -unknown-               xorg
+./usr/X11R7/lib/libXi.so.7.1                   -unknown-               xorg
 ./usr/X11R7/lib/libXinerama.so                 -unknown-               xorg
 ./usr/X11R7/lib/libXinerama.so.2               -unknown-               xorg
 ./usr/X11R7/lib/libXinerama.so.2.0             -unknown-               xorg
diff -r 546b798e00a4 -r 17355b445a19 distrib/sets/lists/xdebug/shl.mi
--- a/distrib/sets/lists/xdebug/shl.mi  Wed Jun 05 00:48:32 2013 +0000
+++ b/distrib/sets/lists/xdebug/shl.mi  Wed Jun 05 00:52:22 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.9 2013/06/03 23:25:43 mrg Exp $
+# $NetBSD: shl.mi,v 1.10 2013/06/05 00:52:23 mrg Exp $
 ./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug                   -unknown-               x11,debug
 ./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug                   -unknown-               x11,debug
 ./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug                  -unknown-               x11,debug
@@ -83,7 +83,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libXfont.so.3.0.debug        -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libXfontcache.so.2.0.debug   -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libXft.so.3.0.debug  -unknown-               xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXi.so.7.0.debug   -unknown-               xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libXi.so.7.1.debug   -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libXinerama.so.2.0.debug     -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libXmu.so.7.0.debug  -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libXmuu.so.2.0.debug -unknown-               xorg,debug
diff -r 546b798e00a4 -r 17355b445a19 external/mit/xorg/lib/libXi/Makefile
--- a/external/mit/xorg/lib/libXi/Makefile      Wed Jun 05 00:48:32 2013 +0000
+++ b/external/mit/xorg/lib/libXi/Makefile      Wed Jun 05 00:52:22 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2011/08/11 23:15:39 joerg Exp $
+#      $NetBSD: Makefile,v 1.9 2013/06/05 00:52:22 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -7,6 +7,7 @@
 .PATH: ${X11SRCDIR.${LIB}}/include/X11/extensions
 
 SRCS=  XIAllowEvents.c \
+       XIBarrier.c \
        XIGrabDevice.c \
        XIQueryVersion.c \
        XIQueryDevice.c \
@@ -81,5 +82,7 @@
 
 CWARNFLAGS.clang+=     -Wno-pointer-sign
 
+# XXX manuals
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r 546b798e00a4 -r 17355b445a19 external/mit/xorg/lib/libXi/shlib_version
--- a/external/mit/xorg/lib/libXi/shlib_version Wed Jun 05 00:48:32 2013 +0000
+++ b/external/mit/xorg/lib/libXi/shlib_version Wed Jun 05 00:52:22 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: shlib_version,v 1.2 2009/01/11 03:10:11 christos Exp $
+#      $NetBSD: shlib_version,v 1.3 2013/06/05 00:52:22 mrg Exp $
 #
 major=7
-minor=0
+minor=1