Index: head/x11/yad/Makefile
===================================================================
--- head/x11/yad/Makefile	(revision 536528)
+++ head/x11/yad/Makefile	(revision 536529)
@@ -1,55 +1,56 @@
 # Created by: Danilo Egea Gondolfo <danilo@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	yad
-PORTVERSION=	0.42.0
+PORTVERSION=	6.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11 gnome
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Display GNOME dialogs from the command line
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	${LOCALBASE}/lib/X11/rgb.txt:x11/rgb
 
 USES=		autoreconf gettext gnome gmake pkgconfig
 
-USE_GNOME=	cairo intltool
+USE_GNOME=	cairo gtk30 intltool
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ENV+=	DATADIRNAME=share
-CONFIGURE_ARGS+=	--disable-html --with-rgb=${LOCALBASE}/lib/X11/rgb.txt
+CONFIGURE_ARGS+=	--with-rgb=${LOCALBASE}/lib/X11/rgb.txt
+GLIB_SCHEMAS=	yad.gschema.xml
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	v1cont
 
-OPTIONS_DEFINE=	ICONBROWSER NLS PFD
+OPTIONS_DEFINE=	HTML ICONBROWSER NLS PFD GTKSOURCEVIEW SPELL
+HTML_DESC=		Build with HTML widget
 ICONBROWSER_DESC=	Build YAD icon browser
-PFD_DESC=	Build PFD fontnames transformation utility
+PFD_DESC=		Build PFD fontnames transformation utility
+GTKSOURCEVIEW_DESC=	Build with GtkSourceView support
+SPELL_DESC=		Build with Spell check support
+OPTIONS_DEFAULT=	SPELL
 OPTIONS_SUB=	yes
 
-OPTIONS_SINGLE=	GTK
-OPTIONS_SINGLE_GTK=	GTK2 GTK3
+HTML_CONFIGURE_ENABLE=	html
+HTML_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+			libsoup-2.4.so:devel/libsoup \
+			libjavascriptcoregtk-4.0.so:www/webkit2-gtk3
 
-OPTIONS_DEFAULT=	GTK2
-
-NLS_CONFIGURE_OFF=	--disable-nls
-GTK2_CONFIGURE_ON=	--with-gtk=gtk2
-GTK2_USE=		GNOME=gtk20
-GTK3_CONFIGURE_ON=	--with-gtk=gtk3
-GTK3_USE=		GNOME=gtk30
 ICONBROWSER_CONFIGURE_ENABLE=	icon-browser
+
 PFD_CONFIGURE_ENABLE=	pfd
 
-.include <bsd.port.options.mk>
+GTKSOURCEVIEW_CONFIGURE_ENABLE=	sourceview
+GTKSOURCEVIEW_USE=	GNOME=gtksourceview3
 
-post-configure:
-.if empty(PORT_OPTIONS:MNLS)
-	@${REINPLACE_CMD} -e '/^SUBDIRS =/ s/ po//' ${WRKSRC}/Makefile
-.endif
+SPELL_CONFIGURE_ENABLE=	spell
+SPELL_LIB_DEPENDS=	libgspell-1.so:textproc/gspell \
+			libenchant-2.so:textproc/enchant2
 
 .include <bsd.port.mk>
Index: head/x11/yad/distinfo
===================================================================
--- head/x11/yad/distinfo	(revision 536528)
+++ head/x11/yad/distinfo	(revision 536529)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551013107
-SHA256 (v1cont-yad-v0.42.0_GH0.tar.gz) = f2d2e54d3ad4c27eda0f92623fab93059ae95a3dd52fd32b007d3a1adc2cad91
-SIZE (v1cont-yad-v0.42.0_GH0.tar.gz) = 266667
+TIMESTAMP = 1590321584
+SHA256 (v1cont-yad-v6.0_GH0.tar.gz) = 2f62bdcfa8eee6c88551f389fdbe4e00c230de7eed7f22a4b599fce4998bce96
+SIZE (v1cont-yad-v6.0_GH0.tar.gz) = 270164
Index: head/x11/yad/pkg-descr
===================================================================
--- head/x11/yad/pkg-descr	(revision 536528)
+++ head/x11/yad/pkg-descr	(revision 536529)
@@ -1,5 +1,5 @@
 Yad (yet another dialog) is a fork of Zenity with
 many improvements, such as custom buttons, additional
 dialogs, pop-up menu in notification icon and more.
 
-WWW: https://sourceforge.net/projects/yad-dialog/
+WWW: https://github.com/v1cont/yad