[src/trunk]: src/external/mit/xorg/lib/freetype Adjust to 2.6.3.

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

details:   https://anonhg.NetBSD.org/src/rev/29b88bc9fb05
branches:  trunk
changeset: 345282:29b88bc9fb05
user:      christos <christos%NetBSD.org@localhost>
date:      Mon May 16 22:19:10 2016 +0000

description:
Adjust to 2.6.3.

diffstat:

 external/mit/xorg/lib/freetype/Makefile                 |  10 ++++++++--
 external/mit/xorg/lib/freetype/freetype/Makefile        |   8 ++++----
 external/mit/xorg/lib/freetype/freetype/cache/Makefile  |   6 +++---
 external/mit/xorg/lib/freetype/freetype/config/Makefile |   6 +++---
 external/mit/xorg/lib/freetype/shlib_version            |   4 ++--
 5 files changed, 20 insertions(+), 14 deletions(-)

diffs (105 lines):

diff -r 37d2be3da09b -r 29b88bc9fb05 external/mit/xorg/lib/freetype/Makefile
--- a/external/mit/xorg/lib/freetype/Makefile   Mon May 16 20:03:07 2016 +0000
+++ b/external/mit/xorg/lib/freetype/Makefile   Mon May 16 22:19:10 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 2015/07/20 04:10:40 mrg Exp $
+#      $NetBSD: Makefile,v 1.17 2016/05/16 22:19:10 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -8,6 +8,12 @@
 
 SUBDIR=        freetype
 
+.PATH: ${X11SRCDIR.freetype}/include/
+
+INCSDIR=${X11INCDIR}/freetype2
+
+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 \
@@ -83,7 +89,7 @@
                -DFT2_BUILD_LIBRARY \
                -DFT_CONFIG_MODULES_H="<ftmodule.h>"
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/freetype2 \
-               -I${DESTDIR}${X11INCDIR}/freetype2/config \
+               -I${DESTDIR}${X11INCDIR}/freetype2/freetype/config \
                -I${X11SRCDIR.${LIB}}/include
 
 .if !defined(MKSUBPIXEL) || ${MKSUBPIXEL} != "no"
diff -r 37d2be3da09b -r 29b88bc9fb05 external/mit/xorg/lib/freetype/freetype/Makefile
--- a/external/mit/xorg/lib/freetype/freetype/Makefile  Mon May 16 20:03:07 2016 +0000
+++ b/external/mit/xorg/lib/freetype/freetype/Makefile  Mon May 16 22:19:10 2016 +0000
@@ -1,12 +1,12 @@
-#      $NetBSD: Makefile,v 1.21 2016/03/21 05:23:39 dholland Exp $
+#      $NetBSD: Makefile,v 1.22 2016/05/16 22:19:10 christos Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=        config
 
-.PATH: ${X11SRCDIR.freetype}/include
+.PATH: ${X11SRCDIR.freetype}/include/freetype
 
-INCSDIR=${X11INCDIR}/freetype2
+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 \
@@ -15,7 +15,7 @@
        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 ft2build.h
+       ftautoh.h ftcffdrv.h
 
 SCRIPTS=       freetype-config
 
diff -r 37d2be3da09b -r 29b88bc9fb05 external/mit/xorg/lib/freetype/freetype/cache/Makefile
--- a/external/mit/xorg/lib/freetype/freetype/cache/Makefile    Mon May 16 20:03:07 2016 +0000
+++ b/external/mit/xorg/lib/freetype/freetype/cache/Makefile    Mon May 16 22:19:10 2016 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.2 2014/03/20 08:57:48 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2016/05/16 22:19:10 christos Exp $
 
 .include <bsd.own.mk>
 
-.PATH: ${X11SRCDIR.freetype}/include/cache
+.PATH: ${X11SRCDIR.freetype}/include/freetype/cache
 
-INCSDIR=${X11INCDIR}/freetype2/cache
+INCSDIR=${X11INCDIR}/freetype2/freetype/cache
 
 INCS=  ftcimage.h ftcmanag.h \
        ftcsbits.h ftcmru.h
diff -r 37d2be3da09b -r 29b88bc9fb05 external/mit/xorg/lib/freetype/freetype/config/Makefile
--- a/external/mit/xorg/lib/freetype/freetype/config/Makefile   Mon May 16 20:03:07 2016 +0000
+++ b/external/mit/xorg/lib/freetype/freetype/config/Makefile   Mon May 16 22:19:10 2016 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.2 2014/03/20 08:57:48 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2016/05/16 22:19:10 christos Exp $
 
 .include <bsd.own.mk>
 
-.PATH: ${X11SRCDIR.freetype}/include/config
+.PATH: ${X11SRCDIR.freetype}/include/freetype/config
 
-INCSDIR=${X11INCDIR}/freetype2/config
+INCSDIR=${X11INCDIR}/freetype2/freetype/config
 
 INCS=  ftconfig.h ftheader.h ftmodule.h ftoption.h ftstdlib.h
 
diff -r 37d2be3da09b -r 29b88bc9fb05 external/mit/xorg/lib/freetype/shlib_version
--- a/external/mit/xorg/lib/freetype/shlib_version      Mon May 16 20:03:07 2016 +0000
+++ b/external/mit/xorg/lib/freetype/shlib_version      Mon May 16 22:19:10 2016 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: shlib_version,v 1.9 2015/07/20 04:10:40 mrg Exp $
+#      $NetBSD: shlib_version,v 1.10 2016/05/16 22:19:10 christos Exp $
 #
 # try to keep this in sync with builds/unix/configure.ac:version_info=
 major=18
 minor=0
-teeny=12
+teeny=13