mate-panel: Remove introspection option.

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

3 files changed, 6 insertions, 24 deletions

diff --git a/x11/mate-panel/Makefile b/x11/mate-panel/Makefile
index e1a3e8923f2..75bf067ece6 100644
--- a/x11/mate-panel/Makefile
+++ b/x11/mate-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2022/04/18 19:12:24 adam Exp $
+# $NetBSD: Makefile,v 1.44 2022/06/28 11:38:05 nia Exp $
 
 PKGREVISION= 2
 .include "../../meta-pkgs/mate/Makefile.common"
@@ -13,8 +13,7 @@ TOOL_DEPENDS+=		libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
 PKGCONFIG_OVERRIDE+=	libmate-panel-applet/libmatepanelapplet-4.0.pc.in
 
 CONFIGURE_ARGS+=	--with-in-process-applets=all
-
-.include "options.mk"
+CONFIGURE_ARGS+=	--enable-introspection
 
 .include "../../devel/glib2/schemas.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
@@ -24,6 +23,7 @@ CONFIGURE_ARGS+=	--with-in-process-applets=all
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../devel/dconf/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
 # The PLIST generated by this package varies, depending on the version
 # of libwnck3 it's built against. Newer versions of libwnck3 offer
 # window previewing functionality that mate-panel conditionally detects
diff --git a/x11/mate-panel/PLIST b/x11/mate-panel/PLIST
index 3e85d59827a..7beb9b38a78 100644
--- a/x11/mate-panel/PLIST
+++ b/x11/mate-panel/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.10 2021/05/04 00:25:35 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.11 2022/06/28 11:38:05 nia Exp $
 bin/mate-desktop-item-edit
 bin/mate-panel
 bin/mate-panel-test-applets
 include/mate-panel-4.0/libmate-panel-applet/mate-panel-applet-enums.h
 include/mate-panel-4.0/libmate-panel-applet/mate-panel-applet-gsettings.h
 include/mate-panel-4.0/libmate-panel-applet/mate-panel-applet.h
-${PLIST.introspection}lib/girepository-1.0/MatePanelApplet-4.0.typelib
+lib/girepository-1.0/MatePanelApplet-4.0.typelib
 lib/libmate-panel-applet-4.la
 lib/mate-panel/libclock-applet.la
 lib/mate-panel/libfish-applet.la
@@ -16,7 +16,7 @@ man/man1/mate-desktop-item-edit.1
 man/man1/mate-panel-test-applets.1
 man/man1/mate-panel.1
 share/applications/mate-panel.desktop
-${PLIST.introspection}share/gir-1.0/MatePanelApplet-4.0.gir
+share/gir-1.0/MatePanelApplet-4.0.gir
 share/glib-2.0/schemas/org.mate.panel.applet.clock.gschema.xml
 share/glib-2.0/schemas/org.mate.panel.applet.fish.gschema.xml
 share/glib-2.0/schemas/org.mate.panel.applet.notification-area.gschema.xml
diff --git a/x11/mate-panel/options.mk b/x11/mate-panel/options.mk
deleted file mode 100644
index ff4a0eefd1a..00000000000
--- a/x11/mate-panel/options.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2016/06/18 09:05:02 youri Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.mate-panel
-PKG_SUPPORTED_OPTIONS=	introspection
-PKG_SUGGESTED_OPTIONS=
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=	introspection
-
-.if !empty(PKG_OPTIONS:Mintrospection)
-BUILDLINK_DEPMETHOD.gobject-introspection+=	build
-.include "../../devel/gobject-introspection/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-introspection
-PLIST.introspection=	yes
-.else
-CONFIGURE_ARGS+=	--disable-introspection
-.endif