Update freetype2 to 2.6.2. Include file layout changed yet again, please

test dependent packages.

CHANGES BETWEEN 2.6 and 2.6.1

  I. IMPORTANT BUG FIXES

    - It turned  out that for CFFs  only the advance widths  should be
      taken from the  `htmx' table, not the side  bearings.  This bug,
      introduced in  version 2.6.0, makes  it necessary to  upgrade if
      you are using  CFFs; otherwise, you get cropped  glyphs with GUI
      interfaces like GTK or Qt.

    - Accessing Type 42 fonts returned  incorrect results if the glyph
      order of the embedded TrueType font differs from the glyph order
      of the Type 42 charstrings table.


  II. IMPORTANT CHANGES

    - The header  file layout  has been  changed (again),  moving  all
      header files except `ft2build.h' into a subdirectory tree.

      Doing so  reduces the  possibility of  header file  name clashes
      (e.g., FTGL's  `FTGlyph.h' with FreeType's `ftglyph.h')  on case
      insensitive file systems like Mac OS X or Windows.

      Applications  that  use  (a)  the  `freetype-config'  script  or
      FreeType's `freetype2.pc' file for pkg-config to get the include
      directory  for the  compiler,  and (b)  the  documented way  for
      header inclusion like

        #include <ft2build.h>
        #include FT_FREETYPE_H
        ...

      don't need any change to the source code.

    - Simple access  to named instances  in GX variation fonts  is now
      available (in addition to the  previous method via FreeType's MM
      interface).   In  the `FT_Face'  structure,  bits  16-30 of  the
      `face_index' field hold the current named instance index for the
      given face  index, and bits  16-30 of `style_flags'  contain the
      number of  instances for  the given face  index.  `FT_Open_Face'
      and friends also understand the  extended bits of the face index
      parameter.

      You need to enable  TT_CONFIG_OPTION_GX_VAR_SUPPORT for this new
      feature.  Otherwise, bits  16-30 of the two fields  are zero (or
      are ignored).

    - Lao script support has been added to the auto-hinter.


  III. MISCELLANEOUS

    - The auto-hinter's Arabic script support has been enhanced.

    - Superscript-like and  subscript-like glyphs  as used  by various
      phonetic alphabets like the IPA  are now better supported by the
      auto-hinter.

    - The TrueType bytecode interpreter now runs slightly faster.

    - Improved support for builds with cmake.

    - The  function  `FT_CeilFix'  now   always  rounds  towards  plus
      infinity.

    - The  function  `FT_FloorFix'  now always  rounds  towards  minus
      infinity.

    - A  new load  flag `FT_LOAD_COMPUTE_METRICS'  has been  added; it
      makes FreeType  ignore pre-computed  metrics, as needed  by font
      validating  or  font  editing  programs.  Right  now,  only  the
      TrueType  module supports  it  to ignore  data  from the  `hdmx'
      table.

    - Another round of bug fixes  to better handle broken fonts, found
      by Kostya Serebryany <kcc@google.com>.

CHANGES BETWEEN 2.6.1 and 2.6.2

  I. IMPORTANT CHANGES

    - The auto-hinter now supports stem darkening, to be controlled by
      the    new   `no-stem-darkening'    and   `darkening-parameters'
      properties.   This is  an  experimental  feature contributed  by
      Nikolaus Waxweiler, and  the interface might change  in a future
      release.

    - By default, stem darkening is now switched off (for both the CFF
      engine and the  auto-hinter).  The main reason is  that you need
      linear  alpha  blending  and  gamma correction  to  get  correct
      rendering results, and  the latter is not yet  available in most
      freely  available  rendering  stacks like  X11.   Applying  stem
      darkening without proper gamma correction  leads to far too dark
      rendering results.

    - The   meaning  of   `FT_RENDER_MODE_LIGHT'  has   been  slightly
      modified.   It  now  essentially  means `no  hinting  along  the
      horizontal  axis'; in  particular,  no change  of glyph  advance
      widths.  Consequently, the auto-hinter  is used for all scalable
      font  formats  except  for  CFF.    It  is  planned  that  other
      font-specific rendering engines (TrueType, Type 1) will follow.


  II. MISCELLANEOUS

    - The default  LCD filter  has been changed  to be  normalized and
      color-balanced.

    - For    better    compatibility   with    FontConfig,    function
      `FT_Library_SetLcdFilter'  accepts   a  new   enumeration  value
      `FT_LCD_FILTER_LEGACY1'   (which  has   the   same  meaning   as
      `FT_LCD_FILTER_LEGACY').

    - A large number of bugs have been detected by using the libFuzzer
      framework,  which should  further  improve  handling of  invalid
      fonts.  Thanks again to Kostya Serebryany and Bungeman!

    - `TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES',  a   new  configuration
      option, controls the maximum number of executed opcodes within a
      bytecode program.  You don't want to change this except for very
      special  situations (e.g.,  making a  library fuzzer  spend less
      time to handle broken fonts).

    - The smooth renderer has been made faster.

    - The `ftstring'  demo program  now supports  sub-pixel rendering;
      use key `l' to cycle through the LCD modes.

    - The `ftstring'  demo program now supports  colour rendering; use
      the `space' key to cycle through various colour combinations.

    - The graphical demo programs now use a default gamma value of 1.8
      (instead of 1.2).

4 files changed, 58 insertions, 72 deletions

diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index 4d57e96ddd0..31a64ae4965 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.100 2015/09/06 08:34:20 mef Exp $
+# $NetBSD: Makefile,v 1.101 2016/01/10 21:16:33 bsiegert Exp $
 
-DISTNAME=	freetype-2.6
+DISTNAME=	freetype-2.6.2
 PKGNAME=	${DISTNAME:S/-/2-/}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freetype/} \
diff --git a/graphics/freetype2/PLIST b/graphics/freetype2/PLIST
index 9a4d071429f..25bcf920d71 100644
--- a/graphics/freetype2/PLIST
+++ b/graphics/freetype2/PLIST
@@ -1,56 +1,56 @@
-@comment $NetBSD: PLIST,v 1.22 2015/09/06 08:34:20 mef Exp $
+@comment $NetBSD: PLIST,v 1.23 2016/01/10 21:16:33 bsiegert Exp $
 bin/freetype-config
-include/freetype2/config/ftconfig.h
-include/freetype2/config/ftheader.h
-include/freetype2/config/ftmodule.h
-include/freetype2/config/ftoption.h
-include/freetype2/config/ftstdlib.h
-include/freetype2/freetype.h
+include/freetype2/freetype/config/ftconfig.h
+include/freetype2/freetype/config/ftheader.h
+include/freetype2/freetype/config/ftmodule.h
+include/freetype2/freetype/config/ftoption.h
+include/freetype2/freetype/config/ftstdlib.h
+include/freetype2/freetype/freetype.h
+include/freetype2/freetype/ftadvanc.h
+include/freetype2/freetype/ftautoh.h
+include/freetype2/freetype/ftbbox.h
+include/freetype2/freetype/ftbdf.h
+include/freetype2/freetype/ftbitmap.h
+include/freetype2/freetype/ftbzip2.h
+include/freetype2/freetype/ftcache.h
+include/freetype2/freetype/ftcffdrv.h
+include/freetype2/freetype/ftchapters.h
+include/freetype2/freetype/ftcid.h
+include/freetype2/freetype/fterrdef.h
+include/freetype2/freetype/fterrors.h
+include/freetype2/freetype/ftfntfmt.h
+include/freetype2/freetype/ftgasp.h
+include/freetype2/freetype/ftglyph.h
+include/freetype2/freetype/ftgxval.h
+include/freetype2/freetype/ftgzip.h
+include/freetype2/freetype/ftimage.h
+include/freetype2/freetype/ftincrem.h
+include/freetype2/freetype/ftlcdfil.h
+include/freetype2/freetype/ftlist.h
+include/freetype2/freetype/ftlzw.h
+include/freetype2/freetype/ftmac.h
+include/freetype2/freetype/ftmm.h
+include/freetype2/freetype/ftmodapi.h
+include/freetype2/freetype/ftmoderr.h
+include/freetype2/freetype/ftotval.h
+include/freetype2/freetype/ftoutln.h
+include/freetype2/freetype/ftpfr.h
+include/freetype2/freetype/ftrender.h
+include/freetype2/freetype/ftsizes.h
+include/freetype2/freetype/ftsnames.h
+include/freetype2/freetype/ftstroke.h
+include/freetype2/freetype/ftsynth.h
+include/freetype2/freetype/ftsystem.h
+include/freetype2/freetype/fttrigon.h
+include/freetype2/freetype/ftttdrv.h
+include/freetype2/freetype/fttypes.h
+include/freetype2/freetype/ftwinfnt.h
+include/freetype2/freetype/t1tables.h
+include/freetype2/freetype/ttnameid.h
+include/freetype2/freetype/tttables.h
+include/freetype2/freetype/tttags.h
+include/freetype2/freetype/ttunpat.h
 include/freetype2/ft2build.h
-include/freetype2/ftadvanc.h
-include/freetype2/ftautoh.h
-include/freetype2/ftbbox.h
-include/freetype2/ftbdf.h
-include/freetype2/ftbitmap.h
-include/freetype2/ftbzip2.h
-include/freetype2/ftcache.h
-include/freetype2/ftcffdrv.h
-include/freetype2/ftchapters.h
-include/freetype2/ftcid.h
-include/freetype2/fterrdef.h
-include/freetype2/fterrors.h
-include/freetype2/ftfntfmt.h
-include/freetype2/ftgasp.h
-include/freetype2/ftglyph.h
-include/freetype2/ftgxval.h
-include/freetype2/ftgzip.h
-include/freetype2/ftimage.h
-include/freetype2/ftincrem.h
-include/freetype2/ftlcdfil.h
-include/freetype2/ftlist.h
-include/freetype2/ftlzw.h
-include/freetype2/ftmac.h
-include/freetype2/ftmm.h
-include/freetype2/ftmodapi.h
-include/freetype2/ftmoderr.h
-include/freetype2/ftotval.h
-include/freetype2/ftoutln.h
-include/freetype2/ftpfr.h
-include/freetype2/ftrender.h
-include/freetype2/ftsizes.h
-include/freetype2/ftsnames.h
-include/freetype2/ftstroke.h
-include/freetype2/ftsynth.h
-include/freetype2/ftsystem.h
-include/freetype2/fttrigon.h
-include/freetype2/ftttdrv.h
-include/freetype2/fttypes.h
-include/freetype2/ftwinfnt.h
-include/freetype2/t1tables.h
-include/freetype2/ttnameid.h
-include/freetype2/tttables.h
-include/freetype2/tttags.h
-include/freetype2/ttunpat.h
 lib/libfreetype.la
 lib/pkgconfig/freetype2.pc
 man/man1/freetype-config.1
diff --git a/graphics/freetype2/distinfo b/graphics/freetype2/distinfo
index 39b45bb37f7..51572c836a1 100644
--- a/graphics/freetype2/distinfo
+++ b/graphics/freetype2/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.55 2015/11/03 21:33:57 agc Exp $
+$NetBSD: distinfo,v 1.56 2016/01/10 21:16:33 bsiegert Exp $
 
-SHA1 (freetype-2.6.tar.bz2) = cd2b144205dd2c61693e2d861069367aa3dde1bc
-RMD160 (freetype-2.6.tar.bz2) = 80618594b49c5bfdd8fd951f83a346d57f04ee09
-SHA512 (freetype-2.6.tar.bz2) = 0242c832dcac3d9dc5d434b7f5145e63f2289d5df32f16e1c7afc1e31c3c92f0dd374e20dfef79a9ecb26b14419f42b0d897c7154f249f629c35ee7af0aa5297
-Size (freetype-2.6.tar.bz2) = 1726219 bytes
-SHA1 (patch-aa) = d89f3f452354129df49d02d5063e712b57e8ba0e
+SHA1 (freetype-2.6.2.tar.bz2) = 29c22b85b77cb22cf95c13e7062e21f39fe6b17a
+RMD160 (freetype-2.6.2.tar.bz2) = 33c5d3a30e0a3224238b45f670e536391d0076ac
+SHA512 (freetype-2.6.2.tar.bz2) = 269d7a2ba728b4cb79d1d533ce93674bfd483566ab80bc6be0ec24f869cb65ba1fd852fbeff8f045607dd044845ce3d125374faeb14c986761b94dce7d1ff48b
+Size (freetype-2.6.2.tar.bz2) = 1767940 bytes
 SHA1 (patch-ab) = cb8c9552e2db1e1f3da3d20971c22f174e343162
diff --git a/graphics/freetype2/patches/patch-aa b/graphics/freetype2/patches/patch-aa
deleted file mode 100644
index 536f3eaeb98..00000000000
--- a/graphics/freetype2/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.20 2013/08/04 10:38:01 adam Exp $
-
---- builds/unix/freetype-config.in.orig	2013-02-08 11:34:57.000000000 +0000
-+++ builds/unix/freetype-config.in
-@@ -17,7 +17,7 @@ exec_prefix="%exec_prefix%"
- exec_prefix_set="no"
- includedir="%includedir%"
- libdir="%libdir%"
--enable_shared="%build_libtool_libs%"
-+enable_shared=yes #"%build_libtool_libs%"
- 
- usage()
- {