Update freetype2 to 2.8.

* `Light' auto-hinting mode no longer uses TrueType metrics for TrueType fonts.
  It causing horizontal scaling also. Add option if people want it back.
* Update pkg-descr, 2.7 started this but I committed the WIP version.

Exp-run done by:	antoine@

PR:		219271
MFH:		2017Q2
Exp-run by:	antoine@
Security:	4a088d67-3af2-11e7-9d75-c86000169601
Security:	CVE-2017-8105, CVE-2017-8287

4 files changed, 21 insertions, 30 deletions

diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index e99a8c7a0515..bbf6bfd9fca7 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freetype2
-PORTVERSION=	2.7.1
+PORTVERSION=	2.8
 CATEGORIES=	print
 MASTER_SITES=	http://savannah.nongnu.org/download/freetype/ \
 		SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \
@@ -36,7 +36,8 @@ PORTDOCS=	reference CHANGES formats.txt LICENSE.TXT raster.txt
 CPE_PRODUCT=	freetype
 CPE_VENDOR=	freetype
 
-OPTIONS_DEFINE=		DEBUG DOCS LCD_FILTERING PNG TABLE_VALIDATION
+OPTIONS_DEFINE=		DEBUG DOCS LCD_FILTERING PNG TABLE_VALIDATION \
+			TT_SIZE_METRICS
 OPTIONS_GROUP=		SUBPIXEL_HINTING
 OPTIONS_GROUP_SUBPIXEL_HINTING=	V38 V40
 OPTIONS_DEFAULT=	LCD_FILTERING V40
@@ -47,10 +48,12 @@ PNG_CONFIGURE_WITH=	png
 
 TABLE_VALIDATION_DESC=	TrueType GX/AAT and OpenType table validation
 
+TT_SIZE_METRICS_DESC=	TrueType-like size metrics for 'light' (V40) auto-hinting
+
 LCD_FILTERING_DESC?=	Sub-pixel rendering (patented)
 LCD_FILTERING_CFLAGS=	-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
 
-SUBPIXEL_HINTING_DESC=	Sub-pixel hinting support 
+SUBPIXEL_HINTING_DESC=	Sub-pixel hinting support
 V38_DESC=	v38 mode (Infinality code)
 V38_VARS=	SUBPIXEL_HINTING_MODE+=1
 V40_DESC=	v40 mode (minimal code, a.k.a. ClearType hinting, faster)
@@ -70,9 +73,6 @@ pre-patch:
 		${WRKSRC}/builds/unix/install.mk
 
 post-patch:
-# Check defined TT_CONFIG_OPTION_SUBPIXEL_HINTING
-	@${REINPLACE_CMD} -e 's|^#if \(TT_CONFIG_OPTION_SUBPIXEL_HINTING\)\(.*\)|#if defined(\1) \&\& (\1\2)|' \
-		${WRKSRC}/include/freetype/config/ftoption.h
 .if defined(SUBPIXEL_HINTING_MODE)
 	@${REINPLACE_CMD} -i '.hinting.bak' \
 		-e 's|^\(#define TT_CONFIG_OPTION_SUBPIXEL_HINTING\).*|\1 \
@@ -94,6 +94,11 @@ post-patch-TABLE_VALIDATION-on:
 	@${REINPLACE_CMD} -e '/valid$$/s|#.*\(AUX_MODULES\)|\1|' \
 		${WRKSRC}/modules.cfg
 
+post-patch-TT_SIZE_METRICS-on:
+	@${REINPLACE_CMD} -i '.metrics.bak' \
+		-e 's|.*\(#define AF_CONFIG_OPTION_TT_SIZE_METRICS\).*|\1|' \
+		${WRKSRC}/include/freetype/config/ftoption.h
+
 post-configure:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup)
diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo
index edc53f7af1a4..eff27a86ec9a 100644
--- a/print/freetype2/distinfo
+++ b/print/freetype2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483129043
-SHA256 (freetype-2.7.1.tar.bz2) = 3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88
-SIZE (freetype-2.7.1.tar.bz2) = 1825107
+TIMESTAMP = 1494694662
+SHA256 (freetype-2.8.tar.bz2) = a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b
+SIZE (freetype-2.8.tar.bz2) = 1873526
diff --git a/print/freetype2/pkg-descr b/print/freetype2/pkg-descr
index fece4e3c93aa..c34dcbd521b7 100644
--- a/print/freetype2/pkg-descr
+++ b/print/freetype2/pkg-descr
@@ -1,25 +1,10 @@
 FreeType is a freely available software library to render fonts.
 
-It is written in C, designed to be small, efficient, highly customizable, and portable while capable of producing high-quality output (glyph images) of most vector and bitmap font formats.
+It is written in C, designed to be small, efficient, highly customizable,
+and portable while capable of producing high-quality output (glyph images)
+of most vector and bitmap font formats.
 
-Some products that use FreeType for rendering fonts on screen or on paper, either exclusively or partially:
-
----
-The FreeType engine is a free and portable font rendering
-engine, developed to provide advanced font support for a variety of
-platforms and environments. FreeType is a library which can open and
-manages font files as well as efficiently load, hint and render
-individual glyphs. FreeType is not a font server or a complete
-text-rendering library.
-
-----
-This includes some tools that are in FreeType 1's contrib directory.
-
-ttf2pfb: Converting TrueType fonts to the Postscript Type 1 format.
-ttf2pk:  A simple conversion tool to bring TrueType quality to the
-         TeX world.
-ttf2bdf: Produce bitmapped fonts from TrueType files for your X11
-         applications.
-ttfbanner: make posters using a TrueType font
+Some products that use FreeType for rendering fonts on screen or on paper,
+either exclusively or partially:
 
 WWW: http://www.freetype.org/
diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist
index eed3d91d67c1..d12b65faba35 100644
--- a/print/freetype2/pkg-plist
+++ b/print/freetype2/pkg-plist
@@ -33,6 +33,7 @@ include/freetype2/freetype/ftmodapi.h
 include/freetype2/freetype/ftmoderr.h
 include/freetype2/freetype/ftotval.h
 include/freetype2/freetype/ftoutln.h
+include/freetype2/freetype/ftpcfdrv.h
 include/freetype2/freetype/ftpfr.h
 include/freetype2/freetype/ftrender.h
 include/freetype2/freetype/ftsizes.h
@@ -53,7 +54,7 @@ include/freetype2/ft2build.h
 lib/libfreetype.a
 lib/libfreetype.so
 lib/libfreetype.so.6
-lib/libfreetype.so.6.13.0
+lib/libfreetype.so.6.14.0
 libdata/pkgconfig/freetype2.pc
 man/man1/freetype-config.1.gz
 share/aclocal/freetype2.m4