[src/trunk]: src/share/mk updates for xorg-server 1.20. don't define stuff h...

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

details:   https://anonhg.NetBSD.org/src/rev/27ef2ef88037
branches:  trunk
changeset: 447100:27ef2ef88037
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Dec 31 11:19:58 2018 +0000

description:
updates for xorg-server 1.20.  don't define stuff here for it.

diffstat:

 share/mk/bsd.x11.mk |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 95858fdc70d3 -r 27ef2ef88037 share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Mon Dec 31 11:14:03 2018 +0000
+++ b/share/mk/bsd.x11.mk       Mon Dec 31 11:19:58 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.125 2018/03/04 23:47:55 christos Exp $
+#      $NetBSD: bsd.x11.mk,v 1.126 2018/12/31 11:19:58 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -88,12 +88,15 @@
     ${MACHINE} == "x68k"       || \
     ${MACHINE} == "vax")
 #      EXT_DEFINES
+. if ${XORG_SERVER_SUBDIR:Uxorg-server.old} == "xorg-server.old"
 X11FLAGS.EXTENSION+=   -DXF86VIDMODE
 
 X11FLAGS.DIX+=         -DDBE -DXRECORD -DPRESENT
 
 #      ServerDefines
-X11FLAGS.SERVER+=      -DXINPUT -DXFreeXDGA -DXF86VIDMODE -DXSERVER_LIBPCIACCESS
+X11FLAGS.SERVER+=      -DXFreeXDGA -DXF86VIDMODE
+X11FLAGS.SERVER+=      -DXINPUT -DXSERVER_LIBPCIACCESS
+. endif
 .endif
 
 .if ${MACHINE_ARCH} == "alpha" || \
@@ -132,8 +135,8 @@
 XORG_SERVER_MINOR=     10
 XORG_SERVER_TEENY=     6
 .else
-XORG_SERVER_MINOR=     18
-XORG_SERVER_TEENY=     4
+XORG_SERVER_MINOR=     20
+XORG_SERVER_TEENY=     3
 .endif
   
 XVENDORNAMESHORT=      '"X.Org"'