[src/netbsd-9]: src/share/mk Pull up following revision(s) (requested by tsut...

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

details:   https://anonhg.NetBSD.org/src/rev/20fb2d968915
branches:  netbsd-9
changeset: 936368:20fb2d968915
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jul 26 10:59:47 2020 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #1028):

        share/mk/bsd.x11.mk: revision 1.135
        external/mit/xorg/server/xorg-server/hw/xnest/Makefile: revision 1.22
        external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile: revision 1.4

Fix typos in ${X11INCS.DIX} include paths. PR/55500
Remove extra "-I" for ${X11INCS.DIX} macro.

diffstat:

 external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile |  4 ++--
 external/mit/xorg/server/xorg-server/hw/xnest/Makefile     |  4 ++--
 share/mk/bsd.x11.mk                                        |  6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (56 lines):

diff -r bbe2379df091 -r 20fb2d968915 external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile
--- a/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile        Sun Jul 26 10:47:25 2020 +0000
+++ b/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile        Sun Jul 26 10:59:47 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2017/05/21 15:28:40 riastradh Exp $
+#      $NetBSD: Makefile,v 1.3.12.1 2020/07/26 10:59:47 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -28,7 +28,7 @@
                -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
                -I${X11SRCDIR.xorg-server}/../include \
-               -I${X11INCS.DIX}
+               ${X11INCS.DIX}
 
 CPPFLAGS+=     ${X11FLAGS.OS_DEFINES} \
                ${X11FLAGS.EXTENSION} \
diff -r bbe2379df091 -r 20fb2d968915 external/mit/xorg/server/xorg-server/hw/xnest/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xnest/Makefile    Sun Jul 26 10:47:25 2020 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xnest/Makefile    Sun Jul 26 10:59:47 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.21 2018/12/31 11:14:06 mrg Exp $
+#      $NetBSD: Makefile,v 1.21.2.1 2020/07/26 10:59:47 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -30,7 +30,7 @@
                -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
                -I${X11SRCDIR.xorg-server}/../include \
-               -I${X11INCS.DIX}
+               ${X11INCS.DIX}
 
 CPPFLAGS+=     ${X11FLAGS.OS_DEFINES} \
                ${X11FLAGS.EXTENSION} \
diff -r bbe2379df091 -r 20fb2d968915 share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Sun Jul 26 10:47:25 2020 +0000
+++ b/share/mk/bsd.x11.mk       Sun Jul 26 10:59:47 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.132 2019/07/10 21:53:35 mrg Exp $
+#      $NetBSD: bsd.x11.mk,v 1.132.2.1 2020/07/26 10:59:47 martin Exp $
 
 .include <bsd.init.mk>
 
@@ -46,8 +46,8 @@
 X11FLAGS.DIX=          -DHAVE_DIX_CONFIG_H -D_BSD_SOURCE -DHAS_FCHOWN \
                        -DHAS_STICKY_DIR_BIT -D_POSIX_THREAD_SAFE_FUNCTIONS=200112L \
                        -DHAVE_XORG_CONFIG_H
-X11INCS.DIX=           -I${X11INCSDIR}/freetype2  \
-                       -I${X11INCSDIR}/pixman-1 \
+X11INCS.DIX=           -I${X11INCDIR}/freetype2  \
+                       -I${X11INCDIR}/pixman-1 \
                        -I$(X11SRCDIR.xorg-server)/include \
                        -I$(X11SRCDIR.xorg-server)/Xext \
                        -I$(X11SRCDIR.xorg-server)/composite \