[src/trunk]: src/external/mit/xorg add some missing -I paths for new freetype.

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

details:   https://anonhg.NetBSD.org/src/rev/97ef81850f19
branches:  trunk
changeset: 832376:97ef81850f19
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed May 09 08:13:23 2018 +0000

description:
add some missing -I paths for new freetype.

diffstat:

 external/mit/xorg/lib/freetype/Makefile      |  3 ++-
 external/mit/xorg/tools/fc-cache/Makefile    |  5 +++--
 external/mit/xorg/tools/mkfontscale/Makefile |  5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r dd7178c7f32a -r 97ef81850f19 external/mit/xorg/lib/freetype/Makefile
--- a/external/mit/xorg/lib/freetype/Makefile   Wed May 09 08:04:06 2018 +0000
+++ b/external/mit/xorg/lib/freetype/Makefile   Wed May 09 08:13:23 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2018/05/09 07:28:44 maya Exp $
+#      $NetBSD: Makefile,v 1.19 2018/05/09 08:13:23 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -89,6 +89,7 @@
                -DFT2_BUILD_LIBRARY \
                -DFT_CONFIG_MODULES_H="<ftmodule.h>"
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/freetype2 \
+               -I${DESTDIR}${X11INCDIR}/freetype2/freetype \
                -I${DESTDIR}${X11INCDIR}/freetype2/freetype/config \
                -I${X11SRCDIR.${LIB}}/include
 
diff -r dd7178c7f32a -r 97ef81850f19 external/mit/xorg/tools/fc-cache/Makefile
--- a/external/mit/xorg/tools/fc-cache/Makefile Wed May 09 08:04:06 2018 +0000
+++ b/external/mit/xorg/tools/fc-cache/Makefile Wed May 09 08:13:23 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2018/05/09 07:28:45 maya Exp $
+#      $NetBSD: Makefile,v 1.15 2018/05/09 08:13:23 mrg Exp $
 
 .include <bsd.hostinit.mk>
 
@@ -111,7 +111,8 @@
                -DFLEXIBLE_ARRAY_MEMBER="/**/"
 HOST_CPPFLAGS+=        -DFT_CONFIG_OPTION_DISABLE_BZIP2
 HOST_CPPFLAGS+=        -I${FONTCONFIG} -I${FREETYPE} \
-               -I${FREETYPE}/include -I${EXPAT}/lib \
+               -I${FREETYPE}/include -I${FREETYPE}/include/freetype \
+               -I${EXPAT}/lib \
                -I${FONTCONFIG}/../include \
                -I${DESTDIR}${X11INCDIR} -I.
 
diff -r dd7178c7f32a -r 97ef81850f19 external/mit/xorg/tools/mkfontscale/Makefile
--- a/external/mit/xorg/tools/mkfontscale/Makefile      Wed May 09 08:04:06 2018 +0000
+++ b/external/mit/xorg/tools/mkfontscale/Makefile      Wed May 09 08:13:23 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2018/05/09 07:28:45 maya Exp $
+#      $NetBSD: Makefile,v 1.12 2018/05/09 08:13:23 mrg Exp $
 
 .include <bsd.hostinit.mk>
 
@@ -89,7 +89,8 @@
 # fontconfig atomic ops.
 HOST_CPPFLAGS+=        -DFC_NO_MT=1
 
-HOST_CPPFLAGS+=        -I${FREETYPE}/include -I${DESTDIR}${X11INCDIR} \
+HOST_CPPFLAGS+=        -I${FREETYPE}/include -I${FREETYPE}/include/freetype \
+               -I${DESTDIR}${X11INCDIR} \
                -I${DESTDIR}${X11INCDIR}/freetype2
 
 .include <bsd.x11.mk>