harfbuzz: remove introspection option

Addresses PR 56755.

Bump PKGREVISION.

4 files changed, 13 insertions, 20 deletions

diff --git a/fonts/harfbuzz/Makefile b/fonts/harfbuzz/Makefile
index 9e7dddef592..39ba289c889 100644
--- a/fonts/harfbuzz/Makefile
+++ b/fonts/harfbuzz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.141 2022/06/04 13:49:15 wiz Exp $
+# $NetBSD: Makefile,v 1.142 2022/06/07 16:47:33 wiz Exp $
 
 .include "Makefile.common"
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT=	OpenType text shaping engine
 
diff --git a/fonts/harfbuzz/Makefile.common b/fonts/harfbuzz/Makefile.common
index f4c5aabe915..2651ec88390 100644
--- a/fonts/harfbuzz/Makefile.common
+++ b/fonts/harfbuzz/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2022/06/04 13:49:15 wiz Exp $
+# $NetBSD: Makefile.common,v 1.21 2022/06/07 16:47:33 wiz Exp $
 # used by fonts/harfbuzz-icu/Makefile
 
 DISTNAME=	harfbuzz-4.3.0
@@ -27,7 +27,7 @@ USE_TOOLS+=	pkg-config
 
 # cairo/fontconfig are only needed for command line utilities
 MESON_ARGS+=	-Dcairo=disabled
-MESON_ARGS+=	-Dintrospection=disabled
+MESON_ARGS+=	-Dintrospection=enabled
 MESON_ARGS+=	-Dbenchmark=disabled
 
 PLIST_VARS+=		graphite2
@@ -77,6 +77,8 @@ PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../devel/meson/build.mk"
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_DEPMETHOD.gobject-introspection+=	build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 #BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.8.0
 #.include "../../graphics/cairo/buildlink3.mk"
diff --git a/fonts/harfbuzz/PLIST b/fonts/harfbuzz/PLIST
index 20e310d7591..90e402aaf2d 100644
--- a/fonts/harfbuzz/PLIST
+++ b/fonts/harfbuzz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.61 2022/06/04 13:49:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.62 2022/06/07 16:47:33 wiz Exp $
 bin/hb-ot-shape-closure
 bin/hb-shape
 bin/hb-subset
@@ -40,7 +40,7 @@ include/harfbuzz/hb-unicode.h
 include/harfbuzz/hb-version.h
 include/harfbuzz/hb.h
 lib/cmake/harfbuzz/harfbuzz-config.cmake
-${PLIST.introspection}lib/girepository-1.0/HarfBuzz-0.0.typelib
+lib/girepository-1.0/HarfBuzz-0.0.typelib
 lib/libharfbuzz-gobject.so
 lib/libharfbuzz-gobject.so.0
 lib/libharfbuzz-gobject.so.0.${SOVER}.0
@@ -53,7 +53,7 @@ lib/libharfbuzz.so.0.${SOVER}.0
 lib/pkgconfig/harfbuzz-gobject.pc
 lib/pkgconfig/harfbuzz-subset.pc
 lib/pkgconfig/harfbuzz.pc
-${PLIST.introspection}share/gir-1.0/HarfBuzz-0.0.gir
+share/gir-1.0/HarfBuzz-0.0.gir
 ${PLIST.doc}share/gtk-doc/html/harfbuzz/HarfBuzz.png
 ${PLIST.doc}share/gtk-doc/html/harfbuzz/HarfBuzz.svg
 ${PLIST.doc}share/gtk-doc/html/harfbuzz/a-clustering-example-for-levels-0-and-1.html
diff --git a/fonts/harfbuzz/options.mk b/fonts/harfbuzz/options.mk
index fec4807fd8c..d560197b11d 100644
--- a/fonts/harfbuzz/options.mk
+++ b/fonts/harfbuzz/options.mk
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.11 2022/06/04 13:49:15 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2022/06/07 16:47:33 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.harfbuzz
-PKG_SUPPORTED_OPTIONS+=	doc introspection
-PKG_SUGGESTED_OPTIONS=	doc introspection
+PKG_SUPPORTED_OPTIONS+=	doc
+PKG_SUGGESTED_OPTIONS=	doc
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		doc introspection
+PLIST_VARS+=		doc
 
 .if !empty(PKG_OPTIONS:Mdoc)
 MESON_ARGS+=	-Ddocs=enabled
@@ -16,12 +16,3 @@ PLIST.doc=	yes
 .else
 MESON_ARGS+=	-Ddocs=disabled
 .endif
-
-.if !empty(PKG_OPTIONS:Mintrospection)
-BUILDLINK_DEPMETHOD.gobject-introspection+=	build
-.include "../../devel/gobject-introspection/buildlink3.mk"
-MESON_ARGS+=	-Dintrospection=enabled
-PLIST.introspection=	yes
-.else
-MESON_ARGS+=	-Dintrospection=disabled
-.endif