Module Name: src
Committed By: jakllsch
Date: Sat Sep 3 16:10:35 UTC 2016
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch shark to Xorg server 1.18.
The igs driver no longer builds against 1.10.
To generate a diff of this commit:
cvs rdiff -u -r1.951 -r1.952 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.951 src/share/mk/bsd.own.mk:1.952
--- src/share/mk/bsd.own.mk:1.951 Sat Sep 3 12:32:12 2016
+++ src/share/mk/bsd.own.mk Sat Sep 3 16:10:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.951 2016/09/03 12:32:12 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.952 2016/09/03 16:10:34 jakllsch Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1399,7 +1399,11 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
.endfor
# During transition from xorg-server 1.10 to 1.18
+.if ${MACHINE} == "shark"
+HAVE_XORG_SERVER_VER?=118
+.else
HAVE_XORG_SERVER_VER?=110
+.endif
.if ${HAVE_XORG_SERVER_VER} == "118"
XORG_SERVER_SUBDIR?=xorg-server
