[src/trunk]: src move some defines from xorg-server dix-config.h back into ma...

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

details:   https://anonhg.NetBSD.org/src/rev/05fe24d9b0ac
branches:  trunk
changeset: 447203:05fe24d9b0ac
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Jan 03 23:25:52 2019 +0000

description:
move some defines from xorg-server dix-config.h back into makefiles,
so that Xx68k can build.

diffstat:

 external/mit/xorg/server/drivers/Makefile.xf86-driver |  5 +++--
 share/mk/bsd.x11.mk                                   |  6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r 70369629ff0a -r 05fe24d9b0ac external/mit/xorg/server/drivers/Makefile.xf86-driver
--- a/external/mit/xorg/server/drivers/Makefile.xf86-driver     Thu Jan 03 23:04:09 2019 +0000
+++ b/external/mit/xorg/server/drivers/Makefile.xf86-driver     Thu Jan 03 23:25:52 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xf86-driver,v 1.25 2018/12/31 11:58:43 mrg Exp $
+#      $NetBSD: Makefile.xf86-driver,v 1.26 2019/01/03 23:25:52 mrg Exp $
 
 LIBISMODULE=   yes
 SHLIB_MAJOR=   ${PACKAGE_MAJOR}
@@ -37,7 +37,8 @@
                -DHAVE_XORG_SERVER_1_1_0 \
                -DSERVER_1_5 \
                -DXSERVER_LIBPCIACCESS \
-               -DHAVE_XEXTPROTO_71
+               -DHAVE_XEXTPROTO_71 \
+               -DXFree86LOADER
 
 .if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 CPPFLAGS+=     -DHAVE_XAA_H
diff -r 70369629ff0a -r 05fe24d9b0ac share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Thu Jan 03 23:04:09 2019 +0000
+++ b/share/mk/bsd.x11.mk       Thu Jan 03 23:25:52 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.126 2018/12/31 11:19:58 mrg Exp $
+#      $NetBSD: bsd.x11.mk,v 1.127 2019/01/03 23:25:53 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -44,7 +44,7 @@
                        ${X11FLAGS.PERVASIVE_EXTENSION}
 
 X11FLAGS.DIX=          -DHAVE_DIX_CONFIG_H -D_BSD_SOURCE -DHAS_FCHOWN \
-                       -DHAS_STICKY_DIR_BIT -D_POSIX_THREAD_SAFE_FUNCTIONS \
+                       -DHAS_STICKY_DIR_BIT -D_POSIX_THREAD_SAFE_FUNCTIONS=200112L \
                        -DHAVE_XORG_CONFIG_H
 X11INCS.DIX=           -I${X11INCSDIR}/freetype2  \
                        -I${X11INCSDIR}/pixman-1 \
@@ -88,7 +88,6 @@
     ${MACHINE} == "x68k"       || \
     ${MACHINE} == "vax")
 #      EXT_DEFINES
-. if ${XORG_SERVER_SUBDIR:Uxorg-server.old} == "xorg-server.old"
 X11FLAGS.EXTENSION+=   -DXF86VIDMODE
 
 X11FLAGS.DIX+=         -DDBE -DXRECORD -DPRESENT
@@ -96,7 +95,6 @@
 #      ServerDefines
 X11FLAGS.SERVER+=      -DXFreeXDGA -DXF86VIDMODE
 X11FLAGS.SERVER+=      -DXINPUT -DXSERVER_LIBPCIACCESS
-. endif
 .endif
 
 .if ${MACHINE_ARCH} == "alpha" || \