[src/trunk]: src libxcb-xkb.so has the wrong version, fix it. patch as provi...

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

details:   https://anonhg.NetBSD.org/src/rev/9563ba28dfcd
branches:  trunk
changeset: 337966:9563ba28dfcd
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon May 04 23:51:25 2015 +0000

description:
libxcb-xkb.so has the wrong version, fix it.  patch as provided by
Yorick Hardy in PR 49873.

diffstat:

 distrib/sets/lists/xbase/shl.mi           |  6 +++---
 external/mit/xorg/lib/libxcb/xkb/Makefile |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (35 lines):

diff -r 096082b50d13 -r 9563ba28dfcd distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi   Mon May 04 23:50:36 2015 +0000
+++ b/distrib/sets/lists/xbase/shl.mi   Mon May 04 23:51:25 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.60 2015/03/12 07:58:05 snj Exp $
+# $NetBSD: shl.mi,v 1.61 2015/05/04 23:51:25 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -424,8 +424,8 @@
 ./usr/X11R7/lib/libxcb-xinerama.so.0           -unknown-               xorg
 ./usr/X11R7/lib/libxcb-xinerama.so.0.1         -unknown-               xorg
 ./usr/X11R7/lib/libxcb-xkb.so                  -unknown-               xorg
-./usr/X11R7/lib/libxcb-xkb.so.0                        -unknown-               xorg
-./usr/X11R7/lib/libxcb-xkb.so.0.1              -unknown-               xorg
+./usr/X11R7/lib/libxcb-xkb.so.1                        -unknown-               xorg
+./usr/X11R7/lib/libxcb-xkb.so.1.0              -unknown-               xorg
 ./usr/X11R7/lib/libxcb-xtest.so                        -unknown-               xorg
 ./usr/X11R7/lib/libxcb-xtest.so.0              -unknown-               xorg
 ./usr/X11R7/lib/libxcb-xtest.so.0.1            -unknown-               xorg
diff -r 096082b50d13 -r 9563ba28dfcd external/mit/xorg/lib/libxcb/xkb/Makefile
--- a/external/mit/xorg/lib/libxcb/xkb/Makefile Mon May 04 23:50:36 2015 +0000
+++ b/external/mit/xorg/lib/libxcb/xkb/Makefile Mon May 04 23:51:25 2015 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.1 2014/03/17 07:25:35 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2015/05/04 23:51:25 mrg Exp $
 
 XCBEXT=        xkb
 
-.include "../xcb.mk"
-
 SHLIB_MAJOR=   1
 SHLIB_MINOR=   0
+
+.include "../xcb.mk"