[src/trunk]: src/share/mk update to xorg-server 1.10.6.

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

details:   https://anonhg.NetBSD.org/src/rev/64469be3a8d5
branches:  trunk
changeset: 787121:64469be3a8d5
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jun 03 07:39:07 2013 +0000

description:
update to xorg-server 1.10.6.

diffstat:

 share/mk/bsd.kernobj.mk |  17 ++++++++++++-----
 share/mk/bsd.x11.mk     |   6 +++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diffs (64 lines):

diff -r 7f7548752b09 -r 64469be3a8d5 share/mk/bsd.kernobj.mk
--- a/share/mk/bsd.kernobj.mk   Mon Jun 03 07:24:11 2013 +0000
+++ b/share/mk/bsd.kernobj.mk   Mon Jun 03 07:39:07 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.kernobj.mk,v 1.13 2010/01/25 00:43:00 christos Exp $
+#      $NetBSD: bsd.kernobj.mk,v 1.14 2013/06/03 07:39:07 mrg Exp $
 
 # KERNSRCDIR   Is the location of the top of the kernel src.
 #              It defaults to `${NETBSDSRCDIR}/sys'.
@@ -7,8 +7,13 @@
 #              It defaults to `arch/${MACHINE}', but may be overridden
 #              in case ${MACHINE} is not correct.
 #
+# KERNCONFDIRDEFAULT   Is the default for ${KERNCONFDIR}.
+#              It defaults to `${KERNSRCDIR}/${KERNARCHDIR}/conf'.
+#
 # KERNCONFDIR  Is where the configuration files for kernels are found.
-#              It defaults to `${KERNSRCDIR}/${KERNARCHDIR}/conf'.
+#              Users can set this to have build.sh find kernel
+#              configurations in another directory.
+#              It defaults to `${KERNCONFDIRDEFAULT}'.
 #
 # KERNOBJDIR   Is the kernel build directory.  The kernel GENERIC for
 #              instance will be compiled in ${KERNOBJDIR}/GENERIC.
@@ -18,9 +23,11 @@
 
 .include <bsd.own.mk>
 
-KERNSRCDIR?=   ${NETBSDSRCDIR}/sys
-KERNARCHDIR?=  arch/${MACHINE}
-KERNCONFDIR?=  ${KERNSRCDIR}/${KERNARCHDIR}/conf
+KERNSRCDIR?=           ${NETBSDSRCDIR}/sys
+KERNARCHDIR?=          arch/${MACHINE}
+KERNCONFDIRDEFAULT?=   ${KERNSRCDIR}/${KERNARCHDIR}/conf
+KERNCONFDIR?=          ${KERNCONFDIRDEFAULT}
+
 .if !defined(KERNOBJDIR) && exists(${KERNSRCDIR}/${KERNARCHDIR}/compile)
 KERNOBJDIR!=   cd "${KERNSRCDIR}/${KERNARCHDIR}/compile" && ${PRINTOBJDIR}
 .endif
diff -r 7f7548752b09 -r 64469be3a8d5 share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Mon Jun 03 07:24:11 2013 +0000
+++ b/share/mk/bsd.x11.mk       Mon Jun 03 07:39:07 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.106 2012/04/04 10:59:47 joerg Exp $
+#      $NetBSD: bsd.x11.mk,v 1.107 2013/06/03 07:39:07 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -130,13 +130,13 @@
 .if ${X11FLAVOUR} == "Xorg"
 XVENDORNAMESHORT=      '"X.Org"'
 XVENDORNAME=           '"The X.Org Foundation"'
-XORG_RELEASE=          '"Release 1.10.3"'
+XORG_RELEASE=          '"Release 1.10.6"'
 __XKBDEFRULES__=       '"xorg"'
 XLOCALE.DEFINES=       -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
                        -DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
 
 # XXX oh yeah, fix me later
-XORG_VERSION_CURRENT="(((1) * 10000000) + ((10) * 100000) + ((3) * 1000) + 0)"
+XORG_VERSION_CURRENT="(((1) * 10000000) + ((10) * 100000) + ((6) * 1000) + 0)"
 .endif
 
 PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ {                      \