diff --git a/x11-toolkits/gtk40/Makefile b/x11-toolkits/gtk40/Makefile
index f8175c06e50b..be5430f33c43 100644
--- a/x11-toolkits/gtk40/Makefile
+++ b/x11-toolkits/gtk40/Makefile
@@ -1,113 +1,113 @@
 PORTNAME=	gtk
 PORTVERSION=	4.10.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	4
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Gimp Toolkit for X11 GUI (current stable version)
 WWW=		https://www.gtk.org/
 
 LICENSE=	LGPL20
 
 PORTSCOUT=	limit:1,even
 
 BUILD_DEPENDS=	sassc>0:textproc/sassc
 LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libfribidi.so:converters/fribidi \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgraphene-1.0.so:graphics/graphene \
 		libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS=	hicolor-icon-theme>=0:misc/hicolor-icon-theme \
 		adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme
 
 USES=		compiler:c11 cpe gettext gnome jpeg localbase meson \
 		ninja pathfix perl5 python:3.7+ pkgconfig tar:xz
 CPE_VENDOR=	gnome
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 USE_GNOME=	atk cairo gdkpixbuf2 introspection:build pango \
 		librsvg2:run
-MESON_ARGS=	-Dbuild-testsuite=false
+MESON_ARGS=	-Dintrospection=enabled -Dbuild-testsuite=false
 LDFLAGS+=	-lexecinfo
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 LIBVERSION=	1.1000.1
 PLIST_SUB+=	LIBVERSION=${LIBVERSION}
 
 GLIB_SCHEMAS=	org.gtk.Demo4.gschema.xml \
 		org.gtk.gtk4.Settings.ColorChooser.gschema.xml \
 		org.gtk.gtk4.Settings.Debug.gschema.xml \
 		org.gtk.gtk4.Settings.EmojiChooser.gschema.xml \
 		org.gtk.gtk4.Settings.FileChooser.gschema.xml
 
 OPTIONS_DEFINE=	CUPS COLORD DEBUG BROADWAY FFMPEG \
 		GSTREAMER VULKAN WAYLAND X11
 OPTIONS_DEFAULT=CUPS COLORD BROADWAY GSTREAMER VULKAN WAYLAND X11
 OPTIONS_SUB=	yes
 
 BROADWAY_DESC=	Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets.
 BROADWAY_MESON_TRUE=	broadway-backend
 
 COLORD_DESC=	Color profile support
 COLORD_LIB_DEPENDS=	libcolord.so:graphics/colord
 COLORD_MESON_ENABLED=	colord
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_MESON_ENABLED=	print-cups
 
 FFMPEG_DESC=		FFmpeg multimedia backend
 FFMPEG_MESON_ENABLED=	media-ffmpeg
 FFMPEG_RUN_DEPENDS=	ffmpeg>0:multimedia/ffmpeg
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 GSTREAMER_DESC=		GStreamer multimedia backend
 GSTREAMER_MESON_ENABLED=media-gstreamer
 GSTREAMER_USES=		gstreamer
 GSTREAMER_USE=		GSTREAMER=bad,gl
 
 VULKAN_DESC=		GDK Vulkan renderer backend
 VULKAN_BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 VULKAN_RUN_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 VULKAN_MESON_ENABLED=	vulkan
 
 WAYLAND_DESC=		GDK Wayland backend
 WAYLAND_MESON_TRUE=	wayland-backend
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland \
 			libxkbcommon.so:x11/libxkbcommon
 WAYLAND_RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
 			wayland-protocols>=0:graphics/wayland-protocols
 WAYLAND_USES=		gl
 WAYLAND_USE=		GL=egl
 
 X11_DESC=		GDK X11 backend
 X11_MESON_TRUE=		x11-backend
 X11_USES=		xorg
 X11_USE=		XORG=x11,xcomposite,xcursor,xdamage,xext,xfixes,xi,xinerama,xrandr,xrender
 
 pre-build:
 	@${RM} -r ${WRKSRC}/docs/gtk.info*
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-4.0/engines
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-4.0/loaders
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-4.0/modules
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-4.0/${GTK4_VERSION}/engines
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-4.0/${GTK4_VERSION}/loaders
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-4.0/${GTK4_VERSION}/modules
 
 pre-test:
 	@if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \
 		${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
 		${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dbuild-testsuite=true"; \
 		${TOUCH} ${WRKDIR}/.meson_build_tests; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk40/files/patch-meson.build b/x11-toolkits/gtk40/files/patch-meson.build
deleted file mode 100644
index c93d9bf8c833..000000000000
--- a/x11-toolkits/gtk40/files/patch-meson.build
+++ /dev/null
@@ -1,14 +0,0 @@
-https://gitlab.gnome.org/GNOME/gtk/-/issues/5633
-
---- meson.build.orig	2023-03-14 11:50:49 UTC
-+++ meson.build
-@@ -740,8 +740,7 @@ endif
-   error('Introspection enabled, but g-ir-scanner not found.')
- endif
- 
--build_gir = gir.found() and (get_option('introspection').enabled() or
--                             (get_option('introspection').allowed() and get_option('gtk_doc')))
-+build_gir = gir.found() and get_option('introspection').allowed()
- 
- project_build_root = meson.current_build_dir()
-