Index: head/x11-wm/sway/Makefile
===================================================================
--- head/x11-wm/sway/Makefile	(revision 558825)
+++ head/x11-wm/sway/Makefile	(revision 558826)
@@ -1,62 +1,72 @@
 # $FreeBSD$
 
 PORTNAME=	sway
 DISTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090
 PATCHFILES+=	f98ca3ab7ca1.patch:-p1 # https://github.com/swaywm/sway/pull/5090
+PATCHFILES+=	968c005760b6.patch:-p1 # https://github.com/swaywm/sway/pull/5856
+PATCHFILES+=	fdbe98512a71.patch:-p1 # https://github.com/swaywm/sway/pull/5856
+PATCHFILES+=	a52176f83035.patch:-p1 # https://github.com/swaywm/sway/pull/5856
+PATCHFILES+=	c9fe0626ca73.patch:-p1 # https://github.com/swaywm/sway/pull/5891
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	i3-compatible Wayland compositor
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.14:graphics/wayland-protocols \
 		wlroots>=0.12.0<0.13.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libevdev.so:devel/libevdev \
 		libpcre.so:devel/pcre \
 		libwayland-egl.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	swaybg:x11/swaybg
 
 USES=		compiler:c11 gl gnome meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GL=		glesv2
 USE_GNOME=	cairo pango
 USE_XORG=	pixman
 GH_ACCOUNT=	swaywm
+MESON_ARGS=	-Dsd-bus-provider=basu
 
-OPTIONS_DEFINE=	MANPAGES PIXBUF SUID X11
-OPTIONS_DEFAULT=MANPAGES PIXBUF SUID X11
+OPTIONS_DEFINE=	BASU MANPAGES PIXBUF SUID X11
+OPTIONS_DEFAULT=BASU MANPAGES PIXBUF SUID X11
 OPTIONS_SUB=	yes
+
+BASU_DESC=		Tray in swaybar via basu
+BASU_LIB_DEPENDS=	libbasu.so:sysutils/basu
+BASU_MESON_ENABLED=	tray
 
 MANPAGES_BUILD_DEPENDS=	scdoc>=1.9.2:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 
 PIXBUF_USE=		GNOME=gdkpixbuf2
 PIXBUF_MESON_ENABLED=	gdk-pixbuf
 
 SUID_DESC=		setuid bit on "sway" binary (to claim DRM without seatd/console-kit-daemon)
 SUID_PLIST_SUB=		MAYBE_SUID="@(,,4755) "
 SUID_PLIST_SUB_OFF=	MAYBE_SUID=""
 
 X11_USE=		XORG=xcb
 X11_MESON_ENABLED=	xwayland
 
 post-patch:
 # Let @sample handle default files under etc/
 	@${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \
 		${WRKSRC}/meson.build
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
 		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
 		${WRKSRC}/meson.build
 
 .include <bsd.port.mk>
Index: head/x11-wm/sway/distinfo
===================================================================
--- head/x11-wm/sway/distinfo	(revision 558825)
+++ head/x11-wm/sway/distinfo	(revision 558826)
@@ -1,7 +1,15 @@
 TIMESTAMP = 1605026851
 SHA256 (swaywm-sway-1.5.1_GH0.tar.gz) = 095f983c9a5f80d761bc2fb19df8166839b9290124ccd47f3e74119a1335490f
 SIZE (swaywm-sway-1.5.1_GH0.tar.gz) = 5536721
 SHA256 (cd9d1038a822.patch) = 4183dffdf4e3dbe70302d7e6e665cc83243a7166cf9bc2b8aacd7d56a9876069
 SIZE (cd9d1038a822.patch) = 8946
 SHA256 (f98ca3ab7ca1.patch) = 319a9658ea12403e6c73ed0c2c6f0deffd23ebe25b6ba81d7573f9984be95760
 SIZE (f98ca3ab7ca1.patch) = 2669
+SHA256 (968c005760b6.patch) = e02fcca49e68a3dfd02d6b50d566b8067637c10b392947f3981320fb2f335af5
+SIZE (968c005760b6.patch) = 2545
+SHA256 (fdbe98512a71.patch) = 3d77c12d2db9bbcc72c082b69376453545232f12fd26c9ee7ef040d4b96cb285
+SIZE (fdbe98512a71.patch) = 5025
+SHA256 (a52176f83035.patch) = 614b899b32b44c363f096452fee93244afe30787ad15cc4ced7240e78499a8dc
+SIZE (a52176f83035.patch) = 2582
+SHA256 (c9fe0626ca73.patch) = b64aa2de7069eedb2a81e60d7d4d275b45ca18325229aa171f2898f23033dd4b
+SIZE (c9fe0626ca73.patch) = 911