4 files changed, 49 insertions, 32 deletions
diff --git a/fonts/harfbuzz/Makefile b/fonts/harfbuzz/Makefile
index 9c190640e20..a3902d6a620 100644
--- a/fonts/harfbuzz/Makefile
+++ b/fonts/harfbuzz/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.130 2020/06/29 13:44:02 nia Exp $
+# $NetBSD: Makefile,v 1.131 2020/08/08 19:11:13 nia Exp $
 
-DISTNAME=	harfbuzz-2.6.8
+DISTNAME=	harfbuzz-2.7.0
 CATEGORIES=	fonts
 MASTER_SITES=	${MASTER_SITE_GITHUB:=harfbuzz/}
-GITHUB_RELEASE=	${PKGVERSION_NOREV}
-EXTRACT_SUFX=	.tar.xz
+GITHUB_TAG=	${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://harfbuzz.github.io/
@@ -15,24 +14,28 @@ LICENSE=	mit
 GCC_REQD+=	4.9
 
 .include "../../mk/bsd.prefs.mk"
-PLIST_VARS+=		graphite2
 .include "../../graphics/librsvg/available.mk"
 
-USE_LANGUAGES=		c c++11
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake pkg-config
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-cairo=no
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	pkg-config
+
+# cairo/fontconfig are only needed for command line utilities
+MESON_ARGS+=	-Dcairo=disabled
+MESON_ARGS+=	-Dfontconfig=disabled
+
+MESON_ARGS+=	-Dintrospection=disabled
+
+PLIST_VARS+=		graphite2
 .if ${LIBRSVG_TYPE} == "rust"
-CONFIGURE_ARGS+=	--with-graphite2=yes
+MESON_ARGS+=		-Dgraphite=enabled
 PLIST.graphite2=	yes
 .else
-CONFIGURE_ARGS+=	--with-graphite2=no
+MESON_ARGS+=		-Dgraphite=disabled
 .endif
 
-PKGCONFIG_OVERRIDE+=	src/harfbuzz.pc.in
-PKGCONFIG_OVERRIDE+=	src/harfbuzz-icu.pc.in
-PKGCONFIG_OVERRIDE+=	src/harfbuzz-subset.pc.in
+PKGCONFIG_OVERRIDE+=	output/meson-private/*.pc
+
+PKGCONFIG_OVERRIDE_STAGE=	pre-install
 
 LDFLAGS.OpenBSD+=	-lz
 
@@ -46,7 +49,7 @@ PLIST_VARS+=	coretext
 .if ${OPSYS} == "Darwin"
 .  if !empty(OS_VERSION:M[0-8].*)
 # MacOS X < 10.5 does not have CoreText.
-CONFIGURE_ARGS+=	--with-coretext=no
+MESON_ARGS+=		-Dcoretext=disabled
 
 .  elif !empty(OS_VERSION:M9.*)
 # MacOS X 10.5 has CoreText but it's
@@ -54,17 +57,19 @@ CONFIGURE_ARGS+=	--with-coretext=no
 # trying to use a font which isn't installed into the system standard
 # path.
 # See http://forum.libcinder.org/topic/text-not-working-in-leopard-osx-10-5
-CONFIGURE_ARGS+=	--with-coretext=no
+MESON_ARGS+=		-Dcoretext=disabled
 
 .  else
-CONFIGURE_ARGS+=	--with-coretext=yes
+MESON_ARGS+=		-Dcoretext=enabled
 PLIST.coretext=		yes
 .  endif
 .endif
 
+PYTHON_FOR_BUILD_ONLY=	tool
+
+.include "../../devel/meson/build.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-#cairo is only needed for the hb-view command line utility
 #BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.8.0
 #.include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/fonts/harfbuzz/PLIST b/fonts/harfbuzz/PLIST
index 35534f13539..6962f7e8efc 100644
--- a/fonts/harfbuzz/PLIST
+++ b/fonts/harfbuzz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2020/06/29 13:44:02 nia Exp $
+@comment $NetBSD: PLIST,v 1.41 2020/08/08 19:11:13 nia Exp $
 bin/hb-ot-shape-closure
 bin/hb-shape
 bin/hb-subset
@@ -15,6 +15,9 @@ include/harfbuzz/hb-font.h
 include/harfbuzz/hb-ft.h
 include/harfbuzz/hb-glib.h
 ${PLIST.graphite2}include/harfbuzz/hb-graphite2.h
+include/harfbuzz/hb-gobject-enums.h
+include/harfbuzz/hb-gobject-structs.h
+include/harfbuzz/hb-gobject.h
 ${PLIST.icu}include/harfbuzz/hb-icu.h
 include/harfbuzz/hb-map.h
 include/harfbuzz/hb-ot-color.h
@@ -37,9 +40,19 @@ include/harfbuzz/hb-unicode.h
 include/harfbuzz/hb-version.h
 include/harfbuzz/hb.h
 lib/cmake/harfbuzz/harfbuzz-config.cmake
-${PLIST.icu}lib/libharfbuzz-icu.la
-lib/libharfbuzz-subset.la
-lib/libharfbuzz.la
+lib/libharfbuzz-gobject.so
+lib/libharfbuzz-gobject.so.0
+lib/libharfbuzz-gobject.so.0.20700.0
+${PLIST.icu}lib/libharfbuzz-icu.so
+${PLIST.icu}lib/libharfbuzz-icu.so.0
+${PLIST.icu}lib/libharfbuzz-icu.so.0.20700.0
+lib/libharfbuzz-subset.so
+lib/libharfbuzz-subset.so.0
+lib/libharfbuzz-subset.so.0.20700.0
+lib/libharfbuzz.so
+lib/libharfbuzz.so.0
+lib/libharfbuzz.so.0.20700.0
+lib/pkgconfig/harfbuzz-gobject.pc
 ${PLIST.icu}lib/pkgconfig/harfbuzz-icu.pc
 lib/pkgconfig/harfbuzz-subset.pc
 lib/pkgconfig/harfbuzz.pc
diff --git a/fonts/harfbuzz/distinfo b/fonts/harfbuzz/distinfo
index 16900b19f55..b0b26bae5fa 100644
--- a/fonts/harfbuzz/distinfo
+++ b/fonts/harfbuzz/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.97 2020/06/29 13:44:02 nia Exp $
+$NetBSD: distinfo,v 1.98 2020/08/08 19:11:13 nia Exp $
 
-SHA1 (harfbuzz-2.6.8.tar.xz) = 22f3b273b8db325d1638417a9f3359fc652bea30
-RMD160 (harfbuzz-2.6.8.tar.xz) = 096f89bbe8a49e4351845a198a93f831d4d1fdcc
-SHA512 (harfbuzz-2.6.8.tar.xz) = 651b23d7d4fab6fef472ee57db39bbaebc31c2f40ea3a482c1499ad1a7b549b86a2bccbe9da191c8e9ecdf464191dd3c9a7485546b51695ad8ab3c0329732d9d
-Size (harfbuzz-2.6.8.tar.xz) = 8976516 bytes
+SHA1 (harfbuzz-2.7.0.tar.gz) = 499274420870cb3147f2758adafe4ef61f91f7eb
+RMD160 (harfbuzz-2.7.0.tar.gz) = 32d29e63b5af3c53674b6e66792e39a3152e13fb
+SHA512 (harfbuzz-2.7.0.tar.gz) = 65d5b9bd3a53be659dd7d220da220f6873f7246c2ab11205132998e4ac4245fcf51b6968e705b81cc7652db5bbacc90c8db977cf1020edf7957a626a19e055c0
+Size (harfbuzz-2.7.0.tar.gz) = 16278518 bytes
diff --git a/fonts/harfbuzz/options.mk b/fonts/harfbuzz/options.mk
index 492a127b85d..acd9d9066d2 100644
--- a/fonts/harfbuzz/options.mk
+++ b/fonts/harfbuzz/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2018/11/23 09:50:55 abs Exp $
+# $NetBSD: options.mk,v 1.5 2020/08/08 19:11:13 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.harfbuzz
 PKG_SUPPORTED_OPTIONS+=	icu
@@ -10,8 +10,7 @@ PLIST_VARS+=		icu
 
 .if !empty(PKG_OPTIONS:Micu)
 .include "../../textproc/icu/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-icu=yes
-PLIST.icu=		yes
+MESON_ARGS+=	-Dicu=enabled
 .else
-CONFIGURE_ARGS+=	--with-icu=no
+MESON_ARGS+=	-Dicu=disabled
 .endif