Module Name: src
Committed By: tsutsui
Date: Sun Sep 11 04:59:54 UTC 2016
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch NetBSD/x68k to Xorg server 1.18 by default.
Build confirmed by build.sh -x release.
To generate a diff of this commit:
cvs rdiff -u -r1.954 -r1.955 src/share/mk/bsd.own.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.own.mk
diff -u src/share/mk/bsd.own.mk:1.954 src/share/mk/bsd.own.mk:1.955
--- src/share/mk/bsd.own.mk:1.954 Mon Sep 5 05:58:29 2016
+++ src/share/mk/bsd.own.mk Sun Sep 11 04:59:54 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.954 2016/09/05 05:58:29 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.955 2016/09/11 04:59:54 tsutsui Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1391,7 +1391,8 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
.endfor
# During transition from xorg-server 1.10 to 1.18
-.if ${MACHINE} == "shark"
+.if ${MACHINE} == "shark" || \
+ ${MACHINE} == "x68k"
HAVE_XORG_SERVER_VER?=118
.else
HAVE_XORG_SERVER_VER?=110
