diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	glib
-DISTVERSION=	2.80.5
+DISTVERSION=	2.82.1
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
@@ -19,6 +19,15 @@
 		update-desktop-database:devel/desktop-file-utils \
 		update-mime-database:misc/shared-mime-info
 
+FLAVORS=	default bootstrap
+FLAVORS_SUB=	yes
+
+default_CONFLICTS_INSTALL=	glib-bootstrap
+default_BUILD_DEPENDS=	g-ir-scanner:devel/gobject-introspection@bootstrap
+
+bootstrap_PKGNAMESUFFIX=	-bootstrap
+bootstrap_CONFLICTS_INSTALL=	glib
+
 # iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo)
 # (wchar_t is used by glibmm, rawtherapee triggered this)
 USES=		compiler:c11 cpe gettext gnome iconv:wchar_t localbase:ldflags \
@@ -30,11 +39,12 @@
 MESON_ARGS=	-Db_lundef=false \
 		-Ddefault_library=both \
 		-Dinstalled_tests=false \
-		-Dintrospection=disabled \
 		-Dlibmount=disabled \
 		-Dlocalstatedir=/var \
 		-Druntime_dir=/var/run \
 		-Dselinux=disabled \
+		-Dsysprof=disabled \
+		-Dsystemtap=disabled \
 		-Dxattr=false
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 PORTSCOUT=	limitw:1,even
@@ -42,7 +52,7 @@
 
 CONFLICTS_INSTALL=	p5-Giovanni
 
-_LIBVERSION=	0.8000.5
+_LIBVERSION=	0.8200.1
 PLIST_SUB=	LIBVERSION=${_LIBVERSION}
 
 OPTIONS_DEFINE=		DOCS FAM_ALTBACKEND MANPAGES NLS TEST
@@ -63,7 +73,13 @@
 .include <bsd.port.pre.mk>
 
 # doesn't build yet
-MESON_ARGS+=	-Ddtrace=false
+MESON_ARGS+=	-Ddtrace=disabled
+
+.if ${FLAVOR:U} == bootstrap
+MESON_ARGS+=	-Dintrospection=disabled
+.else
+MESON_ARGS+=	-Dintrospection=enabled
+.endif
 
 pre-configure-FAM_ALTBACKEND-on:
 	@${REINPLACE_CMD} -e 's|kqueue-helper.c|kqueue_fnm.c|g ; \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1724667709
-SHA256 (gnome/glib-2.80.5.tar.xz) = 9f23a9de803c695bbfde7e37d6626b18b9a83869689dd79019bf3ae66c3e6771
-SIZE (gnome/glib-2.80.5.tar.xz) = 5538308
+TIMESTAMP = 1728054271
+SHA256 (gnome/glib-2.82.1.tar.xz) = 478634440bf52ee4ec4428d558787398c0be6b043c521beb308334b3db4489a6
+SIZE (gnome/glib-2.82.1.tar.xz) = 5554132
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -326,6 +326,13 @@
 lib/libgio-2.0.so
 lib/libgio-2.0.so.0
 lib/libgio-2.0.so.%%LIBVERSION%%
+%%DEFAULT%%lib/girepository-1.0/GIRepository-3.0.typelib
+%%DEFAULT%%lib/girepository-1.0/GLib-2.0.typelib
+%%DEFAULT%%lib/girepository-1.0/GLibUnix-2.0.typelib
+%%DEFAULT%%lib/girepository-1.0/GModule-2.0.typelib
+%%DEFAULT%%lib/girepository-1.0/GObject-2.0.typelib
+%%DEFAULT%%lib/girepository-1.0/Gio-2.0.typelib
+%%DEFAULT%%lib/girepository-1.0/GioUnix-2.0.typelib
 lib/libgirepository-2.0.a
 lib/libgirepository-2.0.so
 lib/libgirepository-2.0.so.0
@@ -382,15 +389,37 @@
 share/bash-completion/completions/gio
 share/bash-completion/completions/gresource
 share/bash-completion/completions/gsettings
+%%DOCS%%share/doc/gio-2.0/gapplication.html
+%%DOCS%%share/doc/gio-2.0/gdbus-codegen.html
+%%DOCS%%share/doc/gio-2.0/gdbus.html
+%%DOCS%%share/doc/gio-2.0/gio-querymodules.html
+%%DOCS%%share/doc/gio-2.0/gio.html
+%%DOCS%%share/doc/gio-2.0/glib-compile-resources.html
+%%DOCS%%share/doc/gio-2.0/glib-compile-schemas.html
+%%DOCS%%share/doc/gio-2.0/gresource.html
+%%DOCS%%share/doc/gio-2.0/gsettings.html
+%%DOCS%%%%DOCSDIR%%-2.0/glib-gettextize.html
+%%DOCS%%%%DOCSDIR%%-2.0/gtester-report.html
+%%DOCS%%%%DOCSDIR%%-2.0/gtester.html
 %%DOCS%%%%DOCSDIR%%-2.0/gvariant-byte-boundaries.svg
 %%DOCS%%%%DOCSDIR%%-2.0/gvariant-integer-and-string-structure.svg
 %%DOCS%%%%DOCSDIR%%-2.0/gvariant-integer-array.svg
 %%DOCS%%%%DOCSDIR%%-2.0/gvariant-specification-1.0.html
 %%DOCS%%%%DOCSDIR%%-2.0/gvariant-string-array.svg
+%%DOCS%%share/doc/gobject-2.0/glib-genmarshal.html
+%%DOCS%%share/doc/gobject-2.0/glib-mkenums.html
+%%DOCS%%share/doc/gobject-2.0/gobject-query.html
 share/gdb/auto-load%%RESETPREFIX%%/lib/libglib-2.0.so.%%LIBVERSION%%-gdb.py
 share/gdb/auto-load%%RESETPREFIX%%/lib/libgobject-2.0.so.%%LIBVERSION%%-gdb.py
 share/gettext/its/gschema.its
 share/gettext/its/gschema.loc
+%%DEFAULT%%share/gir-1.0/GIRepository-3.0.gir
+%%DEFAULT%%share/gir-1.0/GLib-2.0.gir
+%%DEFAULT%%share/gir-1.0/GLibUnix-2.0.gir
+%%DEFAULT%%share/gir-1.0/GModule-2.0.gir
+%%DEFAULT%%share/gir-1.0/GObject-2.0.gir
+%%DEFAULT%%share/gir-1.0/Gio-2.0.gir
+%%DEFAULT%%share/gir-1.0/GioUnix-2.0.gir
 %%DATADIR%%-2.0/codegen/__init__.py
 %%DATADIR%%-2.0/codegen/__init__.pyc
 %%DATADIR%%-2.0/codegen/__init__.pyo
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gobject-introspection
-DISTVERSION=	1.78.1
-PORTREVISION=	2
+DISTVERSION=	1.82.0
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
@@ -17,19 +16,33 @@
 
 LIB_DEPENDS=	libffi.so:devel/libffi
 
-PORTSCOUT=	limitw:1,even
+FLAVORS=	default bootstrap
+
+default_LIB_DEPENDS=	libglib-2.0.so:devel/glib20
+default_CONFLICTS_INSTALL=	gobject-introspection-bootstrap
+
+bootstrap_PKGNAMESUFFIX=	-bootstrap
+bootstrap_LIB_DEPENDS=	libglib-2.0.so:devel/glib20@bootstrap
+bootstrap_CONFLICS_INSTALL=	gobject-introspection
 
 USES=		bison gettext gnome localbase meson pkgconfig python tar:xz
-USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 MESON_ARGS=	-Ddoctool=disabled \
 		-Dpython=${PYTHON_CMD}
+PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=	TEST
 
 TEST_MESON_ENABLED=	cairo
 TEST_LIB_DEPENDS=	libcairo.so:graphics/cairo
 
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} >= 31200
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKSRC}/tools/meson.build
 
@@ -42,4 +55,4 @@
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/lib/gobject-introspection/giscanner/doctemplates/*/meson.build*
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1694863927
-SHA256 (gnome/gobject-introspection-1.78.1.tar.xz) = bd7babd99af7258e76819e45ba4a6bc399608fe762d83fde3cac033c50841bb4
-SIZE (gnome/gobject-introspection-1.78.1.tar.xz) = 1060296
+TIMESTAMP = 1728051662
+SHA256 (gnome/gobject-introspection-1.82.0.tar.xz) = 0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
+SIZE (gnome/gobject-introspection-1.82.0.tar.xz) = 1052872
diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist
--- a/devel/gobject-introspection/pkg-plist
+++ b/devel/gobject-introspection/pkg-plist
@@ -29,10 +29,6 @@
 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/Vulkan-1.0.typelib
 lib/girepository-1.0/cairo-1.0.typelib
 lib/girepository-1.0/fontconfig-2.0.typelib
@@ -204,10 +200,6 @@
 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/Vulkan-1.0.gir
 share/gir-1.0/cairo-1.0.gir
 share/gir-1.0/fontconfig-2.0.gir
@@ -232,6 +224,8 @@
 %%DATADIR%%-1.0/tests/gimarshallingtests.c
 %%DATADIR%%-1.0/tests/gimarshallingtests.h
 %%DATADIR%%-1.0/tests/gitestmacros.h
+%%DATADIR%%-1.0/tests/regress-unix.c
+%%DATADIR%%-1.0/tests/regress-unix.h
 %%DATADIR%%-1.0/tests/regress.c
 %%DATADIR%%-1.0/tests/regress.h
 %%DATADIR%%-1.0/tests/utility.c