diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index d4026860af33..fc2436a89634 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,70 +1,69 @@
 PORTNAME=	gobject-introspection
-DISTVERSION=	1.82.0
-PORTREVISION=	1
+DISTVERSION=	1.84.0
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Generate interface introspection data for GObject libraries
 WWW=		https://gi.readthedocs.io/en/latest/
 
 LICENSE=	GPLv2+ LGPL20+
 LICENSE_COMB=	multi
 LICENSE_FILE_LGPL20+ =	${WRKSRC}/COPYING.LGPL
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING.GPL
 
 LIB_DEPENDS=	libffi.so:devel/libffi
 
 FLAVORS=	default bootstrap
 FLAVOR?=	${FLAVORS:[1]}
 
 default_LIB_DEPENDS=	libglib-2.0.so:devel/glib20
 
 bootstrap_PKGNAMESUFFIX=	-bootstrap
 bootstrap_BUILD_DEPENDS=	${LOCALBASE}/glib-bootstrap/lib/libglib-2.0.so:devel/glib20@bootstrap
 bootstrap_RUN_DEPENDS=		${LOCALBASE}/glib-bootstrap/lib/libglib-2.0.so:devel/glib20@bootstrap
 
 USES=		bison gettext localbase:ldflags meson pkgconfig python tar:xz
 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
 
 .if ${FLAVOR:U} == bootstrap
 MESON_ARGS+=	-Dcairo=disabled
 OPTIONS_DEFINE=
 PREFIX=		${LOCALBASE}/${PORTNAME}-bootstrap
 .endif
 
 .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
 
 .if ${FLAVOR:U} == bootstrap
 post-extract:
 	${LN} -s ${LOCALBASE}/glib-bootstrap/libdata/pkgconfig ${PKGCONFIG_LINKDIR}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKSRC}/tools/meson.build
 
 post-stage:
 	@${PYTHON_CMD} -m compileall -d ${PREFIX}/lib/${PORTNAME} \
 		"${STAGEDIR}${PREFIX}/lib/${PORTNAME}"
 	@${PYTHON_CMD} -O -m compileall -d ${PREFIX}/lib/${PORTNAME} \
 		"${STAGEDIR}${PREFIX}/lib/${PORTNAME}"
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/lib/gobject-introspection/giscanner/doctemplates/*/meson.build*
 
 .include <bsd.port.post.mk>
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index c589c3615c36..775a0f6b2589 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1728051662
-SHA256 (gnome/gobject-introspection-1.82.0.tar.xz) = 0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09
-SIZE (gnome/gobject-introspection-1.82.0.tar.xz) = 1052872
+TIMESTAMP = 1743669169
+SHA256 (gnome/gobject-introspection-1.84.0.tar.xz) = 945b57da7ec262e5c266b89e091d14be800cc424277d82a02872b7d794a84779
+SIZE (gnome/gobject-introspection-1.84.0.tar.xz) = 1080316
diff --git a/devel/gobject-introspection/files/patch-tools_meson.build b/devel/gobject-introspection/files/patch-tools_meson.build
index dc01ec09e47b..1270aa37e68b 100644
--- a/devel/gobject-introspection/files/patch-tools_meson.build
+++ b/devel/gobject-introspection/files/patch-tools_meson.build
@@ -1,15 +1,15 @@
---- tools/meson.build.orig	2020-09-12 17:25:46 UTC
+--- tools/meson.build.orig	2025-03-15 13:50:44 UTC
 +++ tools/meson.build
-@@ -9,11 +9,7 @@ if with_doctool
+@@ -9,11 +9,7 @@ endif
    tools += [['g-ir-doc-tool', 'docmain', 'doc_main']]
  endif
  
--if cc.get_id() == 'msvc'
--  python_cmd = '/usr/bin/env ' + python.path()
+-if not python.full_path().startswith('/usr/bin')
+-  python_cmd = '/usr/bin/env ' + python.full_path()
 -else
 -  python_cmd = '/usr/bin/env python@0@'.format(python.language_version().split('.')[0])
 -endif
 +python_cmd = '%%PYTHON_CMD%%'
  
  tool_output = []
  foreach tool : tools