Index: head/x11/polybar/Makefile
===================================================================
--- head/x11/polybar/Makefile	(revision 508360)
+++ head/x11/polybar/Makefile	(revision 508361)
@@ -1,88 +1,85 @@
 # $FreeBSD$
 
 PORTNAME=	polybar
-DISTVERSION=	3.3.1
-PORTREVISION=	2
+DISTVERSION=	3.4.0
 CATEGORIES=	x11
+MASTER_SITES=	https://github.com/polybar/polybar/releases/download/${DISTVERSION}/
 
 MAINTAINER=	rigoletto@FreeBSD.org
 COMMENT=	Fast and easy-to-use status bar
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 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-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
 
 # compiler:c++11-lang is needed for powerpc64
 USES=		cmake compiler:c++11-lang gnome localbase:ldflags \
-		pkgconfig python:2.7,build
+		pkgconfig python:2.7,build tar
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	jaagr
-GH_TUPLE=	jaagr:i3ipcpp:v0.7.1-4-gd4e4786:i3ipcpp/lib/i3ipcpp \
-		jaagr:xpp:1.4.0-8-gab6247b:xpp/lib/xpp
-
 USE_GNOME=	cairo
 USE_XORG=	xcb
 
 # Needs libnl to work. Disabling completely.
 CMAKE_OFF=	ENABLE_NETWORK
 
 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
 
 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
 
 I3_BUILD_DEPENDS=	${LOCALBASE}/include/i3/ipc.h:x11-wm/i3
 I3_CMAKE_BOOL=		ENABLE_I3
 I3_LIB_DEPENDS=		libjsoncpp.so:devel/jsoncpp
 
 IPC_CMAKE_BOOL=		BUILD_IPC_MSG
 
 MPD_CMAKE_BOOL=		ENABLE_MPD
 MPD_LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient
 
 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
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 do-test-TESTS-on:
 	cd ${TEST_WRKSRC} && ${SETENV} BUILD_TESTS=ON \
 		${SH} ${WRKSRC}/common/travis/tests.sh
 
 .include <bsd.port.mk>
Index: head/x11/polybar/distinfo
===================================================================
--- head/x11/polybar/distinfo	(revision 508360)
+++ head/x11/polybar/distinfo	(revision 508361)
@@ -1,7 +1,3 @@
-TIMESTAMP = 1554317325
-SHA256 (jaagr-polybar-3.3.1_GH0.tar.gz) = d0a0ad987abb9da74c5b1ea4a57f7b17aec1653876b0a26c7da72fc669b53ee7
-SIZE (jaagr-polybar-3.3.1_GH0.tar.gz) = 248790
-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-8-gab6247b_GH0.tar.gz) = ff95905e60da13b6ac8a5670dd259cc0cdd4ebf8ebae985c8bba16c54bbe69ad
-SIZE (jaagr-xpp-1.4.0-8-gab6247b_GH0.tar.gz) = 84294
+TIMESTAMP = 1564027994
+SHA256 (polybar-3.4.0.tar) = 69a098f22d7a72eb594030aff687801252b18520b097c12f5c7894a99c4bcd1b
+SIZE (polybar-3.4.0.tar) = 2713600
Index: head/x11/polybar/files/patch-man_CMakeLists.txt
===================================================================
--- head/x11/polybar/files/patch-man_CMakeLists.txt	(revision 508360)
+++ head/x11/polybar/files/patch-man_CMakeLists.txt	(nonexistent)
@@ -1,8 +0,0 @@
---- man/CMakeLists.txt.orig	2018-05-18 04:58:51 UTC
-+++ man/CMakeLists.txt
-@@ -1,4 +1,4 @@
- set(MAN_PAGES_1 polybar.1)
- INSTALL(FILES ${MAN_PAGES_1}
--  DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
-+  DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1
-   COMPONENT doc)

Property changes on: head/x11/polybar/files/patch-man_CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/x11/polybar/files/patch-doc_CMakeLists.txt
===================================================================
--- head/x11/polybar/files/patch-doc_CMakeLists.txt	(revision 508360)
+++ head/x11/polybar/files/patch-doc_CMakeLists.txt	(nonexistent)
@@ -1,11 +0,0 @@
---- doc/CMakeLists.txt.orig	2017-12-03 17:03:49 UTC
-+++ doc/CMakeLists.txt
-@@ -85,7 +85,7 @@ configure_file(
-   ESCAPE_QUOTES @ONLY)
- 
- install(FILES config
--  DESTINATION share/doc/polybar
-+  DESTINATION share/examples/polybar
-   COMPONENT config)
- 
- # }}}

Property changes on: head/x11/polybar/files/patch-doc_CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/x11/polybar/files/patch-lib_xpp_CMakeLists.txt
===================================================================
--- head/x11/polybar/files/patch-lib_xpp_CMakeLists.txt	(revision 508360)
+++ head/x11/polybar/files/patch-lib_xpp_CMakeLists.txt	(revision 508361)
@@ -1,20 +1,11 @@
---- lib/xpp/CMakeLists.txt.orig	2019-01-12 15:06:55 UTC
+--- lib/xpp/CMakeLists.txt.orig	2019-07-25 04:34:56 UTC
 +++ lib/xpp/CMakeLists.txt
 @@ -48,7 +48,7 @@ set(XPP_LIBRARIES
  #
  # Loop through a hardcoded list of python executables to locate the python module "xcbgen"
  #
 -foreach(CURRENT_EXECUTABLE python2 python2.7 python3 python)
 +foreach(CURRENT_EXECUTABLE python2 python2.7 python3 python3.5 python3.6 python3.7 python)
    message(STATUS "Searching for xcbgen with " ${CURRENT_EXECUTABLE})
  
    execute_process(COMMAND "${CURRENT_EXECUTABLE}" "-c"
-@@ -161,7 +161,7 @@ foreach(PROTO ${PROTO_LIST})
-   set(OUTPUT_FILE ${PROJECT_SOURCE_DIR}/include/xpp/proto/${PROTO_OUTPUT}.hpp)
-   add_custom_command(
-     OUTPUT ${OUTPUT_FILE}
--    COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/generators/cpp_client.py -p "${PYTHON_XCBGEN}"
-+    COMMAND ${PYTHON_EXECUTABLE} -B ${PROJECT_SOURCE_DIR}/generators/cpp_client.py -p "${PYTHON_XCBGEN}"
-     ${XCBPROTO_XCBINCLUDEDIR}/${PROTO}.xml > ${OUTPUT_FILE})
-   list(APPEND PROTO_HEADER_FILES ${OUTPUT_FILE})
- endforeach(PROTO)
Index: head/x11/polybar/pkg-plist
===================================================================
--- head/x11/polybar/pkg-plist	(revision 508360)
+++ head/x11/polybar/pkg-plist	(revision 508361)
@@ -1,6 +1,5 @@
 bin/polybar
 %%IPC%%bin/polybar-msg
-man/man1/polybar.1.gz
 share/bash-completion/completions/polybar
 share/zsh/site-functions/_polybar
 share/zsh/site-functions/_polybar_msg