xsrc/49873: libxcb-xkb.so is installed with the wrong version nummber

[yorickhardy%gmail.com@localhost]

>Number:         49873
>Category:       xsrc
>Synopsis:       libxcb-xkb.so is installed with the wrong version nummber
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    xsrc-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun May 03 09:40:00 +0000 2015
>Originator:     Yorick Hardy
>Release:        NetBSD 7.0_BETA
>Organization:
>Environment:
NetBSD HOME 7.0_BETA NetBSD 7.0_BETA (YORICK.amd64) #0: Fri Apr 24 06:20:00 SAST 2015  root@HOME:/root/build.amd64.local7/obj/sys/arch/amd64/compile/YORICK.amd64 amd64
>Description:
/usr/X11R7/lib/libxcb-xkb.so is installed as /usr/X11R7/lib/libxcb-xkb.so.0.1 but is tagged as version 1.0.
>How-To-Repeat:

>Fix:
Index: distrib/sets/lists/xbase/shl.mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/xbase/shl.mi,v
retrieving revision 1.55.4.3
diff -u -r1.55.4.3 shl.mi
--- distrib/sets/lists/xbase/shl.mi	26 Mar 2015 10:01:03 -0000	1.55.4.3
+++ distrib/sets/lists/xbase/shl.mi	3 May 2015 09:34:52 -0000
@@ -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
Index: external/mit/xorg/lib/libxcb/xkb/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libxcb/xkb/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- external/mit/xorg/lib/libxcb/xkb/Makefile	17 Mar 2014 07:25:35 -0000	1.1
+++ external/mit/xorg/lib/libxcb/xkb/Makefile	3 May 2015 09:34:52 -0000
@@ -2,7 +2,7 @@
 
 XCBEXT=	xkb
 
-.include "../xcb.mk"
-
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0
+
+.include "../xcb.mk"