Index: x11/polybar/Makefile
===================================================================
--- x11/polybar/Makefile
+++ x11/polybar/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	polybar
 DISTVERSION=	3.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	capt_redbeard@protonmail.com
@@ -14,31 +14,40 @@
 BUILD_DEPENDS=	xcb-proto>=1.9:x11/xcb-proto
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
-		libxcb-xrm.so:x11/xcb-util-xrm \
+		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-util.so:x11/xcb-util \
 		libxcb-image.so:x11/xcb-util-image \
-		libinotify.so:devel/libinotify
+		libxcb-util.so:x11/xcb-util \
+		libxcb-xrm.so:x11/xcb-util-xrm
 
 USES=		cmake:outsource localbase:ldflags pkgconfig python:2.7,build
 USE_GITHUB=	yes
 GH_ACCOUNT=	jaagr
+GH_TAGNAME=     0edaead
 GH_TUPLE=	jaagr:i3ipcpp:v0.7.1:i3ipcpp/lib/i3ipcpp \
 		jaagr:xpp:1.4.0-1-g64bd576:xpp/lib/xpp
 USE_GNOME=	cairo
 USE_XORG=	xcb
 
-OPTIONS_DEFINE=	ALSA CURL EXAMPLES I3 IPC MPD
-OPTIONS_DEFAULT=	ALSA CURL I3 IPC MPD
+# Temporarily additions. To test if make any difference
+# to some known  broken modules.
+CMAKE_ON=	WITH_XCOMPOSITE
+CMAKE_ON=	WITH_XDAMAGE
+CMAKE_ON=	WITH_XRENDER
+CMAKE_ON=	WITH_XSYNC
+
+OPTIONS_DEFINE=	ALSA CURL EXAMPLES I3 IPC MPD TESTS
+OPTIONS_DEFAULT=	CURL I3 IPC MPD
 OPTIONS_SUB=	yes
 
 ALSA_DESC=	Volume control
 CURL_DESC=	Github support
 I3_DESC=	i3wm support
+IPC_DESC=	Built-in IPC support
 MPD_DESC=	Support for controlling MPD
-IPC_DESC=	i3 IPC support
+TESTS_DESC=	Build testsuite
 
 ALSA_CMAKE_BOOL=	ENABLE_ALSA
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
@@ -55,6 +64,8 @@
 MPD_CMAKE_BOOL=		ENABLE_MPD
 MPD_LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient
 
+TESTS_CMAKE_BOOL=	BUILD_TESTS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|python2|${PYTHON_CMD}|g' ${WRKSRC_xpp}/CMakeLists.txt
 
Index: x11/polybar/distinfo
===================================================================
--- x11/polybar/distinfo
+++ x11/polybar/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1515547603
-SHA256 (jaagr-polybar-3.1.0_GH0.tar.gz) = cb6f404e1c3e9f0239ecde095c04dcb50a164ce346046f077744b2c53fab7fc4
-SIZE (jaagr-polybar-3.1.0_GH0.tar.gz) = 418298
+TIMESTAMP = 1521608508
+SHA256 (jaagr-polybar-3.1.0-0edaead_GH0.tar.gz) = 784e1bcc8d8c8bf37543a3f922a41ce4f4b49e54904aa604446c22f40fccaedc
+SIZE (jaagr-polybar-3.1.0-0edaead_GH0.tar.gz) = 223548
 SHA256 (jaagr-i3ipcpp-v0.7.1_GH0.tar.gz) = 644d82d0e73b7c653e344ac8852e4d7435d9fb7ea54a160ab81662ab4b3652cf
 SIZE (jaagr-i3ipcpp-v0.7.1_GH0.tar.gz) = 191417
 SHA256 (jaagr-xpp-1.4.0-1-g64bd576_GH0.tar.gz) = 451052c2d71b55cb3ea35dcf2f422162756caf05e3d4bfb9e36b47e802fbf109
Index: x11/polybar/pkg-message
===================================================================
--- x11/polybar/pkg-message
+++ x11/polybar/pkg-message
@@ -7,6 +7,7 @@
 - date
 - i3
 - memory
+- mpd
 - script
 - text
 - xkeyboard
@@ -26,4 +27,3 @@
 - battery
 - github
 - ipc
-- mpd