svn commit: r468892 - in head/print/freetype2: . files

[Jan Beich]

Author: jbeich
Date: Wed May  2 23:33:10 2018
New Revision: 468892
URL: https://svnweb.freebsd.org/changeset/ports/468892

Log:
  print/freetype2: update to 2.9.1
  
  - Keep building freetype-config for now (to skip exp-run)
  - Drop upstreamed patch
  - Properly spell "subpixel" (following upstream)
  
  Changes:	https://sourceforge.net/projects/freetype/files/freetype2/2.9.1
  ABI:		https://abi-laboratory.pro/tracker/timeline/freetype/
  PR:		227936
  Submitted by:	lightside at gmx.com
  Security:	CVE-2018-6942

Deleted:
  head/print/freetype2/files/correct-flex-features.patch
Modified:
  head/print/freetype2/Makefile   (contents, props changed)
  head/print/freetype2/distinfo   (contents, props changed)
  head/print/freetype2/pkg-plist   (contents, props changed)

Modified: head/print/freetype2/Makefile
==============================================================================
--- head/print/freetype2/Makefile	Wed May  2 23:30:09 2018	(r468891)
+++ head/print/freetype2/Makefile	Wed May  2 23:33:10 2018	(r468892)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freetype2
-PORTVERSION=	2.9
-PORTREVISION=	1
+PORTVERSION=	2.9.1
 CATEGORIES=	print
 MASTER_SITES=	http://savannah.nongnu.org/download/freetype/ \
 		SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \
@@ -37,7 +36,7 @@ PORTDOCS=	reference CHANGES formats.txt LICENSE.TXT ra
 CPE_PRODUCT=	freetype
 CPE_VENDOR=	freetype
 
-OPTIONS_DEFINE=		DEBUG DOCS LONG_PCF_NAMES PNG \
+OPTIONS_DEFINE=		CONFIG DEBUG DOCS LONG_PCF_NAMES PNG \
 		TABLE_VALIDATION
 OPTIONS_GROUP=		SUBPIXEL_HINTING
 OPTIONS_GROUP_SUBPIXEL_HINTING=	V38 V40
@@ -45,14 +44,15 @@ OPTIONS_SINGLE=	RENDERING
 OPTIONS_SINGLE_RENDERING=	LCD_FILTERING LCD_RENDERING
 OPTIONS_RADIO=		SIZE_METRICS_CHOICE
 OPTIONS_RADIO_SIZE_METRICS_CHOICE=	FIX_SIZE_METRICS TT_SIZE_METRICS
-OPTIONS_DEFAULT=	LCD_RENDERING V40
+OPTIONS_DEFAULT=	CONFIG LCD_RENDERING V40
+OPTIONS_SUB=	yes
 
+CONFIG_DESC=	Install freetype-config
+CONFIG_CONFIGURE_ENABLE=freetype-config
 PNG_DESC=		Png compressed OpenType embedded bitmaps support
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_WITH=	png
 
-EXTRA_PATCHES=	${FILESDIR}/correct-flex-features.patch:-p1
-
 TABLE_VALIDATION_DESC=	TrueType GX/AAT and OpenType table validation
 
 SIZE_METRICS_CHOICE_DESC=	Size metrics for TrueType fonts
@@ -61,13 +61,13 @@ FIX_SIZE_METRICS_EXTRA_PATCHES=	${FILESDIR}/extra-patc
 TT_SIZE_METRICS_DESC=	TrueType-like size metrics for 'light' auto-hinting
 
 RENDERING_DESC=		Rendering technology
-LCD_FILTERING_DESC?=	Sub-pixel rendering (patented)
+LCD_FILTERING_DESC?=	Subpixel rendering (patented)
 LCD_FILTERING_CFLAGS=	-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
 LCD_RENDERING_DESC=	Harmony LCD rendering
 
 LONG_PCF_NAMES_DESC=	Enable long PCF family names
 
-SUBPIXEL_HINTING_DESC=	Sub-pixel hinting support
+SUBPIXEL_HINTING_DESC=	Subpixel 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)

Modified: head/print/freetype2/distinfo
==============================================================================
--- head/print/freetype2/distinfo	Wed May  2 23:30:09 2018	(r468891)
+++ head/print/freetype2/distinfo	Wed May  2 23:33:10 2018	(r468892)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522475028
-SHA256 (freetype-2.9.tar.bz2) = e6ffba3c8cef93f557d1f767d7bc3dee860ac7a3aaff588a521e081bc36f4c8a
-SIZE (freetype-2.9.tar.bz2) = 1915013
+TIMESTAMP = 1525210487
+SHA256 (freetype-2.9.1.tar.bz2) = db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d
+SIZE (freetype-2.9.1.tar.bz2) = 1926385

Modified: head/print/freetype2/pkg-plist
==============================================================================
--- head/print/freetype2/pkg-plist	Wed May  2 23:30:09 2018	(r468891)
+++ head/print/freetype2/pkg-plist	Wed May  2 23:33:10 2018	(r468892)
@@ -1,4 +1,4 @@
-bin/freetype-config
+%%CONFIG%%bin/freetype-config
 include/freetype2/freetype/config/ftconfig.h
 include/freetype2/freetype/config/ftheader.h
 include/freetype2/freetype/config/ftmodule.h
@@ -51,7 +51,7 @@ include/freetype2/ft2build.h
 lib/libfreetype.a
 lib/libfreetype.so
 lib/libfreetype.so.6
-lib/libfreetype.so.6.16.0
+lib/libfreetype.so.6.16.1
 libdata/pkgconfig/freetype2.pc
-man/man1/freetype-config.1.gz
+%%CONFIG%%man/man1/freetype-config.1.gz
 share/aclocal/freetype2.m4