5 files changed, 39 insertions, 16 deletions

diff --git a/print/harfbuzz-icu/pkg-plist b/print/harfbuzz-icu/pkg-plist
index 51bd496b6107..639ff1f38a9c 100644
--- a/print/harfbuzz-icu/pkg-plist
+++ b/print/harfbuzz-icu/pkg-plist
@@ -16,20 +16,17 @@
 @comment include/harfbuzz/hb-graphite2.h
 @comment include/harfbuzz/hb-map.h
 include/harfbuzz/hb-icu.h
+@comment include/harfbuzz/hb-ot-color.h
 @comment include/harfbuzz/hb-ot-font.h
 @comment include/harfbuzz/hb-ot-layout.h
 @comment include/harfbuzz/hb-ot-math.h
 @comment include/harfbuzz/hb-ot-name.h
 @comment include/harfbuzz/hb-ot-shape.h
-@comment include/harfbuzz/hb-ot-tag.h
 @comment include/harfbuzz/hb-ot-var.h
 @comment include/harfbuzz/hb-ot.h
 @comment include/harfbuzz/hb-set.h
 @comment include/harfbuzz/hb-shape-plan.h
 @comment include/harfbuzz/hb-shape.h
-@comment include/harfbuzz/hb-subset-glyf.hh
-@comment include/harfbuzz/hb-subset-plan.hh
-@comment include/harfbuzz/hb-subset-private.hh
 @comment include/harfbuzz/hb-subset.h
 @comment include/harfbuzz/hb-unicode.h
 @comment include/harfbuzz/hb-version.h
diff --git a/print/harfbuzz/Makefile b/print/harfbuzz/Makefile
index 2fe812b7b719..0e00830dc4ff 100644
--- a/print/harfbuzz/Makefile
+++ b/print/harfbuzz/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	harfbuzz
-PORTVERSION=	2.0.2
+PORTVERSION=	2.1.0
 PORTREVISION?=	0
 CATEGORIES=	print
 MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/
@@ -22,7 +22,7 @@ CONFIGURE_ARGS=	--with-graphite2 --with-gobject=yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
-PLIST_SUB+=	LIBVER=0.20000.2
+PLIST_SUB+=	LIBVER=0.20100.0
 
 HARFBUZZ_SLAVE?=	no
 
diff --git a/print/harfbuzz/distinfo b/print/harfbuzz/distinfo
index 8d1e58378b3b..9c05837e8ffe 100644
--- a/print/harfbuzz/distinfo
+++ b/print/harfbuzz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1540066156
-SHA256 (harfbuzz-2.0.2.tar.bz2) = f6de6c9dc89a56909227ac3e3dc9b18924a0837936ffd9633d13e981bcbd96e0
-SIZE (harfbuzz-2.0.2.tar.bz2) = 4322171
+TIMESTAMP = 1540939334
+SHA256 (harfbuzz-2.1.0.tar.bz2) = 8e5b496ec7328d700ff340e4c44dfbd1dfa8159cd11df2876417496e4efd12f9
+SIZE (harfbuzz-2.1.0.tar.bz2) = 4375308
diff --git a/print/harfbuzz/files/patch-src_test-ot-color.cc b/print/harfbuzz/files/patch-src_test-ot-color.cc
new file mode 100644
index 000000000000..1cc6610a5daf
--- /dev/null
+++ b/print/harfbuzz/files/patch-src_test-ot-color.cc
@@ -0,0 +1,15 @@
+Drop once FreeBSD 10.* is EOL as USE_GCC defaultso to >= 6 since 2017-09-10.
+
+https://github.com/harfbuzz/harfbuzz/issues/1338
+
+--- src/test-ot-color.cc.orig	2018-10-30 05:40:14 UTC
++++ src/test-ot-color.cc
+@@ -23,7 +23,7 @@
+  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+  */
+ 
+-#include "hb.h"
++#include "hb.hh"
+ #include "hb-ot.h"
+ 
+ #include "hb-ft.h"
diff --git a/print/harfbuzz/pkg-plist b/print/harfbuzz/pkg-plist
index 7c819568e6d6..d2ca5b9de85c 100644
--- a/print/harfbuzz/pkg-plist
+++ b/print/harfbuzz/pkg-plist
@@ -15,12 +15,12 @@ include/harfbuzz/hb-gobject-structs.h
 include/harfbuzz/hb-gobject.h
 include/harfbuzz/hb-graphite2.h
 include/harfbuzz/hb-map.h
+include/harfbuzz/hb-ot-color.h
 include/harfbuzz/hb-ot-font.h
 include/harfbuzz/hb-ot-layout.h
 include/harfbuzz/hb-ot-math.h
 include/harfbuzz/hb-ot-name.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
@@ -70,21 +70,31 @@ 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-3-3.html
+share/gtk-doc/html/harfbuzz/api-index-1-4-0.html
 share/gtk-doc/html/harfbuzz/api-index-1-4-2.html
 share/gtk-doc/html/harfbuzz/api-index-1-4-3.html
 share/gtk-doc/html/harfbuzz/api-index-1-5-0.html
 share/gtk-doc/html/harfbuzz/api-index-1-6-0.html
+share/gtk-doc/html/harfbuzz/api-index-1-7-5.html
+share/gtk-doc/html/harfbuzz/api-index-1-7-7.html
+share/gtk-doc/html/harfbuzz/api-index-1-8-0.html
+share/gtk-doc/html/harfbuzz/api-index-1-8-1.html
+share/gtk-doc/html/harfbuzz/api-index-1-8-5.html
+share/gtk-doc/html/harfbuzz/api-index-1-8-6.html
+share/gtk-doc/html/harfbuzz/api-index-1-9-0.html
+share/gtk-doc/html/harfbuzz/api-index-2-0-0.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
 share/gtk-doc/html/harfbuzz/ch08.html
+share/gtk-doc/html/harfbuzz/ch09.html
+share/gtk-doc/html/harfbuzz/ch10.html
 share/gtk-doc/html/harfbuzz/clusters.html
 share/gtk-doc/html/harfbuzz/customizing-unicode-functions.html
 share/gtk-doc/html/harfbuzz/deprecated-api-index.html
 share/gtk-doc/html/harfbuzz/fonts-and-faces.html
-share/gtk-doc/html/harfbuzz/harfbuzz-Buffers.html
-share/gtk-doc/html/harfbuzz/harfbuzz-Shaping.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-blob.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-buffer.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-common.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-coretext.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-deprecated.html
@@ -95,18 +105,20 @@ share/gtk-doc/html/harfbuzz/harfbuzz-hb-glib.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-gobject.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-graphite2.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-icu.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-map.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-color.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-font.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-layout.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-math.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-name.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-shape.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-tag.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-var.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-set.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape-plan.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-unicode.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-uniscribe.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-version.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb.html
 share/gtk-doc/html/harfbuzz/harfbuzz.devhelp2
 share/gtk-doc/html/harfbuzz/hello-harfbuzz.html
 share/gtk-doc/html/harfbuzz/home.png
@@ -115,7 +127,6 @@ share/gtk-doc/html/harfbuzz/install-harfbuzz.html
 share/gtk-doc/html/harfbuzz/left-insensitive.png
 share/gtk-doc/html/harfbuzz/left.png
 share/gtk-doc/html/harfbuzz/level-2.html
-share/gtk-doc/html/harfbuzz/object-tree.html
 share/gtk-doc/html/harfbuzz/plans-and-caching.html
 share/gtk-doc/html/harfbuzz/pt01.html
 share/gtk-doc/html/harfbuzz/pt02.html