pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri May 15 17:01:08 UTC 2026

Modified Files:
        pkgsrc/archivers/gnome-autoar: Makefile
        pkgsrc/audio/gsound: Makefile
        pkgsrc/chat/libfolks: Makefile
        pkgsrc/chat/telepathy-glib: Makefile
        pkgsrc/converters/libkkc: Makefile
        pkgsrc/databases/gom: Makefile
        pkgsrc/devel: Makefile
        pkgsrc/devel/amtk: Makefile
        pkgsrc/devel/appstream: Makefile
        pkgsrc/devel/appstream-glib: Makefile
        pkgsrc/devel/at-spi2-core: options.mk
        pkgsrc/devel/devhelp: Makefile
        pkgsrc/devel/glade: Makefile
        pkgsrc/devel/glib2: Makefile.common
        pkgsrc/devel/gobject-introspection: Makefile PLIST
        pkgsrc/devel/libadapta: Makefile
        pkgsrc/devel/libadwaita: Makefile
        pkgsrc/devel/libdazzle: Makefile
        pkgsrc/devel/libdbusmenu-glib: Makefile
        pkgsrc/devel/libdbusmenu-gtk3: Makefile
        pkgsrc/devel/libgee: Makefile
        pkgsrc/devel/libgee0.6: Makefile
        pkgsrc/devel/libgudev: options.mk
        pkgsrc/devel/libgusb: Makefile
        pkgsrc/devel/libgweather: Makefile
        pkgsrc/devel/libhandy: Makefile
        pkgsrc/devel/libpeas: Makefile buildlink3.mk
        pkgsrc/devel/libwnck3: Makefile
        pkgsrc/devel/nss: Makefile PLIST distinfo
        pkgsrc/devel/pango: options.mk
        pkgsrc/devel/py-gobject3: Makefile
        pkgsrc/editors/gedit: Makefile
        pkgsrc/editors/pluma: Makefile
        pkgsrc/fonts/gucharmap: Makefile
        pkgsrc/fonts/harfbuzz: options.mk
        pkgsrc/geography/geoclue: Makefile
        pkgsrc/geography/geocode-glib: Makefile
        pkgsrc/geography/libchamplain012: Makefile
        pkgsrc/geography/libmemphis02: Makefile
        pkgsrc/geography/osm-gps-map: Makefile
        pkgsrc/graphics/clutter: Makefile
        pkgsrc/graphics/clutter-gtk: Makefile
        pkgsrc/graphics/cogl: Makefile
        pkgsrc/graphics/colord: options.mk
        pkgsrc/graphics/colord-gtk: Makefile options.mk
        pkgsrc/graphics/eog: Makefile
        pkgsrc/graphics/eom: Makefile
        pkgsrc/graphics/gdk-pixbuf2: options.mk
        pkgsrc/graphics/gegl: Makefile
        pkgsrc/graphics/gexiv2: Makefile
        pkgsrc/graphics/goocanvas2: Makefile
        pkgsrc/graphics/graphene: Makefile
        pkgsrc/graphics/librsvg: Makefile
        pkgsrc/graphics/librsvg-c: Makefile
        pkgsrc/inputmethod/fcitx: Makefile
        pkgsrc/inputmethod/fcitx5-gtk: Makefile
        pkgsrc/inputmethod/ibus: Makefile
        pkgsrc/inputmethod/ibus-anthy: Makefile
        pkgsrc/inputmethod/input-pad: options.mk
        pkgsrc/inputmethod/libskk: Makefile
        pkgsrc/math/gnome-calculator: Makefile
        pkgsrc/multimedia/clutter-gst: Makefile
        pkgsrc/multimedia/gst-plugins1-bad: Makefile
        pkgsrc/multimedia/gst-plugins1-base: Makefile
        pkgsrc/multimedia/gst-plugins1-editing-services: Makefile
        pkgsrc/multimedia/gstreamer1: Makefile
        pkgsrc/multimedia/totem-pl-parser: Makefile
        pkgsrc/net/gnome-online-accounts: Makefile
        pkgsrc/net/grilo: Makefile
        pkgsrc/net/gssdp: Makefile
        pkgsrc/net/gst-rtsp-server: Makefile
        pkgsrc/net/gtk-vnc: Makefile
        pkgsrc/net/gupnp: Makefile
        pkgsrc/net/gupnp-av: Makefile
        pkgsrc/net/gupnp-dlna: Makefile
        pkgsrc/net/gupnp-igd: Makefile
        pkgsrc/net/libgdata: Makefile
        pkgsrc/net/libnice: Makefile
        pkgsrc/net/libsoup: Makefile
        pkgsrc/net/libsoup3: Makefile
        pkgsrc/print/evince: Makefile
        pkgsrc/print/poppler: Makefile
        pkgsrc/security/gcr: Makefile buildlink3.mk
        pkgsrc/security/gcr4: Makefile buildlink3.mk options.mk
        pkgsrc/security/libsecret: Makefile
        pkgsrc/security/polkit: Makefile
        pkgsrc/sysutils/accountsservice: Makefile buildlink3.mk
        pkgsrc/sysutils/ayatana-ido: Makefile
        pkgsrc/sysutils/brasero: Makefile
        pkgsrc/sysutils/caja-dropbox: Makefile
        pkgsrc/sysutils/gnome-tracker: Makefile
        pkgsrc/sysutils/gvfs: Makefile
        pkgsrc/sysutils/libnotify: Makefile
        pkgsrc/sysutils/lxpanel: Makefile
        pkgsrc/sysutils/spice-gtk: Makefile
        pkgsrc/sysutils/upower: options.mk
        pkgsrc/sysutils/xfce4-thunar: Makefile
        pkgsrc/textproc/gspell: Makefile
        pkgsrc/textproc/json-glib: Makefile
        pkgsrc/textproc/libxmlb: Makefile
        pkgsrc/time/gnome-pomodoro: Makefile
        pkgsrc/time/libical4: Makefile
        pkgsrc/wayland/gtk-layer-shell: Makefile
        pkgsrc/wayland/gtk4-layer-shell: Makefile
        pkgsrc/wm/mutter: Makefile
        pkgsrc/www/libproxy: Makefile
        pkgsrc/www/librest: Makefile
        pkgsrc/www/liferea: Makefile
        pkgsrc/www/midori: Makefile
        pkgsrc/www/uhttpmock: Makefile
        pkgsrc/www/webkit-gtk: Makefile
        pkgsrc/x11/eekboard: Makefile
        pkgsrc/x11/gnome-desktop: Makefile
        pkgsrc/x11/gnome-desktop3: Makefile
        pkgsrc/x11/gtk2: options.mk
        pkgsrc/x11/gtk3: options.mk
        pkgsrc/x11/gtk4: Makefile
        pkgsrc/x11/gtksourceview3: Makefile
        pkgsrc/x11/gtksourceview4: Makefile
        pkgsrc/x11/gtksourceview5: Makefile
        pkgsrc/x11/keybinder: Makefile
        pkgsrc/x11/keybinder3: Makefile
        pkgsrc/x11/libgdm: Makefile
        pkgsrc/x11/libxfce4util: Makefile
        pkgsrc/x11/libxfce4windowing: Makefile buildlink3.mk
        pkgsrc/x11/lua-keybinder: Makefile
        pkgsrc/x11/mate-menus: Makefile
        pkgsrc/x11/mate-panel: Makefile
        pkgsrc/x11/vte3: Makefile
        pkgsrc/x11/xfce4-panel: Makefile

Log Message:
*: switch to glib2-introspection

The gobject-introspection package installed _some_ of the introspection
files needed for glib2, but not all - some of them are built from the glib2
sources. glib2-introspection now contains all glib2-related introspection
files.

Add a tool dependency on the new package where needed.

Remove gobject-introspection from buildlink3.mk files - this is usually
a tool and should not be forwarded via buildlink3.

Some cleanups/fixes for -current while here.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/archivers/gnome-autoar/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/audio/gsound/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/chat/libfolks/Makefile
cvs rdiff -u -r1.93 -r1.94 pkgsrc/chat/telepathy-glib/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/converters/libkkc/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/databases/gom/Makefile
cvs rdiff -u -r1.4629 -r1.4630 pkgsrc/devel/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/amtk/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/appstream/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/appstream-glib/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/at-spi2-core/options.mk
cvs rdiff -u -r1.175 -r1.176 pkgsrc/devel/devhelp/Makefile
cvs rdiff -u -r1.136 -r1.137 pkgsrc/devel/glade/Makefile
cvs rdiff -u -r1.130 -r1.131 pkgsrc/devel/glib2/Makefile.common
cvs rdiff -u -r1.100 -r1.101 pkgsrc/devel/gobject-introspection/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/gobject-introspection/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/libadapta/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/libadwaita/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/libdazzle/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/libdbusmenu-glib/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/devel/libdbusmenu-gtk3/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/devel/libgee/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/libgee0.6/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/libgudev/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libgusb/Makefile
cvs rdiff -u -r1.124 -r1.125 pkgsrc/devel/libgweather/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/devel/libhandy/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/devel/libpeas/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/devel/libpeas/buildlink3.mk
cvs rdiff -u -r1.51 -r1.52 pkgsrc/devel/libwnck3/Makefile
cvs rdiff -u -r1.295 -r1.296 pkgsrc/devel/nss/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/nss/PLIST
cvs rdiff -u -r1.210 -r1.211 pkgsrc/devel/nss/distinfo
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/pango/options.mk
cvs rdiff -u -r1.59 -r1.60 pkgsrc/devel/py-gobject3/Makefile
cvs rdiff -u -r1.195 -r1.196 pkgsrc/editors/gedit/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/editors/pluma/Makefile
cvs rdiff -u -r1.132 -r1.133 pkgsrc/fonts/gucharmap/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/fonts/harfbuzz/options.mk
cvs rdiff -u -r1.57 -r1.58 pkgsrc/geography/geoclue/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/geography/geocode-glib/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/geography/libchamplain012/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/geography/libmemphis02/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/geography/osm-gps-map/Makefile
cvs rdiff -u -r1.84 -r1.85 pkgsrc/graphics/clutter/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/graphics/clutter-gtk/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/graphics/cogl/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/colord/options.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/graphics/colord-gtk/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/colord-gtk/options.mk
cvs rdiff -u -r1.143 -r1.144 pkgsrc/graphics/eog/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/graphics/eom/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/gdk-pixbuf2/options.mk
cvs rdiff -u -r1.160 -r1.161 pkgsrc/graphics/gegl/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/graphics/gexiv2/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/goocanvas2/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/graphene/Makefile
cvs rdiff -u -r1.182 -r1.183 pkgsrc/graphics/librsvg/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/graphics/librsvg-c/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/inputmethod/fcitx/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/inputmethod/fcitx5-gtk/Makefile
cvs rdiff -u -r1.121 -r1.122 pkgsrc/inputmethod/ibus/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/inputmethod/ibus-anthy/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/inputmethod/input-pad/options.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/inputmethod/libskk/Makefile
cvs rdiff -u -r1.88 -r1.89 pkgsrc/math/gnome-calculator/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/multimedia/clutter-gst/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/multimedia/gst-plugins1-bad/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/multimedia/gst-plugins1-base/Makefile
cvs rdiff -u -r1.43 -r1.44 \
    pkgsrc/multimedia/gst-plugins1-editing-services/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/multimedia/gstreamer1/Makefile
cvs rdiff -u -r1.97 -r1.98 pkgsrc/multimedia/totem-pl-parser/Makefile
cvs rdiff -u -r1.74 -r1.75 pkgsrc/net/gnome-online-accounts/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/net/grilo/Makefile
cvs rdiff -u -r1.117 -r1.118 pkgsrc/net/gssdp/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/gst-rtsp-server/Makefile
cvs rdiff -u -r1.129 -r1.130 pkgsrc/net/gtk-vnc/Makefile
cvs rdiff -u -r1.103 -r1.104 pkgsrc/net/gupnp/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/net/gupnp-av/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/net/gupnp-dlna/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/net/gupnp-igd/Makefile
cvs rdiff -u -r1.92 -r1.93 pkgsrc/net/libgdata/Makefile
cvs rdiff -u -r1.89 -r1.90 pkgsrc/net/libnice/Makefile
cvs rdiff -u -r1.86 -r1.87 pkgsrc/net/libsoup/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/libsoup3/Makefile
cvs rdiff -u -r1.199 -r1.200 pkgsrc/print/evince/Makefile
cvs rdiff -u -r1.126 -r1.127 pkgsrc/print/poppler/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/security/gcr/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/security/gcr/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/gcr4/Makefile \
    pkgsrc/security/gcr4/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/gcr4/options.mk
cvs rdiff -u -r1.39 -r1.40 pkgsrc/security/libsecret/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/security/polkit/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/accountsservice/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/accountsservice/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/ayatana-ido/Makefile
cvs rdiff -u -r1.125 -r1.126 pkgsrc/sysutils/brasero/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/sysutils/caja-dropbox/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/sysutils/gnome-tracker/Makefile
cvs rdiff -u -r1.145 -r1.146 pkgsrc/sysutils/gvfs/Makefile
cvs rdiff -u -r1.91 -r1.92 pkgsrc/sysutils/libnotify/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/sysutils/lxpanel/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/sysutils/spice-gtk/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/upower/options.mk
cvs rdiff -u -r1.115 -r1.116 pkgsrc/sysutils/xfce4-thunar/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/textproc/gspell/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/textproc/json-glib/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/libxmlb/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/time/gnome-pomodoro/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/time/libical4/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wayland/gtk-layer-shell/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wayland/gtk4-layer-shell/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/wm/mutter/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/www/libproxy/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/www/librest/Makefile
cvs rdiff -u -r1.211 -r1.212 pkgsrc/www/liferea/Makefile
cvs rdiff -u -r1.172 -r1.173 pkgsrc/www/midori/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/www/uhttpmock/Makefile
cvs rdiff -u -r1.279 -r1.280 pkgsrc/www/webkit-gtk/Makefile
cvs rdiff -u -r1.96 -r1.97 pkgsrc/x11/eekboard/Makefile
cvs rdiff -u -r1.180 -r1.181 pkgsrc/x11/gnome-desktop/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/x11/gnome-desktop3/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/gtk2/options.mk
cvs rdiff -u -r1.34 -r1.35 pkgsrc/x11/gtk3/options.mk
cvs rdiff -u -r1.73 -r1.74 pkgsrc/x11/gtk4/Makefile
cvs rdiff -u -r1.85 -r1.86 pkgsrc/x11/gtksourceview3/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/x11/gtksourceview4/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/gtksourceview5/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/keybinder/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/keybinder3/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/libgdm/Makefile
cvs rdiff -u -r1.85 -r1.86 pkgsrc/x11/libxfce4util/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/libxfce4windowing/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/libxfce4windowing/buildlink3.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/lua-keybinder/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/mate-menus/Makefile
cvs rdiff -u -r1.77 -r1.78 pkgsrc/x11/mate-panel/Makefile
cvs rdiff -u -r1.100 -r1.101 pkgsrc/x11/vte3/Makefile
cvs rdiff -u -r1.124 -r1.125 pkgsrc/x11/xfce4-panel/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/gnome-autoar/Makefile
diff -u pkgsrc/archivers/gnome-autoar/Makefile:1.27 pkgsrc/archivers/gnome-autoar/Makefile:1.28
--- pkgsrc/archivers/gnome-autoar/Makefile:1.27 Tue Jan 27 08:38:54 2026
+++ pkgsrc/archivers/gnome-autoar/Makefile      Fri May 15 17:00:52 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2026/01/27 08:38:54 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2026/05/15 17:00:52 wiz Exp $
 
 DISTNAME=      gnome-autoar-0.4.4
 PKGREVISION=   10
@@ -11,6 +11,8 @@ HOMEPAGE=     https://gitlab.gnome.org/GNOME
 COMMENT=       GLib wrapper around libarchive
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config
 USE_LIBTOOL=   yes
 

Index: pkgsrc/audio/gsound/Makefile
diff -u pkgsrc/audio/gsound/Makefile:1.24 pkgsrc/audio/gsound/Makefile:1.25
--- pkgsrc/audio/gsound/Makefile:1.24   Tue Jan 27 08:38:58 2026
+++ pkgsrc/audio/gsound/Makefile        Fri May 15 17:00:52 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2026/01/27 08:38:58 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2026/05/15 17:00:52 wiz Exp $
 
 DISTNAME=      gsound-1.0.3
 PKGREVISION=   8
@@ -11,6 +11,8 @@ HOMEPAGE=     https://gitlab.gnome.org/GNOME
 COMMENT=       Small library for playing system sounds
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config
 
 PKGCONFIG_OVERRIDE+=   gsound/gsound.pc

Index: pkgsrc/chat/libfolks/Makefile
diff -u pkgsrc/chat/libfolks/Makefile:1.43 pkgsrc/chat/libfolks/Makefile:1.44
--- pkgsrc/chat/libfolks/Makefile:1.43  Wed Jan  7 08:46:00 2026
+++ pkgsrc/chat/libfolks/Makefile       Fri May 15 17:00:53 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2026/01/07 08:46:00 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2026/05/15 17:00:53 wiz Exp $
 
 DISTNAME=      folks-0.15.5
 PKGNAME=       lib${DISTNAME}
@@ -12,6 +12,8 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       Library to manage contacts
 LICENSE=       gnu-lgpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config xgettext
 
 MESON_ARGS+=   -Dbluez_backend=false
@@ -25,6 +27,8 @@ PKGCONFIG_OVERRIDE+=          output/meson-priva
 PKGCONFIG_OVERRIDE+=           output/meson-private/folks-dummy.pc
 PKGCONFIG_OVERRIDE+=           output/meson-private/folks-telepathy.pc
 
+CFLAGS+=       -Wno-implicit-function-declaration
+
 .include "../../devel/meson/build.mk"
 .include "../../chat/telepathy-glib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/chat/telepathy-glib/Makefile
diff -u pkgsrc/chat/telepathy-glib/Makefile:1.93 pkgsrc/chat/telepathy-glib/Makefile:1.94
--- pkgsrc/chat/telepathy-glib/Makefile:1.93    Wed Jan  7 08:46:02 2026
+++ pkgsrc/chat/telepathy-glib/Makefile Fri May 15 17:00:53 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2026/01/07 08:46:02 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2026/05/15 17:00:53 wiz Exp $
 
 DISTNAME=      telepathy-glib-0.24.1
 PKGREVISION=   41
@@ -10,6 +10,8 @@ HOMEPAGE=     https://telepathy.freedesktop.
 COMMENT=       GObject-based C binding for the Telepathy D-Bus API
 LICENSE=       gnu-gpl-v2 AND modified-bsd
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-vala-bindings
 USE_LIBTOOL=           yes

Index: pkgsrc/converters/libkkc/Makefile
diff -u pkgsrc/converters/libkkc/Makefile:1.14 pkgsrc/converters/libkkc/Makefile:1.15
--- pkgsrc/converters/libkkc/Makefile:1.14      Thu Oct 23 20:36:08 2025
+++ pkgsrc/converters/libkkc/Makefile   Fri May 15 17:00:53 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2025/10/23 20:36:08 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2026/05/15 17:00:53 wiz Exp $
 
 GITHUB_PROJECT=        libkkc
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
@@ -12,9 +12,11 @@ HOMEPAGE=    https://github.com/ueno/libkkc
 COMMENT=       Japanese Kana Kanji conversion library
 LICENSE=       gnu-gpl-v3
 
-PYTHON_VERSIONS_ACCEPTED=      27 # py-marisa
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= ${PYPKGPREFIX}-marisa-[0-9]*:../../textproc/py-marisa
 
+PYTHON_VERSIONS_ACCEPTED=      27 # py-marisa
+
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake intltool msgfmt pkg-config
@@ -25,6 +27,9 @@ PKGCONFIG_OVERRIDE+=  libkkc/kkc-1.0.pc.i
 
 TEST_TARGET=   check
 
+CFLAGS+=       -Wno-incompatible-pointer-types
+CFLAGS+=       -Wno-int-conversion
+
 PYTHON_FOR_BUILD_ONLY= yes
 .include "../../lang/python/application.mk"
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/databases/gom/Makefile
diff -u pkgsrc/databases/gom/Makefile:1.26 pkgsrc/databases/gom/Makefile:1.27
--- pkgsrc/databases/gom/Makefile:1.26  Wed Jan  7 08:46:08 2026
+++ pkgsrc/databases/gom/Makefile       Fri May 15 17:00:53 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2026/01/07 08:46:08 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2026/05/15 17:00:53 wiz Exp $
 
 DISTNAME=      gom-0.4
 PKGREVISION=   23
@@ -11,6 +11,7 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       Object mapper from GObjects to SQLite
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
 USE_LANGUAGES+=        c
@@ -18,8 +19,6 @@ USE_TOOLS+=   pkg-config
 
 PY_PATCHPLIST= yes
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/meson/build.mk"

Index: pkgsrc/devel/Makefile
diff -u pkgsrc/devel/Makefile:1.4629 pkgsrc/devel/Makefile:1.4630
--- pkgsrc/devel/Makefile:1.4629        Fri May 15 07:50:04 2026
+++ pkgsrc/devel/Makefile       Fri May 15 17:00:53 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4629 2026/05/15 07:50:04 wiz Exp $
+# $NetBSD: Makefile,v 1.4630 2026/05/15 17:00:53 wiz Exp $
 #
 
 COMMENT=       Development utilities
@@ -477,6 +477,7 @@ SUBDIR+=    glade
 SUBDIR+=       glasgow
 SUBDIR+=       glib
 SUBDIR+=       glib2
+SUBDIR+=       glib2-introspection
 SUBDIR+=       glib2-tools
 SUBDIR+=       glibmm
 SUBDIR+=       glibmm2.68

Index: pkgsrc/devel/amtk/Makefile
diff -u pkgsrc/devel/amtk/Makefile:1.22 pkgsrc/devel/amtk/Makefile:1.23
--- pkgsrc/devel/amtk/Makefile:1.22     Tue Jan 27 08:39:09 2026
+++ pkgsrc/devel/amtk/Makefile  Fri May 15 17:00:53 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2026/01/27 08:39:09 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2026/05/15 17:00:53 wiz Exp $
 
 DISTNAME=      amtk-5.0.2
 PKGREVISION=   18
@@ -11,6 +11,8 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       Actions, Menus and Toolbars Kit for GTK applications
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 

Index: pkgsrc/devel/appstream/Makefile
diff -u pkgsrc/devel/appstream/Makefile:1.29 pkgsrc/devel/appstream/Makefile:1.30
--- pkgsrc/devel/appstream/Makefile:1.29        Thu May 14 16:40:38 2026
+++ pkgsrc/devel/appstream/Makefile     Fri May 15 17:00:53 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2026/05/14 16:40:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2026/05/15 17:00:53 wiz Exp $
 
 DISTNAME=      appstream-1.1.2
 PKGREVISION=   2
@@ -11,6 +11,7 @@ HOMEPAGE=     https://github.com/ximion/apps
 COMMENT=       Tools and libraries to work with AppStream metadata
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf
 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
 TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl

Index: pkgsrc/devel/appstream-glib/Makefile
diff -u pkgsrc/devel/appstream-glib/Makefile:1.52 pkgsrc/devel/appstream-glib/Makefile:1.53
--- pkgsrc/devel/appstream-glib/Makefile:1.52   Thu May 14 16:40:38 2026
+++ pkgsrc/devel/appstream-glib/Makefile        Fri May 15 17:00:53 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2026/05/14 16:40:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.53 2026/05/15 17:00:53 wiz Exp $
 
 DISTNAME=      appstream-glib-0.8.3
 PKGREVISION=   17
@@ -12,6 +12,7 @@ COMMENT=      GObjects and helper methods for
 LICENSE=       gnu-lgpl-v2.1
 
 TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
 
 USE_TOOLS+=            pkg-config msgfmt xgettext

Index: pkgsrc/devel/at-spi2-core/options.mk
diff -u pkgsrc/devel/at-spi2-core/options.mk:1.3 pkgsrc/devel/at-spi2-core/options.mk:1.4
--- pkgsrc/devel/at-spi2-core/options.mk:1.3    Sun Jan 12 19:23:00 2025
+++ pkgsrc/devel/at-spi2-core/options.mk        Fri May 15 17:00:54 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2025/01/12 19:23:00 riastradh Exp $
+# $NetBSD: options.mk,v 1.4 2026/05/15 17:00:54 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.at-spi2-core
 
@@ -45,6 +45,8 @@ MESON_ARGS+=  -Datk_only=true
 
 .if ${PKG_OPTIONS:Mintrospection}
 PLIST.introspection=   yes
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 BUILDLINK_DEPMETHOD.gobject-introspection=     build
 .  include "../../devel/gobject-introspection/buildlink3.mk"
 .endif

Index: pkgsrc/devel/devhelp/Makefile
diff -u pkgsrc/devel/devhelp/Makefile:1.175 pkgsrc/devel/devhelp/Makefile:1.176
--- pkgsrc/devel/devhelp/Makefile:1.175 Tue Jan 27 08:39:10 2026
+++ pkgsrc/devel/devhelp/Makefile       Fri May 15 17:00:54 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.175 2026/01/27 08:39:10 wiz Exp $
+# $NetBSD: Makefile,v 1.176 2026/05/15 17:00:54 wiz Exp $
 
 DISTNAME=      devhelp-3.34.0
 PKGREVISION=   38
@@ -11,6 +11,8 @@ HOMEPAGE=     https://wiki.gnome.org/Apps/De
 COMMENT=       Tool for browsing and searching API documentation from GNOME
 LICENSE=       gnu-gpl-v3
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config msgfmt xgettext itstool
 
 # workaround for build failure

Index: pkgsrc/devel/glade/Makefile
diff -u pkgsrc/devel/glade/Makefile:1.136 pkgsrc/devel/glade/Makefile:1.137
--- pkgsrc/devel/glade/Makefile:1.136   Tue Jan 27 08:39:11 2026
+++ pkgsrc/devel/glade/Makefile Fri May 15 17:00:54 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2026/01/27 08:39:11 wiz Exp $
+# $NetBSD: Makefile,v 1.137 2026/05/15 17:00:54 wiz Exp $
 
 DISTNAME=              glade-3.40.0
 PKGREVISION=           24
@@ -11,8 +11,9 @@ HOMEPAGE=             https://glade.gnome.org/
 COMMENT=               User interface builder for the GTK3+ toolkit
 LICENSE=               gnu-gpl-v2
 
-TOOL_DEPENDS+=         libxslt-[0-9]*:../../textproc/libxslt
 TOOL_DEPENDS+=         docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+TOOL_DEPENDS+=         libxslt-[0-9]*:../../textproc/libxslt
 
 USE_TOOLS+=            itstool msgfmt pkg-config
 

Index: pkgsrc/devel/glib2/Makefile.common
diff -u pkgsrc/devel/glib2/Makefile.common:1.130 pkgsrc/devel/glib2/Makefile.common:1.131
--- pkgsrc/devel/glib2/Makefile.common:1.130    Mon May  4 09:01:44 2026
+++ pkgsrc/devel/glib2/Makefile.common  Fri May 15 17:00:54 2026
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.130 2026/05/04 09:01:44 adam Exp $
+# $NetBSD: Makefile.common,v 1.131 2026/05/15 17:00:54 wiz Exp $
 # used by devel/gdbus-codegen/Makefile
 # used by devel/glib2/Makefile
 # used by devel/glib2-tools/Makefile
+# used by devel/glib2-introspection/Makefile
 
 DISTNAME=      glib-2.88.1
 PKGNAME=       ${DISTNAME:S/glib/glib2/}

Index: pkgsrc/devel/gobject-introspection/Makefile
diff -u pkgsrc/devel/gobject-introspection/Makefile:1.100 pkgsrc/devel/gobject-introspection/Makefile:1.101
--- pkgsrc/devel/gobject-introspection/Makefile:1.100   Fri May  1 02:14:52 2026
+++ pkgsrc/devel/gobject-introspection/Makefile Fri May 15 17:00:54 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2026/05/01 02:14:52 tsutsui Exp $
+# $NetBSD: Makefile,v 1.101 2026/05/15 17:00:54 wiz Exp $
 
 DISTNAME=      gobject-introspection-1.86.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -42,10 +42,6 @@ MAKE_ENV+=   DYLD_LIBRARY_PATH=${WRKSRC}/o
 # Disable cache to keep fake homedir clean
 MAKE_ENV+=     GI_SCANNER_DISABLE_CACHE=yes
 
-post-install:
-       ${INSTALL_DATA} ${WRKSRC}/output/gir/*.typelib ${DESTDIR}${PREFIX}/lib/girepository-1.0
-       ${INSTALL_DATA} ${WRKSRC}/output/gir/*.gir ${DESTDIR}${PREFIX}/share/gir-1.0
-
 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.82
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libffi+= libffi>=3.0.0

Index: pkgsrc/devel/gobject-introspection/PLIST
diff -u pkgsrc/devel/gobject-introspection/PLIST:1.20 pkgsrc/devel/gobject-introspection/PLIST:1.21
--- pkgsrc/devel/gobject-introspection/PLIST:1.20       Mon Jan  5 14:49:02 2026
+++ pkgsrc/devel/gobject-introspection/PLIST    Fri May 15 17:00:54 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2026/01/05 14:49:02 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.21 2026/05/15 17:00:54 wiz Exp $
 bin/g-ir-annotation-tool
 bin/g-ir-compiler
 bin/g-ir-generate
@@ -30,11 +30,6 @@ lib/girepository-1.0/DBus-1.0.typelib
 lib/girepository-1.0/DBusGLib-1.0.typelib
 lib/girepository-1.0/GIRepository-2.0.typelib
 lib/girepository-1.0/GL-1.0.typelib
-lib/girepository-1.0/GLib-2.0.typelib
-lib/girepository-1.0/GModule-2.0.typelib
-lib/girepository-1.0/GObject-2.0.typelib
-lib/girepository-1.0/Gio-2.0.typelib
-lib/girepository-1.0/GioUnix-2.0.typelib
 lib/girepository-1.0/Vulkan-1.0.typelib
 lib/girepository-1.0/cairo-1.0.typelib
 lib/girepository-1.0/fontconfig-2.0.typelib
@@ -152,11 +147,6 @@ share/gir-1.0/DBus-1.0.gir
 share/gir-1.0/DBusGLib-1.0.gir
 share/gir-1.0/GIRepository-2.0.gir
 share/gir-1.0/GL-1.0.gir
-share/gir-1.0/GLib-2.0.gir
-share/gir-1.0/GModule-2.0.gir
-share/gir-1.0/GObject-2.0.gir
-share/gir-1.0/Gio-2.0.gir
-share/gir-1.0/GioUnix-2.0.gir
 share/gir-1.0/Vulkan-1.0.gir
 share/gir-1.0/cairo-1.0.gir
 share/gir-1.0/fontconfig-2.0.gir

Index: pkgsrc/devel/libadapta/Makefile
diff -u pkgsrc/devel/libadapta/Makefile:1.10 pkgsrc/devel/libadapta/Makefile:1.11
--- pkgsrc/devel/libadapta/Makefile:1.10        Thu May 14 16:40:44 2026
+++ pkgsrc/devel/libadapta/Makefile     Fri May 15 17:00:54 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2026/05/14 16:40:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2026/05/15 17:00:54 wiz Exp $
 
 DISTNAME=      libadapta-1.5.0
 PKGREVISION=   9
@@ -11,6 +11,7 @@ HOMEPAGE=     https://github.com/xapp-projec
 COMMENT=       libAdwaita with theme support and a few extras
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= sassc-[0-9]*:../../www/sassc
 
 USE_PKGLOCALEDIR=      yes

Index: pkgsrc/devel/libadwaita/Makefile
diff -u pkgsrc/devel/libadwaita/Makefile:1.37 pkgsrc/devel/libadwaita/Makefile:1.38
--- pkgsrc/devel/libadwaita/Makefile:1.37       Thu May 14 16:40:44 2026
+++ pkgsrc/devel/libadwaita/Makefile    Fri May 15 17:00:54 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2026/05/14 16:40:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.38 2026/05/15 17:00:54 wiz Exp $
 
 DISTNAME=      libadwaita-1.8.0
 PKGREVISION=   1
@@ -11,6 +11,7 @@ HOMEPAGE=     https://gitlab.gnome.org/GNOME
 COMMENT=       Building blocks for modern GNOME applications
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= sassc-[0-9]*:../../www/sassc
 
 USE_TOOLS+=    msgfmt pkg-config

Index: pkgsrc/devel/libdazzle/Makefile
diff -u pkgsrc/devel/libdazzle/Makefile:1.37 pkgsrc/devel/libdazzle/Makefile:1.38
--- pkgsrc/devel/libdazzle/Makefile:1.37        Tue Jan 27 08:39:14 2026
+++ pkgsrc/devel/libdazzle/Makefile     Fri May 15 17:00:54 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2026/01/27 08:39:14 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2026/05/15 17:00:54 wiz Exp $
 
 DISTNAME=      libdazzle-3.38.0
 PKGREVISION=   23
@@ -11,6 +11,8 @@ HOMEPAGE=     https://gitlab.gnome.org/GNOME
 COMMENT=       Companion library to GObject and Gtk+
 LICENSE=       gnu-gpl-v3
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config
 
 # workaround for build failure

Index: pkgsrc/devel/libdbusmenu-glib/Makefile
diff -u pkgsrc/devel/libdbusmenu-glib/Makefile:1.24 pkgsrc/devel/libdbusmenu-glib/Makefile:1.25
--- pkgsrc/devel/libdbusmenu-glib/Makefile:1.24 Thu Oct 23 20:36:29 2025
+++ pkgsrc/devel/libdbusmenu-glib/Makefile      Fri May 15 17:00:55 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2025/10/23 20:36:29 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2026/05/15 17:00:55 wiz Exp $
 
 PKGREVISION= 3
 .include "../../meta-pkgs/libdbusmenu/Makefile.common"
@@ -6,6 +6,8 @@ PKGREVISION= 3
 PKGNAME=       ${DISTNAME:S/-/-glib-/}
 COMMENT=       Glib2 library created by pulling some code from indicator-applet
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 CONFIGURE_ARGS+=       --disable-gtk
 CONFIGURE_ARGS+=       --disable-dumper
 CONFIGURE_ARGS+=       --disable-tests

Index: pkgsrc/devel/libdbusmenu-gtk3/Makefile
diff -u pkgsrc/devel/libdbusmenu-gtk3/Makefile:1.46 pkgsrc/devel/libdbusmenu-gtk3/Makefile:1.47
--- pkgsrc/devel/libdbusmenu-gtk3/Makefile:1.46 Tue Jan 27 08:39:14 2026
+++ pkgsrc/devel/libdbusmenu-gtk3/Makefile      Fri May 15 17:00:55 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2026/01/27 08:39:14 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2026/05/15 17:00:55 wiz Exp $
 
 PKGREVISION= 12
 .include "../../meta-pkgs/libdbusmenu/Makefile.common"
@@ -6,6 +6,8 @@ PKGREVISION= 12
 PKGNAME=       ${DISTNAME:S/-/-gtk3-/}
 COMMENT=       GTK3+ library created by pulling some code from indicator-applet
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 CONFIGURE_ARGS+=       --enable-gtk
 CONFIGURE_ARGS+=       --with-gtk=3
 CONFIGURE_ARGS+=       --disable-dumper

Index: pkgsrc/devel/libgee/Makefile
diff -u pkgsrc/devel/libgee/Makefile:1.55 pkgsrc/devel/libgee/Makefile:1.56
--- pkgsrc/devel/libgee/Makefile:1.55   Sun Dec 21 14:06:30 2025
+++ pkgsrc/devel/libgee/Makefile        Fri May 15 17:00:55 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2025/12/21 14:06:30 prlw1 Exp $
+# $NetBSD: Makefile,v 1.56 2026/05/15 17:00:55 wiz Exp $
 
 DISTNAME=      libgee-0.20.8
 CATEGORIES=    devel gnome
@@ -10,6 +10,8 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       Library providing GObject-based interfaces and classes
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_LIBTOOL=   yes
 USE_TOOLS+=    pkg-config gmake
 GNU_CONFIGURE= yes

Index: pkgsrc/devel/libgee0.6/Makefile
diff -u pkgsrc/devel/libgee0.6/Makefile:1.9 pkgsrc/devel/libgee0.6/Makefile:1.10
--- pkgsrc/devel/libgee0.6/Makefile:1.9 Thu Oct 23 20:36:30 2025
+++ pkgsrc/devel/libgee0.6/Makefile     Fri May 15 17:00:55 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2025/10/23 20:36:30 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2026/05/15 17:00:55 wiz Exp $
 
 DISTNAME=      libgee-0.6.8
 PKGNAME=       ${DISTNAME:S/libgee/libgee0.6/}
@@ -12,6 +12,8 @@ HOMEPAGE=     https://live.gnome.org/Libgee
 COMMENT=       Library providing GObject-based interfaces and classes (v0.6)
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    pkg-config gmake
@@ -21,6 +23,8 @@ USE_TOOLS+=   pkg-config gmake
 
 PKGCONFIG_OVERRIDE+=   gee-1.0.pc.in
 
+CFLAGS+=       -Wno-incompatible-pointer-types
+
 TEST_TARGET=   check
 
 BUILDLINK_DEPMETHOD.gobject-introspection:= build

Index: pkgsrc/devel/libgudev/options.mk
diff -u pkgsrc/devel/libgudev/options.mk:1.3 pkgsrc/devel/libgudev/options.mk:1.4
--- pkgsrc/devel/libgudev/options.mk:1.3        Sat May  9 12:22:24 2026
+++ pkgsrc/devel/libgudev/options.mk    Fri May 15 17:00:55 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2026/05/09 12:22:24 vins Exp $
+# $NetBSD: options.mk,v 1.4 2026/05/15 17:00:55 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libgudev
 PKG_SUPPORTED_OPTIONS= introspection vapi
@@ -15,6 +15,7 @@ PLIST_VARS+=          introspection vapi
 BUILDLINK_DEPMETHOD.gobject-introspection=     build
 MESON_ARGS+=   -Dintrospection=enabled
 .  include "../../devel/gobject-introspection/buildlink3.mk"
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
 PLIST.introspection=   yes
 .else
 MESON_ARGS+=   -Dintrospection=disabled

Index: pkgsrc/devel/libgusb/Makefile
diff -u pkgsrc/devel/libgusb/Makefile:1.1 pkgsrc/devel/libgusb/Makefile:1.2
--- pkgsrc/devel/libgusb/Makefile:1.1   Sat Apr 25 13:08:55 2026
+++ pkgsrc/devel/libgusb/Makefile       Fri May 15 17:00:55 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2026/04/25 13:08:55 vins Exp $
+# $NetBSD: Makefile,v 1.2 2026/05/15 17:00:55 wiz Exp $
 
 DISTNAME=      libgusb-0.4.9
 CATEGORIES=    devel
@@ -12,6 +12,7 @@ LICENSE=      gnu-lgpl-v2
 
 USE_TOOLS+=    pkg-config tar
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
 PYTHON_FOR_BUILD_ONLY= tool

Index: pkgsrc/devel/libgweather/Makefile
diff -u pkgsrc/devel/libgweather/Makefile:1.124 pkgsrc/devel/libgweather/Makefile:1.125
--- pkgsrc/devel/libgweather/Makefile:1.124     Tue Jan 27 08:39:14 2026
+++ pkgsrc/devel/libgweather/Makefile   Fri May 15 17:00:55 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2026/01/27 08:39:14 wiz Exp $
+# $NetBSD: Makefile,v 1.125 2026/05/15 17:00:55 wiz Exp $
 
 DISTNAME=      libgweather-40.0
 PKGREVISION=   36
@@ -11,16 +11,16 @@ HOMEPAGE=   https://wiki.gnome.org/Project
 COMMENT=       Weather information access library
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+TOOL_DEPENDS+= py${PYTHON_VERSION_DEFAULT}-gobject3-[0-9]*:../../devel/py-gobject3
+
 USE_TOOLS+=    pkg-config xgettext
 
 PYTHON_FOR_BUILD_ONLY= tool
-PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 PKGCONFIG_OVERRIDE_STAGE=      pre-install
 PKGCONFIG_OVERRIDE+=           output/meson-private/gweather-3.0.pc
 
-TOOL_DEPENDS+=         py${PYTHON_VERSION_DEFAULT}-gobject3-[0-9]*:../../devel/py-gobject3
-
 .include "../../devel/meson/build.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../geography/geocode-glib/buildlink3.mk"

Index: pkgsrc/devel/libhandy/Makefile
diff -u pkgsrc/devel/libhandy/Makefile:1.38 pkgsrc/devel/libhandy/Makefile:1.39
--- pkgsrc/devel/libhandy/Makefile:1.38 Tue Jan 27 08:39:14 2026
+++ pkgsrc/devel/libhandy/Makefile      Fri May 15 17:00:55 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2026/01/27 08:39:14 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2026/05/15 17:00:55 wiz Exp $
 
 DISTNAME=      libhandy-1.8.0
 PKGREVISION=   17
@@ -11,6 +11,8 @@ HOMEPAGE=     https://gnome.pages.gitlab.gno
 COMMENT=       Building blocks for modern adaptive GNOME apps
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    msgfmt pkg-config
 
 PYTHON_FOR_BUILD_ONLY= tool

Index: pkgsrc/devel/libpeas/Makefile
diff -u pkgsrc/devel/libpeas/Makefile:1.71 pkgsrc/devel/libpeas/Makefile:1.72
--- pkgsrc/devel/libpeas/Makefile:1.71  Tue Jan 27 08:39:15 2026
+++ pkgsrc/devel/libpeas/Makefile       Fri May 15 17:00:56 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2026/01/27 08:39:15 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2026/05/15 17:00:56 wiz Exp $
 
 DISTNAME=      libpeas-1.26.0
 PKGREVISION=   21
@@ -11,6 +11,7 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       GObject-based plugins engine
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
 USE_TOOLS+=    msgfmt pkg-config

Index: pkgsrc/devel/libpeas/buildlink3.mk
diff -u pkgsrc/devel/libpeas/buildlink3.mk:1.48 pkgsrc/devel/libpeas/buildlink3.mk:1.49
--- pkgsrc/devel/libpeas/buildlink3.mk:1.48     Tue Jan 27 08:39:15 2026
+++ pkgsrc/devel/libpeas/buildlink3.mk  Fri May 15 17:00:56 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.48 2026/01/27 08:39:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.49 2026/05/15 17:00:56 wiz Exp $
 
 BUILDLINK_TREE+=       libpeas
 
@@ -10,8 +10,6 @@ BUILDLINK_ABI_DEPENDS.libpeas+=       libpeas>
 BUILDLINK_PKGSRCDIR.libpeas?=  ../../devel/libpeas
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/gobject-introspection/buildlink3.mk"
-PYTHON_VERSIONS_INCOMPATIBLE+= 27
 .include "../../x11/gtk3/buildlink3.mk"
 .endif # LIBPEAS_BUILDLINK3_MK
 

Index: pkgsrc/devel/libwnck3/Makefile
diff -u pkgsrc/devel/libwnck3/Makefile:1.51 pkgsrc/devel/libwnck3/Makefile:1.52
--- pkgsrc/devel/libwnck3/Makefile:1.51 Tue Jan 27 08:39:15 2026
+++ pkgsrc/devel/libwnck3/Makefile      Fri May 15 17:00:56 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2026/01/27 08:39:15 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2026/05/15 17:00:56 wiz Exp $
 
 DISTNAME=      libwnck-3.36.0
 PKGNAME=       ${DISTNAME:S/libwnck/libwnck3/}
@@ -12,6 +12,8 @@ HOMEPAGE=     https://www.gnome.org/
 COMMENT=       Library to write pagers and tasklists
 LICENSE=       gnu-lgpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config xgettext
 
 # wnckutils conflict with devel/libwnck, but also probably aren't used

Index: pkgsrc/devel/nss/Makefile
diff -u pkgsrc/devel/nss/Makefile:1.295 pkgsrc/devel/nss/Makefile:1.296
--- pkgsrc/devel/nss/Makefile:1.295     Fri Apr 24 09:52:17 2026
+++ pkgsrc/devel/nss/Makefile   Fri May 15 17:00:56 2026
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.295 2026/04/24 09:52:17 wiz Exp $
+# $NetBSD: Makefile,v 1.296 2026/05/15 17:00:56 wiz Exp $
 #
 # release notes
 # https://firefox-source-docs.mozilla.org/security/nss/releases/index.html
 
-DISTNAME=              nss-${NSS_RELEASE:S/.0$//}
-NSS_RELEASE=           3.123.1
-PKGNAME=               nss-${NSS_RELEASE}
+DISTNAME=              nss-3.124
 CATEGORIES=            devel security
-MASTER_SITES=          ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_DIST_DIR_VERSION:S/_0$//}_RTM/src/}
+MASTER_SITES=          ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${PKGVERSION_NOREV:S/./_/g}_RTM/src/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              https://firefox-source-docs.mozilla.org/security/nss/
@@ -135,11 +133,6 @@ MAKE_ENV+= NSS_ENABLE_TLS_1_3=1
 CFLAGS+=       -DNSS_NO_GCC48
 .endif
 
-MOD_MAJOR_VERSION=     ${NSS_RELEASE:C/\.[0-9.]*//}
-MOD_MINOR_VERSION=     ${NSS_RELEASE:S/3.//:C/\.[0-9]*//}
-MOD_PATCH_VERSION=     ${NSS_RELEASE:C/[0-9.]*\.//}
-NSS_DIST_DIR_VERSION=  ${MOD_MAJOR_VERSION}_${MOD_MINOR_VERSION}_${MOD_PATCH_VERSION}
-
 NSPR_MINIMUM_VERSION=  4.38.2
 
 PKGCONFIG_OVERRIDE=    nss.pc
@@ -179,8 +172,6 @@ do-install:
        (cd ${WRKSRC}/dist/public/nss && pax -Lrw . ${DESTDIR}${PREFIX}/include/nss )
        (cd ${WRKSRC}/dist/*_OPT.OBJ/lib && \
                pax -Lrw *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ )
-       ${INSTALL_DATA} ${WRKSRC}/dist/*_OPT.OBJ/lib/libcrmf.a \
-               ${DESTDIR}${PREFIX}/lib/nss/
        ${INSTALL_DATA} ${WRKSRC}/nss.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/nss.pc
        ${INSTALL_SCRIPT} ${WRKSRC}/nss-config ${DESTDIR}${PREFIX}/bin/nss-config
 .for cmd in ${INSTALL_CMDS}

Index: pkgsrc/devel/nss/PLIST
diff -u pkgsrc/devel/nss/PLIST:1.30 pkgsrc/devel/nss/PLIST:1.31
--- pkgsrc/devel/nss/PLIST:1.30 Fri Sep 12 07:26:08 2025
+++ pkgsrc/devel/nss/PLIST      Fri May 15 17:00:56 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2025/09/12 07:26:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.31 2026/05/15 17:00:56 wiz Exp $
 bin/certutil
 bin/cmsutil
 bin/crlutil
@@ -29,13 +29,9 @@ include/nss/cert.h
 include/nss/certdb.h
 include/nss/certt.h
 include/nss/ciferfam.h
-include/nss/cmmf.h
-include/nss/cmmft.h
 include/nss/cms.h
 include/nss/cmsreclist.h
 include/nss/cmst.h
-include/nss/crmf.h
-include/nss/crmft.h
 include/nss/cryptohi.h
 include/nss/cryptoht.h
 include/nss/eccutil.h
@@ -127,7 +123,6 @@ include/nss/utilmodt.h
 include/nss/utilpars.h
 include/nss/utilparst.h
 include/nss/utilrename.h
-lib/nss/libcrmf.a
 lib/nss/libfreebl3.so
 lib/nss/libnss3.so
 lib/nss/libnssckbi-testlib.so

Index: pkgsrc/devel/nss/distinfo
diff -u pkgsrc/devel/nss/distinfo:1.210 pkgsrc/devel/nss/distinfo:1.211
--- pkgsrc/devel/nss/distinfo:1.210     Fri Apr 24 09:52:17 2026
+++ pkgsrc/devel/nss/distinfo   Fri May 15 17:00:56 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.210 2026/04/24 09:52:17 wiz Exp $
+$NetBSD: distinfo,v 1.211 2026/05/15 17:00:56 wiz Exp $
 
-BLAKE2s (nss-3.123.1.tar.gz) = 9eceec78e8262305cba8df2d7c9335e6eb06d31f67cfc54edaac9ebfcacf2904
-SHA512 (nss-3.123.1.tar.gz) = 988927a07d1ac4533e7e89d01a08504e6ff70a7b111c1267e54a9cfe0a3a5674bb8b25e14ad6dca0d8765da3ca591a9be4f977ca172be3cf7af95a52f2e19214
-Size (nss-3.123.1.tar.gz) = 77762541 bytes
+BLAKE2s (nss-3.124.tar.gz) = f013376f9e7a9f2d3078acdce7113a11a21ec5c6ddb21a05428afce3b3163278
+SHA512 (nss-3.124.tar.gz) = 9959977b3cbcb0306c8aeba2c059d4f3646b3144c6401fbc73c14aea364caa92331875354afa79c095b6482b29ae743228d35c1bd510c5124cad5e7c37c5daa2
+Size (nss-3.124.tar.gz) = 78530189 bytes
 SHA1 (patch-md) = ebc903bb19456bfa111fad3c101e3f18168b43b3
 SHA1 (patch-me) = 30aa8b8e22bb687b9c71da40ea9e76b56885d1f8
 SHA1 (patch-mf) = 40e58385fb6f944f463bf00b9aad72bc4ea229d0

Index: pkgsrc/devel/pango/options.mk
diff -u pkgsrc/devel/pango/options.mk:1.23 pkgsrc/devel/pango/options.mk:1.24
--- pkgsrc/devel/pango/options.mk:1.23  Fri Jul 18 08:38:18 2025
+++ pkgsrc/devel/pango/options.mk       Fri May 15 17:00:56 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2025/07/18 08:38:18 adam Exp $
+# $NetBSD: options.mk,v 1.24 2026/05/15 17:00:56 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pango
 PKG_SUPPORTED_OPTIONS= introspection libthai x11
@@ -34,6 +34,7 @@ MESON_ARGS+=  -Dxft=disabled
 .if !empty(PKG_OPTIONS:Mintrospection)
 PLIST.introspection=   yes
 MESON_ARGS+=   -Dintrospection=enabled
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 BUILDLINK_DEPMETHOD.gobject-introspection=     build
 BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=1.84.0
 .include "../../devel/gobject-introspection/buildlink3.mk"

Index: pkgsrc/devel/py-gobject3/Makefile
diff -u pkgsrc/devel/py-gobject3/Makefile:1.59 pkgsrc/devel/py-gobject3/Makefile:1.60
--- pkgsrc/devel/py-gobject3/Makefile:1.59      Sun May 10 22:00:47 2026
+++ pkgsrc/devel/py-gobject3/Makefile   Fri May 15 17:00:56 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2026/05/10 22:00:47 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2026/05/15 17:00:56 wiz Exp $
 
 .include "Makefile.common"
 
@@ -8,6 +8,8 @@ PKGREVISION=    1
 COMMENT=       Python bindings for glib2 gobject
 
 TOOL_DEPENDS+= ${PYPKGPREFIX}-meson_python>=0.12.1:../../devel/py-meson_python
+DEPENDS+=      glib2-introspection-[0-9]*:../../devel/glib2-introspection
+TEST_DEPENDS+= ${PYPKGPREFIX}-test>=0:../../devel/py-test
 
 # Installed by py-gobject3-common:
 post-install:
@@ -25,5 +27,26 @@ BUILDLINK_API_DEPENDS.gobject-introspect
 .include "../../graphics/py-cairo/buildlink3.mk"
 BUILDLINK_API_DEPENDS.cairo+=   cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
+
+# = 28 failed, 1481 passed, 201 skipped, 2 deselected, 6 xfailed, 720 warnings in 16.58s =
+MESON_TESTBUILDDIR=    ${WRKDIR}/testbuild
+
+do-test:
+       ${RUN} printf '[binaries]\npython = %s\n' "'${PYTHONBIN}'" > ${WRKDIR}/.meson_test_native
+       ${RUN} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+           meson setup \
+           --prefix ${PREFIX} \
+           --wrap-mode=nodownload \
+           --native-file ${WRKDIR}/.meson_test_native \
+           -Dtests=true \
+           -Dwheel=false \
+           ${MESON_TESTBUILDDIR}
+       ${RUN} ${SETENV} ${MAKE_ENV} \
+           ninja -C ${MESON_TESTBUILDDIR}
+       ${RUN} cd ${WRKSRC} && ${SETENV} ${TEST_ENV} \
+           meson test -C ${MESON_TESTBUILDDIR} --no-rebuild --timeout 600
+#          meson test -C ${MESON_TESTBUILDDIR} --no-rebuild --timeout 600 \
+#          --test-args="-k 'not (test_pytest_capture_error_in_closure or test_io_add_watch_pyfile)'"
+
 .include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/editors/gedit/Makefile
diff -u pkgsrc/editors/gedit/Makefile:1.195 pkgsrc/editors/gedit/Makefile:1.196
--- pkgsrc/editors/gedit/Makefile:1.195 Tue Jan 27 08:39:20 2026
+++ pkgsrc/editors/gedit/Makefile       Fri May 15 17:00:56 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.195 2026/01/27 08:39:20 wiz Exp $
+# $NetBSD: Makefile,v 1.196 2026/05/15 17:00:56 wiz Exp $
 
 DISTNAME=      gedit-3.36.2
 PKGREVISION=   37
@@ -11,12 +11,15 @@ HOMEPAGE=   https://wiki.gnome.org/Apps/Ge
 COMMENT=       Lightweight GNOME UTF-8 text editor
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+DEPENDS+=      adwaita-icon-theme-[0-9]*:../../graphics/adwaita-icon-theme
+DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+
 PREV_PKGPATH=  editors/gedit3
 
 USE_TOOLS+=                    gettext msgfmt perl pkg-config
 USE_TOOLS+=                    itstool
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
 PY_PATCHPLIST=                 yes
 REPLACE_PYTHON+=               plugins/externaltools/data/send-to-fpaste.tool.in
 REPLACE_PYTHON+=               build-aux/meson/post_install.py
@@ -24,13 +27,9 @@ REPLACE_PYTHON+=             build-aux/meson/post_i
 MESON_ARGS+=   -Dvapi=false
 MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/gedit
 
-DEPENDS+=      adwaita-icon-theme-[0-9]*:../../graphics/adwaita-icon-theme
-DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
-
 pre-configure:
        ${FIND} ${WRKSRC}/help -type f -exec ${CHMOD} 644 {} \;
 
-
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/gettext-tools/msgfmt-desktop.mk"
 BUILDLINK_API_DEPENDS.libpeas+=        libpeas>=1.14.1

Index: pkgsrc/editors/pluma/Makefile
diff -u pkgsrc/editors/pluma/Makefile:1.76 pkgsrc/editors/pluma/Makefile:1.77
--- pkgsrc/editors/pluma/Makefile:1.76  Tue Jan 27 08:39:21 2026
+++ pkgsrc/editors/pluma/Makefile       Fri May 15 17:00:56 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2026/01/27 08:39:21 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2026/05/15 17:00:56 wiz Exp $
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
@@ -10,9 +10,11 @@ CATEGORIES=  editors
 
 COMMENT=       Small and lightweight UTF-8 text editor for MATE
 
-USE_TOOLS+=    bash:run perl
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
 
+USE_TOOLS+=    bash:run perl
+
 CFLAGS+=       -Wno-incompatible-pointer-types
 
 PKGCONFIG_OVERRIDE+=   data/pluma.pc.in
@@ -30,6 +32,8 @@ post-install:
 
 .include "options.mk"
 
+BUILDLINK_DEPMETHOD.gobject-introspection=     build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/libpeas/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../lang/python/application.mk"

Index: pkgsrc/fonts/gucharmap/Makefile
diff -u pkgsrc/fonts/gucharmap/Makefile:1.132 pkgsrc/fonts/gucharmap/Makefile:1.133
--- pkgsrc/fonts/gucharmap/Makefile:1.132       Tue Jan 27 08:39:27 2026
+++ pkgsrc/fonts/gucharmap/Makefile     Fri May 15 17:00:56 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2026/01/27 08:39:27 wiz Exp $
+# $NetBSD: Makefile,v 1.133 2026/05/15 17:00:56 wiz Exp $
 
 DISTNAME=      gucharmap-15.1.2
 PKGREVISION=   12
@@ -11,6 +11,7 @@ HOMEPAGE=     https://wiki.gnome.org/Apps/Gu
 COMMENT=       Unicode/ISO10646 character map and font viewer
 LICENSE=       gnu-gpl-v3 AND unicode
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
 DEPENDS+=      unicode-character-database-[0-9]*:../../textproc/unicode-character-database
 

Index: pkgsrc/fonts/harfbuzz/options.mk
diff -u pkgsrc/fonts/harfbuzz/options.mk:1.20 pkgsrc/fonts/harfbuzz/options.mk:1.21
--- pkgsrc/fonts/harfbuzz/options.mk:1.20       Tue Apr 21 20:53:41 2026
+++ pkgsrc/fonts/harfbuzz/options.mk    Fri May 15 17:00:57 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2026/04/21 20:53:41 wiz Exp $
+# $NetBSD: options.mk,v 1.21 2026/05/15 17:00:57 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.harfbuzz
 PKG_SUPPORTED_OPTIONS+=        introspection
@@ -26,6 +26,7 @@ MESON_ARGS+=  -Dintrospection=enabled
 # XXX This should be TOOL_DEPENDS, no?
 BUILDLINK_DEPMETHOD.gobject-introspection+=    build
 .include "../../devel/gobject-introspection/buildlink3.mk"
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
 PLIST.introspection=   yes
 .else
 MESON_ARGS+=   -Dintrospection=disabled

Index: pkgsrc/geography/geoclue/Makefile
diff -u pkgsrc/geography/geoclue/Makefile:1.57 pkgsrc/geography/geoclue/Makefile:1.58
--- pkgsrc/geography/geoclue/Makefile:1.57      Wed Jan  7 08:47:11 2026
+++ pkgsrc/geography/geoclue/Makefile   Fri May 15 17:00:57 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2026/01/07 08:47:11 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2026/05/15 17:00:57 wiz Exp $
 
 DISTNAME=      geoclue-2.5.7
 PKGREVISION=   20
@@ -10,6 +10,7 @@ HOMEPAGE=     https://gitlab.freedesktop.org
 COMMENT=       Geoinformation service API and base providers
 LICENSE=       gnu-lgpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
 

Index: pkgsrc/geography/geocode-glib/Makefile
diff -u pkgsrc/geography/geocode-glib/Makefile:1.22 pkgsrc/geography/geocode-glib/Makefile:1.23
--- pkgsrc/geography/geocode-glib/Makefile:1.22 Wed Jan  7 08:47:11 2026
+++ pkgsrc/geography/geocode-glib/Makefile      Fri May 15 17:00:57 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2026/01/07 08:47:11 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2026/05/15 17:00:57 wiz Exp $
 
 DISTNAME=      geocode-glib-3.26.2
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -12,6 +12,7 @@ COMMENT=      GNOME convenience library for g
 LICENSE=       gnu-lgpl-v2
 
 TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 
 USE_TOOLS+=    pkg-config xgettext
 

Index: pkgsrc/geography/libchamplain012/Makefile
diff -u pkgsrc/geography/libchamplain012/Makefile:1.68 pkgsrc/geography/libchamplain012/Makefile:1.69
--- pkgsrc/geography/libchamplain012/Makefile:1.68      Tue Jan 27 08:39:34 2026
+++ pkgsrc/geography/libchamplain012/Makefile   Fri May 15 17:00:57 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2026/01/27 08:39:34 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2026/05/15 17:00:57 wiz Exp $
 
 DISTNAME=      libchamplain-0.12.20
 PKGNAME=       ${DISTNAME:S/ain/ain012/}
@@ -12,6 +12,8 @@ HOMEPAGE=     https://projects.gnome.org/lib
 COMMENT=       Map widget
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config
 MESON_ARGS+=   -Dmemphis=true
 

Index: pkgsrc/geography/libmemphis02/Makefile
diff -u pkgsrc/geography/libmemphis02/Makefile:1.23 pkgsrc/geography/libmemphis02/Makefile:1.24
--- pkgsrc/geography/libmemphis02/Makefile:1.23 Tue Jan 27 08:39:34 2026
+++ pkgsrc/geography/libmemphis02/Makefile      Fri May 15 17:00:57 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2026/01/27 08:39:34 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2026/05/15 17:00:57 wiz Exp $
 
 DISTNAME=      memphis-0.2.3
 PKGNAME=       libmemphis02-0.2.3
@@ -13,6 +13,8 @@ HOMEPAGE=     https://github.com/jiuka/memph
 COMMENT=       Library for OpenStreetMap
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_LANGUAGES= c c++

Index: pkgsrc/geography/osm-gps-map/Makefile
diff -u pkgsrc/geography/osm-gps-map/Makefile:1.63 pkgsrc/geography/osm-gps-map/Makefile:1.64
--- pkgsrc/geography/osm-gps-map/Makefile:1.63  Tue Jan 27 08:39:35 2026
+++ pkgsrc/geography/osm-gps-map/Makefile       Fri May 15 17:00:57 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2026/01/27 08:39:35 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2026/05/15 17:00:57 wiz Exp $
 
 DISTNAME=      osm-gps-map-1.2.0
 PKGREVISION=   29
@@ -11,6 +11,8 @@ HOMEPAGE=     https://github.com/nzjrs/osm-g
 COMMENT=       Gtk+ Widget for Displaying OpenStreetMap tiles
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gmake pkg-config

Index: pkgsrc/graphics/clutter/Makefile
diff -u pkgsrc/graphics/clutter/Makefile:1.84 pkgsrc/graphics/clutter/Makefile:1.85
--- pkgsrc/graphics/clutter/Makefile:1.84       Tue Jan 27 08:39:37 2026
+++ pkgsrc/graphics/clutter/Makefile    Fri May 15 17:00:57 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2026/01/27 08:39:37 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2026/05/15 17:00:57 wiz Exp $
 
 DISTNAME=      clutter-1.26.2
 PKGREVISION=   23
@@ -11,6 +11,8 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       Open GL based interactive canvas library
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config

Index: pkgsrc/graphics/clutter-gtk/Makefile
diff -u pkgsrc/graphics/clutter-gtk/Makefile:1.68 pkgsrc/graphics/clutter-gtk/Makefile:1.69
--- pkgsrc/graphics/clutter-gtk/Makefile:1.68   Tue Jan 27 08:39:37 2026
+++ pkgsrc/graphics/clutter-gtk/Makefile        Fri May 15 17:00:57 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2026/01/27 08:39:37 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2026/05/15 17:00:57 wiz Exp $
 
 DISTNAME=      clutter-gtk-1.8.4
 PKGREVISION=   20
@@ -11,6 +11,8 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       GTK+ Integration library for Clutter
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 

Index: pkgsrc/graphics/cogl/Makefile
diff -u pkgsrc/graphics/cogl/Makefile:1.44 pkgsrc/graphics/cogl/Makefile:1.45
--- pkgsrc/graphics/cogl/Makefile:1.44  Tue Jan 27 08:39:38 2026
+++ pkgsrc/graphics/cogl/Makefile       Fri May 15 17:00:58 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2026/01/27 08:39:38 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2026/05/15 17:00:58 wiz Exp $
 
 DISTNAME=      cogl-1.22.0
 PKGREVISION=   24
@@ -13,6 +13,8 @@ LICENSE=      mit AND sgi-free-software-b-v2.
 # if --standalone
 # LICENSE += AND gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 CONFLICTS+=    clutter<1.8
 
 GNU_CONFIGURE=         yes

Index: pkgsrc/graphics/colord/options.mk
diff -u pkgsrc/graphics/colord/options.mk:1.1 pkgsrc/graphics/colord/options.mk:1.2
--- pkgsrc/graphics/colord/options.mk:1.1       Sun Apr 26 14:48:56 2026
+++ pkgsrc/graphics/colord/options.mk   Fri May 15 17:00:58 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2026/04/26 14:48:56 vins Exp $
+# $NetBSD: options.mk,v 1.2 2026/05/15 17:00:58 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.colord
 PKG_SUPPORTED_OPTIONS= doc introspection sane udev vapi
@@ -30,6 +30,7 @@ MESON_ARGS+=  -Ddocs=false
 #
 .if !empty(PKG_OPTIONS:Mintrospection)
 MESON_ARGS+=   -Dintrospection=true
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 .  include "../../devel/gobject-introspection/buildlink3.mk"
 PLIST.introspection=   yes
 .else

Index: pkgsrc/graphics/colord-gtk/Makefile
diff -u pkgsrc/graphics/colord-gtk/Makefile:1.22 pkgsrc/graphics/colord-gtk/Makefile:1.23
--- pkgsrc/graphics/colord-gtk/Makefile:1.22    Sun Apr 26 20:02:40 2026
+++ pkgsrc/graphics/colord-gtk/Makefile Fri May 15 17:00:58 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2026/04/26 20:02:40 vins Exp $
+# $NetBSD: Makefile,v 1.23 2026/05/15 17:00:58 wiz Exp $
 
 DISTNAME=      colord-gtk-0.3.1
 PKGREVISION=   1
@@ -11,13 +11,14 @@ HOMEPAGE=   https://www.freedesktop.org/so
 COMMENT=       Manage color profiles to accurately color input/output devices
 LICENSE=       gnu-gpl-v3
 
-USE_TOOLS+=    pkg-config xgettext
+TOOL_DEPENDS+=         docbook-xsl-ns-[0-9]*:../../textproc/docbook-xsl-ns
+
+USE_TOOLS+=            pkg-config xgettext
 
 USE_PKGLOCALEDIR=      yes
 
 PYTHON_FOR_BUILD_ONLY= tool
 
-TOOL_DEPENDS+=         docbook-xsl-ns-[0-9]*:../../textproc/docbook-xsl-ns
 DOCBOOK_MANPAGE_XSL=   ${PREFIX}/share/xsl/docbook-ns/manpages/docbook.xsl
 
 SUBST_CLASSES+=                man

Index: pkgsrc/graphics/colord-gtk/options.mk
diff -u pkgsrc/graphics/colord-gtk/options.mk:1.1 pkgsrc/graphics/colord-gtk/options.mk:1.2
--- pkgsrc/graphics/colord-gtk/options.mk:1.1   Sun Apr 26 16:55:31 2026
+++ pkgsrc/graphics/colord-gtk/options.mk       Fri May 15 17:00:58 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2026/04/26 16:55:31 vins Exp $
+# $NetBSD: options.mk,v 1.2 2026/05/15 17:00:58 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.colord-gtk
 
@@ -52,6 +52,7 @@ MESON_ARGS+=    -Dgtk4=false
 #
 .if !empty(PKG_OPTIONS:Mintrospection)
 MESON_ARGS+=    -Dintrospection=true
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 .  include "../../devel/gobject-introspection/buildlink3.mk"
 PLIST.introspection=    yes
 .else

Index: pkgsrc/graphics/eog/Makefile
diff -u pkgsrc/graphics/eog/Makefile:1.143 pkgsrc/graphics/eog/Makefile:1.144
--- pkgsrc/graphics/eog/Makefile:1.143  Tue Jan 27 08:39:38 2026
+++ pkgsrc/graphics/eog/Makefile        Fri May 15 17:00:58 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.143 2026/01/27 08:39:38 wiz Exp $
+# $NetBSD: Makefile,v 1.144 2026/05/15 17:00:58 wiz Exp $
 
 DISTNAME=      eog-40.3
 PKGREVISION=   28
@@ -11,6 +11,8 @@ HOMEPAGE=     https://www.gnome.org/
 COMMENT=       Eye of GNOME: an image viewing and cataloging program
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 PREV_PKGPATH=  graphics/eog3
 
 USE_TOOLS+=    msgfmt pkg-config xgettext itstool

Index: pkgsrc/graphics/eom/Makefile
diff -u pkgsrc/graphics/eom/Makefile:1.62 pkgsrc/graphics/eom/Makefile:1.63
--- pkgsrc/graphics/eom/Makefile:1.62   Tue Jan 27 08:39:39 2026
+++ pkgsrc/graphics/eom/Makefile        Fri May 15 17:00:58 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2026/01/27 08:39:39 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2026/05/15 17:00:58 wiz Exp $
 
 # XXX: meta-pkgs/mate/Makefile.common includes pyversion.mk which sets the
 # python version too early and clashes with PYTHON_VERSIONS_INCOMPATIBLE
@@ -13,6 +13,8 @@ CATEGORIES=   graphics
 
 COMMENT=       Eye of MATE: an image viewing and cataloging program
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 PKGCONFIG_OVERRIDE+=   data/eom.pc.in
 
 BUILDLINK_TRANSFORM.SunOS+=    rm:-lutil
@@ -21,6 +23,8 @@ BUILDLINK_TRANSFORM.SunOS+=   rm:-lutil
 
 .include "../../devel/glib2/schemas.mk"
 
+BUILDLINK_DEPMETHOD.gobject-introspection=     build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../x11/mate-desktop/buildlink3.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/graphics/gdk-pixbuf2/options.mk
diff -u pkgsrc/graphics/gdk-pixbuf2/options.mk:1.2 pkgsrc/graphics/gdk-pixbuf2/options.mk:1.3
--- pkgsrc/graphics/gdk-pixbuf2/options.mk:1.2  Sat Oct 26 07:35:54 2024
+++ pkgsrc/graphics/gdk-pixbuf2/options.mk      Fri May 15 17:00:58 2026
@@ -1,5 +1,4 @@
-#      $NetBSD: options.mk,v 1.2 2024/10/26 07:35:54 nia Exp $
-#
+#      $NetBSD: options.mk,v 1.3 2026/05/15 17:00:58 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gdk-pixbuf2
 PKG_SUPPORTED_OPTIONS= introspection tests
@@ -13,6 +12,8 @@ PLIST.introspection=  yes
 MESON_ARGS+=           -Dintrospection=enabled
 BUILDLINK_DEPMETHOD.gobject-introspection:= build
 .include "../../devel/gobject-introspection/buildlink3.mk"
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+#.include "../../devel/glib2-introspection/buildlink3.mk"
 .else
 MESON_ARGS+=           -Dintrospection=disabled
 .endif

Index: pkgsrc/graphics/gegl/Makefile
diff -u pkgsrc/graphics/gegl/Makefile:1.160 pkgsrc/graphics/gegl/Makefile:1.161
--- pkgsrc/graphics/gegl/Makefile:1.160 Sun Mar 29 17:02:21 2026
+++ pkgsrc/graphics/gegl/Makefile       Fri May 15 17:00:58 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.160 2026/03/29 17:02:21 wiz Exp $
+# $NetBSD: Makefile,v 1.161 2026/05/15 17:00:58 wiz Exp $
 
 DISTNAME=      gegl-0.4.70
 CATEGORIES=    graphics
@@ -10,6 +10,8 @@ HOMEPAGE=     https://gegl.org/
 COMMENT=       Graph based image processing framework
 LICENSE=       gnu-gpl-v3
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 MESON_ARGS+=   -Dlibv4l=disabled
 MESON_ARGS+=   -Dlibv4l2=disabled
 # Some binaries that are required to generate docs

Index: pkgsrc/graphics/gexiv2/Makefile
diff -u pkgsrc/graphics/gexiv2/Makefile:1.38 pkgsrc/graphics/gexiv2/Makefile:1.39
--- pkgsrc/graphics/gexiv2/Makefile:1.38        Thu Oct 23 20:37:29 2025
+++ pkgsrc/graphics/gexiv2/Makefile     Fri May 15 17:00:58 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2025/10/23 20:37:29 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2026/05/15 17:00:58 wiz Exp $
 
 DISTNAME=      gexiv2-0.14.3
 PKGREVISION=   2
@@ -11,6 +11,7 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       GObject-based wrapper around the Exiv2 library
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
 # "error: 'for' loop initial declarations are only allowed in C99 mode"

Index: pkgsrc/graphics/goocanvas2/Makefile
diff -u pkgsrc/graphics/goocanvas2/Makefile:1.42 pkgsrc/graphics/goocanvas2/Makefile:1.43
--- pkgsrc/graphics/goocanvas2/Makefile:1.42    Tue Jan 27 08:39:41 2026
+++ pkgsrc/graphics/goocanvas2/Makefile Fri May 15 17:00:58 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2026/01/27 08:39:41 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2026/05/15 17:00:58 wiz Exp $
 
 DISTNAME=      goocanvas-2.0.4
 PKGNAME=       ${DISTNAME:S/-/2-/}
@@ -12,6 +12,8 @@ HOMEPAGE=     https://live.gnome.org/GooCanv
 COMMENT=       Cairo-based canvas widget for GTK+3.0
 LICENSE=       gnu-lgpl-v2
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
 USE_TOOLS+=            pkg-config msgfmt gmake
@@ -20,6 +22,8 @@ USE_PKGLOCALEDIR=     yes
 
 PKGCONFIG_OVERRIDE+=   goocanvas-2.0.pc.in
 
+CFLAGS+=               -Wno-incompatible-pointer-types
+
 TOOLS_NOOP+=           python
 CONFIGURE_ARGS+=       --enable-python=no
 

Index: pkgsrc/graphics/graphene/Makefile
diff -u pkgsrc/graphics/graphene/Makefile:1.9 pkgsrc/graphics/graphene/Makefile:1.10
--- pkgsrc/graphics/graphene/Makefile:1.9       Thu Oct 23 20:37:31 2025
+++ pkgsrc/graphics/graphene/Makefile   Fri May 15 17:00:59 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2025/10/23 20:37:31 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2026/05/15 17:00:59 wiz Exp $
 
 DISTNAME=      graphene-1.10.8
 PKGREVISION=   3
@@ -11,6 +11,8 @@ HOMEPAGE=     https://ebassi.github.io/graph
 COMMENT=       Thin layer of graphic data types
 LICENSE=       mit
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config
 
 MESON_ARGS+=   -Dgobject_types=true

Index: pkgsrc/graphics/librsvg/Makefile
diff -u pkgsrc/graphics/librsvg/Makefile:1.182 pkgsrc/graphics/librsvg/Makefile:1.183
--- pkgsrc/graphics/librsvg/Makefile:1.182      Wed Jan 28 17:25:08 2026
+++ pkgsrc/graphics/librsvg/Makefile    Fri May 15 17:00:59 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.182 2026/01/28 17:25:08 adam Exp $
+# $NetBSD: Makefile,v 1.183 2026/05/15 17:00:59 wiz Exp $
 
 DISTNAME=      librsvg-2.60.2
 CATEGORIES=    graphics gnome
@@ -11,6 +11,7 @@ COMMENT=      SVG library for GNOME
 LICENSE=       gnu-lgpl-v2.1
 
 TOOL_DEPENDS+= cargo-c>=0.9.19:../../devel/cargo-c
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config

Index: pkgsrc/graphics/librsvg-c/Makefile
diff -u pkgsrc/graphics/librsvg-c/Makefile:1.35 pkgsrc/graphics/librsvg-c/Makefile:1.36
--- pkgsrc/graphics/librsvg-c/Makefile:1.35     Tue Jan 27 08:39:44 2026
+++ pkgsrc/graphics/librsvg-c/Makefile  Fri May 15 17:00:59 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2026/01/27 08:39:44 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2026/05/15 17:00:59 wiz Exp $
 
 DISTNAME=      librsvg-2.40.21
 PKGREVISION=   30
@@ -36,6 +36,7 @@ PLIST_VARS+=  introspection
 .if !empty(PKG_OPTIONS:Mintrospection)
 PLIST.introspection=   yes
 CONFIGURE_ARGS+=       --enable-introspection
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
 BUILDLINK_DEPMETHOD.gobject-introspection+=    build
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .else

Index: pkgsrc/inputmethod/fcitx/Makefile
diff -u pkgsrc/inputmethod/fcitx/Makefile:1.62 pkgsrc/inputmethod/fcitx/Makefile:1.63
--- pkgsrc/inputmethod/fcitx/Makefile:1.62      Tue Jan 27 08:39:54 2026
+++ pkgsrc/inputmethod/fcitx/Makefile   Fri May 15 17:00:59 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2026/01/27 08:39:54 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.63 2026/05/15 17:00:59 wiz Exp $
 
 DISTNAME=              fcitx-4.2.9.6
 PKGREVISION=           39
@@ -26,6 +25,8 @@ MAINTAINER=           rxg%NetBSD.org@localhost
 HOMEPAGE=              https://www.fcitx-im.org/
 COMMENT=               Free Chinese Input Toy of X
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_LANGUAGES+=                c c++
 
 USE_TOOLS+=            bash:run gmake pkg-config

Index: pkgsrc/inputmethod/fcitx5-gtk/Makefile
diff -u pkgsrc/inputmethod/fcitx5-gtk/Makefile:1.33 pkgsrc/inputmethod/fcitx5-gtk/Makefile:1.34
--- pkgsrc/inputmethod/fcitx5-gtk/Makefile:1.33 Fri May 15 16:12:04 2026
+++ pkgsrc/inputmethod/fcitx5-gtk/Makefile      Fri May 15 17:00:59 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2026/05/15 16:12:04 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2026/05/15 17:00:59 wiz Exp $
 
 DISTNAME=      fcitx5-gtk-5.1.6
 CATEGORIES=    inputmethod
@@ -9,7 +9,7 @@ HOMEPAGE=       https://github.com/fcitx/fcitx
 COMMENT=       GTK input method module for fcitx5
 LICENSE=       gnu-lgpl-v2.1
 
-#TOOL_DEPENDS+=        glib2-introspection-[0-9]*:../../wip/glib2-introspection
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++

Index: pkgsrc/inputmethod/ibus/Makefile
diff -u pkgsrc/inputmethod/ibus/Makefile:1.121 pkgsrc/inputmethod/ibus/Makefile:1.122
--- pkgsrc/inputmethod/ibus/Makefile:1.121      Thu Apr 30 06:17:25 2026
+++ pkgsrc/inputmethod/ibus/Makefile    Fri May 15 17:00:59 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2026/04/30 06:17:25 tsutsui Exp $
+# $NetBSD: Makefile,v 1.122 2026/05/15 17:00:59 wiz Exp $
 
 DISTNAME=      ibus-1.5.34
 PKGNAME=       ${DISTNAME:S/-rc/rc/:S/-beta/beta/}
@@ -10,16 +10,14 @@ GITHUB_RELEASE=     ${DISTNAME:S/${PKGBASE}-
 MAINTAINER=    tsutsui%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/ibus/ibus/wiki
 LICENSE=       gnu-lgpl-v2.1
-
 COMMENT=       Intelligent Input Bus
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 TOOL_DEPENDS+= cldr-emoji-annotation>=37.0.13.0.0.2:../../textproc/cldr-emoji-annotation
 TOOL_DEPENDS+= unicode-character-database>=15.0.0:../../textproc/unicode-character-database
 TOOL_DEPENDS+= unicode-emoji>=15.0:../../textproc/unicode-emoji
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 GNU_CONFIGURE=                 yes
 USE_LIBTOOL=                   yes
 USE_TOOLS+=                    pkg-config intltool msgfmt gmake msgmerge

Index: pkgsrc/inputmethod/ibus-anthy/Makefile
diff -u pkgsrc/inputmethod/ibus-anthy/Makefile:1.32 pkgsrc/inputmethod/ibus-anthy/Makefile:1.33
--- pkgsrc/inputmethod/ibus-anthy/Makefile:1.32 Thu Oct 23 20:37:56 2025
+++ pkgsrc/inputmethod/ibus-anthy/Makefile      Fri May 15 17:00:59 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2025/10/23 20:37:56 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2026/05/15 17:00:59 wiz Exp $
 
 DISTNAME=      ibus-anthy-1.5.15
 PKGREVISION=   2
@@ -11,6 +11,7 @@ HOMEPAGE=     https://github.com/ibus/ibus/w
 COMMENT=       Anthy engine for IBus input platform
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 DEPENDS+=      kasumi>=2.1:../../inputmethod/kasumi
 DEPENDS+=      ibus>=1.5.4:../../inputmethod/ibus
 DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
@@ -26,8 +27,6 @@ CONFIGURE_ARGS+=      --with-kasumi-exec=${LO
 CONFIGURE_ARGS+=       --with-kasumi-icon=${LOCALBASE}/share/pixmaps/kasumi.png
 CONFIGURE_ARGS+=       --with-layout=default
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gettext-tools/msgfmt-desktop.mk"
 BUILDLINK_API_DEPENDS.glib2+=          glib2>=2.26.0

Index: pkgsrc/inputmethod/input-pad/options.mk
diff -u pkgsrc/inputmethod/input-pad/options.mk:1.6 pkgsrc/inputmethod/input-pad/options.mk:1.7
--- pkgsrc/inputmethod/input-pad/options.mk:1.6 Sat Apr 13 00:48:57 2024
+++ pkgsrc/inputmethod/input-pad/options.mk     Fri May 15 17:00:59 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2024/04/13 00:48:57 riastradh Exp $
+# $NetBSD: options.mk,v 1.7 2026/05/15 17:00:59 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.input-pad
@@ -33,6 +33,7 @@ PLIST.xtest=          yes
 # Introspection support
 #
 .if !empty(PKG_OPTIONS:Mintrospection)
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
 BUILDLINK_DEPMETHOD.gobject-introspection=     build
 .include "../../devel/gobject-introspection/buildlink3.mk"
 PLIST.introspection=   yes

Index: pkgsrc/inputmethod/libskk/Makefile
diff -u pkgsrc/inputmethod/libskk/Makefile:1.21 pkgsrc/inputmethod/libskk/Makefile:1.22
--- pkgsrc/inputmethod/libskk/Makefile:1.21     Thu Oct 23 20:37:59 2025
+++ pkgsrc/inputmethod/libskk/Makefile  Fri May 15 17:01:00 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2025/10/23 20:37:59 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.22 2026/05/15 17:01:00 wiz Exp $
 
 DISTNAME=      libskk-1.0.5
 PKGREVISION=   5
@@ -14,6 +13,8 @@ HOMEPAGE=     https://github.com/ueno/libskk
 COMMENT=       Library to deal with Japnese kana-to-kanji conversion method
 LICENSE=       gnu-gpl-v3
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake intltool pkg-config msgfmt
@@ -26,6 +27,9 @@ CONFIGURE_ARGS+=      --enable-introspection=
 
 TEST_TARGET=           check
 
+CFLAGS+=               -Wno-incompatible-pointer-types
+CFLAGS+=               -Wno-int-conversion
+
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=0.9.0
 BUILDLINK_DEPMETHOD.gobject-introspection+=    build

Index: pkgsrc/math/gnome-calculator/Makefile
diff -u pkgsrc/math/gnome-calculator/Makefile:1.88 pkgsrc/math/gnome-calculator/Makefile:1.89
--- pkgsrc/math/gnome-calculator/Makefile:1.88  Thu May 14 16:41:27 2026
+++ pkgsrc/math/gnome-calculator/Makefile       Fri May 15 17:01:00 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2026/05/14 16:41:27 ryoon Exp $
+# $NetBSD: Makefile,v 1.89 2026/05/15 17:01:00 wiz Exp $
 
 DISTNAME=              gnome-calculator-45.0.2
 PKGREVISION=           22
@@ -11,6 +11,7 @@ HOMEPAGE=             https://wiki.gnome.org/Apps/C
 COMMENT=               Desktop calculator for GNOME
 LICENSE=               gnu-gpl-v2
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
 DEPENDS+=              gnome-icon-theme-symbolic-[0-9]*:../../graphics/gnome-icon-theme-symbolic
 
 CONFLICTS+=            gcalctool-[0-9]*

Index: pkgsrc/multimedia/clutter-gst/Makefile
diff -u pkgsrc/multimedia/clutter-gst/Makefile:1.67 pkgsrc/multimedia/clutter-gst/Makefile:1.68
--- pkgsrc/multimedia/clutter-gst/Makefile:1.67 Tue Jan 27 08:40:15 2026
+++ pkgsrc/multimedia/clutter-gst/Makefile      Fri May 15 17:01:00 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2026/01/27 08:40:15 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2026/05/15 17:01:00 wiz Exp $
 
 DISTNAME=      clutter-gst-3.0.26
 PKGREVISION=   22
@@ -11,6 +11,8 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       Clutter GStreamer integration
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gmake pkg-config

Index: pkgsrc/multimedia/gst-plugins1-bad/Makefile
diff -u pkgsrc/multimedia/gst-plugins1-bad/Makefile:1.27 pkgsrc/multimedia/gst-plugins1-bad/Makefile:1.28
--- pkgsrc/multimedia/gst-plugins1-bad/Makefile:1.27    Fri Feb 13 18:50:22 2026
+++ pkgsrc/multimedia/gst-plugins1-bad/Makefile Fri May 15 17:01:00 2026
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.27 2026/02/13 18:50:22 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2026/05/15 17:01:00 wiz Exp $
 
 PKGNAME=       ${DISTNAME:S/plugins/plugins1/}
 CATEGORIES=    multimedia gnome
 
 COMMENT=       Open source multimedia framework - bad plugins
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    xgettext
 
 GST_PLUGINS+=  accurip

Index: pkgsrc/multimedia/gst-plugins1-base/Makefile
diff -u pkgsrc/multimedia/gst-plugins1-base/Makefile:1.40 pkgsrc/multimedia/gst-plugins1-base/Makefile:1.41
--- pkgsrc/multimedia/gst-plugins1-base/Makefile:1.40   Thu Oct 30 15:35:36 2025
+++ pkgsrc/multimedia/gst-plugins1-base/Makefile        Fri May 15 17:01:00 2026
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.40 2025/10/30 15:35:36 adam Exp $
+# $NetBSD: Makefile,v 1.41 2026/05/15 17:01:00 wiz Exp $
 
 PKGNAME=       ${DISTNAME:S/plugins/plugins1/}
 CATEGORIES=    multimedia gnome
 
 COMMENT=       Open source multimedia framework - base plugins
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    xgettext
 
 GST_PLUGINS+=  adder

Index: pkgsrc/multimedia/gst-plugins1-editing-services/Makefile
diff -u pkgsrc/multimedia/gst-plugins1-editing-services/Makefile:1.43 pkgsrc/multimedia/gst-plugins1-editing-services/Makefile:1.44
--- pkgsrc/multimedia/gst-plugins1-editing-services/Makefile:1.43       Fri Feb 13 18:50:22 2026
+++ pkgsrc/multimedia/gst-plugins1-editing-services/Makefile    Fri May 15 17:01:00 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2026/02/13 18:50:22 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2026/05/15 17:01:00 wiz Exp $
 
 .include "../../multimedia/gstreamer1/version.mk"
 
@@ -12,6 +12,7 @@ HOMEPAGE=     https://gstreamer.freedesktop.
 COMMENT=       Open source multimedia framework - editing services plugin
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
 USE_TOOLS+=    flex pkg-config

Index: pkgsrc/multimedia/gstreamer1/Makefile
diff -u pkgsrc/multimedia/gstreamer1/Makefile:1.72 pkgsrc/multimedia/gstreamer1/Makefile:1.73
--- pkgsrc/multimedia/gstreamer1/Makefile:1.72  Thu Oct 30 15:35:35 2025
+++ pkgsrc/multimedia/gstreamer1/Makefile       Fri May 15 17:01:00 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2025/10/30 15:35:35 adam Exp $
+# $NetBSD: Makefile,v 1.73 2026/05/15 17:01:00 wiz Exp $
 
 .include "version.mk"
 
@@ -8,6 +8,8 @@ CATEGORIES=     multimedia
 MASTER_SITES=  https://gstreamer.freedesktop.org/src/gstreamer/
 EXTRACT_SUFX=  .tar.xz
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 COMMENT=       Open source multimedia framework
 
 USE_TOOLS+=    bison flex perl pkg-config xgettext

Index: pkgsrc/multimedia/totem-pl-parser/Makefile
diff -u pkgsrc/multimedia/totem-pl-parser/Makefile:1.97 pkgsrc/multimedia/totem-pl-parser/Makefile:1.98
--- pkgsrc/multimedia/totem-pl-parser/Makefile:1.97     Sat Feb 14 08:33:35 2026
+++ pkgsrc/multimedia/totem-pl-parser/Makefile  Fri May 15 17:01:00 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2026/02/14 08:33:35 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2026/05/15 17:01:00 wiz Exp $
 
 DISTNAME=      totem-pl-parser-3.26.6
 PKGREVISION=   7
@@ -11,6 +11,8 @@ HOMEPAGE=     https://gitlab.gnome.org/bugzi
 COMMENT=       Totem playlist parser
 LICENSE=       gnu-lgpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config xgettext
 
 # workaround for build failure

Index: pkgsrc/net/gnome-online-accounts/Makefile
diff -u pkgsrc/net/gnome-online-accounts/Makefile:1.74 pkgsrc/net/gnome-online-accounts/Makefile:1.75
--- pkgsrc/net/gnome-online-accounts/Makefile:1.74      Thu May 14 16:41:43 2026
+++ pkgsrc/net/gnome-online-accounts/Makefile   Fri May 15 17:01:01 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2026/05/14 16:41:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.75 2026/05/15 17:01:01 wiz Exp $
 
 DISTNAME=      gnome-online-accounts-3.58.1
 PKGREVISION=   1
@@ -14,6 +14,7 @@ LICENSE=      gnu-lgpl-v2
 USE_TOOLS+=            gdbus-codegen pkg-config
 USE_PKGLOCALEDIR=      yes
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
 # required to generate man pages
 TOOL_DEPENDS+=         docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 DOCBOOK_MANPAGE_XSL=   ${PREFIX}/share/xsl/docbook/manpages/docbook.xsl
@@ -36,6 +37,7 @@ BUILDLINK_DEPMETHOD.${dep}=   build
 .endfor
 
 .include "../../devel/glib2/schemas.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/vala/buildlink3.mk"

Index: pkgsrc/net/grilo/Makefile
diff -u pkgsrc/net/grilo/Makefile:1.69 pkgsrc/net/grilo/Makefile:1.70
--- pkgsrc/net/grilo/Makefile:1.69      Wed Jan  7 08:48:16 2026
+++ pkgsrc/net/grilo/Makefile   Fri May 15 17:01:01 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2026/01/07 08:48:16 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2026/05/15 17:01:01 wiz Exp $
 
 DISTNAME=      grilo-0.3.16
 PKGREVISION=   8
@@ -11,6 +11,8 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       Media browser framework
 LICENSE=       gnu-lgpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config xgettext
 
 MESON_ARGS+=   -Denable-gtk-doc=false

Index: pkgsrc/net/gssdp/Makefile
diff -u pkgsrc/net/gssdp/Makefile:1.117 pkgsrc/net/gssdp/Makefile:1.118
--- pkgsrc/net/gssdp/Makefile:1.117     Wed Jan  7 08:48:17 2026
+++ pkgsrc/net/gssdp/Makefile   Fri May 15 17:01:01 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.117 2026/01/07 08:48:17 wiz Exp $
+# $NetBSD: Makefile,v 1.118 2026/05/15 17:01:01 wiz Exp $
 
 DISTNAME=      gssdp-1.6.2
 PKGREVISION=   11
@@ -11,6 +11,8 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       Simple Service Discovery Protocol library and device sniffer
 LICENSE=       gnu-lgpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config
 
 # needs pandoc

Index: pkgsrc/net/gst-rtsp-server/Makefile
diff -u pkgsrc/net/gst-rtsp-server/Makefile:1.19 pkgsrc/net/gst-rtsp-server/Makefile:1.20
--- pkgsrc/net/gst-rtsp-server/Makefile:1.19    Thu Oct 30 15:35:43 2025
+++ pkgsrc/net/gst-rtsp-server/Makefile Fri May 15 17:01:01 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2025/10/30 15:35:43 adam Exp $
+# $NetBSD: Makefile,v 1.20 2026/05/15 17:01:01 wiz Exp $
 
 .include "../../multimedia/gstreamer1/version.mk"
 
@@ -11,6 +11,8 @@ HOMEPAGE=     https://gstreamer.freedesktop.
 COMMENT=       GStreamer RTSP server
 LICENSE=       gnu-lgpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 PYTHON_FOR_BUILD_ONLY=         tool
 
 USE_TOOLS+=            pkg-config

Index: pkgsrc/net/gtk-vnc/Makefile
diff -u pkgsrc/net/gtk-vnc/Makefile:1.129 pkgsrc/net/gtk-vnc/Makefile:1.130
--- pkgsrc/net/gtk-vnc/Makefile:1.129   Thu May 14 16:41:44 2026
+++ pkgsrc/net/gtk-vnc/Makefile Fri May 15 17:01:01 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2026/05/14 16:41:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.130 2026/05/15 17:01:01 wiz Exp $
 
 DISTNAME=      gtk-vnc-1.3.1
 PKGREVISION=   19
@@ -11,6 +11,8 @@ HOMEPAGE=     https://gitlab.gnome.org/GNOME
 COMMENT=       VNC viewer widget for GTK
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    intltool msgfmt pkg-config
 
 PKGCONFIG_OVERRIDE+=   output/meson-private/*.pc

Index: pkgsrc/net/gupnp/Makefile
diff -u pkgsrc/net/gupnp/Makefile:1.103 pkgsrc/net/gupnp/Makefile:1.104
--- pkgsrc/net/gupnp/Makefile:1.103     Wed Jan  7 08:48:18 2026
+++ pkgsrc/net/gupnp/Makefile   Fri May 15 17:01:01 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2026/01/07 08:48:18 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2026/05/15 17:01:01 wiz Exp $
 
 DISTNAME=      gupnp-1.6.9
 PKGREVISION=   3
@@ -11,6 +11,7 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       Framework for UPnP devices
 LICENSE=       gnu-lgpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
 TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 

Index: pkgsrc/net/gupnp-av/Makefile
diff -u pkgsrc/net/gupnp-av/Makefile:1.70 pkgsrc/net/gupnp-av/Makefile:1.71
--- pkgsrc/net/gupnp-av/Makefile:1.70   Wed Jan  7 08:48:18 2026
+++ pkgsrc/net/gupnp-av/Makefile        Fri May 15 17:01:01 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2026/01/07 08:48:18 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2026/05/15 17:01:01 wiz Exp $
 
 DISTNAME=      gupnp-av-0.14.4
 PKGREVISION=   3
@@ -11,6 +11,8 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       Helpers for audio/video applications using GUPnP
 LICENSE=       gnu-lgpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config
 
 PKGCONFIG_OVERRIDE+=           output/meson-private/gupnp-av-1.0.pc

Index: pkgsrc/net/gupnp-dlna/Makefile
diff -u pkgsrc/net/gupnp-dlna/Makefile:1.57 pkgsrc/net/gupnp-dlna/Makefile:1.58
--- pkgsrc/net/gupnp-dlna/Makefile:1.57 Wed Jan  7 08:48:18 2026
+++ pkgsrc/net/gupnp-dlna/Makefile      Fri May 15 17:01:01 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2026/01/07 08:48:18 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2026/05/15 17:01:01 wiz Exp $
 
 DISTNAME=      gupnp-dlna-0.12.0
 PKGREVISION=   11
@@ -11,6 +11,8 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       Small DLNA-related utility library
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config
 
 PKGCONFIG_OVERRIDE+=           output/meson-private/gupnp-dlna-2.0.pc

Index: pkgsrc/net/gupnp-igd/Makefile
diff -u pkgsrc/net/gupnp-igd/Makefile:1.68 pkgsrc/net/gupnp-igd/Makefile:1.69
--- pkgsrc/net/gupnp-igd/Makefile:1.68  Wed Jan  7 08:48:18 2026
+++ pkgsrc/net/gupnp-igd/Makefile       Fri May 15 17:01:02 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2026/01/07 08:48:18 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2026/05/15 17:01:02 wiz Exp $
 
 DISTNAME=      gupnp-igd-1.6.0
 PKGREVISION=   10
@@ -11,6 +11,8 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       Library to handle UPnP IGD port mapping
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config
 
 PKGCONFIG_OVERRIDE+=           output/meson-private/gupnp-igd-1.6.pc

Index: pkgsrc/net/libgdata/Makefile
diff -u pkgsrc/net/libgdata/Makefile:1.92 pkgsrc/net/libgdata/Makefile:1.93
--- pkgsrc/net/libgdata/Makefile:1.92   Tue Jan 27 08:40:21 2026
+++ pkgsrc/net/libgdata/Makefile        Fri May 15 17:01:02 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2026/01/27 08:40:21 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2026/05/15 17:01:02 wiz Exp $
 
 DISTNAME=      libgdata-0.18.1
 PKGREVISION=   14
@@ -11,6 +11,8 @@ HOMEPAGE=     https://live.gnome.org/libgdat
 COMMENT=       Google Data API based Glib client library
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            intltool msgfmt pkg-config
 

Index: pkgsrc/net/libnice/Makefile
diff -u pkgsrc/net/libnice/Makefile:1.89 pkgsrc/net/libnice/Makefile:1.90
--- pkgsrc/net/libnice/Makefile:1.89    Thu May 14 16:41:46 2026
+++ pkgsrc/net/libnice/Makefile Fri May 15 17:01:02 2026
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.89 2026/05/14 16:41:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.90 2026/05/15 17:01:02 wiz Exp $
 
 PKGREVISION= 3
 .include "Makefile.common"
 
+TOOL_DEPENDS+=                 glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 PKGCONFIG_OVERRIDE+=           output/meson-private/nice.pc
 PKGCONFIG_OVERRIDE_STAGE=      pre-install
 

Index: pkgsrc/net/libsoup/Makefile
diff -u pkgsrc/net/libsoup/Makefile:1.86 pkgsrc/net/libsoup/Makefile:1.87
--- pkgsrc/net/libsoup/Makefile:1.86    Wed Jan  7 08:48:21 2026
+++ pkgsrc/net/libsoup/Makefile Fri May 15 17:01:02 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2026/01/07 08:48:21 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2026/05/15 17:01:02 wiz Exp $
 
 DISTNAME=      libsoup-2.74.3
 PKGREVISION=   13
@@ -11,6 +11,7 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       HTTP library implementation in C (major version 2)
 LICENSE=       gnu-lgpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 DEPENDS+=      glib-networking-[0-9]*:../../net/glib-networking
 
 USE_LANGUAGES= c99

Index: pkgsrc/net/libsoup3/Makefile
diff -u pkgsrc/net/libsoup3/Makefile:1.26 pkgsrc/net/libsoup3/Makefile:1.27
--- pkgsrc/net/libsoup3/Makefile:1.26   Thu May 14 16:41:47 2026
+++ pkgsrc/net/libsoup3/Makefile        Fri May 15 17:01:02 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2026/05/14 16:41:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.27 2026/05/15 17:01:02 wiz Exp $
 
 DISTNAME=      libsoup-3.6.6
 PKGNAME=       ${DISTNAME:S/soup/soup3/}
@@ -12,6 +12,7 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       HTTP library implementation in C (major version 3)
 LICENSE=       gnu-lgpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 DEPENDS+=      glib-networking-[0-9]*:../../net/glib-networking
 # not found by meson
 #TOOL_DEPENDS+=        ${PYPKGPREFIX}-gi-docgen-[0-9]*:../../devel/py-gi-docgen
@@ -40,7 +41,7 @@ PYTHON_FOR_BUILD_ONLY=                tool
 
 .include "options.mk"
 
-# prevent sprurious git cloning of gi-docgen in configure stage
+# prevent spurious git cloning of gi-docgen in configure stage
 post-extract:
        rm -f ${WRKSRC}/subprojects/*.wrap
 

Index: pkgsrc/print/evince/Makefile
diff -u pkgsrc/print/evince/Makefile:1.199 pkgsrc/print/evince/Makefile:1.200
--- pkgsrc/print/evince/Makefile:1.199  Thu May 14 16:41:55 2026
+++ pkgsrc/print/evince/Makefile        Fri May 15 17:01:02 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.199 2026/05/14 16:41:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.200 2026/05/15 17:01:02 wiz Exp $
 
 DISTNAME=      evince-48.1
 PKGREVISION=   4
@@ -11,6 +11,8 @@ HOMEPAGE=     https://wiki.gnome.org/Apps/Ev
 COMMENT=       Document viewer for multiple document formats
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS=             itstool msgfmt pkg-config
 

Index: pkgsrc/print/poppler/Makefile
diff -u pkgsrc/print/poppler/Makefile:1.126 pkgsrc/print/poppler/Makefile:1.127
--- pkgsrc/print/poppler/Makefile:1.126 Fri May 15 09:59:00 2026
+++ pkgsrc/print/poppler/Makefile       Fri May 15 17:01:02 2026
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.126 2026/05/15 09:59:00 adam Exp $
+# $NetBSD: Makefile,v 1.127 2026/05/15 17:01:02 wiz Exp $
 
 COMMENT=       PDF rendering library
 PKGREVISION=   10
 
 SUPERSEDES+=   poppler-glib-[0-9]*
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 PKGCONFIG_OVERRIDE+=   poppler.pc.cmake
 PKGCONFIG_OVERRIDE+=   poppler-glib.pc.cmake
 

Index: pkgsrc/security/gcr/Makefile
diff -u pkgsrc/security/gcr/Makefile:1.51 pkgsrc/security/gcr/Makefile:1.52
--- pkgsrc/security/gcr/Makefile:1.51   Sat May  9 13:43:15 2026
+++ pkgsrc/security/gcr/Makefile        Fri May 15 17:01:02 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2026/05/09 13:43:15 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2026/05/15 17:01:02 wiz Exp $
 
 DISTNAME=      gcr-3.41.2
 CATEGORIES=    security
@@ -11,6 +11,7 @@ COMMENT=      Library for crypto UI and relat
 LICENSE=       gnu-gpl-v2
 
 TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= ${PYPKGPREFIX}-gi-docgen-[0-9]*:../../devel/py-gi-docgen
 DEPENDS+=      gnupg2-[0-9]*:../../security/gnupg2
 

Index: pkgsrc/security/gcr/buildlink3.mk
diff -u pkgsrc/security/gcr/buildlink3.mk:1.26 pkgsrc/security/gcr/buildlink3.mk:1.27
--- pkgsrc/security/gcr/buildlink3.mk:1.26      Fri May  1 14:23:28 2026
+++ pkgsrc/security/gcr/buildlink3.mk   Fri May 15 17:01:02 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2026/05/01 14:23:28 vins Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2026/05/15 17:01:02 wiz Exp $
 
 BUILDLINK_TREE+=       gcr
 
@@ -11,7 +11,6 @@ BUILDLINK_PKGSRCDIR.gcr?=     ../../security
 
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.38
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/p11-kit/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"

Index: pkgsrc/security/gcr4/Makefile
diff -u pkgsrc/security/gcr4/Makefile:1.2 pkgsrc/security/gcr4/Makefile:1.3
--- pkgsrc/security/gcr4/Makefile:1.2   Thu May 14 16:41:59 2026
+++ pkgsrc/security/gcr4/Makefile       Fri May 15 17:01:02 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2026/05/14 16:41:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2026/05/15 17:01:02 wiz Exp $
 
 DISTNAME=      gcr-4.4.0.1
 PKGNAME=       ${DISTNAME:S/gcr/gcr4/}
@@ -44,6 +44,5 @@ PKGCONFIG_OVERRIDE+=          output/meson-priva
 .include "../../security/libsecret/buildlink3.mk"
 .include "../../security/p11-kit/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-
 .include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/security/gcr4/buildlink3.mk
diff -u pkgsrc/security/gcr4/buildlink3.mk:1.2 pkgsrc/security/gcr4/buildlink3.mk:1.3
--- pkgsrc/security/gcr4/buildlink3.mk:1.2      Thu May 14 16:41:59 2026
+++ pkgsrc/security/gcr4/buildlink3.mk  Fri May 15 17:01:02 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2026/05/14 16:41:59 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2026/05/15 17:01:02 wiz Exp $
 
 BUILDLINK_TREE+=       gcr4
 
@@ -20,10 +20,6 @@ pkgbase :=      gcr4
 .  include "../../x11/gtk4/buildlink3.mk"
 .endif
 
-.if ${PKG_BUILD_OPTIONS.gcr4:Mintrospection}
-.  include "../../devel/gobject-introspection/buildlink3.mk"
-.endif
-
 .if ${PKG_BUILD_OPTIONS.gcr4:Mlibgcrypt}
 .  include "../../security/libgcrypt/buildlink3.mk"
 .elif ${PKG_BUILD_OPTIONS.gcr4:Mgnutls}

Index: pkgsrc/security/gcr4/options.mk
diff -u pkgsrc/security/gcr4/options.mk:1.3 pkgsrc/security/gcr4/options.mk:1.4
--- pkgsrc/security/gcr4/options.mk:1.3 Sat May  9 12:23:05 2026
+++ pkgsrc/security/gcr4/options.mk     Fri May 15 17:01:03 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2026/05/09 12:23:05 vins Exp $
+# $NetBSD: options.mk,v 1.4 2026/05/15 17:01:03 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gcr4
 
@@ -43,6 +43,7 @@ MESON_ARGS+=    -Dgtk4=false
 .if !empty(PKG_OPTIONS:Mintrospection)
 BUILDLINK_DEPMETHOD.gobject-introspection=     build
 MESON_ARGS+=    -Dintrospection=true
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 .  include "../../devel/gobject-introspection/buildlink3.mk"
 PLIST.introspection=    yes
 .else

Index: pkgsrc/security/libsecret/Makefile
diff -u pkgsrc/security/libsecret/Makefile:1.39 pkgsrc/security/libsecret/Makefile:1.40
--- pkgsrc/security/libsecret/Makefile:1.39     Sat Jan 17 21:13:49 2026
+++ pkgsrc/security/libsecret/Makefile  Fri May 15 17:01:03 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2026/01/17 21:13:49 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2026/05/15 17:01:03 wiz Exp $
 
 DISTNAME=      libsecret-0.20.5
 PKGREVISION=   3
@@ -12,6 +12,7 @@ COMMENT=      GObject based library for acces
 LICENSE=       gnu-lgpl-v2.1
 
 TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
 TEST_DEPENDS+= ${PYPKGPREFIX}-dbus-[0-9]*:../../sysutils/py-dbus
 

Index: pkgsrc/security/polkit/Makefile
diff -u pkgsrc/security/polkit/Makefile:1.59 pkgsrc/security/polkit/Makefile:1.60
--- pkgsrc/security/polkit/Makefile:1.59        Mon Feb  2 16:47:20 2026
+++ pkgsrc/security/polkit/Makefile     Fri May 15 17:01:03 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2026/02/02 16:47:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.60 2026/05/15 17:01:03 wiz Exp $
 
 DISTNAME=      polkit-127
 CATEGORIES=    security
@@ -12,6 +12,7 @@ LICENSE=      gnu-lgpl-v2
 TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
 TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
 
 NOT_PAX_MPROTECT_SAFE= lib/polkit-1/polkitd

Index: pkgsrc/sysutils/accountsservice/Makefile
diff -u pkgsrc/sysutils/accountsservice/Makefile:1.11 pkgsrc/sysutils/accountsservice/Makefile:1.12
--- pkgsrc/sysutils/accountsservice/Makefile:1.11       Thu Oct 23 20:39:13 2025
+++ pkgsrc/sysutils/accountsservice/Makefile    Fri May 15 17:01:03 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2025/10/23 20:39:13 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2026/05/15 17:01:03 wiz Exp $
 
 DISTNAME=      accountsservice-0.6.42
 PKGREVISION=   6
@@ -11,6 +11,8 @@ HOMEPAGE=     https://www.freedesktop.org/so
 COMMENT=       Set of D-Bus interfaces for accessing account information
 LICENSE=       gnu-gpl-v3
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    pkg-config intltool gmake autoconf autoreconf automake msgfmt
@@ -18,6 +20,8 @@ USE_TOOLS+=   gdbus-codegen
 
 EGDIR=         ${PREFIX}/share/examples/accountsservice
 
+CFLAGS+=       -Wno-implicit-function-declaration
+
 CONFIGURE_ARGS+=       --disable-systemd \
                        --sysconfdir=${EGDIR}
 

Index: pkgsrc/sysutils/accountsservice/buildlink3.mk
diff -u pkgsrc/sysutils/accountsservice/buildlink3.mk:1.5 pkgsrc/sysutils/accountsservice/buildlink3.mk:1.6
--- pkgsrc/sysutils/accountsservice/buildlink3.mk:1.5   Thu Oct 23 20:39:13 2025
+++ pkgsrc/sysutils/accountsservice/buildlink3.mk       Fri May 15 17:01:03 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2025/10/23 20:39:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2026/05/15 17:01:03 wiz Exp $
 
 BUILDLINK_TREE+=       accountsservice
 
@@ -9,8 +9,6 @@ BUILDLINK_API_DEPENDS.accountsservice+= 
 BUILDLINK_ABI_DEPENDS.accountsservice?=        accountsservice>=0.6.42nb6
 BUILDLINK_PKGSRCDIR.accountsservice?=  ../../sysutils/accountsservice
 
-.include "../../devel/gobject-introspection/buildlink3.mk"
-
 .include "../../security/polkit/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .endif # ACCOUNTSSERVICE_BUILDLINK3_MK

Index: pkgsrc/sysutils/ayatana-ido/Makefile
diff -u pkgsrc/sysutils/ayatana-ido/Makefile:1.9 pkgsrc/sysutils/ayatana-ido/Makefile:1.10
--- pkgsrc/sysutils/ayatana-ido/Makefile:1.9    Tue Jan 27 08:40:32 2026
+++ pkgsrc/sysutils/ayatana-ido/Makefile        Fri May 15 17:01:03 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2026/01/27 08:40:32 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2026/05/15 17:01:03 wiz Exp $
 
 DISTNAME=      ayatana-ido-0.10.2
 PKGREVISION=   8
@@ -11,6 +11,8 @@ HOMEPAGE=     https://github.com/AyatanaIndi
 COMMENT=       Ayatana Indicator Display Objects
 LICENSE=       gnu-lgpl-v2 AND gnu-lgpl-v2.1 AND gnu-lgpl-v3 AND gnu-gpl-v3
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 

Index: pkgsrc/sysutils/brasero/Makefile
diff -u pkgsrc/sysutils/brasero/Makefile:1.125 pkgsrc/sysutils/brasero/Makefile:1.126
--- pkgsrc/sysutils/brasero/Makefile:1.125      Tue Jan 27 08:40:32 2026
+++ pkgsrc/sysutils/brasero/Makefile    Fri May 15 17:01:03 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.125 2026/01/27 08:40:32 wiz Exp $
+# $NetBSD: Makefile,v 1.126 2026/05/15 17:01:03 wiz Exp $
 
 DISTNAME=      brasero-3.12.3
 PKGREVISION=   2
@@ -11,14 +11,15 @@ HOMEPAGE=   https://wiki.gnome.org/Apps/Br
 COMMENT=       CD/DVD burning application
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+TOOL_DEPENDS+= p5-XML-LibXML>=1.58:../../textproc/p5-XML-LibXML
+
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    intltool pkg-config perl
 USE_TOOLS+=    msgfmt xgettext itstool
 USE_TOOLS+=    gmake
 
-TOOL_DEPENDS+= p5-XML-LibXML>=1.58:../../textproc/p5-XML-LibXML
-
 CONFIGURE_ARGS+=       --disable-nautilus
 CONFIGURE_ARGS+=       --enable-compile-warnings=minimum # Disable Werror
 

Index: pkgsrc/sysutils/caja-dropbox/Makefile
diff -u pkgsrc/sysutils/caja-dropbox/Makefile:1.49 pkgsrc/sysutils/caja-dropbox/Makefile:1.50
--- pkgsrc/sysutils/caja-dropbox/Makefile:1.49  Tue Jan 27 08:40:32 2026
+++ pkgsrc/sysutils/caja-dropbox/Makefile       Fri May 15 17:01:03 2026
@@ -1,7 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2026/01/27 08:40:32 wiz Exp $
-
-# Makefile.common already includes python .mk files, so need to set this here
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+# $NetBSD: Makefile,v 1.50 2026/05/15 17:01:03 wiz Exp $
 
 PKGREVISION= 15
 .include "../../meta-pkgs/mate/Makefile.common"

Index: pkgsrc/sysutils/gnome-tracker/Makefile
diff -u pkgsrc/sysutils/gnome-tracker/Makefile:1.32 pkgsrc/sysutils/gnome-tracker/Makefile:1.33
--- pkgsrc/sysutils/gnome-tracker/Makefile:1.32 Wed Jan  7 08:48:51 2026
+++ pkgsrc/sysutils/gnome-tracker/Makefile      Fri May 15 17:01:03 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2026/01/07 08:48:51 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2026/05/15 17:01:03 wiz Exp $
 
 DISTNAME=      tracker-3.0.1
 PKGNAME=       gnome-${DISTNAME}
@@ -15,6 +15,7 @@ LICENSE=      gnu-gpl-v2 AND gnu-lgpl-v2.1
 USE_TOOLS+=    pkg-config xgettext
 
 TOOL_DEPENDS+= asciidoc>=10.1.4:../../textproc/asciidoc
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt # xsltproc
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3

Index: pkgsrc/sysutils/gvfs/Makefile
diff -u pkgsrc/sysutils/gvfs/Makefile:1.145 pkgsrc/sysutils/gvfs/Makefile:1.146
--- pkgsrc/sysutils/gvfs/Makefile:1.145 Thu May 14 16:42:06 2026
+++ pkgsrc/sysutils/gvfs/Makefile       Fri May 15 17:01:03 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.145 2026/05/14 16:42:06 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.146 2026/05/15 17:01:03 wiz Exp $
 
 DISTNAME=      gvfs-1.60.0
 PKGREVISION=   2
@@ -12,6 +11,8 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       Userspace virtual filesystem
 LICENSE=       gnu-lgpl-v2
 
+TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+
 USE_TOOLS+=    pkg-config
 
 USE_PKGLOCALEDIR=      yes

Index: pkgsrc/sysutils/libnotify/Makefile
diff -u pkgsrc/sysutils/libnotify/Makefile:1.91 pkgsrc/sysutils/libnotify/Makefile:1.92
--- pkgsrc/sysutils/libnotify/Makefile:1.91     Tue Jan 27 08:40:36 2026
+++ pkgsrc/sysutils/libnotify/Makefile  Fri May 15 17:01:04 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2026/01/27 08:40:36 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2026/05/15 17:01:04 wiz Exp $
 
 DISTNAME=      libnotify-0.8.4
 PKGREVISION=   5
@@ -12,6 +12,7 @@ COMMENT=      Desktop notification framework
 LICENSE=       gnu-lgpl-v2.1
 
 TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
 
 CONFLICTS+=    libnotify07-[0-9]*

Index: pkgsrc/sysutils/lxpanel/Makefile
diff -u pkgsrc/sysutils/lxpanel/Makefile:1.41 pkgsrc/sysutils/lxpanel/Makefile:1.42
--- pkgsrc/sysutils/lxpanel/Makefile:1.41       Tue Jan 27 08:40:36 2026
+++ pkgsrc/sysutils/lxpanel/Makefile    Fri May 15 17:01:04 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2026/01/27 08:40:36 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2026/05/15 17:01:04 wiz Exp $
 
 DISTNAME=      lxpanel-0.10.1
 PKGREVISION=   18
@@ -20,6 +20,8 @@ USE_TOOLS+=           intltool msgfmt perl pkg-co
 CONFIGURE_ARGS+=       --with-plugins="deskno, xkb, wnckpager"
 PKGCONFIG_OVERRIDE+=   lxpanel.pc.in
 
+CFLAGS+=       -Wno-incompatible-pointer-types
+
 PKG_SYSCONFSUBDIR=     xdg
 
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/lxpanel/default/panels        \

Index: pkgsrc/sysutils/spice-gtk/Makefile
diff -u pkgsrc/sysutils/spice-gtk/Makefile:1.32 pkgsrc/sysutils/spice-gtk/Makefile:1.33
--- pkgsrc/sysutils/spice-gtk/Makefile:1.32     Tue Jan 27 08:40:38 2026
+++ pkgsrc/sysutils/spice-gtk/Makefile  Fri May 15 17:01:04 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2026/01/27 08:40:38 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2026/05/15 17:01:04 wiz Exp $
 
 DISTNAME=      spice-gtk-0.42
 PKGREVISION=   4
@@ -11,10 +11,11 @@ HOMEPAGE=   https://www.spice-space.org/sp
 COMMENT=       GTK+ widget for SPICE clients
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
 DEPENDS+=      ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
-TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
 
 USE_TOOLS+=            msgfmt pkg-config
 USE_PKGLOCALEDIR=      yes

Index: pkgsrc/sysutils/upower/options.mk
diff -u pkgsrc/sysutils/upower/options.mk:1.6 pkgsrc/sysutils/upower/options.mk:1.7
--- pkgsrc/sysutils/upower/options.mk:1.6       Sat May  2 07:27:23 2026
+++ pkgsrc/sysutils/upower/options.mk   Fri May 15 17:01:04 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2026/05/02 07:27:23 vins Exp $
+# $NetBSD: options.mk,v 1.7 2026/05/15 17:01:04 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.upower
 
@@ -24,6 +24,7 @@ MESON_ARGS+=  -Dgtk-doc=false
 ### Build GObject Introspection data
 ###
 .if !empty(PKG_OPTIONS:Mintrospection)
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 BUILDLINK_DEPMETHOD.gobject-introspection+= build
 .include "../../devel/gobject-introspection/buildlink3.mk"
 MESON_ARGS+=    -Dintrospection=enabled

Index: pkgsrc/sysutils/xfce4-thunar/Makefile
diff -u pkgsrc/sysutils/xfce4-thunar/Makefile:1.115 pkgsrc/sysutils/xfce4-thunar/Makefile:1.116
--- pkgsrc/sysutils/xfce4-thunar/Makefile:1.115 Tue Apr  7 21:37:40 2026
+++ pkgsrc/sysutils/xfce4-thunar/Makefile       Fri May 15 17:01:04 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2026/04/07 21:37:40 gutteridge Exp $
+# $NetBSD: Makefile,v 1.116 2026/05/15 17:01:04 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -10,6 +10,8 @@ MASTER_SITES= https://archive.xfce.org/s
 HOMEPAGE=      https://docs.xfce.org/xfce/thunar/start
 COMMENT=       Xfce file manager
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_LANGUAGES=         c
 USE_CC_FEATURES=       c99
 

Index: pkgsrc/textproc/gspell/Makefile
diff -u pkgsrc/textproc/gspell/Makefile:1.53 pkgsrc/textproc/gspell/Makefile:1.54
--- pkgsrc/textproc/gspell/Makefile:1.53        Tue Jan 27 08:40:41 2026
+++ pkgsrc/textproc/gspell/Makefile     Fri May 15 17:01:04 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2026/01/27 08:40:41 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2026/05/15 17:01:04 wiz Exp $
 
 DISTNAME=      gspell-1.8.4
 PKGREVISION=   13
@@ -36,6 +36,7 @@ SUBST_MESSAGE.tests=    Disabling tests.
 SUBST_FILES.tests=      Makefile.in
 SUBST_SED.tests=        -e 's,tests testsuite,,'
 .else
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
 .include "../../devel/gobject-introspection/buildlink3.mk"
 PLIST.gir=             yes
 .endif

Index: pkgsrc/textproc/json-glib/Makefile
diff -u pkgsrc/textproc/json-glib/Makefile:1.45 pkgsrc/textproc/json-glib/Makefile:1.46
--- pkgsrc/textproc/json-glib/Makefile:1.45     Thu Oct 23 20:39:33 2025
+++ pkgsrc/textproc/json-glib/Makefile  Fri May 15 17:01:04 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2025/10/23 20:39:33 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2026/05/15 17:01:04 wiz Exp $
 
 DISTNAME=      json-glib-1.10.6
 PKGREVISION=   2
@@ -12,6 +12,7 @@ COMMENT=      JSON parser for GLib-based libr
 LICENSE=       gnu-lgpl-v2.1
 
 TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
 TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
 

Index: pkgsrc/textproc/libxmlb/Makefile
diff -u pkgsrc/textproc/libxmlb/Makefile:1.9 pkgsrc/textproc/libxmlb/Makefile:1.10
--- pkgsrc/textproc/libxmlb/Makefile:1.9        Sun Apr 19 14:57:23 2026
+++ pkgsrc/textproc/libxmlb/Makefile    Fri May 15 17:01:04 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2026/04/19 14:57:23 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2026/05/15 17:01:04 wiz Exp $
 
 DISTNAME=      libxmlb-0.3.26
 CATEGORIES=    textproc
@@ -11,6 +11,8 @@ HOMEPAGE=     https://github.com/hughsie/lib
 COMMENT=       Library to help create and query binary XML blobs
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config
 
 PKGCONFIG_OVERRIDE+=           output/meson-private/xmlb.pc

Index: pkgsrc/time/gnome-pomodoro/Makefile
diff -u pkgsrc/time/gnome-pomodoro/Makefile:1.35 pkgsrc/time/gnome-pomodoro/Makefile:1.36
--- pkgsrc/time/gnome-pomodoro/Makefile:1.35    Tue Jan 27 08:40:43 2026
+++ pkgsrc/time/gnome-pomodoro/Makefile Fri May 15 17:01:05 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2026/01/27 08:40:43 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2026/05/15 17:01:05 wiz Exp $
 
 DISTNAME=      gnome-pomodoro-0.17.0
 PKGREVISION=   29
@@ -13,11 +13,13 @@ COMMENT=    Pomodoro timer for Gnome
 LICENSE=       gnu-gpl-v3
 
 TOOL_DEPENDS+=         autoconf-archive-[0-9]*:../../devel/autoconf-archive
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+=         vala-[0-9]*:../../lang/vala
 
 # Broken generated code uses g_return_if_fail when g_return_val_if_fail
 # is necessary
 CFLAGS+=       -Wno-return-type
+CFLAGS+=       -Wno-return-mismatch
 
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes

Index: pkgsrc/time/libical4/Makefile
diff -u pkgsrc/time/libical4/Makefile:1.3 pkgsrc/time/libical4/Makefile:1.4
--- pkgsrc/time/libical4/Makefile:1.3   Sun May 10 17:55:23 2026
+++ pkgsrc/time/libical4/Makefile       Fri May 15 17:01:05 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2026/05/10 17:55:23 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2026/05/15 17:01:05 wiz Exp $
 
 DISTNAME=      libical-4.0.0
 PKGNAME=       ${DISTNAME:S/libical/libical4/}
@@ -11,6 +11,8 @@ HOMEPAGE=     https://github.com/libical/lib
 COMMENT=       Reference implementation of the iCalendar data type and format (v4)
 LICENSE=       gnu-lgpl-v2.1 OR mpl-2.0
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 CONFLICTS=     libical-[0-9]*
 
 USE_TOOLS+=    perl pkg-config

Index: pkgsrc/wayland/gtk-layer-shell/Makefile
diff -u pkgsrc/wayland/gtk-layer-shell/Makefile:1.1 pkgsrc/wayland/gtk-layer-shell/Makefile:1.2
--- pkgsrc/wayland/gtk-layer-shell/Makefile:1.1 Tue Apr 14 12:41:02 2026
+++ pkgsrc/wayland/gtk-layer-shell/Makefile     Fri May 15 17:01:05 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2026/04/14 12:41:02 kikadf Exp $
+# $NetBSD: Makefile,v 1.2 2026/05/15 17:01:05 wiz Exp $
 
 DISTNAME=      gtk-layer-shell-0.10.1
 CATEGORIES=    wayland
@@ -10,6 +10,8 @@ HOMEPAGE=     https://github.com/wmww/gtk4-l
 COMMENT=       Library to create desktop components for Wayland
 LICENSE=       gnu-gpl-v3
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config
 
 .include "../../devel/gobject-introspection/buildlink3.mk"

Index: pkgsrc/wayland/gtk4-layer-shell/Makefile
diff -u pkgsrc/wayland/gtk4-layer-shell/Makefile:1.1 pkgsrc/wayland/gtk4-layer-shell/Makefile:1.2
--- pkgsrc/wayland/gtk4-layer-shell/Makefile:1.1        Tue Apr 14 13:05:20 2026
+++ pkgsrc/wayland/gtk4-layer-shell/Makefile    Fri May 15 17:01:05 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2026/04/14 13:05:20 kikadf Exp $
+# $NetBSD: Makefile,v 1.2 2026/05/15 17:01:05 wiz Exp $
 
 DISTNAME=      gtk4-layer-shell-1.3.0
 CATEGORIES=    wayland
@@ -10,6 +10,8 @@ HOMEPAGE=     https://github.com/wmww/gtk4-l
 COMMENT=       Library to create desktop components for Wayland
 LICENSE=       gnu-gpl-v3
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=    pkg-config
 
 .include "../../devel/gobject-introspection/buildlink3.mk"

Index: pkgsrc/wm/mutter/Makefile
diff -u pkgsrc/wm/mutter/Makefile:1.28 pkgsrc/wm/mutter/Makefile:1.29
--- pkgsrc/wm/mutter/Makefile:1.28      Tue Jan 27 08:40:46 2026
+++ pkgsrc/wm/mutter/Makefile   Fri May 15 17:01:05 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2026/01/27 08:40:46 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2026/05/15 17:01:05 wiz Exp $
 
 DISTNAME=      mutter-40.2
 PKGREVISION=   17
@@ -11,6 +11,8 @@ HOMEPAGE=     https://gitlab.gnome.org/GNOME
 COMMENT=       GNOME window manager
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=            msgfmt pkg-config gdbus-codegen
 BUILD_DEFS+=           PKG_SYSCONFBASE
 

Index: pkgsrc/www/libproxy/Makefile
diff -u pkgsrc/www/libproxy/Makefile:1.71 pkgsrc/www/libproxy/Makefile:1.72
--- pkgsrc/www/libproxy/Makefile:1.71   Thu May 14 16:42:21 2026
+++ pkgsrc/www/libproxy/Makefile        Fri May 15 17:01:05 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2026/05/14 16:42:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.72 2026/05/15 17:01:05 wiz Exp $
 
 DISTNAME=      libproxy-0.5.12
 PKGREVISION=   3
@@ -11,6 +11,8 @@ HOMEPAGE=     https://libproxy.github.io/lib
 COMMENT=       Library that provides automatic proxy configuration management
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_CC_FEATURES=       c99
 USE_CXX_FEATURES=      c++11
 USE_LANGUAGES=         c c++

Index: pkgsrc/www/librest/Makefile
diff -u pkgsrc/www/librest/Makefile:1.37 pkgsrc/www/librest/Makefile:1.38
--- pkgsrc/www/librest/Makefile:1.37    Thu May 14 16:42:21 2026
+++ pkgsrc/www/librest/Makefile Fri May 15 17:01:05 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2026/05/14 16:42:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.38 2026/05/15 17:01:05 wiz Exp $
 
 DISTNAME=      librest-0.10.2
 PKGREVISION=   1
@@ -11,6 +11,8 @@ HOMEPAGE=     https://gitlab.gnome.org/GNOME
 COMMENT=       Library for "RESTful" web services
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 CONFLICTS+=    librest07-[0-9]*
 SUPERSEDES+=   librest07-[0-9]*
 PREV_PKGPATH=  www/librest07

Index: pkgsrc/www/liferea/Makefile
diff -u pkgsrc/www/liferea/Makefile:1.211 pkgsrc/www/liferea/Makefile:1.212
--- pkgsrc/www/liferea/Makefile:1.211   Tue Jan 27 08:40:50 2026
+++ pkgsrc/www/liferea/Makefile Fri May 15 17:01:05 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.211 2026/01/27 08:40:50 wiz Exp $
+# $NetBSD: Makefile,v 1.212 2026/05/15 17:01:05 wiz Exp $
 
 DISTNAME=      liferea-1.12.8
 PKGREVISION=   36
@@ -12,6 +12,8 @@ HOMEPAGE=     https://lzone.de/liferea/
 COMMENT=       Simple FeedReader clone for reading RSS/RDF feeds
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake intltool msgfmt perl pkg-config
@@ -21,6 +23,8 @@ SHLIBTOOL_OVERRIDE=   # empty
 
 GLIB_SCHEMAS=          net.sf.liferea.gschema.xml
 
+CFLAGS+=       -Wno-incompatible-pointer-types
+
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/libpeas/buildlink3.mk"

Index: pkgsrc/www/midori/Makefile
diff -u pkgsrc/www/midori/Makefile:1.172 pkgsrc/www/midori/Makefile:1.173
--- pkgsrc/www/midori/Makefile:1.172    Fri May  1 14:30:34 2026
+++ pkgsrc/www/midori/Makefile  Fri May 15 17:01:06 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.172 2026/05/01 14:30:34 vins Exp $
+# $NetBSD: Makefile,v 1.173 2026/05/15 17:01:06 wiz Exp $
 
 DISTNAME=      midori-v9.0
 PKGNAME=       ${DISTNAME:S/v//}
@@ -12,6 +12,9 @@ MAINTAINER=           pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://midori-browser.org/
 COMMENT=               Lightweight web browser using WebKit
 LICENSE=               gnu-lgpl-v2.1
+
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_GCC_RUNTIME=       yes
 
 USE_CMAKE=     yes
@@ -21,11 +24,15 @@ BUILDLINK_TRANSFORM+=       rm:-Werror
 
 CONFIGURE_ENV+=        VALAC=${VALAC}
 
+CFLAGS+=       -Wno-int-conversion
+
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_DEPMETHOD.gobject-introspection=     build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/libpeas/buildlink3.mk"
 .include "../../graphics/adwaita-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"

Index: pkgsrc/www/uhttpmock/Makefile
diff -u pkgsrc/www/uhttpmock/Makefile:1.57 pkgsrc/www/uhttpmock/Makefile:1.58
--- pkgsrc/www/uhttpmock/Makefile:1.57  Wed Jan  7 08:49:27 2026
+++ pkgsrc/www/uhttpmock/Makefile       Fri May 15 17:01:06 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2026/01/07 08:49:27 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2026/05/15 17:01:06 wiz Exp $
 
 DISTNAME=      uhttpmock-0.11.0
 PKGREVISION=   8
@@ -11,9 +11,10 @@ HOMEPAGE=    https://gitlab.com/groups/uhtt
 COMMENT=       Library for mocking web service APIs which use HTTP or HTTPS
 LICENSE=       gnu-lgpl-v2.1
 
-USE_TOOLS+=    pkg-config
-
 TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
+USE_TOOLS+=    pkg-config
 
 PKGCONFIG_OVERRIDE+=   libuhttpmock/libuhttpmock.pc.in
 

Index: pkgsrc/www/webkit-gtk/Makefile
diff -u pkgsrc/www/webkit-gtk/Makefile:1.279 pkgsrc/www/webkit-gtk/Makefile:1.280
--- pkgsrc/www/webkit-gtk/Makefile:1.279        Sat Feb 14 07:41:01 2026
+++ pkgsrc/www/webkit-gtk/Makefile      Fri May 15 17:01:06 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.279 2026/02/14 07:41:01 taca Exp $
+# $NetBSD: Makefile,v 1.280 2026/05/15 17:01:06 wiz Exp $
 
 DISTNAME=      webkitgtk-2.36.8
 PKGREVISION=   1
@@ -17,6 +17,7 @@ LICENSE=      2-clause-bsd AND gnu-lgpl-v2
 NOT_FOR_PLATFORM=      NetBSD-[1-6].*-*
 
 TOOL_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 
 USE_LANGUAGES=         c c++
 USE_CXX_FEATURES+=     c++17

Index: pkgsrc/x11/eekboard/Makefile
diff -u pkgsrc/x11/eekboard/Makefile:1.96 pkgsrc/x11/eekboard/Makefile:1.97
--- pkgsrc/x11/eekboard/Makefile:1.96   Tue Jan 27 08:40:53 2026
+++ pkgsrc/x11/eekboard/Makefile        Fri May 15 17:01:06 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2026/01/27 08:40:53 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2026/05/15 17:01:06 wiz Exp $
 
 DISTNAME=      eekboard-1.0.8
 PKGREVISION=   64
@@ -12,6 +12,8 @@ HOMEPAGE=     https://github.com/ueno/eekboa
 COMMENT=       Virtual keyboard for GNOME
 LICENSE=       gnu-gpl-v3
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
@@ -19,6 +21,8 @@ USE_TOOLS+=           gmake pkg-config intltool m
 
 CONFIGURE_ARGS+=       --enable-introspection=yes
 
+CFLAGS+=       -Wno-incompatible-pointer-types
+
 WRKSRC=                ${WRKDIR}/${DISTNAME}
 
 PKGCONFIG_OVERRIDE+=   eek/eek-0.90.pc.in

Index: pkgsrc/x11/gnome-desktop/Makefile
diff -u pkgsrc/x11/gnome-desktop/Makefile:1.180 pkgsrc/x11/gnome-desktop/Makefile:1.181
--- pkgsrc/x11/gnome-desktop/Makefile:1.180     Tue Jan 27 08:40:53 2026
+++ pkgsrc/x11/gnome-desktop/Makefile   Fri May 15 17:01:06 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.180 2026/01/27 08:40:53 wiz Exp $
+# $NetBSD: Makefile,v 1.181 2026/05/15 17:01:06 wiz Exp $
 
 DISTNAME=              gnome-desktop-44.0
 PKGREVISION=           13
@@ -12,6 +12,7 @@ COMMENT=              Common GNOME2 desktop files an
 LICENSE=               gnu-gpl-v2 AND gnu-lgpl-v2
 
 TOOL_DEPENDS+=         gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
 
 #USE_TOOLS+=           gmake intltool msgfmt perl:run pkg-config
 USE_TOOLS+=            itstool msgfmt pkg-config

Index: pkgsrc/x11/gnome-desktop3/Makefile
diff -u pkgsrc/x11/gnome-desktop3/Makefile:1.70 pkgsrc/x11/gnome-desktop3/Makefile:1.71
--- pkgsrc/x11/gnome-desktop3/Makefile:1.70     Tue Jan 27 08:40:53 2026
+++ pkgsrc/x11/gnome-desktop3/Makefile  Fri May 15 17:01:06 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2026/01/27 08:40:53 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2026/05/15 17:01:06 wiz Exp $
 
 DISTNAME=      gnome-desktop-41.0
 PKGNAME=       ${DISTNAME:S/desktop/desktop3/}
@@ -12,6 +12,8 @@ HOMEPAGE=     https://www.gnome.org/
 COMMENT=       GNOME3 desktop-wide documents and libgnome-desktop library
 LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2 AND gnu-fdl-v1.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=            pkg-config xgettext gdbus-codegen
 
 PKGCONFIG_OVERRIDE+=   libgnome-desktop/gnome-desktop-3.0.pc.in

Index: pkgsrc/x11/gtk2/options.mk
diff -u pkgsrc/x11/gtk2/options.mk:1.20 pkgsrc/x11/gtk2/options.mk:1.21
--- pkgsrc/x11/gtk2/options.mk:1.20     Fri Apr 12 19:40:24 2024
+++ pkgsrc/x11/gtk2/options.mk  Fri May 15 17:01:06 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2024/04/12 19:40:24 riastradh Exp $
+# $NetBSD: options.mk,v 1.21 2026/05/15 17:01:06 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.gtk2
 PKG_SUPPORTED_OPTIONS=         cups debug introspection
@@ -31,6 +31,7 @@ PLIST_VARS+=          introspection
 .if !empty(PKG_OPTIONS:Mintrospection)
 CONFIGURE_ARGS+=       --enable-introspection=yes
 PLIST.introspection=   yes
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
 BUILDLINK_DEPMETHOD.gobject-introspection:=    build
 BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=0.9.3
 .include "../../devel/gobject-introspection/buildlink3.mk"

Index: pkgsrc/x11/gtk3/options.mk
diff -u pkgsrc/x11/gtk3/options.mk:1.34 pkgsrc/x11/gtk3/options.mk:1.35
--- pkgsrc/x11/gtk3/options.mk:1.34     Mon Feb 23 16:36:12 2026
+++ pkgsrc/x11/gtk3/options.mk  Fri May 15 17:01:06 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.34 2026/02/23 16:36:12 triaxx Exp $
+# $NetBSD: options.mk,v 1.35 2026/05/15 17:01:06 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk3
 PKG_SUPPORTED_OPTIONS+=        doc introspection gtk3-atk-bridge cups
@@ -88,6 +88,7 @@ MESON_ARGS+=  -Dgtk_doc=false
 PLIST_VARS+=   introspection
 .if ${PKG_OPTIONS:Mintrospection}
 PLIST.introspection=   yes
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
 BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=1.39.0
 .  include "../../devel/gobject-introspection/buildlink3.mk"
 .else

Index: pkgsrc/x11/gtk4/Makefile
diff -u pkgsrc/x11/gtk4/Makefile:1.73 pkgsrc/x11/gtk4/Makefile:1.74
--- pkgsrc/x11/gtk4/Makefile:1.73       Thu May 14 16:42:25 2026
+++ pkgsrc/x11/gtk4/Makefile    Fri May 15 17:01:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2026/05/14 16:42:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.74 2026/05/15 17:01:07 wiz Exp $
 
 DISTNAME=      gtk-4.20.3
 PKGNAME=       ${DISTNAME:S/gtk/gtk4/}
@@ -12,6 +12,7 @@ HOMEPAGE=     https://www.gtk.org/
 COMMENT=       Multi-platform toolkit for creating GUIs, version 4
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 # TEST_DEPENDS, but meson fails if it's not found
 TOOL_DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 # TODO: add more python dependencies?

Index: pkgsrc/x11/gtksourceview3/Makefile
diff -u pkgsrc/x11/gtksourceview3/Makefile:1.85 pkgsrc/x11/gtksourceview3/Makefile:1.86
--- pkgsrc/x11/gtksourceview3/Makefile:1.85     Tue Jan 27 08:40:57 2026
+++ pkgsrc/x11/gtksourceview3/Makefile  Fri May 15 17:01:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2026/01/27 08:40:57 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2026/05/15 17:01:07 wiz Exp $
 
 DISTNAME=      gtksourceview-3.24.11
 PKGNAME=       ${DISTNAME:S/gtksourceview/gtksourceview3/}
@@ -12,6 +12,8 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       Text widget that extends GTK3's GtkTextView widget (v3)
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake gsed msgfmt pkg-config itstool

Index: pkgsrc/x11/gtksourceview4/Makefile
diff -u pkgsrc/x11/gtksourceview4/Makefile:1.52 pkgsrc/x11/gtksourceview4/Makefile:1.53
--- pkgsrc/x11/gtksourceview4/Makefile:1.52     Tue Jan 27 08:40:57 2026
+++ pkgsrc/x11/gtksourceview4/Makefile  Fri May 15 17:01:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2026/01/27 08:40:57 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2026/05/15 17:01:07 wiz Exp $
 
 DISTNAME=      gtksourceview-4.8.4
 PKGNAME=       ${DISTNAME:S/gtksourceview/gtksourceview4/}
@@ -12,6 +12,8 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       Text widget that extends GTK3's GtkTextView widget (v4)
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=            msgfmt pkg-config itstool
 
 # avoid vala dependency

Index: pkgsrc/x11/gtksourceview5/Makefile
diff -u pkgsrc/x11/gtksourceview5/Makefile:1.18 pkgsrc/x11/gtksourceview5/Makefile:1.19
--- pkgsrc/x11/gtksourceview5/Makefile:1.18     Thu May 14 17:54:10 2026
+++ pkgsrc/x11/gtksourceview5/Makefile  Fri May 15 17:01:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2026/05/14 17:54:10 ryoon Exp $
+# $NetBSD: Makefile,v 1.19 2026/05/15 17:01:07 wiz Exp $
 
 DISTNAME=      gtksourceview-5.20.0
 PKGNAME=       ${DISTNAME:S/gtksourceview/gtksourceview5/}
@@ -11,6 +11,8 @@ HOMEPAGE=     https://wiki.gnome.org/Project
 COMMENT=       Text widget that extends GTK4's GtkTextView widget (v5)
 LICENSE=       gnu-lgpl-v2.1
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=            msgfmt pkg-config itstool
 
 PKGCONFIG_OVERRIDE+=   gtksourceview.pc.in

Index: pkgsrc/x11/keybinder/Makefile
diff -u pkgsrc/x11/keybinder/Makefile:1.28 pkgsrc/x11/keybinder/Makefile:1.29
--- pkgsrc/x11/keybinder/Makefile:1.28  Tue Jan 27 08:40:58 2026
+++ pkgsrc/x11/keybinder/Makefile       Fri May 15 17:01:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2026/01/27 08:40:58 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2026/05/15 17:01:07 wiz Exp $
 
 PKGREVISION= 27
 .include "Makefile.common"
@@ -9,6 +9,8 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Library for registering keyboard shortcuts
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 CONFIGURE_ARGS+=       --disable-lua
 CONFIGURE_ARGS+=       --disable-python
 

Index: pkgsrc/x11/keybinder3/Makefile
diff -u pkgsrc/x11/keybinder3/Makefile:1.24 pkgsrc/x11/keybinder3/Makefile:1.25
--- pkgsrc/x11/keybinder3/Makefile:1.24 Tue Jan 27 08:40:58 2026
+++ pkgsrc/x11/keybinder3/Makefile      Fri May 15 17:01:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2026/01/27 08:40:58 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2026/05/15 17:01:07 wiz Exp $
 
 DISTNAME=      keybinder-3.0-0.3.2
 PKGNAME=       keybinder3-0.3.2
@@ -11,6 +11,8 @@ HOMEPAGE=     https://github.com/engla/keybi
 COMMENT=       Library for registering keyboard shortcuts
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 PKGCONFIG_OVERRIDE+=   libkeybinder/keybinder-3.0.pc.in
 
 GNU_CONFIGURE= yes

Index: pkgsrc/x11/libgdm/Makefile
diff -u pkgsrc/x11/libgdm/Makefile:1.23 pkgsrc/x11/libgdm/Makefile:1.24
--- pkgsrc/x11/libgdm/Makefile:1.23     Tue Jan 27 08:40:59 2026
+++ pkgsrc/x11/libgdm/Makefile  Fri May 15 17:01:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2026/01/27 08:40:59 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2026/05/15 17:01:07 wiz Exp $
 
 DISTNAME=      gdm-40.0
 PKGNAME=       lib${DISTNAME}
@@ -12,6 +12,7 @@ HOMEPAGE=     https://www.gnome.org/
 COMMENT=       Gnome Display Manager - client library
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 DEPENDS+=      zenity>=3.32.0:../../x11/zenity
 
 USE_PKGLOCALEDIR=      YES
@@ -80,6 +81,8 @@ do-install:
                ${DESTDIR}${PREFIX}/share/glib-2.0/schemas
 
 .include "../../devel/meson/build.mk"
+BUILDLINK_DEPMETHOD.gobject-introspection=     build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 #.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
 BUILDLINK_DEPMETHOD.openpam=   build
 .include "../../security/openpam/buildlink3.mk"

Index: pkgsrc/x11/libxfce4util/Makefile
diff -u pkgsrc/x11/libxfce4util/Makefile:1.85 pkgsrc/x11/libxfce4util/Makefile:1.86
--- pkgsrc/x11/libxfce4util/Makefile:1.85       Tue Jan 27 08:40:59 2026
+++ pkgsrc/x11/libxfce4util/Makefile    Fri May 15 17:01:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2026/01/27 08:40:59 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2026/05/15 17:01:07 wiz Exp $
 
 PKGREVISION= 5
 .include "../../meta-pkgs/xfce4/Makefile.common"
@@ -7,6 +7,8 @@ DISTNAME=       libxfce4util-4.20.1
 CATEGORIES=    x11
 MASTER_SITES+= https://archive.xfce.org/src/xfce/libxfce4util/${PKGVERSION_NOREV:R}/
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 COMMENT=       Xfce basic library
 
 PKGCONFIG_OVERRIDE=    libxfce4util/libxfce4util-1.0.pc.in

Index: pkgsrc/x11/libxfce4windowing/Makefile
diff -u pkgsrc/x11/libxfce4windowing/Makefile:1.19 pkgsrc/x11/libxfce4windowing/Makefile:1.20
--- pkgsrc/x11/libxfce4windowing/Makefile:1.19  Tue Jan 27 08:40:59 2026
+++ pkgsrc/x11/libxfce4windowing/Makefile       Fri May 15 17:01:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2026/01/27 08:40:59 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2026/05/15 17:01:07 wiz Exp $
 
 PKGREVISION= 1
 .include "../../meta-pkgs/xfce4/Makefile.common"
@@ -9,6 +9,8 @@ MASTER_SITES=   https://archive.xfce.org/s
 
 COMMENT=       Xfce window management library
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 USE_TOOLS+=            pkg-config
 REPLACE_PYTHON+=       xdt-gen-visibility
 

Index: pkgsrc/x11/libxfce4windowing/buildlink3.mk
diff -u pkgsrc/x11/libxfce4windowing/buildlink3.mk:1.10 pkgsrc/x11/libxfce4windowing/buildlink3.mk:1.11
--- pkgsrc/x11/libxfce4windowing/buildlink3.mk:1.10     Tue Jan 27 08:40:59 2026
+++ pkgsrc/x11/libxfce4windowing/buildlink3.mk  Fri May 15 17:01:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2026/01/27 08:40:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2026/05/15 17:01:07 wiz Exp $
 
 BUILDLINK_TREE+=       libxfce4windowing
 
@@ -9,7 +9,6 @@ BUILDLINK_API_DEPENDS.libxfce4windowing+
 BUILDLINK_ABI_DEPENDS.libxfce4windowing?=      libxfce4windowing>=4.20.5nb1
 BUILDLINK_PKGSRCDIR.libxfce4windowing?=                ../../x11/libxfce4windowing
 
-.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/libwnck3/buildlink3.mk"
 .include "../../x11/libdisplay-info/buildlink3.mk"
 .endif # LIBXFCE4WINDOWING_BUILDLINK3_MK

Index: pkgsrc/x11/lua-keybinder/Makefile
diff -u pkgsrc/x11/lua-keybinder/Makefile:1.29 pkgsrc/x11/lua-keybinder/Makefile:1.30
--- pkgsrc/x11/lua-keybinder/Makefile:1.29      Tue Jan 27 08:40:59 2026
+++ pkgsrc/x11/lua-keybinder/Makefile   Fri May 15 17:01:08 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2026/01/27 08:40:59 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2026/05/15 17:01:08 wiz Exp $
 
 PKGREVISION= 27
 .include "../../x11/keybinder/Makefile.common"
@@ -10,6 +10,8 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Lua bindings for the keybinder library
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 # --enable-lua is broken
 CONFIGURE_ARGS+=       --disable-python
 
@@ -17,6 +19,8 @@ INSTALL_DIRS= lua-keybinder
 
 LUA_VERSIONS_ACCEPTED= 51
 
+BUILDLINK_DEPMETHOD.gobject-introspection=     build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../x11/keybinder/buildlink3.mk"
 .include "../../lang/lua/luaversion.mk"
 .include "../../lang/lua/buildlink3.mk"

Index: pkgsrc/x11/mate-menus/Makefile
diff -u pkgsrc/x11/mate-menus/Makefile:1.39 pkgsrc/x11/mate-menus/Makefile:1.40
--- pkgsrc/x11/mate-menus/Makefile:1.39 Tue Jan 27 08:41:01 2026
+++ pkgsrc/x11/mate-menus/Makefile      Fri May 15 17:01:08 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2026/01/27 08:41:01 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2026/05/15 17:01:08 wiz Exp $
 
 PKGREVISION= 13
 .include "../../meta-pkgs/mate/Makefile.common"
@@ -8,6 +8,8 @@ CATEGORIES=     x11
 
 COMMENT=       Implementation of the desktop menu specification for MATE
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 PKGCONFIG_OVERRIDE+=   libmenu/libmate-menu.pc.in
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}

Index: pkgsrc/x11/mate-panel/Makefile
diff -u pkgsrc/x11/mate-panel/Makefile:1.77 pkgsrc/x11/mate-panel/Makefile:1.78
--- pkgsrc/x11/mate-panel/Makefile:1.77 Tue Jan 27 08:41:01 2026
+++ pkgsrc/x11/mate-panel/Makefile      Fri May 15 17:01:08 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2026/01/27 08:41:01 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2026/05/15 17:01:08 wiz Exp $
 
 PKGREVISION= 14
 .include "../../meta-pkgs/mate/Makefile.common"
@@ -8,9 +8,11 @@ CATEGORIES=    x11
 
 COMMENT=       MATE panel application
 
-USE_TOOLS+=    perl
+TOOL_DEPENDS+= glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
 
+USE_TOOLS+=    perl
+
 PKGCONFIG_OVERRIDE+=   libmate-panel-applet/libmatepanelapplet-4.0.pc.in
 
 CONFIGURE_ARGS+=       --with-in-process-applets=all

Index: pkgsrc/x11/vte3/Makefile
diff -u pkgsrc/x11/vte3/Makefile:1.100 pkgsrc/x11/vte3/Makefile:1.101
--- pkgsrc/x11/vte3/Makefile:1.100      Thu May 14 16:42:33 2026
+++ pkgsrc/x11/vte3/Makefile    Fri May 15 17:01:08 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2026/05/14 16:42:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.101 2026/05/15 17:01:08 wiz Exp $
 
 # The 0.80 branch is tracked currently because the newer stable branch
 # requires C++23 for seemingly little that would benefit pkgsrc's
@@ -16,6 +16,8 @@ HOMEPAGE=     https://wiki.gnome.org/Apps/Te
 COMMENT=       Terminal widget with improved accessibility and I18N support
 LICENSE=       gnu-lgpl-v2
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
+
 PKGCONFIG_OVERRIDE_STAGE=      post-configure
 PKGCONFIG_OVERRIDE+=           output/meson-private/vte-2.91.pc
 

Index: pkgsrc/x11/xfce4-panel/Makefile
diff -u pkgsrc/x11/xfce4-panel/Makefile:1.124 pkgsrc/x11/xfce4-panel/Makefile:1.125
--- pkgsrc/x11/xfce4-panel/Makefile:1.124       Wed Mar 25 22:51:24 2026
+++ pkgsrc/x11/xfce4-panel/Makefile     Fri May 15 17:01:08 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2026/03/25 22:51:24 gutteridge Exp $
+# $NetBSD: Makefile,v 1.125 2026/05/15 17:01:08 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -9,6 +9,7 @@ MASTER_SITES+=          https://archive.xfce.org
 HOMEPAGE=              https://docs.xfce.org/xfce/xfce4-panel/start
 COMMENT=               Xfce panel
 
+TOOL_DEPENDS+=         glib2-introspection-[0-9]*:../../devel/glib2-introspection
 TOOL_DEPENDS+=         xfce4-dev-tools-[0-9]*:../../devel/xfce4-dev-tools
 
 USE_TOOLS+=            gdbus-codegen
@@ -25,6 +26,8 @@ CONFIGURE_ARGS+=      --enable-x11
 CONF_FILES+=   ${EGDIR}/default.xml ${PKG_SYSCONFDIR}/default.xml
 
 .include "../../devel/gettext-tools/msgfmt-desktop.mk"
+BUILDLINK_DEPMETHOD.gobject-introspection=     build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
 .include "../../devel/libwnck3/buildlink3.mk"
 .include "../../lang/python/application.mk"



Home | Main Index | Thread Index | Old Index