2 files changed, 44 insertions, 41 deletions

diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile
index 3418c22dfe92..3adefa08798f 100644
--- a/x11/waybar/Makefile
+++ b/x11/waybar/Makefile
@@ -1,24 +1,22 @@
 # $FreeBSD$
 
 PORTNAME=	waybar
-DISTVERSION=	0.8.0
-PORTREVISION=	4
+DISTVERSION=	0.9.0
 CATEGORIES=	x11
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 # https://github.com/Alexays/Waybar/pull/425
-PATCHFILES+=	a85ae0da0580.patch:-p1
-PATCHFILES+=	f0dfa34e651c.patch:-p1
-PATCHFILES+=	25d4420904bd.patch:-p1
-PATCHFILES+=	bf0d2621504e.patch:-p1
-PATCHFILES+=	82844ce8a6f3.patch:-p1
-PATCHFILES+=	7bc3577137af.patch:-p1
-PATCHFILES+=	96ef80d06c00.patch:-p1
-PATCHFILES+=	cf114a111fe0.patch:-p1
-PATCHFILES+=	684d9121a721.patch:-p1
-PATCHFILES+=	f1b288adf8b5.patch:-p1
-# https://github.com/Alexays/Waybar/pull/???
-PATCHFILES+=	0b008154d9de.patch:-p1
+PATCHFILES+=	2e9d80139411.patch:-p1
+PATCHFILES+=	9ba4bfcb20f2.patch:-p1
+PATCHFILES+=	2155d9560887.patch:-p1
+PATCHFILES+=	abc17ff5393c.patch:-p1
+PATCHFILES+=	d3ad69814f28.patch:-p1
+PATCHFILES+=	4ceefa8ed4d9.patch:-p1
+PATCHFILES+=	7675d81f3205.patch:-p1
+PATCHFILES+=	4a151db3a433.patch:-p1
+PATCHFILES+=	e9263a38841b.patch:-p1
+PATCHFILES+=	acb51ccef3ab.patch:-p1
+PATCHFILES+=	6349d48af076.patch:-p1
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Highly customizable Wayland bar for Sway and wlroots-based compositors
@@ -42,12 +40,16 @@ PLIST_FILES=	bin/${PORTNAME} \
 		etc/xdg/${PORTNAME}/config \
 		etc/xdg/${PORTNAME}/style.css
 
-OPTIONS_DEFINE=	DBUS MANPAGES MPD PULSEAUDIO UDEV
-OPTIONS_DEFAULT=DBUS MANPAGES MPD PULSEAUDIO UDEV
+OPTIONS_DEFINE=	DBUS GLS MANPAGES MPD PULSEAUDIO UDEV
+OPTIONS_DEFAULT=DBUS GLS MANPAGES MPD PULSEAUDIO UDEV
 
 DBUS_LIB_DEPENDS=	libdbusmenu-gtk3.so:devel/libdbusmenu
 DBUS_MESON_ENABLED=	dbusmenu-gtk
 
+GLS_DESC=		Use gtk-layer-shell library for popups support
+GLS_LIB_DEPENDS=	libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
+GLS_MESON_ENABLED=	gtk-layer-shell
+
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 MANPAGES_PLIST_FILES=	man/man5/${PORTNAME}-backlight.5.gz \
@@ -55,6 +57,7 @@ MANPAGES_PLIST_FILES=	man/man5/${PORTNAME}-backlight.5.gz \
 			man/man5/${PORTNAME}-clock.5.gz \
 			man/man5/${PORTNAME}-cpu.5.gz \
 			man/man5/${PORTNAME}-custom.5.gz \
+			man/man5/${PORTNAME}-disk.5.gz \
 			man/man5/${PORTNAME}-idle-inhibitor.5.gz \
 			man/man5/${PORTNAME}-memory.5.gz \
 			man/man5/${PORTNAME}-mpd.5.gz \
diff --git a/x11/waybar/distinfo b/x11/waybar/distinfo
index 91f319c3f63c..752f32f27334 100644
--- a/x11/waybar/distinfo
+++ b/x11/waybar/distinfo
@@ -1,25 +1,25 @@
-TIMESTAMP = 1567072617
-SHA256 (Alexays-Waybar-0.8.0_GH0.tar.gz) = 2de2f0cec243da0d9ff2255ceb9dac9d95e8be06d6ea13926fae460d72e4b8aa
-SIZE (Alexays-Waybar-0.8.0_GH0.tar.gz) = 112019
-SHA256 (a85ae0da0580.patch) = f7d752ffecb166ddf4531cf988f0041f0d1f1977031eb7fe668e2803b705502a
-SIZE (a85ae0da0580.patch) = 2686
-SHA256 (f0dfa34e651c.patch) = 7bc5fcdf745c243fdeec0caefa4f5f8cc4c20fbca818a23c453e0acdd21f0197
-SIZE (f0dfa34e651c.patch) = 1168
-SHA256 (25d4420904bd.patch) = 7cdb4854f272b36c78bfdcf06174f58ec23ecf320d6a96cf4b97e9557d1ed170
-SIZE (25d4420904bd.patch) = 1127
-SHA256 (bf0d2621504e.patch) = acb25d11fbd6ec03f3ca7845ff368cc9370ba2297298c522b8e998b9abc8bd4a
-SIZE (bf0d2621504e.patch) = 4167
-SHA256 (82844ce8a6f3.patch) = 1c8ecbe8341e03f2ce0d27c68954b46bab890229f6d14e99f0c859422eb2c551
-SIZE (82844ce8a6f3.patch) = 1382
-SHA256 (7bc3577137af.patch) = 1cb5e6301146cc901fd59033f45702d5b64250e72abfea83a2f6e682c061e0b5
-SIZE (7bc3577137af.patch) = 1854
-SHA256 (96ef80d06c00.patch) = 6094a3ba22b4dec7ad4e1e3ff662308445c61f04580e6045aaa4492ab49aa60a
-SIZE (96ef80d06c00.patch) = 2059
-SHA256 (cf114a111fe0.patch) = 9d7acaf149a2446f9c0cd80c689f2910394ace84b8a9838ea943f0275c341f3e
-SIZE (cf114a111fe0.patch) = 3959
-SHA256 (684d9121a721.patch) = f0e6f54ef8be9b982eb4bf54e811e5c77bf4cbb54b82d99104ff3c98b9942f43
-SIZE (684d9121a721.patch) = 2957
-SHA256 (f1b288adf8b5.patch) = ba051ded886def63352eedaf68137d7042c1437ddfa614828ad8a70987b404e4
-SIZE (f1b288adf8b5.patch) = 2150
-SHA256 (0b008154d9de.patch) = c59ccd2fc373deb2dd9b7cc6f0470f8899c4c30963a214c932e29f90832baea9
-SIZE (0b008154d9de.patch) = 1640
+TIMESTAMP = 1577532909
+SHA256 (Alexays-Waybar-0.9.0_GH0.tar.gz) = 65e8397d5a8880cbb9172138e361b0d91f649bc99327d36945e38d1e5dbb157d
+SIZE (Alexays-Waybar-0.9.0_GH0.tar.gz) = 115404
+SHA256 (2e9d80139411.patch) = fde33b626acacaecc60ea0fde78807fb8f32ef6a1b5a81d877c8078deb0bacfb
+SIZE (2e9d80139411.patch) = 2686
+SHA256 (9ba4bfcb20f2.patch) = eef358d8a590c22cb78cddaf39cd5a2d4797198b3aeb51a3e7a3ca95bcffda79
+SIZE (9ba4bfcb20f2.patch) = 1175
+SHA256 (2155d9560887.patch) = ec790e6da165b0d54da5a98c66a94a7b3f1983b26e809e207ab038a6140c0955
+SIZE (2155d9560887.patch) = 1145
+SHA256 (abc17ff5393c.patch) = add74be3915da7f669fcb3c2f53cd1347083548d1dcfda771cd24962ea9f3571
+SIZE (abc17ff5393c.patch) = 4330
+SHA256 (d3ad69814f28.patch) = 10f666dbf31e5d77e8885040ea2aee9e977a72da14748117c143d193bd857fb1
+SIZE (d3ad69814f28.patch) = 1392
+SHA256 (4ceefa8ed4d9.patch) = c99a9d42cba931a211272ade786dfd892bb1b1b04a01b31783d9a69ad542cb37
+SIZE (4ceefa8ed4d9.patch) = 1817
+SHA256 (7675d81f3205.patch) = 69d54b014af07da6df92dcb011c86729a13e16beba534db12e55c340b895d890
+SIZE (7675d81f3205.patch) = 2055
+SHA256 (4a151db3a433.patch) = 7fdc0e2cd16ab65791e8a23ecb1ea8779190b6a4a65c4d081f968d25feb67c39
+SIZE (4a151db3a433.patch) = 2650
+SHA256 (e9263a38841b.patch) = 5463c9c0909f891501098bbfd3a1f8f38e64833a65b616669dad2e8fd47dbe72
+SIZE (e9263a38841b.patch) = 9276
+SHA256 (acb51ccef3ab.patch) = 1e06e15233903b83cab706cb46e8bd48b8a72a0f8f8bf31d9b6c79eea6710af7
+SIZE (acb51ccef3ab.patch) = 8683
+SHA256 (6349d48af076.patch) = 710e5732ea50bb8057b8fbdacc38d89e8d0176c655bc844e340e1d3f1693e62d
+SIZE (6349d48af076.patch) = 1167