Module Name: src
Committed By: mrg
Date: Mon Jun 3 07:39:07 UTC 2013
Modified Files:
src/share/mk: bsd.kernobj.mk bsd.x11.mk
Log Message:
update to xorg-server 1.10.6.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/share/mk/bsd.kernobj.mk
cvs rdiff -u -r1.106 -r1.107 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kernobj.mk
diff -u src/share/mk/bsd.kernobj.mk:1.13 src/share/mk/bsd.kernobj.mk:1.14
--- src/share/mk/bsd.kernobj.mk:1.13 Mon Jan 25 00:43:00 2010
+++ src/share/mk/bsd.kernobj.mk Mon Jun 3 07:39:07 2013
@@ -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,9 +7,14 @@
# It defaults to `arch/${MACHINE}', but may be overridden
# in case ${MACHINE} is not correct.
#
-# KERNCONFDIR Is where the configuration files for kernels are found.
+# KERNCONFDIRDEFAULT Is the default for ${KERNCONFDIR}.
# It defaults to `${KERNSRCDIR}/${KERNARCHDIR}/conf'.
#
+# KERNCONFDIR Is where the configuration files for kernels are found.
+# 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.
# The default is the .OBJDIR of
@@ -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
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.106 src/share/mk/bsd.x11.mk:1.107
--- src/share/mk/bsd.x11.mk:1.106 Wed Apr 4 10:59:47 2012
+++ src/share/mk/bsd.x11.mk Mon Jun 3 07:39:07 2013
@@ -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 @@ X11FLAGS.LOADABLE= -DXFree86LOADER -DIN_
.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=/ { \
