clutter: Remove introspection option.

https://marc.info/?l=pkgsrc-users&m=165444158600671&w=2

4 files changed, 19 insertions, 24 deletions

diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index 9354161a815..9dc489e573a 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2021/12/08 16:02:08 adam Exp $
+# $NetBSD: Makefile,v 1.68 2022/06/28 10:43:11 nia Exp $
 
 DISTNAME=	clutter-1.26.2
 PKGREVISION=	8
@@ -24,6 +24,8 @@ PKGCONFIG_OVERRIDE+=	clutter/clutter.pc.in
 # until this can be detected properly via various PKG_OPTIONS.
 CONFIGURE_ARGS+=	--disable-egl-backend
 
+CONFIGURE_ARGS+=	--enable-introspection=yes
+
 .include "options.mk"
 
 TEST_TARGET=	check
@@ -40,6 +42,9 @@ BUILDLINK_API_DEPENDS.atk+=	atk>=2.5.3
 .include "../../devel/atk/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.39.0
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.9.5
+BUILDLINK_DEPMETHOD.gobject-introspection+=	build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pango+=	pango>=1.30.0
 .include "../../devel/pango/buildlink3.mk"
 BUILDLINK_API_DEPENDS.cairo-gobject+=	cairo-gobject>=1.14.0
diff --git a/graphics/clutter/PLIST b/graphics/clutter/PLIST
index 567972e6b5d..ef6e891158a 100644
--- a/graphics/clutter/PLIST
+++ b/graphics/clutter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2018/05/31 14:53:00 youri Exp $
+@comment $NetBSD: PLIST,v 1.14 2022/06/28 10:43:11 nia Exp $
 include/clutter-1.0/cally/cally-actor.h
 include/clutter-1.0/cally/cally-clone.h
 include/clutter-1.0/cally/cally-factory.h
@@ -137,9 +137,9 @@ ${PLIST.x11}include/clutter-1.0/clutter/glx/clutter-glx.h
 ${PLIST.osx}include/clutter-1.0/clutter/osx/clutter-osx.h
 ${PLIST.x11}include/clutter-1.0/clutter/x11/clutter-x11-texture-pixmap.h
 ${PLIST.x11}include/clutter-1.0/clutter/x11/clutter-x11.h
-${PLIST.introspection}lib/girepository-1.0/Cally-1.0.typelib
-${PLIST.introspection}lib/girepository-1.0/Clutter-1.0.typelib
-${PLIST.x11}${PLIST.introspection}lib/girepository-1.0/ClutterX11-1.0.typelib
+lib/girepository-1.0/Cally-1.0.typelib
+lib/girepository-1.0/Clutter-1.0.typelib
+${PLIST.x11}lib/girepository-1.0/ClutterX11-1.0.typelib
 lib/libclutter-1.0.la
 ${PLIST.x11}lib/libclutter-glx-1.0.so
 ${PLIST.x11}lib/libclutter-glx-1.0.so.0
@@ -149,9 +149,9 @@ lib/pkgconfig/clutter-cogl-1.0.pc
 ${PLIST.x11}lib/pkgconfig/clutter-glx-1.0.pc
 ${PLIST.osx}lib/pkgconfig/clutter-osx-1.0.pc
 ${PLIST.x11}lib/pkgconfig/clutter-x11-1.0.pc
-${PLIST.introspection}share/gir-1.0/Cally-1.0.gir
-${PLIST.introspection}share/gir-1.0/Clutter-1.0.gir
-${PLIST.x11}${PLIST.introspection}share/gir-1.0/ClutterX11-1.0.gir
+share/gir-1.0/Cally-1.0.gir
+share/gir-1.0/Clutter-1.0.gir
+${PLIST.x11}share/gir-1.0/ClutterX11-1.0.gir
 share/gtk-doc/html/clutter/CallyActor.html
 share/gtk-doc/html/clutter/CallyClone.html
 share/gtk-doc/html/clutter/CallyGroup.html
diff --git a/graphics/clutter/buildlink3.mk b/graphics/clutter/buildlink3.mk
index fec3e56d96c..87f744729dc 100644
--- a/graphics/clutter/buildlink3.mk
+++ b/graphics/clutter/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.46 2021/12/08 16:02:08 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.47 2022/06/28 10:43:11 nia Exp $
 #
 
 BUILDLINK_TREE+=	clutter
@@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.clutter?=	../../graphics/clutter
 pkgbase := clutter
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.clutter:Mx11)
+.if ${PKG_BUILD_OPTIONS.clutter:Mx11}
 BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=7.0
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/graphics/clutter/options.mk b/graphics/clutter/options.mk
index 03bad9eb6b3..d2edcfcfc6a 100644
--- a/graphics/clutter/options.mk
+++ b/graphics/clutter/options.mk
@@ -1,23 +1,13 @@
-# $NetBSD: options.mk,v 1.10 2016/02/25 13:37:47 jperkin Exp $
+# $NetBSD: options.mk,v 1.11 2022/06/28 10:43:11 nia Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.clutter
-PKG_SUPPORTED_OPTIONS=	introspection x11
-PKG_SUGGESTED_OPTIONS=	introspection x11
+PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	x11
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	introspection x11 osx
-
-.if !empty(PKG_OPTIONS:Mintrospection)
-PLIST.introspection=	yes
-BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.9.5
-BUILDLINK_DEPMETHOD.gobject-introspection+=	build
-.include "../../devel/gobject-introspection/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-introspection=yes
-.else
-CONFIGURE_ARGS+=	--enable-introspection=no
-.endif
+PLIST_VARS+=	x11 osx
 
 .if ${OPSYS} == "Darwin"
 PLIST.osx=		yes