Index: head/x11/xkb-switch/files/patch-CMakeLists.txt
===================================================================
--- head/x11/xkb-switch/files/patch-CMakeLists.txt	(revision 508034)
+++ head/x11/xkb-switch/files/patch-CMakeLists.txt	(nonexistent)
@@ -1,14 +0,0 @@
---- CMakeLists.txt.orig	2016-04-17 08:55:32 UTC
-+++ CMakeLists.txt
-@@ -4,6 +4,11 @@ PROJECT( XKB-SWITCH )
- 
- FIND_PROGRAM(CTAGS ctags)
- 
-+FIND_PACKAGE(X11 REQUIRED)
-+
-+INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
-+LINK_DIRECTORIES(${X11_LIBRARY_DIR})
-+
- ADD_EXECUTABLE(xkb-switch XKbSwitch.cpp XKeyboard.cpp)
- 
- TARGET_LINK_LIBRARIES(xkb-switch X11 xkbfile)

Property changes on: head/x11/xkb-switch/files/patch-CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-on
\ 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/xkb-switch/Makefile
===================================================================
--- head/x11/xkb-switch/Makefile	(revision 508034)
+++ head/x11/xkb-switch/Makefile	(revision 508035)
@@ -1,31 +1,39 @@
 # Created by: Dmitri Goutnik <dg@syrec.org>
 # $FreeBSD$
 
 PORTNAME=	xkb-switch
-PORTVERSION=	1.5.0
+PORTVERSION=	1.6.0
 CATEGORIES=	x11
 
+# https://github.com/ierton/xkb-switch/pull/41
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	2075a8cdd5456c906fcd49278c1003dcb6b9f880.patch:-p1
+
 MAINTAINER=	dg@syrec.org
 COMMENT=	Switch your X keyboard layouts from the command line
 
 LICENSE=	GPLv3
 
+USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	ierton
-
-USES=		cmake
 USE_XORG=	x11 xkbfile
 USE_LDCONFIG=	yes
 
+CMAKE_ARGS=	-DMAN_COMPRESSION="gz" -DMANDIR="${MANPREFIX}/man"
+
 OPTIONS_DEFINE=	DOCS
 
 PLIST_FILES=	bin/xkb-switch \
-		lib/libxkbswitch.so
+		lib/libxkbswitch.so \
+		lib/libxkbswitch.so.1 \
+		lib/libxkbswitch.so.1.6.0 \
+		man/man1/xkb-switch.1.gz
 
 PORTDOCS=	README.md
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/x11/xkb-switch/distinfo
===================================================================
--- head/x11/xkb-switch/distinfo	(revision 508034)
+++ head/x11/xkb-switch/distinfo	(revision 508035)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1489685611
-SHA256 (ierton-xkb-switch-1.5.0_GH0.tar.gz) = 3e100ac15670eda2109fb0d3159ad08e85e3b33de4cb1b3369dce5da7d83e954
-SIZE (ierton-xkb-switch-1.5.0_GH0.tar.gz) = 18899
+TIMESTAMP = 1564084605
+SHA256 (ierton-xkb-switch-1.6.0_GH0.tar.gz) = 17ddd00a09945f634654ddf98d55023b0727755f828706747fd5227e2651633d
+SIZE (ierton-xkb-switch-1.6.0_GH0.tar.gz) = 20458
+SHA256 (2075a8cdd5456c906fcd49278c1003dcb6b9f880.patch) = 8dce584225bea7340a3674d9ab4ed66912ee4354f7e40f941625c90b8b66d5e1
+SIZE (2075a8cdd5456c906fcd49278c1003dcb6b9f880.patch) = 1845