[src/netbsd-7]: src Pull up following revision(s) (requested by mrg in ticket...

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

details:   https://anonhg.NetBSD.org/src/rev/e00512cba68b
branches:  netbsd-7
changeset: 799593:e00512cba68b
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Sep 09 09:14:20 2015 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #974):
        distrib/sets/lists/xbase/shl.mi: revision 1.61
        external/mit/xorg/lib/libxcb/xkb/Makefile: revision 1.2
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 c49d9498a0aa -r e00512cba68b distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi   Wed Sep 09 08:14:01 2015 +0000
+++ b/distrib/sets/lists/xbase/shl.mi   Wed Sep 09 09:14:20 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.55.4.3 2015/03/26 10:01:03 martin Exp $
+# $NetBSD: shl.mi,v 1.55.4.4 2015/09/09 09:14:20 martin Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -421,8 +421,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 c49d9498a0aa -r e00512cba68b external/mit/xorg/lib/libxcb/xkb/Makefile
--- a/external/mit/xorg/lib/libxcb/xkb/Makefile Wed Sep 09 08:14:01 2015 +0000
+++ b/external/mit/xorg/lib/libxcb/xkb/Makefile Wed Sep 09 09:14:20 2015 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.1 2014/03/17 07:25:35 mrg Exp $
+#      $NetBSD: Makefile,v 1.1.6.1 2015/09/09 09:14:20 martin Exp $
 
 XCBEXT=        xkb
 
-.include "../xcb.mk"
-
 SHLIB_MAJOR=   1
 SHLIB_MINOR=   0
+
+.include "../xcb.mk"