[src/trunk]: src Adjust for freetype 2.9.1

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

details:   https://anonhg.NetBSD.org/src/rev/9a3788ce3c10
branches:  trunk
changeset: 832369:9a3788ce3c10
user:      maya <maya%NetBSD.org@localhost>
date:      Wed May 09 07:28:44 2018 +0000

description:
Adjust for freetype 2.9.1

Adjusting non-freetype because ftbase.c now includes ftfntfmt.c.
pickup pkgconfig version from pkgsrc pkgconfig file.

diffstat:

 distrib/sets/lists/xcomp/mi                      |  12 +++++++-----
 external/mit/xorg/lib/freetype/Makefile          |   8 ++++----
 external/mit/xorg/lib/freetype/freetype/Makefile |  11 +++++------
 external/mit/xorg/tools/fc-cache/Makefile        |   4 ++--
 external/mit/xorg/tools/mkfontscale/Makefile     |   4 ++--
 5 files changed, 20 insertions(+), 19 deletions(-)

diffs (146 lines):

diff -r 38bc11c16f87 -r 9a3788ce3c10 distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi       Wed May 09 07:21:08 2018 +0000
+++ b/distrib/sets/lists/xcomp/mi       Wed May 09 07:28:44 2018 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: mi,v 1.197 2018/03/14 09:09:46 mrg Exp $
+#       $NetBSD: mi,v 1.198 2018/05/09 07:28:45 maya Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -564,15 +564,16 @@
 ./usr/X11R7/include/freetype2/freetype/config/ftstdlib.h       -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/freetype.h      -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftadvanc.h      -unknown-       xorg
-./usr/X11R7/include/freetype2/freetype/ftautoh.h       -unknown-       xorg
+./usr/X11R7/include/freetype2/freetype/ftautoh.h       -unknown-       obsolete
 ./usr/X11R7/include/freetype2/freetype/ftbbox.h                -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftbdf.h         -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftbitmap.h      -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftbzip2.h       -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftcache.h       -unknown-       xorg
-./usr/X11R7/include/freetype2/freetype/ftcffdrv.h      -unknown-       xorg
+./usr/X11R7/include/freetype2/freetype/ftcffdrv.h      -unknown-       obsolete
 ./usr/X11R7/include/freetype2/freetype/ftchapters.h    -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftcid.h         -unknown-       xorg
+./usr/X11R7/include/freetype2/freetype/ftdriver.h              -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/fterrdef.h      -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/fterrors.h      -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftfntfmt.h      -unknown-       xorg
@@ -591,6 +592,7 @@
 ./usr/X11R7/include/freetype2/freetype/ftmoderr.h      -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftotval.h       -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftoutln.h       -unknown-       xorg
+./usr/X11R7/include/freetype2/freetype/ftparams.h              -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftpfr.h         -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftrender.h      -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftsizes.h       -unknown-       xorg
@@ -599,7 +601,7 @@
 ./usr/X11R7/include/freetype2/freetype/ftsynth.h       -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftsystem.h      -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/fttrigon.h      -unknown-       xorg
-./usr/X11R7/include/freetype2/freetype/ftttdrv.h       -unknown-       xorg
+./usr/X11R7/include/freetype2/freetype/ftttdrv.h       -unknown-       obsolete
 ./usr/X11R7/include/freetype2/freetype/fttypes.h       -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftwinfnt.h      -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftxf86.h                -unknown-       obsolete
@@ -636,7 +638,7 @@
 ./usr/X11R7/include/freetype2/freetype/ttnameid.h      -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/tttables.h      -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/tttags.h                -unknown-       xorg
-./usr/X11R7/include/freetype2/freetype/ttunpat.h       -unknown-       xorg
+./usr/X11R7/include/freetype2/freetype/ttunpat.h       -unknown-       obsolete
 ./usr/X11R7/include/freetype2/ft2build.h               -unknown-       xorg
 ./usr/X11R7/include/freetype2/ftadvanc.h               -unknown-       obsolete
 ./usr/X11R7/include/freetype2/ftautoh.h                        -unknown-       obsolete
diff -r 38bc11c16f87 -r 9a3788ce3c10 external/mit/xorg/lib/freetype/Makefile
--- a/external/mit/xorg/lib/freetype/Makefile   Wed May 09 07:21:08 2018 +0000
+++ b/external/mit/xorg/lib/freetype/Makefile   Wed May 09 07:28:44 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2016/05/16 22:19:10 christos Exp $
+#      $NetBSD: Makefile,v 1.18 2018/05/09 07:28:44 maya Exp $
 
 .include <bsd.own.mk>
 
@@ -15,8 +15,8 @@
 INCS=  ft2build.h
 
 .PATH: ${FREETYPE}/src/base
-SRCS=  ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfntfmt.c ftfstype.c \
-       ftglyph.c ftinit.c ftlcdfil.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
+SRCS=  ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfstype.c \
+       ftglyph.c ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
        ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c ftcid.c \
        ftgasp.c ftgxval.c ftotval.c ftpatent.c ftpfr.c
 
@@ -102,7 +102,7 @@
 
 PKGCONFIG=     freetype2
 PKGDIST.freetype2=     ${.CURDIR}
-PKGCONFIG_VERSION.freetype2=   ${SHLIB_MAJOR}.${SHLIB_MINOR}.${SHLIB_TEENY}
+PKGCONFIG_VERSION.freetype2=   22.0.16
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r 38bc11c16f87 -r 9a3788ce3c10 external/mit/xorg/lib/freetype/freetype/Makefile
--- a/external/mit/xorg/lib/freetype/freetype/Makefile  Wed May 09 07:21:08 2018 +0000
+++ b/external/mit/xorg/lib/freetype/freetype/Makefile  Wed May 09 07:28:44 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.22 2016/05/16 22:19:10 christos Exp $
+#      $NetBSD: Makefile,v 1.23 2018/05/09 07:28:44 maya Exp $
 
 .include <bsd.own.mk>
 
@@ -9,13 +9,12 @@
 INCSDIR=${X11INCDIR}/freetype2/freetype
 
 INCS=  freetype.h ftadvanc.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h \
-       ftchapters.h ftcid.h fterrdef.h fterrors.h ftfntfmt.h ftgasp.h \
+       ftchapters.h ftcid.h ftdriver.h fterrdef.h fterrors.h ftfntfmt.h ftgasp.h \
        ftglyph.h ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h \
        ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h \
-       ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h \
-       ftsystem.h fttrigon.h ftttdrv.h fttypes.h ftwinfnt.h \
-       t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h \
-       ftautoh.h ftcffdrv.h
+       ftparams.h ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h \
+       ftsystem.h fttrigon.h fttypes.h ftwinfnt.h \
+       t1tables.h ttnameid.h tttables.h tttags.h
 
 SCRIPTS=       freetype-config
 
diff -r 38bc11c16f87 -r 9a3788ce3c10 external/mit/xorg/tools/fc-cache/Makefile
--- a/external/mit/xorg/tools/fc-cache/Makefile Wed May 09 07:21:08 2018 +0000
+++ b/external/mit/xorg/tools/fc-cache/Makefile Wed May 09 07:28:44 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2018/05/01 19:59:43 christos Exp $
+#      $NetBSD: Makefile,v 1.14 2018/05/09 07:28:45 maya Exp $
 
 .include <bsd.hostinit.mk>
 
@@ -21,7 +21,7 @@
                ftglue.c
 
 .PATH: ${FREETYPE}/src/base
-SRCS.freetype= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfntfmt.c \
+SRCS.freetype= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c \
                ftglyph.c ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
                ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c
 
diff -r 38bc11c16f87 -r 9a3788ce3c10 external/mit/xorg/tools/mkfontscale/Makefile
--- a/external/mit/xorg/tools/mkfontscale/Makefile      Wed May 09 07:21:08 2018 +0000
+++ b/external/mit/xorg/tools/mkfontscale/Makefile      Wed May 09 07:28:44 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2018/05/01 19:59:44 christos Exp $
+#      $NetBSD: Makefile,v 1.11 2018/05/09 07:28:45 maya Exp $
 
 .include <bsd.hostinit.mk>
 
@@ -10,7 +10,7 @@
 SRCS.mkfontscale=      mkfontscale.c list.c hash.c ident.c
 
 .PATH: ${FREETYPE}/src/base
-SRCS.freetype+=        ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfntfmt.c \
+SRCS.freetype+=        ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c \
                ftglyph.c ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
                ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c