[src/trunk]: src Build fixes for freetype 2.10.4

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

details:   https://anonhg.NetBSD.org/src/rev/2862ebfcd2c8
branches:  trunk
changeset: 941454:2862ebfcd2c8
user:      maya <maya%NetBSD.org@localhost>
date:      Wed Oct 21 15:12:15 2020 +0000

description:
Build fixes for freetype 2.10.4

diffstat:

 distrib/sets/lists/xcomp/mi                             |  5 ++++-
 external/mit/xorg/lib/freetype/freetype/config/Makefile |  3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 9a958e7aa15c -r 2862ebfcd2c8 distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi       Wed Oct 21 13:31:50 2020 +0000
+++ b/distrib/sets/lists/xcomp/mi       Wed Oct 21 15:12:15 2020 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: mi,v 1.217 2020/08/30 04:51:03 mrg Exp $
+#       $NetBSD: mi,v 1.218 2020/10/21 15:12:15 maya Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -570,6 +570,9 @@
 ./usr/X11R7/include/freetype2/freetype/config/ftmodule.h       xcomp-freetype2-include xorg
 ./usr/X11R7/include/freetype2/freetype/config/ftoption.h       xcomp-freetype2-include xorg
 ./usr/X11R7/include/freetype2/freetype/config/ftstdlib.h       xcomp-freetype2-include xorg
+./usr/X11R7/include/freetype2/freetype/config/integer-types.h  xcomp-freetype2-include xorg
+./usr/X11R7/include/freetype2/freetype/config/mac-support.h    xcomp-freetype2-include xorg
+./usr/X11R7/include/freetype2/freetype/config/public-macros.h  xcomp-freetype2-include xorg
 ./usr/X11R7/include/freetype2/freetype/freetype.h      xcomp-freetype2-include xorg
 ./usr/X11R7/include/freetype2/freetype/ftadvanc.h      xcomp-freetype2-include xorg
 ./usr/X11R7/include/freetype2/freetype/ftautoh.h       xcomp-obsolete  obsolete
diff -r 9a958e7aa15c -r 2862ebfcd2c8 external/mit/xorg/lib/freetype/freetype/config/Makefile
--- a/external/mit/xorg/lib/freetype/freetype/config/Makefile   Wed Oct 21 13:31:50 2020 +0000
+++ b/external/mit/xorg/lib/freetype/freetype/config/Makefile   Wed Oct 21 15:12:15 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2016/05/16 22:19:10 christos Exp $
+#      $NetBSD: Makefile,v 1.4 2020/10/21 15:12:15 maya Exp $
 
 .include <bsd.own.mk>
 
@@ -7,6 +7,7 @@
 INCSDIR=${X11INCDIR}/freetype2/freetype/config
 
 INCS=  ftconfig.h ftheader.h ftmodule.h ftoption.h ftstdlib.h
+INCS+= integer-types.h mac-support.h public-macros.h
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>