[src/trunk]: src/share/mk set X11SRCDIR.xf86-video-modesetting correctly for ...

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

details:   https://anonhg.NetBSD.org/src/rev/234d6581b5c3
branches:  trunk
changeset: 347975:234d6581b5c3
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Sep 27 16:47:01 2016 +0000

description:
set X11SRCDIR.xf86-video-modesetting correctly for xorg-server 1.18.4.
should fix build errors for x86.

diffstat:

 share/mk/bsd.own.mk |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r db5194f11b6e -r 234d6581b5c3 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Tue Sep 27 16:44:04 2016 +0000
+++ b/share/mk/bsd.own.mk       Tue Sep 27 16:47:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.962 2016/09/23 21:30:49 macallan Exp $
+#      $NetBSD: bsd.own.mk,v 1.963 2016/09/27 16:47:01 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1453,10 +1453,18 @@
 X11SRCDIR.xf86-input-${_i}?=   ${X11SRCDIRMIT}/xf86-input-${_i}/dist
 .endfor
 
+# xf86-video-modesetting move into the server build.
+EXTRA_DRIVERS=
+.if ${HAVE_XORG_SERVER_VER} == "118"
+X11SRCDIR.xf86-video-modesetting=${X11SRCDIR.xorg-server}/hw/xfree86/drivers/modesetting
+.else
+EXTRA_DRIVERS= modesetting 
+.endif
+
 .for _v in \
        ag10e amdgpu apm ark ast ati ati-kms chips cirrus crime \
        geode glint i128 i740 igs imstt intel intel-old \
-       modesetting mach64 mga \
+       ${EXTRA_DRIVERS} mach64 mga \
        neomagic newport nouveau nsc nv nvxbox openchrome pnozz \
        r128 rendition \
        s3 s3virge savage siliconmotion sis suncg14 \