Updated harfbuzz to 1.4.2.

Enable graphite2 dependency, as libreoffice seems to want it.

Overview of changes leading to 1.4.2
Monday, January 23, 2017
====================================

- Implement OpenType Font Variation tables avar/fvar/HVAR/VVAR.
- hb-shape and hb-view now accept --variations.
- New API:

hb_variation_t
hb_variation_from_string()
hb_variation_to_string()

hb_font_set_variations()
hb_font_set_var_coords_design()
hb_font_get_var_coords_normalized()

hb-ot-var.h:
hb_ot_var_axis_t
hb_ot_var_has_data()
hb_ot_var_get_axis_count()
hb_ot_var_get_axes()
hb_ot_var_find_axis()
hb_ot_var_normalize_variations()
hb_ot_var_normalize_coords()

- MVAR to be implemented later.  Access to named instances to be
  implemented later as well.

- Misc fixes.

4 files changed, 16 insertions, 11 deletions

diff --git a/fonts/harfbuzz/Makefile b/fonts/harfbuzz/Makefile
index 759a94ab6ba..a628842b967 100644
--- a/fonts/harfbuzz/Makefile
+++ b/fonts/harfbuzz/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.75 2017/01/16 11:10:44 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2017/02/06 12:45:09 wiz Exp $
 
-DISTNAME=	harfbuzz-1.4.1
+DISTNAME=	harfbuzz-1.4.2
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/
 EXTRACT_SUFX=	.tar.bz2
@@ -15,6 +15,7 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-cairo=no
+CONFIGURE_ARGS+=	--with-graphite2=yes
 
 PKGCONFIG_OVERRIDE+=	src/harfbuzz.pc.in
 PKGCONFIG_OVERRIDE+=	src/harfbuzz-icu.pc.in
@@ -55,4 +56,5 @@ PLIST.coretext=		yes
 #BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.8.0
 #.include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/graphite2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/harfbuzz/PLIST b/fonts/harfbuzz/PLIST
index 55923614860..039eb58ab8f 100644
--- a/fonts/harfbuzz/PLIST
+++ b/fonts/harfbuzz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2016/10/31 16:15:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.19 2017/02/06 12:45:09 wiz Exp $
 bin/hb-ot-shape-closure
 bin/hb-shape
 include/harfbuzz/hb-blob.h
@@ -10,12 +10,14 @@ include/harfbuzz/hb-face.h
 include/harfbuzz/hb-font.h
 include/harfbuzz/hb-ft.h
 include/harfbuzz/hb-glib.h
+include/harfbuzz/hb-graphite2.h
 ${PLIST.icu}include/harfbuzz/hb-icu.h
 include/harfbuzz/hb-ot-font.h
 include/harfbuzz/hb-ot-layout.h
 include/harfbuzz/hb-ot-math.h
 include/harfbuzz/hb-ot-shape.h
 include/harfbuzz/hb-ot-tag.h
+include/harfbuzz/hb-ot-var.h
 include/harfbuzz/hb-ot.h
 include/harfbuzz/hb-set.h
 include/harfbuzz/hb-shape-plan.h
@@ -50,7 +52,7 @@ share/gtk-doc/html/harfbuzz/api-index-1-0-5.html
 share/gtk-doc/html/harfbuzz/api-index-1-1-2.html
 share/gtk-doc/html/harfbuzz/api-index-1-1-3.html
 share/gtk-doc/html/harfbuzz/api-index-1-2-3.html
-share/gtk-doc/html/harfbuzz/api-index-1-4-0.html
+share/gtk-doc/html/harfbuzz/api-index-1-3-3.html
 share/gtk-doc/html/harfbuzz/api-index-full.html
 share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html
 share/gtk-doc/html/harfbuzz/building.html
diff --git a/fonts/harfbuzz/buildlink3.mk b/fonts/harfbuzz/buildlink3.mk
index 5c411098755..169ead2709c 100644
--- a/fonts/harfbuzz/buildlink3.mk
+++ b/fonts/harfbuzz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2013/08/31 22:20:24 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2017/02/06 12:45:09 wiz Exp $
 
 BUILDLINK_TREE+=	harfbuzz
 
@@ -6,11 +6,12 @@ BUILDLINK_TREE+=	harfbuzz
 HARFBUZZ_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.harfbuzz+=	harfbuzz>=0.9.4
-BUILDLINK_ABI_DEPENDS.harfbuzz+=	harfbuzz>=0.9.17nb2
+BUILDLINK_ABI_DEPENDS.harfbuzz+=	harfbuzz>=1.4.2
 BUILDLINK_PKGSRCDIR.harfbuzz?=		../../fonts/harfbuzz
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/graphite2/buildlink3.mk"
 .endif	# HARFBUZZ_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-harfbuzz
diff --git a/fonts/harfbuzz/distinfo b/fonts/harfbuzz/distinfo
index f3deb887f66..a1c77e11c70 100644
--- a/fonts/harfbuzz/distinfo
+++ b/fonts/harfbuzz/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.62 2017/01/16 11:10:44 wiz Exp $
+$NetBSD: distinfo,v 1.63 2017/02/06 12:45:09 wiz Exp $
 
-SHA1 (harfbuzz-1.4.1.tar.bz2) = aa0f33e41ab69b9004dfbcaa670004b3f4b698de
-RMD160 (harfbuzz-1.4.1.tar.bz2) = 68b2d8c164f7b9a85a4c2f44c02dd52fd2099d31
-SHA512 (harfbuzz-1.4.1.tar.bz2) = f6cafe060e6dad6878b98472be79036ddda86c5ed8e13470f7d53429e584c9e74fe69c46ed5ea2a3f5315dec2fc7669b5437a02a884e8e766cee57fe26a4608b
-Size (harfbuzz-1.4.1.tar.bz2) = 1434585 bytes
+SHA1 (harfbuzz-1.4.2.tar.bz2) = 6f3702cd61ae5b924418ba2aa76c6ecdff92bb47
+RMD160 (harfbuzz-1.4.2.tar.bz2) = 8828945313368c77eac7109d38b2844fcaf65ea5
+SHA512 (harfbuzz-1.4.2.tar.bz2) = 80c06e17f7e2ca4ac847c77489f02b3b6f7bf6fde54194c5d4a47e893db7d1e75bfb0350ce50829c6ae0520202e35ad1711110c09c8d2a9497c0622f000f3357
+Size (harfbuzz-1.4.2.tar.bz2) = 1446752 bytes