Index: x11/polybar/Makefile
===================================================================
--- x11/polybar/Makefile	(revision 471445)
+++ x11/polybar/Makefile	(working copy)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	polybar
-DISTVERSION=	3.1.0
-PORTREVISION=	2
+DISTVERSION=	3.1.0.20180430
 CATEGORIES=	x11
 
 MAINTAINER=	capt_redbeard@protonmail.com
@@ -22,11 +21,12 @@
 		libxcb-util.so:x11/xcb-util \
 		libxcb-xrm.so:x11/xcb-util-xrm
 
-USES=		cmake:outsource localbase:ldflags pkgconfig python:2.7,build
+USES=		cmake:outsource pkgconfig python:2.7,build
 USE_GITHUB=	yes
 GH_ACCOUNT=	jaagr
-GH_TUPLE=	jaagr:i3ipcpp:v0.7.1:i3ipcpp/lib/i3ipcpp \
-		jaagr:xpp:1.4.0-1-g64bd576:xpp/lib/xpp
+GH_TAGNAME=	73e4b4a
+GH_TUPLE=	jaagr:i3ipcpp:d4e4786:i3ipcpp/lib/i3ipcpp \
+		jaagr:xpp:00165e1:xpp/lib/xpp
 USE_GNOME=	cairo
 USE_XORG=	xcb
 
@@ -56,11 +56,11 @@
 MPD_CMAKE_BOOL=		ENABLE_MPD
 MPD_LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient
 
+# 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
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|python2|${PYTHON_CMD}|g' ${WRKSRC_xpp}/CMakeLists.txt
-
 do-test-TESTS-on:
 	cd ${TEST_WRKSRC} && ${SETENV} BUILD_TESTS=ON \
 		${SH} ${WRKSRC}/common/travis/tests.sh
Index: x11/polybar/distinfo
===================================================================
--- x11/polybar/distinfo	(revision 471445)
+++ x11/polybar/distinfo	(working copy)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1515547603
-SHA256 (jaagr-polybar-3.1.0_GH0.tar.gz) = cb6f404e1c3e9f0239ecde095c04dcb50a164ce346046f077744b2c53fab7fc4
-SIZE (jaagr-polybar-3.1.0_GH0.tar.gz) = 418298
-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
-SIZE (jaagr-xpp-1.4.0-1-g64bd576_GH0.tar.gz) = 84145
+TIMESTAMP = 1527191354
+SHA256 (jaagr-polybar-3.1.0.20180430-73e4b4a_GH0.tar.gz) = ddc44d9fe957a57c9aa2b735fee88c80ae7b78fd9c0069525df52850e174172e
+SIZE (jaagr-polybar-3.1.0.20180430-73e4b4a_GH0.tar.gz) = 225439
+SHA256 (jaagr-i3ipcpp-d4e4786_GH0.tar.gz) = 34a426b45487a8fcdc01cf51aaef6d66e52db38b6ad70b5ab2e6fcf115e9110c
+SIZE (jaagr-i3ipcpp-d4e4786_GH0.tar.gz) = 191488
+SHA256 (jaagr-xpp-00165e1_GH0.tar.gz) = 7e85b4bb1d500e1900e71688f4c83e5cd24b56d9df90a4d9cb8a60fd45ae764d
+SIZE (jaagr-xpp-00165e1_GH0.tar.gz) = 84804
Index: x11/polybar/files/patch-cmake_01-core.cmake
===================================================================
--- x11/polybar/files/patch-cmake_01-core.cmake	(revision 471445)
+++ x11/polybar/files/patch-cmake_01-core.cmake	(nonexistent)
@@ -1,20 +0,0 @@
---- cmake/01-core.cmake.orig	2017-12-03 17:03:49 UTC
-+++ cmake/01-core.cmake
-@@ -31,8 +31,17 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic-errors")
- 
-+if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+  # Need dprintf() for FreeBSD 11.1 and older
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WITH_DPRINTF")
-+
-+  # libinotify uses c99 extension, so suppress this error
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c99-extensions")
-+endif()
-+
- if(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=parentheses-equality")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-zero-length-array")
- endif()
- 
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")

Property changes on: x11/polybar/files/patch-cmake_01-core.cmake
___________________________________________________________________
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: x11/polybar/files/patch-cmake_03-libs.cmake
===================================================================
--- x11/polybar/files/patch-cmake_03-libs.cmake	(revision 471445)
+++ x11/polybar/files/patch-cmake_03-libs.cmake	(nonexistent)
@@ -1,11 +0,0 @@
---- cmake/03-libs.cmake.orig	2017-12-03 17:03:49 UTC
-+++ cmake/03-libs.cmake
-@@ -21,3 +21,8 @@ querylib(WITH_XRENDER "pkg-config" xcb-render libs dir
- querylib(WITH_XRM "pkg-config" xcb-xrm libs dirs)
- querylib(WITH_XSYNC "pkg-config" xcb-sync libs dirs)
- querylib(WITH_XCURSOR "pkg-config" xcb-cursor libs dirs)
-+
-+# FreeBSD Support
-+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+  querylib(TRUE "pkg-config" libinotify libs dirs)
-+endif()

Property changes on: x11/polybar/files/patch-cmake_03-libs.cmake
___________________________________________________________________
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: x11/polybar/files/patch-include_adapters_alsa_generic.hpp
===================================================================
--- x11/polybar/files/patch-include_adapters_alsa_generic.hpp	(revision 471445)
+++ x11/polybar/files/patch-include_adapters_alsa_generic.hpp	(nonexistent)
@@ -1,14 +0,0 @@
---- include/adapters/alsa/generic.hpp.orig	2017-12-03 17:03:49 UTC
-+++ include/adapters/alsa/generic.hpp
-@@ -4,7 +4,11 @@
- #include <alsa/asoundlib.h>
- #else
- #include <assert.h>
-+
-+#ifndef __FreeBSD__
- #include <endian.h>
-+#endif
-+
- #include <errno.h>
- #include <fcntl.h>
- #include <stdarg.h>

Property changes on: x11/polybar/files/patch-include_adapters_alsa_generic.hpp
___________________________________________________________________
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: x11/polybar/files/patch-man_CMakeLists.txt
===================================================================
--- x11/polybar/files/patch-man_CMakeLists.txt	(revision 471445)
+++ x11/polybar/files/patch-man_CMakeLists.txt	(working copy)
@@ -1,9 +1,8 @@
---- man/CMakeLists.txt.orig	2017-12-03 17:03:49 UTC
+--- man/CMakeLists.txt.orig	2018-05-18 04:58:51 UTC
 +++ man/CMakeLists.txt
-@@ -1,4 +1,5 @@
-+include(GNUInstallDirs)
+@@ -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_MANDIR}/man1
++  DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1
    COMPONENT doc)
Index: x11/polybar/pkg-message
===================================================================
--- x11/polybar/pkg-message	(revision 471445)
+++ x11/polybar/pkg-message	(working copy)
@@ -1,5 +1,5 @@
-Polybar was originally built with Linux in mind, so certain modules do
-not function in FreeBSD.
+Polybar was originally built with Linux in mind, so certain modules do not
+function in FreeBSD.
 
 Working modules:
 - bspwm
Index: x11/polybar/pkg-plist
===================================================================
--- x11/polybar/pkg-plist	(revision 471445)
+++ x11/polybar/pkg-plist	(working copy)
@@ -1,7 +1,7 @@
 bin/polybar
 %%IPC%%bin/polybar-msg
 man/man1/polybar.1.gz
+share/bash-completion/completions/polybar
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config
-share/bash-completion/completions/polybar
 share/zsh/site-functions/_polybar
 share/zsh/site-functions/_polybar_msg