[src/trunk]: src/external/mit/xorg/lib/freetype updates for freetype 2.4.12. ...

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

details:   https://anonhg.NetBSD.org/src/rev/472d21a57848
branches:  trunk
changeset: 787180:472d21a57848
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jun 05 08:42:56 2013 +0000

description:
updates for freetype 2.4.12.  stop installing internal headers.

diffstat:

 external/mit/xorg/lib/freetype/Makefile                            |   7 ++-
 external/mit/xorg/lib/freetype/freetype/Makefile                   |   7 ++-
 external/mit/xorg/lib/freetype/freetype/internal/Makefile          |  20 ----------
 external/mit/xorg/lib/freetype/freetype/internal/services/Makefile |  12 ------
 external/mit/xorg/lib/freetype/shlib_version                       |   4 +-
 5 files changed, 10 insertions(+), 40 deletions(-)

diffs (104 lines):

diff -r 746675dc5aaa -r 472d21a57848 external/mit/xorg/lib/freetype/Makefile
--- a/external/mit/xorg/lib/freetype/Makefile   Wed Jun 05 08:42:21 2013 +0000
+++ b/external/mit/xorg/lib/freetype/Makefile   Wed Jun 05 08:42:56 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2011/07/23 23:38:19 mrg Exp $
+#      $NetBSD: Makefile,v 1.11 2013/06/05 08:42:56 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,8 @@
 .PATH: ${FREETYPE}/src/base
 SRCS=  ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfstype.c ftglyph.c \
        ftinit.c ftlcdfil.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
-       ftsystem.c fttype1.c ftwinfnt.c ftxf86.c ftbitmap.c
+       ftsystem.c fttype1.c ftwinfnt.c ftxf86.c ftbitmap.c ftcid.c \
+       ftgasp.c ftgxval.c ftotval.c ftpatent.c ftpfr.c
 
 .PATH: ${FREETYPE}/src/autofit
 SRCS+= autofit.c
@@ -53,7 +54,7 @@
 SRCS+= pshinter.c
 
 .PATH: ${FREETYPE}/src/psnames
-SRCS+= psnames.c
+SRCS+= psmodule.c
 
 .PATH: ${FREETYPE}/src/raster
 SRCS+= raster.c
diff -r 746675dc5aaa -r 472d21a57848 external/mit/xorg/lib/freetype/freetype/Makefile
--- a/external/mit/xorg/lib/freetype/freetype/Makefile  Wed Jun 05 08:42:21 2013 +0000
+++ b/external/mit/xorg/lib/freetype/freetype/Makefile  Wed Jun 05 08:42:56 2013 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.9 2011/07/25 18:23:14 mrg Exp $
+#      $NetBSD: Makefile,v 1.10 2013/06/05 08:42:56 mrg Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR=        config internal
+SUBDIR=        config
 
 .PATH: ${X11SRCDIR.freetype}/include/freetype
 
@@ -14,7 +14,8 @@
        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 fttypes.h ftwinfnt.h ftxf86.h \
-       t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h
+       t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h \
+       ftautoh.h ftcffdrv.h
 
 SCRIPTS=       freetype-config
 
diff -r 746675dc5aaa -r 472d21a57848 external/mit/xorg/lib/freetype/freetype/internal/Makefile
--- a/external/mit/xorg/lib/freetype/freetype/internal/Makefile Wed Jun 05 08:42:21 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#      $NetBSD: Makefile,v 1.2 2011/07/23 23:38:19 mrg Exp $
-
-.include <bsd.own.mk>
-
-.PATH: ${X11SRCDIR.freetype}/include/freetype/internal
-
-INCSDIR=${X11INCDIR}/freetype2/freetype/internal
-
-INCS=  autohint.h ftcalc.h \
-       ftdebug.h ftdriver.h ftgloadr.h \
-       ftmemory.h ftobjs.h ftstream.h \
-       fttrace.h internal.h psaux.h pshints.h \
-       sfnt.h t1types.h tttypes.h ftrfork.h ftserv.h
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
-
-SUBDIR=        services
-
-.include <bsd.subdir.mk>
diff -r 746675dc5aaa -r 472d21a57848 external/mit/xorg/lib/freetype/freetype/internal/services/Makefile
--- a/external/mit/xorg/lib/freetype/freetype/internal/services/Makefile        Wed Jun 05 08:42:21 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
-
-.include <bsd.own.mk>
-
-INCSDIR=${X11INCDIR}/freetype2/freetype/internal/services
-
-.PATH: ${X11SRCDIR.freetype}/include/freetype/internal/services
-INCS=  svbdf.h svmm.h svpostnm.h svpsinfo.h svttcmap.h svxf86nm.h \
-       svgldict.h svpfr.h svpscmap.h svsfnt.h svwinfnt.h
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 746675dc5aaa -r 472d21a57848 external/mit/xorg/lib/freetype/shlib_version
--- a/external/mit/xorg/lib/freetype/shlib_version      Wed Jun 05 08:42:21 2013 +0000
+++ b/external/mit/xorg/lib/freetype/shlib_version      Wed Jun 05 08:42:56 2013 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: shlib_version,v 1.5 2011/07/23 23:30:19 mrg Exp $
+#      $NetBSD: shlib_version,v 1.6 2013/06/05 08:42:56 mrg Exp $
 #
 # XXX XXX XXX netbsd xsrc xfree 4.5 freetype used "major=9"!
 #
 major=7
-minor=3
+minor=4