diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index cb70663a38d5..c5cfd419be0e 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,54 +1,55 @@
 PORTNAME=	bluefish
 DISTVERSION=	2.2.14
+PORTREVISION=	1
 CATEGORIES=	www editors
 MASTER_SITES=	https://www.bennewitz.com/bluefish/stable/source/ \
 		SF
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	HTML editor designed for the experienced web designer
 WWW=		http://bluefish.openoffice.nl/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libenchant-2.so:textproc/enchant2 \
 		libharfbuzz.so:print/harfbuzz \
 		libpcre2-8.so:devel/pcre2
 
 USES=		desktop-file-utils gettext gmake gnome libtool localbase \
 		pkgconfig python:3.8-3.9 shared-mime-info shebangfix tar:bzip2
 USE_GNOME=	cairo gdkpixbuf2 intltool libxml2
 SHEBANG_FILES=	data/css_decompressor data/cssmin.py data/jsbeautify \
 		data/jsmin.py data/lorem-ipsum-generator \
 		src/plugin_zencoding/zencoding/actions/*.py \
 		src/plugin_zencoding/zencoding/filters/*.py \
 		src/plugin_zencoding/zencoding/*.py
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-update-databases \
 		--with-freedesktop_org-menu=${PREFIX}/share/applications \
 		--with-freedesktop_org-mime=${PREFIX}/share/mime \
 		--with-icon-path=${PREFIX}/share/pixmaps
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		DEBUG DOCS NLS TIDY
 OPTIONS_DEFAULT=	GTK3
 OPTIONS_SINGLE=		TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
 OPTIONS_SUB=		yes
 
 TOOLKIT_DESC=	GTK+ toolkit
 
 DEBUG_CONFIGURE_ENABLE=	debugging-output
 GTK2_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 GTK2_USE=		GNOME=gtk20
 GTK2_CONFIGURE_ON=	--with-gtk2=yes
 
 GTK3_LIB_DEPENDS=	libgucharmap_2_90.so:deskutils/gucharmap
 GTK3_USE=		GNOME=gtk30
 
 NLS_CONFIGURE_ENABLE=	nls
 
 TIDY_RUN_DEPENDS=	tidy4:www/tidy
 
 .include <bsd.port.mk>
diff --git a/www/bluefish/files/patch-src_bftextview2__autocomp.c b/www/bluefish/files/patch-src_bftextview2__autocomp.c
new file mode 100644
index 000000000000..fad336a7c3f3
--- /dev/null
+++ b/www/bluefish/files/patch-src_bftextview2__autocomp.c
@@ -0,0 +1,11 @@
+--- src/bftextview2_autocomp.c.orig	2023-07-04 14:09:37 UTC
++++ src/bftextview2_autocomp.c
+@@ -429,7 +429,7 @@ acwin_create(BluefishTextView * btv)
+ 	/*gtk_widget_set_size_request(acw->reflabel,150,-1); */
+ 	gtk_widget_show_all(acw->scroll);
+ 	gtk_widget_show(hbox);
+-	g_signal_connect(acw->reflabel, "activate-link", acw_label_active_link_lcb, acw);
++	g_signal_connect(acw->reflabel, "activate-link", G_CALLBACK(acw_label_active_link_lcb), acw);
+ 	/*gtk_widget_set_size_request(GTK_WIDGET(acw->tree),100,200); */
+ 	/*gtk_widget_set_size_request(acw->win, 150, 200); */
+ 	/*g_signal_connect(G_OBJECT(acw->win),"key-release-event",G_CALLBACK(acwin_key_release_lcb),acw); */
diff --git a/www/bluefish/files/patch-src_external__commands.c b/www/bluefish/files/patch-src_external__commands.c
new file mode 100644
index 000000000000..fb5fe1492f4a
--- /dev/null
+++ b/www/bluefish/files/patch-src_external__commands.c
@@ -0,0 +1,11 @@
+--- src/external_commands.c.orig	2023-07-04 14:12:18 UTC
++++ src/external_commands.c
+@@ -483,7 +483,7 @@ create_commandstring(Texternalp * ep, const gchar * fo
+ 		gtk_dialog_set_default_response(GTK_DIALOG(dialog),GTK_RESPONSE_ACCEPT);
+ 		tmp = g_strdup_printf(_("Supply arguments to define %%a in '%s'"), formatstring);
+ 		entry = dialog_entry_labeled(NULL, tmp, gtk_dialog_get_content_area(GTK_DIALOG(dialog)), 6);
+-		g_signal_connect(G_OBJECT(entry), "activate", command_dialog_entry_activated_lcb, dialog);
++		g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(command_dialog_entry_activated_lcb), dialog);
+ 		g_free(tmp);
+ 		gtk_widget_show_all(dialog);
+ 		result = gtk_dialog_run(GTK_DIALOG(dialog));