x11/polybar: update to version 3.3.0.

- disable network support early since it needs Linux/libnl
- add CURSOR, PULSEAUDIO, and XKEYBORAD options
- remove unused EXAMPLES option
- rename CURL option to GITHUB
- rewrite some OPTIONS descriptions

Reviewed by:	tcberner (mentor)
Approved by:	mat (mentor)
Differential Revision:	https://reviews.freebsd.org/

4 files changed, 33 insertions, 44 deletions

diff --git a/x11/polybar/Makefile b/x11/polybar/Makefile
index f25b0cca6829..913921d156c7 100644
--- a/x11/polybar/Makefile
+++ b/x11/polybar/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	polybar
-DISTVERSION=	3.2.1
-PORTREVISION=	1
+DISTVERSION=	3.3.0
 CATEGORIES=	x11
 
 MAINTAINER=	rigoletto@FreeBSD.org
@@ -15,38 +14,46 @@ BUILD_DEPENDS=	xcb-proto>=1.9:x11/xcb-proto
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libinotify.so:devel/libinotify \
-		libxcb-cursor.so:x11/xcb-util-cursor \
 		libxcb-ewmh.so:x11/xcb-util-wm \
 		libxcb-icccm.so:x11/xcb-util-wm \
 		libxcb-image.so:x11/xcb-util-image \
 		libxcb-util.so:x11/xcb-util \
 		libxcb-xrm.so:x11/xcb-util-xrm
 
-USES=		cmake:outsource compiler:c++11-lang localbase:ldflags \
-		pkgconfig python:2.7,build
+USES=		cmake:outsource localbase:ldflags pkgconfig \
+		python:2.7,build
 USE_GITHUB=	yes
 GH_ACCOUNT=	jaagr
 GH_TUPLE=	jaagr:i3ipcpp:v0.7.1-4-gd4e4786:i3ipcpp/lib/i3ipcpp \
-		jaagr:xpp:1.4.0-4-g00165e1:xpp/lib/xpp
+		jaagr:xpp:1.4.0-4-gbf6ff36:xpp/lib/xpp
 USE_GNOME=	cairo
 USE_XORG=	xcb
 
-OPTIONS_DEFINE=	ALSA DEBUG CURL EXAMPLES I3 IPC MPD TESTS
-OPTIONS_DEFAULT=	CURL I3 IPC MPD
-OPTIONS_SUB=	yes
+# Needs libnl to work. Disabling completely.
+CMAKE_OFF=	ENABLE_NETWORK
 
-ALSA_DESC=	Volume control
-CURL_DESC=	Github support
-I3_DESC=	i3wm support
+OPTIONS_DEFINE=		ALSA CURSOR DEBUG GITHUB I3 IPC MPD PULSEAUDIO \
+			TESTS XKEYBOARD
+OPTIONS_DEFAULT=	CURSOR GITHUB I3 IPC MPD PULSEAUDIO XKEYBOARD
+OPTIONS_SUB=		yes
+
+ALSA_DESC=	Shows volume and mute state for Alsa
+CURSOR_DESC=	Required for click and scroll settings
+GITHUB_DESC=	Shows the unread notification count
+I3_DESC=	Uses the i3 IPC to display information
 IPC_DESC=	Built-in IPC support
 MPD_DESC=	Support for controlling MPD
 TESTS_DESC=	Build testsuite
+XKEYBOARD_DESC=	Shows the current layout and active indicators
 
 ALSA_CMAKE_BOOL=	ENABLE_ALSA
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 
-CURL_CMAKE_BOOL=	ENABLE_CURL
-CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+CURSOR_CMAKE_BOOL=	WITH_XCURSOR
+CURSOR_LIB_DEPENDS=	libxcb-cursor.so:x11/xcb-util-cursor
+
+GITHUB_CMAKE_BOOL=	ENABLE_CURL
+GITHUB_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 DEBUG_CMAKE_BOOL=	DEBUG_LOGGER
 
@@ -59,11 +66,17 @@ IPC_CMAKE_BOOL=		BUILD_IPC_MSG
 MPD_CMAKE_BOOL=		ENABLE_MPD
 MPD_LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient
 
-# fail while building on poudriere because it need network access
+PULSEAUDIO_CMAKE_BOOL=		ENABLE_PULSEAUDIO
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
+
+# fail while building on poudriere because it needs network access
 # during the building process to download googletest on-the-fly.
 TESTS_BUILD_DEPENDS=	git>=0:devel/git
 TESTS_CMAKE_BOOL=	BUILD_TESTS
 
+XKEYBOARD_CMAKE_BOOL=	ENABLE_XKEYBOARD
+XKEYBOARD_LIB_DEPENDS=	libxcb-xkb.so:x11/libxcb
+
 do-test-TESTS-on:
 	cd ${TEST_WRKSRC} && ${SETENV} BUILD_TESTS=ON \
 		${SH} ${WRKSRC}/common/travis/tests.sh
diff --git a/x11/polybar/distinfo b/x11/polybar/distinfo
index 8fe5523ca8a1..280f65b80194 100644
--- a/x11/polybar/distinfo
+++ b/x11/polybar/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1533791330
-SHA256 (jaagr-polybar-3.2.1_GH0.tar.gz) = 604e3e8b4fd8c211df94cdd193f8c760c7c027e6822e5b2f598132decdf3edaf
-SIZE (jaagr-polybar-3.2.1_GH0.tar.gz) = 242327
+TIMESTAMP = 1545654715
+SHA256 (jaagr-polybar-3.3.0_GH0.tar.gz) = d64da066a90aa9ab026a22e05d634af0b3870ed6dd83787fae1506b7e9282be5
+SIZE (jaagr-polybar-3.3.0_GH0.tar.gz) = 247001
 SHA256 (jaagr-i3ipcpp-v0.7.1-4-gd4e4786_GH0.tar.gz) = 2154bf1a0b0a211bddcf5904ba97f99eb86ef6faded5dd864858e2a1a2389cec
 SIZE (jaagr-i3ipcpp-v0.7.1-4-gd4e4786_GH0.tar.gz) = 191511
-SHA256 (jaagr-xpp-1.4.0-4-g00165e1_GH0.tar.gz) = a0496281fbf52ce7e798426b56ba7c2130d08bbb8241ced7053b1941a4dcb90d
-SIZE (jaagr-xpp-1.4.0-4-g00165e1_GH0.tar.gz) = 84823
+SHA256 (jaagr-xpp-1.4.0-4-gbf6ff36_GH0.tar.gz) = 9d1f52ee19c925d5900dd49f135f495fbf3a573d80a93876679f08ff41ff2c71
+SIZE (jaagr-xpp-1.4.0-4-gbf6ff36_GH0.tar.gz) = 85073
diff --git a/x11/polybar/files/patch-git_3b32f58 b/x11/polybar/files/patch-git_3b32f58
deleted file mode 100644
index 1af54826a3fa..000000000000
--- a/x11/polybar/files/patch-git_3b32f58
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3b32f5899a4d9a0bcb49099ee4bfee750366a3e6 Mon Sep 17 00:00:00 2001
-From: patrick96 <p.ziegler96@gmail.com>
-Date: Mon, 15 Oct 2018 17:24:27 +0200
-Subject: [PATCH] fix: Move return value of parse_layout_symbol
-
-Fixes #1469
----
- src/x11/extensions/xkb.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/x11/extensions/xkb.cpp b/src/x11/extensions/xkb.cpp
-index 1875c585..a521b935 100644
---- src/x11/extensions/xkb.cpp
-+++ src/x11/extensions/xkb.cpp
-@@ -208,7 +208,7 @@ namespace xkb_util {
-     if (string_util::contains(LAYOUT_SYMBOL_BLACKLIST, ";" + name + ";")) {
-       return "";
-     }
--    return name;
-+    return move(name);
-   }
- }
- 
diff --git a/x11/polybar/pkg-plist b/x11/polybar/pkg-plist
index ddfa0bc55b86..b52f02cf089c 100644
--- a/x11/polybar/pkg-plist
+++ b/x11/polybar/pkg-plist
@@ -2,6 +2,5 @@ bin/polybar
 %%IPC%%bin/polybar-msg
 man/man1/polybar.1.gz
 share/bash-completion/completions/polybar
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config
 share/zsh/site-functions/_polybar
 share/zsh/site-functions/_polybar_msg